From 7668b5bed6ac1797cb742fa859ce744b9194184a Mon Sep 17 00:00:00 2001 From: clinton-hall Date: Sat, 13 Apr 2013 10:30:19 +0930 Subject: [PATCH] improved importing of autoProcess modules --- TorrentToMedia.py | 18 ++++++++---------- nzbToCouchPotato.py | 9 ++++----- nzbToGamez.py | 9 ++++----- nzbToHeadPhones.py | 9 ++++----- nzbToMedia.py | 17 ++++++++--------- nzbToMylar.py | 9 ++++----- nzbToSickBeard.py | 9 ++++----- 7 files changed, 36 insertions(+), 44 deletions(-) diff --git a/TorrentToMedia.py b/TorrentToMedia.py index 3edf2333..eb074f94 100755 --- a/TorrentToMedia.py +++ b/TorrentToMedia.py @@ -3,7 +3,6 @@ #System imports import os import sys -sys.path.insert(0, os.path.join(os.path.dirname(sys.argv[0]),'autoProcess/')) import ConfigParser import shutil import logging @@ -12,17 +11,16 @@ import time import re from subprocess import call - # Custom imports -import migratecfg +import autoProcess.migratecfg as migratecfg import extractor.extractor as extractor -import autoProcessComics -import autoProcessGames -import autoProcessMusic -import autoProcessTV -import autoProcessMovie -from nzbToMediaEnv import * -from nzbToMediaUtil import * +import autoProcess.autoProcessComics as autoProcessComics +import autoProcess.autoProcessGames as autoProcessGames +import autoProcess.autoProcessMusic as autoProcessMusic +import autoProcess.autoProcessTV as autoProcessTV +import autoProcess.autoProcessMovie as autoProcessMovie +from autoProcess.nzbToMediaEnv import * +from autoProcess.nzbToMediaUtil import * from utorrent.client import UTorrentClient def main(inputDirectory, inputName, inputCategory, inputHash, inputID): diff --git a/nzbToCouchPotato.py b/nzbToCouchPotato.py index bfad066f..72cbdb5f 100755 --- a/nzbToCouchPotato.py +++ b/nzbToCouchPotato.py @@ -2,13 +2,12 @@ import os import sys -sys.path.insert(0, os.path.join(os.path.dirname(sys.argv[0]),'autoProcess/')) import logging -import migratecfg -import autoProcessMovie -from nzbToMediaEnv import * -from nzbToMediaUtil import * +import autoProcess.migratecfg as migratecfg +import autoProcess.autoProcessMovie as autoProcessMovie +from autoProcess.nzbToMediaEnv import * +from autoProcess.nzbToMediaUtil import * #check to migrate old cfg before trying to load. if os.path.isfile(os.path.join(os.path.dirname(sys.argv[0]), "autoProcessMedia.cfg.sample")): diff --git a/nzbToGamez.py b/nzbToGamez.py index 72a247e8..eb47c8b5 100755 --- a/nzbToGamez.py +++ b/nzbToGamez.py @@ -2,13 +2,12 @@ import os import sys -sys.path.insert(0, os.path.join(os.path.dirname(sys.argv[0]),'autoProcess/')) import logging -import migratecfg -import autoProcessGames -from nzbToMediaEnv import * -from nzbToMediaUtil import * +import autoProcess.migratecfg as migratecfg +import autoProcess.autoProcessGames as autoProcessGames +from autoProcess.nzbToMediaEnv import * +from autoProcess.nzbToMediaUtil import * #check to migrate old cfg before trying to load. if os.path.isfile(os.path.join(os.path.dirname(sys.argv[0]), "autoProcessMedia.cfg.sample")): diff --git a/nzbToHeadPhones.py b/nzbToHeadPhones.py index f6368006..494b68ab 100755 --- a/nzbToHeadPhones.py +++ b/nzbToHeadPhones.py @@ -2,13 +2,12 @@ import os import sys -sys.path.insert(0, os.path.join(os.path.dirname(sys.argv[0]),'autoProcess/')) import logging -import migratecfg -import autoProcessMusic -from nzbToMediaEnv import * -from nzbToMediaUtil import * +import autoProcess.migratecfg as migratecfg +import autoProcess.autoProcessMusic as autoProcessMusic +from autoProcess.nzbToMediaEnv import * +from autoProcess.nzbToMediaUtil import * #check to migrate old cfg before trying to load. if os.path.isfile(os.path.join(os.path.dirname(sys.argv[0]), "autoProcessMedia.cfg.sample")): diff --git a/nzbToMedia.py b/nzbToMedia.py index 0ede30fb..98ba8d4e 100755 --- a/nzbToMedia.py +++ b/nzbToMedia.py @@ -2,18 +2,17 @@ import os import sys -sys.path.insert(0, os.path.join(os.path.dirname(sys.argv[0]),'autoProcess/')) import ConfigParser import logging -import migratecfg -import autoProcessComics -import autoProcessGames -import autoProcessMusic -import autoProcessTV -import autoProcessMovie -from nzbToMediaEnv import * -from nzbToMediaUtil import * +import autoProcess.migratecfg as migratecfg +import autoProcess.autoProcessComics as autoProcessComics +import autoProcess.autoProcessGames as autoProcessGames +import autoProcess.autoProcessMusic as autoProcessMusic +import autoProcess.autoProcessTV as autoProcessTV +import autoProcess.autoProcessMovie as autoProcessMovie +from autoProcess.nzbToMediaEnv import * +from autoProcess.nzbToMediaUtil import * # check to migrate old cfg before trying to load. if os.path.isfile(os.path.join(os.path.dirname(sys.argv[0]), "autoProcessMedia.cfg.sample")): diff --git a/nzbToMylar.py b/nzbToMylar.py index 6e9eca4b..5109fd88 100755 --- a/nzbToMylar.py +++ b/nzbToMylar.py @@ -2,13 +2,12 @@ import os import sys -sys.path.insert(0, os.path.join(os.path.dirname(sys.argv[0]),'autoProcess/')) import logging -import migratecfg -import autoProcessComics -from nzbToMediaEnv import * -from nzbToMediaUtil import * +import autoProcess.migratecfg as migratecfg +import autoProcess.autoProcessComics as autoProcessComics +from autoProcess.nzbToMediaEnv import * +from autoProcess.nzbToMediaUtil import * #check to migrate old cfg before trying to load. if os.path.isfile(os.path.join(os.path.dirname(sys.argv[0]), "autoProcessMedia.cfg.sample")): diff --git a/nzbToSickBeard.py b/nzbToSickBeard.py index b7daf1eb..8d05ff2c 100755 --- a/nzbToSickBeard.py +++ b/nzbToSickBeard.py @@ -24,13 +24,12 @@ import os import sys -sys.path.insert(0, os.path.join(os.path.dirname(sys.argv[0]),'autoProcess/')) import logging -import migratecfg -import autoProcessTV -from nzbToMediaEnv import * -from nzbToMediaUtil import * +import autoProcess.migratecfg as migratecfg +import autoProcess.autoProcessTV as autoProcessTV +from autoProcess.nzbToMediaEnv import * +from autoProcess.nzbToMediaUtil import * #check to migrate old cfg before trying to load. if os.path.isfile(os.path.join(os.path.dirname(sys.argv[0]), "autoProcessMedia.cfg.sample")):