Fixed lib importing for our custom packages

This commit is contained in:
echel0n 2014-04-22 08:26:08 -07:00
commit f185e6903b
11 changed files with 22 additions and 19 deletions

View file

@ -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'])
inputHash = str(downloadInfo['input_hash'])
inputID = str(downloadInfo['input_id'])
clientAgent = str(downloadInfo['client_agent'][0])
inputHash = str(downloadInfo['input_hash'][0])
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))

View file

@ -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

View file

@ -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'])
download_id = str(downloadInfo['input_id'])
clientAgent = str(downloadInfo['client_agent'][0])
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))

View file

@ -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

View file

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

View file

@ -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

View file

@ -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

View file

@ -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

View file

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

View file

@ -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)

View file

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