From c6e4ab442ec7a1e7afdb03ca592f4a33b634ccfd Mon Sep 17 00:00:00 2001 From: echel0n Date: Tue, 22 Apr 2014 03:39:29 -0700 Subject: [PATCH] Fixes issue with deleteOriginal being set yet not actually deleting any files. --- nzbtomedia/__init__.py | 5 +++-- nzbtomedia/nzbToMediaUtil.py | 3 +-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/nzbtomedia/__init__.py b/nzbtomedia/__init__.py index 2b120c54..26170489 100644 --- a/nzbtomedia/__init__.py +++ b/nzbtomedia/__init__.py @@ -72,6 +72,7 @@ USELINK = None OUTPUTDIRECTORY = None CATEGORIES = [] NOFLATTEN = [] +DELETE_ORIGINAL = None UTORRENTWEBUI = None UTORRENTUSR = None @@ -140,7 +141,7 @@ def initialize(section=None): TRANSCODE, GIT_PATH, GIT_USER, GIT_BRANCH, GIT_REPO, SYS_ENCODING, NZB_CLIENTAGENT, SABNZBDHOST, SABNZBDPORT, SABNZBDAPIKEY, \ DUPLICATE, IGNOREEXTENSIONS, OUTPUTVIDEOEXTENSION, OUTPUTVIDEOCODEC, OUTPUTVIDEOPRESET, OUTPUTVIDEOFRAMERATE, \ OUTPUTVIDEOBITRATE, OUTPUTAUDIOCODEC, OUTPUTAUDIOBITRATE, OUTPUTSUBTITLECODEC, OUTPUTFASTSTART, OUTPUTQUALITYPERCENT, \ - NICENESS, LOG_DEBUG, FORCE_CLEAN, FFMPEG_PATH, FFMPEG, FFPROBE, AUDIOCONTAINER, EXTCONTAINER, TORRENT_CLASS + NICENESS, LOG_DEBUG, FORCE_CLEAN, FFMPEG_PATH, FFMPEG, FFPROBE, AUDIOCONTAINER, EXTCONTAINER, TORRENT_CLASS, DELETE_ORIGINAL if __INITIALIZED__: return False @@ -229,7 +230,7 @@ def initialize(section=None): OUTPUTDIRECTORY = CFG["Torrent"]["outputDirectory"] # /abs/path/to/complete/ CATEGORIES = (CFG["Torrent"]["categories"]) # music,music_videos,pictures,software NOFLATTEN = (CFG["Torrent"]["noFlatten"]) - + DELETE_ORIGINAL = int(CFG["Torrent"]["deleteOriginal"]) UTORRENTWEBUI = CFG["Torrent"]["uTorrentWEBui"] # http://localhost:8090/gui/ UTORRENTUSR = CFG["Torrent"]["uTorrentUSR"] # mysecretusr UTORRENTPWD = CFG["Torrent"]["uTorrentPWD"] # mysecretpwr diff --git a/nzbtomedia/nzbToMediaUtil.py b/nzbtomedia/nzbToMediaUtil.py index 348bf82c..bc7c3f91 100644 --- a/nzbtomedia/nzbToMediaUtil.py +++ b/nzbtomedia/nzbToMediaUtil.py @@ -501,8 +501,7 @@ def resume_torrent(clientAgent, inputHash, inputID, result, inputName): # Hardlink solution for uTorrent, need to implent support for deluge, transmission if clientAgent in ['utorrent', 'transmission', 'deluge'] and inputHash: # Delete torrent and torrentdata from Torrent client if processing was successful. - if (int(nzbtomedia.CFG["Torrent"][ - "deleteOriginal"]) is 1 and result != 1) or nzbtomedia.USELINK == 'move': # if we move files, nothing to resume seeding. + if (nzbtomedia.DELETE_ORIGINAL == 1 and result != 1) or nzbtomedia.USELINK == 'move': # if we move files, nothing to resume seeding. logger.debug("Deleting torrent %s from %s" % (inputName, clientAgent)) if clientAgent == 'utorrent' and nzbtomedia.TORRENT_CLASS != "": nzbtomedia.TORRENT_CLASS.removedata(inputHash)