Fix sync not correctly being canceled

resources/lib/library_sync/fanart.py

@@ -70,7 +70,7 @@ class FanartThread(backgroundthread.KillableThread):
         self.callback(finished)
 
 
-class FanartTask(backgroundthread.Task, common.libsync_mixin):
+class FanartTask(common.libsync_mixin, backgroundthread.Task):
     """
     This task will also be executed while library sync is suspended!
     """

resources/lib/library_sync/get_metadata.py

@@ -27,7 +27,7 @@ def reset_collections():
         COLLECTION_XMLS = {}
 
 
-class GetMetadataTask(backgroundthread.Task, common.libsync_mixin):
+class GetMetadataTask(common.libsync_mixin, backgroundthread.Task):
     """
     Threaded download of Plex XML metadata for a certain library item.
     Fills the queue with the downloaded etree XML objects

resources/lib/library_sync/process_metadata.py

@@ -39,7 +39,7 @@ class DeleteItem(object):
         self.plex_id = plex_id
 
 
-class ProcessMetadata(backgroundthread.KillableThread, common.libsync_mixin):
+class ProcessMetadata(common.libsync_mixin, backgroundthread.KillableThread):
     """
     Not yet implemented for more than 1 thread - if ever. Only to be called by
     ONE thread!

resources/lib/service_entry.py

@@ -152,8 +152,8 @@ class Service():
         i = 0
         while app.SYNC.db_scan:
             i += 1
-            app.APP.monitor.waitForAbort(0.05)
-            if i > 100:
+            app.APP.monitor.waitForAbort(0.1)
+            if i > 150:
                 LOG.error('Could not stop library sync, aborting log-out')
                 # Failed to reset PMS and plex.tv connects. Try to restart Kodi
                 utils.messageDialog(utils.lang(29999), utils.lang(39208))

resources/lib/utils.py

@@ -495,7 +495,7 @@ def reset(ask_user=True):
     from . import app
     # first stop any db sync
     app.APP.suspend_threads = True
-    count = 10
+    count = 15
     while app.SYNC.db_scan:
         LOG.debug("Sync is running, will retry: %s...", count)
         count -= 1