From 885db239e7dbba3007e8f2827671b9a6095eadaf Mon Sep 17 00:00:00 2001
From: hummypkg <af123@hummy.tv>
Date: Tue, 3 May 2016 20:59:16 +0000
Subject: [PATCH] 2.1.0 with recurse rules

---
 CONTROL/control                              |   4 +--
 webif/plugin/sweeper/auto.hook               |  27 ++++++++++++++++---
 webif/plugin/sweeper/edit.jim                |  12 ++++-----
 webif/plugin/sweeper/harness.jim             |  16 +++++++++--
 webif/plugin/sweeper/img/delete.png          | Bin 0 -> 431 bytes
 webif/plugin/sweeper/img/down.png            | Bin 0 -> 300 bytes
 webif/plugin/sweeper/img/edit.png            | Bin 0 -> 814 bytes
 webif/plugin/sweeper/img/page_white_copy.png | Bin 0 -> 309 bytes
 webif/plugin/sweeper/img/up.png              | Bin 0 -> 300 bytes
 webif/plugin/sweeper/th/expand               |   4 +--
 10 files changed, 47 insertions(+), 16 deletions(-)
 create mode 100644 webif/plugin/sweeper/img/delete.png
 create mode 100644 webif/plugin/sweeper/img/down.png
 create mode 100644 webif/plugin/sweeper/img/edit.png
 create mode 100644 webif/plugin/sweeper/img/page_white_copy.png
 create mode 100644 webif/plugin/sweeper/img/up.png

diff --git a/CONTROL/control b/CONTROL/control
index b726daa..5a1b90d 100644
--- a/CONTROL/control
+++ b/CONTROL/control
@@ -1,9 +1,9 @@
 Package: sweeper
 Priority: optional
 Section: misc
-Version: 2.0.17
+Version: 2.1.0
 Architecture: mipsel
 Maintainer: af123@hummypkg.org.uk
-Depends: webif(>=1.2.5-10)
+Depends: webif(>=1.3.0-1)
 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 455cfd0..c5b52d7 100644
--- a/webif/plugin/sweeper/auto.hook
+++ b/webif/plugin/sweeper/auto.hook
@@ -985,7 +985,7 @@ proc ::sweeper::apply_folder_rules {dir rules} {
 	}
 }
 
-proc ::sweeper::apply_rules {dir rules {depth 0}} {
+proc ::sweeper::apply_rules {dir rules {depth 0} {seen {}}} {
 
 	log "" 2
 	log "--- SWEEP($depth) STARTING FOR $dir ---" 2
@@ -996,7 +996,14 @@ proc ::sweeper::apply_rules {dir rules {depth 0}} {
 		return
 	}
 
-	set moredepth 0
+	file stat $dir st
+	set key "$st(dev):$st(ino)"
+	if {$key in $seen} {
+		log "Already seen $dir ($key)" 2
+		return
+	}
+	lappend seen $key
+
 	set dirs {}
 	foreach e [readdir -nocomplain $dir] {
 		set entry "$dir/$e"
@@ -1031,16 +1038,28 @@ proc ::sweeper::apply_rules {dir rules {depth 0}} {
 			if {[llength $rule] < 3} continue
 			set rule [lassign $rule level]
 			if {$level < $depth} continue
-			if {$level > $depth} { incr moredepth }
 			if {[::sweeper::runrule $ts $rule 0]} break
 		}
 	}
 
+	set moredepth 0
+	foreach rule $rules {
+		set level [lindex $rule 0]
+		if {$level > $depth} {
+			incr moredepth
+			break
+		}
+	}
+
 	# No rules require greater recursion
 	if {!$moredepth} return
 
 	foreach dir $dirs {
-		::sweeper::apply_rules $dir $rules $($depth + 1)
+		::sweeper::apply_rules $dir $rules $($depth + 1) $seen
+
+		file stat $dir st
+		set key "$st(dev):$st(ino)"
+		lappend seen $key
 	}
 }
 
diff --git a/webif/plugin/sweeper/edit.jim b/webif/plugin/sweeper/edit.jim
index f8c9096..977e48f 100755
--- a/webif/plugin/sweeper/edit.jim
+++ b/webif/plugin/sweeper/edit.jim
@@ -66,7 +66,7 @@ Add pre-defined ruleset:
 			</span>
 			<span class=comment>Unnamed rule</span>
 			<a class=editcomment href=#>
-				<img src=/img/context/edit.png>
+				<img src=img/edit.png>
 			</a>
 		</span>
 		<span class=legendright>
@@ -78,19 +78,19 @@ Add pre-defined ruleset:
 				    title="Enable/Disable Rule">
 			</a>
 			<a class=delrule href=#>
-				<img src=/img/context/delete.png
+				<img src=img/delete.png
 				    title="Delete Rule">
 			</a>
 			<a class=cprule href=#>
-				<img src=/img/context/page_white_copy.png
+				<img src=img/page_white_copy.png
 				    title="Duplicate Rule">
 			</a>
 			<a class=uprule href=#>
-				<img src=/img/nav/up.png
+				<img src=img/up.png
 				    title="Move Rule Up">
 			</a>
 			<a class=downrule href=#>
-				<img src=/img/nav/down.png
+				<img src=img/down.png
 				    title="Move Rule Down">
 			</a>
 		</span>
@@ -100,7 +100,7 @@ Add pre-defined ruleset:
 	</div>
 	<div class="recursecomment hidden">
 		For each recording and recordings within folders
-		(<span class=depth></span> deep<a class=editdepth href=#><img src=/img/context/edit.png></a>):
+		(<span class=depth></span> deep<a class=editdepth href=#><img src=img/edit.png></a>):
 	</div>
 	<a href=# class=addcriterion>
 		<img src=img/plus.png
diff --git a/webif/plugin/sweeper/harness.jim b/webif/plugin/sweeper/harness.jim
index 72bba39..d097e1a 100755
--- a/webif/plugin/sweeper/harness.jim
+++ b/webif/plugin/sweeper/harness.jim
@@ -25,16 +25,28 @@ proc endclock {size} {
 
 proc register {args} {}
 
-proc scan_run {dir flag callback} {
+proc scan_run {dir flag callback {seen {}}} {
 	global dustbin
 
 	if {[string match {\[*} [string trimleft [file tail $dir]]]} return
 
+	file stat $dir st
+	set key "$st(dev):$st(ino)"
+	if {$key in $seen} {
+		log "Already seen $dir ($key)" 2
+		return
+	}
+	lappend seen $key
+
 	if {[file exists "$dir/.$flag"]} { $callback $dir }
 
 	foreach entry [readdir -nocomplain $dir] {
 		if {[file isdirectory "$dir/$entry"]} {
-			scan_run "$dir/$entry" $flag $callback
+			scan_run "$dir/$entry" $flag $callback $seen
+
+			file stat "$dir/$entry" st
+			set key "$st(dev):$st(ino)"
+			lappend seen $key
 		}
 	}
 }
diff --git a/webif/plugin/sweeper/img/delete.png b/webif/plugin/sweeper/img/delete.png
new file mode 100644
index 0000000000000000000000000000000000000000..e40a61a0ea477bed9bc41b82eb690612198f8813
GIT binary patch
literal 431
zcmeAS@N?(olHy`uVBq!ia0vp^{2<K11|+SoP4xm&jKx9jP7LeL$-D$|SkfJR9T^xl
z_H+M9WCijSl0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP(q@_
zHKHUqKdq!Zu_%=xATcwqM9<GPM4`-B&(NS~lj<a(U7VgSjv*HQYbV=gA1V+y_IFa#
z?Dz%U9FH#S>fi&SPz~8F&Vk~xHPSBL-i}kmSOjZsDs=?gA5`9dz+Oc~F@#6P{lw?p
z)$jU_Bz>=&7hM|~XQdT3`_z-wUba(3ZaprqzgDxAyXWM0H?^wEt@qlq7nXNjJZcp=
z&qAhONkGqRn%%T?Uc3KSWaD$f`FghgZ%glq*}3rC2k(zLcTeW;o%#3QEji7Ja+=Y<
z1+DJ?;n<kxrjR^)X`-~i=@(9kX1;<(2Cfa<y}1@WrV8b3%Qy=5Zrzr+@3+<LzGHTh
z5*wx6o;ROe6S(2I&oZv=gJmK;=dRDRW-iv7ywTTidu~aivAVpRsA!|{{ZGZQjF(k+
VOgo%l-31Id22WQ%mvv4FO#mQ)p;rI^

literal 0
HcmV?d00001

diff --git a/webif/plugin/sweeper/img/down.png b/webif/plugin/sweeper/img/down.png
new file mode 100644
index 0000000000000000000000000000000000000000..7ebe4ce5b2e6e48c491c33ed559c887a671eea1d
GIT binary patch
literal 300
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbL!cYsfbD=PyR2d|)(bF_J6g?(y=
zYyLFPk~uz=ivt?gMt5wA@7^+T!<ng@&Q0HZZr0ZGv$tKCv;E?{9Tykuy1ZoX)%8bj
zZ90B?>&ZLYPTd8X*B1YZ9Y`^j1o;IsI6S+N2I3@nySp%Su*!M>Ih+L^k;M!Q+`=Ht
z$S`Y;1W=H@#M9T6{R)qWpn<UDn{+FnP?V>OV@SoV<OBsS4+n-x4HEX|(%PFEIwmM^
z8*ge@!63h?!J>`9-rk8JWuL`-h5&}Ni7d+(Y?#2n&CM+w!`t4_z#t^Aa!9-7OnO4X
mlShsZnXhi}UQo@x+?`SDIqMu#L4|mrEexKnelF{r5}E+?zhWx@

literal 0
HcmV?d00001

diff --git a/webif/plugin/sweeper/img/edit.png b/webif/plugin/sweeper/img/edit.png
new file mode 100644
index 0000000000000000000000000000000000000000..e7e1851ce5e580a386d9e38cba1af559f84264d3
GIT binary patch
literal 814
zcmV+}1JV46P)<h;3K|Lk000e1NJLTq000mG000gM1^@s6CNG?d00004XF*Lt006O%
z3;baP0000ObVXQnQ*UN;cVTj608n9RZgehAMN}YmGcGeWspsM)0008PNkl<ZI8Sxb
z?N5?X7zS|E%FVSHuC})7Kj@QgeW|UjZ;i^9Eo&AlrF5(1vZ>^1rYJ?J$S{X!%NaOR
z$*CooCYmW0lnU}92%#|)c?l6TK)8B*)LL2hc7Hj~&hNg?b50C}DF2W+7BLCbNZi3y
zUhKXf#L~{S_03xGtWd&UA7#(3c*=pqc*>4AiZAWZ?g;r^Rh1uWX{tEl?U%yy{<D%d
zXvi#61yD7<{Hsgl9u!Kg5WJg*Sm8p0!hKvg;@L(5A0FjW6^{#Gej<XUtrA@_3A*$S
ztVTgrI0D#xA-vUjG3yTEjn;?SVK+p5E_%Jp8Ap+pWK%m!vZ3KzN3WERFM|?jh6Hf9
zZHN#^hyc7nV8FNp`}ZIT_7F(*>pAc{?NrJ@%e{oY=d4#vrB@*q=E2x;8Lpu-m{yj+
z<*{Np3<SbaD9lUH*aBn<qce!SMkBI?Ix2aLj@rybY0bsfcHS|3t51esegaMcF)7(_
zxGeC6qR=~n=r#D!rt+Xp;X(QX4N{B7)`1OVZ#O?xtl%VLwk`?&emaSmRcy>TEtn4g
zQ=TYBtt;rz1;F6`1#BSun@dxkb>%0K$kGO4B93F7{|eg@FtZ3~ol#ul>2RJs@jJn0
zlGHn5`pv@o=q^geoa88i>H@fR<rp_l!r+R)LZr~U)`7H=@vXq&QZ4;-g%V{vF61>A
zus9}wd9)fbSt~x8-Q;xjLKGS0+CTrnW`ZjXGxXecJ2*XN6h9TARdO3I9-alin1Od=
zT1*g|KiMO=RHjD?OT9HgPK%vhNxVF{H3X4r0e3sqU^NVb`%($HX_4GKVv8W1ZNSNV
z&A)+L%{JtTt;lJ#B1>onlWzjEN)KkG7MT@VFgONc`s9Cs?Ki};v@Fpy*-U|vmQgW9
sV{j*F=ZeQ^#NE?QvD7qT`dY{Q1d#d@seb#jPyhe`07*qoM6N<$f)GG)O8@`>

literal 0
HcmV?d00001

diff --git a/webif/plugin/sweeper/img/page_white_copy.png b/webif/plugin/sweeper/img/page_white_copy.png
new file mode 100644
index 0000000000000000000000000000000000000000..a9f31a278e17993d8d4e13beac2f9d5f7b42d08f
GIT binary patch
literal 309
zcmV-50m}Y~P)<h;3K|Lk000e1NJLTq000mG000mO1ONa4wfZ;e00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUy$4Nv%R4C7N
zkxg#GFcb#A<Q_%21Hw5EM?&g?t8|A@3u~?cLP(?}@sBiJIM^nrnvECZ=aHYZ&`KuJ
zs758y%Gp3<<a0AuBoi3uxN#=Xv)!n96GnROTnGd_YE`RJRS2Gu2X{_<aYSpixkobb
z-bl|5$Gm3}qO#|`CkX+|H?KVbnL=><kbAD2OTpuD9LPN#xA_FmF`X<uzmw3UZ*H~D
z&sl~jAXO8!+C0tSo<jQ6D)&VG5i+*Z@^!UMv3Mh+r9S=u_uEaN=S{!n00000NkvXX
Hu0mjfd8B?p

literal 0
HcmV?d00001

diff --git a/webif/plugin/sweeper/img/up.png b/webif/plugin/sweeper/img/up.png
new file mode 100644
index 0000000000000000000000000000000000000000..880e71e714837099a215a55bb968a21db371e309
GIT binary patch
literal 300
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbL!Uw}`DE0C7awbgWr(sGX0bx$w}
z&bLqP@GPC@U9l)*(#~01&(Gd=Vb1o8^LAXEzw^?9U6&W{xw2&M)n)sxt~z*q^`RT<
zj@(>-^wyCpkB?q`0y24p-YX!*SQ6wH%;50sMjD8d<n8Xl(7`I}0pxHNctjR6FmMZl
zFeAgPITAoY_7YEDSN1DBB7!D@llu+}0foXnT^vIyZY3uiV3fG{W0KIM6*Yx+X`Ui>
z{Pxn5I+pC1pr9}9<PsF)5W%3qAUu(UNzhKtOih4!nOo0nevO8d6&$-7G~{PBFo@4$
lP`75+=HA4>Vj#fIz;~AQTHV@rML;VUJYD@<);T3K0RUQ#VRirj

literal 0
HcmV?d00001

diff --git a/webif/plugin/sweeper/th/expand b/webif/plugin/sweeper/th/expand
index b7be34a..b056623 100755
--- a/webif/plugin/sweeper/th/expand
+++ b/webif/plugin/sweeper/th/expand
@@ -19,7 +19,7 @@ foreach {test expected} {
 	{/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}
 	{%epname} {6/10. The Fame Game}
-	{%epdescr} {s?e6/10}
+	{%epdescr} {s?e06/10}
 	{%synopsis%regsub,Game:\s*,,} {6/10. The Fame Crime drama. While Sasha is occupied with an intensive training course, the boys' investigations take them to a lookalike agency. [HD] [AD,S]}
 	{Z Nation_ 20150825_2200.ts%regsub,_ \s*, - ,} {Z Nation - 20150825_2200.ts}
 	{%synopsis%regsub:^\s*([^ ]+)\s+([^ ]+).*:\1,\2:} {6/10.,The}
@@ -30,7 +30,7 @@ foreach {test expected} {
 		puts [format "%-70s => OK" $test]
 	} else {
 		puts [format "%-70s => FAIL" $test]
-		puts "       $ret"
+		puts "       ($ret)/($expected)"
 	}
 
 }