From 2cb9e076a6fef7a6cb6279abea6eaaf955f9c0d1 Mon Sep 17 00:00:00 2001
From: hummypkg <af123@hummy.tv>
Date: Sat, 27 May 2017 09:26:16 +0000
Subject: [PATCH] add bfolder token

---
 CONTROL/control                |  4 ++--
 webif/plugin/sweeper/auto.hook |  1 +
 webif/plugin/sweeper/schema.js | 12 ++++++------
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/CONTROL/control b/CONTROL/control
index cc924f0..4be9aed 100644
--- a/CONTROL/control
+++ b/CONTROL/control
@@ -1,9 +1,9 @@
 Package: sweeper
 Priority: optional
 Section: misc
-Version: 2.1.5-5
+Version: 2.1.5-6
 Architecture: mipsel
 Maintainer: af123@hummypkg.org.uk
 Depends: webif(>=1.4.0)
-Description: Sweeper is a package for managing recordings in a variety of ways using custom rules [See forum for details]
+Description: Sweeper is a package for managing recordings in a variety of ways using custom rules [Add %bfolder token]
 Tags: http://hummy.tv/forum/threads/5138/
diff --git a/webif/plugin/sweeper/auto.hook b/webif/plugin/sweeper/auto.hook
index 1143426..5a6dd30 100644
--- a/webif/plugin/sweeper/auto.hook
+++ b/webif/plugin/sweeper/auto.hook
@@ -230,6 +230,7 @@ proc ::sweeper::expand {ts str {orig ""}} {
 		"%filename" [$ts get file] \
 		"%basename" [$ts bfile] \
 		"%folder" [$ts dir] \
+		"%bfolder" [string map [list "$::auto::root/" ""] [$ts dir]] \
 		\
 		%epname [$ts episode_name] \
 		%series [$ts get seriesnum] \
diff --git a/webif/plugin/sweeper/schema.js b/webif/plugin/sweeper/schema.js
index 127fef8..87b1904 100644
--- a/webif/plugin/sweeper/schema.js
+++ b/webif/plugin/sweeper/schema.js
@@ -134,9 +134,9 @@ var schema = {
 		select: {
 			Locked: 'Locked',
 			New: 'New',
-			Encrypted: 'Encrypted',
+			Encrypted: 'Protected (Enc)',
 			Guidance: 'Guidance',
-			ODEncrypted: 'Encrypted On-Disk',
+			ODEncrypted: 'Encrypted',
 			Shrunk: 'Shrunk',
 			Deduped: 'De-duplicated',
 			Radio: 'Radio Programme'
@@ -346,9 +346,9 @@ var schema = {
 		select: {
 			lock: 'Locked',
 			new: 'New',
-			protect: 'Encrypted',
+			protect: 'Protected (Enc)',
 			guidance: 'Guidance',
-			encrypted: 'Encrypted On-Disk',
+			encrypted: 'Encrypted',
 			shrunk: 'Shrunk',
 			dedup: 'De-duplicated'
 		},
@@ -361,9 +361,9 @@ var schema = {
 		select: {
 			Locked: 'Locked',
 			New: 'New',
-			Encrypted: 'Encrypted',
+			Encrypted: 'Protected (Enc)',
 			Guidance: 'Guidance',
-			ODEncrypted: 'Encrypted On-Disk',
+			ODEncrypted: 'Encrypted',
 			Shrunk: 'Shrunk',
 			Deduped: 'De-duplicated',
 			Radio: 'Radio Programme'