From 1e309b589153e69676e4f7c89901d3e35ba0c1d9 Mon Sep 17 00:00:00 2001
From: clinton-hall <fock_wulf@hotmail.com>
Date: Thu, 4 Dec 2014 13:12:32 +1030
Subject: [PATCH] remove chp.exe. Fixes #630 Big Thanks @nikagl

---
 nzbtomedia/extractor/bin/chp.exe       | Bin 7168 -> 0 bytes
 nzbtomedia/extractor/bin/invisible.cmd |   1 +
 nzbtomedia/extractor/bin/invisible.vbs |  20 ++++++++++++++++++++
 nzbtomedia/extractor/extractor.py      |  13 ++++---------
 4 files changed, 25 insertions(+), 9 deletions(-)
 delete mode 100644 nzbtomedia/extractor/bin/chp.exe
 create mode 100755 nzbtomedia/extractor/bin/invisible.cmd
 create mode 100755 nzbtomedia/extractor/bin/invisible.vbs

diff --git a/nzbtomedia/extractor/bin/chp.exe b/nzbtomedia/extractor/bin/chp.exe
deleted file mode 100644
index 4e5acea18865676cc88403eefeb82acab79b7ae4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7168
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
NsBm7y&i?YZe*vQgaf<)|

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 <some script arguments>"
+    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"]