update to use Mylar api. Fixes #1374

core/autoProcess/autoProcessComics.py

@@ -12,22 +12,21 @@ requests.packages.urllib3.disable_warnings()
 
 class autoProcessComics(object):
     def processEpisode(self, section, dirName, inputName=None, status=0, clientAgent='manual', inputCategory=None):
-        if int(status) != 0:
-            logger.warning("FAILED DOWNLOAD DETECTED, nothing to process.", section)
-            return [1, "{0}: Failed to post-process. {1} does not support failed downloads".format(section, section)]
+
+        apc_version = "2.04"
+        comicrn_version = "1.01"
 
         cfg = dict(core.CFG[section][inputCategory])
 
         host = cfg["host"]
         port = cfg["port"]
-        username = cfg["username"]
-        password = cfg["password"]
+        apikey = cfg["apikey"]
         ssl = int(cfg.get("ssl", 0))
         web_root = cfg.get("web_root", "")
         remote_path = int(cfg.get("remote_path"), 0)
         protocol = "https://" if ssl else "http://"
 
-        url = "{0}{1}:{2}{3}/post_process".format(protocol, host, port, web_root)
+        url = "{0}{1}:{2}{3}/api".format(protocol, host, port, web_root)
         if not server_responding(url):
             logger.error("Server did not respond. Exiting", section)
             return [1, "{0}: Failed to post-process - {1} did not respond.".format(section, section)]
@@ -38,30 +37,38 @@ class autoProcessComics(object):
             inputName = clean_name
 
         params = {
+            'cmd': 'forceProcess',
+            'apikey': apikey,
             'nzb_folder': remoteDir(dirName) if remote_path else dirName,
         }
 
         if inputName is not None:
             params['nzb_name'] = inputName
+        params['failed'] = int(status)
+        params['apc_version'] = apc_version
+        params['comicrn_version'] = comicrn_version
 
         success = False
 
         logger.debug("Opening URL: {0}".format(url), section)
         try:
-            r = requests.get(url, auth=(username, password), params=params, stream=True, verify=False, timeout=(30, 300))
+            r = requests.post(url, params=params, stream=True, verify=False, timeout=(30, 300))
         except requests.ConnectionError:
             logger.error("Unable to open URL", section)
             return [1, "{0}: Failed to post-process - Unable to connect to {1}".format(section, section)]
-        for line in r.iter_lines():
+        if r.status_code not in [requests.codes.ok, requests.codes.created, requests.codes.accepted]:
+            logger.error("Server returned status {0}".format(r.status_code), section)
+            return [1, "{0}: Failed to post-process - Server returned status {1}".format(section, r.status_code)]
+
+        result = r.content
+        if not type(result) == list:
+            result = result.split('\n')
+        for line in result:
             if line:
                 logger.postprocess("{0}".format(line), section)
             if "Post Processing SUCCESSFUL" in line:
                 success = True
 
-        if r.status_code not in [requests.codes.ok, requests.codes.created, requests.codes.accepted]:
-            logger.error("Server returned status {0}".format(r.status_code), section)
-            return [1, "{0}: Failed to post-process - Server returned status {1}".format(section, r.status_code)]
-
         if success:
             logger.postprocess("SUCCESS: This issue has been processed successfully", section)
             return [0, "{0}: Successfully post-processed {1}".format(section, inputName)]

core/nzbToMediaConfig.py

@@ -157,7 +157,7 @@ class ConfigObj(configobj.ConfigObj, Section):
                     if option == ['outputDirectory']:
                         CFG_NEW['Torrent'][option] = os.path.split(os.path.normpath(value))[0]
                         values.pop(option)
-                if section in ['CouchPotato', 'HeadPhones', 'Gamez']:
+                if section in ['CouchPotato', 'HeadPhones', 'Gamez', 'Mylar']:
                     if option in ['username', 'password']:
                         values.pop(option)
                 if section in ["SickBeard", "Mylar"]: