diff --git a/TorrentToMedia.py b/TorrentToMedia.py index c11d984c..b7e7009f 100755 --- a/TorrentToMedia.py +++ b/TorrentToMedia.py @@ -5,6 +5,8 @@ import autoProcessTV import sys, os, ConfigParser, shutil from subprocess import call +from nzbToMediaEnv import * + def removeEmptyFolders(path): if not os.path.isdir(path): return @@ -26,7 +28,7 @@ def removeEmptyFolders(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.2" +print "INFO: TorrentToMedia %s" % VERSION if len(sys.argv) == 4: ##You can use the following parameters (UTORRENT): ## diff --git a/nzbToCouchPotato.py b/nzbToCouchPotato.py index d43cb7aa..d9bcd664 100755 --- a/nzbToCouchPotato.py +++ b/nzbToCouchPotato.py @@ -1,9 +1,11 @@ #!/usr/bin/env python import sys -import autoProcessMovie +import autoProcessMovie -print "nzbToCouchPotato V4.1" +from nzbToMediaEnv import * + +print "nzbToCouchPotato %s" % VERSION # SABnzbd if len(sys.argv) == 8: @@ -20,15 +22,15 @@ if len(sys.argv) == 8: # NZBGet elif len(sys.argv) == 4: -# NZBGet argv: -# 1 The final directory of the job (full path) -# 2 The original name of the NZB file +# NZBGet argv: +# 1 The final directory of the job (full path) +# 2 The original name of the NZB file # 3 The status of the download: 0 == successful print "Script triggered from NZBGet, starting autoProcessMovie..." - + autoProcessMovie.process(sys.argv[1], sys.argv[2], sys.argv[3]) else: - print "Invalid number of arguments received from client." + print "Invalid number of arguments received from client." print "Running autoProcessMovie as a manual run..." autoProcessMovie.process('Manual Run', 'Manual Run', 0) diff --git a/nzbToMediaEnv.py b/nzbToMediaEnv.py new file mode 100644 index 00000000..922704e1 --- /dev/null +++ b/nzbToMediaEnv.py @@ -0,0 +1,2 @@ + +VERSION = 'V4.2' diff --git a/nzbToSickBeard.py b/nzbToSickBeard.py index 635b36a2..d389097f 100755 --- a/nzbToSickBeard.py +++ b/nzbToSickBeard.py @@ -14,7 +14,7 @@ # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with Sick Beard. If not, see . # @@ -25,7 +25,9 @@ import sys import autoProcessTV -print "nzbToSickBeard V4.1" +from nzbToMediaEnv import * + +print "nzbToSickBeard %s" % VERSION # SABnzbd if len(sys.argv) == 8: @@ -42,15 +44,15 @@ if len(sys.argv) == 8: # NZBGet elif len(sys.argv) == 4: -# NZBGet argv: -# 1 The final directory of the job (full path) -# 2 The original name of the NZB file +# NZBGet argv: +# 1 The final directory of the job (full path) +# 2 The original name of the NZB file # 3 The status of the download: 0 == successful print "Script triggered from NZBGet, starting autoProcessTV..." - + autoProcessTV.processEpisode(sys.argv[1], sys.argv[2], sys.argv[3]) else: - print "Invalid number of arguments received from client." + print "Invalid number of arguments received from client." print "Running autoProcessTV as a manual run..." autoProcessTV.processEpisode('Manual Run', 'Manual Run', 0)