From d1ccf7b2d194cc4458b6da463ec519e9bfdc64df Mon Sep 17 00:00:00 2001 From: hummypkg Date: Sat, 17 Dec 2016 23:33:14 +0000 Subject: [PATCH] beta 1.3.4 git-svn-id: file:///root/webif/svn/pkg/webif/trunk@3431 2a923420-c742-0410-a762-8d5b09965624 --- CONTROL/control | 2 +- etc/init.d/S59webif | 1 + webif/html/browse/assets.jim | 22 ++- webif/html/browse/dequeue.jim | 29 +++ webif/html/browse/index.jim | 11 +- webif/html/browse/queue.jim | 34 ++++ webif/html/browse/script.js | 133 ++++++++++++++ webif/html/diag/diag.jim | 1 + webif/html/diag/queue/delete.jim | 14 ++ webif/html/diag/queue/index.jim | 68 +++++++ webif/html/diag/queue/script.js | 75 ++++++++ webif/html/diag/queue/style.css | 28 +++ webif/html/img/queue.png | Bin 0 -> 6094 bytes webif/html/img/queuep.png | Bin 0 -> 7439 bytes webif/html/img/queueps.png | Bin 0 -> 933 bytes webif/html/settings/modules/auto/init.hook | 15 ++ .../html/settings/modules/auto/settings.hook | 79 ++++++++ webif/html/settings/modules/general/init.hook | 2 - .../settings/modules/general/settings.hook | 27 --- webif/html/settings/settings.jim | 44 +++-- webif/lib/bin/auto | 113 +++++++++++- webif/lib/bin/update_queue | 7 + webif/lib/plugin | 6 +- webif/lib/queue.class | 169 ++++++++++++++++++ webif/lib/rsv.class | 9 + webif/lib/settings.class | 22 +++ 26 files changed, 863 insertions(+), 48 deletions(-) create mode 100755 webif/html/browse/dequeue.jim create mode 100755 webif/html/browse/queue.jim create mode 100755 webif/html/diag/queue/delete.jim create mode 100755 webif/html/diag/queue/index.jim create mode 100644 webif/html/diag/queue/script.js create mode 100644 webif/html/diag/queue/style.css create mode 100644 webif/html/img/queue.png create mode 100644 webif/html/img/queuep.png create mode 100644 webif/html/img/queueps.png create mode 100644 webif/html/settings/modules/auto/init.hook create mode 100755 webif/html/settings/modules/auto/settings.hook create mode 100755 webif/lib/bin/update_queue create mode 100644 webif/lib/queue.class diff --git a/CONTROL/control b/CONTROL/control index 376c898..0753ec7 100644 --- a/CONTROL/control +++ b/CONTROL/control @@ -1,7 +1,7 @@ Package: webif Priority: optional Section: web -Version: 1.3.3-3 +Version: 1.3.4 Architecture: mipsel Maintainer: af123@hpkg.tv Depends: tcpfix,webif-channelicons(>=1.1.24),lighttpd(>=1.4.39-1),jim(>=0.77),jim-oo(>=0.77),jim-sqlite3(>=0.76),jim-cgi(>=0.7-1),jim-binary(>=0.76),service-control(>=2.3),busybox(>=1.20.2-1),lsof(>=4.87),epg(>=1.2.3),hmt(>=2.0.10),ssmtp,cron-daemon(>=1.18.3-3),at(>=3.1.18),anacron,trm(>=1.1),openssl-command,nicesplice,id3v2,file,rsvsync(>=1.1.9),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),hwctl,nugget(>=0.95),sqlite3(>=3.15.1) diff --git a/etc/init.d/S59webif b/etc/init.d/S59webif index eb907db..9bc5f88 100755 --- a/etc/init.d/S59webif +++ b/etc/init.d/S59webif @@ -6,6 +6,7 @@ export TZ=GMT+0BST,M3.5.0/1,M10.5.0/2 case "$1" in start) + /mod/webif/lib/bin/update_queue /mod/webif/lib/bin/manage_logs plog activity "System booted (`lbr_descr`)." ;; diff --git a/webif/html/browse/assets.jim b/webif/html/browse/assets.jim index 84ead1e..b54556a 100755 --- a/webif/html/browse/assets.jim +++ b/webif/html/browse/assets.jim @@ -376,6 +376,26 @@ Please wait... - +} + +set queueactions(decrypt) "Decryption" +set queueactions(shrink) "Shrink" +set queueactions(mp3) "Audio-Extraction" +set queueactions(mpg) "Conversion to MPG" +eval_plugins queueactions + +puts { + } diff --git a/webif/html/browse/dequeue.jim b/webif/html/browse/dequeue.jim new file mode 100755 index 0000000..79482d8 --- /dev/null +++ b/webif/html/browse/dequeue.jim @@ -0,0 +1,29 @@ +#!/mod/bin/jimsh + +package require cgi +source /mod/webif/lib/setup +require ts.class queue.class + +httpheader + +set dir [cgi_get dir] + +puts "
De-queuing...
" +puts "" + diff --git a/webif/html/browse/index.jim b/webif/html/browse/index.jim index 3ae1b87..47d3724 100755 --- a/webif/html/browse/index.jim +++ b/webif/html/browse/index.jim @@ -3,7 +3,7 @@ package require cgi source /mod/webif/lib/setup require ts.class pretty_size system.class settings.class escape browse.class \ - plugin epg.class classdump + plugin epg.class classdump queue.class set mroot [system mediaroot] set dir [cgi_get dir $mroot] @@ -216,6 +216,12 @@ proc entry {file} {{i 0}} { set dlna 1 } + # Queued + set queued [queue status $ts] + if {$queued ne ""} { + icon "/img/queueps.png" "Queued for $queued" + } + # Opt+ button puts " @@ -373,6 +379,9 @@ if {$nicesplice} { puts { } } +# Queue +puts { } + # De-duplicate puts { diff --git a/webif/html/browse/queue.jim b/webif/html/browse/queue.jim new file mode 100755 index 0000000..fed764a --- /dev/null +++ b/webif/html/browse/queue.jim @@ -0,0 +1,34 @@ +#!/mod/bin/jimsh + +package require cgi +source /mod/webif/lib/setup +require ts.class queue.class + +httpheader + +set dir [cgi_get dir] +set act [cgi_get act -] +if {$act eq "-"} { + puts "No action." + exit; +} + +puts "
Queuing...
" +puts "" + diff --git a/webif/html/browse/script.js b/webif/html/browse/script.js index 613a73c..ddf0dfa 100755 --- a/webif/html/browse/script.js +++ b/webif/html/browse/script.js @@ -880,6 +880,14 @@ $('#bmpdialogue').dialog({ close: function() { $('#thmbmp').attr('src', 'about:blank'); } }); +// Selection overlay +$seloverlay = $('#selectoverlay').dialog({ + modal: false, autoOpen: false, + height: 85, width: 460, + show: 'fade', hide: 'fade', + draggable: true, resizable: false +}); + // Create re-usable confirmation dialogue. $confirm = $('#confirm').dialog({ modal: true, autoOpen: false, @@ -926,6 +934,10 @@ $('#dedup').button().click(function() { + encodeURIComponent(dir); }); +$('#queue').button().click(function() { + window.location = '/diag/queue/'; +}); + $('#save_stream').button().click(function() { $('#savestream_retrieving').show(); $('#savestream_detail').text('').hide(); @@ -1058,8 +1070,129 @@ $('input.fs').change(function() { else $('#join').disable(); + if (num > 0) + { + $seloverlay + .dialog('option', 'position', { + my: "left top", + at: "right bottom", + of: this + }) + .dialog('option', 'title', 'Selected files: ' + num) + .dialog('open') + .find('span.selcount').text(num); + } + else + { + $seloverlay.dialog('close'); + } }); +$('#so_delete').button() + .click(function() { + var files = new Array(); + var els = $('input.fs:checked + a').each(function() { + files.push(decodeURIComponent($(this).attr('file'))); + }); + //console.log("%o", files); + var str = 'Are you sure you want to delete ' + files.length + + ' file'; + if (files.length != 1) str += 's'; + str += '?'; + if (confirm(str)) + { + disableall(); + $('#deletewait').slideDown('slow'); + + $('#pwdialogue').dialog({ + title: "Deleting", + modal: true, autoOpen: true, + height: 'auto', width: 'auto', + show: 'scale', hide: 'fade', + draggable: false, resizable: false, + closeOnEscape: false, + open: function() { + $('.ui-dialog-titlebar-close').hide(); + } + }); + $('#pwfeedback').load( + '/browse/delete.jim', { + 'dir': dir, + 'files': files + }, function() { + $('#pwdialogue').dialog('close'); + blockpage(); + window.location.reload(true); + }); + } + }); + + +$('#so_queue').button() + .click(function() { + var files = new Array(); + var els = $('input.fs:checked + a').each(function() { + files.push(decodeURIComponent($(this).attr('file'))); + }); + + disableall(); + + $('#pwdialogue').dialog({ + title: "Queuing", + modal: true, autoOpen: true, + height: 'auto', width: 'auto', + show: 'scale', hide: 'fade', + draggable: false, resizable: false, + closeOnEscape: false, + open: function() { + $('.ui-dialog-titlebar-close').hide(); + } + }); + + $('#pwfeedback').load( + '/browse/queue.jim', { + 'dir': dir, + 'files': files, + 'act': $('#so_queueactions').val() + }, function() { + $('#pwdialogue').dialog('close'); + blockpage(); + window.location.reload(true); + }); + }); + +$('#so_dequeue').button() + .click(function() { + var files = new Array(); + var els = $('input.fs:checked + a').each(function() { + files.push(decodeURIComponent($(this).attr('file'))); + }); + + disableall(); + + $('#pwdialogue').dialog({ + title: "De-queuing", + modal: true, autoOpen: true, + height: 'auto', width: 'auto', + show: 'scale', hide: 'fade', + draggable: false, resizable: false, + closeOnEscape: false, + open: function() { + $('.ui-dialog-titlebar-close').hide(); + } + }); + + $('#pwfeedback').load( + '/browse/dequeue.jim', { + 'dir': dir, + 'files': files + }, function() { + $('#pwdialogue').dialog('close'); + blockpage(); + window.location.reload(true); + }); + }); + var streamsize = 0; function checkstream() diff --git a/webif/html/diag/diag.jim b/webif/html/diag/diag.jim index 7f9f508..5bf875f 100755 --- a/webif/html/diag/diag.jim +++ b/webif/html/diag/diag.jim @@ -105,6 +105,7 @@ util "shredder" "rma" "RMA" "#" "
" util "bluering" "reboot" "Reboot System" "/restart/" util "maint" "maint" "Maintenance Mode" "#" "
" +util "queuep" "queue" "Queued Tasks" "/diag/queue/" eval_plugins diag diff --git a/webif/html/diag/queue/delete.jim b/webif/html/diag/queue/delete.jim new file mode 100755 index 0000000..6b5d725 --- /dev/null +++ b/webif/html/diag/queue/delete.jim @@ -0,0 +1,14 @@ +#!/mod/bin/jimsh + +package require cgi +source /mod/webif/lib/setup +require queue.class + +httpheader + +set slots [cgi_get slot 0] + +foreach slot [split $slots ","] { + queue delete_by_id $slot +} + diff --git a/webif/html/diag/queue/index.jim b/webif/html/diag/queue/index.jim new file mode 100755 index 0000000..f53e816 --- /dev/null +++ b/webif/html/diag/queue/index.jim @@ -0,0 +1,68 @@ +#!/mod/bin/jimsh + +package require cgi +source /mod/webif/lib/setup +require altrow ts.class queue.class + +jqplugin tablesorter2 enadis blockui confirmAction +jscss script.js style.css + +header + +puts { +

+ + Queued Tasks +

+
+Queued Tasks + + + + + + + + + + + + +} + +foreach q [queue all] { + set name [string map { + "/mnt/hd2/My Video/" "" + "/media/drive1/Video/" "" + "/media/" "" + ".ts" "" + } [$q get file]] + + puts " + + + + + + + + + " +} + +puts { + +
IDSubmittedFileActionStatusLog
+ [$q get id] + [clock format [$q get dat] -format {%c}]$name[$q get action][$q get status]" + if {[$q get status] eq "RUNNING"} { + puts "" + } + puts "[$q get log]
+ + +
+} + +footer + diff --git a/webif/html/diag/queue/script.js b/webif/html/diag/queue/script.js new file mode 100644 index 0000000..10b68f7 --- /dev/null +++ b/webif/html/diag/queue/script.js @@ -0,0 +1,75 @@ +function page_refresh(msg) +{ + if (!msg) + msg = 'Refreshing page...'; + $.blockUI({ + message: '

' + msg + '

' + }); + window.location.reload(true); +} + +$(function() { + +$('table') + .tablesorter({ + sortList: [[0,1]], + theme: 'webif', + widthFixed: false, + widgets: ['zebra', 'stickyHeaders'] + }); + + +$('input.qid:checkbox').prop('checked', false).enable(); + +$('tr').each(function() { + var status = $(this).find('td.status').text(); + + if (status == 'RUNNING') + $(this).find('input.qid:checkbox').disable(); +}); + +$('input.qid:checkbox').on('change', function() { + var num = $('input.qid:checked').size(); + if (num) + $('#qdelete').enable(); + else + $('#qdelete').disable(); +}).first().trigger('change'); + +$('#qdelete').button({icons:{primary:"ui-icon-trash"}}) + .on('click', function() { + $(this).dojConfirmAction({ + question: 'Delete selected?', + yesAnswer: 'Yes', + cancelAnswer: 'No' + }, function(el) { + $.blockUI({ + message: '

Deleting...

' + }); + + + var slots = $('input.qid:checked').map(function() { + return this.value; + }).get(); + $.get('delete.jim', { + slot: slots.join(',') + }, function() { + page_refresh(); + }); + }); + +}); + +$('#refresh').button({icons:{primary:"ui-icon-refresh"}}) + .on('click', function() { + page_refresh(); +}); + +$('#selall').on('change', function() { + $('input.qid:checkbox').prop('checked', $(this).prop('checked')); +}); + +setInterval(function() { page_refresh() }, 60000); + +}); + diff --git a/webif/html/diag/queue/style.css b/webif/html/diag/queue/style.css new file mode 100644 index 0000000..48e37b1 --- /dev/null +++ b/webif/html/diag/queue/style.css @@ -0,0 +1,28 @@ + +td.status +{ + font-style: italic; +} + +td +{ + white-space: nowrap; +} + +td.status.RUNNING +{ + color: red; +} + +td.status.COMPLETE +{ + color: green; + font-weight: bold; +} + +td.status.INTERRUPTED +{ + color: #ffa500; + font-weight: bold; +} + diff --git a/webif/html/img/queue.png b/webif/html/img/queue.png new file mode 100644 index 0000000000000000000000000000000000000000..75b1be312822d5ab9f4dea5349f296ffda78c0eb GIT binary patch literal 6094 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 N002ovPDHLkV1h}UPHzAJ literal 0 HcmV?d00001 diff --git a/webif/html/img/queueps.png b/webif/html/img/queueps.png new file mode 100644 index 0000000000000000000000000000000000000000..2fc34c852abba38d216ca67b1725d6d7635184db GIT binary patch literal 933 zcmV;W16urvP)Gn zz%DDk2tp7c24WQsL#*Bbe%Sy3P6Ma&qZjYXT@G?&U_n?gVil?DdREuv>PX#GGHy zo_M3c2rK{wW`+eLgg}VFLkNGJxJ-7=+}0B>!=1CYZvkh8(olYeNl4k_7$Z&H&@|he z+S+3K)b>2a`ty%|ymD~j6uA6-p^IfS5D}Ghc$snBJ38-Z+qO+9?E(jz;6Os7!xv;U z2PH7!O8M|K=deA*@nojWRDsOn`1pnBIF1AEPV&S&bG25GjlezdbD%Wn z0R;rbdq_#l=ir{`lC?troV*Io?{2&bZoYPBbp$@R@KpdV2?Izm@yGY~Z~D$Fw=RMz z^~o1$9y=42LSDXQ6j{hV$?<}Oq zp)?>@ZcK@U$c@UA5OTy@f}erwz!!x-du6-=K<+dt>zcP+vc*h0=>-cAS{NmS;S+xN zVUAA%=(2?X?~W(oc!Oy#n3f;lQo%b0AzYL=AF8yD_V9bXZF)svzHPoQpGjEqER zd~7+p%?Jn4nyy~~Kz&&ADCO`W{B2OxTQ54Hj}e!T6!nfe@aH0`8Jv!IIRW4{rUJgV z|LF{1@8FaDla$?!%iqlU6lxtI%AtDx+UsBb07_%^Q@_LLNj5UoFsEF&E-s6sJX%RY z4Gq5rfA5F{ljEzUR)I9Bklse)tm@HHEJHXpExD4rr3zW@3(KC3!49hvpyqfEz`uyA z8k=dt`^jpTuo1lmebDIRbqTcmwAuto-Processing Settings +
+ + Auto-Processing Settings + + +" + +puts -nonewline " + + + + + + +" + +setting_toggle "Suspend automatic processing whilst recording?" \ + "noautorec" $noautorec +setting_toggle "Suspend automatic processing if will record soon?" \ + "noautorecimm" $noautorecimm + +setting_number autorecperiod "...how many minutes is soon?" $autorecperiod + +puts -nonewline " + + + + + + +" + +puts " +
Auto-processing log level + + + +
+
Suspend automatic processing during: +
+ Use Shift and Control to select multiple entries. +
+ 		+ + + +
+
+" + diff --git a/webif/html/settings/modules/general/init.hook b/webif/html/settings/modules/general/init.hook index f501ad5..104f546 100644 --- a/webif/html/settings/modules/general/init.hook +++ b/webif/html/settings/modules/general/init.hook @@ -7,7 +7,6 @@ set notwitfeed [$settings notwitfeed] set nounwatchedcount [$settings nounwatchedcount] set hidevisualota [$settings hidevisualota] set chanchangenc [$settings chanchangenc] -set autolog [$settings autolog] set audiomp3 [$settings audiomp3] handle_str_update hostname $hostname Hostname @@ -19,6 +18,5 @@ handle_int_update nounwatchedcount $nounwatchedcount "Disable unwatched count" handle_int_update hidevisualota $hidevisualota "Hide OTA from visual view" handle_int_update chanchangenc $chanchangenc \ "Disable channel change confirmation" -handle_int_update autolog $autolog "Auto-processing log level" handle_int_update audiomp3 $audiomp3 "MP3 type" diff --git a/webif/html/settings/modules/general/settings.hook b/webif/html/settings/modules/general/settings.hook index 44749ea..703f7d6 100755 --- a/webif/html/settings/modules/general/settings.hook +++ b/webif/html/settings/modules/general/settings.hook @@ -38,33 +38,6 @@ if {[system pkginst ir]} { "chanchangenc" $chanchangenc 0 } -puts -nonewline " - -
- Auto-processing log level - - - - -
- -
- -" - puts -nonewline "
diff --git a/webif/html/settings/settings.jim b/webif/html/settings/settings.jim index 13262d9..402425d 100755 --- a/webif/html/settings/settings.jim +++ b/webif/html/settings/settings.jim @@ -8,6 +8,8 @@ cgi_input httpheader +set modules {general auto tvdb web epg network advanced} + set settings [settings new] if {![dict exists $env SCRIPT_NAME]} { set env(SCRIPT_NAME) "" } @@ -44,7 +46,7 @@ proc handle_str_update {var old {text "Value"} {class alnum} {trim 1}} { # Settings Modules set moddir /mod/webif/html/settings/modules -foreach mod {general tvdb web epg network advanced} { +foreach mod $modules { if {[file exists "$moddir/$mod/.disabled"]} continue if {[catch {source "$moddir/$mod/init.hook"} msg]} { puts "ERROR: $msg" @@ -84,10 +86,29 @@ proc setting_toggle {name attr checked {invert 0} {val 0}} { " } +proc setting_number {name descr val} { + puts -nonewline " + + + $descr + + + + + +
+ +
+ + " +} + ###################################################################### # Settings Modules -foreach mod {general tvdb web epg network advanced} { +foreach mod $modules { if {[file exists "$moddir/$mod/.disabled"]} continue if {[catch {source "$moddir/$mod/settings.hook"} msg]} { puts "ERROR: $msg" @@ -97,18 +118,17 @@ foreach mod {general tvdb web epg network advanced} { ###################################################################### # Plugins -set hook settings -foreach plugin [lsort [glob -nocomplain /mod/webif/plugin/*]] { - if {[file isfile "$plugin/$hook.hook"]} { - puts "

Settings for [file tail $plugin] package

" - puts "
" - if {[catch {source "$plugin/$hook.hook"} msg]} { - puts "ERROR: $msg" - } - puts "
" - } +proc plugin_callback {plugin hook} { + puts "

Settings for [file tail $plugin] package

" + puts "
" + if {[catch {source "$plugin/$hook"} msg]} { + puts "ERROR: $msg" + } + puts "
" } +eval_plugins settings 0 plugin_callback + puts "" footer diff --git a/webif/lib/bin/auto b/webif/lib/bin/auto index d3eabcc..f98205b 100755 --- a/webif/lib/bin/auto +++ b/webif/lib/bin/auto @@ -2,7 +2,7 @@ source /mod/webif/lib/setup require lock system.class ts.class pretty_size browse.class \ - safe_delete settings.class plugin + safe_delete settings.class plugin queue.class rsv.class set settings [settings] set loglevel [$settings autolog] @@ -10,6 +10,14 @@ set audiomp3 [$settings audiomp3] set modules {decrypt dedup shrink mpg mp3 expire} +set queue_actions { + decrypt do_decrypt + strip do_shrink + shrink do_shrink + mpg do_mpg + mp3 do_mp3 +} + set root [system mediaroot] set logfile "/mod/tmp/auto.log" @@ -17,6 +25,7 @@ set logfile "/mod/tmp/auto.log" set logfd "unset" set logprefix "" set prelocked 0 +set earlyexit 0 while {[llength $argv]} { switch -- [lindex $argv 0] { -d { @@ -32,6 +41,9 @@ while {[llength $argv]} { set logprefix [lindex $argv 0] } } + -test { + set earlyexit 1 + } default { # Unknown option, pass to rest of script. break @@ -40,11 +52,16 @@ while {[llength $argv]} { set argv [lrange $argv 1 end] } +######################################################################### + +if {$logfd ne "unset"} { + puts $logfd "Acquiring lock..." +} if {!$prelocked && ![acquire_lock webif_auto 10 1]} { if {$loglevel > 1} { system plog auto "Could not acquire lock." } - puts "Could acquire exclusive lock, terminating." + puts "Could not acquire exclusive lock, terminating." exit } @@ -64,6 +81,50 @@ proc log {msg {level 1}} { flush $::logfd } +proc oktorun {} { + global settings + set now [clock seconds] + + # Ongoing scheduled recording + if {[$settings noautorec]} { + # Use redring helper files if available. + set recs [glob -nocomplain /tmp/.rec*] + set events [rsv list tbl_reservation \ + " where ersvtype = 3 + and nsttime - ulPreOffset <= $now + and nsttime + nduration + ulPostOffset >= $now "] + if {[llength $recs] || [llength $events]} { + log "Aborted, recording in progress." 2 + exit + } + } + + # Imminent recording + if {[$settings noautorecimm]} { + set autorecperiod $([$settings autorecperiod] * 60) + set events [rsv list tbl_reservation \ + " where ersvtype = 3 + and nsttime - $now < $autorecperiod + and nsttime > $now "] + if {[llength $events]} { + set event [lindex $events 0] + log [concat \ + "Aborted, will record '[$event name]' " \ + "on [$event channel_name] at " \ + "[clock format [$event get nsttime] -format {%H:%M}]" \ + ] 2 + exit + } + } + + # Non-running hours + set hour $([clock format [clock seconds] -format %H] + 0) + if {$hour in [$settings noautohours]} { + log "Aborted, not running during hour $hour" 2 + exit + } +} + proc inuse {ts} { set retries 5 while {$retries > 0 && [$ts inuse]} { @@ -114,6 +175,10 @@ proc register {type fn {priority 50}} { } } +proc register_queue {action function} { + set ::queue_actions($action) $function +} + proc runplugin {name {ts 0}} { set var "hook_$name" global $var @@ -130,6 +195,14 @@ proc runplugin {name {ts 0}} { } } +# Check if it's ok to run now. +oktorun + +if {$earlyexit} { + puts "Early exit." + exit +} + eval_plugins auto 1 set scanstart [clock milliseconds] @@ -253,6 +326,7 @@ proc do_shrink {ts} { $ts set_shrunk return } + oktorun set size [$ts size] dsc $size system startop shrink [$ts get file] @@ -360,6 +434,7 @@ proc do_decrypt {ts} { } # Perform the decryption by requesting the file from the DLNA server. + oktorun set size [$ts size] dsc $size runplugin predecrypt $ts @@ -397,8 +472,10 @@ proc do_decrypt {ts} { if {$anencd != "0"} { log " $file - File did not decrypt properly." 0 - system notify "$file - auto-decrypt failed." file tdelete "$tmp/$bfile" + if {[clock seconds] - [$ts get end] > 3 * 3600} { + system notify "$file - auto-decrypt failed." + } system endop decrypt return } @@ -462,6 +539,7 @@ proc do_mpg {ts} { log " $file - In use." return } + oktorun system startop mpg [$ts get file] runplugin prempg $ts dsc [$ts size] @@ -515,6 +593,7 @@ proc do_mp3 {ts} { log " $file - In use." return } + oktorun system startop mp3 [$ts get file] runplugin premp3 $ts dsc [$ts size] @@ -733,6 +812,7 @@ proc xscan {dir attr {force 0} {recurse 1} {seen {}}} {{indent 0} {forceflag ""} set forceflag "$dir/.auto${attr}r" } + oktorun dsc if {$force} { @@ -799,6 +879,33 @@ log "Root device: $rootdev" 2 if {[lindex $argv 0] eq "-singledir"} { scansingle [lrange $argv 1 end] +} elseif {[lindex $argv 0] eq "-queue"} { + log "Processing queue..." 2 + while {[llength [set q [queue pop]]]} { + oktorun + + if {[catch {set ts [ts fetch [$q get file]]}]} { + $q update FAILED "Could not open recording." 1 + continue + } + if {$ts == 0} { + $q update FAILED "Could not open recording." 1 + continue + } + set act [$q get action] + if {![dict exists $::queue_actions $act]} { + log "Unknown queue action, $act" + $q update FAILED "Unknown queue action, $act" 1 + continue + } + set func $::queue_actions($act) + $q update RUNNING "Started at [clock format [clock seconds]]" + if {[catch {$func $ts} msg]} { + $q update FAILED $msg 1 + continue + } + $q update COMPLETE "Completed at [clock format [clock seconds]]" + } } elseif {[llength $argv] > 0} { set loglevel 2 foreach arg $argv { diff --git a/webif/lib/bin/update_queue b/webif/lib/bin/update_queue new file mode 100755 index 0000000..14acb8d --- /dev/null +++ b/webif/lib/bin/update_queue @@ -0,0 +1,7 @@ +#!/mod/bin/jimsh + +source /mod/webif/lib/setup +require queue.class + +queue boot + diff --git a/webif/lib/plugin b/webif/lib/plugin index 117a47b..bf7f96c 100644 --- a/webif/lib/plugin +++ b/webif/lib/plugin @@ -1,8 +1,12 @@ -proc eval_plugins {hook {verbose 0}} { +proc eval_plugins {hook {verbose 0} {callback ""}} { foreach plugin [lsort [glob -nocomplain /mod/webif/plugin/*]] { if {[file exists "$plugin/.disabled"]} continue if {[file isfile "$plugin/$hook.hook"]} { + if {$callback ne ""} { + $callback $plugin $hook.hook + continue + } if {[catch \ {uplevel source "$plugin/$hook.hook"} msg]} { if {$verbose} { diff --git a/webif/lib/queue.class b/webif/lib/queue.class new file mode 100644 index 0000000..21e7cb7 --- /dev/null +++ b/webif/lib/queue.class @@ -0,0 +1,169 @@ + +if {![exists -proc class]} { package require oo } +if {![exists -proc sqlite3.open]} { package require sqlite3 } + +class queue { + id -1 + dat 0 + file "" + action "" + log "" + status "" + retry 0 +} + +proc {queue dbhandle} {args} { + if {"-close" in $args} { + if {[info exists ::queue::db]} { + catch {$::queue::db close} + unset ::queue::db + return 1 + } + return 0 + } + + if {[info exists ::queue::db]} { + return $::queue::db + } + + if {![file exists /mod/etc/queue.db]} { + set ::queue::db [sqlite3.open /mod/etc/queue.db] + $::queue::db query { + create table queue( + id integer primary key autoincrement, + dat integer, + file text, + action text, + status text default 'PENDING', + log text default '', + retry integer default 0 + ); + } + $::queue::db query { + create unique index file on queue(file, action); + } + } else { + set ::queue::db [sqlite3.open /mod/etc/queue.db] + } + + return $::queue::db +} + +queue method update {_status {_log ""} {_retry 0}} { + set db [queue dbhandle] + $db query { + update queue + set status = '%s', log = '%s', retry = retry + %s + where id = %s + } $_status $_log $_retry $id +} + +proc {queue boot} {} { + set db [queue dbhandle] + $db query { + update queue + set status = 'INTERRUPTED', + log = 'System was shut down. Job will be retried automatically.', + retry = retry + 1 + where status in ('RUNNING', 'INTERRUPTED') + } + $db query { + delete from queue + where status in ('COMPLETE', 'FAILED') + and dat < %s + } [expr [clock seconds] - 86400 * 3] +} + +proc {queue insert} {ts action} { + set db [queue dbhandle] + + $db query { + insert or ignore into queue(dat, file, action) + values(%s, '%s', '%s') + } [clock seconds] [file normalize [$ts get file]] $action + + return [$db lastid] +} + +proc {queue delete} {ts {action "*"}} { + set db [queue dbhandle] + + set q " + delete from queue + where file = '%s' + and status in ('PENDING', 'INTERRUPTED', 'COMPLETE', 'FAILED') + " + if {$action ne "*"} { + append q " and action = '%s'" + } + + $db query $q [file normalize [$ts get file]] $action +} + +proc {queue delete_by_id} {id} { + set db [queue dbhandle] + + set q " + delete from queue + where id = '%s' + and status in ('PENDING', 'INTERRUPTED', 'COMPLETE', 'FAILED') + " + + $db query $q $id +} + +proc {queue status} {ts} { + set db [queue dbhandle] + + set ret [$db query { + select group_concat(action) + from queue + where file = '%s' + and status not in ('COMPLETE', 'FAILED') + } [file normalize [$ts get file]]] + + set q "" + if {[llength $ret] == 1} { + lassign [lindex $ret 0] x q + } + return $q +} + +proc {queue all} {} { + set db [queue dbhandle] + + set ret {} + foreach row [$db query {select * from queue order by id}] { + lappend ret [queue new $row] + } + return $ret +} + +proc {queue pending} {} { + set db [queue dbhandle] + + set ret {} + foreach row [$db query { + select * from queue + where status in ('PENDING', 'INTERRUPTED') + order by id + }] { + lappend ret [queue new $row] + } + return $ret +} + +proc {queue pop} {} { + set db [queue dbhandle] + + foreach row [$db query { + select * from queue + where status in ('PENDING', 'INTERRUPTED') + order by id + limit 1 + }] { + return [queue new $row] + } + return {} +} + diff --git a/webif/lib/rsv.class b/webif/lib/rsv.class index f054b80..3f35895 100755 --- a/webif/lib/rsv.class +++ b/webif/lib/rsv.class @@ -199,6 +199,15 @@ rsv method end {} { return $([$self start] + $nduration) } +rsv method showing {} { + set now [clock seconds] + if {$nsttime - $ulPreOffset <= $now && + $nsttime + $nduration + $ulPostOffset >= $now} { + return 1 + } + return 0 +} + rsv method icon {} { set rsvicon "" switch $ersvtype { diff --git a/webif/lib/settings.class b/webif/lib/settings.class index ddaa6b6..edfcaac 100644 --- a/webif/lib/settings.class +++ b/webif/lib/settings.class @@ -24,6 +24,7 @@ class settings { smtp_server "" pkgdev 0 notoolbar 0 + noautorec 0 tvdb 0 tvdb_debug 0 nomobile 0 @@ -35,6 +36,10 @@ class settings { epgscroll 0 genrededup 0 autolog 0 + noautorec 0 + noautorecimm 0 + autorecperiod 10 + noautohours "" changechangenc 0 audiomp3 0 logsize 1048576 @@ -225,6 +230,23 @@ settings method autolog {{level -1}} { return [$self _nval_setting autolog $level] } +settings method noautorec {{val -1}} { + return [$self _nval_setting noautorec $val] +} + +settings method noautorecimm {{val -1}} { + return [$self _nval_setting noautorecimm $val] +} + +settings method autorecperiod {{val -1}} { + return [$self _nval_setting autorecperiod $val] +} + +settings method noautohours {{val -1}} { + set val [$self _tval_setting noautohours $val] + return $val +} + settings method audiomp3 {{val -1}} { return [$self _nval_setting audiomp3 $val] }