Pre v1

Author: daviddavo

.gitignore

@@ -90,3 +90,5 @@ ENV/
 
 # Rope project settings
 .ropeprojectKodi.rar
+
+script\.simkl\.zip

addon.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addon id="script.simkl"
        name="Simkl TV Tracker"
-       version="0.2.4"
+       version="1.0.0"
        provider-name="David Davó / Simkl">
   <requires>
     <import addon="xbmc.python" version="2.6"/>
@@ -14,13 +14,13 @@
     <disclaimer lang="en_gb">Currently under development</disclaimer>
     <description lang="en_gb">Automatically set Movies and TV Shows\Anime as watched on Simkl.com. Simkl knows what you're watching, tells you episodes you've missed, and connects you to what your friends are into.</description>
     <platform>all</platform>
-    <license>Not Licensed yet</license>
+    <license>GPLv3</license>
     <email>[email protected]</email>
-    <source>https://github.com/SIMKL/Kodi</source>
+    <source>https://github.com/SIMKL/script.simkl</source>
     <assets>
       <icon>resources/icon.png</icon>
       <fanart>resources/fanart.png</fanart>
     </assets>
-    <language>en</language>
+    <language>en es</language>
   </extension>
 </addon>

changelog.txt

@@ -1,14 +1,20 @@
+v 1.0.0 [17/01/25]:
+- Ready for submiting to the Kodi repositories
+
+v 0.2.5 [17/01/22]:
+- When Scrobbled using filename, get data from Simkl. Fix #11
+
 v 0.2.4 [17/01/15]:
-- Fixed #7
-- Fixed #8
-- Fixed #9
-- Fixed #5
+- Fixed #7. Rescrobbling duplicate.
+- Fixed a settings button (#8)
+- Fixed SSL Timed out (#9)
+- Enhanced login (#5)
 
 v 0.2.3 [17/01/04]:
-- Fixed #4
+- Fixed bubbles (#4)
 
 v 0.2.2 [17/01/03]:
-- Fixed #3
+- Fixed Reescrobbling (#3)
 
 v 0.2.1 [17/01/01]:
 - Working w/ Kodi for Windows

resources/data/compdate.txt

@@ -0,0 +1 @@
+2017-01-26 17:04:00+01:00

resources/language/English/strings.po

@@ -74,6 +74,30 @@ msgctxt "#32028"
 msgid "Scrobbling {}"
 msgstr ""
 
+msgctxt "#32029"
+msgid "Error at scrobbling. Retrying ({})"
+msgstr ""
+
+msgctxt "#32030"
+msgid "Login successful, {}"
+msgstr ""
+
+msgctxt "#32031"
+msgid "Couldn't log in"
+msgstr ""
+
+msgctxt "#32032"
+msgid "You are alredy logged in as {}"
+msgstr ""
+
+msgctxt "#32033"
+msgid "Continue"
+msgstr ""
+
+msgctxt "#32034"
+msgid "Cancel"
+msgstr ""
+
 #msgctxt "#"
 #msgid ""
 #msgstr ""

resources/language/Spanish/strings.po

@@ -49,8 +49,8 @@ msgid "Simkl login"
 msgstr "Inicio de sesión en Simkl"
 
 msgctxt "#32022"
-msgid "Enter to the following URL: {}"
-msgstr "Entra a la siguiente URL: {}"
+msgid "Please visit {} on \nyour device and enter this code"
+msgstr "Por favor visita {}\n en tu dispositivo e introduce el código"
 
 msgctxt "#32023"
 msgid "Remaining time: {}/{}"
@@ -70,8 +70,8 @@ msgctxt "#32027"
 msgid "You don't have internet"
 msgstr "No tienes conexión a internet"
 
-msgctxt "#32028" 
-msgid "Scrobbling {}" 
+msgctxt "#32028"
+msgid "Scrobbling {}"
 msgstr "Scrobbling {}"
 
 #msgctxt "#"

resources/lib/engine.py

@@ -84,18 +84,19 @@ def onPlayBackStopped(self):
     '''Gets the info needed to pass to the api'''
     try:
       movie = self.getVideoInfoTag()
-      imdb  = movie.getIMDBNumber().strip(" ")
-      fname = self.getPlayingFile()
       thing = xbmc.executeJSONRPC(json.dumps({"jsonrpc": "2.0", "method": "Player.GetItem",
-        "params": { "properties": [ "showtitle", "title", "season", "episode" ]
+        "params": { "properties": [ "showtitle", "title", "season", "episode", "file", "imdbnumber", "genre" ]
         , "playerid": 1 }, "id": "VideoGetItem"}))
       xbmc.log("Simkl: Full: {}".format(thing))
       item = json.loads(thing)["result"]["item"]
+      #imdb  = movie.getIMDBNumber().strip(" ")
+      #fname = self.getPlayingFile()
+      imdb = item["imdbnumber"]
+      fname = item["file"]
       media = item["type"]
       xbmc.log("Simkl: IMDb: {}".format(imdb))
-      xbmc.log("Simkl: Genre: " + movie.getGenre())
+      xbmc.log("Simkl: Genre: {}".format(item["genre"]))
       xbmc.log("Simkl: MediaType: " + str(media))
-      #Scrobble from filename only for testing purposes or error of other methods
 
       percentage = 100 * self.getTime() / self.getTotalTime()
       pctconfig  = int(self.addon.getSetting("scr-pct"))
@@ -107,19 +108,34 @@ def onPlayBackStopped(self):
 
         xbmc.log("Simkl: Ready to scrobble {}".format(movie.getTitle()))
         if imdb == "":
+        #if True:
           xbmc.log("Simkl: No imdb - Fname: {}".format(fname))
           r = self.api.watched(fname, media, self.getTotalTime())
         else:
           xbmc.log("Simkl: IMDB: " + str(imdb))
           r = self.api.watched(imdb, media, self.getTotalTime())
 
         if bubble=="true" and r:
+          if item["label"] in item["file"]:
+          #if True: #For testing purposes
+            xbmc.log("Simkl: Label and file are the same")
+            lstw = self.api.lastwatched
+            if lstw["type"] == "episode":
+              item["showtitle"] = lstw["show"]["title"]
+              item["season"] = lstw["episode"]["season"]
+              item["episode"] = lstw["episode"]["episode"]
+            elif lstw["type"] == "movie":
+              item["title"] = "".join([lstw["movie"]["title"], " (", str(lstw["movie"]["year"]), ")"])
+            media = lstw["type"]
+
           txt = item["label"]
           title = ""
-          if media == "movie": txt = item["title"]
+          if media == "movie":
+            txt = item["title"]
           elif media == "episode":
             txt = item["showtitle"]
             title = "- S{:02}E{:02}".format(item["season"], item["episode"])
+          xbmc.log("Simkl: " + "; ".join([media, txt, title]))
           interface.notify(getstr(32028).format(title), title=txt)
           r = 0
 

resources/lib/interface.py

@@ -25,7 +25,7 @@ def notify(txt="Test", title="Simkl", icon=__icon__):
 #xmlfile = ""
 #script  = __addon__.getAddonInfo("path").decode("utf-8")
 def login(logged):
-    "Change the things that need to be changed. E.g: The settings dialog"
+    """Change the things that need to be changed. E.g: The settings dialog"""
     __addon__.setSetting("loginbool", str(bool(1)).lower())
 
 class loginDialog(xbmcgui.WindowXMLDialog):
@@ -51,15 +51,15 @@ def threaded(self):
                 if self.check_login(self.pin, self.log):
 
                     xbmc.log(str(self.api.USERSETTINGS))
-                    notify("Hello {}".format(self.api.USERSETTINGS["user"]["name"]))
+                    notify(getstr(32030).format(self.api.USERSETTINGS["user"]["name"]))
                     self.waiting = False
                     #Now check that the user has done what it has to be done
 
             cnt += 1
             time.sleep(1)
             if self.canceled or cnt >= self.exp:
                 self.waiting = False
-                notify("Couldn't log in")
+                notify(getstr(32031))
 
         xbmc.log("Simkl: Stop waiting")
         self.close()
@@ -70,18 +70,22 @@ def onInit(self):
         instruction.setLabel(
             getstr(32022).format("[COLOR ffffbf00]" + self.url + "[/COLOR]"))
         self.getControl(PIN_LABEL).setLabel(self.pin)
+        xbmc.log("Simkl: Visible: {}".format(self.getProperty("visible")))
 
-        #t = threading.Thread(target=self.threaded)
+        t = threading.Thread(target=self.threaded)
+        t.start()
 
         if API.is_user_logged(): #If user is alredy logged in
             dialog = xbmcgui.Dialog()
             username = API.USERSETTINGS["user"]["name"]
-            ret = dialog.yesno("Simkl LogIn Warning", "You are alredy logged in as {}".format(username),
-                nolabel="Cancel", yeslabel="Continue", autoclose=30000)
+            ret = dialog.yesno("Simkl LogIn Warning", getstr(32032).format(username),
+                nolabel=getstr(32034), yeslabel=getstr(32033), autoclose=30000)
             #xbmc.log("Ret: {}".format(ret))
             xbmc.log("Simkl:ret: {}".format(ret))
-            if ret == 1: pass #t.start()
-            elif ret == 0: self.onClick(CANCEL_BUTTON)
+            if ret == 1: pass
+            elif ret == 0:
+                self.onClick(CANCEL_BUTTON)
+            return
 
     def onControl(self, controlID):
         pass
@@ -90,6 +94,7 @@ def onFocus(self, controlID):
 
     def onAction(self, action):
         if action == ACTION_PREVIOUS_MENU or action == ACTION_BACK:
+            self.canceled = True
             self.close()
 
     def onClick(self, controlID):

resources/lib/simklapi.py

@@ -17,13 +17,15 @@
 def getstr(strid): return interface.getstr(strid)
 
 REDIRECT_URI = "http://simkl.com"
-USERFILE     = xbmc.translatePath("special://profile/simkl_key")
+USERFILE     = xbmc.translatePath(__addon__.getAddonInfo("profile")).decode("utf-8") + "simkl_key"
+xbmc.translatePath("special://profile/simkl_key")
+
 if not os.path.exists(USERFILE):
     with open(USERFILE, "w") as f:
         f.write("")
 else:
     with open(USERFILE, "r") as f:
-        print(xbmc.log("Simkl Userfile " + str(f.read())))
+        xbmc.log("Simkl Userfile " + str(f.read()))
 
 with open(os.path.dirname(os.path.realpath(__file__)).strip("lib") + "data/apikey") as f:
     d = json.loads(f.read())
@@ -119,6 +121,7 @@ def lock(self, fname, duration):
         exp = self.scrobbled_dict
         exp[fname] = int(time.time() + (105 - float(__addon__.getSetting("scr-pct"))) / 100 * duration)
         xbmc.log("Simkl: Locking {}".format(exp))
+        self.scrobbled_dict = {fname:exp[fname]} #So there is always only one entry on the dict
 
     def is_locked(self, fname):
         exp = self.scrobbled_dict
@@ -149,9 +152,10 @@ def watched(self, filename, mediatype, duration, date=time.strftime('%Y-%m-%d %H
                     values = json.dumps(values)
                     xbmc.log("Simkl: Query: {}".format(values))
                     con.request("GET", "/search/file/", body=values, headers=headers)
-                    r1 = con.getresponse().read().decode("utf-8")
+                    r1 = con.getresponse().read()#.decode("utf-8")
                     xbmc.log("Simkl: Response: {}".format(r1))
-                    r = json.loads(r1)
+                    r = json.loads(str(r1))
+                    self.lastwatched = r
                     if r == []:
                         xbmc.log("Simkl: Couldn't scrobble: Null Response")
                         return 0
@@ -178,10 +182,10 @@ def watched(self, filename, mediatype, duration, date=time.strftime('%Y-%m-%d %H
                 xbmc.log("Simkl: {}".format("ERROR: httplib.BadStatusLine"))
             except SSLError: #Fix #8
                 xbmc.log("Simkl: ERROR: SSLError, retrying?")
-                if cnt == 0: interface.notify("Error at scrobbling. Try number %s" % cnt+1)
+                if cnt == 0: interface.notify(getstr(32029).format(cnt+1))
                 if cnt <= 3:
                     self.watched(filename, mediatype, duration, date=date, cnt=cnt+1)
-                else: interface.notify("I give up :(")
+                else: interface.notify("SSLError")
 
         else:
             xbmc.log("Simkl: Can't scrobble. User not logged in or file locked")
@@ -191,6 +195,4 @@ def watched(self, filename, mediatype, duration, date=time.strftime('%Y-%m-%d %H
 if __name__ == "__main__":
     if sys.argv[1] == "login":
         xbmc.log("Logging in", level=xbmc.LOGDEBUG)
-        api.login()
-    if sys.argv[1] == "test":
-        api.scrobble_from_filename("South Park S01E02")
+        api.login()

resources/settings.xml

@@ -14,7 +14,7 @@
     <setting label="Auto-scrobble" type="bool" id="autoscrobble" default="true" enable="false"/>
     <setting label="32006" type="slider" id="scr-pct" default="70" range="0,100" option="percent" enable="gt(-1,-2)" />
     <setting label="32007"     type="slider" id="sct-w-pct" default="10" range="0,100" option="
-      percent"/>
+      percent" visible="false"/>
     <setting label="32008" type="bool" id="bubble" default="true" enable="true"/>
   </category>
 </settings>