Revert "Quick fix for UserClient sleep"
This reverts commit 281b70da85
.
This commit is contained in:
parent
281b70da85
commit
1b681a0e99
2 changed files with 5 additions and 9 deletions
|
@ -44,6 +44,7 @@ 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):
|
||||
|
@ -290,8 +291,6 @@ class UserClient(threading.Thread):
|
|||
|
||||
def run(self):
|
||||
|
||||
self.logMsg("|---- Starting UserClient ----|", 0)
|
||||
|
||||
while not self.KodiMonitor.abortRequested():
|
||||
|
||||
# Get the latest addon settings
|
||||
|
@ -311,6 +310,7 @@ 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,8 +330,6 @@ class UserClient(threading.Thread):
|
|||
if self.stopClient == True:
|
||||
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
|
||||
|
|
|
@ -93,14 +93,12 @@ 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
|
||||
|
||||
|
|
Loading…
Reference in a new issue