diff --git a/TorrentToMedia.py b/TorrentToMedia.py index 17d330e5..34aafd46 100755 --- a/TorrentToMedia.py +++ b/TorrentToMedia.py @@ -78,7 +78,7 @@ def main(inputDirectory, inputName, inputCategory, inputHash, inputID): continue # This file has not been recently moved or created, skip it if not (inputCategory == cpsCategory or inputCategory == sbCategory): #process all for non-video categories. - Logger.info("MAIN: Found file %s for category %s", filepath, inputCategory) + Logger.info("MAIN: Found file %s for category %s", filePath, inputCategory) copy_link(filePath, targetDirectory, useLink, outputDestination) elif fileExtension in mediaContainer: # If the file is a video file if is_sample(filePath, inputName, minSampleSize): # Ignore samples diff --git a/autoProcess/Transcoder.py b/autoProcess/Transcoder.py index 59740d61..7c2b6b2a 100644 --- a/autoProcess/Transcoder.py +++ b/autoProcess/Transcoder.py @@ -10,6 +10,7 @@ def Transcode_directory(dirName): if os.name == 'nt': ffmpeg = os.path.join(os.path.dirname(sys.argv[0]), 'ffmpeg\\bin\\ffmpeg.exe') # note, will need to package in this dir. + useNiceness = False if not os.path.isfile(ffmpeg): # problem Logger.error("ffmpeg not found. ffmpeg needs to be located at: %s", ffmpeg) Logger.info("Cannot transcode files in folder %s", dirName) @@ -25,6 +26,7 @@ def Transcode_directory(dirName): ffmpeg = 'ffmpeg' else: ffmpeg = 'ffmpeg' + useNiceness = True config = ConfigParser.ConfigParser() configFilename = os.path.join(os.path.dirname(sys.argv[0]), "autoProcessMedia.cfg") @@ -47,6 +49,8 @@ def Transcode_directory(dirName): outputAudioCodec = config.get("Transcoder", "outputAudioCodec").strip() outputAudioBitrate = config.get("Transcoder", "outputAudioBitrate").strip() outputSubtitleCodec = config.get("Transcoder", "outputSubtitleCodec").strip() + if useNiceness: + niceness = int(config.get("Transcoder", "niceness")) map(lambda ext: ext.strip(), mediaContainer) map(lambda ext: ext.strip(), ignoreExtensions) @@ -65,7 +69,15 @@ def Transcode_directory(dirName): outputVideoExtension = '-transcoded' + outputVideoExtension # adds '-transcoded.ext' newfilePath = os.path.normpath(name + outputVideoExtension) +<<<<<<< HEAD command = [ffmpeg, '-loglevel', 'warning', '-i', filePath, '-map', '0'] +======= + command = [ffmpeg, '-i', filePath, '-map', '0'] + + if useNiceness: + command = ['nice', '-%d' % niceness] + command + +>>>>>>> master if len(outputVideoCodec) > 0: command.append('-c:v') command.append(outputVideoCodec) diff --git a/autoProcessMedia.cfg.sample b/autoProcessMedia.cfg.sample index 9df20158..6c68642f 100644 --- a/autoProcessMedia.cfg.sample +++ b/autoProcessMedia.cfg.sample @@ -104,6 +104,8 @@ minSampleSize = 200 transcode = 0 ###### duplicate =1 will cretae a new file. =0 will replace the original duplicate = 1 +# Only works on Linux. Highest priority is -20, lowest priority is 19. +niceness = 0 ignoreExtensions = .avi,.mkv outputVideoExtension = .mp4 outputVideoCodec = libx264