From 5372f8d4aa275f25ab0de93aacae41636a94c4d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Serhat=20G=C3=BCl=C3=A7i=C3=A7ek?= <serhat25@gmail.com>
Date: Sun, 23 Dec 2012 18:16:45 +0100
Subject: [PATCH 01/73] Fix substitution errors with non-bash shells

The scripts has the hashbang for /bin/sh, I assume for  portability
reasons. Some unix systems symlink sh to bash, others like Ubuntu (in my
case) symlink sh to dash or some other basic shell which do not support
the variable substitution. This is used for sending mail at this moment.

For portability reasons I check if we're in a bash shell, if so use the
bash variable substitution as this is available/faster than an external
command. If not as fallback sed will be used, which most of the cases is
present also. Even busybox has some basic sed available. This will
maximize portability usage of this script.
---
 .../9.0/bin/nzbget-postprocess.sh             | 40 ++++++++++++++-----
 1 file changed, 30 insertions(+), 10 deletions(-)

diff --git a/nzbget-postprocessing-files/9.0/bin/nzbget-postprocess.sh b/nzbget-postprocessing-files/9.0/bin/nzbget-postprocess.sh
index 0beebb18..df854d76 100644
--- a/nzbget-postprocessing-files/9.0/bin/nzbget-postprocess.sh
+++ b/nzbget-postprocessing-files/9.0/bin/nzbget-postprocess.sh
@@ -155,6 +155,19 @@ nzbToMedia() {
 	fi
 }
 
+replaceVarBy() {
+	if [ "$Debug" = "yes" ]; then echo "[DETAIL] Post-Process: Executing function 'replaceVarBy'. Going to replace '${2}' in '${1}' by '${3}'" ; fi
+
+	# If we're not using Bash use sed, as we need to support as much as systems possible, also those running sh/dash etc
+	if [ -n "${BASH_VERSION}" ]; then
+		REPLACEDRESULT="${1/${2}/${3}}"
+	else
+		REPLACEDRESULT=$(echo "${1}" | sed "s/${2}/${3}/")
+	fi
+
+	if [ "$Debug" = "yes" ]; then echo "[DETAIL] Post-Process: replace result: ${REPLACEDRESULT}" ; fi
+}
+
 # Pass on postprocess exit codes to external scripts for handling failed downloads
 do_exit() {
 	if [ "$Debug" = "yes" ]; then echo "[DETAIL] Post-Process: Executing function 'do_exit' with argument $1" ; fi
@@ -162,24 +175,31 @@ do_exit() {
 	if [ "$1" -ne "$POSTPROCESS_SUCCESS" ]; then nzbStatus=1 ; fi
 	script=none
 	nzbToMedia $nzbStatus
-	Email_Subject="${Email_Subject/<name>/$NZBPP_NZBFILENAME}"
-	Email_Subject="${Email_Subject/<cat>/$NZBPP_CATEGORY}"
-	Email_Subject="${Email_Subject/<script>/$script}"
-	Email_Message="${Email_Message/<name>/$NZBPP_NZBFILENAME}"
-	Email_Message="${Email_Message/<cat>/$NZBPP_CATEGORY}"
-	Email_Message="${Email_Message/<script>/$script}"
+        echo "[DETAIL] after calling nzbToMedia"
+	replaceVarBy "${Email_Subject}" "<name>" "${NZBPP_NZBFILENAME}"
+	replaceVarBy "${REPLACEDRESULT}" "<cat>" "${NZBPP_CATEGORY}"
+	replaceVarBy "${REPLACEDRESULT}" "<script>" "${script}"
+	Email_Subject="${REPLACEDRESULT}"
+	replaceVarBy "${Email_Message}" "<name>" "${NZBPP_NZBFILENAME}"
+	replaceVarBy "${REPLACEDRESULT}" "<cat>" "${NZBPP_CATEGORY}"
+	replaceVarBy "${REPLACEDRESULT}" "<script>" "${script}"
+	Email_Message="${REPLACEDRESULT}"
 	if [ "$Email_successful" = "yes" -a "$nzbStatus" = 0 ]; then
 		User=""
 		if [ -n "$Email_User" -a -n "$Email_Pass" ]; then User="-xu $Email_User -xp $Email_Pass" ; fi
-		Email_Subject="${Email_Subject/<status>/completed}"
-		Email_Message="${Email_Message/<status>/completed}"
+		replaceVarBy "${Email_Subject}" "<status>" "completed"
+		Email_Subject="${REPLACEDRESULT}"
+		replaceVarBy "${Email_Message}" "<status>" "completed"
+		Email_Message="${REPLACEDRESULT}"
 		$sendEmail -f "$Email_From" -t "$Email_To" -s "$Email_Server" $User -u "$Email_Subject" -m "$Email_Message" 
 	fi
 	if [ "$Email_failed" = "yes" -a "$nzbStatus" != 0 ]; then
 		User=""
 		if [ -n "$Email_User" -a -n "$Email_Pass" ]; then User="-xu $Email_User -xp $Email_Pass" ; fi
-		Email_Subject="${Email_Subject/<status>/failed}"
-		Email_Message="${Email_Message/<status>/failed}"
+		replaceVarBy "${Email_Subject}" "<status>" "failed"
+		Email_Subject="${REPLACEDRESULT}"
+		replaceVarBy "${Email_Message}" "<status>" "failed"
+		Email_Message="${REPLACEDRESULT}"
 		$sendEmail -f "$Email_From" -t "$Email_To" -s "$Email_Server" $User -u "$Email_Subject" -m "$Email_Message" 
 	fi
 	exit $1

From c08b713ecb51988343caaa00ed811b781f41c92b Mon Sep 17 00:00:00 2001
From: clinton-hall <fock_wulf@hotmail.com>
Date: Sun, 20 Jan 2013 22:03:27 -0800
Subject: [PATCH 02/73] Allow Manual Call for SickBeard

---
 nzbToSickBeard.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/nzbToSickBeard.py b/nzbToSickBeard.py
index dd2a62fc..e2874426 100644
--- a/nzbToSickBeard.py
+++ b/nzbToSickBeard.py
@@ -52,4 +52,5 @@ elif len(sys.argv) == 4:
 
 else:
 	print "Invalid number of arguments received from client." 
-        sys.exit()
+	print "Running autoProcessTV as a manual run..."
+	autoProcessTV.processEpisode('Manual Run', 'Manual Run', 0)

From a749a6531deab6d678b5354f086a436fbf8c678f Mon Sep 17 00:00:00 2001
From: clinton-hall <fock_wulf@hotmail.com>
Date: Sun, 20 Jan 2013 22:13:10 -0800
Subject: [PATCH 03/73] Added print out for manual run.

---
 autoProcessTV.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/autoProcessTV.py b/autoProcessTV.py
index e7dc8392..5f924af4 100644
--- a/autoProcessTV.py
+++ b/autoProcessTV.py
@@ -85,6 +85,10 @@ def processEpisode(dirName, nzbName=None, failed=False):
     except (ConfigParser.NoOptionError, ValueError):
         failed_fork = 0
     
+    #allows manual call of postprocess script if we have specified a watch_dir. Check that here.
+    if nzbName = "Manual Run" and watch_dir == ""
+        print "ERROR: In order to run this script manually you must specify a watch_dir in autoProcessTV.cfg"
+        sys.exit(-1)
     #allows us to specify the default watch directory and call the postproecssing on another PC with different directory structure.
     if watch_dir != "":
         dirName = watch_dir

From b52984ffea165ab2bbaa5a0bf26faf43ed3dc127 Mon Sep 17 00:00:00 2001
From: clinton-hall <fock_wulf@hotmail.com>
Date: Sun, 20 Jan 2013 22:17:50 -0800
Subject: [PATCH 04/73] Remove delay on manual call

---
 autoProcessMovie.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/autoProcessMovie.py b/autoProcessMovie.py
index ca95d8af..6e39eac3 100644
--- a/autoProcessMovie.py
+++ b/autoProcessMovie.py
@@ -64,6 +64,10 @@ def process(dirName, nzbName=None, status=0):
         protocol = "https://"
     else:
         protocol = "http://"
+    # don't delay when we are calling this script manually.    
+    if  nzbName == "Manual Run":  
+        delay = 0
+        
     if status == 0:
         if method == "manage":
             command = "manage.update" 

From 93313b19f7edf033aa70d483600b6da492a8db4f Mon Sep 17 00:00:00 2001
From: clinton-hall <fock_wulf@hotmail.com>
Date: Sun, 20 Jan 2013 22:18:30 -0800
Subject: [PATCH 05/73] correct syntaxt for if statement

---
 autoProcessTV.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/autoProcessTV.py b/autoProcessTV.py
index 5f924af4..047fbfcc 100644
--- a/autoProcessTV.py
+++ b/autoProcessTV.py
@@ -86,7 +86,7 @@ def processEpisode(dirName, nzbName=None, failed=False):
         failed_fork = 0
     
     #allows manual call of postprocess script if we have specified a watch_dir. Check that here.
-    if nzbName = "Manual Run" and watch_dir == ""
+    if nzbName = "Manual Run" and watch_dir == "":
         print "ERROR: In order to run this script manually you must specify a watch_dir in autoProcessTV.cfg"
         sys.exit(-1)
     #allows us to specify the default watch directory and call the postproecssing on another PC with different directory structure.

From 77d3f93ffc93500a9613f60b53f08f22f05ab111 Mon Sep 17 00:00:00 2001
From: clinton-hall <fock_wulf@hotmail.com>
Date: Sun, 27 Jan 2013 00:19:31 -0800
Subject: [PATCH 06/73] Correct Status report

only logs renamer stared if success:true.
fixes #30
---
 autoProcessMovie.py | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/autoProcessMovie.py b/autoProcessMovie.py
index 6e39eac3..7a178c1b 100644
--- a/autoProcessMovie.py
+++ b/autoProcessMovie.py
@@ -88,11 +88,12 @@ def process(dirName, nzbName=None, status=0):
             print "Unable to open URL: ", str(e)
             sys.exit(1)
     
-        result = urlObj.readlines()
-        for line in result:
-            print line
-    
-        print command, "started on CouchPotatoServer for", nzbName1
+        result = json.load(urlObj)
+        print "CouchPotatoServer returned", result
+        if result['success']:
+            print command, "started on CouchPotatoServer for", nzbName1
+        else:
+            print "Error", command, "has NOT started on CouchPotatoServer for", nzbName1
 
     else:
         print "download of", nzbName1, "has failed."

From 90f7e672d3380b6d508c9222dbe18040bd34cd29 Mon Sep 17 00:00:00 2001
From: Clinton Hall <fock_wulf@hotmail.com>
Date: Fri, 1 Feb 2013 11:22:58 +1030
Subject: [PATCH 07/73] Made files executable

Hopefully.
---
 nzbToCouchPotato.py                                       | 0
 nzbToSickBeard.py                                         | 0
 nzbget-postprocessing-files/9.0/bin/nzbget-postprocess.sh | 0
 nzbget-postprocessing-files/sendEmail/sendEmail           | 0
 4 files changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 nzbToCouchPotato.py
 mode change 100644 => 100755 nzbToSickBeard.py
 mode change 100644 => 100755 nzbget-postprocessing-files/9.0/bin/nzbget-postprocess.sh
 mode change 100644 => 100755 nzbget-postprocessing-files/sendEmail/sendEmail

diff --git a/nzbToCouchPotato.py b/nzbToCouchPotato.py
old mode 100644
new mode 100755
diff --git a/nzbToSickBeard.py b/nzbToSickBeard.py
old mode 100644
new mode 100755
diff --git a/nzbget-postprocessing-files/9.0/bin/nzbget-postprocess.sh b/nzbget-postprocessing-files/9.0/bin/nzbget-postprocess.sh
old mode 100644
new mode 100755
diff --git a/nzbget-postprocessing-files/sendEmail/sendEmail b/nzbget-postprocessing-files/sendEmail/sendEmail
old mode 100644
new mode 100755

From e500a64a83579e55f3d6f056cba7419b18d61bea Mon Sep 17 00:00:00 2001
From: clinton-hall <fock_wulf@hotmail.com>
Date: Thu, 31 Jan 2013 21:56:09 -0800
Subject: [PATCH 08/73] Create TransmissionToMedia

Still in progress
---
 TransmissionToMedia | 110 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 110 insertions(+)
 create mode 100644 TransmissionToMedia

diff --git a/TransmissionToMedia b/TransmissionToMedia
new file mode 100644
index 00000000..da8f9213
--- /dev/null
+++ b/TransmissionToMedia
@@ -0,0 +1,110 @@
+#!/usr/bin/env python
+
+import sys
+import autoProcessMovie
+import autoProcessTV
+import ConfigParser
+import os
+import glob
+
+##You can use the following parameters:
+##
+##%F - Name of downloaded file (for single file torrents)
+##%D - Directory where files are saved
+##%N - Title of torrent
+##%P - Previous state of torrent
+##%L - Label
+##%T - Tracker
+##%M - Status message string (same as status column)
+##%I - hex encoded info-hash
+##%S - State of torrent
+##%K - kind of torrent (single|multi)
+##
+##Where State is one of:
+##
+##Error - 1
+##Checked - 2
+##Paused - 3
+##Super seeding - 4
+##Seeding - 5
+##Downloading - 6
+##Super seed [F] - 7
+##Seeding [F] - 8
+##Downloading [F] - 9
+##Queued seed - 10
+##Finished - 11
+##Queued - 12
+##Stopped - 13
+
+## We will pass in %D, %N, %L
+Directory = sys.argv[1]
+Name = sys.argv[2]
+Categoty = sys.argv[3]
+print "transmissionToMedia v 4.0"
+
+config = ConfigParser.ConfigParser()
+configFilename = os.path.join(os.path.dirname(sys.argv[0]), "transmissionToMedia.cfg")
+
+print "Loading config from", configFilename
+
+if not os.path.isfile(configFilename):
+    print "ERROR: You need an autoProcessMovie.cfg file - did you rename and edit the .sample?"
+    sys.exit(-1)
+
+config.read(configFilename)
+
+Movie_Cat = config.get("CouchPotato", "category")
+TV_Cat = config.get("SickBeard", "category")
+Movie_dest = config.get("CouchPotato", "destination")
+TV_dest = config.get("CouchPotato", "destination")
+Use_cp = int(config.get("Transmission", "copy"))
+
+if Category == Movie_Cat:
+    destination = Movie_dest
+elif Category == TV_Cat:
+    destination = TV_dest
+else;
+    print "Not assigned a label of either", Movie_Cat, "or", TV_Cat, ". Exiting"
+
+if Use_cp:
+    print "copying all files from", Directory, "to", destination
+    shutil.copytree(Directory, destination)
+else:
+    print "creating hard link from", Directory, "to", destination
+    shutil.copytree(src, dst, copy_function=os.link)
+
+status = 0
+rared = 0
+par2 = 0
+ziptest = 0
+test = os.path.join(destination, '*.rar')
+if glob.glob(test):
+    print "rar files detected"
+    rared = 1
+    #status = 1
+test = os.path.join(destination, '*.par2')
+if  glob.glob(test):
+    print "par2 files detected"
+    par2 = 1
+test = os.path.join(destination, '*.zip')
+if  glob.glob(test):
+    print "zip files detected"
+    ziped = 1
+    #status = 1
+if ziped:
+    #unzip here and reset status to 0 is successful
+
+if par2:
+    #parcheck here
+
+if rared:
+    #unrar here and reset status to 0 if successful
+    
+status = 0
+
+status = int(status)
+##Now we pass off to CouchPotato or SickBeard.
+if Category == Movie_Cat:  
+    autoProcessMovie.process(destination, Name, status)
+elif Category == TV_Cat:
+    autoProcessTV.processEpisode(destination, Name, status)

From 363519c2efba026c493a2adb82562c3e50909d82 Mon Sep 17 00:00:00 2001
From: clinton-hall <fock_wulf@hotmail.com>
Date: Thu, 31 Jan 2013 21:56:37 -0800
Subject: [PATCH 09/73] keep naming consistent

---
 TransmissionToMedia | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/TransmissionToMedia b/TransmissionToMedia
index da8f9213..9d39c44c 100644
--- a/TransmissionToMedia
+++ b/TransmissionToMedia
@@ -43,7 +43,7 @@ Categoty = sys.argv[3]
 print "transmissionToMedia v 4.0"
 
 config = ConfigParser.ConfigParser()
-configFilename = os.path.join(os.path.dirname(sys.argv[0]), "transmissionToMedia.cfg")
+configFilename = os.path.join(os.path.dirname(sys.argv[0]), "TransmissionToMedia.cfg")
 
 print "Loading config from", configFilename
 

From f9f8e2dbf016df7f654104c22cf18aaad870983f Mon Sep 17 00:00:00 2001
From: clinton-hall <fock_wulf@hotmail.com>
Date: Thu, 31 Jan 2013 22:02:01 -0800
Subject: [PATCH 10/73] Create TransmissionToMedia.cfg.sample

---
 TransmissionToMedia.cfg.sample | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 TransmissionToMedia.cfg.sample

diff --git a/TransmissionToMedia.cfg.sample b/TransmissionToMedia.cfg.sample
new file mode 100644
index 00000000..b375f9dd
--- /dev/null
+++ b/TransmissionToMedia.cfg.sample
@@ -0,0 +1,18 @@
+[CouchPotato]
+category = movies
+destination = /abs/path/to/complete/movies
+
+[SickBeard]
+category = tv
+destination = /abs/path/to/complete/tv
+
+[Transmission]
+copy = 1
+unrar = /abs/path/to/unrar
+unzip = /abs/path/to/unzip
+parcheck = /abs/path/to/par2
+
+[Notes]
+copy = 0 will create hard links to your original download. 
+If moving to new hard-disk or network mount, use copy = 1
+copy = 0 is much faster and uses less disk space.

From ec7d3e0d517508dabb794918094adaf2649b89fa Mon Sep 17 00:00:00 2001
From: clinton-hall <fock_wulf@hotmail.com>
Date: Thu, 31 Jan 2013 22:04:47 -0800
Subject: [PATCH 11/73] allow reading of command paths.

---
 TransmissionToMedia | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/TransmissionToMedia b/TransmissionToMedia
index 9d39c44c..ccf65d38 100644
--- a/TransmissionToMedia
+++ b/TransmissionToMedia
@@ -58,6 +58,9 @@ TV_Cat = config.get("SickBeard", "category")
 Movie_dest = config.get("CouchPotato", "destination")
 TV_dest = config.get("CouchPotato", "destination")
 Use_cp = int(config.get("Transmission", "copy"))
+unrar = config.get("Transmission", "unrar")
+unzip = config.get("Transmission", "unzip")
+parcheck = config.get("Transmission", "parcheck")
 
 if Category == Movie_Cat:
     destination = Movie_dest
@@ -93,13 +96,13 @@ if  glob.glob(test):
     #status = 1
 if ziped:
     #unzip here and reset status to 0 is successful
-
+    #unzip
 if par2:
     #parcheck here
-
+    #parcheck
 if rared:
     #unrar here and reset status to 0 if successful
-    
+    #unrar
 status = 0
 
 status = int(status)

From 5b77c67940f30ce306e0da96a64726664a22b6fe Mon Sep 17 00:00:00 2001
From: Clinton Hall <fock_wulf@hotmail.com>
Date: Fri, 1 Feb 2013 16:44:33 +1030
Subject: [PATCH 12/73] forgot the .py

ops
---
 TransmissionToMedia => TransmissionToMedia.py | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename TransmissionToMedia => TransmissionToMedia.py (100%)
 mode change 100644 => 100755

diff --git a/TransmissionToMedia b/TransmissionToMedia.py
old mode 100644
new mode 100755
similarity index 100%
rename from TransmissionToMedia
rename to TransmissionToMedia.py

From db9c6f735de14bfe17d3f2dde971e3dcac2cb8d5 Mon Sep 17 00:00:00 2001
From: clinton-hall <fock_wulf@hotmail.com>
Date: Thu, 31 Jan 2013 22:39:02 -0800
Subject: [PATCH 13/73] started adding descriptions for utorrent

---
 README.md | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/README.md b/README.md
index a8fa3313..f969f0bc 100644
--- a/README.md
+++ b/README.md
@@ -298,3 +298,24 @@ If you are using NZBGet perform the following steps to configure postprocessing
 		Use \r\n for new line.
 		
 		Email_Message='The download of <name> has <status>. \r\n This has been processed by the script <script> for category <cat>' 
+
+### µTorrent
+
+If you are using µTorrent perform the following steps to configure postprocessing for "uTorrentToCouchPotato":
+
+1. Rename the uTorrentToMedia.cfg.sample to uTorrentToMedia.cfg and edit the parameters:
+
+	i.   .
+
+	ii.  .
+
+	iii. .
+
+
+2. In µTorrent go to preferences > Advanced > Run Program > Run this program when torrent finishes:
+ 
+	i.   Set full path to script, pass paramaters as "%D" "%N" "%L" and then output to a desired log.
+	
+		/usr/local/utorrent/nzbToMedia/uTorrentToMedia.py "%D" "%N" "%L" >> /usr/local/utorrent/log.txt.
+
+	ii.  

From 7e774d6e8f9b0eb95a3455174356518878d6661b Mon Sep 17 00:00:00 2001
From: Clinton Hall <fock_wulf@hotmail.com>
Date: Fri, 1 Feb 2013 17:10:46 +1030
Subject: [PATCH 14/73] Change Name

This is for utorrent, Not Transmission
---
 TransmissionToMedia.cfg.sample => uTorrentToMedia.cfg.sample | 0
 TransmissionToMedia.py => uTorrentToMedia.py                 | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename TransmissionToMedia.cfg.sample => uTorrentToMedia.cfg.sample (100%)
 rename TransmissionToMedia.py => uTorrentToMedia.py (100%)

diff --git a/TransmissionToMedia.cfg.sample b/uTorrentToMedia.cfg.sample
similarity index 100%
rename from TransmissionToMedia.cfg.sample
rename to uTorrentToMedia.cfg.sample
diff --git a/TransmissionToMedia.py b/uTorrentToMedia.py
similarity index 100%
rename from TransmissionToMedia.py
rename to uTorrentToMedia.py

From e6bb628f9c6c519d2727188d2268df9ecbfc3ac1 Mon Sep 17 00:00:00 2001
From: clinton-hall <fock_wulf@hotmail.com>
Date: Thu, 31 Jan 2013 22:42:27 -0800
Subject: [PATCH 15/73] uTorrent, not Transmission

---
 uTorrentToMedia.cfg.sample | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/uTorrentToMedia.cfg.sample b/uTorrentToMedia.cfg.sample
index b375f9dd..de919b85 100644
--- a/uTorrentToMedia.cfg.sample
+++ b/uTorrentToMedia.cfg.sample
@@ -6,7 +6,7 @@ destination = /abs/path/to/complete/movies
 category = tv
 destination = /abs/path/to/complete/tv
 
-[Transmission]
+[uTorrent]
 copy = 1
 unrar = /abs/path/to/unrar
 unzip = /abs/path/to/unzip

From 0ec776c478b747f2a4c6aae94f4aa0aa89849957 Mon Sep 17 00:00:00 2001
From: clinton-hall <fock_wulf@hotmail.com>
Date: Thu, 31 Jan 2013 22:44:56 -0800
Subject: [PATCH 16/73] uTorrent, not Transmission

That was silly of me
---
 uTorrentToMedia.py | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/uTorrentToMedia.py b/uTorrentToMedia.py
index ccf65d38..0fabb5e8 100755
--- a/uTorrentToMedia.py
+++ b/uTorrentToMedia.py
@@ -40,15 +40,15 @@ import glob
 Directory = sys.argv[1]
 Name = sys.argv[2]
 Categoty = sys.argv[3]
-print "transmissionToMedia v 4.0"
+print "uTorrentToMedia v 4.0"
 
 config = ConfigParser.ConfigParser()
-configFilename = os.path.join(os.path.dirname(sys.argv[0]), "TransmissionToMedia.cfg")
+configFilename = os.path.join(os.path.dirname(sys.argv[0]), "uTorrentToMedia.cfg")
 
 print "Loading config from", configFilename
 
 if not os.path.isfile(configFilename):
-    print "ERROR: You need an autoProcessMovie.cfg file - did you rename and edit the .sample?"
+    print "ERROR: You need a uTorrentToMedia.cfg file - did you rename and edit the .sample?"
     sys.exit(-1)
 
 config.read(configFilename)
@@ -57,10 +57,10 @@ Movie_Cat = config.get("CouchPotato", "category")
 TV_Cat = config.get("SickBeard", "category")
 Movie_dest = config.get("CouchPotato", "destination")
 TV_dest = config.get("CouchPotato", "destination")
-Use_cp = int(config.get("Transmission", "copy"))
-unrar = config.get("Transmission", "unrar")
-unzip = config.get("Transmission", "unzip")
-parcheck = config.get("Transmission", "parcheck")
+Use_cp = int(config.get("uTorrent", "copy"))
+unrar = config.get("uTorrent", "unrar")
+unzip = config.get("uTorrent", "unzip")
+parcheck = config.get("uTorrent", "parcheck")
 
 if Category == Movie_Cat:
     destination = Movie_dest

From e8778b32a8f91ba408a32c6417a4e5c532777f48 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Serhat=20G=C3=BCl=C3=A7i=C3=A7ek?= <serhat25@gmail.com>
Date: Fri, 1 Feb 2013 08:56:09 +0100
Subject: [PATCH 17/73] Revert the bash version in the replace function

---
 nzbget-postprocessing-files/9.0/bin/nzbget-postprocess.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nzbget-postprocessing-files/9.0/bin/nzbget-postprocess.sh b/nzbget-postprocessing-files/9.0/bin/nzbget-postprocess.sh
index d1abe191..7a992a60 100644
--- a/nzbget-postprocessing-files/9.0/bin/nzbget-postprocess.sh
+++ b/nzbget-postprocessing-files/9.0/bin/nzbget-postprocess.sh
@@ -160,7 +160,7 @@ replaceVarBy() {
 
 	# If we're not using Bash use sed, as we need to support as much as systems possible, also those running sh/dash etc
 	if [ -n "${BASH_VERSION}" ]; then
-		REPLACEDRESULT="${1/${2}/${3##*/}}" # get last part after slash for paths
+		REPLACEDRESULT="${1/${2}/${3}}"
 	else
 		REPLACEDRESULT=$(echo "${1}" | sed "s/${2}/${3##*/}/") # get last part after slash for paths
 	fi

From 86393f9da40eae436ee5494959ef80fd3d3899b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joel=20K=C3=A5berg?= <joel.kaberg@gmail.com>
Date: Fri, 1 Feb 2013 09:14:17 +0100
Subject: [PATCH 18/73] unfinished code

An attempt on adding extraction support. This code isnt finished, and
will probably not work, comments added in code
---
 ...ia.cfg.sample => TorrentToMedia.cfg.sample |   5 +-
 TorrentToMedia.py                             | 171 ++++++++++++++++++
 TransmissionToMedia.py                        | 113 ------------
 3 files changed, 173 insertions(+), 116 deletions(-)
 rename TransmissionToMedia.cfg.sample => TorrentToMedia.cfg.sample (83%)
 create mode 100644 TorrentToMedia.py
 delete mode 100755 TransmissionToMedia.py

diff --git a/TransmissionToMedia.cfg.sample b/TorrentToMedia.cfg.sample
similarity index 83%
rename from TransmissionToMedia.cfg.sample
rename to TorrentToMedia.cfg.sample
index b375f9dd..55646952 100644
--- a/TransmissionToMedia.cfg.sample
+++ b/TorrentToMedia.cfg.sample
@@ -6,10 +6,9 @@ destination = /abs/path/to/complete/movies
 category = tv
 destination = /abs/path/to/complete/tv
 
-[Transmission]
+[Torrent]
 copy = 1
-unrar = /abs/path/to/unrar
-unzip = /abs/path/to/unzip
+unpacker = 'C:\\Program Files\\7-Zip\\7z.exe'
 parcheck = /abs/path/to/par2
 
 [Notes]
diff --git a/TorrentToMedia.py b/TorrentToMedia.py
new file mode 100644
index 00000000..aeccf5cf
--- /dev/null
+++ b/TorrentToMedia.py
@@ -0,0 +1,171 @@
+#!/usr/bin/env python
+
+import sys
+import autoProcessMovie
+import autoProcessTV
+import ConfigParser
+import os
+from os import listdir
+from os.path import isfile, join
+import glob
+
+
+##You can use the following parameters:
+##
+##%F - Name of downloaded file (for single file torrents)
+##%D - Directory where files are saved
+##%N - Title of torrent
+##%P - Previous state of torrent
+##%L - Label
+##%T - Tracker
+##%M - Status message string (same as status column)
+##%I - hex encoded info-hash
+##%S - State of torrent
+##%K - kind of torrent (single|multi)
+##
+##Where State is one of:
+##
+##Error - 1
+##Checked - 2
+##Paused - 3
+##Super seeding - 4
+##Seeding - 5
+##Downloading - 6
+##Super seed [F] - 7
+##Seeding [F] - 8
+##Downloading [F] - 9
+##Queued seed - 10
+##Finished - 11
+##Queued - 12
+##Stopped - 13
+
+## We will pass in %D, %N, %L
+Directory = sys.argv[1]
+Name = sys.argv[2]
+Category = sys.argv[3]
+print "transmissionToMedia v 4.1"
+
+config = ConfigParser.ConfigParser()
+configFilename = os.path.join(os.path.dirname(sys.argv[0]), "TorrentToMedia.cfg")
+
+print "Loading config from", configFilename
+
+if not os.path.isfile(configFilename):
+    print "ERROR: You need an autoProcessMovie.cfg file - did you rename and edit the .sample?"
+    sys.exit(-1)
+
+config.read(configFilename)
+
+Movie_Cat = config.get("CouchPotato", "category")
+TV_Cat = config.get("SickBeard", "category")
+Movie_dest = config.get("CouchPotato", "destination")
+TV_dest = config.get("CouchPotato", "destination")
+Use_cp = int(config.get("Torrent", "copy"))
+packed = config.get("Torrent", "packed")
+unpacker = config.get("Torrent", "unpacker")
+parcheck = config.get("Torrent", "parcheck")
+
+if Category == Movie_Cat:
+    destination = Movie_dest
+elif Category == TV_Cat:
+    destination = TV_dest
+else;
+    print "Not assigned a label of either", Movie_Cat, "or", TV_Cat, ". Exiting"
+
+status = 0
+packed = 0
+par2 = 0
+
+test = re.compile('^(.*)\.((zip|rar|7z|gz|bz|tar|arj)|(r[0-9]{1,3})|([0-9]{1,3}))$', re.IGNORECASE|re.UNICODE);
+if test.match(destination):
+    print "packed files detected"
+    packed = 1
+    #status = 1
+	
+test = os.path.join(destination, '*.par2')
+if  glob.glob(test):
+    print "par2 files detected"
+    par2 = 1
+
+# QUESTION: Do we need this? PAR check is only for usenet?
+if par2:
+    #parcheck here
+    #parcheck
+
+# TODO: Check that files actully is .mkv / .avi etc, and not packed files
+if Use_cp and packed == 0:
+    print "copying all files from", Directory, "to", destination
+    shutil.copytree(Directory, destination)
+else:
+    print "creating hard link from", Directory, "to", destination
+    shutil.copytree(src, dst, copy_function=os.link)
+
+if packed:
+	# 7z x test.rar   ---- need to add "yes" to command
+	# windows only for now, should be adapted to *nix 
+    cmd_7zip = [unpacker, 'x']
+    ext_7zip = [".rar",
+                ".zip",
+                ".tar.gz", "tgz",
+                ".tar.bz2", ".tbz",
+                ".tar.lzma", ".tlz",
+                ".7z", ".xz"]
+    EXTRACT_COMMANDS = dict.fromkeys(ext_zip, cmd_7zip)
+	print('windows check passed')
+
+	# save path
+		if Category == Movie_Cat:  
+			save_path = Movie_dest
+		elif Category == TV_Cat:
+            save_path = TV_dest
+		
+		files = [ f for f in listdir(Directory) if isfile(join(Directory,f)) ]
+
+        for f in files:
+            ext = os.path.splitext(f["path"])
+            if ext[1] in (".gz", ".bz2", ".lzma"):
+                # check if this is a tar
+                if os.path.splitext(ext[0]) == ".tar":
+                    cmd = EXTRACT_COMMANDS[".tar" + ext[1]]
+            else:
+                if ext[1] in EXTRACT_COMMANDS:
+                    cmd = EXTRACT_COMMANDS[ext[1]]
+                else:
+                    print("unknown file type: %s", ext[1])
+                    continue
+
+            fp = os.path.join(save_path, os.path.normpath(f["path"]))
+
+            # destination path
+            dest = os.path.join(save_path, Name)
+
+            # create destionation folder
+            if not os.path.exists(dest):
+                try:
+                    os.makedirs(dest)
+                except Exception, e:
+                    print("cant create destination folder: %s", e)
+                    return
+
+            print("extracting to %s", dest)
+            def on_extract_success(result):
+                print("extract was successful for %s")
+
+            def on_extract_failed(result, torrent_id):
+                print("extract failed for %s")
+            print("hmm %s %s %s %s", cmd[0], cmd[1], fp, dest)
+
+            # running..
+            d = getProcessValue(cmd[0], cmd[1].split() + [str(fp)], {}, str(dest))
+            d.addCallback(on_extract_success)
+            d.addErrback(on_extract_failed)
+
+			
+status = 0
+
+status = int(status)
+##Now we pass off to CouchPotato or SickBeard.
+if Category == Movie_Cat:  
+    autoProcessMovie.process(destination, Name, status)
+elif Category == TV_Cat:
+    autoProcessTV.processEpisode(destination, Name, status)
diff --git a/TransmissionToMedia.py b/TransmissionToMedia.py
deleted file mode 100755
index ccf65d38..00000000
--- a/TransmissionToMedia.py
+++ /dev/null
@@ -1,113 +0,0 @@
-#!/usr/bin/env python
-
-import sys
-import autoProcessMovie
-import autoProcessTV
-import ConfigParser
-import os
-import glob
-
-##You can use the following parameters:
-##
-##%F - Name of downloaded file (for single file torrents)
-##%D - Directory where files are saved
-##%N - Title of torrent
-##%P - Previous state of torrent
-##%L - Label
-##%T - Tracker
-##%M - Status message string (same as status column)
-##%I - hex encoded info-hash
-##%S - State of torrent
-##%K - kind of torrent (single|multi)
-##
-##Where State is one of:
-##
-##Error - 1
-##Checked - 2
-##Paused - 3
-##Super seeding - 4
-##Seeding - 5
-##Downloading - 6
-##Super seed [F] - 7
-##Seeding [F] - 8
-##Downloading [F] - 9
-##Queued seed - 10
-##Finished - 11
-##Queued - 12
-##Stopped - 13
-
-## We will pass in %D, %N, %L
-Directory = sys.argv[1]
-Name = sys.argv[2]
-Categoty = sys.argv[3]
-print "transmissionToMedia v 4.0"
-
-config = ConfigParser.ConfigParser()
-configFilename = os.path.join(os.path.dirname(sys.argv[0]), "TransmissionToMedia.cfg")
-
-print "Loading config from", configFilename
-
-if not os.path.isfile(configFilename):
-    print "ERROR: You need an autoProcessMovie.cfg file - did you rename and edit the .sample?"
-    sys.exit(-1)
-
-config.read(configFilename)
-
-Movie_Cat = config.get("CouchPotato", "category")
-TV_Cat = config.get("SickBeard", "category")
-Movie_dest = config.get("CouchPotato", "destination")
-TV_dest = config.get("CouchPotato", "destination")
-Use_cp = int(config.get("Transmission", "copy"))
-unrar = config.get("Transmission", "unrar")
-unzip = config.get("Transmission", "unzip")
-parcheck = config.get("Transmission", "parcheck")
-
-if Category == Movie_Cat:
-    destination = Movie_dest
-elif Category == TV_Cat:
-    destination = TV_dest
-else;
-    print "Not assigned a label of either", Movie_Cat, "or", TV_Cat, ". Exiting"
-
-if Use_cp:
-    print "copying all files from", Directory, "to", destination
-    shutil.copytree(Directory, destination)
-else:
-    print "creating hard link from", Directory, "to", destination
-    shutil.copytree(src, dst, copy_function=os.link)
-
-status = 0
-rared = 0
-par2 = 0
-ziptest = 0
-test = os.path.join(destination, '*.rar')
-if glob.glob(test):
-    print "rar files detected"
-    rared = 1
-    #status = 1
-test = os.path.join(destination, '*.par2')
-if  glob.glob(test):
-    print "par2 files detected"
-    par2 = 1
-test = os.path.join(destination, '*.zip')
-if  glob.glob(test):
-    print "zip files detected"
-    ziped = 1
-    #status = 1
-if ziped:
-    #unzip here and reset status to 0 is successful
-    #unzip
-if par2:
-    #parcheck here
-    #parcheck
-if rared:
-    #unrar here and reset status to 0 if successful
-    #unrar
-status = 0
-
-status = int(status)
-##Now we pass off to CouchPotato or SickBeard.
-if Category == Movie_Cat:  
-    autoProcessMovie.process(destination, Name, status)
-elif Category == TV_Cat:
-    autoProcessTV.processEpisode(destination, Name, status)

From 501fb42657ac1145e13506b44a27dc0f92e658b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joel=20K=C3=A5berg?= <joel.kaberg@gmail.com>
Date: Fri, 1 Feb 2013 09:33:08 +0100
Subject: [PATCH 19/73] cleanup

---
 TorrentToMedia.cfg.sample |   2 +-
 TorrentToMedia.py         | 101 ++++++++++++++++++--------------------
 2 files changed, 49 insertions(+), 54 deletions(-)

diff --git a/TorrentToMedia.cfg.sample b/TorrentToMedia.cfg.sample
index 55646952..cbfc21ec 100644
--- a/TorrentToMedia.cfg.sample
+++ b/TorrentToMedia.cfg.sample
@@ -7,7 +7,7 @@ category = tv
 destination = /abs/path/to/complete/tv
 
 [Torrent]
-copy = 1
+uselink = 1
 unpacker = 'C:\\Program Files\\7-Zip\\7z.exe'
 parcheck = /abs/path/to/par2
 
diff --git a/TorrentToMedia.py b/TorrentToMedia.py
index aeccf5cf..40df71a8 100644
--- a/TorrentToMedia.py
+++ b/TorrentToMedia.py
@@ -10,7 +10,7 @@ from os.path import isfile, join
 import glob
 
 
-##You can use the following parameters:
+##You can use the following parameters (UTORRENT):
 ##
 ##%F - Name of downloaded file (for single file torrents)
 ##%D - Directory where files are saved
@@ -40,14 +40,18 @@ import glob
 ##Stopped - 13
 
 ## We will pass in %D, %N, %L
-Directory = sys.argv[1]
-Name = sys.argv[2]
-Category = sys.argv[3]
-print "transmissionToMedia v 4.1"
+Directory = sys.argv[1]	## Example output: F:\path\to\dir\My.Series.S01E01.720p.HDTV.x264-2HD
+Name = sys.argv[2]		## Example output: My.Series.S01E01.720p.HDTV.x264-2HD
+Category = sys.argv[3]	## Example output: tvseries # this is the label in uTorrent
+
+status = 0
+packed = 0
+par2 = 0
 
 config = ConfigParser.ConfigParser()
 configFilename = os.path.join(os.path.dirname(sys.argv[0]), "TorrentToMedia.cfg")
 
+print "transmissionToMedia v 4.1"
 print "Loading config from", configFilename
 
 if not os.path.isfile(configFilename):
@@ -58,11 +62,14 @@ config.read(configFilename)
 
 Movie_Cat = config.get("CouchPotato", "category")
 TV_Cat = config.get("SickBeard", "category")
+
 Movie_dest = config.get("CouchPotato", "destination")
 TV_dest = config.get("CouchPotato", "destination")
-Use_cp = int(config.get("Torrent", "copy"))
+
+useLink = int(config.get("Torrent", "uselink"))
 packed = config.get("Torrent", "packed")
 unpacker = config.get("Torrent", "unpacker")
+
 parcheck = config.get("Torrent", "parcheck")
 
 if Category == Movie_Cat:
@@ -72,37 +79,26 @@ elif Category == TV_Cat:
 else;
     print "Not assigned a label of either", Movie_Cat, "or", TV_Cat, ". Exiting"
 
-status = 0
-packed = 0
-par2 = 0
+
 
 test = re.compile('^(.*)\.((zip|rar|7z|gz|bz|tar|arj)|(r[0-9]{1,3})|([0-9]{1,3}))$', re.IGNORECASE|re.UNICODE);
 if test.match(destination):
     print "packed files detected"
     packed = 1
-    #status = 1
 	
 test = os.path.join(destination, '*.par2')
-if  glob.glob(test):
+if glob.glob(test):
     print "par2 files detected"
     par2 = 1
 
-# QUESTION: Do we need this? PAR check is only for usenet?
+## QUESTION: Do we need this? PAR check is only for usenet?
 if par2:
     #parcheck here
     #parcheck
 
-# TODO: Check that files actully is .mkv / .avi etc, and not packed files
-if Use_cp and packed == 0:
-    print "copying all files from", Directory, "to", destination
-    shutil.copytree(Directory, destination)
-else:
-    print "creating hard link from", Directory, "to", destination
-    shutil.copytree(src, dst, copy_function=os.link)
-
 if packed:
-	# 7z x test.rar   ---- need to add "yes" to command
-	# windows only for now, should be adapted to *nix 
+	## 7z x test.rar   ---- need to add "yes" to command
+	## windows only for now, should be adapted to *nix 
     cmd_7zip = [unpacker, 'x']
     ext_7zip = [".rar",
                 ".zip",
@@ -112,19 +108,13 @@ if packed:
                 ".7z", ".xz"]
     EXTRACT_COMMANDS = dict.fromkeys(ext_zip, cmd_7zip)
 	print('windows check passed')
-
-	# save path
-		if Category == Movie_Cat:  
-			save_path = Movie_dest
-		elif Category == TV_Cat:
-            save_path = TV_dest
-		
+	
 		files = [ f for f in listdir(Directory) if isfile(join(Directory,f)) ]
 
         for f in files:
             ext = os.path.splitext(f["path"])
             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]) == ".tar":
                     cmd = EXTRACT_COMMANDS[".tar" + ext[1]]
             else:
@@ -134,37 +124,42 @@ if packed:
                     print("unknown file type: %s", ext[1])
                     continue
 
-            fp = os.path.join(save_path, os.path.normpath(f["path"]))
+		fp = os.path.join(save_path, os.path.normpath(f["path"]))
 
-            # destination path
-            dest = os.path.join(save_path, Name)
+		## destination path
+		dest = os.path.join(destination, Name)
 
-            # create destionation folder
-            if not os.path.exists(dest):
-                try:
-                    os.makedirs(dest)
-                except Exception, e:
-                    print("cant create destination folder: %s", e)
+		## create destionation folder
+        if not os.path.exists(dest):
+			try:
+				os.makedirs(dest)
+					except Exception, e:
+					print("cant create destination folder: %s", e)
                     return
 
-            print("extracting to %s", dest)
-            def on_extract_success(result):
-                print("extract was successful for %s")
+		print("extracting to %s", dest)
+		def on_extract_success(result):
+			print("extract was successful for %s")
 
-            def on_extract_failed(result, torrent_id):
-                print("extract failed for %s")
-            print("hmm %s %s %s %s", cmd[0], cmd[1], fp, dest)
+		def on_extract_failed(result, torrent_id):
+			print("extract failed for %s")
+		print("hmm %s %s %s %s", cmd[0], cmd[1], fp, dest)
 
-            # running..
-            d = getProcessValue(cmd[0], cmd[1].split() + [str(fp)], {}, str(dest))
-            d.addCallback(on_extract_success)
-            d.addErrback(on_extract_failed)
-
-			
-status = 0
+		## running..
+		d = getProcessValue(cmd[0], cmd[1].split() + [str(fp)], {}, str(dest))
+		d.addCallback(on_extract_success)
+		d.addErrback(on_extract_failed)
+else:
+	## TODO: Check that files actully is .mkv / .avi etc, and not packed files
+	if useLink and packed == 0:
+		print "copying all files from", Directory, "to", destination
+		shutil.copytree(Directory, destination)
+	else:
+		print "creating hard link from", Directory, "to", destination
+		shutil.copytree(src, dst, copy_function=os.link)
 
 status = int(status)
-##Now we pass off to CouchPotato or SickBeard.
+## Now we pass off to CouchPotato or SickBeard.
 if Category == Movie_Cat:  
     autoProcessMovie.process(destination, Name, status)
 elif Category == TV_Cat:

From ce0d4b3f23a9a933c665a532f17dc6b2cf14983c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joel=20K=C3=A5berg?= <joel.kaberg@gmail.com>
Date: Fri, 1 Feb 2013 10:19:32 +0100
Subject: [PATCH 20/73] more cleanup

---
 TorrentToMedia.cfg.sample |  5 +--
 TorrentToMedia.py         | 81 ++++++++++++++-------------------------
 2 files changed, 30 insertions(+), 56 deletions(-)

diff --git a/TorrentToMedia.cfg.sample b/TorrentToMedia.cfg.sample
index cbfc21ec..e1e4c646 100644
--- a/TorrentToMedia.cfg.sample
+++ b/TorrentToMedia.cfg.sample
@@ -7,9 +7,8 @@ category = tv
 destination = /abs/path/to/complete/tv
 
 [Torrent]
-uselink = 1
-unpacker = 'C:\\Program Files\\7-Zip\\7z.exe'
-parcheck = /abs/path/to/par2
+uselink = 0
+extractiontool = 'C:\\Program Files\\7-Zip\\7z.exe'
 
 [Notes]
 copy = 0 will create hard links to your original download. 
diff --git a/TorrentToMedia.py b/TorrentToMedia.py
index 40df71a8..9d363f97 100644
--- a/TorrentToMedia.py
+++ b/TorrentToMedia.py
@@ -1,14 +1,10 @@
 #!/usr/bin/env python
 
-import sys
 import autoProcessMovie
 import autoProcessTV
-import ConfigParser
-import os
+import sys, os, glob, ConfigParser
 from os import listdir
 from os.path import isfile, join
-import glob
-
 
 ##You can use the following parameters (UTORRENT):
 ##
@@ -46,7 +42,6 @@ Category = sys.argv[3]	## Example output: tvseries # this is the label in uTorre
 
 status = 0
 packed = 0
-par2 = 0
 
 config = ConfigParser.ConfigParser()
 configFilename = os.path.join(os.path.dirname(sys.argv[0]), "TorrentToMedia.cfg")
@@ -60,17 +55,12 @@ if not os.path.isfile(configFilename):
 
 config.read(configFilename)
 
-Movie_Cat = config.get("CouchPotato", "category")
 TV_Cat = config.get("SickBeard", "category")
-
-Movie_dest = config.get("CouchPotato", "destination")
 TV_dest = config.get("CouchPotato", "destination")
-
+Movie_dest = config.get("CouchPotato", "destination")
+Movie_Cat = config.get("CouchPotato", "category")
 useLink = int(config.get("Torrent", "uselink"))
-packed = config.get("Torrent", "packed")
-unpacker = config.get("Torrent", "unpacker")
-
-parcheck = config.get("Torrent", "parcheck")
+extractionTool = config.get("Torrent", "extractiontool")
 
 if Category == Movie_Cat:
     destination = Movie_dest
@@ -79,84 +69,69 @@ elif Category == TV_Cat:
 else;
     print "Not assigned a label of either", Movie_Cat, "or", TV_Cat, ". Exiting"
 
-
-
 test = re.compile('^(.*)\.((zip|rar|7z|gz|bz|tar|arj)|(r[0-9]{1,3})|([0-9]{1,3}))$', re.IGNORECASE|re.UNICODE);
 if test.match(destination):
-    print "packed files detected"
+    print "Found compressed archives, extracting"
     packed = 1
 	
-test = os.path.join(destination, '*.par2')
-if glob.glob(test):
-    print "par2 files detected"
-    par2 = 1
-
-## QUESTION: Do we need this? PAR check is only for usenet?
-if par2:
-    #parcheck here
-    #parcheck
-
-if packed:
+## TODO: Check that files actully is .mkv / .avi etc, and not packed files or anything else
+if useLink == 1 and packed == 0: ## symlinks
+	print "Copying all files from", Directory, "to", destination
+	shutil.copytree(Directory, destination)
+	
+elif useLink == 0 and packed == 0: ## hardlink
+	print "Creating hard link from", Directory, "to", destination
+	shutil.copytree(src, dst, copy_function=os.link)
+		
+elif useLink == 0 and packed == 1: ## unpack
 	## 7z x test.rar   ---- need to add "yes" to command
-	## windows only for now, should be adapted to *nix 
-    cmd_7zip = [unpacker, 'x']
-    ext_7zip = [".rar",
-                ".zip",
-                ".tar.gz", "tgz",
-                ".tar.bz2", ".tbz",
-                ".tar.lzma", ".tlz",
-                ".7z", ".xz"]
+	## Windows only for now, should be adapted to *nix 
+    cmd_7zip = [extractionTool, 'x']
+    ext_7zip = [".rar",".zip",".tar.gz","tgz",".tar.bz2", ".tbz",".tar.lzma", ".tlz",".7z", ".xz"]
     EXTRACT_COMMANDS = dict.fromkeys(ext_zip, cmd_7zip)
-	print('windows check passed')
+	print('Found 7zip')
 	
 		files = [ f for f in listdir(Directory) if isfile(join(Directory,f)) ]
-
         for f in files:
             ext = os.path.splitext(f["path"])
             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]) == ".tar":
                     cmd = EXTRACT_COMMANDS[".tar" + ext[1]]
             else:
                 if ext[1] in EXTRACT_COMMANDS:
                     cmd = EXTRACT_COMMANDS[ext[1]]
                 else:
-                    print("unknown file type: %s", ext[1])
+                    print("ERROR: Unknown file type: %s", ext[1])
                     continue
 
 		fp = os.path.join(save_path, os.path.normpath(f["path"]))
 
-		## destination path
+		## Destination path
 		dest = os.path.join(destination, Name)
 
-		## create destionation folder
+		## Create destionation folder
         if not os.path.exists(dest):
 			try:
 				os.makedirs(dest)
 					except Exception, e:
-					print("cant create destination folder: %s", e)
+					print("ERROR: Not possible to create destination folder: %s", e)
                     return
 
 		print("extracting to %s", dest)
 		def on_extract_success(result):
-			print("extract was successful for %s")
+			print("Extract was successful for %s")
 
 		def on_extract_failed(result, torrent_id):
-			print("extract failed for %s")
+			print("ERROR: Extract failed for %s")
 		print("hmm %s %s %s %s", cmd[0], cmd[1], fp, dest)
 
-		## running..
+		## Running..
 		d = getProcessValue(cmd[0], cmd[1].split() + [str(fp)], {}, str(dest))
 		d.addCallback(on_extract_success)
 		d.addErrback(on_extract_failed)
 else:
-	## TODO: Check that files actully is .mkv / .avi etc, and not packed files
-	if useLink and packed == 0:
-		print "copying all files from", Directory, "to", destination
-		shutil.copytree(Directory, destination)
-	else:
-		print "creating hard link from", Directory, "to", destination
-		shutil.copytree(src, dst, copy_function=os.link)
+	print "Didn't find any compressed archives or media files to process, exiting"
 
 status = int(status)
 ## Now we pass off to CouchPotato or SickBeard.

From 7c4e14cca066cdd2c4e1d41cfaab03923d02ff4a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joel=20K=C3=A5berg?= <joel.kaberg@gmail.com>
Date: Fri, 1 Feb 2013 13:17:55 +0100
Subject: [PATCH 21/73] support for *nix and nt systems

---
 TorrentToMedia.py | 56 ++++++++++++++++++++++++++++++++---------------
 1 file changed, 38 insertions(+), 18 deletions(-)

diff --git a/TorrentToMedia.py b/TorrentToMedia.py
index 9d363f97..3a3948f6 100644
--- a/TorrentToMedia.py
+++ b/TorrentToMedia.py
@@ -85,25 +85,45 @@ elif useLink == 0 and packed == 0: ## hardlink
 		
 elif useLink == 0 and packed == 1: ## unpack
 	## 7z x test.rar   ---- need to add "yes" to command
-	## Windows only for now, should be adapted to *nix 
-    cmd_7zip = [extractionTool, 'x']
-    ext_7zip = [".rar",".zip",".tar.gz","tgz",".tar.bz2", ".tbz",".tar.lzma", ".tlz",".7z", ".xz"]
-    EXTRACT_COMMANDS = dict.fromkeys(ext_zip, cmd_7zip)
-	print('Found 7zip')
 	
-		files = [ f for f in listdir(Directory) if isfile(join(Directory,f)) ]
-        for f in files:
-            ext = os.path.splitext(f["path"])
-            if ext[1] in (".gz", ".bz2", ".lzma"):
-                ## Check if this is a tar
-                if os.path.splitext(ext[0]) == ".tar":
-                    cmd = EXTRACT_COMMANDS[".tar" + ext[1]]
-            else:
-                if ext[1] in EXTRACT_COMMANDS:
-                    cmd = EXTRACT_COMMANDS[ext[1]]
-                else:
-                    print("ERROR: Unknown file type: %s", ext[1])
-                    continue
+	## Using Windows?
+	if os.name == 'nt':
+		cmd_7zip = [extractionTool, 'x']
+		ext_7zip = [".rar",".zip",".tar.gz","tgz",".tar.bz2", ".tbz",".tar.lzma", ".tlz",".7z", ".xz"]
+		EXTRACT_COMMANDS = dict.fromkeys(ext_zip, cmd_7zip)
+		print('Found 7zip')
+	
+			files = [ f for f in listdir(Directory) if isfile(join(Directory,f)) ]
+				for f in files:
+					ext = os.path.splitext(f["path"])
+					if ext[1] in (".gz", ".bz2", ".lzma"):
+					## Check if this is a tar
+						if os.path.splitext(ext[0]) == ".tar":
+							cmd = EXTRACT_COMMANDS[".tar" + ext[1]]
+					else:
+						if ext[1] in EXTRACT_COMMANDS:
+							cmd = EXTRACT_COMMANDS[ext[1]]
+					else:
+						print("ERROR: Unknown file type: %s", ext[1])
+						continue
+	## Using linux?
+	elif os.name == 'posix':
+		required_cmds=["unrar", "unzip", "tar", "unxz", "unlzma", "7zr"]
+		EXTRACT_COMMANDS = {
+		".rar": ["unrar", "x -o+ -y"],
+		".zip": ["unzip", ""],
+		".tar.gz": ["tar", "xzf"],
+		".tgz": ["tar", "xzf"],
+		".tar.bz2": ["tar", "xjf"],
+		".tbz": ["tar", "xjf"],
+		".tar.lzma": ["tar", "--lzma xf"],
+		".tlz": ["tar", "--lzma xf"],
+		".txz": ["tar", "--xz xf"],
+		".7z": ["7zr", "x"],
+		}
+	## Need to add check for which commands that can be utilized in Linux..
+	else:
+		print "Unknown OS, exiting"
 
 		fp = os.path.join(save_path, os.path.normpath(f["path"]))
 

From 68afb6a0854091232b7aecd1f4d01311698da019 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joel=20K=C3=A5berg?= <joel.kaberg@gmail.com>
Date: Fri, 1 Feb 2013 13:39:34 +0100
Subject: [PATCH 22/73] to fast to furious, cleanup

---
 TorrentToMedia.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/TorrentToMedia.py b/TorrentToMedia.py
index 3a3948f6..98c65b7c 100644
--- a/TorrentToMedia.py
+++ b/TorrentToMedia.py
@@ -131,7 +131,7 @@ elif useLink == 0 and packed == 1: ## unpack
 		dest = os.path.join(destination, Name)
 
 		## Create destionation folder
-        if not os.path.exists(dest):
+		if not os.path.exists(dest):
 			try:
 				os.makedirs(dest)
 					except Exception, e:

From ca9ffb3ce53fabc606444e36607ef2d2238329f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joel=20K=C3=A5berg?= <joel.kaberg@gmail.com>
Date: Fri, 1 Feb 2013 13:43:18 +0100
Subject: [PATCH 23/73] cleanup

---
 TorrentToMedia.py | 100 +++++++++++++++++++++++-----------------------
 1 file changed, 51 insertions(+), 49 deletions(-)

diff --git a/TorrentToMedia.py b/TorrentToMedia.py
index 98c65b7c..89d4c97d 100644
--- a/TorrentToMedia.py
+++ b/TorrentToMedia.py
@@ -35,10 +35,10 @@ from os.path import isfile, join
 ##Queued - 12
 ##Stopped - 13
 
-## We will pass in %D, %N, %L
-Directory = sys.argv[1]	## Example output: F:\path\to\dir\My.Series.S01E01.720p.HDTV.x264-2HD
-Name = sys.argv[2]		## Example output: My.Series.S01E01.720p.HDTV.x264-2HD
-Category = sys.argv[3]	## Example output: tvseries # this is the label in uTorrent
+## We will pass in %D, %N, %L from uTorrent
+Directory = sys.argv[1]	## %D -- Example output: F:\path\to\dir\My.Series.S01E01.720p.HDTV.x264-2HD
+Name = sys.argv[2]		## %N -- Example output: My.Series.S01E01.720p.HDTV.x264-2HD
+Category = sys.argv[3]	## %L -- Example output: tvseries ## This is the label in uTorrent
 
 status = 0
 packed = 0
@@ -47,7 +47,7 @@ config = ConfigParser.ConfigParser()
 configFilename = os.path.join(os.path.dirname(sys.argv[0]), "TorrentToMedia.cfg")
 
 print "transmissionToMedia v 4.1"
-print "Loading config from", configFilename
+print "INFO: Loading config from", configFilename
 
 if not os.path.isfile(configFilename):
     print "ERROR: You need an autoProcessMovie.cfg file - did you rename and edit the .sample?"
@@ -67,20 +67,20 @@ if Category == Movie_Cat:
 elif Category == TV_Cat:
     destination = TV_dest
 else;
-    print "Not assigned a label of either", Movie_Cat, "or", TV_Cat, ". Exiting"
+    print "INFO: Not assigned a label of either", Movie_Cat, "or", TV_Cat, ". Exiting"
 
 test = re.compile('^(.*)\.((zip|rar|7z|gz|bz|tar|arj)|(r[0-9]{1,3})|([0-9]{1,3}))$', re.IGNORECASE|re.UNICODE);
 if test.match(destination):
-    print "Found compressed archives, extracting"
+    print "INFO: Found compressed archives, extracting"
     packed = 1
 	
 ## TODO: Check that files actully is .mkv / .avi etc, and not packed files or anything else
 if useLink == 1 and packed == 0: ## symlinks
-	print "Copying all files from", Directory, "to", destination
+	print "INFO: Copying all files from", Directory, "to", destination
 	shutil.copytree(Directory, destination)
 	
 elif useLink == 0 and packed == 0: ## hardlink
-	print "Creating hard link from", Directory, "to", destination
+	print "INFO: Creating hard link from", Directory, "to", destination
 	shutil.copytree(src, dst, copy_function=os.link)
 		
 elif useLink == 0 and packed == 1: ## unpack
@@ -89,23 +89,10 @@ elif useLink == 0 and packed == 1: ## unpack
 	## Using Windows?
 	if os.name == 'nt':
 		cmd_7zip = [extractionTool, 'x']
-		ext_7zip = [".rar",".zip",".tar.gz","tgz",".tar.bz2", ".tbz",".tar.lzma", ".tlz",".7z", ".xz"]
+		ext_7zip = [".rar",".zip",".tar.gz","tgz",".tar.bz2",".tbz",".tar.lzma",".tlz",".7z",".xz"]
 		EXTRACT_COMMANDS = dict.fromkeys(ext_zip, cmd_7zip)
-		print('Found 7zip')
-	
-			files = [ f for f in listdir(Directory) if isfile(join(Directory,f)) ]
-				for f in files:
-					ext = os.path.splitext(f["path"])
-					if ext[1] in (".gz", ".bz2", ".lzma"):
-					## Check if this is a tar
-						if os.path.splitext(ext[0]) == ".tar":
-							cmd = EXTRACT_COMMANDS[".tar" + ext[1]]
-					else:
-						if ext[1] in EXTRACT_COMMANDS:
-							cmd = EXTRACT_COMMANDS[ext[1]]
-					else:
-						print("ERROR: Unknown file type: %s", ext[1])
-						continue
+		print "INFO: We are using Windows"
+		
 	## Using linux?
 	elif os.name == 'posix':
 		required_cmds=["unrar", "unzip", "tar", "unxz", "unlzma", "7zr"]
@@ -121,37 +108,52 @@ elif useLink == 0 and packed == 1: ## unpack
 		".txz": ["tar", "--xz xf"],
 		".7z": ["7zr", "x"],
 		}
-	## Need to add check for which commands that can be utilized in Linux..
+		print "INFO: We are using *nix"
+		
+	## Need to add a check for which commands that can be utilized in *nix systems..
 	else:
-		print "Unknown OS, exiting"
+		print "ERROR: Unknown OS, exiting"
 
-		fp = os.path.join(save_path, os.path.normpath(f["path"]))
+	files = [ f for f in listdir(Directory) if isfile(join(Directory,f)) ]
+		for f in files:
+			ext = os.path.splitext(f["path"])
+			if ext[1] in (".gz", ".bz2", ".lzma"):
+			## Check if this is a tar
+				if os.path.splitext(ext[0]) == ".tar":
+					cmd = EXTRACT_COMMANDS[".tar" + ext[1]]
+				else:
+					if ext[1] in EXTRACT_COMMANDS:
+						cmd = EXTRACT_COMMANDS[ext[1]]
+					else:
+						print("ERROR: Unknown file type: %s", ext[1])
+						continue
+	fp = os.path.join(save_path, os.path.normpath(f["path"]))
 
-		## Destination path
-		dest = os.path.join(destination, Name)
+	## Destination path
+	dest = os.path.join(destination, Name)
 
-		## Create destionation folder
-		if not os.path.exists(dest):
-			try:
-				os.makedirs(dest)
-					except Exception, e:
-					print("ERROR: Not possible to create destination folder: %s", e)
-                    return
+	## Create destionation folder
+       if not os.path.exists(dest):
+		try:
+			os.makedirs(dest)
+				except Exception, e:
+				print("ERROR: Not possible to create destination folder: %s", e)
+                   return
 
-		print("extracting to %s", dest)
-		def on_extract_success(result):
-			print("Extract was successful for %s")
+	print("INFO: Extracting to %s", dest)
+	def on_extract_success(result):
+		print("INFO: Extraction was successful for %s")
 
-		def on_extract_failed(result, torrent_id):
-			print("ERROR: Extract failed for %s")
-		print("hmm %s %s %s %s", cmd[0], cmd[1], fp, dest)
-
-		## Running..
-		d = getProcessValue(cmd[0], cmd[1].split() + [str(fp)], {}, str(dest))
-		d.addCallback(on_extract_success)
-		d.addErrback(on_extract_failed)
+	def on_extract_failed(result):
+		print("ERROR: Extraction failed for %s")
+	
+	## Running..	
+	print("INFO: Extracting %s %s %s %s", cmd[0], cmd[1], fp, dest)
+	d = getProcessValue(cmd[0], cmd[1].split() + [str(fp)], {}, str(dest))
+	d.addCallback(on_extract_success)
+	d.addErrback(on_extract_failed)
 else:
-	print "Didn't find any compressed archives or media files to process, exiting"
+	print "INFO: Didn't find any compressed archives or media files to process, exiting"
 
 status = int(status)
 ## Now we pass off to CouchPotato or SickBeard.

From 1c1dc35e4c004582635c54540e69dea8bb017d1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joel=20K=C3=A5berg?= <joel.kaberg@gmail.com>
Date: Fri, 1 Feb 2013 13:47:08 +0100
Subject: [PATCH 24/73] always assume -y switch on windows

---
 TorrentToMedia.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/TorrentToMedia.py b/TorrentToMedia.py
index 89d4c97d..cd55c117 100644
--- a/TorrentToMedia.py
+++ b/TorrentToMedia.py
@@ -88,7 +88,7 @@ elif useLink == 0 and packed == 1: ## unpack
 	
 	## Using Windows?
 	if os.name == 'nt':
-		cmd_7zip = [extractionTool, 'x']
+		cmd_7zip = [extractionTool, 'x -y']
 		ext_7zip = [".rar",".zip",".tar.gz","tgz",".tar.bz2",".tbz",".tar.lzma",".tlz",".7z",".xz"]
 		EXTRACT_COMMANDS = dict.fromkeys(ext_zip, cmd_7zip)
 		print "INFO: We are using Windows"

From 5e9677be6c9e8bbb90a9403bc09cff9833a603a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joel=20K=C3=A5berg?= <joel.kaberg@gmail.com>
Date: Fri, 1 Feb 2013 14:20:26 +0100
Subject: [PATCH 25/73] cleanup

---
 TorrentToMedia.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/TorrentToMedia.py b/TorrentToMedia.py
index cd55c117..3c3a793d 100644
--- a/TorrentToMedia.py
+++ b/TorrentToMedia.py
@@ -46,7 +46,7 @@ packed = 0
 config = ConfigParser.ConfigParser()
 configFilename = os.path.join(os.path.dirname(sys.argv[0]), "TorrentToMedia.cfg")
 
-print "transmissionToMedia v 4.1"
+print "torrentToMedia v 4.1"
 print "INFO: Loading config from", configFilename
 
 if not os.path.isfile(configFilename):
@@ -84,8 +84,6 @@ elif useLink == 0 and packed == 0: ## hardlink
 	shutil.copytree(src, dst, copy_function=os.link)
 		
 elif useLink == 0 and packed == 1: ## unpack
-	## 7z x test.rar   ---- need to add "yes" to command
-	
 	## Using Windows?
 	if os.name == 'nt':
 		cmd_7zip = [extractionTool, 'x -y']
@@ -127,7 +125,7 @@ elif useLink == 0 and packed == 1: ## unpack
 					else:
 						print("ERROR: Unknown file type: %s", ext[1])
 						continue
-	fp = os.path.join(save_path, os.path.normpath(f["path"]))
+	fp = os.path.join(destination, os.path.normpath(f["path"]))
 
 	## Destination path
 	dest = os.path.join(destination, Name)

From 1ecd7a790ab76a04ffa5a527e15ccf91eaf79ab8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joel=20K=C3=A5berg?= <joel.kaberg@gmail.com>
Date: Fri, 1 Feb 2013 14:31:21 +0100
Subject: [PATCH 26/73] typo :(

---
 TorrentToMedia.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/TorrentToMedia.py b/TorrentToMedia.py
index 3c3a793d..07342601 100644
--- a/TorrentToMedia.py
+++ b/TorrentToMedia.py
@@ -70,7 +70,7 @@ else;
     print "INFO: Not assigned a label of either", Movie_Cat, "or", TV_Cat, ". Exiting"
 
 test = re.compile('^(.*)\.((zip|rar|7z|gz|bz|tar|arj)|(r[0-9]{1,3})|([0-9]{1,3}))$', re.IGNORECASE|re.UNICODE);
-if test.match(destination):
+if test.match(Directory):
     print "INFO: Found compressed archives, extracting"
     packed = 1
 	

From fcd27f1a9f3af23cfe73ac465b32cb49c825b736 Mon Sep 17 00:00:00 2001
From: clinton-hall <fock_wulf@hotmail.com>
Date: Fri, 1 Feb 2013 17:57:12 -0800
Subject: [PATCH 27/73] A lot happened here.

Added additional tests for movie files. Ensured follow-through of each test etc.
Changed formatting and generally tidied up.
---
 TorrentToMedia.py | 172 +++++++++++++++++++++++++---------------------
 1 file changed, 94 insertions(+), 78 deletions(-)

diff --git a/TorrentToMedia.py b/TorrentToMedia.py
index 07342601..4af75a7f 100644
--- a/TorrentToMedia.py
+++ b/TorrentToMedia.py
@@ -2,43 +2,51 @@
 
 import autoProcessMovie
 import autoProcessTV
-import sys, os, glob, ConfigParser
+import sys, os, ConfigParser
 from os import listdir
 from os.path import isfile, join
 
-##You can use the following parameters (UTORRENT):
-##
-##%F - Name of downloaded file (for single file torrents)
-##%D - Directory where files are saved
-##%N - Title of torrent
-##%P - Previous state of torrent
-##%L - Label
-##%T - Tracker
-##%M - Status message string (same as status column)
-##%I - hex encoded info-hash
-##%S - State of torrent
-##%K - kind of torrent (single|multi)
-##
-##Where State is one of:
-##
-##Error - 1
-##Checked - 2
-##Paused - 3
-##Super seeding - 4
-##Seeding - 5
-##Downloading - 6
-##Super seed [F] - 7
-##Seeding [F] - 8
-##Downloading [F] - 9
-##Queued seed - 10
-##Finished - 11
-##Queued - 12
-##Stopped - 13
 
-## We will pass in %D, %N, %L from uTorrent
-Directory = sys.argv[1]	## %D -- Example output: F:\path\to\dir\My.Series.S01E01.720p.HDTV.x264-2HD
-Name = sys.argv[2]		## %N -- Example output: My.Series.S01E01.720p.HDTV.x264-2HD
-Category = sys.argv[3]	## %L -- Example output: tvseries ## This is the label in uTorrent
+print "TorrentToMedia v 4.1"
+if len(sys.argv) == 4
+	##You can use the following parameters (UTORRENT):
+	##
+	##%F - Name of downloaded file (for single file torrents)
+	##%D - Directory where files are saved
+	##%N - Title of torrent
+	##%P - Previous state of torrent
+	##%L - Label
+	##%T - Tracker
+	##%M - Status message string (same as status column)
+	##%I - hex encoded info-hash
+	##%S - State of torrent
+	##%K - kind of torrent (single|multi)
+	##
+	##Where State is one of:
+	##
+	##Error - 1
+	##Checked - 2
+	##Paused - 3
+	##Super seeding - 4
+	##Seeding - 5
+	##Downloading - 6
+	##Super seed [F] - 7
+	##Seeding [F] - 8
+	##Downloading [F] - 9
+	##Queued seed - 10
+	##Finished - 11
+	##Queued - 12
+	##Stopped - 13
+	
+	## We will pass in %D, %N, %L from uTorrent
+	Directory = sys.argv[1]	## %D -- Example output: F:\path\to\dir\My.Series.S01E01.720p.HDTV.x264-2HD
+	Name = sys.argv[2]		## %N -- Example output: My.Series.S01E01.720p.HDTV.x264-2HD
+	Category = sys.argv[3]	## %L -- Example output: tvseries ## This is the label in uTorrent
+
+else:
+	##test for Transmission here.
+	print "currently only supports uTorrent. Exiting"
+	sys.exit(-1)
 
 status = 0
 packed = 0
@@ -46,12 +54,11 @@ packed = 0
 config = ConfigParser.ConfigParser()
 configFilename = os.path.join(os.path.dirname(sys.argv[0]), "TorrentToMedia.cfg")
 
-print "torrentToMedia v 4.1"
 print "INFO: Loading config from", configFilename
 
 if not os.path.isfile(configFilename):
-    print "ERROR: You need an autoProcessMovie.cfg file - did you rename and edit the .sample?"
-    sys.exit(-1)
+	print "ERROR: You need a TorrentToMedia.cfg file - did you rename and edit the .sample?"
+	sys.exit(-1)
 
 config.read(configFilename)
 
@@ -63,27 +70,34 @@ useLink = int(config.get("Torrent", "uselink"))
 extractionTool = config.get("Torrent", "extractiontool")
 
 if Category == Movie_Cat:
-    destination = Movie_dest
+	destination = Movie_dest
 elif Category == TV_Cat:
-    destination = TV_dest
+	destination = TV_dest
 else;
-    print "INFO: Not assigned a label of either", Movie_Cat, "or", TV_Cat, ". Exiting"
+	print "INFO: Not assigned a label of either", Movie_Cat, "or", TV_Cat, ". Exiting"
+	sys.exit(-1)
 
 test = re.compile('^(.*)\.((zip|rar|7z|gz|bz|tar|arj)|(r[0-9]{1,3})|([0-9]{1,3}))$', re.IGNORECASE|re.UNICODE);
+test2 = re.compile('^(.*)\.(mkv|avi|divx|xvid|mov|wmv)$', re.IGNORECASE|re.UNICODE);
 if test.match(Directory):
-    print "INFO: Found compressed archives, extracting"
-    packed = 1
-	
-## TODO: Check that files actully is .mkv / .avi etc, and not packed files or anything else
-if useLink == 1 and packed == 0: ## symlinks
+	print "INFO: Found compressed archives, extracting"
+	packed = 1
+## Check that files actully is .mkv / .avi etc, and not packed files or anything else
+elif test2.match(Directory):
+	print "INFO: Found media files, moving"
+else:
+	print "INFO: Didn't find any compressed archives or media files to process, exiting"
+	sys.exit(-1)
+
+if useLink == 0 and packed == 0: ## copy
 	print "INFO: Copying all files from", Directory, "to", destination
 	shutil.copytree(Directory, destination)
-	
-elif useLink == 0 and packed == 0: ## hardlink
+
+elif useLink == 1 and packed == 0: ## hardlink
 	print "INFO: Creating hard link from", Directory, "to", destination
-	shutil.copytree(src, dst, copy_function=os.link)
-		
-elif useLink == 0 and packed == 1: ## unpack
+	shutil.copytree(Directory, destination, copy_function=os.link)
+	
+elif packed == 1: ## unpack
 	## Using Windows?
 	if os.name == 'nt':
 		cmd_7zip = [extractionTool, 'x -y']
@@ -117,45 +131,47 @@ elif useLink == 0 and packed == 1: ## unpack
 			ext = os.path.splitext(f["path"])
 			if ext[1] in (".gz", ".bz2", ".lzma"):
 			## Check if this is a tar
-				if os.path.splitext(ext[0]) == ".tar":
+				if os.path.splitext(ext[0])[1] == ".tar":
 					cmd = EXTRACT_COMMANDS[".tar" + ext[1]]
+			else:
+				if ext[1] in EXTRACT_COMMANDS:
+					cmd = EXTRACT_COMMANDS[ext[1]]
 				else:
-					if ext[1] in EXTRACT_COMMANDS:
-						cmd = EXTRACT_COMMANDS[ext[1]]
-					else:
-						print("ERROR: Unknown file type: %s", ext[1])
-						continue
-	fp = os.path.join(destination, os.path.normpath(f["path"]))
+					print("ERROR: Unknown file type: %s", ext[1])
+					continue
+					
+			fp = os.path.join(destination, os.path.normpath(f["path"]))
 
-	## Destination path
-	dest = os.path.join(destination, Name)
+			## Destination path
+			dest = os.path.join(destination, Name)
 
-	## Create destionation folder
-       if not os.path.exists(dest):
-		try:
-			os.makedirs(dest)
-				except Exception, e:
+			## Create destionation folder
+			if not os.path.exists(dest):
+			try:
+				os.makedirs(dest)
+			except Exception, e:
 				print("ERROR: Not possible to create destination folder: %s", e)
-                   return
+				return
 
-	print("INFO: Extracting to %s", dest)
-	def on_extract_success(result):
-		print("INFO: Extraction was successful for %s")
+			print("INFO: Extracting to %s", dest)
 
-	def on_extract_failed(result):
-		print("ERROR: Extraction failed for %s")
 	
-	## Running..	
-	print("INFO: Extracting %s %s %s %s", cmd[0], cmd[1], fp, dest)
-	d = getProcessValue(cmd[0], cmd[1].split() + [str(fp)], {}, str(dest))
-	d.addCallback(on_extract_success)
-	d.addErrback(on_extract_failed)
-else:
-	print "INFO: Didn't find any compressed archives or media files to process, exiting"
+			## Running..	
+			print("INFO: Extracting %s %s %s %s", cmd[0], cmd[1], fp, dest)
+			d = getProcessValue(cmd[0], cmd[1].split() + [str(fp)], {}, str(dest))
+			d.addCallback(on_extract_success)
+			d.addErrback(on_extract_failed)
 
 status = int(status)
 ## Now we pass off to CouchPotato or SickBeard.
 if Category == Movie_Cat:  
-    autoProcessMovie.process(destination, Name, status)
+	autoProcessMovie.process(destination, Name, status)
 elif Category == TV_Cat:
-    autoProcessTV.processEpisode(destination, Name, status)
+	autoProcessTV.processEpisode(destination, Name, status)
+    
+def on_extract_success(result):
+	print("INFO: Extraction was successful for %s")
+	status = 0
+
+def on_extract_failed(result):
+	print("ERROR: Extraction failed for %s")

From 8e5798b025de4aea6ee283d449567f5c362e8fbc Mon Sep 17 00:00:00 2001
From: clinton-hall <fock_wulf@hotmail.com>
Date: Fri, 1 Feb 2013 18:08:24 -0800
Subject: [PATCH 28/73] added more comments

---
 README.md | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index f969f0bc..298e847d 100644
--- a/README.md
+++ b/README.md
@@ -303,13 +303,20 @@ If you are using NZBGet perform the following steps to configure postprocessing
 
 If you are using µTorrent perform the following steps to configure postprocessing for "uTorrentToCouchPotato":
 
-1. Rename the uTorrentToMedia.cfg.sample to uTorrentToMedia.cfg and edit the parameters:
+1. Rename the uTorrentToMedia.cfg.sample to autoProcessMedia.cfg and edit the parameters:
 
-	i.   .
+	i.   uselink = 1 to allow hard-linking of files
+		quicker and less harddisk used, if download and final location are on the same hard-disk
+		set uselink = 0 to use normal copy options. 
+		Windows systems and any movement across hard disks MUST use "0"
 
-	ii.  .
+	ii.  extractiontool (Windows Only)
+		'C:\\Program Files\\7-Zip\\7z.exe' (you will need to install 7-zip)
 
-	iii. .
+	iii. [CouchPotato] & [SickBeard]
+		Category = you must set the category that is passed from these applications
+		destination = you must set the absoluet path where you want movies extracted to.
+		this destination, for CouchPotato, must match the CouchPotato Renamers, "from" directory.
 
 
 2. In µTorrent go to preferences > Advanced > Run Program > Run this program when torrent finishes:

From 9f7bd7078063a20773ded772495bf8151de8dee3 Mon Sep 17 00:00:00 2001
From: clinton-hall <fock_wulf@hotmail.com>
Date: Fri, 1 Feb 2013 18:10:52 -0800
Subject: [PATCH 29/73] consistency

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 298e847d..521188f7 100644
--- a/README.md
+++ b/README.md
@@ -303,7 +303,7 @@ If you are using NZBGet perform the following steps to configure postprocessing
 
 If you are using µTorrent perform the following steps to configure postprocessing for "uTorrentToCouchPotato":
 
-1. Rename the uTorrentToMedia.cfg.sample to autoProcessMedia.cfg and edit the parameters:
+1. Rename the autoProcessMedia.cfg.sample to autoProcessMedia.cfg and edit the parameters:
 
 	i.   uselink = 1 to allow hard-linking of files
 		quicker and less harddisk used, if download and final location are on the same hard-disk

From 44bde704d4bab03acf370bafc3974c1525c462bd Mon Sep 17 00:00:00 2001
From: Clinton Hall <fock_wulf@hotmail.com>
Date: Sat, 2 Feb 2013 12:46:27 +1030
Subject: [PATCH 30/73] change name + make exe

---
 TorrentToMedia.py                                         | 0
 uTorrentToMedia.cfg.sample => autoProcessMedia.cfg.sample | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 TorrentToMedia.py
 rename uTorrentToMedia.cfg.sample => autoProcessMedia.cfg.sample (100%)

diff --git a/TorrentToMedia.py b/TorrentToMedia.py
old mode 100644
new mode 100755
diff --git a/uTorrentToMedia.cfg.sample b/autoProcessMedia.cfg.sample
similarity index 100%
rename from uTorrentToMedia.cfg.sample
rename to autoProcessMedia.cfg.sample

From 292cc52598a1924faee29be140934ff71f3a557e Mon Sep 17 00:00:00 2001
From: clinton-hall <fock_wulf@hotmail.com>
Date: Fri, 1 Feb 2013 18:19:57 -0800
Subject: [PATCH 31/73] autoProcessMedia

---
 TorrentToMedia.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/TorrentToMedia.py b/TorrentToMedia.py
index 4af75a7f..fc61638b 100755
--- a/TorrentToMedia.py
+++ b/TorrentToMedia.py
@@ -52,12 +52,12 @@ status = 0
 packed = 0
 
 config = ConfigParser.ConfigParser()
-configFilename = os.path.join(os.path.dirname(sys.argv[0]), "TorrentToMedia.cfg")
+configFilename = os.path.join(os.path.dirname(sys.argv[0]), "autoProcessMedia.cfg")
 
 print "INFO: Loading config from", configFilename
 
 if not os.path.isfile(configFilename):
-	print "ERROR: You need a TorrentToMedia.cfg file - did you rename and edit the .sample?"
+	print "ERROR: You need an autoProcessMedia.cfg file - did you rename and edit the .sample?"
 	sys.exit(-1)
 
 config.read(configFilename)

From 8875a2b808b78ad05db1eb1e4e8aa7e836833b34 Mon Sep 17 00:00:00 2001
From: clinton-hall <fock_wulf@hotmail.com>
Date: Fri, 1 Feb 2013 18:22:58 -0800
Subject: [PATCH 32/73] all in one

---
 autoProcessMedia.cfg.sample | 29 ++++++++++++++++++++---------
 1 file changed, 20 insertions(+), 9 deletions(-)

diff --git a/autoProcessMedia.cfg.sample b/autoProcessMedia.cfg.sample
index de919b85..7d92025d 100644
--- a/autoProcessMedia.cfg.sample
+++ b/autoProcessMedia.cfg.sample
@@ -1,18 +1,29 @@
 [CouchPotato]
+host = localhost
+port = 5050
+username = 
+password = 
+ssl = 0
+web_root =
+apikey = xxxxxxxx
+delay = 60
+method = renamer
 category = movies
 destination = /abs/path/to/complete/movies
 
 [SickBeard]
+host=localhost
+port=8081
+username=
+password=
+web_root=
+ssl=0
+watch_dir=
+failed_fork=0
 category = tv
 destination = /abs/path/to/complete/tv
 
-[uTorrent]
-copy = 1
-unrar = /abs/path/to/unrar
-unzip = /abs/path/to/unzip
-parcheck = /abs/path/to/par2
+[Torrent]
+uselink = 0
+extractiontool = 'C:\\Program Files\\7-Zip\\7z.exe'
 
-[Notes]
-copy = 0 will create hard links to your original download. 
-If moving to new hard-disk or network mount, use copy = 1
-copy = 0 is much faster and uses less disk space.

From 7aca279c2f38b9f2b57eabf40ebea3ae71ed6fa0 Mon Sep 17 00:00:00 2001
From: clinton-hall <fock_wulf@hotmail.com>
Date: Fri, 1 Feb 2013 18:25:56 -0800
Subject: [PATCH 33/73] minor changes

---
 README.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 521188f7..088d469d 100644
--- a/README.md
+++ b/README.md
@@ -27,7 +27,7 @@ Installation
 
 ### nzbToSickBeard
 
-1. Rename the file autoProcessTV.cfg.sample to autoProcessTV.cfg and fill in the appropriate 
+1. Rename the file autoProcessMedia.cfg.sample to autoProcessMedia.cfg and fill in the appropriate 
    fields as they apply to your installation.
 
 	host: Set this to "localhost" if SickBeard and your download client are on the same system. otherwise enter the ipaddress of the system SickBeard is insatlled on.
@@ -48,7 +48,7 @@ Installation
 
 ### nzbToCouchPotato
 
-1. Rename the file autoProcessMovie.cfg.sample to autoProcessMovie.cfg and fill in the appropriate 
+1. Rename the file autoProcessMedia.cfg.sample to autoProcessMedia.cfg and fill in the appropriate 
    fields as they apply to your installation.
 
 	host: Set this to "localhost" if CouchPotatoServer and your download client are on the same system. otherwise enter the ipaddress of the system SickBeard is insatlled on.
@@ -305,12 +305,12 @@ If you are using µTorrent perform the following steps to configure postprocessi
 
 1. Rename the autoProcessMedia.cfg.sample to autoProcessMedia.cfg and edit the parameters:
 
-	i.   uselink = 1 to allow hard-linking of files
+	i.   [Torrent} uselink = 1 to allow hard-linking of files
 		quicker and less harddisk used, if download and final location are on the same hard-disk
 		set uselink = 0 to use normal copy options. 
 		Windows systems and any movement across hard disks MUST use "0"
 
-	ii.  extractiontool (Windows Only)
+	ii.  [Torrent] extractiontool (Windows Only)
 		'C:\\Program Files\\7-Zip\\7z.exe' (you will need to install 7-zip)
 
 	iii. [CouchPotato] & [SickBeard]

From b662299555774e6fb0f75f01eaf61749ac6c283c Mon Sep 17 00:00:00 2001
From: clinton-hall <fock_wulf@hotmail.com>
Date: Fri, 1 Feb 2013 18:30:58 -0800
Subject: [PATCH 34/73] autoProcessMedia

---
 autoProcessMovie.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/autoProcessMovie.py b/autoProcessMovie.py
index 7a178c1b..6865620a 100644
--- a/autoProcessMovie.py
+++ b/autoProcessMovie.py
@@ -29,11 +29,11 @@ def process(dirName, nzbName=None, status=0):
 
     status = int(status)
     config = ConfigParser.ConfigParser()
-    configFilename = os.path.join(os.path.dirname(sys.argv[0]), "autoProcessMovie.cfg")
+    configFilename = os.path.join(os.path.dirname(sys.argv[0]), "autoProcessMedia.cfg")
     print "Loading config from", configFilename
     
     if not os.path.isfile(configFilename):
-        print "ERROR: You need an autoProcessMovie.cfg file - did you rename and edit the .sample?"
+        print "ERROR: You need an autoProcessMedia.cfg file - did you rename and edit the .sample?"
         sys.exit(-1)
     
     config.read(configFilename)

From d6671b7cec66fb1b60af2fc50955c5314721fc3f Mon Sep 17 00:00:00 2001
From: clinton-hall <fock_wulf@hotmail.com>
Date: Fri, 1 Feb 2013 18:31:44 -0800
Subject: [PATCH 35/73] autoProcessMedia

---
 autoProcessTV.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/autoProcessTV.py b/autoProcessTV.py
index 047fbfcc..335bd341 100644
--- a/autoProcessTV.py
+++ b/autoProcessTV.py
@@ -45,11 +45,11 @@ def processEpisode(dirName, nzbName=None, failed=False):
 
     status = int(failed)
     config = ConfigParser.ConfigParser()
-    configFilename = os.path.join(os.path.dirname(sys.argv[0]), "autoProcessTV.cfg")
+    configFilename = os.path.join(os.path.dirname(sys.argv[0]), "autoProcessMedia.cfg")
     print "Loading config from", configFilename
     
     if not os.path.isfile(configFilename):
-        print "ERROR: You need an autoProcessTV.cfg file - did you rename and edit the .sample?"
+        print "ERROR: You need an autoProcessMedia.cfg file - did you rename and edit the .sample?"
         sys.exit(-1)
     
     try:

From 0d8ed14b13979bc355a4290c767dd8e82b45226e Mon Sep 17 00:00:00 2001
From: Clinton Hall <fock_wulf@hotmail.com>
Date: Sat, 2 Feb 2013 13:05:47 +1030
Subject: [PATCH 36/73] remove unused files

---
 TorrentToMedia.cfg.sample   |  16 -----
 autoProcessMovie.cfg.sample |  22 -------
 autoProcessTV.cfg.sample    |   9 ---
 uTorrentToMedia.py          | 113 ------------------------------------
 4 files changed, 160 deletions(-)
 delete mode 100644 TorrentToMedia.cfg.sample
 delete mode 100644 autoProcessMovie.cfg.sample
 delete mode 100644 autoProcessTV.cfg.sample
 delete mode 100755 uTorrentToMedia.py

diff --git a/TorrentToMedia.cfg.sample b/TorrentToMedia.cfg.sample
deleted file mode 100644
index e1e4c646..00000000
--- a/TorrentToMedia.cfg.sample
+++ /dev/null
@@ -1,16 +0,0 @@
-[CouchPotato]
-category = movies
-destination = /abs/path/to/complete/movies
-
-[SickBeard]
-category = tv
-destination = /abs/path/to/complete/tv
-
-[Torrent]
-uselink = 0
-extractiontool = 'C:\\Program Files\\7-Zip\\7z.exe'
-
-[Notes]
-copy = 0 will create hard links to your original download. 
-If moving to new hard-disk or network mount, use copy = 1
-copy = 0 is much faster and uses less disk space.
diff --git a/autoProcessMovie.cfg.sample b/autoProcessMovie.cfg.sample
deleted file mode 100644
index 563f2160..00000000
--- a/autoProcessMovie.cfg.sample
+++ /dev/null
@@ -1,22 +0,0 @@
-[CouchPotato]
-host = localhost
-port = 5050
-username = 
-password = 
-ssl = 0
-web_root =
-apikey = xxxxxxxx
-delay = 60
-method = renamer
-
-[Comments]
-host = (ip address for CouchPotato Server. Use "localhost" if SABnzbd and CPS on same system)
-port = (port for CouchPotato Server)
-username = (username if set for CouchPotato Server)
-password = (password if set for CouchPotato Server)
-ssl = 0 (set to 1 if you want to use ssl. -untested. Default is 0)
-web_root = (set URL base if needed.)
-apikey = (apikey for CouchPotato Server... Required) 
-delay = (set delay in seconds before sending api call. Minimum 60)
-method = "renamer" or "manage". renamer is the default. Read the help file.
- 
diff --git a/autoProcessTV.cfg.sample b/autoProcessTV.cfg.sample
deleted file mode 100644
index 84d2fe8f..00000000
--- a/autoProcessTV.cfg.sample
+++ /dev/null
@@ -1,9 +0,0 @@
-[SickBeard]
-host=localhost
-port=8081
-username=
-password=
-web_root=
-ssl=0
-watch_dir=
-failed_fork=0
diff --git a/uTorrentToMedia.py b/uTorrentToMedia.py
deleted file mode 100755
index 0fabb5e8..00000000
--- a/uTorrentToMedia.py
+++ /dev/null
@@ -1,113 +0,0 @@
-#!/usr/bin/env python
-
-import sys
-import autoProcessMovie
-import autoProcessTV
-import ConfigParser
-import os
-import glob
-
-##You can use the following parameters:
-##
-##%F - Name of downloaded file (for single file torrents)
-##%D - Directory where files are saved
-##%N - Title of torrent
-##%P - Previous state of torrent
-##%L - Label
-##%T - Tracker
-##%M - Status message string (same as status column)
-##%I - hex encoded info-hash
-##%S - State of torrent
-##%K - kind of torrent (single|multi)
-##
-##Where State is one of:
-##
-##Error - 1
-##Checked - 2
-##Paused - 3
-##Super seeding - 4
-##Seeding - 5
-##Downloading - 6
-##Super seed [F] - 7
-##Seeding [F] - 8
-##Downloading [F] - 9
-##Queued seed - 10
-##Finished - 11
-##Queued - 12
-##Stopped - 13
-
-## We will pass in %D, %N, %L
-Directory = sys.argv[1]
-Name = sys.argv[2]
-Categoty = sys.argv[3]
-print "uTorrentToMedia v 4.0"
-
-config = ConfigParser.ConfigParser()
-configFilename = os.path.join(os.path.dirname(sys.argv[0]), "uTorrentToMedia.cfg")
-
-print "Loading config from", configFilename
-
-if not os.path.isfile(configFilename):
-    print "ERROR: You need a uTorrentToMedia.cfg file - did you rename and edit the .sample?"
-    sys.exit(-1)
-
-config.read(configFilename)
-
-Movie_Cat = config.get("CouchPotato", "category")
-TV_Cat = config.get("SickBeard", "category")
-Movie_dest = config.get("CouchPotato", "destination")
-TV_dest = config.get("CouchPotato", "destination")
-Use_cp = int(config.get("uTorrent", "copy"))
-unrar = config.get("uTorrent", "unrar")
-unzip = config.get("uTorrent", "unzip")
-parcheck = config.get("uTorrent", "parcheck")
-
-if Category == Movie_Cat:
-    destination = Movie_dest
-elif Category == TV_Cat:
-    destination = TV_dest
-else;
-    print "Not assigned a label of either", Movie_Cat, "or", TV_Cat, ". Exiting"
-
-if Use_cp:
-    print "copying all files from", Directory, "to", destination
-    shutil.copytree(Directory, destination)
-else:
-    print "creating hard link from", Directory, "to", destination
-    shutil.copytree(src, dst, copy_function=os.link)
-
-status = 0
-rared = 0
-par2 = 0
-ziptest = 0
-test = os.path.join(destination, '*.rar')
-if glob.glob(test):
-    print "rar files detected"
-    rared = 1
-    #status = 1
-test = os.path.join(destination, '*.par2')
-if  glob.glob(test):
-    print "par2 files detected"
-    par2 = 1
-test = os.path.join(destination, '*.zip')
-if  glob.glob(test):
-    print "zip files detected"
-    ziped = 1
-    #status = 1
-if ziped:
-    #unzip here and reset status to 0 is successful
-    #unzip
-if par2:
-    #parcheck here
-    #parcheck
-if rared:
-    #unrar here and reset status to 0 if successful
-    #unrar
-status = 0
-
-status = int(status)
-##Now we pass off to CouchPotato or SickBeard.
-if Category == Movie_Cat:  
-    autoProcessMovie.process(destination, Name, status)
-elif Category == TV_Cat:
-    autoProcessTV.processEpisode(destination, Name, status)

From 3d97ff2eb4c529abf105dc1531c4eb0fcea1d6e0 Mon Sep 17 00:00:00 2001
From: clinton-hall <fock_wulf@hotmail.com>
Date: Fri, 1 Feb 2013 18:55:07 -0800
Subject: [PATCH 37/73] correct : for if statements

---
 TorrentToMedia.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/TorrentToMedia.py b/TorrentToMedia.py
index fc61638b..0384eb99 100755
--- a/TorrentToMedia.py
+++ b/TorrentToMedia.py
@@ -8,7 +8,7 @@ from os.path import isfile, join
 
 
 print "TorrentToMedia v 4.1"
-if len(sys.argv) == 4
+if len(sys.argv) == 4:
 	##You can use the following parameters (UTORRENT):
 	##
 	##%F - Name of downloaded file (for single file torrents)
@@ -73,7 +73,7 @@ if Category == Movie_Cat:
 	destination = Movie_dest
 elif Category == TV_Cat:
 	destination = TV_dest
-else;
+else:
 	print "INFO: Not assigned a label of either", Movie_Cat, "or", TV_Cat, ". Exiting"
 	sys.exit(-1)
 

From 27770a3556b1b565c767e7f6c45fcac3e4540032 Mon Sep 17 00:00:00 2001
From: clinton-hall <fock_wulf@hotmail.com>
Date: Fri, 1 Feb 2013 22:55:03 -0800
Subject: [PATCH 38/73] Added more comments regarding recent changes

---
 README.md | 58 ++++++++++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 49 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index 088d469d..4e334ce7 100644
--- a/README.md
+++ b/README.md
@@ -18,17 +18,19 @@ The renamer of CouchPotatoServer caused broken downloads by interfering with NZB
 Failed download handling for SickBeard is available by using the development branch from fork [SickBeard-failed](https://github.com/Tolstyak/Sick-Beard.git "SickBeard-failed")
 To use this feature, in autoProcessTV.cfg set the parameter "failed_fork=1". Default is 0 and will work with standard version of SickBeard and just ignores failed downloads.
 
+Torrent support has been added with the assistance of [jkaberg](https://github.com/jkaberg "jkaberg").
+
 Installation
 ------------
 ### General
 
 1. Put all files in a directory wherever you want to keep them (eg. /scripts/ in the home directory of your nzb client) 
-   and change the permission accordingly so the nzb client can access to this files. 
+   and change the permission accordingly so the nzb client can access these files. 
 
 ### nzbToSickBeard
 
 1. Rename the file autoProcessMedia.cfg.sample to autoProcessMedia.cfg and fill in the appropriate 
-   fields as they apply to your installation.
+   fields in [SickBeard] as they apply to your installation.
 
 	host: Set this to "localhost" if SickBeard and your download client are on the same system. otherwise enter the ipaddress of the system SickBeard is insatlled on.
 	
@@ -45,11 +47,15 @@ Installation
 	watch_dir: Set this only if SickBeard is on another PC to your download client and the directory structure is different.(optional)
 	
 	failed_fork: Set this to "1" if you are using the failed fork branch. Otherwise set this to "0". (optional)
+	
+2. If you have added .py to your PATHEXT (in windows) or you have given nzbToSickBeard.py executable permissions, or you are using the compiled executables you can manually call this process outside of your nzb client for testing your configuration or in case a postprocessing event failed.  
+	To do this, execute nzbToSickBeard.py e.g. double-click in Windows or via ssh/shell issue the following command: 
+   	$ ./nzbToSickBeard.py when in the directory where nzbToSickBeard.py is located.
 
 ### nzbToCouchPotato
 
 1. Rename the file autoProcessMedia.cfg.sample to autoProcessMedia.cfg and fill in the appropriate 
-   fields as they apply to your installation.
+   fields in [CouchPotato] as they apply to your installation.
 
 	host: Set this to "localhost" if CouchPotatoServer and your download client are on the same system. otherwise enter the ipaddress of the system SickBeard is insatlled on.
 	
@@ -73,9 +79,13 @@ Installation
 	
 	Method "manage" will make CouchPotatoServer update the list of managed movies if manager is enabled but renamer is not enabled.
 	In this case your nzb client must extract the files directly to your final movies folder (as configured in CouchPotatoServer manage settings) and Manage must be enabled.
+	
+	delete_failed: Set this to "1" if you want this script to delete all files and folders related to a download that has failed.
+	setting this to "0" will not delete any files.
+	note. this is not given as an option for SickBeard since the failed_fork in SickBeard supports this feature.
 
-3. If you have added .py to your PATHEXT (in windows) or you have given nzbToCouchPotato.py executable permissions, or you are using the compiled executables you can manually call this process outside of your nzb client for testing your configuration or in case a postprocessing event failed.  
-	To do this, execute nzbToCouchPotato.py e.g. via ssl issue the following command: 
+2. If you have added .py to your PATHEXT (in windows) or you have given nzbToCouchPotato.py executable permissions, or you are using the compiled executables you can manually call this process outside of your nzb client for testing your configuration or in case a postprocessing event failed.  
+	To do this, execute nzbToCouchPotato.py e.g. double-click in Windows or via ssh/shell issue the following command: 
    	$ ./nzbToCouchPotato.py when in the directory where nzbToCouchPotato.py is located.
 
 ### SickBeard
@@ -174,7 +184,7 @@ If you are using SABnzbd perform the following steps to configure postprocessing
    > Do post-processing and run the user script even if nothing has been downloaded. 
    This is useful in combination with tools like SickBeard, for which running the script on an empty or failed download is a trigger to try an alternative NZB. 
    Note that the "Status" parameter for the script will be -1. [0.7.5+ only]
-   
+
 ### NZBGet
 
 If you are using NZBGet perform the following steps to configure postprocessing for "nzbToCouchPotato":
@@ -301,7 +311,7 @@ If you are using NZBGet perform the following steps to configure postprocessing
 
 ### µTorrent
 
-If you are using µTorrent perform the following steps to configure postprocessing for "uTorrentToCouchPotato":
+If you are using µTorrent, perform the following steps to configure postprocessing for "TorrentToMedia":
 
 1. Rename the autoProcessMedia.cfg.sample to autoProcessMedia.cfg and edit the parameters:
 
@@ -317,12 +327,42 @@ If you are using µTorrent perform the following steps to configure postprocessi
 		Category = you must set the category that is passed from these applications
 		destination = you must set the absoluet path where you want movies extracted to.
 		this destination, for CouchPotato, must match the CouchPotato Renamers, "from" directory.
+		
+	iv.  Configure the remaining settings as describes in nzbToCouchPotato and nzbToSickBeard above.
 
 
 2. In µTorrent go to preferences > Advanced > Run Program > Run this program when torrent finishes:
  
 	i.   Set full path to script, pass paramaters as "%D" "%N" "%L" and then output to a desired log.
 	
-		/usr/local/utorrent/nzbToMedia/uTorrentToMedia.py "%D" "%N" "%L" >> /usr/local/utorrent/log.txt.
+		/usr/local/utorrent/nzbToMedia/TorrentToMedia.py "%D" "%N" "%L" >> /usr/local/utorrent/log.txt.
+	
+### Transmission  ###TBA.
+
+If you are using Transmission, perform the following steps to configure postprocessing for "TorrentToMedia":
+
+1. Rename the autoProcessMedia.cfg.sample to autoProcessMedia.cfg and edit the parameters:
+
+	i.   [Torrent} uselink = 1 to allow hard-linking of files
+		quicker and less harddisk used, if download and final location are on the same hard-disk
+		set uselink = 0 to use normal copy options. 
+		Windows systems and any movement across hard disks MUST use "0"
+
+	ii.  [Torrent] extractiontool (Windows Only)
+		'C:\\Program Files\\7-Zip\\7z.exe' (you will need to install 7-zip)
+
+	iii. [CouchPotato] & [SickBeard]
+		Category = you must set the category that is passed from these applications
+		destination = you must set the absoluet path where you want movies extracted to.
+		this destination, for CouchPotato, must match the CouchPotato Renamers, "from" directory.
+		
+	iv.  Configure the remaining settings as describes in nzbToCouchPotato and nzbToSickBeard above.
+
+
+2. In Transmission go to 
+ 
+	i.   Set full path to script.
+	
+		/usr/local/utorrent/nzbToMedia/TorrentToMedia.py.
+
 
-	ii.  

From f7d0e902a02fa6b1fb06870a1bfcbf8074c5ae46 Mon Sep 17 00:00:00 2001
From: clinton-hall <fock_wulf@hotmail.com>
Date: Fri, 1 Feb 2013 22:55:56 -0800
Subject: [PATCH 39/73] V4.1

---
 nzbToCouchPotato.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nzbToCouchPotato.py b/nzbToCouchPotato.py
index 24d04f78..d43cb7aa 100755
--- a/nzbToCouchPotato.py
+++ b/nzbToCouchPotato.py
@@ -3,7 +3,7 @@
 import sys
 import autoProcessMovie 
 
-print "nzbToCouchPotato V4.0"
+print "nzbToCouchPotato V4.1"
 
 # SABnzbd
 if len(sys.argv) == 8:

From 818af22cf743170b063a8fc1d5825f4efa02cb58 Mon Sep 17 00:00:00 2001
From: clinton-hall <fock_wulf@hotmail.com>
Date: Fri, 1 Feb 2013 22:56:27 -0800
Subject: [PATCH 40/73] V4.1

---
 nzbToSickBeard.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nzbToSickBeard.py b/nzbToSickBeard.py
index e2874426..635b36a2 100755
--- a/nzbToSickBeard.py
+++ b/nzbToSickBeard.py
@@ -25,7 +25,7 @@
 import sys
 import autoProcessTV
 
-print "nzbToSickBeard V4.0"
+print "nzbToSickBeard V4.1"
 
 # SABnzbd
 if len(sys.argv) == 8:

From aea9a16435fb007c606209c2bfaf402c85ae377e Mon Sep 17 00:00:00 2001
From: clinton-hall <fock_wulf@hotmail.com>
Date: Fri, 1 Feb 2013 22:56:54 -0800
Subject: [PATCH 41/73] V4.1

---
 TorrentToMedia.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/TorrentToMedia.py b/TorrentToMedia.py
index 0384eb99..7139a56b 100755
--- a/TorrentToMedia.py
+++ b/TorrentToMedia.py
@@ -7,7 +7,7 @@ from os import listdir
 from os.path import isfile, join
 
 
-print "TorrentToMedia v 4.1"
+print "TorrentToMedia V4.1"
 if len(sys.argv) == 4:
 	##You can use the following parameters (UTORRENT):
 	##

From 9ef41e1bb1e6a1af54a2a751d40475bb9b4c8b37 Mon Sep 17 00:00:00 2001
From: clinton-hall <fock_wulf@hotmail.com>
Date: Fri, 1 Feb 2013 23:01:05 -0800
Subject: [PATCH 42/73] V4.1

---
 changelog.txt | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/changelog.txt b/changelog.txt
index d48b069c..843fff12 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,5 +1,13 @@
 Change_LOG / History
 
+V4.1 02/02/2013
+
+Added Torrent Support (µTorrent and Transmission).
+Added manual run option for nzbToSickBeard.
+Changed nzbGet script to use move not copy and remove.
+Merged all .cfg scripts into one (autoProcessMedia.cfg).
+Made all scripts execitable (755) on github.
+
 V4.0 21/12/2012
 
 Changed name from nzbToCouchPotato to nzbToMedia; Now supports mltiple post-processing from two nzb download clients.

From e5065766398234abcbe4ad95dde05bf66f5aea25 Mon Sep 17 00:00:00 2001
From: clinton-hall <fock_wulf@hotmail.com>
Date: Fri, 1 Feb 2013 23:02:56 -0800
Subject: [PATCH 43/73] V4.1

---
 changelog.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/changelog.txt b/changelog.txt
index 843fff12..b3fc4013 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -7,6 +7,8 @@ Added manual run option for nzbToSickBeard.
 Changed nzbGet script to use move not copy and remove.
 Merged all .cfg scripts into one (autoProcessMedia.cfg).
 Made all scripts execitable (755) on github.
+Added category limits for email support in nzbget.
+Fixed issue with replacements (of paths) in email messages in nzbget.
 
 V4.0 21/12/2012
 

From 93b9b98f057c4587d80a7aa655b26b74a07c90bc Mon Sep 17 00:00:00 2001
From: clinton-hall <fock_wulf@hotmail.com>
Date: Fri, 1 Feb 2013 23:04:56 -0800
Subject: [PATCH 44/73] added note on nzbToSickBeard manual call.

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 4e334ce7..33a6dad7 100644
--- a/README.md
+++ b/README.md
@@ -51,6 +51,7 @@ Installation
 2. If you have added .py to your PATHEXT (in windows) or you have given nzbToSickBeard.py executable permissions, or you are using the compiled executables you can manually call this process outside of your nzb client for testing your configuration or in case a postprocessing event failed.  
 	To do this, execute nzbToSickBeard.py e.g. double-click in Windows or via ssh/shell issue the following command: 
    	$ ./nzbToSickBeard.py when in the directory where nzbToSickBeard.py is located.
+	note: you must have watch_dir set to use nzbToSickBeard for a manual scan.
 
 ### nzbToCouchPotato
 

From f10fec0f8b54712c969dc6224cf3ce0a684183f7 Mon Sep 17 00:00:00 2001
From: clinton-hall <fock_wulf@hotmail.com>
Date: Fri, 1 Feb 2013 23:24:08 -0800
Subject: [PATCH 45/73] added delete_failed option

---
 autoProcessMedia.cfg.sample | 1 +
 1 file changed, 1 insertion(+)

diff --git a/autoProcessMedia.cfg.sample b/autoProcessMedia.cfg.sample
index 7d92025d..c92230f3 100644
--- a/autoProcessMedia.cfg.sample
+++ b/autoProcessMedia.cfg.sample
@@ -8,6 +8,7 @@ web_root =
 apikey = xxxxxxxx
 delay = 60
 method = renamer
+delete_failed = 0
 category = movies
 destination = /abs/path/to/complete/movies
 

From 4e0657d3503ad98837cb6855a678d362d38af3b4 Mon Sep 17 00:00:00 2001
From: clinton-hall <fock_wulf@hotmail.com>
Date: Fri, 1 Feb 2013 23:26:29 -0800
Subject: [PATCH 46/73] added delete_failed option

---
 autoProcessMovie.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/autoProcessMovie.py b/autoProcessMovie.py
index 6865620a..a054f530 100644
--- a/autoProcessMovie.py
+++ b/autoProcessMovie.py
@@ -1,6 +1,7 @@
 import sys
 import urllib
 import os.path
+import shutil
 import ConfigParser
 import time
 import json 
@@ -45,6 +46,7 @@ def process(dirName, nzbName=None, status=0):
     apikey = config.get("CouchPotato", "apikey")
     delay = float(config.get("CouchPotato", "delay"))
     method = config.get("CouchPotato", "method")
+    delete_failed = int(config.get("CouchPotato", "delete_failed"))
 
     try:
         ssl = int(config.get("CouchPotato", "ssl"))
@@ -146,3 +148,6 @@ def process(dirName, nzbName=None, status=0):
             print line
     
         print "movie", movid, "set to try the next best release on CouchPotatoServer"
+        if delete_failed:
+            print "Deleting failed files and folder", dirName
+            shutil.rmtree(dirName)

From 51057395b096e3a4fbff58673c174e79ef2d8e7b Mon Sep 17 00:00:00 2001
From: clinton-hall <fock_wulf@hotmail.com>
Date: Fri, 1 Feb 2013 23:27:56 -0800
Subject: [PATCH 47/73] added second = in if statement

---
 autoProcessTV.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/autoProcessTV.py b/autoProcessTV.py
index 335bd341..ca7e05d5 100644
--- a/autoProcessTV.py
+++ b/autoProcessTV.py
@@ -86,7 +86,7 @@ def processEpisode(dirName, nzbName=None, failed=False):
         failed_fork = 0
     
     #allows manual call of postprocess script if we have specified a watch_dir. Check that here.
-    if nzbName = "Manual Run" and watch_dir == "":
+    if nzbName == "Manual Run" and watch_dir == "":
         print "ERROR: In order to run this script manually you must specify a watch_dir in autoProcessTV.cfg"
         sys.exit(-1)
     #allows us to specify the default watch directory and call the postproecssing on another PC with different directory structure.

From cc08553428ba3f6d37ede1c25bacfbe621c81a44 Mon Sep 17 00:00:00 2001
From: clinton-hall <fock_wulf@hotmail.com>
Date: Fri, 1 Feb 2013 23:30:11 -0800
Subject: [PATCH 48/73] added email categories

---
 .../9.0/webui/nzbget-postprocess.conf                     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/nzbget-postprocessing-files/9.0/webui/nzbget-postprocess.conf b/nzbget-postprocessing-files/9.0/webui/nzbget-postprocess.conf
index 8679de67..ee3045b4 100644
--- a/nzbget-postprocessing-files/9.0/webui/nzbget-postprocess.conf
+++ b/nzbget-postprocessing-files/9.0/webui/nzbget-postprocess.conf
@@ -124,11 +124,11 @@ DestDir=
 # be sent via email. 
 # This uses sendEmail as authored by Brandon Zehm <caspian@dotconf.net>
 
-# Specify if you want emails to be sent for successful downloads (yes, no).
-Email_successful=yes
+# List Categories for successful download email, default 'tv movies'
+Email_successful='tv movies'
 
-# Specify if you want emails to be sent for failed downloads (yes, no).
-Email_failed=yes
+# List Categories for failed download email, default 'tv movies'
+Email_failed='tv movies'
 
 # Set the full path and file name for sendEmail application.
 sendEmail=/usr/local/nzbget/var/sendEmail/sendEmail

From 29965538a4ca57607664de137dce33228f8f4a86 Mon Sep 17 00:00:00 2001
From: clinton-hall <fock_wulf@hotmail.com>
Date: Fri, 1 Feb 2013 23:36:23 -0800
Subject: [PATCH 49/73] changed cp to mv. Added email category option

merged former dev branch into torrent branch...
Auto merge not possible.
---
 .../9.0/bin/nzbget-postprocess.sh             | 25 +++++++------------
 1 file changed, 9 insertions(+), 16 deletions(-)

diff --git a/nzbget-postprocessing-files/9.0/bin/nzbget-postprocess.sh b/nzbget-postprocessing-files/9.0/bin/nzbget-postprocess.sh
index f219b4ff..7df62cfc 100755
--- a/nzbget-postprocessing-files/9.0/bin/nzbget-postprocess.sh
+++ b/nzbget-postprocessing-files/9.0/bin/nzbget-postprocess.sh
@@ -184,7 +184,8 @@ do_exit() {
 	replaceVarBy "${REPLACEDRESULT}" "<cat>" "${NZBPP_CATEGORY}"
 	replaceVarBy "${REPLACEDRESULT}" "<script>" "${script}"
 	Email_Message="${REPLACEDRESULT}"
-	if [ "$Email_successful" = "yes" -a "$nzbStatus" = 0 ]; then
+	for item in $Email_successful; do
+	if [ "${NZBPP_CATEGORY}" = "$item" -a "$nzbStatus" = 0 ]; then
 		User=""
 		if [ -n "$Email_User" -a -n "$Email_Pass" ]; then User="-xu $Email_User -xp $Email_Pass" ; fi
 		replaceVarBy "${Email_Subject}" "<status>" "completed"
@@ -192,8 +193,9 @@ do_exit() {
 		replaceVarBy "${Email_Message}" "<status>" "completed"
 		Email_Message="${REPLACEDRESULT}"
 		$sendEmail -f "$Email_From" -t "$Email_To" -s "$Email_Server" $User -u "$Email_Subject" -m "$Email_Message" 
-	fi
-	if [ "$Email_failed" = "yes" -a "$nzbStatus" != 0 ]; then
+	fi; done
+	for item in $Email_failed; do
+	if [ "${NZBPP_CATEGORY}" = "$item" -a "$nzbStatus" != 0 ]; then
 		User=""
 		if [ -n "$Email_User" -a -n "$Email_Pass" ]; then User="-xu $Email_User -xp $Email_Pass" ; fi
 		replaceVarBy "${Email_Subject}" "<status>" "failed"
@@ -201,7 +203,7 @@ do_exit() {
 		replaceVarBy "${Email_Message}" "<status>" "failed"
 		Email_Message="${REPLACEDRESULT}"
 		$sendEmail -f "$Email_From" -t "$Email_To" -s "$Email_Server" $User -u "$Email_Subject" -m "$Email_Message" 
-	fi
+	fi; done
 	exit $1
 }
 
@@ -445,14 +447,11 @@ fi
 # Test for category and ensure the passed directory exists as a directory.
 if [ "$NZBPP_CATEGORY" = "$SickBeardCategory" -a -d "$TvDownloadDir" ]; then
         echo "[INFO] Post-Process: Moving TV shows to $TvDownloadDir"
-        cp -R "$NZBPP_DIRECTORY" "$TvDownloadDir"
+        mv "$NZBPP_DIRECTORY" "$TvDownloadDir"
         if [ "$?" -ne 0 ]; then
            echo "[ERROR] Post-Process: Moving to $TvDownloadDir"
            exit $POSTPROCESS_ERROR
         else
-           rm -fr *
-           cd ..
-           rmdir "$NZBPP_DIRECTORY"
            NZBPP_DIRECTORY="$TvDownloadDir"
 	   cd "$NZBPP_DIRECTORY"
         fi
@@ -460,14 +459,11 @@ fi
 # Test for category and ensure the passed directory exists as a directory.
 if [ "$NZBPP_CATEGORY" = "$CouchPotatoCategory" -a -d "$MoviesDownloadDir" ]; then
         echo "[INFO] Post-Process: Moving Movies to $MoviesDownloadDir" 
-        cp -R "$NZBPP_DIRECTORY" "$MoviesDownloadDir" 
+        mv "$NZBPP_DIRECTORY" "$MoviesDownloadDir" 
         if [ "$?" -ne 0 ]; then
            echo "[ERROR] Post-Process: Moving to $MoviesDownloadDir"
            exit $POSTPROCESS_ERROR
         else
-           rm -fr *
-           cd ..
-           rmdir "$NZBPP_DIRECTORY"
            NZBPP_DIRECTORY="$MoviesDownloadDir"
 	   cd "$NZBPP_DIRECTORY"
         fi
@@ -475,14 +471,11 @@ fi
 # Test for category and ensure the passed directory exists as a directory.
 if [ "$NZBPP_CATEGORY" = "$CustomCategory" -a -d "$CustomDownloadDir" ]; then
         echo "[INFO] Post-Process: Moving $CustomCategory to $CustomDownloadDir" 
-        cp -R "$NZBPP_DIRECTORY" "$CustomDownloadDir" 
+        mv "$NZBPP_DIRECTORY" "$CustomDownloadDir" 
         if [ "$?" -ne 0 ]; then
            echo "[ERROR] Post-Process: Moving to $CustomDownloadDir"
            exit $POSTPROCESS_ERROR
         else
-           rm -fr *
-           cd ..
-           rmdir "$NZBPP_DIRECTORY"
            NZBPP_DIRECTORY="$CustomDownloadDir"
 	   cd "$NZBPP_DIRECTORY"
         fi

From 4122ff3876b046a1c95272c903212495d79b8f0b Mon Sep 17 00:00:00 2001
From: clinton-hall <fock_wulf@hotmail.com>
Date: Sat, 2 Feb 2013 00:33:07 -0800
Subject: [PATCH 50/73] added Transmission pass in.

Not entirely sure about this one.
Also added blackhole-subdirectory test.
---
 TorrentToMedia.py | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/TorrentToMedia.py b/TorrentToMedia.py
index 7139a56b..b54a230c 100755
--- a/TorrentToMedia.py
+++ b/TorrentToMedia.py
@@ -39,15 +39,31 @@ if len(sys.argv) == 4:
 	##Stopped - 13
 	
 	## We will pass in %D, %N, %L from uTorrent
+	print "script called from utorrent"
 	Directory = sys.argv[1]	## %D -- Example output: F:\path\to\dir\My.Series.S01E01.720p.HDTV.x264-2HD
 	Name = sys.argv[2]		## %N -- Example output: My.Series.S01E01.720p.HDTV.x264-2HD
 	Category = sys.argv[3]	## %L -- Example output: tvseries ## This is the label in uTorrent
 
-else:
+else len(sys.argv) == 7:
 	##test for Transmission here.
-	print "currently only supports uTorrent. Exiting"
+	#TR_APP_VERSION
+	#TR_TIME_LOCALTIME
+	#TR_TORRENT_DIR
+	#TR_TORRENT_HASH
+	#TR_TORRENT_ID
+	#TR_TORRENT_NAME
+	print "script called from Transmission"
+	Directory = sys.argv[3]
+	Name = sys.argv[6]
+	Category = os.path.basename(os.path.normpath(Directory)) #We assume the last directory is the category for now.
+
+else:
+	print "The number of arguments passed is", len(sys.argv), "unable to determin the arguments to use, Exiting
 	sys.exit(-1)
 
+if not Category:
+	Category = os.path.basename(os.path.normpath(Directory)) #Test for blackhole sub-directory.
+
 status = 0
 packed = 0
 

From 649d9dcd4d708f3c1664ac7e09d9f1761ed6bf91 Mon Sep 17 00:00:00 2001
From: clinton-hall <fock_wulf@hotmail.com>
Date: Sat, 2 Feb 2013 00:41:20 -0800
Subject: [PATCH 51/73] add instructions for transmission

---
 README.md | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 33a6dad7..d25f6986 100644
--- a/README.md
+++ b/README.md
@@ -326,6 +326,7 @@ If you are using µTorrent, perform the following steps to configure postprocess
 
 	iii. [CouchPotato] & [SickBeard]
 		Category = you must set the category that is passed from these applications
+		If using "blackhole-subdirectory", this is the last folder name used in the blackhole.
 		destination = you must set the absoluet path where you want movies extracted to.
 		this destination, for CouchPotato, must match the CouchPotato Renamers, "from" directory.
 		
@@ -354,15 +355,17 @@ If you are using Transmission, perform the following steps to configure postproc
 
 	iii. [CouchPotato] & [SickBeard]
 		Category = you must set the category that is passed from these applications
+		This is the last folder name in the directory path passed as directory for completed downloads.
+		If using "blackhole-subdirectory", this is the last folder name used in the blackhole.
 		destination = you must set the absoluet path where you want movies extracted to.
 		this destination, for CouchPotato, must match the CouchPotato Renamers, "from" directory.
 		
 	iv.  Configure the remaining settings as describes in nzbToCouchPotato and nzbToSickBeard above.
 
 
-2. In Transmission go to 
+2. In Transmission go to Preferences->Transfers->Management
  
-	i.   Set full path to script.
+	i.   Select the script to run on download complete.
 	
 		/usr/local/utorrent/nzbToMedia/TorrentToMedia.py.
 

From 887b0672274fef301ca6e9fb037a2528b3f855a7 Mon Sep 17 00:00:00 2001
From: clinton-hall <fock_wulf@hotmail.com>
Date: Sun, 3 Feb 2013 21:17:14 -0800
Subject: [PATCH 52/73] Correct pass in of transmission variables

---
 TorrentToMedia.py | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/TorrentToMedia.py b/TorrentToMedia.py
index b54a230c..08b9f42b 100755
--- a/TorrentToMedia.py
+++ b/TorrentToMedia.py
@@ -44,7 +44,11 @@ if len(sys.argv) == 4:
 	Name = sys.argv[2]		## %N -- Example output: My.Series.S01E01.720p.HDTV.x264-2HD
 	Category = sys.argv[3]	## %L -- Example output: tvseries ## This is the label in uTorrent
 
-else len(sys.argv) == 7:
+elif len(sys.argv) > 1: #Doesn't match Transmission (1) or uTorrent (4).
+	print "The number of arguments passed is", len(sys.argv), "unable to determin the arguments to use, Exiting"
+	sys.exit(-1)
+
+else:
 	##test for Transmission here.
 	#TR_APP_VERSION
 	#TR_TIME_LOCALTIME
@@ -52,15 +56,15 @@ else len(sys.argv) == 7:
 	#TR_TORRENT_HASH
 	#TR_TORRENT_ID
 	#TR_TORRENT_NAME
-	print "script called from Transmission"
-	Directory = sys.argv[3]
-	Name = sys.argv[6]
+	try:
+		Directory = os.getenv('TR_TORRENT_DIR')
+		Name = os.getenv('TR_TORRENT_NAME')
+		print "script called from Transmission"
+	except:
+		print "There was a problem loading variables from Transmission", "Exiting"
+		sys.exit(-1)
 	Category = os.path.basename(os.path.normpath(Directory)) #We assume the last directory is the category for now.
-
-else:
-	print "The number of arguments passed is", len(sys.argv), "unable to determin the arguments to use, Exiting
-	sys.exit(-1)
-
+	
 if not Category:
 	Category = os.path.basename(os.path.normpath(Directory)) #Test for blackhole sub-directory.
 

From 28eee572c7303469ea29d3d3f74c9fb90b99e22a Mon Sep 17 00:00:00 2001
From: clinton-hall <fock_wulf@hotmail.com>
Date: Sun, 3 Feb 2013 22:55:29 -0800
Subject: [PATCH 53/73] added local logging of postprocess results.

---
 TorrentToMedia.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/TorrentToMedia.py b/TorrentToMedia.py
index 08b9f42b..ef30fe0e 100755
--- a/TorrentToMedia.py
+++ b/TorrentToMedia.py
@@ -6,7 +6,9 @@ import sys, os, ConfigParser
 from os import listdir
 from os.path import isfile, join
 
-
+old_stdout = sys.stdout #backup the default stdout
+log_file = open(os.path.join(os.path.dirname(sys.argv[0]), "postprocess.log"),"w+")
+sys.stdout = log_file #create a local log file, and direct all "print" to the log.
 print "TorrentToMedia V4.1"
 if len(sys.argv) == 4:
 	##You can use the following parameters (UTORRENT):
@@ -188,6 +190,9 @@ if Category == Movie_Cat:
 	autoProcessMovie.process(destination, Name, status)
 elif Category == TV_Cat:
 	autoProcessTV.processEpisode(destination, Name, status)
+
+sys.stdout = old_stdout #reset our stdout
+log_file.close() #close the log
     
 def on_extract_success(result):
 	print("INFO: Extraction was successful for %s")

From c2495af755a2b3cb2094b023598c9f03d67a52f6 Mon Sep 17 00:00:00 2001
From: clinton-hall <fock_wulf@hotmail.com>
Date: Sun, 3 Feb 2013 23:11:46 -0800
Subject: [PATCH 54/73] append, not truncate

---
 TorrentToMedia.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/TorrentToMedia.py b/TorrentToMedia.py
index ef30fe0e..722c6d97 100755
--- a/TorrentToMedia.py
+++ b/TorrentToMedia.py
@@ -7,7 +7,7 @@ from os import listdir
 from os.path import isfile, join
 
 old_stdout = sys.stdout #backup the default stdout
-log_file = open(os.path.join(os.path.dirname(sys.argv[0]), "postprocess.log"),"w+")
+log_file = open(os.path.join(os.path.dirname(sys.argv[0]), "postprocess.log"),"a+")
 sys.stdout = log_file #create a local log file, and direct all "print" to the log.
 print "TorrentToMedia V4.1"
 if len(sys.argv) == 4:

From e74d0004e302d0a2addd561244c57e509ccc70f6 Mon Sep 17 00:00:00 2001
From: clinton-hall <fock_wulf@hotmail.com>
Date: Sun, 3 Feb 2013 23:22:58 -0800
Subject: [PATCH 55/73] details of Transmission usage.

---
 README.md | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index d25f6986..99161d93 100644
--- a/README.md
+++ b/README.md
@@ -335,11 +335,13 @@ If you are using µTorrent, perform the following steps to configure postprocess
 
 2. In µTorrent go to preferences > Advanced > Run Program > Run this program when torrent finishes:
  
-	i.   Set full path to script, pass paramaters as "%D" "%N" "%L" and then output to a desired log.
+	i.   Set full path to script, pass paramaters as "%D" "%N" "%L".
 	
-		/usr/local/utorrent/nzbToMedia/TorrentToMedia.py "%D" "%N" "%L" >> /usr/local/utorrent/log.txt.
+		/usr/local/utorrent/nzbToMedia/TorrentToMedia.py "%D" "%N" "%L"
 	
-### Transmission  ###TBA.
+3. Output from TorrentToMedia will be logged where the scripts reside, in a file called "postprocess.log"
+
+### Transmission
 
 If you are using Transmission, perform the following steps to configure postprocessing for "TorrentToMedia":
 
@@ -363,10 +365,18 @@ If you are using Transmission, perform the following steps to configure postproc
 	iv.  Configure the remaining settings as describes in nzbToCouchPotato and nzbToSickBeard above.
 
 
-2. In Transmission go to Preferences->Transfers->Management
+2. In Transmission add the TorrentToMedia.py script to run on downlaod complete.
  
-	i.   Select the script to run on download complete.
+	i.   On some systems go to Preferences->Transfers->Management
+		Select the script to run on download complete.
 	
-		/usr/local/utorrent/nzbToMedia/TorrentToMedia.py.
+		/usr/local/transmission/nzbToMedia/TorrentToMedia.py
 
+	ii.   On other systems you will need to edit settings.json 
+		(usually /etc/transmission-daemon/settings.json). 
+		Edit while the daemon is not running.
+		
+    		"script-torrent-done-enabled": true, 
+    		"script-torrent-done-filename": "/usr/local/transmission/nzbToMedia/TorrentToMedia.py",
 
+3. Output from TorrentToMedia will be logged where the scripts reside, in a file called "postprocess.log"

From 6cb1cf6a79e6e6ad8daab3b980911f6f2ed0203e Mon Sep 17 00:00:00 2001
From: clinton-hall <fock_wulf@hotmail.com>
Date: Mon, 4 Feb 2013 18:54:19 -0800
Subject: [PATCH 56/73] Add more details and examples

---
 README.md | 109 ++++++++++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 101 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index 99161d93..2402434d 100644
--- a/README.md
+++ b/README.md
@@ -106,8 +106,14 @@ The following must be configured in SickBeard:
 	v.   SABnzbd API Key = The api key used by SABnzbd (Found in sabnzbd -> config -> general -> SABnzbd Web Server)
 	
 	vi.  NZBGet Category - SABnzbd Category = A category that is used by your download client (e.g. "TV", or "SickBeard")
+	
+2. Config -> Search Settings -> Search Torrents
+	
+	i.   Torrent Black Hole = Enter your Torrent downlaoder's BlackHole Directory + tv sub directory
 
-2. Settings -> Post Processing -> Post Processing
+		/usr/local/blackhole/tv
+	
+3. Settings -> Post Processing -> Post Processing
 	
 	i.   TV Download Dir = blank
 	
@@ -119,13 +125,13 @@ The following must be configured in SickBeard:
 	
 	v.   Scan and Process = must be unticked.
 
-3. Settings -> Post Processing -> Naming
+4. Settings -> Post Processing -> Naming
 	
 	The naming must be specified as per user choice. 
 	
 	This naming will be applied to all shows processed via the postprocess script. 
 
-4. Settings -> Post Processing -> Metadata
+5. Settings -> Post Processing -> Metadata
 	
 	The metadata wanted must be specified as per user choice. 
 	
@@ -146,8 +152,41 @@ The following must be configured in CouchPotatoServer:
 	iv.  Category = A category that is used by your downlaod client (e.g. "movies", or "CouchPotato")
 	
 	v.   Delete Failed = Should be unticked (Sabnzbd only)
+	
+2. Settings -> Downloaders -> Transmission
 
-2. Settings -> Renamer -> "Rename downloaded movies" should be checked and the settings below applied:
+	i.   Host = The url/host and port for Transmission.
+	
+	ii.  username = The user name required to log in to Transmission
+	
+	iii. password = The password required to log in to Transmission
+	
+	iv.  Directory = The directory for completed/seeding files. NOT the renamer "from" directory.
+		
+		/usr/local/Download/movies
+	
+3. Settings -> Downloaders -> uTorrent
+
+	i.   Host = The url/host and port for uTorrent.
+	
+	ii.  username = The user name required to log in to uTorrent
+	
+	iii. password = The password required to log in to uTorrent
+	
+	iv.  label = label/category to be used by the postprocessing script.
+		
+		movies
+		
+4. Settings -> Downloaders -> BlackHole
+
+	i.   Directory = Enter your Torrent downlaoder's BlackHole Directory + movies sub directory
+
+		/usr/local/blackhole/movies
+	
+	ii.  use for = Torrents, Usenet, or Both. 
+		If using SABnzbd of NZBget for Usenet, and balckhole for torrents, select "torrents" only.
+
+5. Settings -> Renamer -> "Rename downloaded movies" should be checked and the settings below applied:
 
 	i.   From = Must be set to the full path to your completed download movies (including any additional category paths)
 
@@ -339,7 +378,18 @@ If you are using µTorrent, perform the following steps to configure postprocess
 	
 		/usr/local/utorrent/nzbToMedia/TorrentToMedia.py "%D" "%N" "%L"
 	
-3. Output from TorrentToMedia will be logged where the scripts reside, in a file called "postprocess.log"
+3. In uTorrent set the following directories.
+ 
+	i.   Download Directory = The directory where downloaded files stay while seeding.
+		This is NOT the "FROM" directory in CouchPotato renamer. 
+	
+		/usr/local/Download
+
+	ii.   Watch Direcetory = The balckhole directory used by CouchPotato and/or SickBeard
+				 
+    		/usr/local/blackhole
+
+4. Output from TorrentToMedia will be logged where the scripts reside, in a file called "postprocess.log"
 
 ### Transmission
 
@@ -357,11 +407,14 @@ If you are using Transmission, perform the following steps to configure postproc
 
 	iii. [CouchPotato] & [SickBeard]
 		Category = you must set the category that is passed from these applications
-		This is the last folder name in the directory path passed as directory for completed downloads.
+		This is the last folder name in the directory path passed as "directory for completed downloads."
 		If using "blackhole-subdirectory", this is the last folder name used in the blackhole.
+		
 		destination = you must set the absoluet path where you want movies extracted to.
 		this destination, for CouchPotato, must match the CouchPotato Renamers, "from" directory.
-		
+			/usr/local/extracted/movies
+			/usr/local/extracted/tv
+
 	iv.  Configure the remaining settings as describes in nzbToCouchPotato and nzbToSickBeard above.
 
 
@@ -379,4 +432,44 @@ If you are using Transmission, perform the following steps to configure postproc
     		"script-torrent-done-enabled": true, 
     		"script-torrent-done-filename": "/usr/local/transmission/nzbToMedia/TorrentToMedia.py",
 
-3. Output from TorrentToMedia will be logged where the scripts reside, in a file called "postprocess.log"
+3. In Transmission set the following directories (settings.json, or interface).
+ 
+	i.   Download Directory = The directory where downloaded files stay while seeding.
+		This is NOT the "FROM" directory in CouchPotato renamer. 
+	
+		"download-dir": "/usr/local/Download",
+
+	ii.   Watch Direcetory = The balckhole directory used by CouchPotato and/or SickBeard
+				 
+    		"watch-dir": "/usr/local/blackhole',
+    		"watch-dir-enabled": true,
+
+4. Output from TorrentToMedia will be logged where the scripts reside, in a file called "postprocess.log"
+
+
+### FOLDER STRUCTURE: Important for black-hole and Torrent. 
+
+This is just an example to illustrate how this can be achieved.
+
+Watch Directory / Blackhole
+This is the root path where your downloader looks for nzbs/torrents.
+This will have 2 sub-directories, "tv" and "movies", which define the "categories".
+
+		/usr/local/blackhole
+			/usr/local/blackhole/tv
+			/usr/local/blackhole/movies
+
+Download Directory
+This is the root path where your downloads are put when finished (and where files will be seeded from for Torrents).
+This will have 2 sub-directories, "tv" and "movies", which define the "categories".
+
+		/usr/local/Download
+			/usr/local/Download/tv
+			/usr/local/Download/movies
+
+destination
+This is the directory specified for each category, where final files are moved to after extarction. 
+For CouchPotato this will be the renamer "from" directory.
+	
+		/usr/local/extracted/tv
+		/usr/local/extracted/movies

From b964e34d4ef2096dee6fb4dfe133fb0a8566b211 Mon Sep 17 00:00:00 2001
From: clinton-hall <fock_wulf@hotmail.com>
Date: Tue, 5 Feb 2013 15:24:53 -0800
Subject: [PATCH 57/73] fixed directories and standardize os. calls

---
 TorrentToMedia.py | 28 +++++++++++-----------------
 1 file changed, 11 insertions(+), 17 deletions(-)

diff --git a/TorrentToMedia.py b/TorrentToMedia.py
index 722c6d97..bf1a3756 100755
--- a/TorrentToMedia.py
+++ b/TorrentToMedia.py
@@ -3,8 +3,6 @@
 import autoProcessMovie
 import autoProcessTV
 import sys, os, ConfigParser
-from os import listdir
-from os.path import isfile, join
 
 old_stdout = sys.stdout #backup the default stdout
 log_file = open(os.path.join(os.path.dirname(sys.argv[0]), "postprocess.log"),"a+")
@@ -92,9 +90,9 @@ useLink = int(config.get("Torrent", "uselink"))
 extractionTool = config.get("Torrent", "extractiontool")
 
 if Category == Movie_Cat:
-	destination = Movie_dest
+	destination = os.path.join(Movie_dest, Name)
 elif Category == TV_Cat:
-	destination = TV_dest
+	destination = os.path.join(TV_dest, Name)
 else:
 	print "INFO: Not assigned a label of either", Movie_Cat, "or", TV_Cat, ". Exiting"
 	sys.exit(-1)
@@ -148,9 +146,10 @@ elif packed == 1: ## unpack
 	else:
 		print "ERROR: Unknown OS, exiting"
 
-	files = [ f for f in listdir(Directory) if isfile(join(Directory,f)) ]
+	files = [ f for f in os.listdir(Directory) if os.path.isfile(os.path.join(Directory,f)) ]
 		for f in files:
-			ext = os.path.splitext(f["path"])
+			ext = os.path.splitext(f)
+			fp = os.path.join(Directory, os.path.normpath(f))
 			if ext[1] in (".gz", ".bz2", ".lzma"):
 			## Check if this is a tar
 				if os.path.splitext(ext[0])[1] == ".tar":
@@ -161,26 +160,21 @@ elif packed == 1: ## unpack
 				else:
 					print("ERROR: Unknown file type: %s", ext[1])
 					continue
-					
-			fp = os.path.join(destination, os.path.normpath(f["path"]))
 
-			## Destination path
-			dest = os.path.join(destination, Name)
-
-			## Create destionation folder
-			if not os.path.exists(dest):
+			## Create destination folder
+			if not os.path.exists(destination):
 			try:
-				os.makedirs(dest)
+				os.makedirs(destination)
 			except Exception, e:
 				print("ERROR: Not possible to create destination folder: %s", e)
 				return
 
-			print("INFO: Extracting to %s", dest)
+			print("INFO: Extracting to %s", destination)
 
 	
 			## Running..	
-			print("INFO: Extracting %s %s %s %s", cmd[0], cmd[1], fp, dest)
-			d = getProcessValue(cmd[0], cmd[1].split() + [str(fp)], {}, str(dest))
+			print("INFO: Extracting %s %s %s %s", cmd[0], cmd[1], fp, destination)
+			d = getProcessValue(cmd[0], cmd[1].split() + [str(fp)], {}, str(destination))
 			d.addCallback(on_extract_success)
 			d.addErrback(on_extract_failed)
 

From 9405c26f11b83c8ae7ad87e91eba9c074bdba6ca Mon Sep 17 00:00:00 2001
From: clinton-hall <fock_wulf@hotmail.com>
Date: Tue, 5 Feb 2013 18:20:02 -0800
Subject: [PATCH 58/73] changed extraction calls. Don't use twisted
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Previous version required import of twisted.internet.utils...
This wasn't imported and is too large for what we want.

Extraction has been tested on both windows using 7zip and QNAP NAS (zip and tar.gz) 
---
 TorrentToMedia.py | 42 ++++++++++++++++++++++++++++++------------
 1 file changed, 30 insertions(+), 12 deletions(-)

diff --git a/TorrentToMedia.py b/TorrentToMedia.py
index bf1a3756..626c6116 100755
--- a/TorrentToMedia.py
+++ b/TorrentToMedia.py
@@ -3,6 +3,7 @@
 import autoProcessMovie
 import autoProcessTV
 import sys, os, ConfigParser
+from subprocess import call
 
 old_stdout = sys.stdout #backup the default stdout
 log_file = open(os.path.join(os.path.dirname(sys.argv[0]), "postprocess.log"),"a+")
@@ -122,7 +123,7 @@ elif packed == 1: ## unpack
 	if os.name == 'nt':
 		cmd_7zip = [extractionTool, 'x -y']
 		ext_7zip = [".rar",".zip",".tar.gz","tgz",".tar.bz2",".tbz",".tar.lzma",".tlz",".7z",".xz"]
-		EXTRACT_COMMANDS = dict.fromkeys(ext_zip, cmd_7zip)
+		EXTRACT_COMMANDS = dict.fromkeys(ext_7zip, cmd_7zip)
 		print "INFO: We are using Windows"
 		
 	## Using linux?
@@ -174,10 +175,34 @@ elif packed == 1: ## unpack
 	
 			## Running..	
 			print("INFO: Extracting %s %s %s %s", cmd[0], cmd[1], fp, destination)
-			d = getProcessValue(cmd[0], cmd[1].split() + [str(fp)], {}, str(destination))
-			d.addCallback(on_extract_success)
-			d.addErrback(on_extract_failed)
-
+			pwd = os.getcwd # Get our Present Working Directory
+			os.chdir(destination) #not all unpack commands accept full paths, so just extract into this directory.
+			if os.name == 'nt': #Windows needs quotes around directory structure
+				try:
+					run = "\"" + cmd[0] + "\" " + cmd[1] + " \"" + fp + "\"" #windows needs quotes around directories.
+					res = call(run)
+					if res == 0:
+						status = 0
+						print ("INFO: Extraction was successful for %s to %s", fp, destination)
+					else:
+						print("ERROR: Extraction failed for %s. 7zip result was %s", fp, res)
+				except:
+					print ("ERROR: Extraction failed for %s. Could not call command %s %s", fp, run)
+			else:
+				try:
+					if cmd[1] == "": #if calling unzip, we dont want to pass the ""
+						res = call([cmd[0], fp])
+					else:
+						res = call([cmd[0], cmd[1], fp])
+					if res == 0:
+						status = 0
+						print ("INFO: Extraction was successful for %s to %s", fp, destination)
+					else:
+						print("ERROR: Extraction failed for %s. 7zip result was %s", fp, res)
+				except:
+					print ("ERROR: Extraction failed for %s. Could not call command %s %s %s %s", fp, cmd[0], cmd[1], fp)	
+			os.chdir(pwd) # Go back to our Original Working Directory
+				
 status = int(status)
 ## Now we pass off to CouchPotato or SickBeard.
 if Category == Movie_Cat:  
@@ -187,10 +212,3 @@ elif Category == TV_Cat:
 
 sys.stdout = old_stdout #reset our stdout
 log_file.close() #close the log
-    
-def on_extract_success(result):
-	print("INFO: Extraction was successful for %s")
-	status = 0
-
-def on_extract_failed(result):
-	print("ERROR: Extraction failed for %s")

From c0e9f89ea366734c65a4ee2fe4af7f4a401f2bdb Mon Sep 17 00:00:00 2001
From: clinton-hall <fock_wulf@hotmail.com>
Date: Tue, 5 Feb 2013 18:22:46 -0800
Subject: [PATCH 59/73] Consistent logging.

---
 TorrentToMedia.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/TorrentToMedia.py b/TorrentToMedia.py
index 626c6116..4cc95eab 100755
--- a/TorrentToMedia.py
+++ b/TorrentToMedia.py
@@ -8,7 +8,7 @@ from subprocess import call
 old_stdout = sys.stdout #backup the default stdout
 log_file = open(os.path.join(os.path.dirname(sys.argv[0]), "postprocess.log"),"a+")
 sys.stdout = log_file #create a local log file, and direct all "print" to the log.
-print "TorrentToMedia V4.1"
+print "INFO: TorrentToMedia V4.1"
 if len(sys.argv) == 4:
 	##You can use the following parameters (UTORRENT):
 	##
@@ -40,13 +40,13 @@ if len(sys.argv) == 4:
 	##Stopped - 13
 	
 	## We will pass in %D, %N, %L from uTorrent
-	print "script called from utorrent"
+	print "INFO: Script called from utorrent"
 	Directory = sys.argv[1]	## %D -- Example output: F:\path\to\dir\My.Series.S01E01.720p.HDTV.x264-2HD
 	Name = sys.argv[2]		## %N -- Example output: My.Series.S01E01.720p.HDTV.x264-2HD
 	Category = sys.argv[3]	## %L -- Example output: tvseries ## This is the label in uTorrent
 
 elif len(sys.argv) > 1: #Doesn't match Transmission (1) or uTorrent (4).
-	print "The number of arguments passed is", len(sys.argv), "unable to determin the arguments to use, Exiting"
+	print "Error: The number of arguments passed is", len(sys.argv), "unable to determin the arguments to use, Exiting"
 	sys.exit(-1)
 
 else:
@@ -60,9 +60,9 @@ else:
 	try:
 		Directory = os.getenv('TR_TORRENT_DIR')
 		Name = os.getenv('TR_TORRENT_NAME')
-		print "script called from Transmission"
+		print "INFO: Script called from Transmission"
 	except:
-		print "There was a problem loading variables from Transmission", "Exiting"
+		print "Error: There was a problem loading variables from Transmission", "Exiting"
 		sys.exit(-1)
 	Category = os.path.basename(os.path.normpath(Directory)) #We assume the last directory is the category for now.
 	

From 66ca32532e2cf8cf3d7164d80af1c57b9bbae690 Mon Sep 17 00:00:00 2001
From: clinton-hall <fock_wulf@hotmail.com>
Date: Tue, 5 Feb 2013 18:24:18 -0800
Subject: [PATCH 60/73] Correct call to os.getcwd()

---
 TorrentToMedia.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/TorrentToMedia.py b/TorrentToMedia.py
index 4cc95eab..71bc08a8 100755
--- a/TorrentToMedia.py
+++ b/TorrentToMedia.py
@@ -175,7 +175,7 @@ elif packed == 1: ## unpack
 	
 			## Running..	
 			print("INFO: Extracting %s %s %s %s", cmd[0], cmd[1], fp, destination)
-			pwd = os.getcwd # Get our Present Working Directory
+			pwd = os.getcwd() # Get our Present Working Directory
 			os.chdir(destination) #not all unpack commands accept full paths, so just extract into this directory.
 			if os.name == 'nt': #Windows needs quotes around directory structure
 				try:

From 5b1a7d622de56201cf3d3bba1c6721e38a91fcdf Mon Sep 17 00:00:00 2001
From: clinton-hall <fock_wulf@hotmail.com>
Date: Tue, 5 Feb 2013 19:43:52 -0800
Subject: [PATCH 61/73] flatten destination directory

After extracting this can be very messy.
We also want the movie files in the directory that includes the .cp(ttxxxx) tag
---
 TorrentToMedia.py | 42 +++++++++++++++++++++++++++++++++++-------
 1 file changed, 35 insertions(+), 7 deletions(-)

diff --git a/TorrentToMedia.py b/TorrentToMedia.py
index 71bc08a8..b0fbe2b4 100755
--- a/TorrentToMedia.py
+++ b/TorrentToMedia.py
@@ -2,7 +2,7 @@
 
 import autoProcessMovie
 import autoProcessTV
-import sys, os, ConfigParser
+import sys, os, ConfigParser, shutil
 from subprocess import call
 
 old_stdout = sys.stdout #backup the default stdout
@@ -46,7 +46,7 @@ if len(sys.argv) == 4:
 	Category = sys.argv[3]	## %L -- Example output: tvseries ## This is the label in uTorrent
 
 elif len(sys.argv) > 1: #Doesn't match Transmission (1) or uTorrent (4).
-	print "Error: The number of arguments passed is", len(sys.argv), "unable to determin the arguments to use, Exiting"
+	print ("Error: The number of arguments passed is %s. Unable to determin the arguments to use; Exiting" , len(sys.argv))
 	sys.exit(-1)
 
 else:
@@ -75,7 +75,7 @@ packed = 0
 config = ConfigParser.ConfigParser()
 configFilename = os.path.join(os.path.dirname(sys.argv[0]), "autoProcessMedia.cfg")
 
-print "INFO: Loading config from", configFilename
+print ("INFO: Loading config from %s", configFilename)
 
 if not os.path.isfile(configFilename):
 	print "ERROR: You need an autoProcessMedia.cfg file - did you rename and edit the .sample?"
@@ -95,7 +95,7 @@ if Category == Movie_Cat:
 elif Category == TV_Cat:
 	destination = os.path.join(TV_dest, Name)
 else:
-	print "INFO: Not assigned a label of either", Movie_Cat, "or", TV_Cat, ". Exiting"
+	print ("INFO: Not assigned a label of either %s or %s. Exiting", Movie_Cat, TV_Cat)
 	sys.exit(-1)
 
 test = re.compile('^(.*)\.((zip|rar|7z|gz|bz|tar|arj)|(r[0-9]{1,3})|([0-9]{1,3}))$', re.IGNORECASE|re.UNICODE);
@@ -111,11 +111,11 @@ else:
 	sys.exit(-1)
 
 if useLink == 0 and packed == 0: ## copy
-	print "INFO: Copying all files from", Directory, "to", destination
+	print ("INFO: Copying all files from %s to %s", Directory, destination)
 	shutil.copytree(Directory, destination)
 
 elif useLink == 1 and packed == 0: ## hardlink
-	print "INFO: Creating hard link from", Directory, "to", destination
+	print ("INFO: Creating hard link from %s to %s", Directory, destination)
 	shutil.copytree(Directory, destination, copy_function=os.link)
 	
 elif packed == 1: ## unpack
@@ -202,7 +202,17 @@ elif packed == 1: ## unpack
 				except:
 					print ("ERROR: Extraction failed for %s. Could not call command %s %s %s %s", fp, cmd[0], cmd[1], fp)	
 			os.chdir(pwd) # Go back to our Original Working Directory
-				
+
+for dirpath, dirnames, filenames in os.walk(destination): #flatten out the directory to make postprocessing easier.
+	if dirpath == destination:
+		continue #no need to try and move files in the root destination directory.
+	for filename in filenames:
+		try:
+			shutil.move(os.path.join(dirpath, filename), destination))
+		except OSError:
+			print ("INFO: Could not flatten %s ", os.path.join(dirpath, filename))
+removeEmptyFolders(destination) #cleanup empty directories.
+
 status = int(status)
 ## Now we pass off to CouchPotato or SickBeard.
 if Category == Movie_Cat:  
@@ -212,3 +222,21 @@ elif Category == TV_Cat:
 
 sys.stdout = old_stdout #reset our stdout
 log_file.close() #close the log
+
+def removeEmptyFolders(path):
+	if not os.path.isdir(path):
+    		return
+
+	# remove empty subfolders
+	files = os.listdir(path)
+	if len(files):
+		for f in files:
+			fullpath = os.path.join(path, f)
+			if os.path.isdir(fullpath):
+				removeEmptyFolders(fullpath)
+
+	# if folder empty, delete it
+	files = os.listdir(path)
+	if len(files) == 0:
+		print ("INFO: Removing empty folder: %s", path)
+		os.rmdir(path)

From b002d4127d9e5014f1f3dde566fb086432381d57 Mon Sep 17 00:00:00 2001
From: clinton-hall <fock_wulf@hotmail.com>
Date: Wed, 6 Feb 2013 01:32:25 -0800
Subject: [PATCH 62/73] improve matching without .nzb closes #36

---
 autoProcessMovie.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/autoProcessMovie.py b/autoProcessMovie.py
index a054f530..e8862502 100644
--- a/autoProcessMovie.py
+++ b/autoProcessMovie.py
@@ -100,8 +100,8 @@ def process(dirName, nzbName=None, status=0):
     else:
         print "download of", nzbName1, "has failed."
         print "trying to re-cue the next highest ranked release"
-        a=nzbName1.find('.cp')+4
-        b=nzbName1.find('.nzb')-1
+        a=nzbName1.find('.cp(')+4
+        b=nzbName1[a:].find(')')+a
         imdbid=nzbName1[a:b]
         #print imdbid
 

From 8f64b69c7939200bec13a027d35e4c01d57a1752 Mon Sep 17 00:00:00 2001
From: clinton-hall <fock_wulf@hotmail.com>
Date: Thu, 7 Feb 2013 18:50:36 -0800
Subject: [PATCH 63/73] Removed quotes

---
 .../9.0/bin/nzbget-postprocess.sh                  | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/nzbget-postprocessing-files/9.0/bin/nzbget-postprocess.sh b/nzbget-postprocessing-files/9.0/bin/nzbget-postprocess.sh
index 3566c943..98bb16ed 100755
--- a/nzbget-postprocessing-files/9.0/bin/nzbget-postprocess.sh
+++ b/nzbget-postprocessing-files/9.0/bin/nzbget-postprocess.sh
@@ -447,36 +447,36 @@ fi
 # Test for category and ensure the passed directory exists as a directory.
 if [ "$NZBPP_CATEGORY" = "$SickBeardCategory" -a -d "$TvDownloadDir" ]; then
         echo "[INFO] Post-Process: Moving TV shows to $TvDownloadDir"
-        mv "$NZBPP_DIRECTORY" "$TvDownloadDir"
+        mv $NZBPP_DIRECTORY $TvDownloadDir
         if [ "$?" -ne 0 ]; then
            echo "[ERROR] Post-Process: Moving to $TvDownloadDir"
            exit $POSTPROCESS_ERROR
         else
-           NZBPP_DIRECTORY="$TvDownloadDir"
+           NZBPP_DIRECTORY=$TvDownloadDir
 	   cd "$NZBPP_DIRECTORY"
         fi
 fi
 # Test for category and ensure the passed directory exists as a directory.
 if [ "$NZBPP_CATEGORY" = "$CouchPotatoCategory" -a -d "$MoviesDownloadDir" ]; then
         echo "[INFO] Post-Process: Moving Movies to $MoviesDownloadDir" 
-        mv "$NZBPP_DIRECTORY" "$MoviesDownloadDir" 
+        mv $NZBPP_DIRECTORY $MoviesDownloadDir 
         if [ "$?" -ne 0 ]; then
            echo "[ERROR] Post-Process: Moving to $MoviesDownloadDir"
            exit $POSTPROCESS_ERROR
         else
-           NZBPP_DIRECTORY="$MoviesDownloadDir"
+           NZBPP_DIRECTORY=$MoviesDownloadDir
 	   cd "$NZBPP_DIRECTORY"
         fi
 fi
 # Test for category and ensure the passed directory exists as a directory.
 if [ "$NZBPP_CATEGORY" = "$CustomCategory" -a -d "$CustomDownloadDir" ]; then
         echo "[INFO] Post-Process: Moving $CustomCategory to $CustomDownloadDir" 
-        mv "$NZBPP_DIRECTORY" "$CustomDownloadDir" 
+        mv $NZBPP_DIRECTORY $CustomDownloadDir 
         if [ "$?" -ne 0 ]; then
            echo "[ERROR] Post-Process: Moving to $CustomDownloadDir"
            exit $POSTPROCESS_ERROR
         else
-           NZBPP_DIRECTORY="$CustomDownloadDir"
+           NZBPP_DIRECTORY=$CustomDownloadDir
 	   cd "$NZBPP_DIRECTORY"
         fi
 fi
@@ -494,7 +494,7 @@ if [ "$NZBPR_DestDir" != "" ]; then
 	cd ..
 	rmdir $NZBPP_DIRECTORY
 	NZBPP_DIRECTORY=$NZBPR_DestDir
-	cd "$NZBPP_DIRECTORY"
+	cd $NZBPP_DIRECTORY
 fi
 
 # All OK, requesting cleaning up of download queue

From 62ba17bf294aca2edaeda7fe076e20ad76ea40e0 Mon Sep 17 00:00:00 2001
From: clinton-hall <fock_wulf@hotmail.com>
Date: Sun, 10 Feb 2013 20:12:33 -0800
Subject: [PATCH 64/73] remove indented section

---
 TorrentToMedia.py | 98 +++++++++++++++++++++++------------------------
 1 file changed, 49 insertions(+), 49 deletions(-)

diff --git a/TorrentToMedia.py b/TorrentToMedia.py
index b0fbe2b4..20f6c418 100755
--- a/TorrentToMedia.py
+++ b/TorrentToMedia.py
@@ -148,60 +148,60 @@ elif packed == 1: ## unpack
 		print "ERROR: Unknown OS, exiting"
 
 	files = [ f for f in os.listdir(Directory) if os.path.isfile(os.path.join(Directory,f)) ]
-		for f in files:
-			ext = os.path.splitext(f)
-			fp = os.path.join(Directory, os.path.normpath(f))
-			if ext[1] in (".gz", ".bz2", ".lzma"):
-			## Check if this is a tar
-				if os.path.splitext(ext[0])[1] == ".tar":
-					cmd = EXTRACT_COMMANDS[".tar" + ext[1]]
+	for f in files:
+		ext = os.path.splitext(f)
+		fp = os.path.join(Directory, os.path.normpath(f))
+		if ext[1] in (".gz", ".bz2", ".lzma"):
+		## Check if this is a tar
+			if os.path.splitext(ext[0])[1] == ".tar":
+				cmd = EXTRACT_COMMANDS[".tar" + ext[1]]
+		else:
+			if ext[1] in EXTRACT_COMMANDS:
+				cmd = EXTRACT_COMMANDS[ext[1]]
 			else:
-				if ext[1] in EXTRACT_COMMANDS:
-					cmd = EXTRACT_COMMANDS[ext[1]]
-				else:
-					print("ERROR: Unknown file type: %s", ext[1])
-					continue
+				print("ERROR: Unknown file type: %s", ext[1])
+				continue
 
-			## Create destination folder
-			if not os.path.exists(destination):
-			try:
-				os.makedirs(destination)
-			except Exception, e:
-				print("ERROR: Not possible to create destination folder: %s", e)
-				return
+		## Create destination folder
+		if not os.path.exists(destination):
+		try:
+			os.makedirs(destination)
+		except Exception, e:
+			print("ERROR: Not possible to create destination folder: %s", e)
+			return
 
-			print("INFO: Extracting to %s", destination)
+		print("INFO: Extracting to %s", destination)
 
 	
-			## Running..	
-			print("INFO: Extracting %s %s %s %s", cmd[0], cmd[1], fp, destination)
-			pwd = os.getcwd() # Get our Present Working Directory
-			os.chdir(destination) #not all unpack commands accept full paths, so just extract into this directory.
-			if os.name == 'nt': #Windows needs quotes around directory structure
-				try:
-					run = "\"" + cmd[0] + "\" " + cmd[1] + " \"" + fp + "\"" #windows needs quotes around directories.
-					res = call(run)
-					if res == 0:
-						status = 0
-						print ("INFO: Extraction was successful for %s to %s", fp, destination)
-					else:
-						print("ERROR: Extraction failed for %s. 7zip result was %s", fp, res)
-				except:
-					print ("ERROR: Extraction failed for %s. Could not call command %s %s", fp, run)
-			else:
-				try:
-					if cmd[1] == "": #if calling unzip, we dont want to pass the ""
-						res = call([cmd[0], fp])
-					else:
-						res = call([cmd[0], cmd[1], fp])
-					if res == 0:
-						status = 0
-						print ("INFO: Extraction was successful for %s to %s", fp, destination)
-					else:
-						print("ERROR: Extraction failed for %s. 7zip result was %s", fp, res)
-				except:
-					print ("ERROR: Extraction failed for %s. Could not call command %s %s %s %s", fp, cmd[0], cmd[1], fp)	
-			os.chdir(pwd) # Go back to our Original Working Directory
+		## Running..	
+		print("INFO: Extracting %s %s %s %s", cmd[0], cmd[1], fp, destination)
+		pwd = os.getcwd() # Get our Present Working Directory
+		os.chdir(destination) #not all unpack commands accept full paths, so just extract into this directory.
+		if os.name == 'nt': #Windows needs quotes around directory structure
+			try:
+				run = "\"" + cmd[0] + "\" " + cmd[1] + " \"" + fp + "\"" #windows needs quotes around directories.
+				res = call(run)
+				if res == 0:
+					status = 0
+					print ("INFO: Extraction was successful for %s to %s", fp, destination)
+				else:
+					print("ERROR: Extraction failed for %s. 7zip result was %s", fp, res)
+			except:
+				print ("ERROR: Extraction failed for %s. Could not call command %s %s", fp, run)
+		else:
+			try:
+				if cmd[1] == "": #if calling unzip, we dont want to pass the ""
+					res = call([cmd[0], fp])
+				else:
+					res = call([cmd[0], cmd[1], fp])
+				if res == 0:
+					status = 0
+					print ("INFO: Extraction was successful for %s to %s", fp, destination)
+				else:
+					print("ERROR: Extraction failed for %s. 7zip result was %s", fp, res)
+			except:
+				print ("ERROR: Extraction failed for %s. Could not call command %s %s %s %s", fp, cmd[0], cmd[1], fp)	
+		os.chdir(pwd) # Go back to our Original Working Directory
 
 for dirpath, dirnames, filenames in os.walk(destination): #flatten out the directory to make postprocessing easier.
 	if dirpath == destination:

From 8aabce583e82f57ebda1c63186826f137c7799d2 Mon Sep 17 00:00:00 2001
From: clinton-hall <fock_wulf@hotmail.com>
Date: Sun, 10 Feb 2013 20:23:21 -0800
Subject: [PATCH 65/73] import SickBeard destination

---
 TorrentToMedia.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/TorrentToMedia.py b/TorrentToMedia.py
index 20f6c418..6947649a 100755
--- a/TorrentToMedia.py
+++ b/TorrentToMedia.py
@@ -84,7 +84,7 @@ if not os.path.isfile(configFilename):
 config.read(configFilename)
 
 TV_Cat = config.get("SickBeard", "category")
-TV_dest = config.get("CouchPotato", "destination")
+TV_dest = config.get("SickBeard", "destination")
 Movie_dest = config.get("CouchPotato", "destination")
 Movie_Cat = config.get("CouchPotato", "category")
 useLink = int(config.get("Torrent", "uselink"))

From a511f9d2d76a82133b298823edb6cb1c7af2ab61 Mon Sep 17 00:00:00 2001
From: clinton-hall <fock_wulf@hotmail.com>
Date: Mon, 11 Feb 2013 02:50:21 -0800
Subject: [PATCH 66/73] fixed indent and bracket

---
 TorrentToMedia.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/TorrentToMedia.py b/TorrentToMedia.py
index 6947649a..2a29e450 100755
--- a/TorrentToMedia.py
+++ b/TorrentToMedia.py
@@ -164,11 +164,11 @@ elif packed == 1: ## unpack
 
 		## Create destination folder
 		if not os.path.exists(destination):
-		try:
-			os.makedirs(destination)
-		except Exception, e:
-			print("ERROR: Not possible to create destination folder: %s", e)
-			return
+			try:
+				os.makedirs(destination)
+			except Exception, e:
+				print("ERROR: Not possible to create destination folder: %s", e)
+				return
 
 		print("INFO: Extracting to %s", destination)
 
@@ -208,7 +208,7 @@ for dirpath, dirnames, filenames in os.walk(destination): #flatten out the direc
 		continue #no need to try and move files in the root destination directory.
 	for filename in filenames:
 		try:
-			shutil.move(os.path.join(dirpath, filename), destination))
+			shutil.move(os.path.join(dirpath, filename), destination)
 		except OSError:
 			print ("INFO: Could not flatten %s ", os.path.join(dirpath, filename))
 removeEmptyFolders(destination) #cleanup empty directories.

From d74fa9216e2efccfe8c3a2485bfe16e60aa76172 Mon Sep 17 00:00:00 2001
From: clinton-hall <fock_wulf@hotmail.com>
Date: Mon, 11 Feb 2013 14:52:02 -0800
Subject: [PATCH 67/73] more fixes

---
 TorrentToMedia.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/TorrentToMedia.py b/TorrentToMedia.py
index 2a29e450..ece4176b 100755
--- a/TorrentToMedia.py
+++ b/TorrentToMedia.py
@@ -2,7 +2,7 @@
 
 import autoProcessMovie
 import autoProcessTV
-import sys, os, ConfigParser, shutil
+import sys, os, ConfigParser, shutil, re
 from subprocess import call
 
 old_stdout = sys.stdout #backup the default stdout
@@ -168,7 +168,7 @@ elif packed == 1: ## unpack
 				os.makedirs(destination)
 			except Exception, e:
 				print("ERROR: Not possible to create destination folder: %s", e)
-				return
+				continue
 
 		print("INFO: Extracting to %s", destination)
 

From c2b7a269210527181bada0a3c49e16fb1cd28465 Mon Sep 17 00:00:00 2001
From: clinton-hall <fock_wulf@hotmail.com>
Date: Mon, 11 Feb 2013 18:58:22 -0800
Subject: [PATCH 68/73] Fix Torrent handling
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fix logging
move def removeEmptyFolders to top
Change extension matching to use simple tools
Change os.link 
---
 TorrentToMedia.py | 88 +++++++++++++++++++++++++----------------------
 1 file changed, 46 insertions(+), 42 deletions(-)

diff --git a/TorrentToMedia.py b/TorrentToMedia.py
index ece4176b..d7dac065 100755
--- a/TorrentToMedia.py
+++ b/TorrentToMedia.py
@@ -2,13 +2,31 @@
 
 import autoProcessMovie
 import autoProcessTV
-import sys, os, ConfigParser, shutil, re
+import sys, os, ConfigParser, shutil
 from subprocess import call
 
+def removeEmptyFolders(path):
+	if not os.path.isdir(path):
+		return
+
+	# remove empty subfolders
+	files = os.listdir(path)
+	if len(files):
+		for f in files:
+			fullpath = os.path.join(path, f)
+			if os.path.isdir(fullpath):
+				removeEmptyFolders(fullpath)
+
+	# if folder empty, delete it
+	files = os.listdir(path)
+	if len(files) == 0:
+		print "INFO: Removing empty folder: %s" % (path)
+		os.rmdir(path)
+
 old_stdout = sys.stdout #backup the default stdout
 log_file = open(os.path.join(os.path.dirname(sys.argv[0]), "postprocess.log"),"a+")
 sys.stdout = log_file #create a local log file, and direct all "print" to the log.
-print "INFO: TorrentToMedia V4.1"
+print "INFO: TorrentToMedia V4.2"
 if len(sys.argv) == 4:
 	##You can use the following parameters (UTORRENT):
 	##
@@ -46,7 +64,7 @@ if len(sys.argv) == 4:
 	Category = sys.argv[3]	## %L -- Example output: tvseries ## This is the label in uTorrent
 
 elif len(sys.argv) > 1: #Doesn't match Transmission (1) or uTorrent (4).
-	print ("Error: The number of arguments passed is %s. Unable to determin the arguments to use; Exiting" , len(sys.argv))
+	print "Error: The number of arguments passed is %s. Unable to determin the arguments to use; Exiting" % (len(sys.argv))
 	sys.exit(-1)
 
 else:
@@ -75,7 +93,7 @@ packed = 0
 config = ConfigParser.ConfigParser()
 configFilename = os.path.join(os.path.dirname(sys.argv[0]), "autoProcessMedia.cfg")
 
-print ("INFO: Loading config from %s", configFilename)
+print "INFO: Loading config from ", configFilename
 
 if not os.path.isfile(configFilename):
 	print "ERROR: You need an autoProcessMedia.cfg file - did you rename and edit the .sample?"
@@ -95,28 +113,33 @@ if Category == Movie_Cat:
 elif Category == TV_Cat:
 	destination = os.path.join(TV_dest, Name)
 else:
-	print ("INFO: Not assigned a label of either %s or %s. Exiting", Movie_Cat, TV_Cat)
+	print "INFO: Not assigned a label of either %s or %s: Exiting" %(Movie_Cat, TV_Cat)
 	sys.exit(-1)
 
-test = re.compile('^(.*)\.((zip|rar|7z|gz|bz|tar|arj)|(r[0-9]{1,3})|([0-9]{1,3}))$', re.IGNORECASE|re.UNICODE);
-test2 = re.compile('^(.*)\.(mkv|avi|divx|xvid|mov|wmv)$', re.IGNORECASE|re.UNICODE);
-if test.match(Directory):
+test = ['.zip', '.rar', '.7z', '.gz', '.bz', '.tar', '.arj']
+test2 = ['.mkv', '.avi', '.divx', '.xvid', '.mov', '.wmv']
+f = [filenames for dirpath, dirnames, filenames in os.walk(Directory)]
+ext = [os.path.splitext(file)[1] for file in f[1]]
+if set(ext).intersection(set(test)):
 	print "INFO: Found compressed archives, extracting"
 	packed = 1
 ## Check that files actully is .mkv / .avi etc, and not packed files or anything else
-elif test2.match(Directory):
+elif set(ext).intersection(set(test2)):
 	print "INFO: Found media files, moving"
 else:
 	print "INFO: Didn't find any compressed archives or media files to process, exiting"
 	sys.exit(-1)
 
 if useLink == 0 and packed == 0: ## copy
-	print ("INFO: Copying all files from %s to %s", Directory, destination)
+	print "INFO: Copying all files from %s to %s." % (Directory, destination)
 	shutil.copytree(Directory, destination)
 
 elif useLink == 1 and packed == 0: ## hardlink
-	print ("INFO: Creating hard link from %s to %s", Directory, destination)
-	shutil.copytree(Directory, destination, copy_function=os.link)
+	print "INFO: Creating hard link from %s to %s." % (Directory, destination)
+	os.mkdir(destination)
+	for dirpath, dirnames, filenames in os.walk(Directory):
+		for file in filenames:
+			os.link(os.path.join(dirpath, file), os.path.join(destination, file))
 	
 elif packed == 1: ## unpack
 	## Using Windows?
@@ -159,7 +182,7 @@ elif packed == 1: ## unpack
 			if ext[1] in EXTRACT_COMMANDS:
 				cmd = EXTRACT_COMMANDS[ext[1]]
 			else:
-				print("ERROR: Unknown file type: %s", ext[1])
+				print "ERROR: Unknown file type: %s" % (ext[1])
 				continue
 
 		## Create destination folder
@@ -167,14 +190,13 @@ elif packed == 1: ## unpack
 			try:
 				os.makedirs(destination)
 			except Exception, e:
-				print("ERROR: Not possible to create destination folder: %s", e)
+				print "ERROR: Not possible to create destination folder: %s" % (e)
 				continue
 
-		print("INFO: Extracting to %s", destination)
-
+		print"INFO: Extracting to %s" % (destination)
 	
 		## Running..	
-		print("INFO: Extracting %s %s %s %s", cmd[0], cmd[1], fp, destination)
+		print "INFO: Extracting %s %s %s %s" % (cmd[0], cmd[1], fp, destination)
 		pwd = os.getcwd() # Get our Present Working Directory
 		os.chdir(destination) #not all unpack commands accept full paths, so just extract into this directory.
 		if os.name == 'nt': #Windows needs quotes around directory structure
@@ -183,11 +205,11 @@ elif packed == 1: ## unpack
 				res = call(run)
 				if res == 0:
 					status = 0
-					print ("INFO: Extraction was successful for %s to %s", fp, destination)
+					print "INFO: Extraction was successful for %s to %s" % (fp, destination)
 				else:
-					print("ERROR: Extraction failed for %s. 7zip result was %s", fp, res)
+					print "ERROR: Extraction failed for %s. 7zip result was %s" % (fp, res)
 			except:
-				print ("ERROR: Extraction failed for %s. Could not call command %s %s", fp, run)
+				print "ERROR: Extraction failed for %s. Could not call command %s %s" % (fp, run)
 		else:
 			try:
 				if cmd[1] == "": #if calling unzip, we dont want to pass the ""
@@ -196,11 +218,11 @@ elif packed == 1: ## unpack
 					res = call([cmd[0], cmd[1], fp])
 				if res == 0:
 					status = 0
-					print ("INFO: Extraction was successful for %s to %s", fp, destination)
+					print "INFO: Extraction was successful for %s to %s" % (fp, destination)
 				else:
-					print("ERROR: Extraction failed for %s. 7zip result was %s", fp, res)
+					print "ERROR: Extraction failed for %s. 7zip result was %s" % (fp, res)
 			except:
-				print ("ERROR: Extraction failed for %s. Could not call command %s %s %s %s", fp, cmd[0], cmd[1], fp)	
+				print "ERROR: Extraction failed for %s. Could not call command %s %s %s %s" % (fp, cmd[0], cmd[1], fp)	
 		os.chdir(pwd) # Go back to our Original Working Directory
 
 for dirpath, dirnames, filenames in os.walk(destination): #flatten out the directory to make postprocessing easier.
@@ -210,7 +232,7 @@ for dirpath, dirnames, filenames in os.walk(destination): #flatten out the direc
 		try:
 			shutil.move(os.path.join(dirpath, filename), destination)
 		except OSError:
-			print ("INFO: Could not flatten %s ", os.path.join(dirpath, filename))
+			print "INFO: Could not flatten %s " % (os.path.join(dirpath, filename))
 removeEmptyFolders(destination) #cleanup empty directories.
 
 status = int(status)
@@ -222,21 +244,3 @@ elif Category == TV_Cat:
 
 sys.stdout = old_stdout #reset our stdout
 log_file.close() #close the log
-
-def removeEmptyFolders(path):
-	if not os.path.isdir(path):
-    		return
-
-	# remove empty subfolders
-	files = os.listdir(path)
-	if len(files):
-		for f in files:
-			fullpath = os.path.join(path, f)
-			if os.path.isdir(fullpath):
-				removeEmptyFolders(fullpath)
-
-	# if folder empty, delete it
-	files = os.listdir(path)
-	if len(files) == 0:
-		print ("INFO: Removing empty folder: %s", path)
-		os.rmdir(path)

From a8e963acc0ccaf7a5f4a808332eefa0005491a45 Mon Sep 17 00:00:00 2001
From: clinton-hall <fock_wulf@hotmail.com>
Date: Mon, 11 Feb 2013 22:08:48 -0800
Subject: [PATCH 69/73] 4.2

---
 changelog.txt | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/changelog.txt b/changelog.txt
index b3fc4013..190c4cf2 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,5 +1,9 @@
 Change_LOG / History
 
+V4.2 12/02/2013
+
+Fixes to TorrentToMedia
+
 V4.1 02/02/2013
 
 Added Torrent Support (µTorrent and Transmission).

From b24a5edf91e7ddfd14f7194d47342f5955204c96 Mon Sep 17 00:00:00 2001
From: clinton-hall <fock_wulf@hotmail.com>
Date: Tue, 12 Feb 2013 02:53:46 -0800
Subject: [PATCH 70/73] added debug print.

---
 TorrentToMedia.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/TorrentToMedia.py b/TorrentToMedia.py
index d7dac065..fed6789a 100755
--- a/TorrentToMedia.py
+++ b/TorrentToMedia.py
@@ -127,6 +127,8 @@ if set(ext).intersection(set(test)):
 elif set(ext).intersection(set(test2)):
 	print "INFO: Found media files, moving"
 else:
+	print "DEBUG: Found files with extensions %s." % (ext)
+	print "DEBUG: Looking for extensions %s or %s." % (test, tests2)
 	print "INFO: Didn't find any compressed archives or media files to process, exiting"
 	sys.exit(-1)
 

From 3e7fef87b7decf0f88878d441be6276f44198a9a Mon Sep 17 00:00:00 2001
From: clinton-hall <fock_wulf@hotmail.com>
Date: Tue, 12 Feb 2013 02:56:12 -0800
Subject: [PATCH 71/73] Typo

---
 TorrentToMedia.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/TorrentToMedia.py b/TorrentToMedia.py
index fed6789a..2872422b 100755
--- a/TorrentToMedia.py
+++ b/TorrentToMedia.py
@@ -128,7 +128,7 @@ elif set(ext).intersection(set(test2)):
 	print "INFO: Found media files, moving"
 else:
 	print "DEBUG: Found files with extensions %s." % (ext)
-	print "DEBUG: Looking for extensions %s or %s." % (test, tests2)
+	print "DEBUG: Looking for extensions %s or %s." % (test, test2)
 	print "INFO: Didn't find any compressed archives or media files to process, exiting"
 	sys.exit(-1)
 

From c8d3ccb24146502ae6af9c171593ae13b68e00d7 Mon Sep 17 00:00:00 2001
From: clinton-hall <fock_wulf@hotmail.com>
Date: Tue, 12 Feb 2013 03:45:54 -0800
Subject: [PATCH 72/73] Added extra video extensions.

---
 TorrentToMedia.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/TorrentToMedia.py b/TorrentToMedia.py
index 2872422b..f243c1db 100755
--- a/TorrentToMedia.py
+++ b/TorrentToMedia.py
@@ -117,7 +117,7 @@ else:
 	sys.exit(-1)
 
 test = ['.zip', '.rar', '.7z', '.gz', '.bz', '.tar', '.arj']
-test2 = ['.mkv', '.avi', '.divx', '.xvid', '.mov', '.wmv']
+test2 = ['.mkv', '.avi', '.divx', '.xvid', '.mov', '.wmv', '.mp4', '.mpg', '.mpeg']
 f = [filenames for dirpath, dirnames, filenames in os.walk(Directory)]
 ext = [os.path.splitext(file)[1] for file in f[1]]
 if set(ext).intersection(set(test)):

From af825ed96201a0a153f99557970fec2ea5b5f70c Mon Sep 17 00:00:00 2001
From: clinton-hall <fock_wulf@hotmail.com>
Date: Tue, 12 Feb 2013 03:48:46 -0800
Subject: [PATCH 73/73] Consistent logging

---
 TorrentToMedia.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/TorrentToMedia.py b/TorrentToMedia.py
index f243c1db..fee10a6b 100755
--- a/TorrentToMedia.py
+++ b/TorrentToMedia.py
@@ -93,7 +93,7 @@ packed = 0
 config = ConfigParser.ConfigParser()
 configFilename = os.path.join(os.path.dirname(sys.argv[0]), "autoProcessMedia.cfg")
 
-print "INFO: Loading config from ", configFilename
+print "INFO: Loading config from %s" % (configFilename)
 
 if not os.path.isfile(configFilename):
 	print "ERROR: You need an autoProcessMedia.cfg file - did you rename and edit the .sample?"