Fixed lib importing for our custom packages

TorrentToMedia.py

@@ -4,8 +4,8 @@ import os
 import time
 import shutil
 import sys
-import nzbtomedia
 import platform
+import nzbtomedia
 
 from subprocess import Popen
 from nzbtomedia import logger, nzbToMediaDB
@@ -308,11 +308,11 @@ def main(args):
                         inputID = None
 
                         logger.info("Checking database for download info for %s ..." % (os.path.basename(dirName)))
-                        downloadInfo = nzbtomedia.get_downloadInfo(os.path.basename(dirName), 0)[0]
+                        downloadInfo = nzbtomedia.get_downloadInfo(os.path.basename(dirName), 0)
                         if downloadInfo:
-                            clientAgent = str(downloadInfo['client_agent'])
+                            clientAgent = str(downloadInfo['client_agent'][0])
-                            inputHash = str(downloadInfo['input_hash'])
+                            inputHash = str(downloadInfo['input_hash'][0])
-                            inputID = str(downloadInfo['input_id'])
+                            inputID = str(downloadInfo['input_id'][0])
                             logger.info("Found download info for %s, setting variables now ..." % (os.path.basename(dirName)))
 
                         logger.info("Running %s:%s as a manual run for folder %s ..." % (section, category, dirName))

libs/configobj/configobj.py

@@ -20,7 +20,7 @@ import sys
 from codecs import BOM_UTF8, BOM_UTF16, BOM_UTF16_BE, BOM_UTF16_LE
 
 # imported lazily to avoid startup performance hit if it isn't used
-from lib import six
+import six
 
 compiler = None
 

nzbToMedia.py

@@ -443,10 +443,10 @@ def main(args, section=None):
                         download_id = None
 
                         logger.info("Checking database for download info for %s ..." % (os.path.basename(dirName)))
-                        downloadInfo = get_downloadInfo(os.path.basename(dirName), 0)[0]
+                        downloadInfo = get_downloadInfo(os.path.basename(dirName), 0)
                         if downloadInfo:
-                            clientAgent = str(downloadInfo['client_agent'])
+                            clientAgent = str(downloadInfo['client_agent'][0])
-                            download_id = str(downloadInfo['input_id'])
+                            download_id = str(downloadInfo['input_id'][0])
                             logger.info("Found download info for %s, setting variables now ..." % (os.path.basename(dirName)))
 
                         logger.info("Starting manual run for %s:%s - Folder:%s" % (section, category, dirName))

nzbtomedia/autoProcess/autoProcessComics.py

@@ -1,7 +1,7 @@
 import os
 import time
 import nzbtomedia
-from lib import requests
+import requests
 from nzbtomedia.nzbToMediaUtil import convert_to_ascii, joinPath
 from nzbtomedia import logger
 

nzbtomedia/autoProcess/autoProcessGames.py

@@ -1,5 +1,5 @@
 import nzbtomedia
-from lib import requests
+import requests
 from nzbtomedia.nzbToMediaUtil import convert_to_ascii
 from nzbtomedia import logger
 

nzbtomedia/autoProcess/autoProcessMovie.py

@@ -1,8 +1,8 @@
 import os
 import time
-
+import requests
 import nzbtomedia
-from lib import requests
+
 from nzbtomedia.nzbToMediaSceneExceptions import process_all_exceptions
 from nzbtomedia.nzbToMediaUtil import convert_to_ascii, rmDir, find_imdbid, find_download, joinPath, listMediaFiles
 from nzbtomedia import logger

nzbtomedia/autoProcess/autoProcessMusic.py

@@ -1,7 +1,8 @@
 import os
 import time
+import requests
 import nzbtomedia
-from lib import requests
+
 from nzbtomedia.nzbToMediaUtil import convert_to_ascii, joinPath
 from nzbtomedia import logger
 

nzbtomedia/autoProcess/autoProcessTV.py

@@ -1,8 +1,8 @@
 import copy
 import os
-
+import requests
 import nzbtomedia
-from lib import requests
+
 from nzbtomedia.nzbToMediaAutoFork import autoFork
 from nzbtomedia.nzbToMediaSceneExceptions import process_all_exceptions
 from nzbtomedia.nzbToMediaUtil import convert_to_ascii, flatten, rmDir, joinPath, listMediaFiles

nzbtomedia/gh_api.py

@@ -1,5 +1,5 @@
 import json
-from lib import requests
+import requests
 
 class GitHub(object):
     """

nzbtomedia/nzbToMediaAutoFork.py

@@ -1,7 +1,8 @@
 import urllib
 import nzbtomedia
-from lib import requests
+import requests
 from nzbtomedia import logger
+
 def autoFork(inputCategory):
     # auto-detect correct section
     section = nzbtomedia.CFG.findsection(inputCategory)

nzbtomedia/nzbToMediaConfig.py

@@ -1,7 +1,8 @@
 import os
 import shutil
 import nzbtomedia
-from lib.configobj import *
+from configobj import *
+
 from itertools import chain
 
 class Sections(dict):