diff --git a/nzbtomedia/__init__.py b/nzbtomedia/__init__.py index e8731c31..0107bd4c 100644 --- a/nzbtomedia/__init__.py +++ b/nzbtomedia/__init__.py @@ -4,12 +4,15 @@ import subprocess import sys import platform +# init libs +PROGRAM_DIR = os.path.dirname(os.path.normpath(os.path.abspath(os.path.join(__file__, os.pardir)))) +LIBS_DIR = os.path.join(PROGRAM_DIR, 'libs') +sys.path.insert(0, LIBS_DIR) + # init preliminaries SYS_ARGV = sys.argv[1:] APP_FILENAME = sys.argv[0] APP_NAME = os.path.basename(APP_FILENAME) -PROGRAM_DIR = os.path.dirname(os.path.normpath(os.path.abspath(os.path.join(__file__, os.pardir)))) -LIBS_DIR = os.path.join(PROGRAM_DIR, 'lib') LOG_DIR = os.path.join(PROGRAM_DIR, 'logs') LOG_FILE = os.path.join(LOG_DIR, 'postprocess.log') CONFIG_FILE = os.path.join(PROGRAM_DIR, 'autoProcessMedia.cfg') @@ -17,9 +20,6 @@ CONFIG_SPEC_FILE = os.path.join(PROGRAM_DIR, 'autoProcessMedia.cfg.spec') CONFIG_MOVIE_FILE = os.path.join(PROGRAM_DIR, 'autoProcessMovie.cfg') CONFIG_TV_FILE = os.path.join(PROGRAM_DIR, 'autoProcessTv.cfg') -# add our custom libs to the system path -sys.path.insert(0, LIBS_DIR) - import requests import guessit from nzbtomedia.autoProcess.autoProcessComics import autoProcessComics diff --git a/nzbtomedia/nzbToMediaUtil.py b/nzbtomedia/nzbToMediaUtil.py index 68cb242e..991aadd7 100644 --- a/nzbtomedia/nzbToMediaUtil.py +++ b/nzbtomedia/nzbToMediaUtil.py @@ -10,10 +10,10 @@ import nzbtomedia from nzbtomedia.extractor import extractor from nzbtomedia.linktastic import linktastic -from nzbtomedia import logger, nzbToMediaDB from nzbtomedia.synchronousdeluge.client import DelugeClient from nzbtomedia.utorrent.client import UTorrentClient from nzbtomedia.transmissionrpc.client import Client as TransmissionClient +from nzbtomedia import logger, nzbToMediaDB def sanitizeFileName(name): '''