mirror of
https://github.com/clinton-hall/nzbToMedia.git
synced 2025-07-16 02:02: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,9 +1,8 @@
|
|||
import os
|
||||
import sys
|
||||
import ConfigParser
|
||||
sys.path.insert(0, os.path.join(os.path.dirname(sys.argv[0]),'autoProcess/'))
|
||||
import logging
|
||||
from subprocess import call, Popen, PIPE
|
||||
|
||||
from nzbToMediaConfig import *
|
||||
from subprocess import call, Popen
|
||||
from autoProcess.nzbToMediaUtil import create_destination
|
||||
|
||||
|
||||
|
@ -112,11 +111,9 @@ def extract(filePath, outputDestination):
|
|||
# Create outputDestination folder
|
||||
create_destination(outputDestination)
|
||||
|
||||
config = ConfigParser.ConfigParser()
|
||||
configFilename = os.path.join(os.path.dirname(sys.argv[0]), "autoProcessMedia.cfg")
|
||||
Logger.info("MAIN: Loading config from %s", configFilename)
|
||||
config.read(configFilename)
|
||||
passwordsfile = config.get("passwords", "PassWordFile")
|
||||
Logger.info("MAIN: Loading config from %s", CONFIG_FILE)
|
||||
|
||||
passwordsfile = config().get("passwords", "PassWordFile")
|
||||
if passwordsfile != "" and os.path.isfile(os.path.normpath(passwordsfile)):
|
||||
passwords = [line.strip() for line in open(os.path.normpath(passwordsfile))]
|
||||
else:
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue