From 3ca87e128590ea3ade0505220464291dcf9244da Mon Sep 17 00:00:00 2001 From: hummypkg Date: Mon, 5 Jan 2015 21:59:36 +0000 Subject: [PATCH] update webif git-svn-id: file:///root/webif/svn/humax/pkg/src/webif/trunk@2114 2a923420-c742-0410-a762-8d5b09965624 --- CONTROL/control | 4 ++-- webif/cgi-bin/channel.jim | 2 +- webif/cgi-bin/epg/info.jim | 8 +++++++- webif/html/browse/file.jim | 12 +++++++++++- webif/html/browse/index.jim | 5 ++++- webif/html/img/Guidance_blue.png | Bin 0 -> 4520 bytes webif/html/img/Guidance_red.png | Bin 0 -> 4482 bytes webif/html/m/browse.jim | 5 ++++- webif/lib/epg.class | 17 +++++++++++++++-- 9 files changed, 44 insertions(+), 9 deletions(-) create mode 100644 webif/html/img/Guidance_blue.png create mode 100644 webif/html/img/Guidance_red.png diff --git a/CONTROL/control b/CONTROL/control index 0d28fb9..e3f90d8 100644 --- a/CONTROL/control +++ b/CONTROL/control @@ -1,10 +1,10 @@ Package: webif Priority: optional Section: web -Version: 1.0.18-8 +Version: 1.2.0 Architecture: mipsel Maintainer: af123@hummypkg.org.uk -Depends: webif-channelicons(>=1.1.14),lighttpd(>=1.4.35-2),jim(>=0.75-1),jim-oo,jim-sqlite3(>=0.75),jim-cgi(>=0.7),jim-binary(>=0.75),service-control(>=2.1),busybox(>=1.20.2-1),lsof(>=4.87),epg(>=1.0.15),hmt(>=1.1.21),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,mongoose +Depends: webif-channelicons(>=1.1.14),lighttpd(>=1.4.35-2),jim(>=0.75-1),jim-oo,jim-sqlite3(>=0.75),jim-cgi(>=0.7),jim-binary(>=0.75),service-control(>=2.1),busybox(>=1.20.2-1),lsof(>=4.87),epg(>=1.2.0),hmt(>=1.2.0),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,mongoose Suggests: Description: An evolving web interface for the Humax. Tags: http://hummy.tv/forum/threads/5866/ diff --git a/webif/cgi-bin/channel.jim b/webif/cgi-bin/channel.jim index f32a215..579577d 100755 --- a/webif/cgi-bin/channel.jim +++ b/webif/cgi-bin/channel.jim @@ -73,7 +73,7 @@ foreach tw [$db query { "BBC ONE HD" { set mux "PSB3/BBC B" } "ITV3" { set mux "COM4/SDN" } "Dave" { set mux "COM5/ARQ A" } - "Film4+1" { set mux "COM6/ARQ B" } + "ITV4" { set mux "COM6/ARQ B" } "BBC NEWS HD" { set mux "COM7/ARQ C" } "Movies4Men" { set mux "Local" } } diff --git a/webif/cgi-bin/epg/info.jim b/webif/cgi-bin/epg/info.jim index 8ae5b9d..21d8280 100755 --- a/webif/cgi-bin/epg/info.jim +++ b/webif/cgi-bin/epg/info.jim @@ -72,10 +72,16 @@ puts " " if {[$record get warning] != ""} { + if {[$record get warning_mode]} { + set gcol red + } else { + set gcol blue + } puts " Warning - [$record get warning] + + [$record get warning] " } diff --git a/webif/html/browse/file.jim b/webif/html/browse/file.jim index d23d99f..82c50e7 100755 --- a/webif/html/browse/file.jim +++ b/webif/html/browse/file.jim @@ -38,7 +38,17 @@ if {$type eq "ts"} { puts " Guidance + src=/img/Guidance_red.png height=21> + [$ts get guidance] + + + " + } + if {[$ts flag "GGuidance"] > 0} { + puts " + General Guidance + [$ts get guidance] diff --git a/webif/html/browse/index.jim b/webif/html/browse/index.jim index 11dd3cf..2a1dcc3 100755 --- a/webif/html/browse/index.jim +++ b/webif/html/browse/index.jim @@ -221,7 +221,10 @@ proc entry {file} {{i 0}} { # Guidance if {[$ts flag "Guidance"] > 0} { - icon "/images/174_1_26_GuidancePolicy.png" + icon "/img/Guidance_red.png" + } + if {[$ts flag "GGuidance"] > 0} { + icon "/img/Guidance_blue.png" } # Indexed diff --git a/webif/html/img/Guidance_blue.png b/webif/html/img/Guidance_blue.png new file mode 100644 index 0000000000000000000000000000000000000000..df5309764d9422c75fbc302ea3be4e0d888a9a81 GIT binary patch literal 4520 zcmV;Z5m)YsP)|D^_ww@lRz|vCuzLs)$;-`! zo*{AqUjza0dRV*yaMRE;fKCVhpQKsoe1Yhg01=zBIT!& zC1$=TK@rP|Ibo3vKKm@PqnO#LJhq6%Ij6Hz*<$V$@wQAMN5qJ)hzm2hoGcOF60t^# zFqJFfH{#e-4l@G)6iI9sa9D{VHW4w29}?su;^hF~NC{tY+*d5%WDCTXa!E_i;d2ub z1#}&jF5T4HnnCyEWTkKf0>c0%E1Ah>(_PY1)0w;+02c53Su*0<(nUqKG_|(0G&D0Z z{i;y^b@OjZ+}lNZ8Th$p5Uu}MTtq^NHl z*T1?CO*}7&0ztZsv2j*bmJyf3G7=Z`5B*PvzoDiKdLpOAxi2$L0#SX*@cY_n(^h55xYX z#km%V()bZjV~l{*bt*u9?FT3d5g^g~#a;iSZ@&02Abxq_DwB(I|L-^bXThc7C4-yr zInE_0gw7K3GZ**7&k~>k0Z0NWkO#^@9q0fwx1%qjZ=)yBuQ3=5 z4Wo^*!gyjLF-e%Um=erBOdIALW)L%unZshS@>qSW9o8Sq#0s#5*edK%>{;v(b^`kb zN5rY%%y90wC>#%$kE_5P!JWYk;U;klcqzOl-UjcFXXA75rT9jCH~u<)0>40zCTJ7v z2qAyk54cquI@7b&LHdZ`+zlTss6bJ7%PQ)z$cROu4wBhpu-r)01)S~6}jY?%U? zgEALn#wiFzo#H}aQ8rT=DHkadR18&{>P1bW7E`~Y4p3)hWn`DhhRJ5j*2tcg9i<^O zEt(fCg;q*CP8+7ZTcWhYX$fb^_9d-LhL+6BEtPYWVlfK zTBusSTASKKb%HuWJzl+By+?gkLq)?+BTu761jmyXF)a;mc z^>(B7bo*HQ1NNg1st!zt28YLv>W*y3CdWx9U8f|cqfXDAO`Q48?auQqHZJR2&bcD4 z9Ip>EY~kKEPV6Wm+eXFV)D)_R=tM0@&p?(!V*Qu1PXHG9o^TY0bZ?)4%0 z1p8F`JoeS|<@=<@RE7GY07EYX@lwd>4oW|Yi!o+Su@M`;WuSK8LKk71XR(_ zRKHM1xJ5XYX`fk>`6eqY>qNG6HZQwBM=xi4&Sb88?zd}EYguc1@>KIS<&CX#T35dw zS|7K*XM_5Nf(;WJJvJWRMA($P>8E^?{IdL4o5MGE7bq2MEEwP7v8AO@qL5!WvekBL z-8R%V?zVyL=G&{be=K4bT`e{#t|)$A!YaA?jp;X)-+bB;zhj`(vULAW%ue3U;av{9 z4wp%n<(7@__S@Z2PA@Mif3+uO&y|X06?J#o zSi8M;ejj_^(0<4Lt#wLu#dYrva1Y$6_o(k^&}yhSh&h;f@JVA>W8b%oZ=0JGnu?n~ z9O4}sJsfnnx7n(>`H13?(iXTy*fM=I`sj`CT)*pTHEgYKqqP+u1IL8No_-(u{qS+0 z<2@%BCt82d{Gqm;(q7a7b>wu+b|!X?c13m#p7cK1({0<`{-e>4hfb-UsyQuty7Ua; zOu?B?XLHZaol8GAb3Wnxcu!2v{R_`T4=x`(GvqLI{-*2AOSimkUAw*F_TX^n z@STz9kDQ$NC=!KfXWC z8h`dn#xL(D3Z9UkR7|Q&Hcy#Notk!^zVUSB(}`#4&lYA1f0h2V_PNgUAAWQEt$#LR zcH#y9#i!p(Udq2b^lI6wp1FXzN3T;~FU%Lck$-deE#qz9yYP3D3t8{6?<+s(e(3(_ z^YOu_)K8!O1p}D#{JO;G(*OVf24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV z0GgZ_00007bV*G`2j2k&4Js`MZr;`a00!_$L_t(Y$K{txY#nD6$A9yU-|M{QuKmT*a6A}K~htL1u z@E&yY$8SwI@#!tT z$4kIBjL6>HSdH;``sZ2ABtd-vj!?<5LHL9~djoCEC!^ zhD;kWW66x|JXa2U0uMspC-94H5^dgCtFHd~?U%oH6vzSV*2jY$dh`7kfS;zu?unG9 zktteAqmvk`a;(;c5W*0@)J0J4#t#Db0>xIDu@{;*7k+-?(2KtVQb6Ag9JEiq_qX>B z3LK8L*;CIH)ifh&)KT>sDr&Ggb%Oc_(?oNZXkNKM(9=s$E(2ijP$JkOn!{dK_xOfA zPb@7SKRV|C?+A4O@ZGhFJxNfQ7n+jlasdk;ZRF91u&k8Z|4~OV~=9e1ThA&1^_VzzpHC(VEnNIOMic39>@R% zNSGPBPg@~NlR}|cip_JP`6~cy`0SIE9vVQknwTuZW+{l^1pyoPe+kbIP*D?%LBxqv zq!aE^|KJ4hN1)}@Y{FEV39%NFCfF>)u2bx{a9;hHxMxft8(!D%?_*#gn%FFq%~YHEW&EF#%gtY(=f#5#mlJr z8Y`1;-D7K&?K>HIYQGba6nV9_*e}lq99YSfs2AEStC~FBXtE5%7EGNO0MeCZdPjC3 zB80saD%*E{ouI7BF-hET-nrWGl<) zMje}_h&A+V9%1xbFC!w@G~w3Ce{`6O2$H*!F$OWZ&_di=boJR@geGpy0H3!i@2F0+ zraZKfY-O3+`56Wu-wXD39*t7iETwt*9L|b5fHuz%5loh0(gf95o4vc``8tj!bsRZE zcWkYtZ^y2}z*m;3pFe|&3d6|Os;Js3(cERS>aBvM)y4nw468LJiLq&nXiZjKIq&?} zw7X82Rc{>&D}AT&{5=4k=ONb6yJZ_an@31)F0gp)&kR1cm#%>g1U@o$T_6S;&LHvt@OrmwzaEsj zc7r@3*5G+w$8`ojGl9v|PACEVa+#qg_tW#qZNv*#DfJKX&?BG5BrzsUFma2#Q9D&T zJAFjAqBS4_>JD7D6%}rK{>86`mA;>OelYI&K3))j=i!GXyiyl_7?Q75FewRUd$1keOlfT{!6ohDwtaAv+TG8%!5i`GM8iZHk9O{~H1 zDiiirFlma3TLmizrdkmuZla>*e6o1sNbT&@J3!*XT5~KFAi;VqG%laJ)IGFm$qW2p zM7E1k9Xo4#vdPi{G>Hp)j9Z0TlZ3opI~Cu!dZd1S<{fA5b+?-C+TJm)xWl%t&CY>0 z<@tUKk0CL7$m*gbOqOD@6q`A(Zi^;~XVaCX*PEBmABh*{FFJ;G$FSk9+tb56)1dD> zvIpp|Y~Asx?v0-~5cF0i{IE2JA8ht~Z$OM`h}Mfn<+D0!oKF^S%w#Lei*5o;UG5s| z0M+{8%=?(BKXk3A7w7{j>snK|ZuAhhS-TEXR~C`W;eDq;?*X41KG5Y_QoA3P*LMpC zY8+tZKvH-9@6EmUx#u~6a2?CwK1|Izw)$UA`2ROwZT|%ES>jDM%Smhi0000|D^_ww@lRz|vCuzLs)$;-`! zo*{AqUjza0dRV*yaMRE;fKCVhpQKsoe1Yhg01=zBIT!& zC1$=TK@rP|Ibo3vKKm@PqnO#LJhq6%Ij6Hz*<$V$@wQAMN5qJ)hzm2hoGcOF60t^# zFqJFfH{#e-4l@G)6iI9sa9D{VHW4w29}?su;^hF~NC{tY+*d5%WDCTXa!E_i;d2ub z1#}&jF5T4HnnCyEWTkKf0>c0%E1Ah>(_PY1)0w;+02c53Su*0<(nUqKG_|(0G&D0Z z{i;y^b@OjZ+}lNZ8Th$p5Uu}MTtq^NHl z*T1?CO*}7&0ztZsv2j*bmJyf3G7=Z`5B*PvzoDiKdLpOAxi2$L0#SX*@cY_n(^h55xYX z#km%V()bZjV~l{*bt*u9?FT3d5g^g~#a;iSZ@&02Abxq_DwB(I|L-^bXThc7C4-yr zInE_0gw7K3GZ**7&k~>k0Z0NWkO#^@9q0fwx1%qjZ=)yBuQ3=5 z4Wo^*!gyjLF-e%Um=erBOdIALW)L%unZshS@>qSW9o8Sq#0s#5*edK%>{;v(b^`kb zN5rY%%y90wC>#%$kE_5P!JWYk;U;klcqzOl-UjcFXXA75rT9jCH~u<)0>40zCTJ7v z2qAyk54cquI@7b&LHdZ`+zlTss6bJ7%PQ)z$cROu4wBhpu-r)01)S~6}jY?%U? zgEALn#wiFzo#H}aQ8rT=DHkadR18&{>P1bW7E`~Y4p3)hWn`DhhRJ5j*2tcg9i<^O zEt(fCg;q*CP8+7ZTcWhYX$fb^_9d-LhL+6BEtPYWVlfK zTBusSTASKKb%HuWJzl+By+?gkLq)?+BTu761jmyXF)a;mc z^>(B7bo*HQ1NNg1st!zt28YLv>W*y3CdWx9U8f|cqfXDAO`Q48?auQqHZJR2&bcD4 z9Ip>EY~kKEPV6Wm+eXFV)D)_R=tM0@&p?(!V*Qu1PXHG9o^TY0bZ?)4%0 z1p8F`JoeS|<@=<@RE7GY07EYX@lwd>4oW|Yi!o+Su@M`;WuSK8LKk71XR(_ zRKHM1xJ5XYX`fk>`6eqY>qNG6HZQwBM=xi4&Sb88?zd}EYguc1@>KIS<&CX#T35dw zS|7K*XM_5Nf(;WJJvJWRMA($P>8E^?{IdL4o5MGE7bq2MEEwP7v8AO@qL5!WvekBL z-8R%V?zVyL=G&{be=K4bT`e{#t|)$A!YaA?jp;X)-+bB;zhj`(vULAW%ue3U;av{9 z4wp%n<(7@__S@Z2PA@Mif3+uO&y|X06?J#o zSi8M;ejj_^(0<4Lt#wLu#dYrva1Y$6_o(k^&}yhSh&h;f@JVA>W8b%oZ=0JGnu?n~ z9O4}sJsfnnx7n(>`H13?(iXTy*fM=I`sj`CT)*pTHEgYKqqP+u1IL8No_-(u{qS+0 z<2@%BCt82d{Gqm;(q7a7b>wu+b|!X?c13m#p7cK1({0<`{-e>4hfb-UsyQuty7Ua; zOu?B?XLHZaol8GAb3Wnxcu!2v{R_`T4=x`(GvqLI{-*2AOSimkUAw*F_TX^n z@STz9kDQ$NC=!KfXWC z8h`dn#xL(D3Z9UkR7|Q&Hcy#Notk!^zVUSB(}`#4&lYA1f0h2V_PNgUAAWQEt$#LR zcH#y9#i!p(Udq2b^lI6wp1FXzN3T;~FU%Lck$-deE#qz9yYP3D3t8{6?<+s(e(3(_ z^YOu_)K8!O1p}D#{JO;G(*OVf24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV z0GgZ_00007bV*G`2j2k&4J`+gl!3;`7N z1QUw@;loOVL000Bh{yrivSj%ZMUi~)Ik(7Ca`7RNY=MN3a?2r?$hky9QOLpKV95u9 z92tylAqX1?fd!jIyDamuGt<*uU0ts#hpE|&0h8pC98%I#f6es2-uu7*d#{!Ep8xiW z_#Z6wxQEwHoOsGRcUVQyLGRptFR~r)=bT6j=WcnCOHS+aMXPn@TW`Pp8Q{n4KLfpb z{P-psi5K*0H^hP+0xRl51l^!E?@u`?2ADc-g@hYz|WmA`y|h? zX^IR6*et^p1+FNDfYmBdwMslSg^FY1Y89ekdN^aQrHhNdJbd=-?*R?i2Z7_!$(1+X zd=WV6wB9F!0p;2ndUX}kY@!DP-d|qke6z{bZkL5ti;W`G0+9E9J^a92JUO}dNUe77 z)ZM$c0^sLD9Rpl`qeR#*AO!UFF%n_TI3xg6~D@-jwi zp4qq&ya%N~1n(T)+QtTvx!C)Q7uVLh4{{snaBmN7iHVFR0H zW^hG;7XjxGt#QsZQftp&Pt#7|Rsf$kV-5ocB+n_kU2Lz%K!iUxo9iB)IB=V zBSk@!B)qzBAJa*~*JozfxosPgWq1)>;MQ5oR2=VmuF*JjdU^RaPyi+16JM4Gowe9B z#T5m{7zz=t_Idz(x6xo?(hs!dIF?b+RikG%-C8|^?JDnk*`)86`@5x1IR4V&{ zKLUf0&5}r-@Auv#S%zd8+BvNEe41qd?5fv?_xpYNWr=nU@t#->)mBl8i8v-wifR-g zp_UuxFd`_Wb_Gr+feK&}XYF>Irbw1yL?}ft&e05-+&no+nWkhS+#C$}q|;%%Nkmb^ zmns!rn4iau-7lR(J4dY4mH<`-5+F)!zdttu%ta`@#{@13VJyO~+s5$j%F07!ZBM<< z3-j}cb2vb}#{Z1-*) zkXp-o_wKEG?tsEM%D}mJ&p?D;S*`?qj*Mtv?WJ6Vfd~U@hdXtSty5C~TxhrHl_jaQ zbc~^C3@ci5zbLra=?u%@7@%l~@IWJ5|8A8dJ1uPo2^$`TWHXq}_D_;#Z~V`75oBw;DbxDdP?U&c9d5sI*hwlRxWdc8}b8kM7p z6#wb|{r-36=H@(n--aacVN1K~bw2KNaNe_&=lnfQS?Kk+ljk_^sYDUZdm7a$&&#lc1cEyA+a>mE(U zF-PX-*)cuMjWlJ`#01}%oh1ukJ!@$j^U=9h>tt$e2S|Z#0Jo!zN`Aa!$1Agy%CT6f zy%CT^5s^|%L=j0iu4;{Tjy?7IP>Z1$l-`qx&@D^4WyxAu-oBZpzq!zEe+cw}CeRAt zcD;#z(&^mZIX#^!rS@9y8#d_9I!ECgK6qHKRE8dfj8Cl{0nxXXwX(c@JIhXf*lvFS zLC69v+$oqfjHKfSIpNPw)Q9)YPF`9Ph8j@vc~@EfLHL^t8x|^?tEq z%+*h`?9z(XD`5iEfxF%qU^zaVsV|uNlhBGb0MkHitTiQLqsK^HBOU4>i!^Zf$Z1eL z=5r$gCPGUZ^~36Tw+NsT0E+;k!}-5A_dep83INHNm+>P!l`(Jaznt*@Z@$|80geUJ UFszq)*#H0l07*qoM6N<$f)b3U!T 0} { - icon "/images/174_1_26_GuidancePolicy.png" + icon "/img/Guidance_red.png" + } + if {[$ts flag "GGuidance"] > 0} { + icon "/img/Guidance_blue.png" } # Indexed diff --git a/webif/lib/epg.class b/webif/lib/epg.class index a70e65e..903ec9e 100644 --- a/webif/lib/epg.class +++ b/webif/lib/epg.class @@ -23,7 +23,7 @@ if {[file exists $::epgdbpath]} { # * service_id, event_id, start, duration, encrypted, name, text # * warning, content code, content type, -# * event CRID, series CRID, rec CRID +# * event CRID, series CRID, rec CRID, warning mode class epg { service_id 0 @@ -34,6 +34,7 @@ class epg { name "" text "" warning "" + warning_mode 0 content_code 0 content_type "" event_crid "" @@ -47,12 +48,14 @@ class epg { sched_type -1 rsv 0 + } epg method _parse {line} { lassign [split $line "\t"] \ service_id event_id start duration encrypted name text warning \ - content_code content_type event_crid series_crid rec_crid + content_code content_type event_crid series_crid rec_crid \ + warning_mode } epg method percent {} { @@ -218,6 +221,16 @@ epg method icon_set {{height 0}} { alt=\"$content_type\" title=\"$content_type\">" } + if {$warning ne ""} { + if {$warning_mode} { + set icon "Guidance_red" + } else { + set icon "Guidance_blue" + } + lappend set "Guidance" + } + $self process_sched if {$sched_type == 1} { lappend set \