fix for channels config without Tvh

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.7.2" provider-name="edit4ever">
+<addon id="script.module.zap2epg" name="zap2epg" version="0.7.3" provider-name="edit4ever">
   <requires>
     <import addon="xbmc.python" version="2.7.13"/>
     <import addon="script.module.dateutil" version="2.4.2"/>
@@ -29,7 +29,7 @@ Setup:
     <email></email>
     <source></source>
     <news>
-      v0.7.2 - fixes issue with certain digital lineups (2018-01-18)
+      v0.7.3 - fixes issue with channel configuration when not using Tvheadend (2018-01-19)
     </news>
     <assets>
         <icon>resources/icon.png</icon>

changelog.txt

@@ -1,3 +1,6 @@
+v0.7.3 (2018-01-19)
+ - fixes issue with channel configuration when not using Tvheadend
+
 v0.7.2 (2018-01-18)
  - fixes issue with certain digital lineups
 

default.py

@@ -87,24 +87,25 @@ def get_icon_path(icon_name):
     return os.path.join(addon_path, 'resources', 'img', icon_name+".png")
 
 def create_cList():
-    if not os.path.isfile(tvhList):
-            channels_url = 'http://' + tvh_url + ':' + tvh_port + '/api/channel/grid?all=1&limit=999999999&sort=name'
-            response = requests.get(channels_url)
-            try:
-                logging.info('Accessing Tvheadend channel list from: %s', channels_url)
-                channels = response.json()
-                with open(tvhList,"w") as f:
-                    json.dump(channels,f)
-            except urllib2.HTTPError as e:
-                logging.exception('Exception: tvhClist - %s', e.strerror)
-                pass
-    with open(tvhList) as tvhData:
-        tvhClist = []
-        tvhDict = json.load(tvhData)
-        for ch in tvhDict['entries']:
-            channelEnabled = ch['enabled']
-            if channelEnabled == True:
-                tvhClist.append(ch['number'])
+    tvhClist = []
+    if tvhoff == 'true':
+        if not os.path.isfile(tvhList):
+                channels_url = 'http://' + tvh_url + ':' + tvh_port + '/api/channel/grid?all=1&limit=999999999&sort=name'
+                response = requests.get(channels_url)
+                try:
+                    logging.info('Accessing Tvheadend channel list from: %s', channels_url)
+                    channels = response.json()
+                    with open(tvhList,"w") as f:
+                        json.dump(channels,f)
+                except urllib2.HTTPError as e:
+                    logging.exception('Exception: tvhClist - %s', e.strerror)
+                    pass
+        with open(tvhList) as tvhData:
+            tvhDict = json.load(tvhData)
+            for ch in tvhDict['entries']:
+                channelEnabled = ch['enabled']
+                if channelEnabled == True:
+                    tvhClist.append(ch['number'])
     lineupcode = xbmcaddon.Addon().getSetting('lineupcode')
     url = 'http://tvlistings.gracenote.com/api/grid?lineupId=&timespan=3&headendId=' + lineupcode + '&country=' + country + '&device=-&postalCode=' + zipcode + '&time=' + str(gridtime) + '&pref=-&userId=-'
     content = urllib2.urlopen(url).read()

zap2epg.py

@@ -95,7 +95,7 @@ def mainRun(userdata):
         country = 'USA'
     else:
         country = 'CAN'
-    logging.info('Running zap2epg-0.7.2 for zipcode: %s and lineup: %s', zipcode, lineup)
+    logging.info('Running zap2epg-0.7.3 for zipcode: %s and lineup: %s', zipcode, lineup)
     pythonStartTime = time.time()
     cacheDir = os.path.join(userdata, 'cache')
     dayHours = int(days) * 8 # set back to 8 when done testing