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

Reduced number of "out" parameters and replaced with return statements.

Browse source
This commit is contained in:
Chuddah 2020-02-23 14:48:40 +00:00
commit 3829015cbd
1 changed files with 15 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

32
jellyfin_kodi/jellyfin/http.py
View file

@ -201,7 +201,8 @@ class HTTP(object):
if 'url' not in data: if 'url' not in data:
data['url'] = "%s/%s" % (config.get("auth.server", ""), data.pop('handler', "")) data['url'] = "%s/%s" % (config.get("auth.server", ""), data.pop('handler', ""))
self._get_header(config, data) headers = self._get_header(config, data.get('headers', {}))
data['headers'] = headers
data['timeout'] = data.get('timeout') or config['http.timeout'] data['timeout'] = data.get('timeout') or config['http.timeout']
data['verify'] = data.get('verify') or config.get('auth.ssl', False) data['verify'] = data.get('verify') or config.get('auth.ssl', False)
data['url'] = self._replace_user_info(data['url']) data['url'] = self._replace_user_info(data['url'])
@ -221,24 +222,22 @@ class HTTP(object):
if isinstance(value, string_types): if isinstance(value, string_types):
params[key] = self._replace_user_info(value) params[key] = self._replace_user_info(value)
def _get_header(self, config, data): def _get_header(self, config, headers):
if not headers:
data['headers'] = data.setdefault('headers', {}) headers = {
if not data['headers']:
data['headers'].update({
'Content-type': "application/json", 'Content-type': "application/json",
'Accept-Charset': "UTF-8,*", 'Accept-Charset': "UTF-8,*",
'Accept-encoding': "gzip", 'Accept-encoding': "gzip",
'User-Agent': config['http.user_agent'] or "%s/%s" % (config.get('app.name', 'Jellyfin for Kodi'), config.get('app.version', "0.0.0")) 'User-Agent': config['http.user_agent'] or "%s/%s" % (config.get('app.name', 'Jellyfin for Kodi'), config.get('app.version', "0.0.0"))
}) }
if 'x-emby-authorization' not in data['headers']: if 'x-emby-authorization' not in headers:
self._authorization(config, data) xxx = self._authorization(config)
headers.update(xxx)
return data return headers
def _authorization(self, config, data): def _authorization(self, config):
auth = "MediaBrowser " auth = "MediaBrowser "
auth += "Client=%s, " % config.get('app.name', "Jellyfin for Kodi") auth += "Client=%s, " % config.get('app.name', "Jellyfin for Kodi")
@ -246,14 +245,13 @@ class HTTP(object):
auth += "DeviceId=%s, " % config.get('app.device_id', 'Unknown Device id') auth += "DeviceId=%s, " % config.get('app.device_id', 'Unknown Device id')
auth += "Version=%s" % config.get('app.version', '0.0.0') auth += "Version=%s" % config.get('app.version', '0.0.0')
data['headers'].update({'x-emby-authorization': auth})
if config.get('auth.token') and config.get('auth.user_id'): if config.get('auth.token') and config.get('auth.user_id'):
auth += ', UserId=%s' % config.get('auth.user_id') auth += ', UserId=%s' % config.get('auth.user_id')
data['headers'].update({'x-emby-authorization': auth, 'X-MediaBrowser-Token': config.get('auth.token')}) xxx = {'x-emby-authorization': auth, 'X-MediaBrowser-Token': config.get('auth.token')}
else:
return data xxx = {'x-emby-authorization': auth}
return xxx
def _requests(self, session, action, **kwargs): def _requests(self, session, action, **kwargs):