From 918678b66f4955c4fbb9abd3c7c67a8741410198 Mon Sep 17 00:00:00 2001 From: hummypkg Date: Tue, 10 Jan 2017 19:58:20 +0000 Subject: [PATCH] register sweeper flag. Use -hold on queue isert --- CONTROL/control | 4 ++-- webif/plugin/sweeper/auto.hook | 4 +++- webif/plugin/sweeper/harness.jim | 1 + webif/plugin/sweeper/th/expand | 6 +++--- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/CONTROL/control b/CONTROL/control index 98ddc50..efc6f33 100644 --- a/CONTROL/control +++ b/CONTROL/control @@ -1,9 +1,9 @@ Package: sweeper Priority: optional Section: misc -Version: 2.1.5-1 +Version: 2.1.5-2 Architecture: mipsel Maintainer: af123@hummypkg.org.uk -Depends: webif(>=1.3.5-2) +Depends: webif(>=1.3.5-3) Description: Sweeper is a package for managing recordings in a variety of ways using custom rules [See forum for details] Tags: http://hummy.tv/forum/threads/5138/ diff --git a/webif/plugin/sweeper/auto.hook b/webif/plugin/sweeper/auto.hook index 8d6a5ac..1143426 100644 --- a/webif/plugin/sweeper/auto.hook +++ b/webif/plugin/sweeper/auto.hook @@ -903,10 +903,11 @@ proc ::sweeper::action_queue {ts cmd arg folder} { set opt [lassign $arg arg] log "ARG: ($arg) OPT: ($opt)" 2 if {!$::sweeper::dryrun} { - set q [{queue insert} $ts $arg] + set q [{queue insert} -hold $ts $arg] if {[string trim $opt] ne ""} { $q set args $opt } + $q submit } return 0 } @@ -1210,5 +1211,6 @@ proc ::sweeper::rundir {dir} { if {[file exists $::sweeper::cf]} { ::auto::register sweeper 700 + ::auto::register_flag sweeper sweeper } diff --git a/webif/plugin/sweeper/harness.jim b/webif/plugin/sweeper/harness.jim index 88cd529..a742530 100755 --- a/webif/plugin/sweeper/harness.jim +++ b/webif/plugin/sweeper/harness.jim @@ -10,6 +10,7 @@ proc ::auto::log {msg {level 1}} { } proc ::auto::register {args} {} +proc ::auto::register_flag {args} {} proc ::auto::flagscan {dir flag callback {seen {}}} { variable dustbin diff --git a/webif/plugin/sweeper/th/expand b/webif/plugin/sweeper/th/expand index b056623..e4ee4d6 100755 --- a/webif/plugin/sweeper/th/expand +++ b/webif/plugin/sweeper/th/expand @@ -12,9 +12,9 @@ proc log {msg {level 1}} { foreach {test expected} { {%title} {New Tricks} - {%synopsis%replace:Crime:XXX:} {6/10. The Fame Game: XXX drama. While Sasha is occupied with an intensive training course, the boys' investigations take them to a lookalike agency. [HD] [AD,S]} - {PREAMBLE%synopsis%replace:Crime:XXX:POSTAMBLE} {PREAMBLE6/10. The Fame Game: XXX drama. While Sasha is occupied with an intensive training course, the boys' investigations take them to a lookalike agency. [HD] [AD,S]POSTAMBLE} - {%replace:Crime:XXX:PREAMBLE %synopsis POSTAMBLE} {PREAMBLE 6/10. The Fame Game: XXX drama. While Sasha is occupied with an intensive training course, the boys' investigations take them to a lookalike agency. [HD] [AD,S] POSTAMBLE} + {%synopsis%replace:Crime:ZZZ:} {6/10. The Fame Game: ZZZ drama. While Sasha is occupied with an intensive training course, the boys' investigations take them to a lookalike agency. [HD] [AD,S]} + {PREAMBLE%synopsis%replace:Crime:ZZZ:POSTAMBLE} {PREAMBLE6/10. The Fame Game: ZZZ drama. While Sasha is occupied with an intensive training course, the boys' investigations take them to a lookalike agency. [HD] [AD,S]POSTAMBLE} + {%replace:Crime:ZZZ:PREAMBLE %synopsis POSTAMBLE} {PREAMBLE 6/10. The Fame Game: ZZZ drama. While Sasha is occupied with an intensive training course, the boys' investigations take them to a lookalike agency. [HD] [AD,S] POSTAMBLE} {%asfilename:/mod/video/Test File/bob.ts:} {_mod_video_Test File_bob_ts} {/mod/video/%asfilename:bob/fred:.ts} {/mod/video/bob_fred.ts} {/mod/video/%asfilename:bob/fred:.ts%replace:video:radiator:} {/mod/radiator/bob_fred.ts}