Jellyfin/jellyfin-kodi
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-kodi.git synced 2024-11-10 04:06:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #438 from mcarlton00/context-is-important

Browse source 
Move api_client details to context.py
This commit is contained in:
Abby 2020-11-29 21:22:07 +00:00 committed by GitHub
commit f943316d25
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
jellyfin_kodi/entrypoint/context.py
View file

@ -52,6 +52,19 @@ class Context(object):
self.media = xbmc.getInfoLabel('ListItem.DBTYPE') self.media = xbmc.getInfoLabel('ListItem.DBTYPE')
item_id = None item_id = None
addon_data = xbmc.translatePath("special://profile/addon_data/plugin.video.jellyfin/data.json")
with open(addon_data, 'rb') as infile:
data = json.load(infile)
try:
server_data = data['Servers'][0]
self.api_client.config.data['auth.server'] = server_data.get('address')
self.api_client.config.data['auth.server-name'] = server_data.get('Name')
self.api_client.config.data['auth.user_id'] = server_data.get('UserId')
self.api_client.config.data['auth.token'] = server_data.get('AccessToken')
except Exception as e:
LOG.warning('Addon appears to not be configured yet: {}'.format(e))
if self.server_id or item_id: if self.server_id or item_id:
self.item = self.api_client.get_item(item_id) self.item = self.api_client.get_item(item_id)
else: else:

16
jellyfin_kodi/jellyfin/client.py
View file

@ -3,10 +3,7 @@ from __future__ import division, absolute_import, print_function, unicode_litera
################################################################################################# #################################################################################################
import json
from helper import LazyLogger from helper import LazyLogger
from kodi_six.xbmc import translatePath
from . import api from . import api
from .configuration import Config from .configuration import Config
@ -45,19 +42,6 @@ class JellyfinClient(object):
self.callback_ws = callback self.callback_ws = callback
self.callback = callback self.callback = callback
addon_data = translatePath("special://profile/addon_data/plugin.video.jellyfin/data.json")
with open(addon_data, 'rb') as infile:
data = json.load(infile)
try:
server_data = data['Servers'][0]
self.jellyfin.config.data['auth.server'] = server_data.get('address')
self.jellyfin.config.data['auth.server-name'] = server_data.get('Name')
self.jellyfin.config.data['auth.user_id'] = server_data.get('UserId')
self.jellyfin.config.data['auth.token'] = server_data.get('AccessToken')
except Exception as e:
LOG.warning('Addon appears to not be configured yet: {}'.format(e))
def set_credentials(self, credentials=None): def set_credentials(self, credentials=None):
self.auth.credentials.set_credentials(credentials or {}) self.auth.credentials.set_credentials(credentials or {})