mirror of
https://github.com/clinton-hall/nzbToMedia.git
synced 2025-07-14 17:22:53 -07:00
Improved detection of empty configuration options
This commit is contained in:
parent
9e00ef72a5
commit
c72240bc2e
1 changed files with 17 additions and 14 deletions
|
@ -39,14 +39,17 @@ def Transcode_directory(dirName):
|
||||||
mediaContainer = (config.get("Extensions", "mediaExtensions")).split(',')
|
mediaContainer = (config.get("Extensions", "mediaExtensions")).split(',')
|
||||||
duplicate = int(config.get("Transcoder", "duplicate"))
|
duplicate = int(config.get("Transcoder", "duplicate"))
|
||||||
ignoreExtensions = (config.get("Transcoder", "ignoreExtensions")).split(',')
|
ignoreExtensions = (config.get("Transcoder", "ignoreExtensions")).split(',')
|
||||||
outputVideoExtension = config.get("Transcoder", "outputVideoExtension")
|
outputVideoExtension = config.get("Transcoder", "outputVideoExtension").strip()
|
||||||
outputVideoCodec = config.get("Transcoder", "outputVideoCodec")
|
outputVideoCodec = config.get("Transcoder", "outputVideoCodec").strip()
|
||||||
outputVideoPreset = config.get("Transcoder", "outputVideoPreset")
|
outputVideoPreset = config.get("Transcoder", "outputVideoPreset").strip()
|
||||||
outputVideoFramerate = config.get("Transcoder", "outputVideoFramerate")
|
outputVideoFramerate = config.get("Transcoder", "outputVideoFramerate").strip()
|
||||||
outputVideoBitrate = config.get("Transcoder", "outputVideoBitrate")
|
outputVideoBitrate = config.get("Transcoder", "outputVideoBitrate").strip()
|
||||||
outputAudioCodec = config.get("Transcoder", "outputAudioCodec")
|
outputAudioCodec = config.get("Transcoder", "outputAudioCodec").strip()
|
||||||
outputAudioBitrate = config.get("Transcoder", "outputAudioBitrate")
|
outputAudioBitrate = config.get("Transcoder", "outputAudioBitrate").strip()
|
||||||
outputSubtitleCodec = config.get("Transcoder", "outputSubtitleCodec")
|
outputSubtitleCodec = config.get("Transcoder", "outputSubtitleCodec").strip()
|
||||||
|
|
||||||
|
map(lambda ext: ext.strip(), mediaContainer)
|
||||||
|
map(lambda ext: ext.strip(), ignoreExtensions)
|
||||||
|
|
||||||
Logger.info("Checking for files to be transcoded")
|
Logger.info("Checking for files to be transcoded")
|
||||||
final_result = 0 # initialize as successful
|
final_result = 0 # initialize as successful
|
||||||
|
@ -63,7 +66,7 @@ def Transcode_directory(dirName):
|
||||||
newfilePath = os.path.normpath(name + outputVideoExtension)
|
newfilePath = os.path.normpath(name + outputVideoExtension)
|
||||||
|
|
||||||
command = [ffmpeg, '-i', filePath, '-map', '0']
|
command = [ffmpeg, '-i', filePath, '-map', '0']
|
||||||
if outputVideoCodec:
|
if len(outputVideoCodec) > 0:
|
||||||
command.append('-c:v')
|
command.append('-c:v')
|
||||||
command.append(outputVideoCodec)
|
command.append(outputVideoCodec)
|
||||||
if outputVideoCodec == 'libx264' and outputVideoPreset:
|
if outputVideoCodec == 'libx264' and outputVideoPreset:
|
||||||
|
@ -72,22 +75,22 @@ def Transcode_directory(dirName):
|
||||||
else:
|
else:
|
||||||
command.append('-c:v')
|
command.append('-c:v')
|
||||||
command.append('copy')
|
command.append('copy')
|
||||||
if outputVideoFramerate:
|
if len(outputVideoFramerate) > 0:
|
||||||
command.append('-r')
|
command.append('-r')
|
||||||
command.append(outputVideoFramerate)
|
command.append(outputVideoFramerate)
|
||||||
if outputVideoBitrate:
|
if len(outputVideoBitrate) > 0:
|
||||||
command.append('-b:v')
|
command.append('-b:v')
|
||||||
command.append(outputVideoBitrate)
|
command.append(outputVideoBitrate)
|
||||||
if outputAudioCodec:
|
if len(outputAudioCodec) > 0:
|
||||||
command.append('-c:a')
|
command.append('-c:a')
|
||||||
command.append(outputAudioCodec)
|
command.append(outputAudioCodec)
|
||||||
else:
|
else:
|
||||||
command.append('-c:a')
|
command.append('-c:a')
|
||||||
command.append('copy')
|
command.append('copy')
|
||||||
if outputAudioBitrate:
|
if len(outputAudioBitrate) > 0:
|
||||||
command.append('-b:a')
|
command.append('-b:a')
|
||||||
command.append(outputAudioBitrate)
|
command.append(outputAudioBitrate)
|
||||||
if outputSubtitleCodec:
|
if len(outputSubtitleCodec) > 0:
|
||||||
command.append('-c:s')
|
command.append('-c:s')
|
||||||
command.append(outputSubtitleCodec)
|
command.append(outputSubtitleCodec)
|
||||||
else:
|
else:
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue