From b8b2f4923f01c9381f9c139d7527bc75ee74dcb4 Mon Sep 17 00:00:00 2001 From: echel0n Date: Tue, 15 Apr 2014 17:02:09 -0700 Subject: [PATCH] Headphones fix for issue #321 --- DeleteSamples.py | 12 +++--------- ResetDateTime.py | 11 +++-------- nzbtomedia/autoProcess/autoProcessMusic.py | 2 +- 3 files changed, 7 insertions(+), 18 deletions(-) diff --git a/DeleteSamples.py b/DeleteSamples.py index 386d26dc..03956f6c 100755 --- a/DeleteSamples.py +++ b/DeleteSamples.py @@ -1,12 +1,4 @@ #!/usr/bin/env python - -# adds lib directory to system path -import os -import sys -sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), 'lib'))) - -import nzbtomedia - # ############################################################################## ### NZBGET POST-PROCESSING SCRIPT ### @@ -37,6 +29,9 @@ import nzbtomedia ### NZBGET POST-PROCESSING SCRIPT ### ############################################################################## +import os +import sys +import nzbtomedia def is_sample(filePath, inputName, maxSampleSize, SampleIDs): # 200 MB in bytes @@ -118,7 +113,6 @@ if os.environ.has_key('NZBOP_SCRIPTDIR') and not os.environ['NZBOP_VERSION'][0:5 print "Error: unable to delete file", filePath sys.exit(nzbtomedia.NZBGET_POSTPROCESS_ERROR) sys.exit(nzbtomedia.NZBGET_POSTPROCESS_SUCCESS) - else: print "This script can only be called from NZBGet (11.0 or later)." sys.exit(0) diff --git a/ResetDateTime.py b/ResetDateTime.py index 13e7227b..fc2df369 100755 --- a/ResetDateTime.py +++ b/ResetDateTime.py @@ -1,12 +1,4 @@ #!/usr/bin/env python - -# adds lib directory to system path -import os -import sys -sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), 'lib'))) - -import nzbtomedia - # ############################################################################## ### NZBGET POST-PROCESSING SCRIPT ### @@ -20,6 +12,9 @@ import nzbtomedia ### NZBGET POST-PROCESSING SCRIPT ### ############################################################################## +import os +import sys +import nzbtomedia if os.environ.has_key('NZBOP_SCRIPTDIR') and not os.environ['NZBOP_VERSION'][0:5] < '11.0': print "Script triggered from NZBGet (11.0 or later)." diff --git a/nzbtomedia/autoProcess/autoProcessMusic.py b/nzbtomedia/autoProcess/autoProcessMusic.py index a3a45d25..2c08b164 100644 --- a/nzbtomedia/autoProcess/autoProcessMusic.py +++ b/nzbtomedia/autoProcess/autoProcessMusic.py @@ -78,7 +78,7 @@ class autoProcessMusic: params = {} params['apikey'] = apikey params['cmd'] = "forceProcess" - params['dir'] = dirName + params['dir'] = os.path.dirname(dirName) url = baseURL