From 74dfbade18a1d0fca831b283077375b0a334c0c3 Mon Sep 17 00:00:00 2001 From: Chuddah Date: Sun, 23 Feb 2020 17:22:11 +0000 Subject: [PATCH] Renamed REQUEST to request_url. request_url is unique throughout the codebase so is grep'able. --- jellyfin_kodi/downloader.py | 8 ++++---- jellyfin_kodi/jellyfin/api.py | 6 +++--- jellyfin_kodi/jellyfin/connection_manager.py | 6 +++--- jellyfin_kodi/jellyfin/http.py | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/jellyfin_kodi/downloader.py b/jellyfin_kodi/downloader.py index a0fccab4..4fac888a 100644 --- a/jellyfin_kodi/downloader.py +++ b/jellyfin_kodi/downloader.py @@ -44,18 +44,18 @@ def browse_info(): def _get(handler, params=None, server_id=None): url = get_jellyfinserver_url(handler) 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): url = get_jellyfinserver_url(handler) 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): url = get_jellyfinserver_url(handler) 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): @@ -321,7 +321,7 @@ class GetItemWorker(threading.Thread): } 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']: diff --git a/jellyfin_kodi/jellyfin/api.py b/jellyfin_kodi/jellyfin/api.py index c632cb73..2cc9e0e6 100644 --- a/jellyfin_kodi/jellyfin/api.py +++ b/jellyfin_kodi/jellyfin/api.py @@ -38,15 +38,15 @@ class API(object): def _get(self, handler, params=None): 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): 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): url = self.client.get_handler_url(handler) - return self.client.REQUEST(url, "DELETE", params) + return self.client.request_url(url, "DELETE", params) ################################################################################################# diff --git a/jellyfin_kodi/jellyfin/connection_manager.py b/jellyfin_kodi/jellyfin/connection_manager.py index 137c6a6a..1fd371b9 100644 --- a/jellyfin_kodi/jellyfin/connection_manager.py +++ b/jellyfin_kodi/jellyfin/connection_manager.py @@ -104,7 +104,7 @@ class ConnectionManager(object): 'Username': username, '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 LOG.exception(error) return False @@ -223,7 +223,7 @@ class ConnectionManager(object): headers = self._get_headers() try: - return self.http.REQUEST(url, "GET", headers=headers, \ + return self.http.request_url(url, "GET", headers=headers, \ timeout=timeout, retry=False) except Exception as error: LOG.exception(error) @@ -400,7 +400,7 @@ class ConnectionManager(object): headers = self._get_headers() 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) self._update_server_info(server, system_info) diff --git a/jellyfin_kodi/jellyfin/http.py b/jellyfin_kodi/jellyfin/http.py index b7607c72..29c28883 100644 --- a/jellyfin_kodi/jellyfin/http.py +++ b/jellyfin_kodi/jellyfin/http.py @@ -71,7 +71,7 @@ class HTTP(object): 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): config = self.config.data