From b373ccb3dc69f51108730c15eaeb1821aac380fb Mon Sep 17 00:00:00 2001 From: hummypkg Date: Mon, 2 Nov 2015 23:17:11 +0000 Subject: [PATCH] tvdb improvements git-svn-id: file:///root/webif/svn/pkg/webif/trunk@2533 2a923420-c742-0410-a762-8d5b09965624 --- CONTROL/control | 2 +- webif/html/browse/file.jim | 4 ++- webif/html/browse/index.jim | 2 +- webif/html/browse/tvdb/banner.jim | 2 +- webif/html/browse/tvdb/script.js | 24 ++++++++++++------ webif/html/browse/tvdb/search.jim | 2 ++ .../html/lib/jquery.plugin/dialogue/utils.js | 21 +++++++++++++++ webif/lib/bin/tvdb | Bin 13100 -> 13692 bytes webif/lib/tvdb.class | 10 ++++++-- 9 files changed, 53 insertions(+), 14 deletions(-) create mode 100755 webif/html/lib/jquery.plugin/dialogue/utils.js diff --git a/CONTROL/control b/CONTROL/control index 2bd02755..ed1bc65e 100644 --- a/CONTROL/control +++ b/CONTROL/control @@ -1,7 +1,7 @@ Package: webif Priority: optional Section: web -Version: 1.2.5-4 +Version: 1.2.5-5 Architecture: mipsel Maintainer: af123@hummypkg.org.uk Depends: webif-channelicons(>=1.1.18),lighttpd(>=1.4.35-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.7),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/browse/file.jim b/webif/html/browse/file.jim index b6a55392..3d5a4c3f 100755 --- a/webif/html/browse/file.jim +++ b/webif/html/browse/file.jim @@ -42,7 +42,9 @@ if {$type eq "ts"} { if {[llength $sdata]} { set sid [$sdata get seriesid] if {$sid} { - append series "/$sid" + append series " / " + append series " / DB:$sid" } } puts "[$ts epstr] - $epname ($series) diff --git a/webif/html/browse/index.jim b/webif/html/browse/index.jim index 5df566bb..61ec17ef 100755 --- a/webif/html/browse/index.jim +++ b/webif/html/browse/index.jim @@ -8,7 +8,7 @@ require ts.class pretty_size system.class settings.class escape browse.class \ set mroot [system mediaroot] set dir [cgi_get dir $mroot] -jqplugin contextMenu bar enadis blockui +jqplugin contextMenu bar enadis blockui dialogue jscss script.js style.css if {[system has tvdb]} { jscss tvdb/script.js tvdb/style.css } diff --git a/webif/html/browse/tvdb/banner.jim b/webif/html/browse/tvdb/banner.jim index 36d9cb81..5aa57cb2 100644 --- a/webif/html/browse/tvdb/banner.jim +++ b/webif/html/browse/tvdb/banner.jim @@ -5,7 +5,7 @@ require classdump if {[file exists "$dir/.tvdbseriesid"]} { set seriesid [string trim [file read "$dir/.tvdbseriesid"]] set tvdb_series [set v [tvdb series [file tail $dir] $seriesid]] - puts "
" + puts "
" if {[set banner [$v get banner]] ne ""} { puts " diff --git a/webif/html/browse/tvdb/script.js b/webif/html/browse/tvdb/script.js index d22647fe..15a62e1f 100644 --- a/webif/html/browse/tvdb/script.js +++ b/webif/html/browse/tvdb/script.js @@ -7,8 +7,7 @@ function select_episode() $('.tvdbresults').hide(); $('#tvdbresults_saving').show(); - $('#tvdbresults').dialog('option', 'position', { - my: "center", at: "center", of: window }); + $('#tvdbresults').diagrefresh(); $.get('tvdb/store.jim', { dir: dir, sid: sid }, function(data) { if (data <= 0) @@ -24,8 +23,7 @@ function select_episode() .on('click', function() { $('.tvdbresults').hide(); $('#tvdbresults_saving').show(); - $('#tvdbresults').dialog('option', 'position', { - my: "center", at: "center", of: window }); + $('#tvdbresults').diagrefresh(); $.get('tvdb/store.jim', { dir: dir, sid: sid, @@ -37,7 +35,8 @@ function select_episode() }); } -$('#tvdbsetseries').button().on('click', function() { +$('#tvdbsetseries').button().on('click', function(e) { + e.stopPropagation(); val = $('#tvdbseriesname').text(); if (!val) val = dir.split(/[\\/]/).pop(); @@ -78,9 +77,10 @@ $('#tvdbsetseries').button().on('click', function() { .on('click', select_episode); $('#tvdbresults_loading').slideUp('slow'); $('#tvdbresults_inner').show(); - $('#tvdbresults').dialog('option', - 'position', { - my: "center", at: "center", of: window }); + $('#tvdbresults').diagrefresh({ + width: $(window).width() - 100, + height: $(window).height() - 100 + }); }); } }, @@ -108,5 +108,13 @@ $('#tvdbsetseries').button().on('click', function() { }); }); +$('img.tvdbbannertop').hover( + function() { $(this).css('cursor', 'pointer'); }, + function() { $(this).css('cursor', 'auto'); } +).on('click', function() { + var sid = $(this).closest('div').attr('sid'); + window.open('http://thetvdb.com/?tab=series&id=' + sid, '_blank'); +}); + }); diff --git a/webif/html/browse/tvdb/search.jim b/webif/html/browse/tvdb/search.jim index 131a8f3e..b8d5aaed 100755 --- a/webif/html/browse/tvdb/search.jim +++ b/webif/html/browse/tvdb/search.jim @@ -13,7 +13,9 @@ foreach series [[tvdb] searchseries $term] { puts "
+ + $series(seriesname) diff --git a/webif/html/lib/jquery.plugin/dialogue/utils.js b/webif/html/lib/jquery.plugin/dialogue/utils.js new file mode 100755 index 00000000..65e7cd60 --- /dev/null +++ b/webif/html/lib/jquery.plugin/dialogue/utils.js @@ -0,0 +1,21 @@ +(function($) +{ + $.fn.diagrefresh = function(options) + { + var defaults = { + height: 'auto', + width: 'auto' + }; + + var settings = $.extend(defaults, options); + + return this.each(function() { + $(this) + .dialog('option', 'position', { + my: "center", at: "center", of: window + }) + .dialog('option', 'height', settings.height) + .dialog('option', 'width', settings.width); + }); + }; +})(jQuery); diff --git a/webif/lib/bin/tvdb b/webif/lib/bin/tvdb index f6f1ecc73f3dd29676326a54fd72079eaaecccdd..8621358696cb71684bf5a06926cb4ac7c9896bc5 100755 GIT binary patch delta 2700 zcmaJ@ZERE589w*=gV=HCwIN@&<6QgRlv`rav;9fQtuS(xYa?zv(M}*t{(_v0=D?a@Ag=NNasR~!v{naMOA1W4m z5t9I`W9z_I;uZ_z9$;S9_=x?d$f&#)@BXR@eNl+l^@#n)jA?8M0r?03H-WOie+OQQ z(|KoVNRUoIS`hd?@SMQ!f@cN38EIt%eg}FhP7zo8lpy^LtW<%23M)n67oleYZvem7 zWkFcU{SUaW2s{k^vcMalUlRBT_*7XCya_=`;4TCx3S0v(2>f~QoWS3Je^%gs2hRw6 z684tBLyXa8cVJ2oWnrQUd?UCb@T1^N;Ip9j3=7vv4Sogvioo9iUl#Zg*ewbCNA6b^ z1PM5ljK#a|EwVg)iM}vme4jq&Nd!s@^M+n{i$9TNjHiu>b#%&Oa_tq*Zf`ENrTDMa z4-L?OH}=d)v$wNgzR;-^hveTE18jBmh0b|dsT*X%JW%-; z!W8zwY(7QDyyp6xIju{~p${^7AeW*AZ{>^e#`?I1JDf;e(z(MRa}G?Kr|dv=%u;wD ztD32ksT-zEiq-e=On29BmlAZo{(Wa+o9?0u^#&DupL61{NwMJ!^pW-N<9ha~GVSuY z<>AEQ*{4DhH`+u;>zipt@zJufgU1W{4OnjR_erL} z5#>4x>=-zmpje>anaJoPbh)jACIhjC+a9Hkrwg0eVH#_*>Jmfxu(CYMO@2v5%}2gS zy2(~6Hw=Ycd^f6E%tB2bBF@8(W>-JpH-IUu9>K%%)#UNjlqf#F^Zt*HLd%h+3MrLA1a57hF_t zi*DJX^(`+$F&W)OOD&CZiI6AI)nmbUHK+`FEjB+&>(N)ym83^~dD1dKzU;vztb= ztMXd!CF!+r#KYe>&8{26^r!HESW%50hLg3zJaH9nCLgV563-UO`9!a;AM@&#Arsu9 zPg;eUo>6^u)vZT2S?n-Lf#$Y5Qf0dj7f#t9CSyZ0{AF+TRF}#1WlwEs_Ox%5TIfJi zs6k~nXStOR#dp|iRBqqu`WBYWRi==xcKP=x*WX>UHMi-?n)bBXMLSiWteSLHJt(J5 zdp(DveBmaee5LvNhGVL1nf9WWRc9cB>hsNB+rc|+FDXO*)^^t(#J9Il@7v7U$j!D^ z&2!aHdPkLySNYB=KTKz0&8{rga4S6@G#dEqMdvf=^AXg*V}w` zq!IFT>~-Z$rStCMSjTT=X^B2JwEy`hW!|TaAHH7S%6k;`NbHvwCNAEiva$s(bT?kH30wpPC;%k&mN~{5jr2N4ix<@@H{6+x>zmc72%K!iX delta 2484 zcmaJ@ZD>5?|Bw`m*OCZ;#ZO>Uapq_K(MM<=(PPRCSIanfyF4JgBpZPX11 zb6_(k%rUib?>10GGP=PKr_nn61J=3!3u z4ET(0GCyh$t7R=u_}{{e@{jwwKbL~t6#9!j;eUg%Fq=S!ym){qpe*nYz)L!vw0HFj z>N`*i0)GvBSl~Co^8#OiY2^fd9d=WvfTLqXP~U}@D)3wIQUpE*I}><4_`RqJu`>6M zQO^k65Bs#h>tUY|_%`s7vLJi`p(JnzIw%S}3|_FN7)V(x{fC zw`)@ks&PP*m`&?ta*vv%Gqsg3rZ&{gEj%EW{95Ayz0BT|HTGK_Ihm>Oj?C&z?M!XT z8WgJQ<}=+~w?>N5$-0a7*lNu|U)JeVaNp*{W|3n3Vb}u=7x6r@piCRwHS%C={Kx{I z#GRJX?z)9^NO9A&vX=MP-l)T~ud!QNM|&DIw2wEgu*X(u7ih8HSHI4sIQe8GX4ekT zx%M{aB>um)o`W$8c{27`PRrA|MG@NP2?geT^UCDtfO1t=*x1>iYBCeAKNX|Po-Svs zUmH-SM|q5ap>8e;NdqJWR(Ss_X7;I=gbeNfgPJ>^94H|}6N9df4l0wFT?wsBtgEUDPay&77VlhPJME9DJPu5DhMeyl0&OC5vC)zLKdYPvK?d)hU4A8${g{Zo4e z&%dqbVqfOdfSa~QTIrzg4ag6COL@2cKxjVkJkg)UpVQJI3w-zeik(Fg^4em4$Fv3qjv{OwqxhU{m<Z;U2Xw|pr<*VN5)Fz9ytf(XSj=7X`uoHBV@VE5Vtx(Lj@Fo0r#*~^Zk7q z;QM$PC`D*z*Bab8&UcN-x=D@FqVZgMw;bWOgle(&M6}lc{0ON5N|o3<-C+l&H=|QS zChUq~@EFbz8!gWSYE%Qm8#I&&xhi)Y#+=lcX`&Muca4FIhJmXLj9E0ZxER?j;~y}Z zP;k$A1S7xT FOUND: ($w)
" ladd _phrases $w @@ -340,3 +342,7 @@ proc {tvdb bannerurl} {banner} { return "http://$::tvdb::mirror/banners/$banner" } +proc {tvdb seriesurl} {seriesid} { + return "http://$::tvdb::mirror/?tab=series&id=$seriesid" +} +