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

Librarysync overhaul

Browse source
This commit is contained in:
tomkat83 2016-03-02 17:27:21 +01:00
parent 065169aa31
commit e10bc84bf3
3 changed files with 128 additions and 85 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

185
resources/lib/librarysync.py
View file

@ -3,7 +3,6 @@
############################################################################### ###############################################################################
from threading import Thread, Lock from threading import Thread, Lock
from datetime import datetime
import Queue import Queue
import xbmc import xbmc
@ -244,7 +243,7 @@ class LibrarySync(Thread):
completed = self.fastSync() completed = self.fastSync()
if not completed: if not completed:
# Fast sync failed or server plugin is not found # Fast sync failed or server plugin is not found
self.logMsg("Something went wrong, starting full sync", 0) self.logMsg("Something went wrong, starting full sync", -1)
completed = self.fullSync(manualrun=True) completed = self.fullSync(manualrun=True)
utils.window('emby_dbScan', clear=True) utils.window('emby_dbScan', clear=True)
return completed return completed
@ -355,8 +354,10 @@ class LibrarySync(Thread):
embyconn.close() embyconn.close()
return return
@utils.LogTime
def fullSync(self, manualrun=False, repair=False): def fullSync(self, manualrun=False, repair=False):
# Only run once when first setting up. Can be run manually. # self.compare == False: we're syncing EVERY item
# True: we're syncing only the delta, e.g. different checksum
self.compare = manualrun or repair self.compare = manualrun or repair
xbmc.executebuiltin('InhibitIdleShutdown(true)') xbmc.executebuiltin('InhibitIdleShutdown(true)')
@ -366,12 +367,13 @@ class LibrarySync(Thread):
# Set new timestamp NOW because sync might take a while # Set new timestamp NOW because sync might take a while
self.saveLastSync() self.saveLastSync()
starttotal = datetime.now()
# Ensure that DBs exist if called for very first time # Ensure that DBs exist if called for very first time
self.initializeDBs() self.initializeDBs()
# Set views # Set views. Abort if unsuccessful
self.maintainViews() if not self.maintainViews():
xbmc.executebuiltin('InhibitIdleShutdown(false)')
return False
process = { process = {
'movies': self.PlexMovies, 'movies': self.PlexMovies,
@ -379,27 +381,18 @@ class LibrarySync(Thread):
} }
if self.enableMusic: if self.enableMusic:
process['music'] = self.PlexMusic process['music'] = self.PlexMusic
for itemtype in process: for itemtype in process:
startTime = datetime.now()
completed = process[itemtype]() completed = process[itemtype]()
if not completed: if not completed:
xbmc.executebuiltin('InhibitIdleShutdown(false)') xbmc.executebuiltin('InhibitIdleShutdown(false)')
return False return False
else:
elapsedTime = datetime.now() - startTime
self.logMsg("SyncDatabase (finished %s in: %s)"
% (itemtype, str(elapsedTime).split('.')[0]), 1)
# Let kodi update the views in any case # Let kodi update the views in any case, since we're doing a full sync
xbmc.executebuiltin('UpdateLibrary(video)') xbmc.executebuiltin('UpdateLibrary(video)')
if self.enableMusic: if self.enableMusic:
xbmc.executebuiltin('UpdateLibrary(music)') xbmc.executebuiltin('UpdateLibrary(music)')
elapsedtotal = datetime.now() - starttotal
utils.window('emby_initialScan', clear=True)
self.showKodiNote("Sync completed in: %s"
% (str(elapsedtotal).split('.')[0]))
utils.window('emby_initialScan', clear=True)
xbmc.executebuiltin('InhibitIdleShutdown(false)') xbmc.executebuiltin('InhibitIdleShutdown(false)')
return True return True
@ -408,8 +401,14 @@ class LibrarySync(Thread):
folder = folderItem.attrib folder = folderItem.attrib
mediatype = folder['type'] mediatype = folder['type']
# Only process supported formats # Only process supported formats
if mediatype not in ('movie', 'show'): if mediatype not in ('movie', 'show', 'artist'):
return return totalnodes
# Prevent duplicate for nodes of the same type
nodes = self.nodes[mediatype]
# Prevent duplicate for playlists of the same type
playlists = self.playlists[mediatype]
sorted_views = self.sorted_views[mediatype]
folderid = folder['key'] folderid = folder['key']
foldername = folder['title'] foldername = folder['title']
@ -422,20 +421,23 @@ class LibrarySync(Thread):
current_viewtype = view[1] current_viewtype = view[1]
current_tagid = view[2] current_tagid = view[2]
except TypeError: except TypeError:
self.logMsg("Creating viewid: %s in Emby database." self.logMsg("Creating viewid: %s in Plex database."
% folderid, 1) % folderid, 1)
tagid = kodi_db.createTag(foldername) tagid = kodi_db.createTag(foldername)
# Create playlist for the video library # Create playlist for the video library
if mediatype in ['movies', 'tvshows', 'musicvideos']: if (foldername not in playlists and
utils.playlistXSP(mediatype, foldername, viewtype) mediatype in ('movie', 'show', 'musicvideos')):
utils.playlistXSP(mediatype, foldername, folderid, viewtype)
playlists.append(foldername)
# Create the video node # Create the video node
if (mediatype in ['movies', 'tvshows', 'musicvideos', if (foldername not in nodes and
'homevideos']): mediatype not in ("musicvideos", "artist")):
vnodes.viewNode(totalnodes, vnodes.viewNode(sorted_views.index(foldername),
foldername, foldername,
mediatype, mediatype,
viewtype, viewtype,
folderid) folderid)
nodes.append(foldername)
totalnodes += 1 totalnodes += 1
# Add view to emby database # Add view to emby database
emby_db.addView(folderid, foldername, viewtype, tagid) emby_db.addView(folderid, foldername, viewtype, tagid)
@ -463,56 +465,69 @@ class LibrarySync(Thread):
# Update view with new info # Update view with new info
emby_db.updateView(foldername, tagid, folderid) emby_db.updateView(foldername, tagid, folderid)
if mediatype != "music": if mediatype != "artist":
if emby_db.getView_byName(current_viewname) is None: if emby_db.getView_byName(current_viewname) is None:
# The tag could be a combined view. Ensure there's # The tag could be a combined view. Ensure there's
# no other tags with the same name before deleting # no other tags with the same name before deleting
# playlist. # playlist.
utils.playlistXSP(mediatype, utils.playlistXSP(mediatype,
current_viewname, current_viewname,
folderid,
current_viewtype, current_viewtype,
True) True)
# Delete video node # Delete video node
if mediatype != "musicvideos": if mediatype != "musicvideos":
vnodes.viewNode(totalnodes, vnodes.viewNode(
current_viewname, indexnumber=sorted_views.index(foldername),
mediatype, tagname=current_viewname,
current_viewtype, mediatype=mediatype,
folderid, viewtype=current_viewtype,
viewid=folderid,
delete=True) delete=True)
# Added new playlist # Added new playlist
if mediatype in ['movies', 'tvshows', 'musicvideos']: if (foldername not in playlists and
utils.playlistXSP(mediatype, foldername, viewtype) mediatype in ('movie', 'show', 'musicvideos')):
utils.playlistXSP(mediatype,
foldername,
folderid,
viewtype)
playlists.append(foldername)
# Add new video node # Add new video node
if mediatype != "musicvideos": if foldername not in nodes and mediatype != "musicvideos":
vnodes.viewNode(totalnodes, vnodes.viewNode(sorted_views.index(foldername),
foldername, foldername,
mediatype, mediatype,
viewtype, viewtype,
folderid) folderid)
nodes.append(foldername)
totalnodes += 1 totalnodes += 1
# Update items with new tag # Update items with new tag
items = emby_db.getItem_byView(folderid) items = emby_db.getItem_byView(folderid)
for item in items: for item in items:
# Remove the "s" from viewtype for tags # Remove the "s" from viewtype for tags
kodi_db.updateTag(current_tagid, kodi_db.updateTag(
tagid, current_tagid, tagid, item[0], current_viewtype[:-1])
item[0],
current_viewtype[:-1])
else: else:
if mediatype != "music":
# Validate the playlist exists or recreate it # Validate the playlist exists or recreate it
if mediatype in ['movies', 'tvshows', 'musicvideos']: if mediatype != "artist":
utils.playlistXSP(mediatype, foldername, viewtype) if (foldername not in playlists and
mediatype in ('movie', 'show', 'musicvideos')):
utils.playlistXSP(mediatype,
foldername,
folderid,
viewtype)
playlists.append(foldername)
# Create the video node if not already exists # Create the video node if not already exists
if mediatype != "musicvideos": if foldername not in nodes and mediatype != "musicvideos":
vnodes.viewNode(totalnodes, vnodes.viewNode(sorted_views.index(foldername),
foldername, foldername,
mediatype, mediatype,
viewtype, viewtype,
folderid) folderid)
nodes.append(foldername)
totalnodes += 1 totalnodes += 1
return totalnodes
def maintainViews(self): def maintainViews(self):
""" """
@ -532,6 +547,18 @@ class LibrarySync(Thread):
# total nodes for window properties # total nodes for window properties
vnodes.clearProperties() vnodes.clearProperties()
totalnodes = 0 totalnodes = 0
self.nodes = {
'movie': [],
'show': [],
'artist': []
}
self.playlists = self.nodes.copy()
self.sorted_views = self.nodes.copy()
for view in sections:
itemType = view.attrib['type']
if itemType in ('movie', 'show'): # and NOT artist for now
self.sorted_views[itemType].append(view.attrib['title'])
with embydb.GetEmbyDB() as emby_db: with embydb.GetEmbyDB() as emby_db:
# Backup old views to delete them later, if needed (at the end # Backup old views to delete them later, if needed (at the end
@ -539,19 +566,23 @@ class LibrarySync(Thread):
self.old_views = emby_db.getViews() self.old_views = emby_db.getViews()
with kodidb.GetKodiDB('video') as kodi_db: with kodidb.GetKodiDB('video') as kodi_db:
for folderItem in sections: for folderItem in sections:
self.processView(folderItem, kodi_db, emby_db, totalnodes) totalnodes = self.processView(folderItem,
kodi_db,
emby_db,
totalnodes)
else: else:
# Add video nodes listings # Add video nodes listings
vnodes.singleNode(totalnodes, # Plex: there seem to be no favorites/favorites tag
"Favorite movies", # vnodes.singleNode(totalnodes,
"movies", # "Favorite movies",
"favourites") # "movies",
totalnodes += 1 # "favourites")
vnodes.singleNode(totalnodes, # totalnodes += 1
"Favorite tvshows", # vnodes.singleNode(totalnodes,
"tvshows", # "Favorite tvshows",
"favourites") # "tvshows",
totalnodes += 1 # "favourites")
# totalnodes += 1
vnodes.singleNode(totalnodes, vnodes.singleNode(totalnodes,
"channels", "channels",
"movies", "movies",
@ -560,7 +591,7 @@ class LibrarySync(Thread):
# Save total # Save total
utils.window('Emby.nodes.total', str(totalnodes)) utils.window('Emby.nodes.total', str(totalnodes))
# Reopen DB connection to ensure that changes are commited # Reopen DB connection to ensure that changes were commited before
with embydb.GetEmbyDB() as emby_db: with embydb.GetEmbyDB() as emby_db:
# update views for all: # update views for all:
self.views = emby_db.getAllViewInfo() self.views = emby_db.getAllViewInfo()
@ -579,7 +610,9 @@ class LibrarySync(Thread):
for view in self.old_views: for view in self.old_views:
emby_db.removeView(view) emby_db.removeView(view)
self.logMsg("views saved: %s" % self.views, 1) self.logMsg("Finished processing views. Views saved: %s"
% self.views, 1)
return True
def GetUpdatelist(self, xml, itemType, method, viewName, viewId, def GetUpdatelist(self, xml, itemType, method, viewName, viewId,
dontCheck=False): dontCheck=False):
@ -664,7 +697,7 @@ class LibrarySync(Thread):
self.logMsg("self.updatelist: %s" % self.updatelist, 2) self.logMsg("self.updatelist: %s" % self.updatelist, 2)
itemNumber = len(self.updatelist) itemNumber = len(self.updatelist)
if itemNumber == 0: if itemNumber == 0:
return True return
# Run through self.updatelist, get XML metadata per item # Run through self.updatelist, get XML metadata per item
# Initiate threads # Initiate threads
@ -733,8 +766,8 @@ class LibrarySync(Thread):
self.logMsg("Could not delete threads", -1) self.logMsg("Could not delete threads", -1)
self.logMsg("Sync threads finished", 1) self.logMsg("Sync threads finished", 1)
self.updatelist = [] self.updatelist = []
return True
@utils.LogTime
def PlexMovies(self): def PlexMovies(self):
# Initialize # Initialize
self.allPlexElementsId = {} self.allPlexElementsId = {}
@ -865,6 +898,7 @@ class LibrarySync(Thread):
return True return True
@utils.LogTime
def PlexTVShows(self): def PlexTVShows(self):
# Initialize # Initialize
self.allPlexElementsId = {} self.allPlexElementsId = {}
@ -974,6 +1008,7 @@ class LibrarySync(Thread):
self.logMsg("%s sync is finished." % itemType, 1) self.logMsg("%s sync is finished." % itemType, 1)
return True return True
@utils.LogTime
def PlexMusic(self): def PlexMusic(self):
itemType = 'Music' itemType = 'Music'
@ -1060,14 +1095,13 @@ class LibrarySync(Thread):
return False return False
def run(self): def run(self):
try: try:
self.run_internal() self.run_internal()
except Exception as e: except Exception as e:
utils.window('emby_dbScan', clear=True) utils.window('emby_dbScan', clear=True)
xbmcgui.Dialog().ok( xbmcgui.Dialog().ok(
heading=self.addonName, heading=self.addonName,
line1=("Library sync thread has exited! " line1=("Library sync thread has crashed. "
"You should restart Kodi now. " "You should restart Kodi now. "
"Please report this on the forum.")) "Please report this on the forum."))
raise raise
@ -1080,6 +1114,7 @@ class LibrarySync(Thread):
startupComplete = False startupComplete = False
self.views = [] self.views = []
count = 0 count = 0
errorcount = 0
self.logMsg("---===### Starting LibrarySync ###===---", 0) self.logMsg("---===### Starting LibrarySync ###===---", 0)
while not self.threadStopped(): while not self.threadStopped():
@ -1116,6 +1151,7 @@ class LibrarySync(Thread):
"until the database is reset.")) "until the database is reset."))
else: else:
utils.reset() utils.reset()
window('emby_dbCheck', value="true")
if not startupComplete: if not startupComplete:
# Also runs when first installed # Also runs when first installed
@ -1136,20 +1172,27 @@ class LibrarySync(Thread):
# Run start up sync # Run start up sync
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("SyncDatabase (started)", 1) log("Initial start-up full sync starting", 0)
startTime = datetime.now()
librarySync = self.fullSync(manualrun=True) librarySync = self.fullSync(manualrun=True)
elapsedTime = datetime.now() - startTime window('emby_dbScan', clear=True)
log("SyncDatabase (finished in: %s) %s" if librarySync:
% (str(elapsedTime).split('.')[0], librarySync), 1) log("Initial start-up full sync successful", 0)
# Only try the initial sync once per kodi session regardless
# This will prevent an infinite loop in case something goes
# wrong.
startupComplete = True startupComplete = True
settings('SyncInstallRunDone', value="true") settings('SyncInstallRunDone', value="true")
settings("dbCreatedWithVersion", self.clientInfo.getVersion()) settings("dbCreatedWithVersion",
self.clientInfo.getVersion())
self.installSyncDone = True self.installSyncDone = True
window('emby_dbScan', clear=True) else:
log("Initial start-up full sync unsuccessful", -1)
errorcount += 1
if errorcount > 2:
log("Startup full sync failed. Stopping sync", -1)
xbmcgui.Dialog().ok(
heading=self.addonName,
line1=("Startup syncing process failed repeatedly."
" Try restarting Kodi. Stopping Sync for "
"now."))
break
# Currently no db scan, so we can start a new scan # Currently no db scan, so we can start a new scan
elif window('emby_dbScan') != "true": elif window('emby_dbScan') != "true":

18
resources/lib/utils.py
View file

@ -639,14 +639,14 @@ def playlistXSP(mediatype, tagname, viewid, viewtype="", delete=False):
path = xbmc.translatePath("special://profile/playlists/video/").decode('utf-8') path = xbmc.translatePath("special://profile/playlists/video/").decode('utf-8')
if viewtype == "mixed": if viewtype == "mixed":
plname = "%s - %s" % (tagname, mediatype) plname = "%s - %s" % (tagname, mediatype)
xsppath = "%sEmby %s - %s.xsp" % (path, viewid, mediatype) xsppath = "%sPlex %s - %s.xsp" % (path, viewid, mediatype)
else: else:
plname = tagname plname = tagname
xsppath = "%sEmby %s.xsp" % (path, viewid) xsppath = "%sPlex %s.xsp" % (path, viewid)
# Create the playlist directory # Create the playlist directory
if not xbmcvfs.exists(path): if not xbmcvfs.exists(path):
logMsg("EMBY", "Creating directory: %s" % path, 1) logMsg("PLEX", "Creating directory: %s" % path, 1)
xbmcvfs.mkdirs(path) xbmcvfs.mkdirs(path)
# Only add the playlist if it doesn't already exists # Only add the playlist if it doesn't already exists
@ -654,25 +654,25 @@ def playlistXSP(mediatype, tagname, viewid, viewtype="", delete=False):
if delete: if delete:
xbmcvfs.delete(xsppath) xbmcvfs.delete(xsppath)
logMsg("EMBY", "Successfully removed playlist: %s." % tagname, 1) logMsg("PLEX", "Successfully removed playlist: %s." % tagname, 1)
return return
# Using write process since there's no guarantee the xml declaration works with etree # Using write process since there's no guarantee the xml declaration works with etree
itemtypes = { itemtypes = {
'homevideos': "movies" 'homevideos': "movie"
} }
logMsg("EMBY", "Writing playlist file to: %s" % xsppath, 1) logMsg("Plex", "Writing playlist file to: %s" % xsppath, 1)
try: try:
f = xbmcvfs.File(xsppath, 'w') f = xbmcvfs.File(xsppath, 'w')
except: except:
logMsg("EMBY", "Failed to create playlist: %s" % xsppath, 1) logMsg("Plex", "Failed to create playlist: %s" % xsppath, -1)
return return
else: else:
f.write( f.write(
'<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>\n' '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>\n'
'<smartplaylist type="%s">\n\t' '<smartplaylist type="%s">\n\t'
'<name>Emby %s</name>\n\t' '<name>Plex %s</name>\n\t'
'<match>all</match>\n\t' '<match>all</match>\n\t'
'<rule field="tag" operator="is">\n\t\t' '<rule field="tag" operator="is">\n\t\t'
'<value>%s</value>\n\t' '<value>%s</value>\n\t'
@ -680,7 +680,7 @@ def playlistXSP(mediatype, tagname, viewid, viewtype="", delete=False):
'</smartplaylist>' '</smartplaylist>'
% (itemtypes.get(mediatype, mediatype), plname, tagname)) % (itemtypes.get(mediatype, mediatype), plname, tagname))
f.close() f.close()
logMsg("EMBY", "Successfully added playlist: %s" % tagname) logMsg("Plex", "Successfully added playlist: %s" % tagname)
def deletePlaylists(): def deletePlaylists():

2
service.py
View file

@ -320,7 +320,7 @@ class Service():
# Delay option # Delay option
delay = int(utils.settings('startupDelay')) delay = int(utils.settings('startupDelay'))
xbmc.log("Delaying emby startup by: %s sec..." % delay) xbmc.log("Delaying Plex startup by: %s sec..." % delay)
if delay and xbmc.Monitor().waitForAbort(delay): if delay and xbmc.Monitor().waitForAbort(delay):
# Start the service # Start the service
xbmc.log("Abort requested while waiting. Emby for kodi not started.") xbmc.log("Abort requested while waiting. Emby for kodi not started.")