From 330ef6a23ac9604eebb2a42de037fb68c61a1ce3 Mon Sep 17 00:00:00 2001
From: clinton-hall <fock_wulf@hotmail.com>
Date: Tue, 3 Jun 2014 17:22:01 +0930
Subject: [PATCH] bypass remote_path error and log current version #414. Fix
 Mylar Handling #410

---
 nzbToMedia.py                               | 12 +++++++-----
 nzbToMylar.py                               |  7 +++++--
 nzbtomedia/autoProcess/autoProcessComics.py |  9 ++++-----
 3 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/nzbToMedia.py b/nzbToMedia.py
index 40ff9c40..e9c81666 100755
--- a/nzbToMedia.py
+++ b/nzbToMedia.py
@@ -214,8 +214,11 @@
 # Mylar port.
 #myport=8090
 
-# Mylar api key.
-#myapikey=
+# Mylar username.
+#myusername=
+
+# Mylar password.
+#mypassword=
 
 # Mylar uses ssl (0, 1).
 #
@@ -401,9 +404,8 @@ def process(inputDirectory, inputName=None, status=0, clientAgent='manual', down
                 sectionName, inputCategory))
             return -1
     except:
-        logger.error('Remote Path is not valid for %s:%s Please set this to either 0 to disable or 1 to enable, exiting!' % (
-            sectionName, inputCategory))
-        return -1
+        logger.error('Remote Path %s is not valid for %s:%s Please set this to either 0 to disable or 1 to enable!' % (
+            section[inputCategory]['remote_path'], sectionName, inputCategory))
 
     if extract == 1:
         logger.debug('Checking for archives to extract in directory: %s' % (inputDirectory))
diff --git a/nzbToMylar.py b/nzbToMylar.py
index c34028c9..9a9d31bc 100755
--- a/nzbToMylar.py
+++ b/nzbToMylar.py
@@ -38,8 +38,11 @@
 # Mylar port.
 #myport=8090
 
-# Mylar api key.
-#myapikey=
+# Mylar username.
+#myusername=
+
+# Mylar password.
+#mypassword=
 
 # Mylar uses ssl (0, 1).
 #
diff --git a/nzbtomedia/autoProcess/autoProcessComics.py b/nzbtomedia/autoProcess/autoProcessComics.py
index e24ebee9..5ba64f36 100644
--- a/nzbtomedia/autoProcess/autoProcessComics.py
+++ b/nzbtomedia/autoProcess/autoProcessComics.py
@@ -14,7 +14,8 @@ class autoProcessComics:
 
         host = nzbtomedia.CFG[section][inputCategory]["host"]
         port = nzbtomedia.CFG[section][inputCategory]["port"]
-        apikey = nzbtomedia.CFG[section][inputCategory]["apikey"]
+        username = nzbtomedia.CFG[section][inputCategory]["username"]
+        password = nzbtomedia.CFG[section][inputCategory]["password"]
         try:
             ssl = int(nzbtomedia.CFG[section][inputCategory]["ssl"])
         except:
@@ -33,8 +34,6 @@ class autoProcessComics:
         replaceExtensions(dirName)
 
         params = {}
-        params['apikey'] = apikey
-        params['cmd'] = "forceProcess"
         params['nzb_folder'] = dirName
         if remote_path:
             params['nzb_folder'] = remoteDir(dirName)
@@ -47,14 +46,14 @@ class autoProcessComics:
         else:
             protocol = "http://"
 
-        url = "%s%s:%s%s/api" % (protocol, host, port, web_root)
+        url = "%s%s:%s%s/post_process" % (protocol, host, port, web_root)
 
         success = False
 
         logger.debug("Opening URL: %s" % (url), section)
 
         try:
-            r = requests.get(url, params=params, stream=True, verify=False)
+            r = requests.get(url, auth=(username, password), params=params, stream=True, verify=False)
         except requests.ConnectionError:
             logger.error("Unable to open URL", section)
             return 1 # failure