diff --git a/CONTROL/control b/CONTROL/control index cc40996..3dd73fd 100644 --- a/CONTROL/control +++ b/CONTROL/control @@ -1,7 +1,7 @@ Package: webif Priority: optional Section: web -Version: 1.4.8-11 +Version: 1.4.9 Architecture: mipsel Maintainer: af123@hpkg.tv Depends: tcpfix,webif-channelicons(>=1.1.27),lighttpd(>=1.4.39-1),jim(>=0.79),jim-pack(>=0.79),jim-oo(>=0.77),jim-sqlite3(>=0.77),jim-cgi(>=0.7-2),jim-binary(>=0.76),service-control(>=2.3),busybox(>=1.20.2-1),lsof(>=4.87),epg(>=1.2.8),hmt(>=2.0.10),ssmtp,cron-daemon(>=1.18.3-3),at(>=3.1.18),anacron,trm(>=1.1),openssl-command,nicesplice,id3v2,file,rsvsync(>=1.1.13),webif-charts(>=1.2-1),stripts(>=1.4.2),tmenu(>=1.21-2),ffmpeg(>=2.8),id3v2,multienv(>=1.6),tcpping(>=1.1),e2fsprogs,wireless-tools(>=29-1),dbupdate,recmon(>=2.0.7),hwctl,nugget(>=0.98),sqlite3(>=3.15.1),jim-xconv,zip(>=3.0-1),wget diff --git a/webif/html/diskspace/diskspace.jim b/webif/html/diskspace/diskspace.jim index d21b767..58e98e3 100755 --- a/webif/html/diskspace/diskspace.jim +++ b/webif/html/diskspace/diskspace.jim @@ -9,6 +9,11 @@ lassign [system diskspace 1] size used perc free fperc tsrbuf tsrused set tsrreserve $($tsrbuf - $tsrused) # Adjust values to account for the TSR reserve set free $($free - $tsrreserve) +# In case the reserve has been over-committed +if {$free < 0} { + # avoid displaying negative free, or used > available + set free 0 +} set used $($size - $free) set dbs 0 diff --git a/webif/lib/bin/tvdb b/webif/lib/bin/tvdb index 57925b8..f4237bf 100755 Binary files a/webif/lib/bin/tvdb and b/webif/lib/bin/tvdb differ diff --git a/webif/lib/test/episode b/webif/lib/test/episode index aeb7f76..333ef7d 100755 --- a/webif/lib/test/episode +++ b/webif/lib/test/episode @@ -18,6 +18,11 @@ foreach {sample expected} { {(S8, Ep2)} {S8E2/0} {(S4 Ep22/24)} {S4E22/24} {23/27.} {S0E23/27} + {Part 5/10} {S0E5/10} + {Pt. 5/10} {S0E5/10} + {Part 5 of 10} {S0E5/10} + {Pt. 5 of10} {S0E5/10} + {Pt5} {S0E5/0} } { set ts [ts new "synopsis {$sample}"] $ts episode_name diff --git a/webif/lib/ts.class b/webif/lib/ts.class index 83de168..6f516bd 100644 --- a/webif/lib/ts.class +++ b/webif/lib/ts.class @@ -697,6 +697,14 @@ ts method extract_numbers {} { regexp -nocase -- {S\.*(\d+),?\s*Ep\.?\s*(\d+)(/(\d+))?} $synopsis \ x seriesnum episodenum x episodetot + # (Part 5/10) + # (Pt. 5/10) + # (Part 5 of 10) + # (Pt. 5 of 10) + # (Pt5) + regexp -nocase -- {P(art|t\.?)\s*(\d+)\s*(of|/)?\s*(\d+)?} $synopsis \ + x x episodenum x episodetot + foreach v {seriesnum episodenum episodetot} { if {[set $v] eq ""} { set $v 0