diff --git a/core/autoProcess/autoProcessComics.py b/core/autoProcess/autoProcessComics.py index f7262985..1a0fb43f 100644 --- a/core/autoProcess/autoProcessComics.py +++ b/core/autoProcess/autoProcessComics.py @@ -23,11 +23,7 @@ class autoProcessComics(object): ssl = int(core.CFG[section][inputCategory].get("ssl", 0)) web_root = core.CFG[section][inputCategory].get("web_root", "") remote_path = int(core.CFG[section][inputCategory].get("remote_path"), 0) - - if ssl: - protocol = "https://" - else: - protocol = "http://" + protocol = "https://" if ssl else "http://" url = "%s%s:%s%s/post_process" % (protocol, host, port, web_root) if not server_responding(url): diff --git a/core/autoProcess/autoProcessGames.py b/core/autoProcess/autoProcessGames.py index fe0bc890..336c48b3 100644 --- a/core/autoProcess/autoProcessGames.py +++ b/core/autoProcess/autoProcessGames.py @@ -21,11 +21,7 @@ class autoProcessGames(object): library = core.CFG[section][inputCategory].get("library") ssl = int(core.CFG[section][inputCategory].get("ssl", 0)) web_root = core.CFG[section][inputCategory].get("web_root", "") - - if ssl: - protocol = "https://" - else: - protocol = "http://" + protocol = "https://" if ssl else "http://" url = "%s%s:%s%s/api" % (protocol, host, port, web_root) if not server_responding(url): @@ -38,9 +34,7 @@ class autoProcessGames(object): gamezID = fields[0].replace("[", "").replace("]", "").replace(" ", "") - downloadStatus = 'Wanted' - if status == 0: - downloadStatus = 'Downloaded' + downloadStatus = 'Downloaded' if status == 0 else 'Wanted' params = { 'api_key': apikey, diff --git a/core/autoProcess/autoProcessMovie.py b/core/autoProcess/autoProcessMovie.py index 93180a71..3ded9d24 100644 --- a/core/autoProcess/autoProcessMovie.py +++ b/core/autoProcess/autoProcessMovie.py @@ -115,11 +115,7 @@ class autoProcessMovie(object): web_root = core.CFG[section][inputCategory].get("web_root", "") remote_path = int(core.CFG[section][inputCategory].get("remote_path", 0)) extract = int(section[inputCategory].get("extract", 0)) - - if ssl: - protocol = "https://" - else: - protocol = "http://" + protocol = "https://" if ssl else "http://" baseURL = "%s%s:%s%s/api/%s" % (protocol, host, port, web_root, apikey) if not server_responding(baseURL): @@ -213,9 +209,7 @@ class autoProcessMovie(object): params['downloader'] = downloader or clientAgent params['download_id'] = download_id - params['media_folder'] = dirName - if remote_path: - params['media_folder'] = remoteDir(dirName) + params['media_folder'] = remoteDir(dirName) if remote_path else dirName if method == "manage": command = "/manage.update" diff --git a/core/autoProcess/autoProcessMusic.py b/core/autoProcess/autoProcessMusic.py index be0be9c1..8ea22a3c 100644 --- a/core/autoProcess/autoProcessMusic.py +++ b/core/autoProcess/autoProcessMusic.py @@ -50,11 +50,7 @@ class autoProcessMusic(object): web_root = core.CFG[section][inputCategory].get("web_root", "") remote_path = int(core.CFG[section][inputCategory].get("remote_path", 0)) extract = int(section[inputCategory].get("extract", 0)) - - if ssl: - protocol = "https://" - else: - protocol = "http://" + protocol = "https://" if ssl else "http://" url = "%s%s:%s%s/api" % (protocol, host, port, web_root) if not server_responding(url): diff --git a/core/autoProcess/autoProcessTV.py b/core/autoProcess/autoProcessTV.py index e261435e..34d10df2 100644 --- a/core/autoProcess/autoProcessTV.py +++ b/core/autoProcess/autoProcessTV.py @@ -56,11 +56,7 @@ class autoProcessTV(object): port = core.CFG[section][inputCategory]["port"] ssl = int(core.CFG[section][inputCategory].get("ssl", 0)) web_root = core.CFG[section][inputCategory].get("web_root", "") - - if ssl: - protocol = "https://" - else: - protocol = "http://" + protocol = "https://" if ssl else "http://" if not server_responding("%s%s:%s%s" % (protocol, host, port, web_root)): logger.error("Server did not respond. Exiting", section)