From 21e780715e8e78e899b9e5051416b0e0b7aa2493 Mon Sep 17 00:00:00 2001 From: angelblue05 Date: Tue, 18 Sep 2018 04:53:14 -0500 Subject: [PATCH] Transfer data.txt to data.json Use default port for webserver caching --- resources/lib/database/__init__.py | 10 +++++++++- resources/lib/setup.py | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/resources/lib/database/__init__.py b/resources/lib/database/__init__.py index ab8ad547..71c054da 100644 --- a/resources/lib/database/__init__.py +++ b/resources/lib/database/__init__.py @@ -277,7 +277,15 @@ def get_credentials(): with open(os.path.join(path, 'data.json')) as infile: credentials = json.load(infile) except Exception: - credentials = {} + + try: + with open(os.path.join(path, 'data.txt')) as infile: + credentials = json.load(infile) + save_credentials(credentials) + + xbmcvfs.delete(os.path.join(path, 'data.txt')) + except Exception: + credentials = {} credentials['Servers'] = credentials.get('Servers', []) diff --git a/resources/lib/setup.py b/resources/lib/setup.py index 0b00dec1..abb847e0 100644 --- a/resources/lib/setup.py +++ b/resources/lib/setup.py @@ -36,7 +36,7 @@ class Setup(object): if not self.get_web_server(): set_setting = JSONRPC('Settings.SetSetingValue') - set_setting.execute({'setting': "services.webserverport", 'value': 50325}) + set_setting.execute({'setting': "services.webserverport", 'value': 8080}) set_setting.execute({'setting': "services.webserver", 'value': True}) if not self.get_web_server():