Jellyfin/jellyfin-kodi
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-kodi.git synced 2024-12-26 02:36:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

Revert "Quick fix for UserClient sleep"

Browse source 
This reverts commit 281b70da85.
This commit is contained in:
angelblue05 2015-04-04 05:20:13 -05:00
parent 281b70da85
commit 1b681a0e99
2 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
resources/lib/UserClient.py
View file

@ -44,6 +44,7 @@ class UserClient(threading.Thread):
self.addonName = clientInfo.getAddonName() self.addonName = clientInfo.getAddonName()
self.addon = xbmcaddon.Addon(id=self.addonId) self.addon = xbmcaddon.Addon(id=self.addonId)
self.logMsg("|---- Starting UserClient ----|", 0)
threading.Thread.__init__(self, *args) threading.Thread.__init__(self, *args)
def logMsg(self, msg, level=1): def logMsg(self, msg, level=1):
@ -290,8 +291,6 @@ class UserClient(threading.Thread):
def run(self): def run(self):
self.logMsg("|---- Starting UserClient ----|", 0)
while not self.KodiMonitor.abortRequested(): while not self.KodiMonitor.abortRequested():
# Get the latest addon settings # Get the latest addon settings
@ -311,6 +310,7 @@ class UserClient(threading.Thread):
self.auth = False self.auth = False
self.authenticate() self.authenticate()
if (self.auth == False) and (self.currUser == None): if (self.auth == False) and (self.currUser == None):
# Only if there's information found to login # Only if there's information found to login
server = self.getServer() server = self.getServer()
@ -330,11 +330,9 @@ class UserClient(threading.Thread):
if self.stopClient == True: if self.stopClient == True:
break break
# Prevent sleep while the initial sync is going if self.KodiMonitor.waitForAbort(1):
if (self.WINDOW.getProperty("Server_sync") == ""): # Abort was requested while waiting. We should exit
if self.KodiMonitor.waitForAbort(1): break
# Abort was requested while waiting. We should exit
break
self.logMsg("|---- UserClient Stopped ----|", 0) self.logMsg("|---- UserClient Stopped ----|", 0)

2
service.py
View file

@ -93,14 +93,12 @@ class Service():
#full sync #full sync
if(cur_seconds_fullsync >= interval_FullSync): if(cur_seconds_fullsync >= interval_FullSync):
xbmc.log("Doing_Db_Sync: syncDatabase (Started)") xbmc.log("Doing_Db_Sync: syncDatabase (Started)")
self.WINDOW.setProperty("Server_sync", "true")
worked = librarySync.syncDatabase() worked = librarySync.syncDatabase()
xbmc.log("Doing_Db_Sync: syncDatabase (Finished) " + str(worked)) xbmc.log("Doing_Db_Sync: syncDatabase (Finished) " + str(worked))
if(worked): if(worked):
cur_seconds_fullsync = 0 cur_seconds_fullsync = 0
else: else:
cur_seconds_fullsync = interval_FullSync - 10 cur_seconds_fullsync = interval_FullSync - 10
self.WINDOW.setProperty("Server_sync", "")
else: else:
cur_seconds_fullsync += 1 cur_seconds_fullsync += 1