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

Don't use a dedicated thread to get section generators

Browse source
This commit is contained in:
croneter 2019-12-06 08:24:13 +01:00
parent 8f86f43a93
commit a87dfa0a7a
1 changed files with 6 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
resources/lib/library_sync/full_sync.py
View file

@ -137,11 +137,11 @@ class FullSync(common.LibrarySyncMixin, backgroundthread.KillableThread):
LOG.error('Could not entirely process section %s', section) LOG.error('Could not entirely process section %s', section)
self.successful = False self.successful = False
def threaded_get_iterators(self, kinds, queue, all_items): def get_generators(self, kinds, queue, all_items):
""" """
Getting iterators is costly, so let's do it asynchronously Getting iterators is costly, so let's do it asynchronously
""" """
LOG.debug('Start threaded_get_iterators') LOG.debug('Start get_generators')
try: try:
for kind in kinds: for kind in kinds:
for section in (x for x in app.SYNC.sections for section in (x for x in app.SYNC.sections
@ -179,7 +179,7 @@ class FullSync(common.LibrarySyncMixin, backgroundthread.KillableThread):
utils.ERROR(notify=True) utils.ERROR(notify=True)
finally: finally:
queue.put(None) queue.put(None)
LOG.debug('Exiting threaded_get_iterators') LOG.debug('Exiting get_generators')
def full_library_sync(self): def full_library_sync(self):
kinds = [ kinds = [
@ -194,11 +194,8 @@ class FullSync(common.LibrarySyncMixin, backgroundthread.KillableThread):
(v.PLEX_TYPE_ALBUM, v.PLEX_TYPE_ARTIST), (v.PLEX_TYPE_ALBUM, v.PLEX_TYPE_ARTIST),
]) ])
# ADD NEW ITEMS # ADD NEW ITEMS
# Already start setting up the iterators. We need to enforce # We need to enforce syncing e.g. show before season before episode
# syncing e.g. show before season before episode self.get_generators(kinds, self.section_queue, False)
backgroundthread.KillableThread(
target=self.threaded_get_iterators,
args=(kinds, self.section_queue, False)).start()
# Do the heavy lifting # Do the heavy lifting
self.processing_loop_new_and_changed_items() self.processing_loop_new_and_changed_items()
common.update_kodi_library(video=True, music=True) common.update_kodi_library(video=True, music=True)
@ -230,9 +227,7 @@ class FullSync(common.LibrarySyncMixin, backgroundthread.KillableThread):
# Close the progress indicator dialog # Close the progress indicator dialog
self.dialog.close() self.dialog.close()
self.dialog = None self.dialog = None
backgroundthread.KillableThread( self.get_generators(kinds, self.section_queue, True)
target=self.threaded_get_iterators,
args=(kinds, self.section_queue, True)).start()
self.processing_loop_playstates() self.processing_loop_playstates()
if self.should_cancel() or not self.successful: if self.should_cancel() or not self.successful:
return return