diff --git a/changelog.txt b/changelog.txt index 6648163..5d8b7bd 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,10 +1,16 @@ +[B]2.9.0~a3[/B] +- Validate sid cache +- Fix EPG regression in ~a2 +- Remove dialog on no data in EPG +UI Client +- Handle "timed out" message + [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 +- Don't open window when loading channel icons +- Handle stray timeout message [B]2.9.0~a1[/B] - Matrix and Leia comnpatibility for repo diff --git a/resources/src/KNEW_Client.py b/resources/src/KNEW_Client.py index bb81c55..b87ceaa 100644 --- a/resources/src/KNEW_Client.py +++ b/resources/src/KNEW_Client.py @@ -83,15 +83,17 @@ def doRequest5(self, method, isJSON = True): def sidLogin5(self): self.settings.XNEWA_INTERFACE = "Version5" - #self.settings.XNEWA_WEBCLIENT = True cached = 'sid.p' if self.checkCache(cached): login = self.myCachedPickleLoad(cached) self.sid = login['sid'] - xbmc.log(self.sid) - setClient5(self) - self.offline = False - return + method = 'session.valid' + ret, keys = doRequest5(self,method) + if ret == True: + xbmc.log(self.sid) + setClient5(self) + self.offline = False + return method = 'session.initiate&ver=1.0&device=emby' ret, keys = doRequest5(self,method) @@ -172,7 +174,7 @@ def getChannelList_v5(self): for channel in channels['channels']: if (channel['channelIcon']): cnt= cnt+1 - if cnt > 0 and my_settings.XNEWA_WEBCLIENT == False: + if cnt > 0 and self.settings.XNEWA_WEBCLIENT == False: icons = glob.glob(os.path.join(self.cached_channelPath,'*.*')) if cnt > len(icons) + 20: myDlg = xbmcgui.DialogProgress() diff --git a/resources/src/XNEWAGlobals.py b/resources/src/XNEWAGlobals.py index c999860..f3af4ef 100644 --- a/resources/src/XNEWAGlobals.py +++ b/resources/src/XNEWAGlobals.py @@ -216,10 +216,10 @@ # Script doc constants __scriptname__ = "knewc" -__version__ = '2.9.0~a2' +__version__ = '2.9.0~a3' __author__ = 'emveepee' __original_author__ = 'Ton van der Poel' -__date__ = '2020-09-28' +__date__ = '2020-10-04' XBMC_DIALOG_BUSY_OPEN = "ActivateWindow(busydialognocancel)" XBMC_DIALOG_BUSY_CLOSE = "Dialog.Close(busydialognocancel)" diff --git a/resources/src/nextpvr/details.py b/resources/src/nextpvr/details.py index 8cc3599..76d12fa 100644 --- a/resources/src/nextpvr/details.py +++ b/resources/src/nextpvr/details.py @@ -408,9 +408,12 @@ def _myPlayer(self, detail=None, button=None, isMin = False, Audio = False, setR self.urly = self.xnewa.getURL() isVlc = False myDlg = None - from uuid import getnode as get_mac - mac = get_mac() #self.player = XBMCPlayer(xbmc.PLAYER_CORE_AUTO,settings=self.settings, xnewa=self.xnewa) + cached = 'sid.p' + if self.xnewa.checkCache(cached): + keys = self.xnewa.myCachedPickleLoad(cached) + self.xnewa.myCachedPickle(keys,cached) + self.player = XBMCPlayer(settings=self.settings, xnewa=self.xnewa) if self.player.isPlaying(): isMin = True diff --git a/resources/src/nextpvr/emulate.py b/resources/src/nextpvr/emulate.py index 9c93ca8..c6d6cbb 100644 --- a/resources/src/nextpvr/emulate.py +++ b/resources/src/nextpvr/emulate.py @@ -731,7 +731,7 @@ def getControlEx(self, url=None, showImage=True): print (err) code = -1 leave = True - if str(err) == 'timeout': + if str(err) == 'timed out': self.timeout += 1 leave = xbmcgui.Dialog().yesno('NextPVR timeout', 'Do you want to exit UI client?', autoclose=10000) xbmc.sleep(250) diff --git a/resources/src/nextpvr/epg.py b/resources/src/nextpvr/epg.py index 0d4be46..53e0389 100644 --- a/resources/src/nextpvr/epg.py +++ b/resources/src/nextpvr/epg.py @@ -442,12 +442,15 @@ def setFocus(self, nRow, nButton,movement): ############################################################################################### def reFocus(self): try: + if len(self.epgButtons[self.idxRow]) <= self.idxButt: + self.idxButt = len(self.epgButtons[self.idxRow]) - 1 ctrl = self.epgButtons[self.idxRow][self.idxButt] xbmcgui.WindowXML.setFocus(self, ctrl) except: - handleException() if self.idxButt == 0: return + print (len(self.epgButtons[self.idxRow]), self.idxButt) + handleException() self.idxButt = self.idxButt - 1 self.reFocus() pass