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

Fix views encoding

Browse source
This commit is contained in:
angelblue05 2018-09-10 17:34:06 -05:00
parent 16c8571f07
commit 2d27ff78fd
1 changed files with 39 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
resources/lib/views.py
View file

@ -80,6 +80,9 @@ def verify_kodi_defaults():
for index, node in enumerate(['movies', 'tvshows', 'musicvideos']):
file = os.path.join(node_path, node, "index.xml")
if xbmcvfs.exists(file):
xml = etree.parse(file).getroot()
xml.set('order', str(17 + index))
indent(xml)
@ -175,6 +178,8 @@ class Views(object):
library = library.replace('Mixed:', "")
view = db.get_view(library)
if view:
view = {'Id': library, 'Name': view[0], 'Tag': view[0], 'Media': view[1]}
if view['Media'] == 'mixed':
@ -326,7 +331,7 @@ class Views(object):
for node in NODES[view['Media']]:
xml_name = node[0]
xml_label = node[1] or view['Name'].encode('utf-8')
xml_label = node[1] or view['Name']
file = os.path.join(folder, "%s.xml" % xml_name)
self.add_node(NODES[view['Media']].index(node), file, view, xml_name, xml_label)
@ -335,7 +340,7 @@ class Views(object):
for node in NODES[view['Media']]:
xml_name = node[0]
xml_label = node[1] or view['Name'].encode('utf-8')
xml_label = node[1] or view['Name']
xml_index = NODES[view['Media']].index(node)
file = os.path.join(folder, "%s.xml" % xml_name)
@ -355,8 +360,9 @@ class Views(object):
etree.SubElement(xml, 'match')
etree.SubElement(xml, 'content')
label = xml.find('label')
label.text = str(name) if type(name) == int else name.encode('utf-8')
label.text = str(name) if type(name) == int else name
content = xml.find('content')
content.text = view['Media']
@ -702,6 +708,9 @@ class Views(object):
else:
window_path = "ActivateWindow(Videos,%s,return)" % path
node_label = _(node_label) if type(node_label) == int else node_label
node_label = node_label or view['Name']
if node in ('all', 'music'):
window_prop = "Emby.nodes.%s" % index
@ -715,7 +724,7 @@ class Views(object):
window('%s.title' % window_prop, view['Name'].encode('utf-8'))
else:
window_prop = "Emby.nodes.%s.%s" % (index, node)
window('%s.title' % window_prop, str(node_label) or view['Name'].encode('utf-8'))
window('%s.title' % window_prop, node_label.encode('utf-8'))
window('%s.content' % window_prop, path)
window('%s.id' % window_prop, view['Id'])
@ -750,11 +759,14 @@ class Views(object):
else:
path = self.window_path(view, node)
if node in ('browse', 'homevideos', 'photos'):
if node in ('browse', 'books', 'audiobooks'):
window_path = path
else:
window_path = "ActivateWindow(Videos,%s,return)" % path
node_label = _(node_label) if type(node_label) == int else node_label
node_label = node_label or view['Name']
if node == 'all':
window_prop = "Emby.wnodes.%s" % index
@ -769,7 +781,7 @@ class Views(object):
window('%s.content' % window_prop, path)
else:
window_prop = "Emby.wnodes.%s.%s" % (index, node)
window('%s.title' % window_prop, str(node_label) or view['Name'].encode('utf-8'))
window('%s.title' % window_prop, node_label.encode('utf-8'))
window('%s.content' % window_prop, path)
window('%s.id' % window_prop, view['Id'])
@ -794,7 +806,7 @@ class Views(object):
'mode': "nextepisodes",
'limit': self.limit
}
return "%s?%s" % ("plugin://plugin.video.emby", urllib.urlencode(params))
return "%s?%s" % ("plugin://plugin.video.emby/", urllib.urlencode(params))
def window_browse(self, view, node=None):
@ -809,7 +821,7 @@ class Views(object):
if node:
params['folder'] = node
return "%s?%s" % ("plugin://plugin.video.emby", urllib.urlencode(params))
return "%s?%s" % ("plugin://plugin.video.emby/", urllib.urlencode(params))
def window_clear(self, name=None):