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

Clean up

Browse source
This commit is contained in:
Chuddah 2020-02-23 15:13:09 +00:00
commit a0dfada081
1 changed files with 23 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

42
jellyfin_kodi/jellyfin/http.py
View file

@ -49,17 +49,17 @@ class HTTP(object):
except Exception as error: except Exception as error:
LOG.warning("The requests session could not be terminated: %s", error) LOG.warning("The requests session could not be terminated: %s", error)
def _replace_user_info(self, string): def _replace_user_info(self, config, string):
if '{server}' in string: if '{server}' in string:
if self.config.data.get('auth.server', None): if config.get('auth.server', None):
string = string.replace("{server}", self.config.data['auth.server']) string = string.replace("{server}", config['auth.server'])
else: else:
LOG.debug("Server address not set") LOG.debug("Server address not set")
if '{UserId}'in string: if '{UserId}'in string:
if self.config.data.get('auth.user_id', None): if config.get('auth.user_id', None):
string = string.replace("{UserId}", self.config.data['auth.user_id']) string = string.replace("{UserId}", config['auth.user_id'])
else: else:
LOG.debug("UserId is not set.") LOG.debug("UserId is not set.")
@ -72,35 +72,37 @@ class HTTP(object):
def REQUEST(self, url, type, params=None, json=None, session=None, \ def REQUEST(self, url, type, params=None, json=None, session=None, \
headers=None, verify=None, timeout=None, retry=None): headers={}, verify=None, timeout=None, retry=5):
config = self.config.data config = self.config.data
url = self._replace_user_info(url) url = self._replace_user_info(config, url)
data = {} optional = {}
if params is not None: if params is not None:
data['params'] = params optional['params'] = params
if json is not None: if json is not None:
data['json'] = json optional['json'] = json
headers = headers if headers is not None else {}
retry = retry if retry is not None else 5
timeout = timeout if timeout is not None else config['http.timeout'] timeout = timeout if timeout is not None else config['http.timeout']
verify = verify if verify is not None else config.get('auth.ssl', False) verify = verify if verify is not None else config.get('auth.ssl', False)
headers = self._get_header(config, headers) headers = self._get_header(config, headers)
self._process_params(data.get('params') or {}) self._process_params(optional.get('params') or {})
self._process_params(data.get('json') or {}) self._process_params(optional.get('json') or {})
LOG.debug("--->[ http ] %s", JsonDebugPrinter(data)) LOG.debug("--->[ http ] %s", JsonDebugPrinter({
'url': url,
'headers': headers,
'optional': optional,
}))
while True: while True:
try: try:
r = self._requests(session or self.session or requests, type, r = self._requests(session or self.session or requests, type,
url=url, headers=headers, verify=verify, timeout=timeout, **data) url=url, headers=headers, verify=verify, timeout=timeout, **optional)
r.content # release the connection r.content # release the connection
if not self.keep_alive and self.session is not None: if not self.keep_alive:
self.stop_session() self.stop_session()
r.raise_for_status() r.raise_for_status()
@ -188,10 +190,12 @@ class HTTP(object):
self._process_params(value) self._process_params(value)
if isinstance(value, string_types): if isinstance(value, string_types):
params[key] = self._replace_user_info(value) params[key] = self._replace_user_info(self.config.data, value)
def _get_header(self, config, headers): def _get_header(self, config, headers):
if not headers: if headers:
headers = dict(headers)
else:
headers = { headers = {
'Content-type': "application/json", 'Content-type': "application/json",
'Accept-Charset': "UTF-8,*", 'Accept-Charset': "UTF-8,*",