From 9a715773befe312bc0db5022afeb1b6f19ecdfd2 Mon Sep 17 00:00:00 2001 From: clinton-hall Date: Mon, 19 Jan 2015 09:34:30 +1030 Subject: [PATCH] edit PR #679 to only change Windows. Fixes #676 --- nzbtomedia/extractor/extractor.py | 9 +++++---- nzbtomedia/linktastic/linktastic.py | 5 +++-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/nzbtomedia/extractor/extractor.py b/nzbtomedia/extractor/extractor.py index 9163eca0..344903ec 100644 --- a/nzbtomedia/extractor/extractor.py +++ b/nzbtomedia/extractor/extractor.py @@ -98,12 +98,13 @@ def extract(filePath, outputDestination): os.chdir(outputDestination) # Not all unpack commands accept full paths, so just extract into this directory devnull = open(os.devnull, 'w') - info = subprocess.STARTUPINFO() - info.dwFlags |= subprocess.STARTF_USESHOWWINDOW - try: # now works same for nt and *nix + info = None cmd.append(filePath) # add filePath to final cmd arg. - if platform.system() != 'Windows': + if platform.system() == 'Windows': + info = subprocess.STARTUPINFO() + info.dwFlags |= subprocess.STARTF_USESHOWWINDOW + else: cmd = nzbtomedia.NICENESS + cmd cmd2 = cmd cmd2.append("-p-") # don't prompt for password. diff --git a/nzbtomedia/linktastic/linktastic.py b/nzbtomedia/linktastic/linktastic.py index 6696e4a3..408bbc2e 100644 --- a/nzbtomedia/linktastic/linktastic.py +++ b/nzbtomedia/linktastic/linktastic.py @@ -25,8 +25,9 @@ import subprocess from subprocess import CalledProcessError import os -info = subprocess.STARTUPINFO() -info.dwFlags |= subprocess.STARTF_USESHOWWINDOW +if os.name == 'nt': + info = subprocess.STARTUPINFO() + info.dwFlags |= subprocess.STARTF_USESHOWWINDOW # Prevent spaces from messing with us! def _escape_param(param):