diff --git a/addon.xml b/addon.xml index 4902019..16b0250 100644 --- a/addon.xml +++ b/addon.xml @@ -1,7 +1,7 @@ diff --git a/resources/lib/plugin.py b/resources/lib/plugin.py index 17812b9..8f2ff7d 100644 --- a/resources/lib/plugin.py +++ b/resources/lib/plugin.py @@ -230,9 +230,7 @@ def search(params): def clear_session(): LOG('clear_session') - files = ['device_id.conf', 'localisation.json', 'profile_id.conf', 'token.json'] - for f in files: - sky.cache.remove_file(sky.pldir +'/' + f) + sky.clear_session() def logout(): clear_session() diff --git a/resources/lib/sky.py b/resources/lib/sky.py index 332ce8e..c3c8557 100644 --- a/resources/lib/sky.py +++ b/resources/lib/sky.py @@ -101,15 +101,6 @@ def __init__(self, config_directory, platform='skyshowtime'): self.platform['device_id'] = self.create_device_id() self.cache.save_file(self.pldir + '/device_id.conf', self.platform['device_id']) - # Load profile - content = self.cache.load_file(self.pldir + '/profile.json') - if content: - profile = json.loads(content) - self.account['profile_id'] = profile['id'] - self.account['profile_type'] = profile['type'] - else: - self.account['profile_id'], self.account['profile_type'] = self.select_default_profile() - # Load localisation localisation_filename = self.pldir + '/localisation.json' content = self.cache.load_file(localisation_filename) @@ -129,6 +120,15 @@ def __init__(self, config_directory, platform='skyshowtime'): self.net.headers.update(self.platform['headers']) #print_json(self.net.headers) + # Load profile + content = self.cache.load_file(self.pldir + '/profile.json') + if content: + profile = json.loads(content) + self.account['profile_id'] = profile['id'] + self.account['profile_type'] = profile['type'] + else: + self.account['profile_id'], self.account['profile_type'] = self.select_default_profile() + # Load user token token_filename = self.pldir + '/token.json' content = self.cache.load(token_filename, 60) @@ -761,3 +761,8 @@ def install_cookie_file(self, filename): if sys.version_info[0] > 2: filename = bytes(filename, 'utf-8') shutil.copyfile(filename, self.cache.config_directory + self.pldir + '/cookie.conf') + + def clear_session(self): + files = ['device_id.conf', 'localisation.json', 'profile.json', 'token.json', 'menu.json'] + for f in files: + self.cache.remove_file(self.pldir +'/'+ f)