mirror of
https://github.com/clinton-hall/nzbToMedia.git
synced 2025-07-14 17:22:53 -07:00
Added in a config class to access main config properly and now can be called from anywhere in the code by creating a instance.
Re-coded migratecfg, vast improvements made and code cleanup of unrequired checks. Fixed numerous small bugs throughout nzbToMedia including possible calls to variables that may not have been created do to conditional statements.
This commit is contained in:
parent
08bd4584d8
commit
6d45257035
29 changed files with 348 additions and 543 deletions
|
@ -1,10 +1,11 @@
|
|||
import sys
|
||||
import os
|
||||
import ConfigParser
|
||||
import logging
|
||||
import errno
|
||||
from subprocess import call
|
||||
|
||||
from nzbToMediaConfig import *
|
||||
|
||||
|
||||
Logger = logging.getLogger()
|
||||
|
||||
def Transcode_directory(dirName):
|
||||
|
@ -28,32 +29,28 @@ def Transcode_directory(dirName):
|
|||
else:
|
||||
ffmpeg = 'ffmpeg'
|
||||
useNiceness = True
|
||||
|
||||
config = ConfigParser.ConfigParser()
|
||||
configFilename = os.path.join(os.path.dirname(sys.argv[0]), "autoProcessMedia.cfg")
|
||||
Logger.info("Loading config from %s", configFilename)
|
||||
|
||||
if not os.path.isfile(configFilename):
|
||||
Logger.info("Loading config from %s", CONFIG_FILE)
|
||||
|
||||
if not config():
|
||||
Logger.error("You need an autoProcessMedia.cfg file - did you rename and edit the .sample?")
|
||||
return 1 # failure
|
||||
|
||||
config.read(configFilename)
|
||||
|
||||
mediaContainer = (config.get("Extensions", "mediaExtensions")).split(',')
|
||||
duplicate = int(config.get("Transcoder", "duplicate"))
|
||||
ignoreExtensions = (config.get("Transcoder", "ignoreExtensions")).split(',')
|
||||
outputVideoExtension = config.get("Transcoder", "outputVideoExtension").strip()
|
||||
outputVideoCodec = config.get("Transcoder", "outputVideoCodec").strip()
|
||||
outputVideoPreset = config.get("Transcoder", "outputVideoPreset").strip()
|
||||
outputVideoFramerate = config.get("Transcoder", "outputVideoFramerate").strip()
|
||||
outputVideoBitrate = config.get("Transcoder", "outputVideoBitrate").strip()
|
||||
outputAudioCodec = config.get("Transcoder", "outputAudioCodec").strip()
|
||||
outputAudioBitrate = config.get("Transcoder", "outputAudioBitrate").strip()
|
||||
outputSubtitleCodec = config.get("Transcoder", "outputSubtitleCodec").strip()
|
||||
outputFastStart = int(config.get("Transcoder", "outputFastStart"))
|
||||
outputQualityPercent = int(config.get("Transcoder", "outputQualityPercent"))
|
||||
mediaContainer = (config().get("Extensions", "mediaExtensions")).split(',')
|
||||
duplicate = int(config().get("Transcoder", "duplicate"))
|
||||
ignoreExtensions = (config().get("Transcoder", "ignoreExtensions")).split(',')
|
||||
outputVideoExtension = config().get("Transcoder", "outputVideoExtension").strip()
|
||||
outputVideoCodec = config().get("Transcoder", "outputVideoCodec").strip()
|
||||
outputVideoPreset = config().get("Transcoder", "outputVideoPreset").strip()
|
||||
outputVideoFramerate = config().get("Transcoder", "outputVideoFramerate").strip()
|
||||
outputVideoBitrate = config().get("Transcoder", "outputVideoBitrate").strip()
|
||||
outputAudioCodec = config().get("Transcoder", "outputAudioCodec").strip()
|
||||
outputAudioBitrate = config().get("Transcoder", "outputAudioBitrate").strip()
|
||||
outputSubtitleCodec = config().get("Transcoder", "outputSubtitleCodec").strip()
|
||||
outputFastStart = int(config().get("Transcoder", "outputFastStart"))
|
||||
outputQualityPercent = int(config().get("Transcoder", "outputQualityPercent"))
|
||||
if useNiceness:
|
||||
niceness = int(config.get("Transcoder", "niceness"))
|
||||
niceness = int(config().get("Transcoder", "niceness"))
|
||||
|
||||
map(lambda ext: ext.strip(), mediaContainer)
|
||||
map(lambda ext: ext.strip(), ignoreExtensions)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue