fix ampersand channel names

Author: edit4ever

addon.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="script.module.zap2epg" name="zap2epg" version="0.5.0" provider-name="edit4ever">
+<addon id="script.module.zap2epg" name="zap2epg" version="0.5.2" provider-name="edit4ever">
   <requires>
     <import addon="xbmc.python" version="2.7.13"/>
     <import addon="script.module.dateutil" version="2.4.2"/>
@@ -29,6 +29,7 @@ Setup:
     <email></email>
     <source></source>
     <news>
+    v0.5.2 - fix for channel names with ampersand (2017-11-22)  
     v0.5.0 - add tvheadend subchannel and match option (2017-11-19)
     v0.4.1 - adds option to adjust genre information (2017-11-16)
     </news>

zap2epg.py

@@ -227,17 +227,17 @@ def printStations(fh):
             for station in scheduleSort:
                 fh.write('\t<channel id=\"' + station + '.zap2epg\">\n')
                 if 'chtvh' in scheduleSort[station] and scheduleSort[station]['chtvh'] is not None:
-                    xchtvh = scheduleSort[station]['chtvh']
+                    xchtvh = re.sub('&','&amp;',scheduleSort[station]['chtvh'])
                     fh.write('\t\t<display-name>' + xchtvh + '</display-name>\n')
                 if 'chnum' in scheduleSort[station] and 'chfcc' in scheduleSort[station]:
                     xchnum = scheduleSort[station]['chnum']
                     xchfcc = scheduleSort[station]['chfcc']
-                    fh.write('\t\t<display-name>' + xchnum + ' ' + xchfcc + '</display-name>\n')
-                    fh.write('\t\t<display-name>' + xchfcc + '</display-name>\n')
+                    fh.write('\t\t<display-name>' + xchnum + ' ' + re.sub('&','&amp;',xchfcc) + '</display-name>\n')
+                    fh.write('\t\t<display-name>' + re.sub('&','&amp;',xchfcc) + '</display-name>\n')
                     fh.write('\t\t<display-name>' + xchnum + '</display-name>\n')
                 elif 'chfcc' in scheduleSort[station]:
                     xchnum = scheduleSort[station]['chfcc']
-                    fh.write('\t\t<display-name>' + xcfcc + '</display-name>\n')
+                    fh.write('\t\t<display-name>' + re.sub('&','&amp;',xcfcc) + '</display-name>\n')
                 elif 'chnum' in scheduleSort[station]:
                     xchnum = scheduleSort[station]['chnum']
                     fh.write('\t\t<display-name>' + xchnum + '</display-name>\n')