Merge pull request #837 from DxCx/master

Couple of enhancements for Torrents usage

TorrentToMedia.py

@@ -97,7 +97,12 @@ def processTorrent(inputDirectory, inputName, inputCategory, inputHash, inputID,
     if clientAgent != 'manual':
         core.pause_torrent(clientAgent, inputHash, inputID, inputName)
 
-    if uniquePath:
+    # Incase input is not directory, make sure to create one.
+    # This way Processing is isolated.
+    if not os.path.isdir(os.path.join(inputDirectory, inputName)):
+        basename = os.path.splitext(core.sanitizeName(inputName))[0]
+        outputDestination = os.path.join(core.OUTPUTDIRECTORY, inputCategory, basename)
+    elif uniquePath:
         outputDestination = os.path.normpath(
             core.os.path.join(core.OUTPUTDIRECTORY, inputCategory, core.sanitizeName(inputName)))
     else:
@@ -197,6 +202,9 @@ def processTorrent(inputDirectory, inputName, inputCategory, inputHash, inputID,
 
     logger.info("Calling %s:%s to post-process:%s" % (sectionName, usercat, inputName))
 
+    if core.TORRENT_CHMOD_DIRECTORY:
+        core.rchmod(outputDestination, core.TORRENT_CHMOD_DIRECTORY)
+
     result = [ 0, "" ]
     if sectionName == 'UserScript':
         result = external_script(outputDestination, inputName, inputCategory, section[usercat])
@@ -220,7 +228,9 @@ def processTorrent(inputDirectory, inputName, inputCategory, inputHash, inputID,
     plex_update(inputCategory)
 
     if result[0] != 0:
-        if clientAgent != 'manual':
+        if not core.TORRENT_RESUME_ON_FAILURE:
+            logger.error("A problem was reported in the autoProcess* script. torrent won't resume seeding (settings)")
+        elif clientAgent != 'manual':
             logger.error(
                 "A problem was reported in the autoProcess* script. If torrent was paused we will resume seeding")
             core.resume_torrent(clientAgent, inputHash, inputID, inputName)

autoProcessMedia.cfg.spec

@@ -241,6 +241,8 @@
     DelugePWD = your password
     ###### ADVANCED USE - ONLY EDIT IF YOU KNOW WHAT YOU'RE DOING ######
     deleteOriginal = 0
+    chmodDirecotry = 0
+    resumeOnFailure = 1
 
 [Extensions]
     compressedExtensions = .zip,.rar,.7z,.gz,.bz,.tar,.arj,.1,.01,.001

core/__init__.py

@@ -98,7 +98,9 @@ USELINK = None
 OUTPUTDIRECTORY = None
 NOFLATTEN = []
 DELETE_ORIGINAL = None
+TORRENT_CHMOD_DIRECTORY = None
 TORRENT_DEFAULTDIR = None
+TORRENT_RESUME_ON_FAILURE = None
 
 REMOTEPATHS = []
 
@@ -210,9 +212,9 @@ def initialize(section=None):
         ACODEC2, ACODEC2_ALLOW, ABITRATE2, ACODEC3, ACODEC3_ALLOW, ABITRATE3, ALLOWSUBS, SEXTRACT, SEMBED, SLANGUAGES, \
         SINCLUDE, SUBSDIR, SCODEC, OUTPUTFASTSTART, OUTPUTQUALITYPERCENT, BURN, GETSUBS, HWACCEL, LOG_DIR, LOG_FILE, \
         NICENESS, LOG_DEBUG, FORCE_CLEAN, FFMPEG_PATH, FFMPEG, FFPROBE, AUDIOCONTAINER, EXTCONTAINER, TORRENT_CLASS, \
-        DELETE_ORIGINAL, PASSWORDSFILE, USER_DELAY, USER_SCRIPT, USER_SCRIPT_CLEAN, USER_SCRIPT_MEDIAEXTENSIONS, \
+        DELETE_ORIGINAL, TORRENT_CHMOD_DIRECTORY, PASSWORDSFILE, USER_DELAY, USER_SCRIPT, USER_SCRIPT_CLEAN, USER_SCRIPT_MEDIAEXTENSIONS, \
         USER_SCRIPT_PARAM, USER_SCRIPT_RUNONCE, USER_SCRIPT_SUCCESSCODES, DOWNLOADINFO, CHECK_MEDIA, SAFE_MODE, \
-        TORRENT_DEFAULTDIR, NZB_DEFAULTDIR, REMOTEPATHS, LOG_ENV, PID_FILE, MYAPP, ACHANNELS, ACHANNELS2, ACHANNELS3, \
+        TORRENT_DEFAULTDIR, TORRENT_RESUME_ON_FAILURE, NZB_DEFAULTDIR, REMOTEPATHS, LOG_ENV, PID_FILE, MYAPP, ACHANNELS, ACHANNELS2, ACHANNELS3, \
         PLEXSSL, PLEXHOST, PLEXPORT, PLEXTOKEN, PLEXSEC
 
     if __INITIALIZED__:
@@ -339,6 +341,8 @@ def initialize(section=None):
     if isinstance(NOFLATTEN, str): NOFLATTEN = NOFLATTEN.split(',')
     if isinstance(CATEGORIES, str): CATEGORIES = CATEGORIES.split(',')
     DELETE_ORIGINAL = int(CFG["Torrent"]["deleteOriginal"])
+    TORRENT_CHMOD_DIRECTORY = int(CFG["Torrent"]["chmodDirecotry"], 8)
+    TORRENT_RESUME_ON_FAILURE = int(CFG["Torrent"]["resumeOnFailure"])
     UTORRENTWEBUI = CFG["Torrent"]["uTorrentWEBui"]  # http://localhost:8090/gui/
     UTORRENTUSR = CFG["Torrent"]["uTorrentUSR"]  # mysecretusr
     UTORRENTPWD = CFG["Torrent"]["uTorrentPWD"]  # mysecretpwr
@@ -740,3 +744,15 @@ def restart():
         status = p.returncode
 
     os._exit(status)
+
+def rchmod(path, mod):
+    logger.log("Changing file mode of %s to %s" % (path, oct(mod)))
+    os.chmod(path, mod)
+    if not os.path.isdir(path):
+        return # Skip files
+
+    for root, dirs, files in os.walk(path):
+        for d in dirs:
+            os.chmod(os.path.join(root, d), mod)
+        for f in files:
+            os.chmod(os.path.join(root, f), mod)