fix apostrophe problem in file info, support gpt-driveX

git-svn-id: file:///root/webif/svn/pkg/webif/trunk@2680 2a923420-c742-0410-a762-8d5b09965624
This commit is contained in:
hummypkg 2016-02-21 00:22:34 +00:00
parent 03164c8b4c
commit 055458ed46
4 changed files with 8 additions and 8 deletions

View File

@ -1,10 +1,10 @@
Package: webif Package: webif
Priority: optional Priority: optional
Section: web Section: web
Version: 1.2.8-5 Version: 1.2.8-6
Architecture: mipsel Architecture: mipsel
Maintainer: af123@hummypkg.org.uk Maintainer: af123@hummypkg.org.uk
Depends: tcpfix,webif-channelicons(>=1.1.20),lighttpd(>=1.4.39-1),jim(>=0.76),jim-oo,jim-sqlite3(>=0.76),jim-cgi(>=0.7),jim-binary(>=0.76),service-control(>=2.1),busybox(>=1.20.2-1),lsof(>=4.87),epg(>=1.2.1),hmt(>=2.0.9),ssmtp,anacron,trm(>=1.1),openssl-command,nicesplice,id3v2,file,rsvsync(>=1.0.2),webif-charts(>=1.2-1),stripts(>=1.2.5-3),smartmontools,tmenu(>=1.08),ffmpeg,id3v2,multienv(>=1.6),tcpping(>=1.1),e2fsprogs,wireless-tools(>=29-1),dbupdate,recmon(>=2.0.7) Depends: tcpfix,webif-channelicons(>=1.1.20),lighttpd(>=1.4.39-1),jim(>=0.76),jim-oo,jim-sqlite3(>=0.76),jim-cgi(>=0.7),jim-binary(>=0.76),service-control(>=2.1),busybox(>=1.20.2-1),lsof(>=4.87),epg(>=1.2.1),hmt(>=2.0.9),ssmtp,anacron,trm(>=1.1),openssl-command,nicesplice,id3v2,file,rsvsync(>=1.0.2),webif-charts(>=1.2-1),stripts(>=1.2.5-3),tmenu(>=1.08),ffmpeg,id3v2,multienv(>=1.6),tcpping(>=1.1),e2fsprogs,wireless-tools(>=29-1),dbupdate,recmon(>=2.0.7)
Suggests: Suggests:
Description: An evolving web interface for the Humax. Description: An evolving web interface for the Humax.
Tags: http://hummy.tv/forum/threads/6484/ Tags: http://hummy.tv/forum/threads/6484/

Binary file not shown.

View File

@ -210,11 +210,10 @@ if {[$ts get bookmarks]} {
puts " puts "
</table> </table>
" "
puts " puts "<div class=hidden id=file>$file</div>"
<script type=text/javascript>
var file = '$file';
"
puts { puts {
<script type=text/javascript>
var file = $('#file').text();
$('button').button(); $('button').button();
$('.tvdbchoose').on('click', function() { $('.tvdbchoose').on('click', function() {
window.location.href = '/browse/tvdb/episode.jim?file=' + window.location.href = '/browse/tvdb/episode.jim?file=' +

View File

@ -603,13 +603,14 @@ proc {system usbmounts} {{full 0}} {
set num 0 set num 0
catch { catch {
set num [ set num [
exec grep -cE {/media/(usb-)?drive} /proc/mounts] exec grep -cE {/media/(usb-|gpt-)?drive} \
/proc/mounts]
} }
return $num return $num
} }
set ret {} set ret {}
if {[catch { if {[catch {
set lines [exec grep -E {media/(usb-)?drive} /proc/mounts] set lines [exec grep -E {media/(usb-|gpt-)?drive} /proc/mounts]
}]} { return $ret } }]} { return $ret }
foreach line [split $lines "\n"] { foreach line [split $lines "\n"] {
lassign $line dev mp lassign $line dev mp