diff --git a/nzbToCouchPotato.py b/nzbToCouchPotato.py index e99ebd8a..9f9f9632 100755 --- a/nzbToCouchPotato.py +++ b/nzbToCouchPotato.py @@ -120,8 +120,6 @@ ### NZBGET POST-PROCESSING SCRIPT ### ############################################################################## - -import logging import os import sys import nzbtomedia diff --git a/nzbtomedia/Transcoder.py b/nzbtomedia/Transcoder.py index aea2639f..04d79c14 100644 --- a/nzbtomedia/Transcoder.py +++ b/nzbtomedia/Transcoder.py @@ -1,15 +1,12 @@ import errno -import logging import os import sys +import nzbtomedia from subprocess import call -from nzbtomedia.nzbToMediaConfig import config - +from nzbtomedia import logger class Transcoder: def Transcode_directory(self, dirName): - Logger = logging.getLogger() - if os.name == 'nt': ffmpeg = os.path.join(os.path.dirname(sys.argv[0]), 'ffmpeg\\bin\\ffmpeg.exe') # note, will need to package in this dir. useNiceness = False diff --git a/nzbtomedia/extractor/extractor.py b/nzbtomedia/extractor/extractor.py index 1ca77c95..0ed7b64d 100644 --- a/nzbtomedia/extractor/extractor.py +++ b/nzbtomedia/extractor/extractor.py @@ -1,17 +1,12 @@ import os import sys -import logging +import nzbtomedia from subprocess import call, Popen - -from nzbtomedia.nzbToMediaConfig import config from nzbtomedia.nzbToMediaUtil import create_destination - - -Logger = logging.getLogger() +from nzbtomedia import logger # which() and os_platform() breaks when running in Transmission (has to do with os.environ) - def os_platform(): # Author Credit: Matthew Scouten @ http://stackoverflow.com/a/7260315 true_platform = os.environ['PROCESSOR_ARCHITECTURE'] @@ -75,12 +70,13 @@ def extract(filePath, outputDestination): logger.error("EXTRACTOR: %s not found, disabling support for %s", cmd, k) del EXTRACT_COMMANDS[k] else: - Logger.warn("EXTRACTOR: Cannot determine which tool to use when called from Transmission") + logger.warning("EXTRACTOR: Cannot determine which tool to use when called from Transmission") if not EXTRACT_COMMANDS: - Logger.warn("EXTRACTOR: No archive extracting programs found, plugin will be disabled") + logger.warning("EXTRACTOR: No archive extracting programs found, plugin will be disabled") ext = os.path.splitext(filePath) + cmd = [] if ext[1] in (".gz", ".bz2", ".lzma"): # Check if this is a tar if os.path.splitext(ext[0])[1] == ".tar":