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

Clean-up library sync loop

Browse source
This commit is contained in:
tomkat83 2016-03-08 11:20:11 +01:00
parent 333b93b481
commit 0b4736b01b
2 changed files with 37 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

67
resources/lib/librarysync.py
View file

@ -243,16 +243,6 @@ class LibrarySync(Thread):
icon="special://home/addons/plugin.video.plexkodiconnect/icon.png", icon="special://home/addons/plugin.video.plexkodiconnect/icon.png",
sound=False) sound=False)
def startSync(self):
utils.window('emby_dbScan', value="true")
completed = self.fastSync()
if not completed:
# Fast sync failed or server plugin is not found
self.logMsg("Something went wrong, starting full sync", -1)
completed = self.fullSync(manualrun=True)
utils.window('emby_dbScan', clear=True)
return completed
def fastSync(self): def fastSync(self):
""" """
Fast incremential lib sync Fast incremential lib sync
@ -1129,29 +1119,37 @@ class LibrarySync(Thread):
raise raise
def run_internal(self): def run_internal(self):
# Re-assign handles to have faster calls
window = utils.window window = utils.window
settings = utils.settings settings = utils.settings
log = self.logMsg log = self.logMsg
threadStopped = self.threadStopped
threadSuspended = self.threadSuspended
installSyncDone = self.installSyncDone
enableBackgroundSync = self.enableBackgroundSync
fullSync = self.fullSync
fastSync = self.fastSync
dialog = xbmcgui.Dialog()
startupComplete = False startupComplete = False
self.views = [] self.views = []
count = 0 count = 0
errorcount = 0 errorcount = 0
self.logMsg("---===### Starting LibrarySync ###===---", 0) log("---===### Starting LibrarySync ###===---", 0)
while not self.threadStopped(): while not threadStopped():
# In the event the server goes offline, or an item is playing # In the event the server goes offline, or an item is playing
while self.threadSuspended(): while threadSuspended():
# Set in service.py # Set in service.py
if self.threadStopped(): if threadStopped():
# Abort was requested while waiting. We should exit # Abort was requested while waiting. We should exit
log("###===--- LibrarySync Stopped ---===###", 0) log("###===--- LibrarySync Stopped ---===###", 0)
return return
xbmc.sleep(1000) xbmc.sleep(1000)
if (window('emby_dbCheck') != "true" and if (window('emby_dbCheck') != "true" and installSyncDone):
self.installSyncDone):
# Verify the validity of the database # Verify the validity of the database
currentVersion = settings('dbCreatedWithVersion') currentVersion = settings('dbCreatedWithVersion')
minVersion = window('emby_minDBVersion') minVersion = window('emby_minDBVersion')
@ -1160,14 +1158,14 @@ class LibrarySync(Thread):
if not uptoDate: if not uptoDate:
log("Db version out of date: %s minimum version required: " log("Db version out of date: %s minimum version required: "
"%s" % (currentVersion, minVersion), 0) "%s" % (currentVersion, minVersion), 0)
resp = xbmcgui.Dialog().yesno( resp = dialog.yesno(
heading="Db Version", heading="Db Version",
line1=("Detected the database needs to be recreated " line1=("Detected the database needs to be recreated "
"for this version of " + self.addonName + "for this version of " + self.addonName +
"Proceed?")) "Proceed?"))
if not resp: if not resp:
log("Db version out of date! USER IGNORED!", 0) log("Db version out of date! USER IGNORED!", 0)
xbmcgui.Dialog().ok( dialog.ok(
heading=self.addonName, heading=self.addonName,
line1=(self.addonName + " may not work correctly " line1=(self.addonName + " may not work correctly "
"until the database is reset.")) "until the database is reset."))
@ -1185,7 +1183,7 @@ class LibrarySync(Thread):
# Database does not exists # Database does not exists
log("The current Kodi version is incompatible " log("The current Kodi version is incompatible "
"to know which Kodi versions are supported.", 0) "to know which Kodi versions are supported.", 0)
xbmcgui.Dialog().ok( dialog.ok(
heading=self.addonName, heading=self.addonName,
line1=("Cancelling the database syncing process. " line1=("Cancelling the database syncing process. "
"Current Kodi version: %s is unsupported. " "Current Kodi version: %s is unsupported. "
@ -1197,7 +1195,7 @@ class LibrarySync(Thread):
window('emby_dbScan', value="true") window('emby_dbScan', value="true")
log("Db version: %s" % settings('dbCreatedWithVersion'), 0) log("Db version: %s" % settings('dbCreatedWithVersion'), 0)
log("Initial start-up full sync starting", 0) log("Initial start-up full sync starting", 0)
librarySync = self.fullSync(manualrun=True) librarySync = fullSync(manualrun=True)
window('emby_dbScan', clear=True) window('emby_dbScan', clear=True)
if librarySync: if librarySync:
log("Initial start-up full sync successful", 0) log("Initial start-up full sync successful", 0)
@ -1205,13 +1203,13 @@ class LibrarySync(Thread):
settings('SyncInstallRunDone', value="true") settings('SyncInstallRunDone', value="true")
settings("dbCreatedWithVersion", settings("dbCreatedWithVersion",
self.clientInfo.getVersion()) self.clientInfo.getVersion())
self.installSyncDone = True installSyncDone = True
else: else:
log("Initial start-up full sync unsuccessful", -1) log("Initial start-up full sync unsuccessful", -1)
errorcount += 1 errorcount += 1
if errorcount > 2: if errorcount > 2:
log("Startup full sync failed. Stopping sync", -1) log("Startup full sync failed. Stopping sync", -1)
xbmcgui.Dialog().ok( dialog.ok(
heading=self.addonName, heading=self.addonName,
line1=("Startup syncing process failed repeatedly." line1=("Startup syncing process failed repeatedly."
" Try restarting Kodi. Stopping Sync for " " Try restarting Kodi. Stopping Sync for "
@ -1225,7 +1223,7 @@ class LibrarySync(Thread):
log('Full library scan requested, starting', 0) log('Full library scan requested, starting', 0)
window('emby_dbScan', value="true") window('emby_dbScan', value="true")
window('plex_runLibScan', clear=True) window('plex_runLibScan', clear=True)
self.fullSync(manualrun=True) fullSync(manualrun=True)
window('emby_dbScan', clear=True) window('emby_dbScan', clear=True)
count = 0 count = 0
# Reset views was requested from somewhere else # Reset views was requested from somewhere else
@ -1239,8 +1237,8 @@ class LibrarySync(Thread):
# Remove video nodes # Remove video nodes
utils.deleteNodes() utils.deleteNodes()
# Kick off refresh # Kick off refresh
dialog = xbmcgui.Dialog()
if self.maintainViews(): if self.maintainViews():
# Ran successfully
dialog.notification( dialog.notification(
heading=self.addonName, heading=self.addonName,
message="Plex playlists/nodes refreshed", message="Plex playlists/nodes refreshed",
@ -1248,7 +1246,8 @@ class LibrarySync(Thread):
time=3000, time=3000,
sound=True) sound=True)
else: else:
self.logMsg("Refresh playlists/nodes failed", -1) # Failed
log("Refresh playlists/nodes failed", -1)
dialog.notification( dialog.notification(
heading=self.addonName, heading=self.addonName,
message="Plex playlists/nodes refresh failed", message="Plex playlists/nodes refresh failed",
@ -1256,19 +1255,25 @@ class LibrarySync(Thread):
time=3000, time=3000,
sound=True) sound=True)
window('emby_dbScan', clear=True) window('emby_dbScan', clear=True)
elif self.enableBackgroundSync: elif enableBackgroundSync:
# Run full lib scan approx every 30min # Run full lib scan approx every 30min
if count >= 1800: if count >= 1800:
count = 0 count = 0
window('emby_dbScan', value="true") window('emby_dbScan', value="true")
log('Running automatic full lib scan', 0) log('Running background full lib scan', 0)
self.fullSync(manualrun=True) fullSync(manualrun=True)
window('emby_dbScan', clear=True) window('emby_dbScan', clear=True)
# Run fast sync otherwise (ever 2 seconds or so) # Run fast sync otherwise (ever second or so)
else: else:
self.startSync() window('emby_dbScan', value="true")
if not fastSync():
# Fast sync failed or server plugin is not found
self.logMsg(
"Something went wrong, starting full sync", -1)
fullSync(manualrun=True)
window('emby_dbScan', clear=True)
xbmc.sleep(2000) xbmc.sleep(1000)
count += 1 count += 1
log("###===--- LibrarySync Stopped ---===###", 0) log("###===--- LibrarySync Stopped ---===###", 0)

2
resources/lib/userclient.py
View file

@ -423,7 +423,7 @@ class UserClient(threading.Thread):
while self.threadSuspended(): while self.threadSuspended():
if self.threadStopped(): if self.threadStopped():
break break
xbmc.sleep(3000) xbmc.sleep(1000)
status = window('emby_serverStatus') status = window('emby_serverStatus')
if status: if status: