Fixes regarding video node sync

This commit is contained in:
tomkat83 2016-01-11 14:38:01 +01:00
parent c854ee621e
commit a959ee118c
2 changed files with 19 additions and 13 deletions

View file

@ -6,6 +6,8 @@
<requires> <requires>
<import addon="xbmc.python" version="2.1.0"/> <import addon="xbmc.python" version="2.1.0"/>
<import addon="script.module.requests" version="2.3.0" /> <import addon="script.module.requests" version="2.3.0" />
<import addon="plugin.video.plexkodiconnect.movies" version="0.01" />
<import addon="plugin.video.plexkodiconnect.tvshows" version="0.01" />
</requires> </requires>
<extension point="xbmc.python.pluginsource" <extension point="xbmc.python.pluginsource"
library="default.py"> library="default.py">

View file

@ -506,10 +506,10 @@ class LibrarySync(threading.Thread):
# Delete video node # Delete video node
if mediatype != "musicvideos": if mediatype != "musicvideos":
vnodes.viewNode( vnodes.viewNode(
indexnumber=totalnodes, totalnodes,
tagname=current_viewname, current_viewname,
mediatype=mediatype, mediatype,
viewtype=current_viewtype, current_viewtype,
delete=True) delete=True)
# Added new playlist # Added new playlist
utils.playlistXSP(mediatype, foldername, viewtype) utils.playlistXSP(mediatype, foldername, viewtype)
@ -702,25 +702,28 @@ class LibrarySync(threading.Thread):
# Initialize # Initialize
plx = PlexAPI.PlexAPI() plx = PlexAPI.PlexAPI()
self.allPlexElementsId = {} self.allPlexElementsId = {}
embyconn = utils.kodiSQL('emby')
embycursor = embyconn.cursor()
emby_db = embydb.Embydb_Functions(embycursor)
itemType = 'Movies' itemType = 'Movies'
views = plx.GetPlexCollections('movie') views = emby_db.getView_byType('movie')
self.logMsg("Processing Plex %s. Libraries: %s" % (itemType, views), 1) self.logMsg("Processing Plex %s. Libraries: %s" % (itemType, views), 1)
if self.compare: if self.compare:
# Get movies from Plex server # Get movies from Plex server
embyconn = utils.kodiSQL('emby')
embycursor = embyconn.cursor()
emby_db = embydb.Embydb_Functions(embycursor) emby_db = embydb.Embydb_Functions(embycursor)
# Pull the list of movies and boxsets in Kodi # Pull the list of movies and boxsets in Kodi
try: try:
self.allKodiElementsId = dict(emby_db.getChecksum('Movie')) self.allKodiElementsId = dict(emby_db.getChecksum('Movie'))
except ValueError: except ValueError:
self.allKodiElementsId = {} self.allKodiElementsId = {}
embyconn.close()
else: else:
# Getting all metadata, hence set Kodi elements to {} # Getting all metadata, hence set Kodi elements to {}
self.allKodiElementsId = {} self.allKodiElementsId = {}
embyconn.close()
##### PROCESS MOVIES ##### ##### PROCESS MOVIES #####
self.updatelist = [] self.updatelist = []
@ -942,16 +945,17 @@ class LibrarySync(threading.Thread):
plx = PlexAPI.PlexAPI() plx = PlexAPI.PlexAPI()
self.allPlexElementsId = {} self.allPlexElementsId = {}
itemType = 'TVShows' itemType = 'TVShows'
# Open DB connections
embyconn = utils.kodiSQL('emby')
embycursor = embyconn.cursor()
emby_db = embydb.Embydb_Functions(embycursor)
views = plx.GetPlexCollections('show') views = emby_db.getView_byType('show')
self.logMsg("Media folders for %s: %s" % (itemType, views), 1) self.logMsg("Media folders for %s: %s" % (itemType, views), 1)
self.allKodiElementsId = {} self.allKodiElementsId = {}
if self.compare: if self.compare:
# Get movies from Plex server # Get movies from Plex server
embyconn = utils.kodiSQL('emby')
embycursor = embyconn.cursor()
emby_db = embydb.Embydb_Functions(embycursor)
# Pull the list of TV shows already in Kodi # Pull the list of TV shows already in Kodi
try: try:
all_koditvshows = dict(emby_db.getChecksum('Series')) all_koditvshows = dict(emby_db.getChecksum('Series'))
@ -964,7 +968,7 @@ class LibrarySync(threading.Thread):
self.allKodiElementsId.update(all_kodiepisodes) self.allKodiElementsId.update(all_kodiepisodes)
except ValueError: except ValueError:
pass pass
embyconn.close() embyconn.close()
##### PROCESS TV Shows ##### ##### PROCESS TV Shows #####
self.updatelist = [] self.updatelist = []