From 4aec6d3679c1025fc83b147697fbf2553dd91b8d Mon Sep 17 00:00:00 2001 From: hummypkg Date: Sat, 17 Dec 2016 23:34:37 +0000 Subject: [PATCH] beta 2.1.4 --- CONTROL/control | 4 +- webif/plugin/sweeper/auto.hook | 20 +++++++++ webif/plugin/sweeper/edit.jim | 2 + webif/plugin/sweeper/harness.jim | 2 +- webif/plugin/sweeper/schema.js | 49 +++++++++++++++++++- webif/plugin/sweeper/script.js | 77 +++++++++++++++++++++++++------- 6 files changed, 132 insertions(+), 22 deletions(-) diff --git a/CONTROL/control b/CONTROL/control index c8491a8..c221ffd 100644 --- a/CONTROL/control +++ b/CONTROL/control @@ -1,9 +1,9 @@ Package: sweeper Priority: optional Section: misc -Version: 2.1.3-1 +Version: 2.1.4 Architecture: mipsel Maintainer: af123@hummypkg.org.uk -Depends: webif(>=1.3.0-1) +Depends: webif(>=1.3.4) 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 165205e..d735379 100644 --- a/webif/plugin/sweeper/auto.hook +++ b/webif/plugin/sweeper/auto.hook @@ -890,6 +890,26 @@ proc ::sweeper::action_unflag {ts cmd arg folder} { return 0 } +proc ::sweeper::action_queue {ts cmd arg folder} { + log "Queued [$ts get file] for $arg" 0 + if {!$::sweeper::dryrun} { + queue insert $ts $arg + } + return 0 +} + +proc ::sweeper::action_dequeue {ts cmd arg folder} { + log "De-queued [$ts get file] for $arg" 0 + if {!$::sweeper::dryrun} { + if {$arg eq "all"} { + queue delete $ts + } else { + queue delete $ts $arg + } + } + return 0 +} + eval_plugins sweeper ###################################################################### diff --git a/webif/plugin/sweeper/edit.jim b/webif/plugin/sweeper/edit.jim index 3fcb7b0..9250762 100755 --- a/webif/plugin/sweeper/edit.jim +++ b/webif/plugin/sweeper/edit.jim @@ -235,6 +235,8 @@ For pattern matching, the following special sequences may appear in the pattern: