add Transcode options to all scripts. Add more logging for manual. #474

This commit is contained in:
clinton-hall 2014-07-12 07:56:25 +09:30
commit 011bcfad55
3 changed files with 62 additions and 54 deletions

View file

@ -100,12 +100,12 @@
# getSubs (0, 1). # getSubs (0, 1).
# #
# set to 1 to download subtitles. # set to 1 to download subtitles.
#getSubs = 0 #getSubs=0
# subLanguages. # subLanguages.
# #
# subLanguages. create a list of languages in the order you want them in your subtitles. # subLanguages. create a list of languages in the order you want them in your subtitles.
#subLanguages = eng,spa,fra #subLanguages=eng,spa,fra
# Transcode (0, 1). # Transcode (0, 1).
# #
@ -120,7 +120,7 @@
# set niceness level. # set niceness level.
# #
# Only works on Linux. Highest priority is -20, lowest priority is 19. # Only works on Linux. Highest priority is -20, lowest priority is 19.
#niceness = 0 #niceness=0
# ignore extensions. # ignore extensions.
# #
@ -130,77 +130,80 @@
# outputFastStart (0,1). # outputFastStart (0,1).
# #
# outputFastStart. 1 will use -movflags + faststart. 0 will disable this from being used. # outputFastStart. 1 will use -movflags + faststart. 0 will disable this from being used.
#outputFastStart = 0 #outputFastStart=0
# outputVideoPath. # outputVideoPath.
# #
# outputVideoPath. Set path you want transcoded videos moved to. Leave blank to disable. # outputVideoPath. Set path you want transcoded videos moved to. Leave blank to disable.
#outputVideoPath = #outputVideoPath=
# processOutput (0,1). # processOutput (0,1).
# #
# processOutput. 1 will send the outputVideoPath to SickBeard/CouchPotato. 0 will send original files. # processOutput. 1 will send the outputVideoPath to SickBeard/CouchPotato. 0 will send original files.
#processOutput = 0 #processOutput=0
# audioLanguage. # audioLanguage.
# #
# audioLanguage. set the 3 letter language code you want as your primary audio track. # audioLanguage. set the 3 letter language code you want as your primary audio track.
#audioLanguage = eng #audioLanguage=eng
# allAudioLanguages (0,1). # allAudioLanguages (0,1).
# #
# allAudioLanguages. 1 will keep all audio tracks (uses AudioCodec3) where available. # allAudioLanguages. 1 will keep all audio tracks (uses AudioCodec3) where available.
#allAudioLanguages = 0 #allAudioLanguages=0
# allSubLanguages (0,1). # allSubLanguages (0,1).
# #
# allSubLanguages. 1 will keep all exisiting sub languages. 0 will discare those not in your list above. # allSubLanguages. 1 will keep all exisiting sub languages. 0 will discare those not in your list above.
#allSubLanguages = 0 #allSubLanguages=0
# embedSubs (0,1). # embedSubs (0,1).
# #
# embedSubs. 1 will embded external sub/srt subs into your video if this is supported. # embedSubs. 1 will embded external sub/srt subs into your video if this is supported.
#embedSubs = 1 #embedSubs=1
# burnInSubtitle (0,1). # burnInSubtitle (0,1).
# #
# burnInSubtitle. burns the default sub language into your video (needed for players that don't support subs) # burnInSubtitle. burns the default sub language into your video (needed for players that don't support subs)
#burnInSubtitle = 0 #burnInSubtitle=0
# extractSubs (0,1). # extractSubs (0,1).
# #
# extractSubs. 1 will extract subs from the video file and save these as external srt files. # extractSubs. 1 will extract subs from the video file and save these as external srt files.
#extractSubs = 0 #extractSubs=0
# externalSubDir. # externalSubDir.
# #
# externalSubDir. set the directory where subs should be saved (if not the same directory as the video) # externalSubDir. set the directory where subs should be saved (if not the same directory as the video)
#externalSubDir = #externalSubDir=
# outputDefault (None, iPad, iPad-1080p, iPad-720p, Apple-TV2, iPod, iPhone, PS3, Roku-1080p, Roku-720p, Roku-480p). # outputDefault (None, iPad, iPad-1080p, iPad-720p, Apple-TV2, iPod, iPhone, PS3, Roku-1080p, Roku-720p, Roku-480p).
# #
# outputDefault. Loads default configs for the selected device. The remaining options below are ignored. # outputDefault. Loads default configs for the selected device. The remaining options below are ignored.
# If you want to use your own profile, set None and set the remaining options below. # If you want to use your own profile, set None and set the remaining options below.
#outputDefault = None #outputDefault=None
# ffmpeg output settings. # ffmpeg output settings.
#outputVideoExtension=.mp4 #outputVideoExtension=.mp4
#outputVideoCodec=libx264 #outputVideoCodec=libx264
#VideoCodecAllow = #VideoCodecAllow=
#outputVideoPreset=medium #outputVideoPreset=medium
#outputVideoFramerate=24 #outputVideoFramerate=24
#outputVideoBitrate=800k #outputVideoBitrate=800k
#outputAudioCodec=libmp3lame #outputAudioCodec=ac3
#AudioCodecAllow = #AudioCodecAllow=
#outputAudioBitrate=128k #outputAudioChannels=6
#outputQualityPercent = 0 #outputAudioBitrate=640k
#outputAudioTrack2Codec = libfaac #outputQualityPercent=
#AudioCodec2Allow = #outputAudioTrack2Codec=libfaac
#outputAudioTrack2Bitrate = 128k #AudioCodec2Allow=
#outputAudioOtherCodec = libmp3lame #outputAudioTrack2Channels=2
#AudioOtherCodecAllow = #outputAudioTrack2Bitrate=160k
#outputAudioOtherBitrate = 128k #outputAudioOtherCodec=libmp3lame
#outputSubtitleCodec = #AudioOtherCodecAllow=
#outputAudioOtherChannels=2
#outputAudioOtherBitrate=128k
#outputSubtitleCodec=
## WakeOnLan ## WakeOnLan

View file

@ -108,12 +108,12 @@
# getSubs (0, 1). # getSubs (0, 1).
# #
# set to 1 to download subtitles. # set to 1 to download subtitles.
#getSubs = 0 #getSubs=0
# subLanguages. # subLanguages.
# #
# subLanguages. create a list of languages in the order you want them in your subtitles. # subLanguages. create a list of languages in the order you want them in your subtitles.
#subLanguages = eng,spa,fra #subLanguages=eng,spa,fra
# Transcode (0, 1). # Transcode (0, 1).
# #
@ -128,7 +128,7 @@
# set niceness level. # set niceness level.
# #
# Only works on Linux. Highest priority is -20, lowest priority is 19. # Only works on Linux. Highest priority is -20, lowest priority is 19.
#niceness = 0 #niceness=0
# ignore extensions. # ignore extensions.
# #
@ -138,77 +138,80 @@
# outputFastStart (0,1). # outputFastStart (0,1).
# #
# outputFastStart. 1 will use -movflags + faststart. 0 will disable this from being used. # outputFastStart. 1 will use -movflags + faststart. 0 will disable this from being used.
#outputFastStart = 0 #outputFastStart=0
# outputVideoPath. # outputVideoPath.
# #
# outputVideoPath. Set path you want transcoded videos moved to. Leave blank to disable. # outputVideoPath. Set path you want transcoded videos moved to. Leave blank to disable.
#outputVideoPath = #outputVideoPath=
# processOutput (0,1). # processOutput (0,1).
# #
# processOutput. 1 will send the outputVideoPath to SickBeard/CouchPotato. 0 will send original files. # processOutput. 1 will send the outputVideoPath to SickBeard/CouchPotato. 0 will send original files.
#processOutput = 0 #processOutput=0
# audioLanguage. # audioLanguage.
# #
# audioLanguage. set the 3 letter language code you want as your primary audio track. # audioLanguage. set the 3 letter language code you want as your primary audio track.
#audioLanguage = eng #audioLanguage=eng
# allAudioLanguages (0,1). # allAudioLanguages (0,1).
# #
# allAudioLanguages. 1 will keep all audio tracks (uses AudioCodec3) where available. # allAudioLanguages. 1 will keep all audio tracks (uses AudioCodec3) where available.
#allAudioLanguages = 0 #allAudioLanguages=0
# allSubLanguages (0,1). # allSubLanguages (0,1).
# #
# allSubLanguages. 1 will keep all exisiting sub languages. 0 will discare those not in your list above. # allSubLanguages. 1 will keep all exisiting sub languages. 0 will discare those not in your list above.
#allSubLanguages = 0 #allSubLanguages=0
# embedSubs (0,1). # embedSubs (0,1).
# #
# embedSubs. 1 will embded external sub/srt subs into your video if this is supported. # embedSubs. 1 will embded external sub/srt subs into your video if this is supported.
#embedSubs = 1 #embedSubs=1
# burnInSubtitle (0,1). # burnInSubtitle (0,1).
# #
# burnInSubtitle. burns the default sub language into your video (needed for players that don't support subs) # burnInSubtitle. burns the default sub language into your video (needed for players that don't support subs)
#burnInSubtitle = 0 #burnInSubtitle=0
# extractSubs (0,1). # extractSubs (0,1).
# #
# extractSubs. 1 will extract subs from the video file and save these as external srt files. # extractSubs. 1 will extract subs from the video file and save these as external srt files.
#extractSubs = 0 #extractSubs=0
# externalSubDir. # externalSubDir.
# #
# externalSubDir. set the directory where subs should be saved (if not the same directory as the video) # externalSubDir. set the directory where subs should be saved (if not the same directory as the video)
#externalSubDir = #externalSubDir=
# outputDefault (None, iPad, iPad-1080p, iPad-720p, Apple-TV2, iPod, iPhone, PS3, Roku-1080p, Roku-720p, Roku-480p). # outputDefault (None, iPad, iPad-1080p, iPad-720p, Apple-TV2, iPod, iPhone, PS3, Roku-1080p, Roku-720p, Roku-480p).
# #
# outputDefault. Loads default configs for the selected device. The remaining options below are ignored. # outputDefault. Loads default configs for the selected device. The remaining options below are ignored.
# If you want to use your own profile, set None and set the remaining options below. # If you want to use your own profile, set None and set the remaining options below.
#outputDefault = None #outputDefault=None
# ffmpeg output settings. # ffmpeg output settings.
#outputVideoExtension=.mp4 #outputVideoExtension=.mp4
#outputVideoCodec=libx264 #outputVideoCodec=libx264
#VideoCodecAllow = #VideoCodecAllow=
#outputVideoPreset=medium #outputVideoPreset=medium
#outputVideoFramerate=24 #outputVideoFramerate=24
#outputVideoBitrate=800k #outputVideoBitrate=800k
#outputAudioCodec=libmp3lame #outputAudioCodec=ac3
#AudioCodecAllow = #AudioCodecAllow=
#outputAudioBitrate=128k #outputAudioChannels=6
#outputQualityPercent = 0 #outputAudioBitrate=640k
#outputAudioTrack2Codec = libfaac #outputQualityPercent=
#AudioCodec2Allow = #outputAudioTrack2Codec=libfaac
#outputAudioTrack2Bitrate = 128k #AudioCodec2Allow=
#outputAudioOtherCodec = libmp3lame #outputAudioTrack2Channels=2
#AudioOtherCodecAllow = #outputAudioTrack2Bitrate=160k
#outputAudioOtherBitrate = 128k #outputAudioOtherCodec=libmp3lame
#outputSubtitleCodec = #AudioOtherCodecAllow=
#outputAudioOtherChannels=2
#outputAudioOtherBitrate=128k
#outputSubtitleCodec=
## WakeOnLan ## WakeOnLan

View file

@ -534,13 +534,15 @@ def getDirs(section, subsection):
to_return.extend(processDir(watch_dir)) to_return.extend(processDir(watch_dir))
elif os.path.exists(nzbtomedia.CFG[section][subsection]["watch_dir"]): elif os.path.exists(nzbtomedia.CFG[section][subsection]["watch_dir"]):
to_return.extend(processDir(nzbtomedia.CFG[section][subsection]["watch_dir"])) to_return.extend(processDir(nzbtomedia.CFG[section][subsection]["watch_dir"]))
except:pass except:
logger.error("Failed to add directories from %s for post-processing." % (nzbtomedia.CFG[section][subsection]["watch_dir"]))
try: try:
outputDirectory = os.path.join(nzbtomedia.OUTPUTDIRECTORY, subsection) outputDirectory = os.path.join(nzbtomedia.OUTPUTDIRECTORY, subsection)
if os.path.exists(outputDirectory): if os.path.exists(outputDirectory):
to_return.extend(processDir(outputDirectory)) to_return.extend(processDir(outputDirectory))
except:pass except:
logger.error("Failed to add directories from %s for post-processing." % (nzbtomedia.OUTPUTDIRECTORY))
if not to_return: if not to_return:
logger.debug("No directories identified in %s:%s for post-processing" % (section,subsection)) logger.debug("No directories identified in %s:%s for post-processing" % (section,subsection))