New login dialog

Author: daviddavo

resources/language/English/strings.po

@@ -49,7 +49,7 @@ msgid "Simkl login"
 msgstr ""
 
 msgctxt "#32022"
-msgid "Enter to the following URL: {}"
+msgid "Visit {} on your device and enter this code"
 msgstr ""
 
 msgctxt "#32023"

resources/lib/engine.py

@@ -44,7 +44,7 @@ def synclibrary(self):
     }))
     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
@@ -84,6 +84,7 @@ def onPlayBackEnded(self):
     xbmc.log("Simkl: ONPLAYBACKENDED")
     self.onPlayBackStopped()
   def onPlayBackStopped(self):
+    '''Gets the info needed to pass to the api'''
     try:
       movie = self.getVideoInfoTag()
       imdb  = movie.getIMDBNumber().strip(" ")

resources/lib/interface.py

@@ -14,14 +14,73 @@ def getstr(strid): return __addon__.getLocalizedString(strid)
 def notify(txt="Test"):
   not_dialog.notification("Simkl", txt, __icon__) #Put an icon
 
-#import simklapi
+PIN_LABEL      = 201
+INSTRUCTION_ID = 202
+CANCEL_BUTTON  = 203
 
+#xmlfile = ""
+#script  = __addon__.getAddonInfo("path").decode("utf-8")
+class loginDialog(xbmcgui.WindowXMLDialog):
+  def __init__(self, xmlFilename, scriptPath, pin, url, check_login, log, 
+    exp=900, inter=5, api=None):
+    self.pin = pin
+    self.url = url
+    self.check_login = check_login
+    self.log = log
+    self.exp = exp
+    self.inter = inter
+    self.api = api
+    self.waiting = True
+    self.canceled = False
+
+  def onInit(self):
+    instruction = self.getControl(INSTRUCTION_ID)
+    instruction.setLabel(
+      getstr(32022).format("[COLOR yellow]" + self.url + "[/COLOR]"))
+    self.getControl(PIN_LABEL).setLabel(self.pin)
+    
+    cnt = 0
+    while self.waiting:
+      if cnt % (self.inter+1) == 0 and cnt>1:
+        xbmc.log("Simkl: Still waiting... {}".format(cnt))
+        if self.check_login(self.pin, self.log):
+
+          xbmc.log(str(self.api.USERSETTINGS))
+          notify("Hello {}".format(self.api.USERSETTINGS["user"]["name"]))
+          self.waiting = False
+        #Now check 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")
+
+    xbmc.log("Simkl: Stop waiting")
+    self.close()
+
+  def onAction(self, action):
+    #xbmc.log("Simkl: onaction {}".format(action))
+    if action == True: #TODO
+      self.close()
+
+  def onControl(self, controlID):
+    pass
+  def onFocus(self, controlID):
+    pass 
+
+  def onClick(self, controlID):
+    xbmc.log("Simkl: onclick {}".format(controlID))
+    if controlID == CANCEL_BUTTON:
+      self.canceled = True
+      self.close()
+
+'''
 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), 
+    self.dialog.create(getstr(32021),
       getstr(32022).format(url), "PIN: {}".format(pin))
     waiting = True
     cnt = 0
@@ -43,3 +102,4 @@ def __init__(self, url, pin, check_login, log, exp=900, inter=5, api=None):
       if self.dialog.iscanceled() or cnt >= exp:
         waiting = False
         #raise Not logged in
+'''

resources/lib/simklapi.py

@@ -12,6 +12,7 @@
 import xbmc
 import interface
 import httplib
+import xbmcgui
 
 __addon__ = interface.__addon__
 def getstr(strid): return interface.getstr(strid)
@@ -32,20 +33,20 @@ def getstr(strid): return interface.getstr(strid)
   xbmc.log("APIKEY: {}".format(APIKEY))
 ATOKEN = 0 #Get atoken from file
 headers = {"Content-Type": "application-json",
-  "simkl-api-key": APIKEY
-}
+  "simkl-api-key": APIKEY}
 
 class API:
   def __init__(self):
+    self.scrobbled_dict = {} #So it doesn't scrobble 5 times the same chapter
+    #{"Label":expiration_time}
     with open(USERFILE, "r") as f:
       self.token = f.readline().strip("\n")
       headers["authorization"] = "Bearer " + self.token
-      self.scrobbled_dict = {} #So it doesn't scrobble 5 times the same chapter
-      #{"Label":expiration_time}
     try:
       self.con = httplib.HTTPSConnection("api.simkl.com")
       self.con.request("GET", "/users/settings", headers=headers)
       self.USERSETTINGS = json.loads(self.con.getresponse().read().decode("utf-8"))
+      xbmc.log("Simkl: " + str(self.USERSETTINGS))
       self.internet = True
       if not os.path.exists(USERFILE):
         api.login()
@@ -63,9 +64,20 @@ def login(self):
     r = log.getresponse().read().decode("utf-8")
     xbmc.log(r)
     rdic = json.loads(r)
-    dialog = interface.loginDialog(rdic["verification_url"],
-      rdic["user_code"], self.check_login, log, rdic["expires_in"],
-      rdic["interval"], self)
+    #interface.loginDialog(rdic["verification_url"],
+    #  rdic["user_code"], self.check_login, log, rdic["expires_in"],
+    #  rdic["interval"], self)
+
+    pin = rdic["user_code"]
+    url = rdic["verification_url"]
+    exp = int(rdic["expires_in"])
+    ntv = int(rdic["interval"])
+
+    self.logindialog = interface.loginDialog("simkl-LoginDialog.xml",
+      __addon__.getAddonInfo("path"), pin=pin, url=url,
+      check_login=self.check_login, log=log, exp=exp, inter=ntv, api=self)
+    self.logindialog.doModal()
+    del self.logindialog
 
   def set_atoken(self, token):
     global ATOKEN
@@ -85,13 +97,15 @@ def check_login(self, ucode, log): #Log is the connection
       log.request("GET", "/users/settings", headers=headers)
       r = json.loads(log.getresponse().read().decode("utf-8"))
       self.USERSETTINGS = r
-      xbmc.log(str(self.USERSETTINGS))
       return True
     elif r["result"] == "KO":
       return False
 
   def is_user_logged(self):
-    if self.token == "":
+    """ Checks if user is logged in """
+    failed = False
+    if "error" in self.USERSETTINGS.keys(): failed = self.USERSETTINGS["error"]
+    if self.token == "" or failed == "user_token_failed":
       xbmc.log("Simkl: User not logged in")
       return False
     else:
@@ -121,17 +135,20 @@ def watched(self, filename, mediatype, duration, date=time.strftime('%Y-%m-%d %H
         mediadict = {"movie": "movies", "episode":"episodes"}
 
         if filename[:2] == "tt":
-          imdb = filename
           toappend = {"ids":{"imdb":filename}, "watched_at":date}
           media = mediadict[mediatype]
         else:
           xbmc.log("Simkl: Filename - {}".format(filename))
           values = {"file":filename}
           values = json.dumps(values)
+          xbmc.log("Simkl: Getting info about: ".format(values))
           con.request("GET", "/search/file/", body=values, headers=headers)
           r1 = con.getresponse().read().decode("utf-8")
           r = json.loads(r1)
-          xbmc.log("Simkl: {}".format(r))
+          if r == []:
+            xbmc.log("Simkl: Couldn't scrobble: Null Response")
+            return 0
+          xbmc.log("Simkl: Response: {}".format(r))
           media = mediadict[r["type"]]
           toappend = {"ids": r[r["type"]]["ids"], "watched_at":date}
 

resources/settings.xml

@@ -12,6 +12,6 @@
     <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"/>
-    <setting label="32008" type="bool" id="bubble" default="false" enable="true"/>
+    <setting label="32008" type="bool" id="bubble" default="true" enable="true"/>
   </category>
 </settings>

script.simkl.zip

@@ -26,9 +26,11 @@ def getstr(strid): return simkl_addon.getLocalizedString(strid)
   player.addon = simkl_addon
   eng     = engine.Engine(API.api, player)
   #Remember: if getTime() is more than x% scrobble file
+  
 
   if not API.api.is_user_logged():
-    interface.notify(getstr(32026))
+    API.api.login() #Add "remind me tomorrow button"
+    #interface.notify(getstr(32026))
   else:
     interface.notify(getstr(32025).format(API.api.USERSETTINGS["user"]["name"]))