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

Inlined and removed _REQUEST_URL

Browse source
This commit is contained in:
Chuddah 2020-02-23 17:01:28 +00:00
commit 2ca0250448
1 changed files with 12 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

36
jellyfin_kodi/jellyfin/connection_manager.py
View file

@ -183,22 +183,6 @@ class ConnectionManager(object):
def get_jellyfin_url(self, base, handler): def get_jellyfin_url(self, base, handler):
return "%s/%s" % (base, handler) return "%s/%s" % (base, handler)
def _REQUEST_URL(self, url, type, data_type=None, timeout=None, verify=None, retry=5,
headers={}, json=None, additional_headers=True):
headers = dict(headers)
timeout = timeout or self.timeout
if additional_headers:
extra_headers = self._get_headers(data_type)
headers.update(extra_headers)
try:
return self.http.REQUEST(url, type, json=json, headers=headers, \
verify=verify, timeout=timeout, retry=retry)
except Exception as error:
LOG.exception(error)
raise
def _add_app_info(self): def _add_app_info(self):
return "%s/%s" % (self.config.data['app.name'], self.config.data['app.version']) return "%s/%s" % (self.config.data['app.name'], self.config.data['app.version'])
@ -241,12 +225,17 @@ class ConnectionManager(object):
} }
def _try_connect(self, url, timeout=None, options={}): def _try_connect(self, url, timeout=None, options={}):
url = self.get_jellyfin_url(url, "system/info/public") url = self.get_jellyfin_url(url, "system/info/public")
LOG.info("tryConnect url: %s", url) LOG.info("tryConnect url: %s", url)
timeout = timeout or self.timeout
headers = self._get_headers('json')
return self._REQUEST_URL(url, "GET", 'json', timeout, \ try:
options.get('ssl'), retry=False) return self.http.REQUEST(url, "GET", headers=headers, \
timeout=timeout, retry=False)
except Exception as error:
LOG.exception(error)
raise
def _server_discovery(self): def _server_discovery(self):
@ -416,12 +405,11 @@ class ConnectionManager(object):
try: try:
url = self.get_jellyfin_url(server['address'], "System/Info") url = self.get_jellyfin_url(server['address'], "System/Info")
headers = { headers = self._get_headers('json')
'X-MediaBrowser-Token': server['AccessToken'] headers['X-MediaBrowser-Token'] = server['AccessToken']
}
system_info = self._REQUEST_URL(url, "GET", 'json', \ system_info = self.http.REQUEST(url, "GET", headers=headers, \
verify=options.get('ssl'), headers=headers) verify=options.get('ssl'), timeout=self.timeout)
self._update_server_info(server, system_info) self._update_server_info(server, system_info)
except Exception as error: except Exception as error: