From bb2496a8a7ace4d0156781b94a5b839c37c54ec4 Mon Sep 17 00:00:00 2001
From: hummypkg <af123@hpkg.tv>
Date: Wed, 25 Nov 2015 22:28:32 +0000
Subject: [PATCH] update dedup settings

git-svn-id: file:///root/webif/svn/pkg/webif/trunk@2551 2a923420-c742-0410-a762-8d5b09965624
---
 CONTROL/control                               |  2 +-
 .../html/settings/modules/tvdb/settings.hook  | 16 ++++++++++-----
 webif/lib/settings.class                      |  2 +-
 webif/lib/ts.class                            | 20 ++++++++++++-------
 4 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/CONTROL/control b/CONTROL/control
index cbfddb9..f51c0f1 100644
--- a/CONTROL/control
+++ b/CONTROL/control
@@ -1,7 +1,7 @@
 Package: webif
 Priority: optional
 Section: web
-Version: 1.2.5-8
+Version: 1.2.5-9
 Architecture: mipsel
 Maintainer: af123@hummypkg.org.uk
 Depends: webif-channelicons(>=1.1.18),lighttpd(>=1.4.37-2),jim(>=0.76),jim-oo,jim-sqlite3(>=0.76),jim-cgi(>=0.7),jim-binary(>=0.76),service-control(>=2.1),busybox(>=1.20.2-1),lsof(>=4.87),epg(>=1.2.0),hmt(>=2.0.8),ssmtp,anacron,trm(>=1.1),openssl-command,nicesplice,id3v2,file,rsvsync(>=1.0.2),webif-charts(>=1.2-1),stripts(>=1.2.5-3),smartmontools,tmenu(>=1.08),ffmpeg,id3v2,multienv(>=1.6),tcpping(>=1.1),e2fsprogs,wireless-tools(>=29-1),dbupdate,recmon(>=2.0.7)
diff --git a/webif/html/settings/modules/tvdb/settings.hook b/webif/html/settings/modules/tvdb/settings.hook
index 713f81a..4c2023e 100755
--- a/webif/html/settings/modules/tvdb/settings.hook
+++ b/webif/html/settings/modules/tvdb/settings.hook
@@ -19,21 +19,27 @@ puts "
 	<form class=auto id=dedup method=get action=$env(SCRIPT_NAME)>
 		<th class=key>
 			Dedup Episode Prefix<br>
-			<span class=footnote>
-			%s - series number<br>
-			%e - episode number<br>
-			%E - number of episodes
-			</span>
 		</th>
 		<td>
 		<input name=dedup_template value=\"$dedup_template\"
 		    class=\"text ui-widget-content ui-corner-all\"
 		    length=20 maxlength=50>
+		    <br>
 		    <small>
 		    <input id=dedup_submit value=\"change\" type=submit>
 		    </small>
 		    <div id=dedup_output></div>
 		</td>
+		<td>
+		<span class=blood>
+			%s - series number<br>
+			%S - series number (two digits)<br>
+			%e - episode number<br>
+			%E - episode number (two digits)<br>
+			%n - number of episodes<br>
+			%N - number of episodes (two digits)
+		</span>
+		</td>
 	</form>
 	</tr>
 "
diff --git a/webif/lib/settings.class b/webif/lib/settings.class
index 7737eab..b1635ad 100644
--- a/webif/lib/settings.class
+++ b/webif/lib/settings.class
@@ -357,7 +357,7 @@ settings method logkeep {{num -1}} {
 
 settings method dedup_template {{pattern -1}} {
 	set val [$self _tval_setting dedup_template $pattern]
-	if {$val eq "0"} { set val "s%se%e - " }
+	if {$val eq "0"} { set val "s%se%E - " }
 	return $val
 }
 
diff --git a/webif/lib/ts.class b/webif/lib/ts.class
index 9dcbbc9..5443d27 100644
--- a/webif/lib/ts.class
+++ b/webif/lib/ts.class
@@ -693,22 +693,28 @@ ts method episode_name {} {
 	return $s
 }
 
-ts method epstr {{format "s%se%e/%E"}} {
+ts method epstr {{format "s%se%E/%n"}} {
 	set map {}
 	if {$seriesnum eq 0} {
-		set map(%s) "??"
+		set map(%s) "?"
+		set map(%S) "??"
 	} else {
-		set map(%s) [format "%02d" $seriesnum]
+		set map(%s) $seriesnum
+		set map(%S) [format "%02d" $seriesnum]
 	}
 	if {$episodenum eq 0} {
-		set map(%e) "??"
+		set map(%e) "?"
+		set map(%E) "??"
 	} else {
-		set map(%e) [format "%02d" $episodenum]
+		set map(%e) $episodenum
+		set map(%E) [format "%02d" $episodenum]
 	}
 	if {$episodetot eq 0} {
-		set map(%E) "?"
+		set map(%n) "?"
+		set map(%N) "??"
 	} else {
-		set map(%E) $episodetot
+		set map(%n) $episodetot
+		set map(%N) [format "%02d" $episodetot]
 	}
 	return [string map $map $format]
 }