From 281b70da852cdfbcff173db49d9b23ce98cd21dc Mon Sep 17 00:00:00 2001 From: angelblue05 Date: Sat, 4 Apr 2015 04:32:11 -0500 Subject: [PATCH] Quick fix for UserClient sleep It was activating sleep while the initial scan was going. Changed to allow sleep when the initial scan is not running. --- resources/lib/UserClient.py | 12 +++++++----- service.py | 2 ++ 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/resources/lib/UserClient.py b/resources/lib/UserClient.py index a8834903..071471e2 100644 --- a/resources/lib/UserClient.py +++ b/resources/lib/UserClient.py @@ -44,7 +44,6 @@ class UserClient(threading.Thread): self.addonName = clientInfo.getAddonName() self.addon = xbmcaddon.Addon(id=self.addonId) - self.logMsg("|---- Starting UserClient ----|", 0) threading.Thread.__init__(self, *args) def logMsg(self, msg, level=1): @@ -291,6 +290,8 @@ class UserClient(threading.Thread): def run(self): + self.logMsg("|---- Starting UserClient ----|", 0) + while not self.KodiMonitor.abortRequested(): # Get the latest addon settings @@ -310,7 +311,6 @@ class UserClient(threading.Thread): self.auth = False self.authenticate() - if (self.auth == False) and (self.currUser == None): # Only if there's information found to login server = self.getServer() @@ -330,9 +330,11 @@ class UserClient(threading.Thread): if self.stopClient == True: break - if self.KodiMonitor.waitForAbort(1): - # Abort was requested while waiting. We should exit - break + # Prevent sleep while the initial sync is going + if (self.WINDOW.getProperty("Server_sync") == ""): + if self.KodiMonitor.waitForAbort(1): + # Abort was requested while waiting. We should exit + break self.logMsg("|---- UserClient Stopped ----|", 0) diff --git a/service.py b/service.py index d90f26da..217e29ec 100644 --- a/service.py +++ b/service.py @@ -93,12 +93,14 @@ class Service(): #full sync if(cur_seconds_fullsync >= interval_FullSync): xbmc.log("Doing_Db_Sync: syncDatabase (Started)") + self.WINDOW.setProperty("Server_sync", "true") worked = librarySync.syncDatabase() xbmc.log("Doing_Db_Sync: syncDatabase (Finished) " + str(worked)) if(worked): cur_seconds_fullsync = 0 else: cur_seconds_fullsync = interval_FullSync - 10 + self.WINDOW.setProperty("Server_sync", "") else: cur_seconds_fullsync += 1