Working on #4

Author: daviddavo

changelog.txt

@@ -1,3 +1,12 @@
+v 0.2.4 [17/01/15]:
+- Fixed #7
+- Fixed #8
+- Fixed #9
+- Fixed #5
+
+v 0.2.3 [17/01/04]:
+- Fixed #4
+
 v 0.2.2 [17/01/03]:
 - Fixed #3
 

resources/lib/interface.py

@@ -3,72 +3,96 @@
 import time
 import threading
 import xbmc, xbmcgui, xbmcaddon
+__addon__ = xbmcaddon.Addon("script.simkl")
+from simklapi import api as API
 tmp = time.time()
 
-__addon__ = xbmcaddon.Addon("script.simkl")
 __icon__ = __addon__.getAddonInfo("icon")
 def getstr(strid): return __addon__.getLocalizedString(strid)
 
 xbmc.log("Simkl: Icon: "+str(__icon__))
 
 not_dialog = xbmcgui.Dialog()
 def notify(txt="Test", title="Simkl", icon=__icon__):
-  not_dialog.notification(title, txt, icon)
+    not_dialog.notification(title, txt, icon)
 
 PIN_LABEL      = 201
 INSTRUCTION_ID = 202
 CANCEL_BUTTON  = 203
+ACTION_PREVIOUS_MENU = 10
+ACTION_BACK = 92
 
 #xmlfile = ""
 #script  = __addon__.getAddonInfo("path").decode("utf-8")
+def login(logged):
+    "Change the things that need to be changed. E.g: The settings dialog"
+    __addon__.setSetting("loginbool", str(bool(1)).lower())
+
 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 threaded(self):
-    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 onInit(self):
-    instruction = self.getControl(INSTRUCTION_ID)
-    instruction.setLabel(
-      getstr(32022).format("[COLOR ffffbf00]" + self.url + "[/COLOR]"))
-    self.getControl(PIN_LABEL).setLabel(self.pin)
-
-    t = threading.Thread(target=self.threaded)
-    t.start()
-
-  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
+    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 threaded(self):
+        """ A loop threaded function, so you can do another things meanwhile """
+        xbmc.log("Simkl: threaded: {}".format(self))
+        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 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")
+
+        xbmc.log("Simkl: Stop waiting")
+        self.close()
+
+    def onInit(self):
+        """The function that is loaded on Window init"""
+        instruction = self.getControl(INSTRUCTION_ID)
+        instruction.setLabel(
+            getstr(32022).format("[COLOR ffffbf00]" + self.url + "[/COLOR]"))
+        self.getControl(PIN_LABEL).setLabel(self.pin)
+
+        #t = threading.Thread(target=self.threaded)
+
+        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)
+            #xbmc.log("Ret: {}".format(ret))
+            xbmc.log("Simkl:ret: {}".format(ret))
+            if ret == 1: pass #t.start()
+            elif ret == 0: self.onClick(CANCEL_BUTTON)
+
+    def onControl(self, controlID):
+        pass
+    def onFocus(self, controlID):
+        pass
+
+    def onAction(self, action):
+        if action == ACTION_PREVIOUS_MENU or action == ACTION_BACK:
+            self.close()
+
+    def onClick(self, controlID):
+        xbmc.log("Simkl: onclick {}, {}".format(controlID, self))
+        if controlID == CANCEL_BUTTON:
+            self.canceled = True