Merge remote-tracking branch 'doctorlard/master' into develop

This commit is contained in:
tomkat83 2016-04-05 12:01:10 +02:00
commit 248ae52599

View file

@ -768,6 +768,7 @@ def BrowseContent(viewname, type="", folderid=""):
if view.get("name") == viewname.decode('utf-8'): if view.get("name") == viewname.decode('utf-8'):
folderid = view.get("id") folderid = view.get("id")
if viewname is not None:
utils.logMsg("BrowseContent","viewname: %s - type: %s - folderid: %s - filter: %s" %(viewname.decode('utf-8'), type.decode('utf-8'), folderid.decode('utf-8'), filter.decode('utf-8'))) utils.logMsg("BrowseContent","viewname: %s - type: %s - folderid: %s - filter: %s" %(viewname.decode('utf-8'), type.decode('utf-8'), folderid.decode('utf-8'), filter.decode('utf-8')))
#set the correct params for the content type #set the correct params for the content type
#only proceed if we have a folderid #only proceed if we have a folderid
@ -937,10 +938,9 @@ def BrowseChannels(itemid, folderid=None):
itemid = item['Id'] itemid = item['Id']
itemtype = item['Type'] itemtype = item['Type']
li = createListItemFromEmbyItem(item,art,doUtils) li = createListItemFromEmbyItem(item,art,doUtils)
if itemtype == "ChannelFolderItem":
isFolder = True isFolder = item.get('IsFolder', False)
else:
isFolder = False
channelId = item.get('ChannelId', "") channelId = item.get('ChannelId', "")
channelName = item.get('ChannelName', "") channelName = item.get('ChannelName', "")
if itemtype == "Channel": if itemtype == "Channel":