Skip to content

Commit

Permalink
Version 0.1.6
Browse files Browse the repository at this point in the history
  • Loading branch information
Paco8 committed Mar 25, 2023
1 parent 11488a4 commit e095ea6
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 13 deletions.
2 changes: 1 addition & 1 deletion addon.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="plugin.video.skyott"
name="Peacock"
version="0.1.5"
version="0.1.6"
provider-name="Paco8">
<requires>
<!--- <import addon="xbmc.python" version="2.25.0"/> -->
Expand Down
4 changes: 1 addition & 3 deletions resources/lib/plugin.py
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
23 changes: 14 additions & 9 deletions resources/lib/sky.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
Expand Down Expand Up @@ -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)

0 comments on commit e095ea6

Please # to comment.