diff --git a/nzbToCouchPotato.py b/nzbToCouchPotato.py index aba25932..01f1bcb1 100755 --- a/nzbToCouchPotato.py +++ b/nzbToCouchPotato.py @@ -100,12 +100,12 @@ # getSubs (0, 1). # # set to 1 to download subtitles. -#getSubs = 0 +#getSubs=0 # subLanguages. # # 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). # @@ -120,7 +120,7 @@ # set niceness level. # # Only works on Linux. Highest priority is -20, lowest priority is 19. -#niceness = 0 +#niceness=0 # ignore extensions. # @@ -130,77 +130,80 @@ # outputFastStart (0,1). # # outputFastStart. 1 will use -movflags + faststart. 0 will disable this from being used. -#outputFastStart = 0 +#outputFastStart=0 # outputVideoPath. # # outputVideoPath. Set path you want transcoded videos moved to. Leave blank to disable. -#outputVideoPath = +#outputVideoPath= # processOutput (0,1). # # processOutput. 1 will send the outputVideoPath to SickBeard/CouchPotato. 0 will send original files. -#processOutput = 0 +#processOutput=0 # audioLanguage. # # audioLanguage. set the 3 letter language code you want as your primary audio track. -#audioLanguage = eng +#audioLanguage=eng # allAudioLanguages (0,1). # # allAudioLanguages. 1 will keep all audio tracks (uses AudioCodec3) where available. -#allAudioLanguages = 0 +#allAudioLanguages=0 # allSubLanguages (0,1). # # 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. 1 will embded external sub/srt subs into your video if this is supported. -#embedSubs = 1 +#embedSubs=1 # burnInSubtitle (0,1). # # 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. 1 will extract subs from the video file and save these as external srt files. -#extractSubs = 0 +#extractSubs=0 # externalSubDir. # # 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. 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. -#outputDefault = None +#outputDefault=None # ffmpeg output settings. #outputVideoExtension=.mp4 #outputVideoCodec=libx264 -#VideoCodecAllow = +#VideoCodecAllow= #outputVideoPreset=medium #outputVideoFramerate=24 #outputVideoBitrate=800k -#outputAudioCodec=libmp3lame -#AudioCodecAllow = -#outputAudioBitrate=128k -#outputQualityPercent = 0 -#outputAudioTrack2Codec = libfaac -#AudioCodec2Allow = -#outputAudioTrack2Bitrate = 128k -#outputAudioOtherCodec = libmp3lame -#AudioOtherCodecAllow = -#outputAudioOtherBitrate = 128k -#outputSubtitleCodec = +#outputAudioCodec=ac3 +#AudioCodecAllow= +#outputAudioChannels=6 +#outputAudioBitrate=640k +#outputQualityPercent= +#outputAudioTrack2Codec=libfaac +#AudioCodec2Allow= +#outputAudioTrack2Channels=2 +#outputAudioTrack2Bitrate=160k +#outputAudioOtherCodec=libmp3lame +#AudioOtherCodecAllow= +#outputAudioOtherChannels=2 +#outputAudioOtherBitrate=128k +#outputSubtitleCodec= ## WakeOnLan diff --git a/nzbToSickBeard.py b/nzbToSickBeard.py index 18d92bd8..581c0849 100755 --- a/nzbToSickBeard.py +++ b/nzbToSickBeard.py @@ -108,12 +108,12 @@ # getSubs (0, 1). # # set to 1 to download subtitles. -#getSubs = 0 +#getSubs=0 # subLanguages. # # 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). # @@ -128,7 +128,7 @@ # set niceness level. # # Only works on Linux. Highest priority is -20, lowest priority is 19. -#niceness = 0 +#niceness=0 # ignore extensions. # @@ -138,77 +138,80 @@ # outputFastStart (0,1). # # outputFastStart. 1 will use -movflags + faststart. 0 will disable this from being used. -#outputFastStart = 0 +#outputFastStart=0 # outputVideoPath. # # outputVideoPath. Set path you want transcoded videos moved to. Leave blank to disable. -#outputVideoPath = +#outputVideoPath= # processOutput (0,1). # # processOutput. 1 will send the outputVideoPath to SickBeard/CouchPotato. 0 will send original files. -#processOutput = 0 +#processOutput=0 # audioLanguage. # # audioLanguage. set the 3 letter language code you want as your primary audio track. -#audioLanguage = eng +#audioLanguage=eng # allAudioLanguages (0,1). # # allAudioLanguages. 1 will keep all audio tracks (uses AudioCodec3) where available. -#allAudioLanguages = 0 +#allAudioLanguages=0 # allSubLanguages (0,1). # # 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. 1 will embded external sub/srt subs into your video if this is supported. -#embedSubs = 1 +#embedSubs=1 # burnInSubtitle (0,1). # # 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. 1 will extract subs from the video file and save these as external srt files. -#extractSubs = 0 +#extractSubs=0 # externalSubDir. # # 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. 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. -#outputDefault = None +#outputDefault=None # ffmpeg output settings. #outputVideoExtension=.mp4 #outputVideoCodec=libx264 -#VideoCodecAllow = +#VideoCodecAllow= #outputVideoPreset=medium #outputVideoFramerate=24 #outputVideoBitrate=800k -#outputAudioCodec=libmp3lame -#AudioCodecAllow = -#outputAudioBitrate=128k -#outputQualityPercent = 0 -#outputAudioTrack2Codec = libfaac -#AudioCodec2Allow = -#outputAudioTrack2Bitrate = 128k -#outputAudioOtherCodec = libmp3lame -#AudioOtherCodecAllow = -#outputAudioOtherBitrate = 128k -#outputSubtitleCodec = +#outputAudioCodec=ac3 +#AudioCodecAllow= +#outputAudioChannels=6 +#outputAudioBitrate=640k +#outputQualityPercent= +#outputAudioTrack2Codec=libfaac +#AudioCodec2Allow= +#outputAudioTrack2Channels=2 +#outputAudioTrack2Bitrate=160k +#outputAudioOtherCodec=libmp3lame +#AudioOtherCodecAllow= +#outputAudioOtherChannels=2 +#outputAudioOtherBitrate=128k +#outputSubtitleCodec= ## WakeOnLan diff --git a/nzbtomedia/nzbToMediaUtil.py b/nzbtomedia/nzbToMediaUtil.py index b4a9d7f4..9c389d99 100644 --- a/nzbtomedia/nzbToMediaUtil.py +++ b/nzbtomedia/nzbToMediaUtil.py @@ -534,13 +534,15 @@ def getDirs(section, subsection): to_return.extend(processDir(watch_dir)) elif os.path.exists(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: outputDirectory = os.path.join(nzbtomedia.OUTPUTDIRECTORY, subsection) if os.path.exists(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: logger.debug("No directories identified in %s:%s for post-processing" % (section,subsection))