Jellyfin/jellyfin-kodi
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-kodi.git synced 2024-12-26 02:36:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

Support mixed content and undefined collection

Browse source 
Undefined collection - when rich presentation is disabled.
This commit is contained in:
angelblue05 2015-09-08 13:36:49 -05:00
parent 09966b25bb
commit c92454bb92
3 changed files with 39 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
resources/lib/LibrarySync.py
View file

@ -236,6 +236,15 @@ class LibrarySync(threading.Thread):
allEmbyMovies = ReadEmbyDB().getMovies(view.get('id')) allEmbyMovies = ReadEmbyDB().getMovies(view.get('id'))
allKodiMovies = ReadKodiDB().getKodiMovies(connection, cursor) allKodiMovies = ReadKodiDB().getKodiMovies(connection, cursor)
for kodimovie in allKodiMovies:
allKodiMovieIds.append(kodimovie[1])
title = view.get('title')
content = view.get('content')
if content == "mixed":
title = "%s - Movies" % title
for kodimovie in allKodiMovies: for kodimovie in allKodiMovies:
allKodiMovieIds.append(kodimovie[1]) allKodiMovieIds.append(kodimovie[1])
@ -263,10 +272,10 @@ class LibrarySync(threading.Thread):
kodiMovie = kodimovie kodiMovie = kodimovie
if kodiMovie == None: if kodiMovie == None:
WriteKodiVideoDB().addOrUpdateMovieToKodiLibrary(item["Id"],connection, cursor, view.get('title')) WriteKodiVideoDB().addOrUpdateMovieToKodiLibrary(item["Id"],connection, cursor, title)
else: else:
if kodiMovie[2] != API().getChecksum(item): if kodiMovie[2] != API().getChecksum(item):
WriteKodiVideoDB().addOrUpdateMovieToKodiLibrary(item["Id"],connection, cursor, view.get('title')) WriteKodiVideoDB().addOrUpdateMovieToKodiLibrary(item["Id"],connection, cursor, title)
@ -367,6 +376,12 @@ class LibrarySync(threading.Thread):
allEmbyTvShows = ReadEmbyDB().getTvShows(view.get('id')) allEmbyTvShows = ReadEmbyDB().getTvShows(view.get('id'))
allKodiTvShows = ReadKodiDB().getKodiTvShows(connection, cursor) allKodiTvShows = ReadKodiDB().getKodiTvShows(connection, cursor)
title = view.get('title')
content = view.get('content')
if content == "mixed":
title = "%s - TV Shows" % title
total = len(allEmbyTvShows) + 1 total = len(allEmbyTvShows) + 1
count = 1 count = 1
@ -396,11 +411,11 @@ class LibrarySync(threading.Thread):
if kodiShow == None: if kodiShow == None:
# Tv show doesn't exist in Kodi yet so proceed and add it # Tv show doesn't exist in Kodi yet so proceed and add it
WriteKodiVideoDB().addOrUpdateTvShowToKodiLibrary(item["Id"],connection, cursor, view.get('title')) WriteKodiVideoDB().addOrUpdateTvShowToKodiLibrary(item["Id"],connection, cursor, title)
else: else:
# If there are changes to the item, perform a full sync of the item # If there are changes to the item, perform a full sync of the item
if kodiShow[2] != API().getChecksum(item): if kodiShow[2] != API().getChecksum(item):
WriteKodiVideoDB().addOrUpdateTvShowToKodiLibrary(item["Id"],connection, cursor, view.get('title')) WriteKodiVideoDB().addOrUpdateTvShowToKodiLibrary(item["Id"],connection, cursor, title)
#### PROCESS EPISODES ###### #### PROCESS EPISODES ######
self.EpisodesFullSync(connection,cursor,item["Id"]) self.EpisodesFullSync(connection,cursor,item["Id"])

12
resources/lib/ReadEmbyDB.py
View file

@ -291,13 +291,21 @@ class ReadEmbyDB():
for item in result: for item in result:
if item['RecursiveItemCount']: if item['RecursiveItemCount']:
name = item['Name'] name = item['Name']
itemtype = item.get('CollectionType', "movies") itemtype = item.get('CollectionType')
content = itemtype
if itemtype is None and type in ("movies", "tvshows"):
# Mixed content or rich presentation is disabled
itemtype = type
content = "mixed"
if itemtype == type and name != "Collections": if itemtype == type and name != "Collections":
collections.append({ collections.append({
'title': name, 'title': name,
'type': itemtype, 'type': itemtype,
'id': item['Id'] 'id': item['Id'],
'content': content
}) })
return collections return collections

12
resources/lib/VideoNodes.py
View file

@ -331,13 +331,21 @@ class VideoNodes():
views_movies = ReadEmbyDB().getCollections("movies") views_movies = ReadEmbyDB().getCollections("movies")
if views_movies: if views_movies:
for view in views_movies: for view in views_movies:
self.buildVideoNodeForView(view.get('title'), "movies", totalNodesCount) title = view.get('title')
content = view.get('content')
if content == "mixed":
title = "%s - Movies" % title
self.buildVideoNodeForView(title, "movies", totalNodesCount)
totalNodesCount +=1 totalNodesCount +=1
views_shows = ReadEmbyDB().getCollections("tvshows") views_shows = ReadEmbyDB().getCollections("tvshows")
if views_shows: if views_shows:
for view in views_shows: for view in views_shows:
self.buildVideoNodeForView(view.get('title'), "tvshows", totalNodesCount) title = view.get('title')
content = view.get('content')
if content == "mixed":
title = "%s - TV Shows" % title
self.buildVideoNodeForView(title, "tvshows", totalNodesCount)
totalNodesCount +=1 totalNodesCount +=1
#create tag node for emby channels #create tag node for emby channels