From 427f3a7cd14dd3ade45d2f4e492ab4ea0e0bb2ff Mon Sep 17 00:00:00 2001 From: Matt Date: Sat, 12 Dec 2020 13:03:15 -0500 Subject: [PATCH 1/3] Make the down arrow work on server selection screen --- .../skins/default/1080i/script-jellyfin-connect-server.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/skins/default/1080i/script-jellyfin-connect-server.xml b/resources/skins/default/1080i/script-jellyfin-connect-server.xml index fd3de8c8..c09e86e0 100644 --- a/resources/skins/default/1080i/script-jellyfin-connect-server.xml +++ b/resources/skins/default/1080i/script-jellyfin-connect-server.xml @@ -75,7 +75,7 @@ noop close close - 205 + 206 20 From 07313a38b87888fe561b8576bb9635608adaaefa Mon Sep 17 00:00:00 2001 From: Matt Date: Sat, 12 Dec 2020 13:17:06 -0500 Subject: [PATCH 2/3] Accept manual server input instead of looping --- jellyfin_kodi/connect.py | 1 + 1 file changed, 1 insertion(+) diff --git a/jellyfin_kodi/connect.py b/jellyfin_kodi/connect.py index c2d3c8ca..a9bab9ad 100644 --- a/jellyfin_kodi/connect.py +++ b/jellyfin_kodi/connect.py @@ -176,6 +176,7 @@ class Connect(object): LOG.debug("Adding manual server") try: self.manual_server() + return except RuntimeError: pass else: From ec59fb8cbe7419932d8e54038e84239211081577 Mon Sep 17 00:00:00 2001 From: Matt Date: Sat, 12 Dec 2020 23:21:46 -0500 Subject: [PATCH 3/3] Stop overwriting manual input for reals this time --- jellyfin_kodi/connect.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/jellyfin_kodi/connect.py b/jellyfin_kodi/connect.py index a9bab9ad..6fad39b9 100644 --- a/jellyfin_kodi/connect.py +++ b/jellyfin_kodi/connect.py @@ -112,8 +112,7 @@ class Connect(object): return state['Credentials'] elif (server_selection or state['State'] == CONNECTION_STATE['ServerSelection'] or state['State'] == CONNECTION_STATE['Unavailable'] and not settings('SyncInstallRunDone.bool')): - - self.select_servers(state) + state['Credentials']['Servers'] = [self.select_servers(state)] elif state['State'] == CONNECTION_STATE['ServerSignIn']: if 'ExchangeToken' not in state['Servers'][0]: @@ -170,13 +169,12 @@ class Connect(object): if dialog.is_server_selected(): LOG.debug("Server selected: %s", dialog.get_server()) - return + return dialog.get_server() elif dialog.is_manual_server(): LOG.debug("Adding manual server") try: - self.manual_server() - return + return self.manual_server() except RuntimeError: pass else: