Working on windows

Author: daviddavo

addon.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addon id="script.simkl"
        name="Simkl TV Tracker Dev"
-       version="0.1.1"
+       version="0.2.1"
        provider-name="David Davó / Simkl">
   <requires>
     <import addon="xbmc.python" version="2.6"/>

changelog.txt

@@ -1,3 +1,6 @@
+v0.2.1 (2017-1-1)
+- Scrobble working fine on windows
+
 v0.1.1 (2016-12-23)
 - Initial version
 - Added notification bubble at scrobble

resources/lib/engine.py

@@ -19,41 +19,39 @@ def synclibrary(self):
     ### UPLOAD ###
     #DISABLED UNTIL WORKING FINE
     pass
-    '''
-    kodilibrary = xbmc.executeJSONRPC(json.dumps({
-      "jsonrpc": "2.0",
-      "method": "VideoLibrary.GetMovies",
-      "params": {
-      "limits": {
-        "start": 0,
-        "end": 1000
-      },
-      "properties": [
-        "playcount",
-        "imdbnumber",
-        "file",
-        "lastplayed"
-      ],
-      "sort": {
-        "order": "ascending",
-        "method": "label",
-        "ignorearticle": True
-      }
-      },
-      "id": "libMovies"
-    }))
-    xbmc.log("Simkl: Ret: {}".format(kodilibrary))
-    kodilibrary = json.loads(kodilibrary)
+    # kodilibrary = xbmc.executeJSONRPC(json.dumps({
+    #   "jsonrpc": "2.0",
+    #   "method": "VideoLibrary.GetMovies",
+    #   "params": {
+    #   "limits": {
+    #     "start": 0,
+    #     "end": 1000
+    #   },
+    #   "properties": [
+    #     "playcount",
+    #     "imdbnumber",
+    #     "file",
+    #     "lastplayed"
+    #   ],
+    #   "sort": {
+    #     "order": "ascending",
+    #     "method": "label",
+    #     "ignorearticle": True
+    #   }
+    #   },
+    #   "id": "libMovies"
+    # }))
+    # xbmc.log("Simkl: Ret: {}".format(kodilibrary))
+    # kodilibrary = json.loads(kodilibrary)
 
-    if kodilibrary["result"]["limits"]["total"] > 0:
-      for movie in kodilibrary["result"]["movies"]:
-        #Dont do that, upload all at once
+    # if kodilibrary["result"]["limits"]["total"] > 0:
+    #   for movie in kodilibrary["result"]["movies"]:
+    #     #Dont do that, upload all at once
 
-        if movie["playcount"] > 0:
-          imdb = movie["imdbnumber"]
-          date = movie["lastplayed"]
-          self.api.watched(imdb, "movie", date)
-    '''
+    #     if movie["playcount"] > 0:
+    #       imdb = movie["imdbnumber"]
+    #       date = movie["lastplayed"]
+    #       self.api.watched(imdb, "movie", date)
 
 class Player(xbmc.Player):
   def __init__(self):
@@ -102,8 +100,9 @@ def onPlayBackStopped(self):
       percentage = 100 * self.getTime() / self.getTotalTime()
       pctconfig  = int(self.addon.getSetting("scr-pct"))
 
-      if percentage > pctconfig:
+      if 99 > percentage > pctconfig:
         bubble = __addon__.getSetting("bubble")
+        xbmc.log("Percentage: {}, pctconfig {}".format(percentage, pctconfig))
 
         xbmc.log("Simkl: Ready to scrobble {}".format(movie.getTitle()))
         if imdb == "":

resources/lib/interface.py

@@ -22,7 +22,7 @@ def notify(txt="Test"):
 #xmlfile = ""
 #script  = __addon__.getAddonInfo("path").decode("utf-8")
 class loginDialog(xbmcgui.WindowXMLDialog):
-  def __init__(self, xmlFilename, scriptPath, pin, url, check_login, log, 
+  def __init__(self, xmlFilename, scriptPath, pin, url, check_login, log,
     exp=900, inter=5, api=None):
     self.pin = pin
     self.url = url
@@ -64,41 +64,11 @@ def onInit(self):
     t.start()
 
   def onControl(self, controlID):
-    xbmc.log("Simkl: oncontrol {}".format(controlID))
+    pass
   def onFocus(self, controlID):
     pass
 
   def onClick(self, controlID):
     xbmc.log("Simkl: onclick {}".format(controlID))
     if controlID == CANCEL_BUTTON:
-      self.canceled = True
-
-'''
-class loginDialog:
-  def __init__(self, url, pin, check_login, log, exp=900, inter=5, api=None):
-    #TODO: If user is loged in, show a confirmation dialog
-    API = api
-    self.dialog = xbmcgui.DialogProgress()
-    self.dialog.create(getstr(32021),
-      getstr(32022).format(url), "PIN: {}".format(pin))
-    waiting = True
-    cnt = 0
-    while waiting:
-      pct = min(max(1, int( round( cnt*100 / exp, 0))), 99)
-      self.dialog.update(pct, line3=getstr(32023).format(
-        str(cnt).zfill(3), exp))
-
-      if cnt % (inter+1) == 0 and cnt>1:
-        if check_login(pin,log):
-          dialognot = xbmcgui.Dialog()
-          xbmc.log(str(API.USERSETTINGS))
-          dialognot.notification("Simkl", "Hello {}".format(
-            API.USERSETTINGS["user"]["name"]))
-          waiting = False
-        #Now check the user has done what it has to be done
-      time.sleep(1)
-      cnt += 1
-      if self.dialog.iscanceled() or cnt >= exp:
-        waiting = False
-        #raise Not logged in
-'''
+      self.canceled = True

resources/lib/simklapi.py

@@ -130,8 +130,9 @@ def is_locked(self, fname):
   def watched(self, filename, mediatype, duration, date=time.strftime('%Y-%m-%d %H:%M:%S')): #OR IDMB, member: only works with movies
     if self.is_user_logged() and not self.is_locked(filename):
       try:
+        filename = filename.replace("\\", "/")
         con = httplib.HTTPSConnection("api.simkl.com")
-        mediadict = {"movie": "movies", "episode":"episodes"}
+        mediadict = {"movie": "movies", "episode":"episodes", "show":"show"}
 
         if filename[:2] == "tt":
           toappend = {"ids":{"imdb":filename}, "watched_at":date}
@@ -143,8 +144,8 @@ def watched(self, filename, mediatype, duration, date=time.strftime('%Y-%m-%d %H
           xbmc.log("Simkl: Query: {}".format(values))
           con.request("GET", "/search/file/", body=values, headers=headers)
           r1 = con.getresponse().read().decode("utf-8")
+          xbmc.log("Simkl: Response: {}".format(r1))
           r = json.loads(r1)
-          xbmc.log("Simkl: Response: {}".format(r))
           if r == []:
             xbmc.log("Simkl: Couldn't scrobble: Null Response")
             return 0