mirror of
https://github.com/jellyfin/jellyfin-kodi.git
synced 2024-12-25 02:06:09 +00:00
Merge branch 'database_changes' of https://github.com/MediaBrowser/Emby.Kodi into database_changes
This commit is contained in:
commit
d349207781
1 changed files with 33 additions and 23 deletions
|
@ -226,33 +226,43 @@ class ReadEmbyDB():
|
||||||
doUtils = DownloadUtils()
|
doUtils = DownloadUtils()
|
||||||
|
|
||||||
viewsUrl = "{server}/mediabrowser/Users/{UserId}/Views?format=json&ImageTypeLimit=1"
|
viewsUrl = "{server}/mediabrowser/Users/{UserId}/Views?format=json&ImageTypeLimit=1"
|
||||||
jsonData = doUtils.downloadUrl(viewsUrl)
|
result = doUtils.downloadUrl(viewsUrl)
|
||||||
collections=[]
|
collections=[]
|
||||||
|
|
||||||
if (jsonData != ""):
|
if (result == ""):
|
||||||
views = views[u'Items']
|
return []
|
||||||
|
|
||||||
for view in views:
|
result = result[u'Items']
|
||||||
if (view[u'Type'] == 'UserView'): # Need to grab the real main node
|
|
||||||
newViewsUrl = "{server}/mediabrowser/Users/{UserId}/items?ParentId=%s&SortBy=SortName&SortOrder=Ascending&format=json&ImageTypeLimit=1" % view[u'Id']
|
|
||||||
jsonData = doUtils.downloadUrl(newViewsUrl)
|
|
||||||
if (jsonData != ""):
|
|
||||||
newViews = newViews[u'Items']
|
|
||||||
for newView in newViews:
|
|
||||||
# There are multiple nodes in here like 'Latest', 'NextUp' - below we grab the full node.
|
|
||||||
if newView[u'CollectionType'] == "MovieMovies" or newView[u'CollectionType'] == "TvShowSeries":
|
|
||||||
view=newView
|
|
||||||
if (view[u'ChildCount'] != 0):
|
|
||||||
Name = view[u'Name']
|
|
||||||
|
|
||||||
total = str(view[u'ChildCount'])
|
for view in result:
|
||||||
|
if (view[u'Type'] == 'UserView'): # Need to grab the real main node
|
||||||
|
newViewsUrl = "{server}/mediabrowser/Users/{UserId}/items?ParentId=%s&SortBy=SortName&SortOrder=Ascending&format=json&ImageTypeLimit=1" % view[u'Id']
|
||||||
|
newViews = doUtils.downloadUrl(newViewsUrl)
|
||||||
|
if (result == ""):
|
||||||
|
return []
|
||||||
|
newViews = newViews[u'Items']
|
||||||
|
print str(newViews)
|
||||||
|
for newView in newViews:
|
||||||
|
# There are multiple nodes in here like 'Latest', 'NextUp' - below we grab the full node.
|
||||||
|
if newView[u'CollectionType'] != None:
|
||||||
|
if newView[u'CollectionType'] == "MovieMovies" or newView[u'CollectionType'] == "TvShowSeries":
|
||||||
|
view=newView
|
||||||
|
if (view[u'ChildCount'] != 0):
|
||||||
|
Name = view[u'Name']
|
||||||
|
|
||||||
|
total = str(view[u'ChildCount'])
|
||||||
|
try:
|
||||||
itemtype = view[u'CollectionType']
|
itemtype = view[u'CollectionType']
|
||||||
if itemtype == None:
|
except:
|
||||||
itemtype = "movies" # User may not have declared the type
|
itemtype = "movies"
|
||||||
if itemtype == type:
|
if itemtype == "MovieMovies":
|
||||||
collections.append( {'title' : Name,
|
itemtype = "movies"
|
||||||
'type' : type,
|
if itemtype == "TvShowSeries":
|
||||||
'id' : view[u'Id']})
|
itemtype = "tvshows"
|
||||||
|
if itemtype == type:
|
||||||
|
collections.append( {'title' : Name,
|
||||||
|
'type' : type,
|
||||||
|
'id' : view[u'Id']})
|
||||||
return collections
|
return collections
|
||||||
|
|
||||||
def getBoxSets(self):
|
def getBoxSets(self):
|
||||||
|
|
Loading…
Reference in a new issue