Merge remote-tracking branch 'doctorlard/master' into develop
This commit is contained in:
commit
248ae52599
1 changed files with 5 additions and 5 deletions
|
@ -768,7 +768,8 @@ def BrowseContent(viewname, type="", folderid=""):
|
|||
if view.get("name") == viewname.decode('utf-8'):
|
||||
folderid = view.get("id")
|
||||
|
||||
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')))
|
||||
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')))
|
||||
#set the correct params for the content type
|
||||
#only proceed if we have a folderid
|
||||
if folderid:
|
||||
|
@ -937,10 +938,9 @@ def BrowseChannels(itemid, folderid=None):
|
|||
itemid = item['Id']
|
||||
itemtype = item['Type']
|
||||
li = createListItemFromEmbyItem(item,art,doUtils)
|
||||
if itemtype == "ChannelFolderItem":
|
||||
isFolder = True
|
||||
else:
|
||||
isFolder = False
|
||||
|
||||
isFolder = item.get('IsFolder', False)
|
||||
|
||||
channelId = item.get('ChannelId', "")
|
||||
channelName = item.get('ChannelName', "")
|
||||
if itemtype == "Channel":
|
||||
|
|
Loading…
Reference in a new issue