From 439f129d4bb95ee17b3a6921acc7f0e71581bbe1 Mon Sep 17 00:00:00 2001 From: clinton-hall Date: Mon, 29 Sep 2014 23:10:10 +0930 Subject: [PATCH] fix extractor paths for Windows. #574 --- nzbtomedia/__init__.py | 2 +- nzbtomedia/extractor/extractor.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nzbtomedia/__init__.py b/nzbtomedia/__init__.py index f81c18b1..88c34933 100644 --- a/nzbtomedia/__init__.py +++ b/nzbtomedia/__init__.py @@ -603,7 +603,7 @@ def initialize(section=None): if platform.system() == 'Windows': FFMPEG = os.path.join(FFMPEG_PATH, 'ffmpeg.exe') FFPROBE = os.path.join(FFMPEG_PATH, 'ffprobe.exe') - SEVENZIP = os.path.join(PROGRAM_DIR, 'nzbtomedia/extractor/bin/' + platform.machine() + '/7z.exe') + SEVENZIP = os.path.join(PROGRAM_DIR, 'nzbtomedia', 'extractor', 'bin', platform.machine(), '7z.exe') if not (os.path.isfile(FFMPEG)): # problem FFMPEG = None diff --git a/nzbtomedia/extractor/extractor.py b/nzbtomedia/extractor/extractor.py index 5eaed8cb..22ca581e 100644 --- a/nzbtomedia/extractor/extractor.py +++ b/nzbtomedia/extractor/extractor.py @@ -8,7 +8,7 @@ def extract(filePath, outputDestination): success = 0 # Using Windows if platform.system() == 'Windows': - chplocation = nzbtomedia.os.path.join(nzbtomedia.PROGRAM_DIR, 'nzbtomedia/extractor/bin/chp.exe') + chplocation = os.path.join(nzbtomedia.PROGRAM_DIR, 'nzbtomedia', 'extractor', 'bin', 'chp.exe') if not os.path.exists(nzbtomedia.SEVENZIP): nzbtomedia.logger.error("EXTRACTOR: Could not find 7-zip, Exiting")