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

Renamed REQUEST to request_url. request_url is unique throughout the

Browse source 
codebase so is grep'able.
This commit is contained in:
Chuddah 2020-02-23 17:22:11 +00:00
commit 74dfbade18
4 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

8
jellyfin_kodi/downloader.py
View file

@ -44,18 +44,18 @@ def browse_info():
def _get(handler, params=None, server_id=None): def _get(handler, params=None, server_id=None):
url = get_jellyfinserver_url(handler) url = get_jellyfinserver_url(handler)
jf = Jellyfin(server_id) jf = Jellyfin(server_id)
return jf.http.REQUEST(url, "GET", params) return jf.http.request_url(url, "GET", params)
def _post(handler, json=None, params=None, server_id=None): def _post(handler, json=None, params=None, server_id=None):
url = get_jellyfinserver_url(handler) url = get_jellyfinserver_url(handler)
jf = Jellyfin(server_id) jf = Jellyfin(server_id)
return jf.http.REQUEST(url, "POST", params, json) return jf.http.request_url(url, "POST", params, json)
def _delete(handler, params=None, server_id=None): def _delete(handler, params=None, server_id=None):
url = get_jellyfinserver_url(handler) url = get_jellyfinserver_url(handler)
jf = Jellyfin(server_id) jf = Jellyfin(server_id)
return jf.http.REQUEST(url, "DELETE", params) return jf.http.request_url(url, "DELETE", params)
def validate_view(library_id, item_id): def validate_view(library_id, item_id):
@ -321,7 +321,7 @@ class GetItemWorker(threading.Thread):
} }
try: try:
result = self.server.http.REQUEST(url, "GET", params, s) result = self.server.http.request_url(url, "GET", params, s)
for item in result['Items']: for item in result['Items']:

6
jellyfin_kodi/jellyfin/api.py
View file

@ -38,15 +38,15 @@ class API(object):
def _get(self, handler, params=None): def _get(self, handler, params=None):
url = self.client.get_handler_url(handler) url = self.client.get_handler_url(handler)
return self.client.REQUEST(url, "GET", params) return self.client.request_url(url, "GET", params)
def _post(self, handler, json=None, params=None): def _post(self, handler, json=None, params=None):
url = self.client.get_handler_url(handler) url = self.client.get_handler_url(handler)
return self.client.REQUEST(url, "POST", params, json) return self.client.request_url(url, "POST", params, json)
def _delete(self, handler, params=None): def _delete(self, handler, params=None):
url = self.client.get_handler_url(handler) url = self.client.get_handler_url(handler)
return self.client.REQUEST(url, "DELETE", params) return self.client.request_url(url, "DELETE", params)
################################################################################################# #################################################################################################

6
jellyfin_kodi/jellyfin/connection_manager.py
View file

@ -104,7 +104,7 @@ class ConnectionManager(object):
'Username': username, 'Username': username,
'Pw': password or "" 'Pw': password or ""
} }
result = self.http.REQUEST(url, "POST", json=json, timeout=self.timeout) result = self.http.request_url(url, "POST", json=json, timeout=self.timeout)
except Exception as error: # Failed to login except Exception as error: # Failed to login
LOG.exception(error) LOG.exception(error)
return False return False
@ -223,7 +223,7 @@ class ConnectionManager(object):
headers = self._get_headers() headers = self._get_headers()
try: try:
return self.http.REQUEST(url, "GET", headers=headers, \ return self.http.request_url(url, "GET", headers=headers, \
timeout=timeout, retry=False) timeout=timeout, retry=False)
except Exception as error: except Exception as error:
LOG.exception(error) LOG.exception(error)
@ -400,7 +400,7 @@ class ConnectionManager(object):
headers = self._get_headers() 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(url, "GET", headers=headers, \
verify=options.get('ssl'), timeout=self.timeout) verify=options.get('ssl'), timeout=self.timeout)
self._update_server_info(server, system_info) self._update_server_info(server, system_info)

2
jellyfin_kodi/jellyfin/http.py
View file

@ -71,7 +71,7 @@ class HTTP(object):
return "%s/%s" % (server, handler) return "%s/%s" % (server, handler)
def REQUEST(self, url, type, params=None, json=None, session=None, \ def request_url(self, url, type, params=None, json=None, session=None, \
headers={}, verify=None, timeout=None, retry=5): headers={}, verify=None, timeout=None, retry=5):
config = self.config.data config = self.config.data