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

Refactored connectionmanager to use newer explicit request interface.

Browse source
This commit is contained in:
Chuddah 2020-02-22 20:03:12 +00:00
commit c5878d070f
2 changed files with 24 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

16
jellyfin_kodi/jellyfin/connection_manager.py
View file

@ -191,24 +191,24 @@ class ConnectionManager(object):
'url': url, 'url': url,
'headers': headers, 'headers': headers,
} }
if timeout is not None:
data['timeout'] = timeout
if verify is not None: if verify is not None:
data['verify'] = verify data['verify'] = verify
if retry is not None: if retry is not None:
data['retry'] = retry data['retry'] = retry
if json is not None: if json is not None:
data['json'] = json data['json'] = json
return self._request_url(data, data_type, timeout, additional_headers=additional_headers)
def _request_url(self, data, data_type=None, timeout=None, additional_headers=True):
data['timeout'] = timeout or self.timeout timeput = timeout or self.timeout
data['timeout'] = timeout
if additional_headers: if additional_headers:
headers = self._get_headers(data_type) extra_headers = self._get_headers(data_type)
data.setdefault('headers', {}).update(headers) data['headers'].update(extra_headers)
headers = data['headers']
try: try:
return self.http.request(data) return self.http.REQUEST(url, type, json=json, headers=headers, \
verify=verify, timeout=timeout, retry=retry)
except Exception as error: except Exception as error:
LOG.exception(error) LOG.exception(error)
raise raise

21
jellyfin_kodi/jellyfin/http.py
View file

@ -64,13 +64,24 @@ class HTTP(object):
return string return string
def REQUEST(self, url, type, params=None, json=None, session=None): def REQUEST(self, url, type, params=None, json=None, session=None, \
request = {'url': url, 'type': type} headers=None, verify=None, timeout=None, retry=None):
data = {'url': url, 'type': type}
if params is not None: if params is not None:
request['params'] = params data['params'] = params
if json is not None: if json is not None:
request['json'] = json data['json'] = json
return self.request(request, session) if headers is not None:
data['headers'] = headers
if timeout is not None:
data['timeout'] = timeout
if verify is not None:
data['verify'] = verify
if retry is not None:
data['retry'] = retry
if json is not None:
data['json'] = json
return self.request(data, session)
def get_handler_url(self, handler): def get_handler_url(self, handler):