Troplo/PlexKodiConnect
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Try to shutdown more cleanly

Browse source
This commit is contained in:
tomkat83 2016-04-09 16:57:45 +02:00
parent e53afe3fb9
commit 89fe2565d2
2 changed files with 27 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
resources/lib/downloadutils.py
View file

@ -238,6 +238,11 @@ class DownloadUtils():
self.logMsg("Error message: %s" % e, 2) self.logMsg("Error message: %s" % e, 2)
return False return False
except SystemExit:
self.logMsg('SystemExit detected, aborting download', 0)
self.stopSession()
return False
except: except:
self.logMsg('Unknown requests error', -1) self.logMsg('Unknown requests error', -1)
import traceback import traceback

24
resources/lib/librarysync.py
View file

@ -58,6 +58,17 @@ class ThreadedGetMetadata(Thread):
continue continue
else: else:
self.queue.task_done() self.queue.task_done()
if utils.window('plex_terminateNow') == 'true':
# Extreme measures if Kodi shutdown requested
while not self.out_queue.empty():
# Still try because remaining item might have been taken
try:
self.out_queue.get(block=False)
except Queue.Empty:
xbmc.sleep(50)
continue
else:
self.out_queue.task_done()
def run(self): def run(self):
# cache local variables because it's faster # cache local variables because it's faster
@ -96,7 +107,6 @@ class ThreadedGetMetadata(Thread):
utils.window('plex_scancrashed', value='401') utils.window('plex_scancrashed', value='401')
# Kill remaining items in queue (for main thread to cont.) # Kill remaining items in queue (for main thread to cont.)
queue.task_done() queue.task_done()
self.terminateNow()
break break
updateItem['XML'] = plexXML updateItem['XML'] = plexXML
@ -109,8 +119,10 @@ class ThreadedGetMetadata(Thread):
queue.task_done() queue.task_done()
# Empty queue in case PKC was shut down (main thread hangs otherwise) # Empty queue in case PKC was shut down (main thread hangs otherwise)
self.terminateNow() self.terminateNow()
self.logMsg('Download thread terminated', 2)
@utils.logging
@utils.ThreadMethodsAdditionalStop('suspend_LibraryThread') @utils.ThreadMethodsAdditionalStop('suspend_LibraryThread')
@utils.ThreadMethods @utils.ThreadMethods
class ThreadedProcessMetadata(Thread): class ThreadedProcessMetadata(Thread):
@ -157,7 +169,7 @@ class ThreadedProcessMetadata(Thread):
try: try:
updateItem = queue.get(block=False) updateItem = queue.get(block=False)
except Queue.Empty: except Queue.Empty:
xbmc.sleep(100) xbmc.sleep(50)
continue continue
# Do the work # Do the work
plexitem = updateItem['XML'] plexitem = updateItem['XML']
@ -181,8 +193,10 @@ class ThreadedProcessMetadata(Thread):
# Sleep, just in case the other threads throw another xml # Sleep, just in case the other threads throw another xml
xbmc.sleep(1000) xbmc.sleep(1000)
self.terminateNow() self.terminateNow()
self.logMsg('Processing thread terminated', 2)
@utils.logging
@utils.ThreadMethodsAdditionalStop('suspend_LibraryThread') @utils.ThreadMethodsAdditionalStop('suspend_LibraryThread')
@utils.ThreadMethods @utils.ThreadMethods
class ThreadedShowSyncInfo(Thread): class ThreadedShowSyncInfo(Thread):
@ -238,6 +252,7 @@ class ThreadedShowSyncInfo(Thread):
# Sleep for x milliseconds # Sleep for x milliseconds
xbmc.sleep(500) xbmc.sleep(500)
dialog.close() dialog.close()
self.logMsg('Dialog Infobox thread terminated', 2)
@utils.logging @utils.logging
@ -1711,4 +1726,9 @@ class LibrarySync(Thread):
xbmc.sleep(100) xbmc.sleep(100)
# doUtils could still have a session open due to interrupted sync
try:
downloadutils.DownloadUtils().stopSession()
except:
pass
log("###===--- LibrarySync Stopped ---===###", 0) log("###===--- LibrarySync Stopped ---===###", 0)