diff --git a/core/auto_process/managers/pymedusa.py b/core/auto_process/managers/pymedusa.py index f0481389..5924562e 100644 --- a/core/auto_process/managers/pymedusa.py +++ b/core/auto_process/managers/pymedusa.py @@ -35,13 +35,11 @@ class PyMedusaApiV1(SickBeard): def api_call(self): self._process_fork_prarams() - url = self._create_url() - - logger.debug('Opening URL: {0} with params: {1}'.format(url, self.sb_init.fork_params), self.sb_init.section) + logger.debug(f'Opening URL: {self.url} with params: {self.sb_init.fork_params}', self.sb_init.section) try: - response = self.session.get(url, auth=(self.sb_init.username, self.sb_init.password), params=self.sb_init.fork_params, stream=True, verify=False, timeout=(30, 1800)) + response = self.session.get(self.url, auth=(self.sb_init.username, self.sb_init.password), params=self.sb_init.fork_params, stream=True, verify=False, timeout=(30, 1800)) except requests.ConnectionError: - logger.error('Unable to open URL: {0}'.format(url), self.sb_init.section) + logger.error(f'Unable to open URL: {self.url}', self.sb_init.section) return ProcessResult( message='{0}: Failed to post-process - Unable to connect to {0}'.format(self.sb_init.section), status_code=1, @@ -101,9 +99,7 @@ class PyMedusaApiV2(SickBeard): def api_call(self): self._process_fork_prarams() - url = self._create_url() - - logger.debug('Opening URL: {0}'.format(url), self.sb_init.section) + logger.debug(f'Opening URL: {self.url}', self.sb_init.section) payload = self.sb_init.fork_params payload['resource'] = self.sb_init.fork_params['nzbName'] del payload['nzbName'] @@ -116,7 +112,7 @@ class PyMedusaApiV2(SickBeard): # Send postprocess request try: - response = self.session.post(url, json=payload, verify=False, timeout=(30, 1800)) + response = self.session.post(self.url, json=payload, verify=False, timeout=(30, 1800)) except requests.ConnectionError: logger.error('Unable to send postprocess request', self.sb_init.section) return ProcessResult( @@ -140,7 +136,7 @@ class PyMedusaApiV2(SickBeard): wait_for = int(self.sb_init.config.get('wait_for', 2)) n = 0 response = {} - url = '{0}/{1}'.format(url, queueitem_identifier) + url = f'{self.url}/{queueitem_identifier}' while n < 12: # set up wait_for minutes to see if command completes.. time.sleep(5 * wait_for) response = self._get_identifier_status(url) diff --git a/core/auto_process/managers/sickbeard.py b/core/auto_process/managers/sickbeard.py index ed1e711e..9bacfe6c 100644 --- a/core/auto_process/managers/sickbeard.py +++ b/core/auto_process/managers/sickbeard.py @@ -438,9 +438,7 @@ class SickBeard: def api_call(self): """Perform a base sickbeard api call.""" self._process_fork_prarams() - url = self._create_url() - - logger.debug('Opening URL: {0} with params: {1}'.format(url, self.sb_init.fork_params), self.sb_init.section) + logger.debug(f'Opening URL: {self.url} with params: {self.sb_init.fork_params}', self.sb_init.section) try: if not self.sb_init.apikey and self.sb_init.username and self.sb_init.password: # If not using the api, we need to login using user/pass first. @@ -456,9 +454,9 @@ class SickBeard: if r.status_code in [401, 403] and r.cookies.get('_xsrf'): login_params['_xsrf'] = r.cookies.get('_xsrf') self.session.post(login, data=login_params, stream=True, verify=False, timeout=(30, 60)) - response = self.session.get(url, auth=(self.sb_init.username, self.sb_init.password), params=self.sb_init.fork_params, stream=True, verify=False, timeout=(30, 1800)) + response = self.session.get(self.url, auth=(self.sb_init.username, self.sb_init.password), params=self.sb_init.fork_params, stream=True, verify=False, timeout=(30, 1800)) except requests.ConnectionError: - logger.error('Unable to open URL: {0}'.format(url), self.sb_init.section) + logger.error(f'Unable to open URL: {self.url}', self.sb_init.section) return ProcessResult( message='{0}: Failed to post-process - Unable to connect to {0}'.format(self.sb_init.section), status_code=1,