From 039eea0aec0c04a1ac35d02986f21d3c4bcc6cbb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Odd=20Str=C3=A5b=C3=B8?= Date: Fri, 13 Dec 2019 23:44:46 +0100 Subject: [PATCH 1/3] Add config migration for pr #145 --- jellyfin_kodi/database/__init__.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/jellyfin_kodi/database/__init__.py b/jellyfin_kodi/database/__init__.py index 6498752a..b82b4741 100644 --- a/jellyfin_kodi/database/__init__.py +++ b/jellyfin_kodi/database/__init__.py @@ -392,6 +392,15 @@ def get_credentials(): credentials['Servers'] = credentials.get('Servers', []) + # Migration for #145 + # TODO: CLEANUP for 1.0.0 release + for server in credentials['Servers']: + if 'LocalAddress' in server: + server['address'] = server['LocalAddress'] + del server['LocalAddress'] + if 'LastConnectionMode' in server: + del server['LastConnectionMode'] + return credentials From 842b0813a3d3f19cb8a557062f062fbbaf5b6e1d Mon Sep 17 00:00:00 2001 From: mcarlton00 Date: Fri, 13 Dec 2019 19:38:20 -0500 Subject: [PATCH 2/3] Add migration for manual configuration servers --- jellyfin_kodi/database/__init__.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/jellyfin_kodi/database/__init__.py b/jellyfin_kodi/database/__init__.py index b82b4741..9f5587a2 100644 --- a/jellyfin_kodi/database/__init__.py +++ b/jellyfin_kodi/database/__init__.py @@ -395,7 +395,13 @@ def get_credentials(): # Migration for #145 # TODO: CLEANUP for 1.0.0 release for server in credentials['Servers']: - if 'LocalAddress' in server: + if 'ManualAddress' in server: + server['address'] = server['ManualAddress'] + del server['ManualAddress'] + # If manual is present, local should always be here, but better to be safe + if 'LocalAddress' in server: + del server['LocalAddress'] + elif 'LocalAddress' in server: server['address'] = server['LocalAddress'] del server['LocalAddress'] if 'LastConnectionMode' in server: From 14fd9253b209c94825a72cc2c8e8fc8d40c8f9fe Mon Sep 17 00:00:00 2001 From: mcarlton00 Date: Fri, 13 Dec 2019 19:53:38 -0500 Subject: [PATCH 3/3] Remove remote address if it still exists in the config file --- jellyfin_kodi/database/__init__.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/jellyfin_kodi/database/__init__.py b/jellyfin_kodi/database/__init__.py index 9f5587a2..92560b25 100644 --- a/jellyfin_kodi/database/__init__.py +++ b/jellyfin_kodi/database/__init__.py @@ -401,6 +401,9 @@ def get_credentials(): # If manual is present, local should always be here, but better to be safe if 'LocalAddress' in server: del server['LocalAddress'] + # Functionality removed in #60 + if 'RemoteAddress' in server: + del server['RemoteAddress'] elif 'LocalAddress' in server: server['address'] = server['LocalAddress'] del server['LocalAddress']