Merge pull request #4408 from dimkroon/matrix

[plugin.video.viwx] 1.1.1

plugin.video.viwx/addon.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="plugin.video.viwx" name="viwX" version="1.0.0" provider-name="Dimitri Kroon">
+<addon id="plugin.video.viwx" name="viwX" version="1.1.1" provider-name="Dimitri Kroon">
   <requires>
     <import addon="xbmc.python" version="3.0.0"/>
     <import addon="inputstream.adaptive" version="19.0.5"/>
@@ -30,7 +30,15 @@
       <fanart>resources/fanart.png</fanart>
     </assets>
     <news>
-      First stable release
+[B]v1.1.1[/B]
+- fix: playing VOD on kodi Omega failed with error.
+
+[B]v1.1.0[/B]
+- Updated user-agent string to Firefox 118.
+- Added support for Live TV items in collections. Fixes: collection 'ITVX Live Channels' is empty.
+- Added support for shortFromSlider in collection, like the folder with short news-like items in the collection 'Rugby World Cup'.
+- Added support for shorForm collections. Fixes: absence of the collection 'Rugby World Cup 2023'.
+- Adapt to a change at itvx causing an empty 'Kids Collection'.
     </news>
     <reuselanguageinvoker>true</reuselanguageinvoker>
   </extension>

plugin.video.viwx/changelog.txt

@@ -1,3 +1,13 @@
+v 1.1.1
+- fix: playing VOD on kodi Omega failed with error.
+
+v 1.1.0
+- Updated user-agent string to Firefox 118.
+- Added support for Live TV items in collections. Fixes: collection 'ITVX Live Channels' is empty.
+- Added support for shortFromSlider in collection, like the folder with short news-like items in the collection 'Rugby World Cup'.
+- Added support for shorForm collections. Fixes: absence of the collection 'Rugby World Cup 2023'.
+- Adapt to a change at itvx causing an empty 'Kids Collection'.
+
 v 1.0.0
  - First release.
 

plugin.video.viwx/resources/language/resource.language.en_gb/strings.po

@@ -189,7 +189,7 @@ msgid "Resume from"
 msgstr ""
 
 msgctxt "#30620"
-msgid "Play from the start"
+msgid "Watch from the start"
 msgstr ""
 
 msgctxt "#30621"

plugin.video.viwx/resources/lib/fetch.py

@@ -21,7 +21,7 @@
 
 
 WEB_TIMEOUT = (3.5, 7)
-USER_AGENT = 'Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:109.0) Gecko/20100101 Firefox/110.0'
+USER_AGENT = 'Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:109.0) Gecko/20100101 Firefox/118.0'
 
 
 logger = logging.getLogger('.'.join((logger_id, __name__.split('.', 2)[-1])))

plugin.video.viwx/resources/lib/itv_account.py

@@ -105,7 +105,7 @@ def login(self, uname: str, passw: str):
                 'https://auth.prd.user.itv.com/auth',
                 req_data,
                 headers={'Accept': 'application/vnd.user.auth.v2+json',
-                         'Akamai-BM-Telemetry': '7a74G7m23Vrp0o5c9379441.75-1,2,-94,-100,Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:109.0) Gecko/20100101 Firefox/110.0,uaend,11059,20100101,nl,Gecko,5,0,0,0,409881,2462846,1680,1010,1680,1050,1680,925,1680,,cpen:0,i1:0,dm:0,cwen:0,non:1,opc:0,fc:1,sc:0,wrc:1,isc:85,vib:1,bat:0,x11:0,x12:1,5663,0.09571883547,832931231423,0,loc:-1,2,-94,-131,-1,2,-94,-101,do_en,dm_en,t_dis-1,2,-94,-105,0,-1,0,0,2422,113,0;0,-1,0,0,1102,520,0;1,0,0,0,1465,883,0;-1,2,-94,-102,0,0,0,0,2422,113,0;0,-1,1,0,1102,520,0;1,0,1,0,1465,883,0;-1,2,-94,-108,0,1,11374,16,0,0,883;1,1,11749,-2,0,8,883;2,3,11749,-2,0,8,883;3,2,11909,-2,0,8,883;4,2,11941,16,0,8,883;5,1,12086,-2,0,0,883;6,3,12086,-2,0,0,883;7,2,12213,-2,0,0,883;8,1,12422,-2,0,0,883;9,3,12422,-2,0,0,883;10,2,12541,-2,0,0,883;11,1,12766,-2,0,0,883;12,3,12766,-2,0,0,883;-1,2,-94,-110,0,1,1363,1044,37;1,1,1379,1029,47;2,1,1396,998,59;3,1,1413,888,96;4,1,1429,792,122;5,1,1446,698,146;6,1,1462,590,170;7,1,1478,520,186;8,1,1496,478,196;9,1,1512,442,204;10,1,1530,418,210;11,1,1546,406,216;12,1,1562,400,217;13,1,1621,400,219;14,1,1630,400,221;15,1,1742,402,221;16,1,1750,403,222;17,1,1763,405,223;18,1,1780,410,223;19,1,1795,415,224;20,1,1812,425,225;21,1,1829,431,225;22,1,1847,442,225;23,1,1863,455,222;24,1,1880,470,216;25,1,1896,487,211;26,1,1929,506,206;27,1,1930,523,199;28,1,1946,530,195;29,1,1997,531,194;30,1,2026,531,193;31,1,2029,530,191;32,1,2046,529,189;33,1,2063,527,188;34,1,2080,523,184;35,1,2095,519,182;36,1,2113,517,180;37,1,2130,516,180;38,3,2334,516,180,520;39,4,2480,516,180,520;40,2,2480,516,180,520;41,1,3070,518,178;42,1,3078,522,178;43,1,3086,525,178;44,1,3094,527,178;45,1,3099,531,178;46,1,3108,533,178;47,1,3116,535,178;48,1,3125,539,178;49,1,3133,543,178;50,1,3142,548,178;51,1,3149,554,178;52,1,3157,565,178;53,1,3165,576,179;54,1,3174,592,183;55,1,3181,617,189;56,1,3224,844,245;57,1,3240,964,271;58,1,3257,1092,297;59,1,3273,1194,305;60,1,3290,1278,309;61,1,3307,1350,307;62,1,3324,1418,297;63,1,3340,1464,289;64,1,3357,1506,285;65,1,3373,1544,281;66,1,3390,1590,275;67,1,3407,1626,269;68,1,3423,1648,261;69,1,3440,1652,251;70,1,3456,1654,247;71,1,3629,1653,247;72,1,3637,1649,248;73,1,3646,1649,250;74,1,3654,1649,251;75,1,3670,1651,252;76,1,3687,1657,239;77,1,3704,1664,225;78,1,3721,1672,213;79,1,3737,1677,205;80,1,7228,1617,184;81,1,7244,1537,200;82,1,7260,1405,218;83,1,7278,1159,238;84,1,7294,973,254;85,1,7311,775,262;86,1,7329,557,270;87,1,7345,357,274;88,1,7361,197,284;89,1,7378,83,268;90,1,7395,9,236;91,1,7411,-1,-1;92,1,7606,4,218;93,1,7615,9,219;94,1,7622,21,222;95,1,7630,39,222;96,1,7638,64,224;97,1,7646,94,224;98,1,7654,128,218;99,1,7663,160,216;100,1,7671,192,214;101,1,7678,218,214;102,1,7686,250,214;139,3,8277,480,178,520;140,4,8409,480,178,520;141,2,8409,480,178,520;176,3,10288,510,244,883;177,4,10391,510,244,883;178,2,10391,510,244,883;234,3,20817,406,425,1242;235,4,20936,406,425,1242;236,2,20942,406,425,1242;-1,2,-94,-117,-1,2,-94,-111,-1,2,-94,-109,-1,2,-94,-114,-1,2,-94,-103,3,51;2,6537;3,8264;-1,2,-94,-112,https://www.itv.com/hub/user/signin-1,2,-94,-115,169649,606167,32,0,0,0,775783,20959,0,1665862462846,6,17820,13,237,2970,8,0,20960,652788,1,1,49,951,-446417374,26067385,PiZtE,78068,22,0,-1-1,2,-94,-106,-1,0-1,2,-94,-119,-1-1,2,-94,-122,0,0,0,0,1,0,0-1,2,-94,-123,-1,2,-94,-124,-1,2,-94,-126,-1,2,-94,-127,-1,2,-94,-70,-844419666;149504396;dis;,7;true;true;true;-120;true;24;24;true;false;unspecified-1,2,-94,-80,6510-1,2,-94,-116,332483235-1,2,-94,-118,171916-1,2,-94,-129,,,44f5478a49e419c98b42237f92350e68f367f4784614425eab4847066ff6289d,,,,0-1,2,-94,-121,;8;1;0'
+                         'Akamai-BM-Telemetry': 'a=&&&e=QzNGMDA0RjYzRDkxQ0IxOTgzOTg1NTYzNURDMkJEMjl+WUFBUU5NWWN1S2p0cHl1TEFRQUFJcUNhTkJXaWlSczVGWHRaWUtKRWdCd0VyWDI0L0ZiY051QkZwYUwyWTZldUxkWVQxYTNJSnRtQWxnQkh3UTA1MGt0cWVkR2t4YTVlbzZhZ2VhN1h0QjVTQXZDOE5CYkZsa3Y3cXJZbzB1WGJXbXd3cFlSQkZDeUNTUVZGNWRpTXQwc1RCWm84UGxGVEEvTVF5ZHlJemlob0NuSXpJMFpHRkVjVVJWNndockRLL0xnRzJLZ2poYVdiNDBTYitROW5oRjd3S2JoZW13eEVOazBnWFVJd2ZiRGNYSXNGbG5IUFZZWWswQUl6WWw4SHZ6d0xZaE45V1g3QmlTSnlBcDl3blhFVzVOSm5lbWNBemdYcVlhZzdwRDQ9fjM2ODc3NDV+MzQyMDcyMw==&&&sensor_data=2;3687745;3420723;51,1,0,3,7,144;@ct!5<%NXRG|jFjgYKgceeq[! XBK_A0Rc65Ycf5S^bq2T%w=9X*7`Z`-dYT8~Kk:~u~dyl^o7jis_#kLSea<T^79QMQUy4Wpqdr|ak.o[m8CrC@r4`KuFE]!~L+*NxEuCu9`Ua;!#Cv2{q.uY=)EJZ`D}&de{^m2aPoGFw=J~3oD9|8s@M;z6:Od@Hb~F}EYH+[3ZsT8YpL{vKp#,]b5}MeWPWn4hQ#tX,]5=`A=_xP8)1R?Q?bF BSN5cgK%dEkQ;uq->F-Tq]=E13%8/%s`xD;.TvR#vUQ,1^?ax}s>mX8E(e) >TC-MrykAX_Q4<?ovlt>x6K$B=A>Jv?$%yQLe~ICz=,gdSWIH)}CjmP,Y~o$w/CWgihR&dsvU!m_]PGMO7(^#,?zTD7U[z%QWtjh<%9Bk@6$4+:17$([&;EPC2i3?ad:GccdR$@K-mn]cVwm$ome+7N@{%5Mf2;.bmNUI2HTFutr!$MIdZZ1&AQ@5E>lrNiK^!/:*x?L=04#;Idr%/-r_vC:(<?v5j6h!Sjva[<E2&-,EP(5LKdM9i2!v1F~5y>(=s-G80`.tls}Mc6Gqt q_<ZeYw2g0xC%[3O]ab-ZeH~~Bc0OjvA/1]&35NnK Iy7/i&$M.-_.WB24S}jp, F}x}/<-#5b]-+Z=g4,AGM&%#^:Y;.1vm@!#fv,Ls^2=teE$V04S%noxLc<cFcPh0CF/gx9b8*[gBIwtBu(A}h((Ux_2$;(M|6F3o}6{S>3(uj[C(a{:~u)(i2|R?jIX81PI[ 6lXH6E:5.+U9Zwe]w$e.|WP$w>*7`TNn/pBQAJDO=G}l%WS?c{Ul)s]>,d@_2 z; ];=3LGP^P97R ! IYBzw_eF0v]vNQOvA<y0,HCUN_ICbF>@t<&VaFM76 a5ggg>me_qa$#SIZ`E VYi5aU;@7;(.x^7pz+Z4+&;9_t36_IL!ec03Nqa|nwf}VR0d} cEEBZd69rrC27vad h2527-<BOO:wag$dMMYz&Ws@Oqj#jHe1jJ>1JFrd:}lZ3ns]OWf(Ei3YtIH]E5Plo@G?^Ww*EEH3q>YV2i^y>-8{@gx<zo$PG)=?^i*9`YqKLb80|;J!6>&PL|(SDCo9$s~,Dc+<wx+qr@eaHr0m3p;-I-CaUPm33Lda>J}Bts2~ NzywGXOqi,nM*>mnvW!wt.Ey,n+cf~,+lB@Ik*oD6n_4{<hosR+14^sP[NpB[~q%XGMP|J8wYA=me+VhtcCDNi!g,y5x4Ulj_>JeEf]<2rhE6k:ZhU?FG{;$W8lCy?L_G8Fe@ae?@.1wkA*6V;ht#,A-cJ&mCvw+*k0A;a`IMFV/!hMa.qk#8mENH&4%Q1HdbKn7sMP9VH8nQ+n7NJI]!]B&eVB7ZIo2}q?mL;J6GCW@L/,Evtz5_EveXK2/k^oE=B`5(u%#8?LEM< Z,,)VwuTY1<%y_CkGON(SMX4mhv3;:0&U-AN(C7x{ju?kNMoO)d5r4Yq{8ThC4{~akv(a]#8I<RCH/,[3u3h>vra<7AADhgrH/iNQ6UPTPm_kkmG~1=(`ph:Gw5kp507te#H{NZ_lc#%73:iRp.|Xpt6lfdu.`[sYGW$hMNHns)<LFU: D`LA]a7L/?{2i|:rw=QQ2;9Vl-;YRbNHm.%w7=p5v<(Cu0A52h-!]. C.ac*?viT~GOE[%^x_1vEy6UKGx=;4ESz,>fX`g{b5{l]$D1R2pa7q+VKD,YdRk ^nN_O),U]@~ w=jJxiJBl_f78N2pgi%Ex>u@ilrz+vk &Tv^:<wkP&O05?y[ee/Q3ZDaHY),?t[w X,tMF,6sX,_~~fM`bDf<oO ]wphj]D[{G{oRT>N(vHD?SG;S`:K>qa* ?.g_%v3Y,mcSSUX4-gZk-}b+=$K)!X;)Y1LbQJi~oMN<SFO:G azFGBU{K)oXM4+Q5Zzwp5RC&/~;0G8B-xCcUW2H(_OQ:qnNM=M}#Gph^`Yj!/y-lr.mqm9qH/(wrdh< M));e;(#(-@Maezmc4jqjOpfGT;M*7|q1oo b(;#:?ek5?^EC}UkoK|xb^VyenPD Z[p`-61GH#+3AM,(Y:Y`D&rggi&&) )R9GO; +1Ic2@vtIDT8v-D)pbkl$/$R9E#X~, `i}@W.B 2Xft[Cj%vNZHmq6<TGa4vB^PE]X0CyG}9uu8if0TB+%4MR%%cPWS6V{}m|3g0a3b6Zw7/+GgrK[g69d{<EPGBr:>7Qh3XIz_(ao*.0e&~q,4[mRb)6N@IeC=Cs ](n]n$<T+(+[-.%MRu9z1{LR02b@NHt/y>7s[9(;ZmzG*5,T]8~ |&LlnwY8><x?j<7c/H3^tS;ygW:SnGnXgAXxLQ3z*9u!mL8JwJFuL#:u`l$DgBpe0l4hg#kHnkL {ecIB&t[<QfA:JY9R?l_)wBx}C,y2U9idOQ5C(4WJW#xa%<w;~nW0p?&@TTAXyb?biX.:$%qYq5/!?dBsjI<2Q^t:Z]P|H1e%E8l)&&iQiCK6e.h@:wn[T}u.XW`-KO0/)PKb[tBHn:9@w@.ee;?-)jd&WD[)qO:]Xbv5/G4)`/E?r^k/dalVa>5T19=|Ot-%_:lyPo^i;l)1j21x$ezs$kr@js*eDR;gt1;iw6%1mQif_+%e{{-3?$+Y6G_@.5-_e;Ev{GHZ:|8V5ribps7=I20|]t/(^tj8QC@sO-|bK2YtkGNFXe%3B;A)pCLK5CO#<k2i,]op`G.{Fj{xA=nn8@G,zGgeLf~IkFkLk>ZwkT}HK7ADl!LT{%?*w_W4b%AtC}J9Y0HdXg/`GD`j/Jn3Ldyzq7pze;R|Q<n].o,OIIzSUQfsQ[3X%?eSH-i`g5N=v`(&S8O{0*h@EAbw`z^uJi)55^ETO4Y5|_G7vZ(R_iT#96Z!U}b,[}>:>u!04.?$JeHR{nAp%B(qtz>#!>TAm(]lwdP]rQz|WfG9+oR}AZB47X!F:d+%nbi{?uB`N{X/vFc>#T!k/naNcWSNoP:D7b8J@_WB7|%*{Iz|=n g~G>i$:%GA}|]C Rr3$1RzfNA?NETNY:1Rxqj7J:q^ED@|WC_220Z~jUZ]jg-%?yo>l]k9gEy-ebSD6z?dyoX(s`lj#,IPcUO{ESh,TG~3x(usUXwJSO3hearz9Iloz!nL(=NsI:{,#4~D nDy*,}VVFnw=Iq|46:pPhmY-(v}y+&90&T=EhM2,(Mz3>*$9>K)v/E-abL$CM 108bR_3qUdl3F!8U$JEKB~LVD-?5>Gly%z)l`xI2o*5SvNmKi/BdJ6RxsHO_py>Typ}dQ C2+D]/=wH#Dy7O;3[*jvJ7<N$%NWbRHy4B/Ia=cUpK=/5.3{Wysdw-Vj5U~2A:2X73;QuFve3zV{A[biCzk^w-U$WmCHzq`:z!nAeOmb<6lGl98:sJUaz~]{_%[s07/oHVc6U<}vHCl_$aioS*;>]o[#k0V%EOc@x*9i9yycA4wa9mz@tP$W_WEmWrl#^djVATX9qjJR2,nf4 3E1vRy38wO0pO~M^0cEj(`C2#!o|hf7r#VD.GU<gF rO8nIZ|oe}6xVXDHY_?@{ 1FF7]|GzpGC#$E1M]ic-B/my_zq&uvSNs>67djh:3ie^D)j*MK@|?7 &&.+CEL=.G+~(Pk~rY#~gaH+P3{.b7/o-t@OampbW.faf?da<-15|-eTrWU_B}vl$ KNx!-{{M=I>1Y@(&*0(6 v:]y<ctdN}!Nr@SJWmE2I&^A$x,S=LH&Qe/; q4Z<-vZ,bmkT2QnwR6xgy[9E*%5OzGOOYMUpWhfO!VBFy{><!pdqAgeC&0o4MM$_cJym%2e|Ax-5<T_q~gYJHs+3{~Z3ACCDd8+Ra6sQKsri=h>)gm:wAs&M2vY[A,X=z#:`za*Q@V!slXoS)?jNO?H(6vZ5 gW~)y#*o(@|fc#5ON]{)?|kpeP_GW[5&L~bYkR+OD$y<a+UQTC5}kww{3jx?n;5rk1rY~Nd<TBSSHx~T=|.>WD3YT)8iO&w`IoQ%JC4ndSuD(.n~DVj[D{9sVWBmFpt~3Z!R&=f$T=s7~K4U^*%<M/JP8OS+R>];),BRdIuLx]fp4KXmt#uwC_&.Dr2.Cm2PlyK;~+5E9[5e|xZDEvjSu0dI:gcL<nC}/|l:UQ.8.8853Aon8[TQo9~QB/% f1rAipe.NG%0-LBVP^C9n77/Y$nVC29&k_8b0-3s:0~2 :Ff]re_5e`i9{7X4(/|.dY$NMcDjnmrq6?jkz{vI#(7pA;y!t#k$cc3_kvf=??Q` &_`%z&c5@W=`]WR`nb|UU8ly@~aid*)bn:TplyU;cmU-&&02CGMIE4~)R/mp.Te3Dt0TWkZ@b{W5=@PqQB22-v^w@&u8+bwOsCr74SH-KvZBNHe~CD`[rMGu50s,Ak4p?e*_!7uv3eV>N_&-Qi%(:%|Pxyh-4j7{C%Px7TJOuV@:GM|0Vz9JnSOvPKYl1[6zF9bHS|osA(}!?Ii&WnOZ!piEq)%OkJ%f=,eJb1+=xFIHj+T~SyR_,u Z<KW~@zcG-(iNm;MS4jwx>Y-Z<^@ex-%oNcnyeR3+MlK:m@siw/6et&70MDRJ${[qdu^kZR4fX!a({2H^@cHu}o)/xI6bf8Ue^o,sB6v)iyia3q=M:-AN/RN}h=<X:HdMDv*jCJ66@?1$bNl3,z3O)dS8,cP-V#@<.Orb<P=?x*WO$&FgeU/C!^V<9pfF!Chsg9UK>B4JCRW]M4x=86[YC(T.)~}[4`+@Au<+v$(EO`WpVYwS[d5aH)(x|qpVBp>LS5hVBYc0;KPi]j/hq}g8~def`ZcPJz]Vh; -xD>ho5JbXS@{56kGE41;GNG8<fRny_1B:ei3Fr*:JL(r/Iz[aQhVzt)}}^GekMB>Gh,L/|}| .,qz@5hafky;D^XQ;yBcU2KJ%5w<sxM^sjQx,s^ji|4WWo| tj-D:(;Nz@ C.DpuC(+R!fRdm5Gfr33B:.Wr m/;n@ W,Q$[[PI#EC/OY!<ht<GdMJwJXFk-Z1vG)Y;XqkrM|xh.5ewRnIIe`q8mpo;Y4jU<-[/K{s+Y<A0arIc>a0IgdoP!*8Y}u9EvmB}Orx5cPIR$:kCxAsT#rvcA(S_(qHO~&^Kvvbp{IcgU=_YAkUwGMR:$3K)QK+&~rUFySmub[glNeMsj3 @y;</p,I-gWD<4A(wY-JmL@P4$6V:wYApIY&ukz?}MUFULYAIxVwK@.CZ0m[I;fh2f-I51R#uLJ:OFcOV=sIll]$E2[M<=$o;{Auki3XHIA+GFUVcG/Z#3-fRq{%OT]|a[K*.z[I4~BsWZgHb/ tAi,H?4o{oy]]A-Z!3Tn::-D@#ZW;PC<tFn=b]aCG>MAA.{S+,Gz]eVep-Dd#9.3nPZbNrvVrf w!gb<{28#[kW*;czB[umte=_kO $p.$9<O@K~R!8{_ki6;}3]vAFO|)@i7t&v69UXyjdd7Sp^Qbp0NyHz:iuu9:~UBauo6>jg)zTX,,G=/JZ&A1S{Dq%;%&UupNe[13Wp.6IQ4Hx!qWto2Jo#~ <N}NBFf*MOq/VsaF}yIyEDATuEu6lHK!o`_70[k[N(Fgm]0kPvOTEYe|F{G[U%*2t(T~{?tq9U*Bj7m,C>M!umc;iJ+iN>75KH_lE!3&Sf<iOxDj,59rWc|EkP66ylH9^-KVRZR)]{W#mC!9mn)lVgxKtjg,V+4Kbg~4}y~5Y$sC#O9`/IcK3GbAxs_[BD*{b;YmXKhuZ$kC$hO Sj%uh,R2aSFXDUC:(`|E4*^i3nZVp-U1e+@ACYsazyAzE%Gu*{ihb[ m)S}])j6>v83U3VXp)!O16y?Af%H~{Qvj~1QDlY!0wDcn==vXD_N}s(.1$(Kz!A8Gng^=_6+rhGcgsD~v]o}<Dlo9I$ c_kbVV4mk)dhq_7+c5l6,0zz<h2?eW]=f,0|F3.2,D5B$%eH`iG !&JZy,bd0|6sKk m=Pe]7jUcVMGSRD*l}|G_{Qp)RTgJ,HaG($&<H]ktpsbD]y`Pip<SC%N# j-i^#H5soz39fm#0Bxd{O91M`(>uDwCl*4AWjgaDWb$-Y`%-oqO}ubNl/SdKg};z0C.:bGg5};`l2q[C54(U,(!DV4U=zS-ay56?0g_Enu [Qo=PpTi-ol;>X- .+YjM]EhJQ2} `2r56oKKv-)`Y.[(EqC3uiCwI )2eCNOu+^&o3u+PQW4!(=q:(LU+1g]|S^lT?HM~HqH{Q*Iy-=u`{%j-y^Y@J,yG$3T-)*8eH=X? W]L1E4o33.NJ;b+4m#ePcwZOf|M}]E3dGuXa~n_~4$fjVLIH^tAO*<!{MZ.(7N}hD)es=2.En_4=}9>yk}y`CY@:d*h=.xwSG asIF@^+#Yeb&x(!!kX.VZW:D!he?N3-_I{HPCwC6-,0AM^efaN,SsFZQ?1+ptctI<]159oL==VB%Sa-K>>pMGU*yM/^t-osRFPa^2dMM<_g)4L_xnxW-@J0aVEM=OKu.arTdu[<<;K(se'
                          }
             )
 

plugin.video.viwx/resources/lib/itvx.py

@@ -161,46 +161,67 @@ def main_page_items():
 
 
 def collection_content(url=None, slider=None, hide_paid=False):
+    uk_tz = pytz.timezone('Europe/London')
+    time_fmt = ' '.join((xbmc.getRegion('dateshort'), xbmc.getRegion('time')))
+
     if url:
+        # A collection that has its own dedicated page.
         page_data = get_page_data(url, cache_time=43200)
+        if slider == 'shortFormSlider':
+            # return the items from the collection's shortFormSlider
+            for item in page_data['shortFormSlider']['items']:
+                yield parsex.parse_shortform_item(item, uk_tz, time_fmt)
+            return
+
         collection = page_data['collection']
-        rails = page_data.get('rails')
+        editorial_sliders = page_data.get('editorialSliders')
+        shortform_slider = page_data.get('shortFormSlider')
+
+        if shortform_slider is not None:
+            yield parsex.parse_short_form_slider(shortform_slider, url)
+
         if collection is not None:
-            col_items = collection.get('shows', [])
-            progr_gen = (parsex.parse_collection_item(item, hide_paid) for item in col_items)
-        elif rails:
-            # Do not sort this list on title
-            return list(filter(None, (parsex.parse_slider('', rail) for rail in rails)))
+            for item in collection.get('shows', []):
+                yield parsex.parse_collection_item(item, hide_paid)
+        elif editorial_sliders:
+            # Folders, or kind of sub-collections in a collection.
+            for slider in editorial_sliders:
+                yield parsex.parse_slider('', slider)
         else:
-            logger.warning("Missing both collections and rails in data from '%s'.", url)
-            return []
+            logger.warning("Missing both collections and editorial_sliders in data from '%s'.", url)
+            return
 
     else:
         # A Collection that has all it's data on the main page and does not have its own page.
         page_data = get_page_data('https://www.itv.com', cache_time=3600)
 
         if slider == 'shortFormSliderContent':
-            uk_tz = pytz.timezone('Europe/London')
-            time_fmt = ' '.join((xbmc.getRegion('dateshort'), xbmc.getRegion('time')))
-            items_list = page_data['shortFormSliderContent'][0]['items']
-            progr_gen = (parsex.parse_news_collection_item(news_item, uk_tz, time_fmt, hide_paid)
-                          for news_item in items_list)
+            # Currently only handling News short form. The only other known shorFromSlider is
+            # 'Sport' and is handled as a full collection.
+            items_list = None
+            for slider in page_data['shortFormSliderContent']:
+                if slider['key'] == 'newsShortForm':
+                    for news_item in slider['items']:
+                        yield parsex.parse_shortform_item(news_item, uk_tz, time_fmt, hide_paid)
+
+            if items_list is None:
+                logger.warning("News shortFormSlider unexpectedly absent from main page")
+                return
 
         elif slider == 'trendingSliderContent':
             items_list = page_data['trendingSliderContent']['items']
-            progr_gen = (parsex.parse_trending_collection_item(trending_item, hide_paid)
-                          for trending_item in items_list)
+            for trending_item in items_list:
+                yield parsex.parse_trending_collection_item(trending_item, hide_paid)
 
         else:
             try:
                 items_list = page_data['editorialSliders'][slider]['collection']['shows']
             except KeyError:
                 logger.error("Failed to parse collection content: Unknown slider '%s'", slider)
-                return []
-            progr_gen = (parsex.parse_collection_item(item, hide_paid) for item in items_list)
+                return
+            for item in items_list:
+                yield parsex.parse_collection_item(item, hide_paid)
 
-    progr_list = sorted(filter(None, progr_gen), key=lambda prog: prog['show']['info']['sorttitle'])
-    return progr_list
 
 
 def episodes(url, use_cache=False):
@@ -379,11 +400,11 @@ def category_news_content(url, sub_cat, rail=None, hide_paid=False):
         return []
 
     if hide_paid:
-        return [parsex.parse_news_collection_item(news_item, uk_tz, time_fmt)
+        return [parsex.parse_shortform_item(news_item, uk_tz, time_fmt)
                 for news_item in items_list
                 if not news_item.get('isPaid')]
     else:
-        return [parsex.parse_news_collection_item(news_item, uk_tz, time_fmt)
+        return [parsex.parse_shortform_item(news_item, uk_tz, time_fmt)
                 for news_item in items_list]