From d299c91eede56dde90feaefa7417ea3af633d574 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Dav=C3=B3?= Date: Wed, 4 Jan 2017 18:56:41 +0100 Subject: [PATCH] Fix #4 --- README.md | 12 ++++++++++-- changelog.txt | 15 ++++++++++----- resources/lib/engine.py | 14 ++++++++++---- resources/lib/interface.py | 4 ++-- script.simkl.zip | Bin 377227 -> 377627 bytes 5 files changed, 32 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index 1356945..694cdc2 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,19 @@ # Kodi ## Installing -1. Download the .zip [here](https://github.com/SIMKL/script.service.simkl/blob/master/script.simkl.zip) +1. Download the .zip [here](https://github.com/SIMKL/script.simkl/releases/latest) 2. Open Kodi and go to Settings > Add-ons > Install from zip file, select the zip file 3. In Settings > Add-ons > My add-ons and search for Simkl TV Tracker. Click on it. 4. Click on Configure to configure the add-on (Login and scrobbler options) -5. Please report any bugs [here](https://github.com/SIMKL/Kodi/issues) +5. Please report any bugs [here](https://github.com/SIMKL/script.simkl/issues) ## TODO: - [x] Add LICENSE.TXT +- [x] Make it work (more or less) + +## Donations: +It would be very nice if you invite me for a cup of coffee: +[](https://www.coinbase.com/daviddavo) +Bitcoin address: 1PcbSQrBddJszsTiRhqHyLntp7Lxfuyaio + +Thanks, you can write me an e-mail to david@ddavo.me with your receipt, and I'll send you a photo drinking the cup of coffee you invited me to. \ No newline at end of file diff --git a/changelog.txt b/changelog.txt index 1bad70f..a122c27 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,6 +1,11 @@ -v0.2.1 (2017-1-1) -- Scrobble working fine on windows +v 0.2.2 [17/01/03]: +- Fixed #3 -v0.1.1 (2016-12-23) -- Initial version -- Added notification bubble at scrobble \ No newline at end of file +v 0.2.1 [17/01/01]: +- Working w/ Kodi for Windows + +v0.1.1 [16/12/24]: +- Auto scrobbles +- Shows a bubble +- Nothing more +- It works (I think)[on Linux] \ No newline at end of file diff --git a/resources/lib/engine.py b/resources/lib/engine.py index c838294..a52a0e9 100644 --- a/resources/lib/engine.py +++ b/resources/lib/engine.py @@ -87,10 +87,11 @@ def onPlayBackStopped(self): imdb = movie.getIMDBNumber().strip(" ") fname = self.getPlayingFile() thing = xbmc.executeJSONRPC(json.dumps({"jsonrpc": "2.0", "method": "Player.GetItem", - "params": { "properties": [ "showtitle", "title" ] + "params": { "properties": [ "showtitle", "title", "season", "episode" ] , "playerid": 1 }, "id": "VideoGetItem"})) xbmc.log("Simkl: Full: {}".format(thing)) - media = json.loads(thing)["result"]["item"]["type"] + item = json.loads(thing)["result"]["item"] + media = item["type"] xbmc.log("Simkl: IMDb: {}".format(imdb)) xbmc.log("Simkl: Genre: " + movie.getGenre()) xbmc.log("Simkl: MediaType: " + str(media)) @@ -112,8 +113,13 @@ def onPlayBackStopped(self): r = self.api.watched(imdb, media, self.getTotalTime()) if bubble and r: - interface.notify(getstr(32028).format( - json.loads(thing)["result"]["item"]["label"])) + txt = item["label"] + title = "" + if media == "movie": txt = item["title"] + elif media == "episode": + txt = item["showtitle"] + title = "- S{:02}E{:02}".format(item["season"], item["episode"]) + interface.notify(getstr(32028).format(title), title=txt) r = 0 except RuntimeError: diff --git a/resources/lib/interface.py b/resources/lib/interface.py index 9289bd2..81bfa19 100644 --- a/resources/lib/interface.py +++ b/resources/lib/interface.py @@ -12,8 +12,8 @@ def getstr(strid): return __addon__.getLocalizedString(strid) xbmc.log("Simkl: Icon: "+str(__icon__)) not_dialog = xbmcgui.Dialog() -def notify(txt="Test"): - not_dialog.notification("Simkl", txt, __icon__) #Put an icon +def notify(txt="Test", title="Simkl", icon=__icon__): + not_dialog.notification(title, txt, icon) PIN_LABEL = 201 INSTRUCTION_ID = 202 diff --git a/script.simkl.zip b/script.simkl.zip index 95792801157e760a84e6306f67830f95c38780bf..1ff26b0aaa92bf23d938b6fb9f6710c9099d6508 100644 GIT binary patch delta 5382 zcmZ`-2|UyP8{ceS$Hbi3z#r3= zh|1UcI*xOH)`^;3#@3PcY{ZN`P`KCtP@n{>iP4#+Y59FQ>_2(aL8Zlrzb zmyJ9`^Ik)h%`LFAtpaf@OpI%u!f-V`Qlzv!MrRAMC$B_0h%h;^U?m7n2?B06g%GmC zQk#QC$p}u-9PA-RPfXf^oAZ_;1qf6M!8U}0dH+H+H{_il*tUfZNQ%5u7ghb8ByG^DV2XFZflouXP1@8|4V4NN`U-%1~+5c`oy8c-H zmyOBmNV@lHA4CgoegFLP+sieH?m)ZEH*|u1!a@4!OfgPhY5a#+-=V{3A8PivAs?!k zS$bqsucLgk`BthaeCvS1g*?@QimTBe=L5a1BRo*dq(mM1$UH}h^&bfz(G|aZ*Y2wM>?pzXTXO_=<>K!6?p=+Sc<;3~&wiHS6 zTsyVG6g?nIH{UA*J{Jccs5Si2G8YwrY4P$Dd#tqT;mvP_huKPwM;yL=1u+&V?T~?~ ziIqvTpNPDe=8W?_L%eQ14pH%ZHr#D*J_>+NiuF%%Pn(+6qmNJcINbbP08*!Dw2>S;_+I1`#fY_z1hbQtXka8*^1s%hNU*|xtx{27zjynOKPTl31oC?HkS6(m!5GMNX<7@N40sN1~G20!zoMCsmXZB88c)&Yz(bBi6M0 zf|F5UQED*0v37xP6ITP`)sA=f$|!TpEZ|3%7w{ZoThn&MA3GzL6Fu`6fkp2R_#yG! zgSG*ZA!k-zPRVNY&z0Y2F?x!bD$*>Lo=STmt>t(af0nn^Q>#*UX_~2qd4~J(kYLB%FjaHs{NM(Y2YG8e7$pNnQ)i3Q)5}zlV?H$oli~*`7Kx*s? z+sU!>R#~xK{Sg|8!#~=F{GeG6RytXK`k*(hCD3qe;@sQg9mWbee$6-iOm4Tb+&jbV zSU0rVGyHvZZN|#QbE2n4y>QYkkXhL-w^BEUS1o_*)E%j`n>LM-IruIKp;8XN--<)r zZEPB*C`%?S*sU6{XE*G@2u9+LkY29F2OgTdI|ojeQ3anmiiUm26DS;PpJP~PjppAf zeCx?sy>u@AA-?9E;c#-9x&8=~3x}(7ih8vlW35?h=!kr99FoG;CR|(Gvw_;Ri{IEihb6ixT@o;EmM+VZDuEzFRTpC|42G|RaC}9%C-%odNRbaNPH&0 zplN?4k34-{&iLR0VubTCPpT90YJ<3C*xJ?jT&MJTl*id5SzN=m{pddj=95xu=UQLY5(3vdmk zQz}-XQtj0S+C@-tHRkFV?yWMl{B@})x=R!bQie9xPEK_dQj8-iV^VypxARXRp}t!+ z;~bmt2DP^*OJALUF-@LM6PK7sl3Ei;*-sl%clD-2R;rC~SJQagX?zpErhTQG*`4`w z7{m3+;?JBvUKzw+vHMs$i~6M+7s>RcC^*h+#W=glPTOvkq3G-u3#Meg1(IEw!DZB^ z_}#?ag0cSn0~%8%c_Y5}PhrJO#C@aKa85ZsNs%{);INUo(3IX0BiN^7*yi_M;v?HHSJ8d0lBHyB{hV6BFZJE6}hUD)O2_E)M~q ztXFJ*v9n${UR9+~HEN3a?#?kq`KYiq)0|l?H8J{3<&hhooemUtcJ#FkdMc03r+26! zPcxX#IO|6;3_Odm!$hd&h7PU^{D_Izbm0| zG;CZtE9_Vb5pimGrl%|PRr6Z3@q;u`nTw{NA-m%SYcE~z;xwZ4Fv_ky?*9I1a%j!< zcK#w8p?!|2VLUL85FY=bB8Mjx7RAYK#ywb7^qI%Gep2{q!P=xYvBkpUgI^`xbPrfJ z<|ydooqOmBa~6ahgTqD+-<(xY_#$Qcu1f83Ql5bc_(j1TykPn7iXacJcdf-SVbAVQ zN~$DA&q)VBT8itYW-ukqs1Lb}DaiTUp#_utn`Oh4qh9j9UY!kjuR@VS{26jag(oyd z3f>g|JgD>p9c3)B^xGdITatdcx_VYIcq3w*!uRt=e~4CNVZ7dO0?+I0@aWCv?1*p5 z@mB;peM9L@Ort=hqTfeHsYQI45nOK-!QDKOX)Byd$5^|+Aw)5HK9+h8=Df;n<^~>W zc=qzk5%Y^54Yt@r+)En<@oajkHFdw#e=kUX!z?^)z_T;o4ce#L7hCrvV?n&0x|+Z3 zQYDi5m2H>R=SNQ0=`H1Aic~lhiqrL2J#Gb6sX7+8_0<$o$cGN&KD=LbbWu9c>R!*O zF3J>Z_QNtn%k_z~x#zv%>uj548BLk=`V*^8Ym)T-5nchIybEva-}mcs8(TQlwqXS? zV_fjr@>W}iyGMSi<{>J?@D_{>_V`JcE%=_Nyf*1^Px`{%cmVKX4ekRBdmaX)w!8h3 z*m@$Ny=KJ5+y^B8_6$IqIuo7&EL)`)Jx<%ENC`(~+9*3H1B6a=U#&i)@Y@?a45*08 zh~8Wt!|?ihztPy-3;J&m)Q7C@ZpyFU>pX+iv$9&KZ4hbt9Gox?6%A~>p*wwkfo&;n z^g@FyQ!KZRsblZY=Nq#a)wY5bpPK^=i)eJexYoIcTH!yOTWlQIFGg3_%GND`D2wAwXOTl3KguHuF#Ygk_0bZ=S8WN@3L z4wI!8Ej$^=^8#5zxq{KkiHcg+^y5caK{UGT(*rx&FP@+IJiXZCd;~|sZgb4G(x95r`9{H@|<48U;kljZ!JtQQ9>bUdGQfa;-GZ#?)1=_DW_4_x96VE~?)t0zi6q`H z*PeaykB(PRs5)xdhk3d-6X>7FSNw{5Bp&i{H#~rt`C2@7z4}tg>THWa z!ir7tiz0ORW;gri<;y9YoH|3{=YQST3$t1OV0T@qAWx{?DB%)j&{t*1SFHYuq;b#p z+Bdb&Hl$LAPxop>(ApH{mfl(Fkv+3yaj3{+wx5$Z@PJ=^&cuhCb+9^ELdW#j#sU}Y z=hw*LFA>e&h+)CF4jo#*gDnEz3|Y2}_ECmeZB~b*1kE*B8roz9=m}RbS)ybex*>tV zOGdE~a~Y4nCq0(!Iyu~DGAaM%9!|*lGww#PVauagZl0#%dkLvQS<%*I1D+T6UGB=x zLPP6bUvG5lI=DgF^MCHuSf2;L3GyDt)jj~msYxAVY8fCwHt#fzi)Fx0uPa&(B$K!u z<-niI0dBJ#$lh)x?>++LiG3&b0}kNWdtt{ys{pA#7)ivU3OE2c3;`u_LJ*VysbM8K zsu26nfbUl?pA`dvbRs|?1mR75feD}7ARcot$jjE#(cN3r%hA=@MNC&qRbAg$UDVsp z+tg&24)@;6GYGVQk4`66tQz1VhqNCHZvrSuak*6!;xdZ@W5Kat1odvoU8F7|DSw;9 z^*54O4T1D)o5cS&QW}wDb(=ICKX$wZfRSV3AcX_N5%3l=u8#w_$@s2tVu>X7IFg9y z?qU)pl4}VdW*Zd2YS#j+WQFY!f{6G^Jjq!E`?3~b+>8Gr;sekB!8IQPY5>qf}{Tvv?y+^cH2})W4 z*q)P6*shFrRsBE%aDZYc345;zV8^-Ta*FpUI*Kulfoj;A@MK&o|5P0kj5i+A#}UK+Ro-r6G9CF9oaJ^ zG?(Zmy0@ImO@svS`P+iR%{%L2R}rn62^@|JA_qxlXYFlGxH<1SKuFWlMC5pGbFggX zdjmT~EOTbE`>PN_nLj~6Ahtb$X;%V!k18*FPhUq{dr|jme+IH|0eC36s|iyC`X7AB BfSCXQ delta 5102 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 VHA#ot8;<6mf_&5w#l#{3{{yfGKMnu@