Troplo/PlexKodiConnect
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix Info screen not returning

Browse source
This commit is contained in:
croneter 2018-09-16 16:08:44 +02:00
parent c7bb333e97
commit c4f6a441b6
4 changed files with 17 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
resources/lib/plex_tv.py
View file

@ -216,7 +216,12 @@ def sign_in_with_pin():
Writes to Kodi settings file and returns the HomeUser or None Writes to Kodi settings file and returns the HomeUser or None
""" """
xml = _sign_in_with_pin() from .windows import background
bkgrd = background.BackgroundWindow.create(function=_sign_in_with_pin)
bkgrd.modal()
xml = bkgrd.result
del bkgrd
if not xml: if not xml:
return return
user = HomeUser(xml.attrib) user = HomeUser(xml.attrib)
@ -235,7 +240,6 @@ def _sign_in_with_pin():
pre = signin.PreSignInWindow.open() pre = signin.PreSignInWindow.open()
try: try:
pre = signin.PreSignInWindow.open()
try: try:
if not pre.doSignin: if not pre.doSignin:
return return

8
resources/lib/windows/background.py
View file

@ -19,10 +19,16 @@ class BackgroundWindow(kodigui.BaseWindow):
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
kodigui.BaseWindow.__init__(self, *args, **kwargs) kodigui.BaseWindow.__init__(self, *args, **kwargs)
self.result = None
self.function = kwargs.get('function') self.function = kwargs.get('function')
def onAction(self, action):
kodigui.BaseWindow.onAction(self, action)
def onFirstInit(self): def onFirstInit(self):
self.function() self.result = self.function()
self.doClose() self.doClose()

10
resources/lib/windows/signin.py
View file

@ -56,6 +56,7 @@ class SignInPlexPass(kodigui.BaseWindow):
if action == xbmcgui.ACTION_SELECT_ITEM: if action == xbmcgui.ACTION_SELECT_ITEM:
self.retry = True self.retry = True
self.doClose() self.doClose()
kodigui.BaseWindow.onAction(self, action)
def onClick(self, controlID): def onClick(self, controlID):
if controlID == self.RETRY_BUTTON_ID: if controlID == self.RETRY_BUTTON_ID:
@ -84,6 +85,7 @@ class PreSignInWindow(kodigui.BaseWindow):
if action == xbmcgui.ACTION_SELECT_ITEM: if action == xbmcgui.ACTION_SELECT_ITEM:
self.doSignin = True self.doSignin = True
self.doClose() self.doClose()
kodigui.BaseWindow.onAction(self, action)
def onClick(self, controlID): def onClick(self, controlID):
if controlID == self.SIGNIN_BUTTON_ID: if controlID == self.SIGNIN_BUTTON_ID:
@ -117,12 +119,8 @@ class PinLoginWindow(kodigui.BaseWindow):
self.setProperty('pin.image.3', '') self.setProperty('pin.image.3', '')
def onAction(self, action): def onAction(self, action):
try: if action == xbmcgui.ACTION_NAV_BACK or action == xbmcgui.ACTION_PREVIOUS_MENU:
if action == xbmcgui.ACTION_NAV_BACK or action == xbmcgui.ACTION_PREVIOUS_MENU: self.abort = True
self.abort = True
except:
utils.ERROR()
kodigui.BaseWindow.onAction(self, action) kodigui.BaseWindow.onAction(self, action)

14
resources/skins/Main/skin.xml
View file

@ -1,14 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<skin>
<defaultresolution>1080i</defaultresolution>
<defaultresolutionwide>1080i</defaultresolutionwide>
<version>1.0</version>
<!-- amount to zoom skin to remove overscan compensation -->
<zoom>0</zoom>
<credits>
<skinname>Main</skinname>
<name>Plex</name>
</credits>
</skin>