diff --git a/nzbtomedia/extractor/bin/chp.exe b/nzbtomedia/extractor/bin/chp.exe deleted file mode 100644 index 4e5acea1..00000000 Binary files a/nzbtomedia/extractor/bin/chp.exe and /dev/null differ diff --git a/nzbtomedia/extractor/bin/invisible.cmd b/nzbtomedia/extractor/bin/invisible.cmd new file mode 100755 index 00000000..09d46c6f --- /dev/null +++ b/nzbtomedia/extractor/bin/invisible.cmd @@ -0,0 +1 @@ +start /wait wscript "%~dp0\invisible.vbs" %* \ No newline at end of file diff --git a/nzbtomedia/extractor/bin/invisible.vbs b/nzbtomedia/extractor/bin/invisible.vbs new file mode 100755 index 00000000..1c96e8cc --- /dev/null +++ b/nzbtomedia/extractor/bin/invisible.vbs @@ -0,0 +1,20 @@ +set args = WScript.Arguments +num = args.Count + +if num = 0 then + WScript.Echo "Usage: [CScript | WScript] invis.vbs aScript.bat " + WScript.Quit 1 +end if + +sargs = "" +if num > 1 then + sargs = " " + for k = 1 to num - 1 + anArg = args.Item(k) + sargs = sargs & anArg & " " + next +end if + +Set WshShell = WScript.CreateObject("WScript.Shell") + +WshShell.Run """" & WScript.Arguments(0) & """" & sargs, 0, True \ No newline at end of file diff --git a/nzbtomedia/extractor/extractor.py b/nzbtomedia/extractor/extractor.py index ecd17d01..4f2a7f3b 100644 --- a/nzbtomedia/extractor/extractor.py +++ b/nzbtomedia/extractor/extractor.py @@ -10,18 +10,13 @@ def extract(filePath, outputDestination): success = 0 # Using Windows if platform.system() == 'Windows': - 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") return False - else: - if not os.path.exists(chplocation): - cmd_7zip = [nzbtomedia.SEVENZIP, "x", "-y"] - else: - cmd_7zip = [chplocation, nzbtomedia.SEVENZIP, "x", "-y"] - ext_7zip = [".rar", ".zip", ".tar.gz", "tgz", ".tar.bz2", ".tbz", ".tar.lzma", ".tlz", ".7z", ".xz"] - EXTRACT_COMMANDS = dict.fromkeys(ext_7zip, cmd_7zip) + invislocation = os.path.join(nzbtomedia.PROGRAM_DIR, 'nzbtomedia', 'extractor', 'bin', 'invisible.cmd') + cmd_7zip = [invislocation, nzbtomedia.SEVENZIP, "x", "-y"] + ext_7zip = [".rar", ".zip", ".tar.gz", "tgz", ".tar.bz2", ".tbz", ".tar.lzma", ".tlz", ".7z", ".xz"] + EXTRACT_COMMANDS = dict.fromkeys(ext_7zip, cmd_7zip) # Using unix else: required_cmds = ["unrar", "unzip", "tar", "unxz", "unlzma", "7zr", "bunzip2"]