From bc682f4bef836e04973689b8e9fd587e205658c8 Mon Sep 17 00:00:00 2001 From: hummypkg Date: Mon, 15 Jun 2015 17:33:32 +0000 Subject: [PATCH] New guidance icon, early abort from automatic processing on flag disappearance, show recording icon instead of failed git-svn-id: file:///root/webif/svn/pkg/webif/trunk@2425 2a923420-c742-0410-a762-8d5b09965624 --- CONTROL/control | 4 ++-- webif/html/browse/file.jim | 2 +- webif/html/browse/index.jim | 7 ++++-- webif/html/img/Guidance_purple.png | Bin 0 -> 4542 bytes webif/html/img/Video_Rec.png | Bin 0 -> 6613 bytes webif/html/img/Video_Rec_New.png | Bin 0 -> 6789 bytes webif/html/m/browse.jim | 2 +- webif/lib/bin/auto | 37 ++++++++++++++++++----------- 8 files changed, 32 insertions(+), 20 deletions(-) create mode 100644 webif/html/img/Guidance_purple.png create mode 100644 webif/html/img/Video_Rec.png create mode 100644 webif/html/img/Video_Rec_New.png diff --git a/CONTROL/control b/CONTROL/control index 27e5a02..c304d93 100644 --- a/CONTROL/control +++ b/CONTROL/control @@ -1,10 +1,10 @@ Package: webif Priority: optional Section: web -Version: 1.2.2-9 +Version: 1.2.3 Architecture: mipsel Maintainer: af123@hummypkg.org.uk -Depends: webif-channelicons(>=1.1.18),lighttpd(>=1.4.35-2),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.0),hmt(>=2.0.3),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.3-3) +Depends: webif-channelicons(>=1.1.18),lighttpd(>=1.4.35-2),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.0),hmt(>=2.0.3),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.3-3),auto-unprotect(>=2.0.0-1) Suggests: Description: An evolving web interface for the Humax. Tags: http://hummy.tv/forum/threads/5866/ diff --git a/webif/html/browse/file.jim b/webif/html/browse/file.jim index f107dbe..24571d0 100755 --- a/webif/html/browse/file.jim +++ b/webif/html/browse/file.jim @@ -64,7 +64,7 @@ if {$type eq "ts"} { puts " Guidance + src=/img/Guidance_purple.png height=21> [$ts get guidance] diff --git a/webif/html/browse/index.jim b/webif/html/browse/index.jim index 5bcd935..c10bb78 100755 --- a/webif/html/browse/index.jim +++ b/webif/html/browse/index.jim @@ -117,8 +117,11 @@ proc entry {file} {{i 0}} { if {$ext eq ".ts" && [file exists "${base}.nts"]} { set type ts set ts [ts fetch $file 1] - if {[$ts get status] eq "Valid/OK"} { + set rstat [$ts get status] + if {$rstat eq "Valid/OK"} { set img Video_TS + } elseif {$rstat eq "Loss of power/OK" && $bfile in $dinuse} { + set img Video_Rec } else { set img Video_Failed } @@ -225,7 +228,7 @@ proc entry {file} {{i 0}} { # Guidance if {[$ts flag "Guidance"] > 0} { - icon "/img/Guidance_red.png" + icon "/img/Guidance_purple.png" } if {[$ts flag "GGuidance"] > 0} { icon "/img/Guidance_blue.png" diff --git a/webif/html/img/Guidance_purple.png b/webif/html/img/Guidance_purple.png new file mode 100644 index 0000000000000000000000000000000000000000..fac4aaacc669918888c4145e0707ea4de214cbd1 GIT binary patch literal 4542 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 literal 0 HcmV?d00001 diff --git a/webif/html/img/Video_Rec.png b/webif/html/img/Video_Rec.png new file mode 100644 index 0000000000000000000000000000000000000000..44c8e9615607889376f66023712abc9f29b6ffc7 GIT binary patch literal 6613 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 literal 0 HcmV?d00001 diff --git a/webif/html/m/browse.jim b/webif/html/m/browse.jim index f30065f..ed8b174 100755 --- a/webif/html/m/browse.jim +++ b/webif/html/m/browse.jim @@ -140,7 +140,7 @@ proc entry {file {i 0}} { # Guidance if {[$ts flag "Guidance"] > 0} { - icon "/img/Guidance_red.png" + icon "/img/Guidance_purple.png" } if {[$ts flag "GGuidance"] > 0} { icon "/img/Guidance_blue.png" diff --git a/webif/lib/bin/auto b/webif/lib/bin/auto index 86aa1ac..a4db844 100755 --- a/webif/lib/bin/auto +++ b/webif/lib/bin/auto @@ -10,7 +10,6 @@ set audiomp3 [$settings audiomp3] set modules {decrypt dedup shrink mpg mp3 expire} - set logfile "/mod/tmp/auto.log" set logfd "unset" @@ -201,7 +200,7 @@ proc endop {} { file delete "$tmp/.op" } -proc dedup {dir} { +proc dedup {dir {flag ""}} { log "DEDUP: \[$dir]" 2 loop i 0 1 { foreach line [split \ @@ -556,8 +555,12 @@ proc do_mp3 {ts} { endop } -proc entries {dir callback} { +proc entries {dir callback {flag ""}} { foreach entry [readdir -nocomplain $dir] { + if {$flag ne "" && ![file exists $flag]} { + log "Flag $flag disappeared mid-run, aborting." 0 + break + } if {![string match {*.ts} $entry]} continue if {[catch {set ts [ts fetch "$dir/$entry"]}]} continue if {$ts == 0} continue @@ -565,27 +568,27 @@ proc entries {dir callback} { } } -proc shrink {dir} { +proc shrink {dir {flag ""}} { log "SHRINK: \[$dir]" 2 - entries $dir do_shrink + entries $dir do_shrink $flag } -proc decrypt {dir} { +proc decrypt {dir {flag ""}} { log "DECRYPT: \[$dir]" 2 - if {$::dlnaok} { entries $dir do_decrypt } + if {$::dlnaok} { entries $dir do_decrypt $flag } } -proc mpg {dir} { +proc mpg {dir {flag ""}} { log "MPG: \[$dir]" 2 - entries $dir do_mpg + entries $dir do_mpg $flag } -proc mp3 {dir} { +proc mp3 {dir {flag ""}} { log "MP3: \[$dir]" 2 - entries $dir do_mp3 + entries $dir do_mp3 $flag } -proc expire {dir} { +proc expire {dir {flag ""}} { log "EXPIRE: \[$dir]" 2 # type 0 keep {} days 2 keepnew 0 @@ -675,7 +678,7 @@ proc scan_run {dir flag callback} { } } -proc xscan {dir attr {force 0} {recurse 1}} {{indent 0}} { +proc xscan {dir attr {force 0} {recurse 1}} {{indent 0} {forceflag ""}} { global dustbin incr indent 2 @@ -698,6 +701,7 @@ proc xscan {dir attr {force 0} {recurse 1}} {{indent 0}} { } if {$force} { set force 0 + set forceflag "" log "Special folder, overriding recursion." 2 } } @@ -706,11 +710,16 @@ proc xscan {dir attr {force 0} {recurse 1}} {{indent 0}} { if {!$force && [file exists "$dir/.auto${attr}r"]} { log "[string repeat " " $indent] (R)" 2 set force 1 + set forceflag "$dir/.auto${attr}r" } dsc - if {$force || [file exists "$dir/.auto$attr"]} { $attr $dir } + if {$force} { + $attr $dir $forceflag + } elseif {[file exists "$dir/.auto$attr"]} { + $attr $dir "$dir/.auto$attr" + } foreach entry [readdir -nocomplain $dir] { if {$recurse && [file isdirectory "$dir/$entry"]} {