hummypkg/webif
5
3
Fork 4
Code Issues Pull Requests Releases 1 Activity

update dedup settings

Browse Source 
git-svn-id: file:///root/webif/svn/pkg/webif/trunk@2551 2a923420-c742-0410-a762-8d5b09965624
This commit is contained in:
hummypkg 2015-11-25 22:28:32 +00:00
parent 57a2523b1c
commit bb2496a8a7
4 changed files with 26 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CONTROL/control
View File

@ -1,7 +1,7 @@
Package: webif Package: webif
Priority: optional Priority: optional
Section: web Section: web
Version: 1.2.5-8 Version: 1.2.5-9
Architecture: mipsel Architecture: mipsel
Maintainer: af123@hummypkg.org.uk 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) 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)

16
webif/html/settings/modules/tvdb/settings.hook
View File

@ -19,21 +19,27 @@ puts "
<form class=auto id=dedup method=get action=$env(SCRIPT_NAME)> <form class=auto id=dedup method=get action=$env(SCRIPT_NAME)>
<th class=key> <th class=key>
Dedup Episode Prefix<br> Dedup Episode Prefix<br>
<span class=footnote>
%s - series number<br>
%e - episode number<br>
%E - number of episodes
</span>
</th> </th>
<td> <td>
<input name=dedup_template value=\"$dedup_template\" <input name=dedup_template value=\"$dedup_template\"
class=\"text ui-widget-content ui-corner-all\" class=\"text ui-widget-content ui-corner-all\"
length=20 maxlength=50> length=20 maxlength=50>
<br>
<small> <small>
<input id=dedup_submit value=\"change\" type=submit> <input id=dedup_submit value=\"change\" type=submit>
</small> </small>
<div id=dedup_output></div> <div id=dedup_output></div>
</td> </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> </form>
</tr> </tr>
" "

2
webif/lib/settings.class
View File

@ -357,7 +357,7 @@ settings method logkeep {{num -1}} {
settings method dedup_template {{pattern -1}} { settings method dedup_template {{pattern -1}} {
set val [$self _tval_setting dedup_template $pattern] 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 return $val
} }

20
webif/lib/ts.class
View File

@ -693,22 +693,28 @@ ts method episode_name {} {
return $s return $s
} }
ts method epstr {{format "s%se%e/%E"}} { ts method epstr {{format "s%se%E/%n"}} {
set map {} set map {}
if {$seriesnum eq 0} { if {$seriesnum eq 0} {
set map(%s) "??" set map(%s) "?"
set map(%S) "??"
} else { } else {
set map(%s) [format "%02d" $seriesnum] set map(%s) $seriesnum
set map(%S) [format "%02d" $seriesnum]
} }
if {$episodenum eq 0} { if {$episodenum eq 0} {
set map(%e) "??" set map(%e) "?"
set map(%E) "??"
} else { } else {
set map(%e) [format "%02d" $episodenum] set map(%e) $episodenum
set map(%E) [format "%02d" $episodenum]
} }
if {$episodetot eq 0} { if {$episodetot eq 0} {
set map(%E) "?" set map(%n) "?"
set map(%N) "??"
} else { } else {
set map(%E) $episodetot set map(%n) $episodetot
set map(%N) [format "%02d" $episodetot]
} }
return [string map $map $format] return [string map $map $format]
} }