1
0
mirror of https://github.com/moparisthebest/SickRage synced 2024-12-12 11:02:21 -05:00

Fix for subtitle processing.

This commit is contained in:
echel0n 2014-07-19 15:32:28 -07:00
parent 02c8b867c6
commit 1b84c6d281
2 changed files with 14 additions and 14 deletions

View File

@ -1190,70 +1190,70 @@ def halt():
dailySearchScheduler.stop.set() dailySearchScheduler.stop.set()
logger.log(u"Waiting for the DAILYSEARCH thread to exit") logger.log(u"Waiting for the DAILYSEARCH thread to exit")
try: try:
dailySearchScheduler.thread.join() dailySearchScheduler.join()
except: except:
pass pass
backlogSearchScheduler.stop.set() backlogSearchScheduler.stop.set()
logger.log(u"Waiting for the BACKLOG thread to exit") logger.log(u"Waiting for the BACKLOG thread to exit")
try: try:
backlogSearchScheduler.thread.join() backlogSearchScheduler.join()
except: except:
pass pass
showUpdateScheduler.stop.set() showUpdateScheduler.stop.set()
logger.log(u"Waiting for the SHOWUPDATER thread to exit") logger.log(u"Waiting for the SHOWUPDATER thread to exit")
try: try:
showUpdateScheduler.thread.join() showUpdateScheduler.join()
except: except:
pass pass
versionCheckScheduler.stop.set() versionCheckScheduler.stop.set()
logger.log(u"Waiting for the VERSIONCHECKER thread to exit") logger.log(u"Waiting for the VERSIONCHECKER thread to exit")
try: try:
versionCheckScheduler.thread.join() versionCheckScheduler.join()
except: except:
pass pass
showQueueScheduler.stop.set() showQueueScheduler.stop.set()
logger.log(u"Waiting for the SHOWQUEUE thread to exit") logger.log(u"Waiting for the SHOWQUEUE thread to exit")
try: try:
showQueueScheduler.thread.join() showQueueScheduler.join()
except: except:
pass pass
searchQueueScheduler.stop.set() searchQueueScheduler.stop.set()
logger.log(u"Waiting for the SEARCHQUEUE thread to exit") logger.log(u"Waiting for the SEARCHQUEUE thread to exit")
try: try:
searchQueueScheduler.thread.join() searchQueueScheduler.join()
except: except:
pass pass
autoPostProcesserScheduler.stop.set() autoPostProcesserScheduler.stop.set()
logger.log(u"Waiting for the POSTPROCESSER thread to exit") logger.log(u"Waiting for the POSTPROCESSER thread to exit")
try: try:
autoPostProcesserScheduler.thread.join() autoPostProcesserScheduler.join()
except: except:
pass pass
traktCheckerScheduler.stop.set() traktCheckerScheduler.stop.set()
logger.log(u"Waiting for the TRAKTCHECKER thread to exit") logger.log(u"Waiting for the TRAKTCHECKER thread to exit")
try: try:
traktCheckerScheduler.thread.join() traktCheckerScheduler.join()
except: except:
pass pass
properFinderScheduler.stop.set() properFinderScheduler.stop.set()
logger.log(u"Waiting for the PROPERFINDER thread to exit") logger.log(u"Waiting for the PROPERFINDER thread to exit")
try: try:
properFinderScheduler.thread.join() properFinderScheduler.join()
except: except:
pass pass
subtitlesFinderScheduler.stop.set() subtitlesFinderScheduler.stop.set()
logger.log(u"Waiting for the SUBTITLESFINDER thread to exit") logger.log(u"Waiting for the SUBTITLESFINDER thread to exit")
try: try:
subtitlesFinderScheduler.thread.join() subtitlesFinderScheduler.join()
except: except:
pass pass

View File

@ -2399,15 +2399,15 @@ class ConfigSubtitles(MainHandler):
subtitles_finder_frequency = 1 subtitles_finder_frequency = 1
if use_subtitles == "on": if use_subtitles == "on":
if sickbeard.subtitlesFinderScheduler.thread is None or not sickbeard.subtitlesFinderScheduler.thread.isAlive(): if not sickbeard.subtitlesFinderScheduler.isAlive():
sickbeard.subtitlesFinderScheduler.silent = False sickbeard.subtitlesFinderScheduler.silent = False
sickbeard.subtitlesFinderScheduler.initThread() sickbeard.subtitlesFinderScheduler.start()
else: else:
sickbeard.subtitlesFinderScheduler.abort = True sickbeard.subtitlesFinderScheduler.stop.set()
sickbeard.subtitlesFinderScheduler.silent = True sickbeard.subtitlesFinderScheduler.silent = True
logger.log(u"Waiting for the SUBTITLESFINDER thread to exit") logger.log(u"Waiting for the SUBTITLESFINDER thread to exit")
try: try:
sickbeard.subtitlesFinderScheduler.thread.join(5) sickbeard.subtitlesFinderScheduler.join()
except: except:
pass pass