github/nzbToMedia
1
0
Fork 0
mirror of https://github.com/clinton-hall/nzbToMedia.git synced 2025-08-19 21:03:14 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added missing code for logger

Browse source
This commit is contained in:
echel0n 2014-04-12 03:19:50 -07:00
commit 6806bca1bb
3 changed files with 7 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

2
nzbToCouchPotato.py
View file

@ -120,8 +120,6 @@
### NZBGET POST-PROCESSING SCRIPT ### ### NZBGET POST-PROCESSING SCRIPT ###
############################################################################## ##############################################################################
import logging
import os import os
import sys import sys
import nzbtomedia import nzbtomedia

7
nzbtomedia/Transcoder.py
View file

@ -1,15 +1,12 @@
import errno import errno
import logging
import os import os
import sys import sys
import nzbtomedia
from subprocess import call from subprocess import call
from nzbtomedia.nzbToMediaConfig import config from nzbtomedia import logger
class Transcoder: class Transcoder:
def Transcode_directory(self, dirName): def Transcode_directory(self, dirName):
Logger = logging.getLogger()
if os.name == 'nt': 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. ffmpeg = os.path.join(os.path.dirname(sys.argv[0]), 'ffmpeg\\bin\\ffmpeg.exe') # note, will need to package in this dir.
useNiceness = False useNiceness = False

14
nzbtomedia/extractor/extractor.py
View file

@ -1,17 +1,12 @@
import os import os
import sys import sys
import logging import nzbtomedia
from subprocess import call, Popen from subprocess import call, Popen
from nzbtomedia.nzbToMediaConfig import config
from nzbtomedia.nzbToMediaUtil import create_destination from nzbtomedia.nzbToMediaUtil import create_destination
from nzbtomedia import logger
Logger = logging.getLogger()
# which() and os_platform() breaks when running in Transmission (has to do with os.environ) # which() and os_platform() breaks when running in Transmission (has to do with os.environ)
def os_platform(): def os_platform():
# Author Credit: Matthew Scouten @ http://stackoverflow.com/a/7260315 # Author Credit: Matthew Scouten @ http://stackoverflow.com/a/7260315
true_platform = os.environ['PROCESSOR_ARCHITECTURE'] 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) logger.error("EXTRACTOR: %s not found, disabling support for %s", cmd, k)
del EXTRACT_COMMANDS[k] del EXTRACT_COMMANDS[k]
else: 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: 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) ext = os.path.splitext(filePath)
cmd = []
if ext[1] in (".gz", ".bz2", ".lzma"): if ext[1] in (".gz", ".bz2", ".lzma"):
# Check if this is a tar # Check if this is a tar
if os.path.splitext(ext[0])[1] == ".tar": if os.path.splitext(ext[0])[1] == ".tar":