jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-28 13:16:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2108 from Kwiboo/fix-appliance-merge

Browse Source 
kodi: fix appliance.xml merge and more
This commit is contained in:
Christian Hewitt 2017-10-16 00:46:11 +04:00 committed by GitHub
commit f066989daf
4 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
packages/mediacenter/kodi/config/appliance.xml
View File

@ -24,6 +24,13 @@
</setting> </setting>
</group> </group>
</category> </category>
<category id="logging">
<group id="1">
<setting id="debug.screenshotpath">
<default>/storage/screenshots/</default>
</setting>
</group>
</category>
</section> </section>
<section id="services"> <section id="services">

3
packages/mediacenter/kodi/config/guisettings.xml
View File

@ -1,7 +1,4 @@
<settings> <settings>
<debug>
<screenshotpath pathversion="1">/storage/screenshots/</screenshotpath>
</debug>
<general> <general>
<settinglevel>2</settinglevel> <settinglevel>2</settinglevel>
</general> </general>

14
packages/mediacenter/kodi/scripts/xml_merge.py
View File

@ -11,6 +11,10 @@ from xml.etree import ElementTree as et
def printerr(*args, **kwargs): def printerr(*args, **kwargs):
print(*args, file=sys.stderr, **kwargs) print(*args, file=sys.stderr, **kwargs)
class hashabledict(dict):
def __hash__(self):
return hash(tuple(sorted(self.items())))
class XMLCombiner(object): class XMLCombiner(object):
def __init__(self, filenames): def __init__(self, filenames):
if len(filenames) == 0: if len(filenames) == 0:
@ -32,19 +36,19 @@ class XMLCombiner(object):
return self.prettyPrint(self.roots[0]) return self.prettyPrint(self.roots[0])
def combine_element(self, one, other): def combine_element(self, one, other):
mapping = {el.tag: el for el in one} mapping = {(el.tag, hashabledict(el.attrib)): el for el in one}
for el in other: for el in other:
if len(el) == 0: if len(el) == 0:
try: try:
mapping[el.tag].text = el.text mapping[(el.tag, hashabledict(el.attrib))].text = el.text
except KeyError: except KeyError:
mapping[el.tag] = el mapping[(el.tag, hashabledict(el.attrib))] = el
one.append(el) one.append(el)
else: else:
try: try:
self.combine_element(mapping[el.tag], el) self.combine_element(mapping[(el.tag, hashabledict(el.attrib))], el)
except KeyError: except KeyError:
mapping[el.tag] = el mapping[(el.tag, hashabledict(el.attrib))] = el
one.append(el) one.append(el)
if __name__ == '__main__': if __name__ == '__main__':

6
projects/imx6/kodi/guisettings.xml
View File

@ -1,10 +1,4 @@
<settings> <settings>
<debug>
<screenshotpath pathversion="1">/storage/screenshots/</screenshotpath>
</debug>
<general>
<settinglevel>3</settinglevel>
</general>
<audiooutput> <audiooutput>
<audiodevice>ALSA:hdmi:CARD=imxhdmisoc,DEV=0</audiodevice> <audiodevice>ALSA:hdmi:CARD=imxhdmisoc,DEV=0</audiodevice>
</audiooutput> </audiooutput>