knewc 2.9.0 a 2

Trap user errors in ExtraDirectories, trap secondary timeout,

addon.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="script.kodi.knewc" name="NextPVR New Client" version="2.9.0~a1" provider-name="emveepee">
+<addon id="script.kodi.knewc" name="NextPVR New Client" version="2.9.0~a2" provider-name="emveepee">
     <requires>
         <!--import addon="xbmc.python" version="2.1.0"/-->
         <import addon="script.module.future" version="0.16.0.4"/>

changelog.txt

@@ -1,3 +1,11 @@
+[B]2.9.0~a2[/B]
+- Fix error handling of ExtraDirectory call
+- Extra logging for debugging PVR mode
+- Don't open window when loading channel icons in PVR mode
+UI Client
+- Handle unhandled timeout exception
+- Fix regression in ~a1 on context menu popup
+
 [B]2.9.0~a1[/B]
 - Matrix and Leia comnpatibility for repo
 - PVR mode for in progress recordings using JSON RPC

resources/src/KNEW_Client.py

@@ -151,7 +151,7 @@ def getRecDirList_v5(self):
                     try:
                         dirs[extras[i]] = extras[i+1]
                     except:
-                        xbmc.log('Duplicate of ' + dirs[extras[i]])
+                        xbmc.log('Setting error ' + setting['value'])
 
     xbmc.log("getRecDirList v5 end")
     return dirs
@@ -172,7 +172,7 @@ def getChannelList_v5(self):
         for channel in channels['channels']:
             if (channel['channelIcon']):
                 cnt= cnt+1
-        if cnt > 0:
+        if cnt > 0 and my_settings.XNEWA_WEBCLIENT == False:
             icons = glob.glob(os.path.join(self.cached_channelPath,'*.*'))
             if cnt > len(icons) + 20:
                 myDlg = xbmcgui.DialogProgress()
@@ -219,7 +219,8 @@ def getChannelList_v5(self):
                 pass
     except Exception as err:
         xbmc.log(str(err))
-
+    if myDlg != None:
+        myDlg.close()
     xbmc.log("getChannelList v5 end")
     return dic
 

resources/src/XNEWAGlobals.py

@@ -216,10 +216,10 @@
 
 # Script doc constants
 __scriptname__ = "knewc"
-__version__ = '2.9.0~a1'
+__version__ = '2.9.0~a2'
 __author__ = 'emveepee'
 __original_author__ = 'Ton van der Poel'
-__date__ = '2020-09-19'
+__date__ = '2020-09-28'
 
 XBMC_DIALOG_BUSY_OPEN = "ActivateWindow(busydialognocancel)"
 XBMC_DIALOG_BUSY_CLOSE = "Dialog.Close(busydialognocancel)"

resources/src/XNEWA_Connect.py

@@ -283,6 +283,7 @@ def GetPVRRecordings(self):
                 m = re.search('.+ (.+?).pvr', recording['file'])
                 if m != None:
                     self.PVRRecordings[m.group(1)] = recording['file']
+        xbmc.log('Number of recordings: {}'.format(len(self.PVRRecordings)))
 
 #################################################################################################################
     def GetPVRRecording(self, recid):

resources/src/XNEWA_Settings.py

@@ -75,6 +75,7 @@ def loadFromSettingsXML(self):
         self.XNEWA_SORT_RECORDING = int(addon.getSetting("recordingSort"))
         self.XNEWA_SORT_EPISODE = int(addon.getSetting("episodeSort"))
         self.NextPVR_STREAM = addon.getSetting("stream")
+        xbmc.log('Streaming mode: ' + self.NextPVR_STREAM)
 
         self.XNEWA_PREBUFFER = int(addon.getSetting("prebuffer")) // 4
         self.XNEWA_POSTBUFFER = int(addon.getSetting("postbuffer")) // 4

resources/src/nextpvr/emulate.py

@@ -618,7 +618,7 @@ def getContext(self):
             return
         url = None
         keyBase = ''
-        dialog = xbmcgui.Dialog
+        dialog = xbmcgui.Dialog()
         value = dialog.select( 'Enter selection', [  'Remote Keys', 'Recordings',  'TV Guide',  'Main Menu', 'Exit UI Client', '0', '1', '2', '3', '4', '5','6', '7', '8', '9'])
         xbmc.log(str(value))
 
@@ -730,9 +730,14 @@ def getControlEx(self, url=None, showImage=True):
         except Exception as err:
             print (err)
             code = -1
-            self.exit = True
-            self.close()
-
+            leave = True
+            if str(err) == 'timeout':
+                self.timeout += 1
+                leave = xbmcgui.Dialog().yesno('NextPVR timeout', 'Do you want to exit UI client?', autoclose=10000)
+                xbmc.sleep(250)
+            if leave == True:
+                self.exit = True
+                self.close()
         return code