xmltv.and

primaeval · Apr 10, 2018 · ae9fa25 · ae9fa25
1 parent db97438
commit ae9fa25
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 7 deletions.
diff --git a/resources/settings.xml b/resources/settings.xml
@@ -15,6 +15,7 @@
         <setting id="xmltv.interval" label="30128" type="enum" default="2" values="every start|12 hours|24 hours|48 hours|7 days|14 days" />
         <setting id="xmltv.date" label="Treat 4 Digit Program Date as Movie" type="bool" default="true" />
         <setting id="xmltv.offset" label="XMLTV Timezone Offset (minutes)" type="text" default="0" />
+        <setting id="xmltv.and" label="Convert &amp; to &amp;amp;" type="bool" default="false" />
         <setting type="sep"/>
 
     </category>

diff --git a/source.py b/source.py
@@ -1829,13 +1829,14 @@ def __init__(self, addon, force):
         else:
             self.xmltvFile = self.updateLocalFile('xmltv.xml', addon.getSetting('xmltv.url'), addon, force=force)
 
-        f = xbmcvfs.File(self.xmltvFile,'rb')
-        data = f.read()
-        f.close()
-        data = re.sub('&(?!amp;)','&amp;',data)
-        f = xbmcvfs.File(self.xmltvFile,'wb')
-        f.write(data)
-        f.close()
+        if ADDON.getSetting('xmltv.and') == 'true':
+            f = xbmcvfs.File(self.xmltvFile,'rb')
+            data = f.read()
+            f.close()
+            data = re.sub('&(?!amp;)','&amp;',data)
+            f = xbmcvfs.File(self.xmltvFile,'wb')
+            f.write(data)
+            f.close()
 
         self.xmltv2File = ''
         if ADDON.getSetting('xmltv2.enabled') == 'true':
@@ -1856,6 +1857,15 @@ def __init__(self, addon, force):
             else:
                 self.xmltv2File = self.updateLocalFile('xmltv2.xml', addon.getSetting('xmltv2.url'), addon, force=force)
 
+            if ADDON.getSetting('xmltv.and') == 'true':
+                f = xbmcvfs.File(self.xmltv2File,'rb')
+                data = f.read()
+                f.close()
+                data = re.sub('&(?!amp;)','&amp;',data)
+                f = xbmcvfs.File(self.xmltv2File,'wb')
+                f.write(data)
+                f.close()
+
         self.xmltv3File = ''
         if ADDON.getSetting('xmltv3.enabled') == 'true':
             if self.xmltv3Type == XMLTVSource.XMLTV_SOURCE_FILE:
@@ -1875,6 +1885,14 @@ def __init__(self, addon, force):
             else:
                 self.xmltv3File = self.updateLocalFile('xmltv3.xml', addon.getSetting('xmltv3.url'), addon, force=force)
 
+            if ADDON.getSetting('xmltv.and') == 'true':
+                f = xbmcvfs.File(self.xmltv2File,'rb')
+                data = f.read()
+                f.close()
+                data = re.sub('&(?!amp;)','&amp;',data)
+                f = xbmcvfs.File(self.xmltv2File,'wb')
+                f.write(data)
+                f.close()
 
 
         if not self.xmltvFile or not xbmcvfs.exists(self.xmltvFile):