From 2460cda29847e9dbbed38509bb10f843e2a25c6f Mon Sep 17 00:00:00 2001
From: hummypkg <af123@hummy.tv>
Date: Thu, 25 Jun 2015 22:19:54 +0000
Subject: [PATCH] fixes

---
 CONTROL/control                |  2 +-
 webif/plugin/sweeper/auto.hook |  4 ++--
 webif/plugin/sweeper/schema.js | 19 +------------------
 3 files changed, 4 insertions(+), 21 deletions(-)

diff --git a/CONTROL/control b/CONTROL/control
index 2c7c55b..4048596 100644
--- a/CONTROL/control
+++ b/CONTROL/control
@@ -1,7 +1,7 @@
 Package: sweeper
 Priority: optional
 Section: misc
-Version: 2.0.8-5
+Version: 2.0.8-6
 Architecture: mipsel
 Maintainer: af123@hummypkg.org.uk
 Depends: webif(>=1.2.3-2)
diff --git a/webif/plugin/sweeper/auto.hook b/webif/plugin/sweeper/auto.hook
index 62b9fcd..c575456 100644
--- a/webif/plugin/sweeper/auto.hook
+++ b/webif/plugin/sweeper/auto.hook
@@ -266,7 +266,7 @@ proc ::sweeper::find {root target orig} {
 	foreach e [readdir -nocomplain $root] {
 		regsub -all -- {//} "$root/$e" "/" entry
 		if {![file isdirectory $entry]} continue
-		if {[string match {\[*} $e]} continue
+		if {[string match {\[*} [string trimleft $e]]} continue
 		if {$e eq $dustbin} continue
 		if {$entry eq $orig} continue
 
@@ -831,7 +831,7 @@ proc ::sweeper::apply {dir cf} {
 	    foreach e [readdir -nocomplain $dir] {
 		set entry "$dir/$e"
 		if {![file isdirectory $entry]} continue
-		if {[string match {\[*} $e]} continue
+		if {[string match {\[*} [string trimleft $e]]} continue
 		if {$e eq $dustbin} continue
 
 		log "" 2
diff --git a/webif/plugin/sweeper/schema.js b/webif/plugin/sweeper/schema.js
index 8e34bea..7ffd5aa 100644
--- a/webif/plugin/sweeper/schema.js
+++ b/webif/plugin/sweeper/schema.js
@@ -313,24 +313,7 @@ var macros = {
 		  {
 		    "raw": "title New:* action {settitle {%orig%regsub,New:\\s*,,}}",
 		    "name": "Remove New: prefix.",
-		    "type": "file",
-		    "enabled": "1",
-		    "criteria": [
-		      {
-			"negate": 0,
-			"cmd": "title",
-			"arg": "New:*"
-		      }
-		    ],
-		    "action": {
-			"cmd": "settitle",
-			"arg": "%orig%regsub,New:\\s*,,"
-		    }
-		  },
-		  {
-		    "raw": "title New:* action {settitle {%orig%regsub,New:\\s*,,}}",
-		    "name": "Unnamed rule",
-		    "type": "folder",
+		    "type": "global",
 		    "enabled": "1",
 		    "criteria": [
 		      {