Jellyfin
/
jellyfin-kodi
mirror of https://github.com/jellyfin/jellyfin-kodi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #224 from mcarlton00/xml-unicode 

Fix ascii errors
This commit is contained in:
Abby 2020-03-08 14:56:11 +00:00 committed by GitHub
parent c4419fb90b 0cff79e3c8
commit 0c25cd04be
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 56 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jellyfin_kodi/helper/__init__.py
View File

@ -13,8 +13,6 @@ from .utils import event
from .utils import validate
from .utils import values
from .utils import JSONRPC
from .utils import indent
from .utils import write_xml
from .utils import compare_version
from .utils import unzip
from .utils import create_id

38
jellyfin_kodi/helper/utils.py
View File

@ -266,44 +266,6 @@ def values(item, keys):
return (item[key.replace('{', "").replace('}', "")] if isinstance(key, text_type) and key.startswith('{') else key for key in keys)
def indent(elem, level=0):
''' Prettify xml docs.
'''
try:
i = "\n" + level * " "
if len(elem):
if not elem.text or not elem.text.strip():
elem.text = i + " "
if not elem.tail or not elem.tail.strip():
elem.tail = i
for elem in elem:
indent(elem, level + 1)
if not elem.tail or not elem.tail.strip():
elem.tail = i
else:
if level and (not elem.tail or not elem.tail.strip()):
elem.tail = i
except Exception as error:
LOG.exception(error)
return
def write_xml(content, file):
if isinstance(content, text_type):
content = content.encode('utf-8')
with open(file, 'wb') as infile:
# replace apostrophes with double quotes only in xml keys, not texts
def replace_apostrophes(match):
return match.group(0).replace(b"'", b'"')
content = re.sub(b"<(.*?)>", replace_apostrophes, content)
content = content.replace(b'?>', b' standalone="yes" ?>', 1)
infile.write(content)
def delete_folder(path):
''' Delete objects from kodi cache

14
jellyfin_kodi/helper/xmls.py
View File

@ -9,7 +9,7 @@ import xml.etree.ElementTree as etree
from kodi_six import xbmc
from . import translate, indent, write_xml, dialog, settings
from . import translate, dialog, settings
#################################################################################################
@ -75,8 +75,8 @@ def sources():
except Exception as error:
LOG.exception(error)
indent(xml)
write_xml(etree.tostring(xml, 'UTF-8'), file)
tree = etree.ElementTree(xml)
tree.write(file)
def tvtunes_nfo(path, urls):
@ -95,8 +95,8 @@ def tvtunes_nfo(path, urls):
for url in urls:
etree.SubElement(xml, 'file').text = url
indent(xml)
write_xml(etree.tostring(xml, 'UTF-8'), path)
tree = etree.ElementTree(xml)
tree.write(path)
def advanced_settings():
@ -125,8 +125,8 @@ def advanced_settings():
LOG.warning("cleanonupdate disabled")
video.remove(cleanonupdate)
indent(xml)
write_xml(etree.tostring(xml, 'UTF-8'), path)
tree = etree.ElementTree(xml)
tree.write(path)
dialog("ok", heading="{jellyfin}", line1=translate(33097))
xbmc.executebuiltin('RestartApp')

57
jellyfin_kodi/views.py
View File

@ -12,7 +12,7 @@ from six.moves.urllib.parse import urlencode
from kodi_six import xbmc, xbmcvfs
from database import Database, jellyfin_db, get_sync, save_sync
from helper import translate, api, indent, write_xml, window, event
from helper import translate, api, window, event
from jellyfin import Jellyfin
#################################################################################################
@ -110,7 +110,7 @@ def verify_kodi_defaults():
'''
node_path = xbmc.translatePath("special://profile/library/video")
if not xbmcvfs.exists(node_path):
if not os.path.exists(node_path):
try:
shutil.copytree(
src=xbmc.translatePath("special://xbmc/system/library/video"),
@ -126,8 +126,8 @@ def verify_kodi_defaults():
xml = etree.parse(file).getroot()
xml.set('order', str(17 + index))
indent(xml)
write_xml(etree.tostring(xml, 'UTF-8'), file)
tree = etree.ElementTree(xml)
tree.write(file)
playlist_path = xbmc.translatePath("special://profile/playlists/video")
@ -272,7 +272,12 @@ class Views(object):
file = os.path.join(path, "jellyfin%s%s.xsp" % (view['Media'], view['Id']))
try:
if os.path.isfile(file):
xml = etree.parse(file).getroot()
else:
xml = etree.Element('smartplaylist', {'type': view['Media']})
etree.SubElement(xml, 'name')
etree.SubElement(xml, 'match')
except Exception:
LOG.warning("Unable to parse file '%s'", file)
xml = etree.Element('smartplaylist', {'type': view['Media']})
@ -292,8 +297,8 @@ class Views(object):
rule = etree.SubElement(xml, 'rule', {'field': "tag", 'operator': "is"})
etree.SubElement(rule, 'value').text = view['Tag']
indent(xml)
write_xml(etree.tostring(xml, 'UTF-8'), file)
tree = etree.ElementTree(xml)
tree.write(file)
def add_nodes(self, path, view, mixed=False):
@ -316,7 +321,13 @@ class Views(object):
file = os.path.join(path, "jellyfin_%s.xml" % view['Tag'].replace(" ", ""))
try:
if os.path.isfile(file):
xml = etree.parse(file).getroot()
else:
xml = self.node_root('folder' if item_type == 'favorites' and view['Media'] == 'episodes' else 'filter', index)
etree.SubElement(xml, 'label')
etree.SubElement(xml, 'match')
etree.SubElement(xml, 'content')
except Exception:
LOG.warning("Unable to parse file '%s'", file)
xml = self.node_root('folder' if item_type == 'favorites' and view['Media'] == 'episodes' else 'filter', index)
@ -348,8 +359,8 @@ class Views(object):
else:
self.node_all(xml)
indent(xml)
write_xml(etree.tostring(xml, 'UTF-8'), file)
tree = etree.ElementTree(xml)
tree.write(file)
def node_root(self, root, index):
@ -372,8 +383,14 @@ class Views(object):
index = self.sync['SortedViews'].index(view['Id'])
try:
if os.path.isfile(file):
xml = etree.parse(file).getroot()
xml.set('order', str(index))
else:
xml = self.node_root('filter', index)
etree.SubElement(xml, 'label')
etree.SubElement(xml, 'match')
etree.SubElement(xml, 'content')
except Exception as error:
LOG.exception(error)
xml = self.node_root('main', index)
@ -382,8 +399,8 @@ class Views(object):
label = xml.find('label')
label.text = view['Name'] if not mixed else "%s (%s)" % (view['Name'], translate(view['Media']))
indent(xml)
write_xml(etree.tostring(xml, 'UTF-8'), file)
tree = etree.ElementTree(xml)
tree.write(file)
def node(self, folder, view):
@ -412,7 +429,14 @@ class Views(object):
def add_node(self, index, file, view, node, name):
try:
if os.path.isfile(file):
xml = etree.parse(file).getroot()
else:
xml = self.node_root('filter', index)
etree.SubElement(xml, 'label')
etree.SubElement(xml, 'match')
etree.SubElement(xml, 'content')
except Exception:
LOG.warning("Unable to parse file '%s'", file)
xml = self.node_root('filter', index)
@ -437,13 +461,18 @@ class Views(object):
etree.SubElement(rule, 'value').text = view['Tag']
getattr(self, 'node_' + node)(xml) # get node function based on node type
indent(xml)
write_xml(etree.tostring(xml, 'UTF-8'), file)
tree = etree.ElementTree(xml)
tree.write(file)
def add_dynamic_node(self, index, file, view, node, name, path):
try:
if os.path.isfile(file):
xml = etree.parse(file).getroot()
else:
xml = self.node_root('filter', index)
etree.SubElement(xml, 'label')
etree.SubElement(xml, 'content')
except Exception:
LOG.warning("Unable to parse file '%s'", file)
xml = self.node_root('folder', index)
@ -454,8 +483,8 @@ class Views(object):
label.text = name
getattr(self, 'node_' + node)(xml, path)
indent(xml)
write_xml(etree.tostring(xml, 'UTF-8'), file)
tree = etree.ElementTree(xml)
tree.write(file)
def node_all(self, root):