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

Removed more over-engineered code

Browse source
This commit is contained in:
Chuddah 2020-02-23 17:16:27 +00:00
commit cebff5d8a4
1 changed files with 8 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

23
jellyfin_kodi/jellyfin/connection_manager.py
View file

@ -182,19 +182,12 @@ 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 _add_app_info(self): def _get_headers(self):
return "%s/%s" % (self.config.data['app.name'], self.config.data['app.version']) return {
'Accept': "application/json",
def _get_headers(self, data_type): 'X-Application': "%s/%s" % (self.config.data['app.name'], self.config.data['app.version']),
headers = {} 'Content-type': 'application/x-www-form-urlencoded; charset=UTF-8',
}
if data_type == "json":
headers['Accept'] = "application/json"
headers['X-Application'] = self._add_app_info()
headers['Content-type'] = 'application/x-www-form-urlencoded; charset=UTF-8'
return headers
def _connect_to_servers(self, servers, options): def _connect_to_servers(self, servers, options):
@ -227,7 +220,7 @@ class ConnectionManager(object):
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 timeout = timeout or self.timeout
headers = self._get_headers('json') headers = self._get_headers()
try: try:
return self.http.REQUEST(url, "GET", headers=headers, \ return self.http.REQUEST(url, "GET", headers=headers, \
@ -404,7 +397,7 @@ class ConnectionManager(object):
try: try:
url = self.get_jellyfin_url(server['address'], "System/Info") url = self.get_jellyfin_url(server['address'], "System/Info")
headers = self._get_headers('json') headers = self._get_headers()
headers['X-MediaBrowser-Token'] = server['AccessToken'] headers['X-MediaBrowser-Token'] = server['AccessToken']
system_info = self.http.REQUEST(url, "GET", headers=headers, \ system_info = self.http.REQUEST(url, "GET", headers=headers, \