mirror of
https://github.com/clinton-hall/nzbToMedia.git
synced 2025-08-21 22:03:13 -07:00
Added error checking for migration NzbGet code.
Fixed migration code on how it writes backups and new config files.
This commit is contained in:
echel0n
parent
7904330613
commit
9157309131
2 changed files with 117 additions and 117 deletions
|
|
@ -159,11 +159,14 @@ def initialize():
|
||||||
|
|
||||||
# run migrate to convert old cfg to new style cfg plus fix any cfg missing values/options.
|
# run migrate to convert old cfg to new style cfg plus fix any cfg missing values/options.
|
||||||
if not config.migrate():
|
if not config.migrate():
|
||||||
logger.error("Unable to load config from %s", CONFIG_FILE)
|
logger.error("Unable to migrate config file %s, exiting ...", CONFIG_FILE)
|
||||||
sys.exit(-1)
|
sys.exit(-1)
|
||||||
|
|
||||||
|
# run migrate to convert NzbGet data from old cfg style to new cfg style
|
||||||
if os.environ.has_key('NZBOP_SCRIPTDIR'):
|
if os.environ.has_key('NZBOP_SCRIPTDIR'):
|
||||||
config.addnzbget()
|
if not config.addnzbget():
|
||||||
|
logger.error("Unable to migrate NzbGet config file %s, exiting ...", CONFIG_FILE)
|
||||||
|
sys.exit(-1)
|
||||||
|
|
||||||
# load newly migrated config
|
# load newly migrated config
|
||||||
logger.info("Loading config from %s", CONFIG_FILE)
|
logger.info("Loading config from %s", CONFIG_FILE)
|
||||||
|
|
|
||||||
|
|
@ -90,7 +90,7 @@ class ConfigObj(configobj.ConfigObj, Section):
|
||||||
pass
|
pass
|
||||||
|
|
||||||
# check for autoProcessMedia.cfg and autoProcessMedia.cfg.spec and if they don't exist return and fail
|
# check for autoProcessMedia.cfg and autoProcessMedia.cfg.spec and if they don't exist return and fail
|
||||||
if not CFG_NEW or not CFG_OLD:
|
if CFG_NEW is None or CFG_OLD is None:
|
||||||
return False
|
return False
|
||||||
|
|
||||||
subsections = {}
|
subsections = {}
|
||||||
|
|
@ -186,150 +186,147 @@ class ConfigObj(configobj.ConfigObj, Section):
|
||||||
# create a backup of our old config
|
# create a backup of our old config
|
||||||
CFG_OLD.filename = nzbtomedia.CONFIG_FILE + ".old"
|
CFG_OLD.filename = nzbtomedia.CONFIG_FILE + ".old"
|
||||||
CFG_OLD.write()
|
CFG_OLD.write()
|
||||||
CFG_OLD.clear()
|
|
||||||
|
|
||||||
# write our new config to autoProcessMedia.cfg
|
# write our new config to autoProcessMedia.cfg
|
||||||
CFG_NEW.filename = nzbtomedia.CONFIG_FILE
|
CFG_NEW.filename = nzbtomedia.CONFIG_FILE
|
||||||
CFG_NEW.write()
|
CFG_NEW.write()
|
||||||
CFG_NEW.clear()
|
|
||||||
|
|
||||||
return True
|
return True
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def addnzbget():
|
def addnzbget():
|
||||||
# load configs into memory
|
# load configs into memory
|
||||||
CFG_OLD = config(nzbtomedia.CONFIG_FILE)
|
CFG_NEW = config()
|
||||||
CFG_NEW = CFG_OLD
|
|
||||||
|
|
||||||
section = "CouchPotato"
|
try:
|
||||||
envCatKey = 'NZBPO_CPSCATEGORY'
|
section = "CouchPotato"
|
||||||
envKeys = ['ENABLED', 'APIKEY', 'HOST', 'PORT', 'SSL', 'WEB_ROOT', 'DELAY', 'METHOD', 'DELETE_FAILED', 'REMOTECPS', 'WAIT_FOR', 'TIMEPERGIB']
|
envCatKey = 'NZBPO_CPSCATEGORY'
|
||||||
cfgKeys = ['enabled', 'apikey', 'host', 'port', 'ssl', 'web_root', 'delay', 'method', 'delete_failed', 'remoteCPS', 'wait_for', 'TimePerGiB']
|
envKeys = ['ENABLED', 'APIKEY', 'HOST', 'PORT', 'SSL', 'WEB_ROOT', 'DELAY', 'METHOD', 'DELETE_FAILED', 'REMOTECPS', 'WAIT_FOR', 'TIMEPERGIB']
|
||||||
if os.environ.has_key(envCatKey):
|
cfgKeys = ['enabled', 'apikey', 'host', 'port', 'ssl', 'web_root', 'delay', 'method', 'delete_failed', 'remoteCPS', 'wait_for', 'TimePerGiB']
|
||||||
|
if os.environ.has_key(envCatKey):
|
||||||
|
for index in range(len(envKeys)):
|
||||||
|
key = 'NZBPO_CPS' + envKeys[index]
|
||||||
|
if os.environ.has_key(key):
|
||||||
|
option = cfgKeys[index]
|
||||||
|
value = os.environ[key]
|
||||||
|
if os.environ[envCatKey] not in CFG_NEW[section].sections:
|
||||||
|
CFG_NEW[section][os.environ[envCatKey]] = {}
|
||||||
|
CFG_NEW[section][os.environ[envCatKey]][option] = value
|
||||||
|
CFG_NEW[section][os.environ[envCatKey]]['enabled'] = 1
|
||||||
|
|
||||||
|
section = "SickBeard"
|
||||||
|
envCatKey = 'NZBPO_SBCATEGORY'
|
||||||
|
envKeys = ['ENABLED', 'HOST', 'PORT', 'USERNAME', 'PASSWORD', 'SSL', 'WEB_ROOT', 'WATCH_DIR', 'FORK', 'DELETE_FAILED', 'DELAY', 'TIMEPERGIB', 'TORRENT_NOLINK', 'NZBEXTRACTIONBY']
|
||||||
|
cfgKeys = ['enabled', 'host', 'port', 'username', 'password', 'ssl', 'web_root', 'watch_dir', 'fork', 'delete_failed', 'delay', 'TimePerGiB', 'Torrent_NoLink', 'nzbExtractionBy']
|
||||||
|
if os.environ.has_key(envCatKey):
|
||||||
|
for index in range(len(envKeys)):
|
||||||
|
key = 'NZBPO_SB' + envKeys[index]
|
||||||
|
if os.environ.has_key(key):
|
||||||
|
option = cfgKeys[index]
|
||||||
|
value = os.environ[key]
|
||||||
|
if os.environ[envCatKey] not in CFG_NEW[section].sections:
|
||||||
|
CFG_NEW[section][os.environ[envCatKey]] = {}
|
||||||
|
CFG_NEW[section][os.environ[envCatKey]][option] = value
|
||||||
|
CFG_NEW[section][os.environ[envCatKey]]['enabled'] = 1
|
||||||
|
|
||||||
|
section = "HeadPhones"
|
||||||
|
envCatKey = 'NZBPO_HPCATEGORY'
|
||||||
|
envKeys = ['ENABLED', 'APIKEY', 'HOST', 'PORT', 'SSL', 'WEB_ROOT', 'DELAY', 'TIMEPERGIB']
|
||||||
|
cfgKeys = ['enabled', 'apikey', 'host', 'port', 'ssl', 'web_root', 'delay', 'TimePerGiB']
|
||||||
|
if os.environ.has_key(envCatKey):
|
||||||
|
for index in range(len(envKeys)):
|
||||||
|
key = 'NZBPO_HP' + envKeys[index]
|
||||||
|
if os.environ.has_key(key):
|
||||||
|
option = cfgKeys[index]
|
||||||
|
value = os.environ[key]
|
||||||
|
if os.environ[envCatKey] not in CFG_NEW[section].sections:
|
||||||
|
CFG_NEW[section][os.environ[envCatKey]] = {}
|
||||||
|
CFG_NEW[section][os.environ[envCatKey]][option] = value
|
||||||
|
CFG_NEW[section][os.environ[envCatKey]]['enabled'] = 1
|
||||||
|
|
||||||
|
section = "Mylar"
|
||||||
|
envCatKey = 'NZBPO_MYCATEGORY'
|
||||||
|
envKeys = ['ENABLED', 'HOST', 'PORT', 'USERNAME', 'PASSWORD', 'SSL', 'WEB_ROOT']
|
||||||
|
cfgKeys = ['enabled', 'host', 'port', 'username', 'password', 'ssl', 'web_root']
|
||||||
|
if os.environ.has_key(envCatKey):
|
||||||
|
for index in range(len(envKeys)):
|
||||||
|
key = 'NZBPO_MY' + envKeys[index]
|
||||||
|
if os.environ.has_key(key):
|
||||||
|
option = cfgKeys[index]
|
||||||
|
value = os.environ[key]
|
||||||
|
if os.environ[envCatKey] not in CFG_NEW[section].sections:
|
||||||
|
CFG_NEW[section][os.environ[envCatKey]] = {}
|
||||||
|
CFG_NEW[section][os.environ[envCatKey]][option] = value
|
||||||
|
CFG_NEW[section][os.environ[envCatKey]]['enabled'] = 1
|
||||||
|
|
||||||
|
section = "Gamez"
|
||||||
|
envCatKey = 'NZBPO_GZCATEGORY'
|
||||||
|
envKeys = ['ENABLED', 'APIKEY', 'HOST', 'PORT', 'SSL', 'WEB_ROOT']
|
||||||
|
cfgKeys = ['enabled', 'apikey', 'host', 'port', 'ssl', 'web_root']
|
||||||
|
if os.environ.has_key(envCatKey):
|
||||||
|
for index in range(len(envKeys)):
|
||||||
|
key = 'NZBPO_GZ' + envKeys[index]
|
||||||
|
if os.environ.has_key(key):
|
||||||
|
option = cfgKeys[index]
|
||||||
|
value = os.environ[key]
|
||||||
|
if os.environ[envCatKey] not in CFG_NEW[section].sections:
|
||||||
|
CFG_NEW[section][os.environ[envCatKey]] = {}
|
||||||
|
CFG_NEW[section][os.environ[envCatKey]][option] = value
|
||||||
|
CFG_NEW[section][os.environ[envCatKey]]['enabled'] = 1
|
||||||
|
|
||||||
|
section = "NzbDrone"
|
||||||
|
envCatKey = 'NZBPO_NDCATEGORY'
|
||||||
|
envKeys = ['ENABLED', 'HOST', 'PORT', 'USERNAME', 'PASSWORD', 'SSL', 'WEB_ROOT', 'WATCH_DIR', 'FORK', 'DELETE_FAILED', 'DELAY', 'TIMEPERGIB', 'TORRENT_NOLINK', 'NZBEXTRACTIONBY']
|
||||||
|
cfgKeys = ['enabled', 'host', 'port', 'username', 'password', 'ssl', 'web_root', 'watch_dir', 'fork', 'delete_failed', 'delay', 'TimePerGiB', 'Torrent_NoLink', 'nzbExtractionBy']
|
||||||
|
if os.environ.has_key(envCatKey):
|
||||||
|
for index in range(len(envKeys)):
|
||||||
|
key = 'NZBPO_ND' + envKeys[index]
|
||||||
|
if os.environ.has_key(key):
|
||||||
|
option = cfgKeys[index]
|
||||||
|
value = os.environ[key]
|
||||||
|
if os.environ[envCatKey] not in CFG_NEW[section].sections:
|
||||||
|
CFG_NEW[section][os.environ[envCatKey]] = {}
|
||||||
|
CFG_NEW[section][os.environ[envCatKey]][option] = value
|
||||||
|
CFG_NEW[section][os.environ[envCatKey]]['enabled'] = 1
|
||||||
|
|
||||||
|
section = "Extensions"
|
||||||
|
envKeys = ['COMPRESSEDEXTENSIONS', 'MEDIAEXTENSIONS', 'METAEXTENSIONS']
|
||||||
|
cfgKeys = ['compressedExtensions', 'mediaExtensions', 'metaExtensions']
|
||||||
for index in range(len(envKeys)):
|
for index in range(len(envKeys)):
|
||||||
key = 'NZBPO_CPS' + envKeys[index]
|
key = 'NZBPO_' + envKeys[index]
|
||||||
if os.environ.has_key(key):
|
if os.environ.has_key(key):
|
||||||
option = cfgKeys[index]
|
option = cfgKeys[index]
|
||||||
value = os.environ[key]
|
value = os.environ[key]
|
||||||
if os.environ[envCatKey] not in CFG_NEW[section].sections:
|
CFG_NEW[section][option] = value
|
||||||
CFG_NEW[section][os.environ[envCatKey]] = {}
|
|
||||||
CFG_NEW[section][os.environ[envCatKey]][option] = value
|
|
||||||
CFG_NEW[section][os.environ[envCatKey]]['enabled'] = 1
|
|
||||||
|
|
||||||
section = "SickBeard"
|
section = "Transcoder"
|
||||||
envCatKey = 'NZBPO_SBCATEGORY'
|
envKeys = ['TRANSCODE', 'DUPLICATE', 'IGNOREEXTENSIONS', 'OUTPUTVIDEOEXTENSION', 'OUTPUTVIDEOCODEC', 'OUTPUTVIDEOPRESET', 'OUTPUTVIDEOFRAMERATE', 'OUTPUTVIDEOBITRATE', 'OUTPUTAUDIOCODEC', 'OUTPUTAUDIOBITRATE', 'OUTPUTSUBTITLECODEC']
|
||||||
envKeys = ['ENABLED', 'HOST', 'PORT', 'USERNAME', 'PASSWORD', 'SSL', 'WEB_ROOT', 'WATCH_DIR', 'FORK', 'DELETE_FAILED', 'DELAY', 'TIMEPERGIB', 'TORRENT_NOLINK', 'NZBEXTRACTIONBY']
|
cfgKeys = ['transcode', 'duplicate', 'ignoreExtensions', 'outputVideoExtension', 'outputVideoCodec', 'outputVideoPreset', 'outputVideoFramerate', 'outputVideoBitrate', 'outputAudioCodec', 'outputAudioBitrate', 'outputSubtitleCodec']
|
||||||
cfgKeys = ['enabled', 'host', 'port', 'username', 'password', 'ssl', 'web_root', 'watch_dir', 'fork', 'delete_failed', 'delay', 'TimePerGiB', 'Torrent_NoLink', 'nzbExtractionBy']
|
|
||||||
if os.environ.has_key(envCatKey):
|
|
||||||
for index in range(len(envKeys)):
|
for index in range(len(envKeys)):
|
||||||
key = 'NZBPO_SB' + envKeys[index]
|
key = 'NZBPO_' + envKeys[index]
|
||||||
if os.environ.has_key(key):
|
if os.environ.has_key(key):
|
||||||
option = cfgKeys[index]
|
option = cfgKeys[index]
|
||||||
value = os.environ[key]
|
value = os.environ[key]
|
||||||
if os.environ[envCatKey] not in CFG_NEW[section].sections:
|
CFG_NEW[section][option] = value
|
||||||
CFG_NEW[section][os.environ[envCatKey]] = {}
|
|
||||||
CFG_NEW[section][os.environ[envCatKey]][option] = value
|
|
||||||
CFG_NEW[section][os.environ[envCatKey]]['enabled'] = 1
|
|
||||||
|
|
||||||
section = "HeadPhones"
|
section = "WakeOnLan"
|
||||||
envCatKey = 'NZBPO_HPCATEGORY'
|
envKeys = ['WAKE', 'HOST', 'PORT', 'MAC']
|
||||||
envKeys = ['ENABLED', 'APIKEY', 'HOST', 'PORT', 'SSL', 'WEB_ROOT', 'DELAY', 'TIMEPERGIB']
|
cfgKeys = ['wake', 'host', 'port', 'mac']
|
||||||
cfgKeys = ['enabled', 'apikey', 'host', 'port', 'ssl', 'web_root', 'delay', 'TimePerGiB']
|
|
||||||
if os.environ.has_key(envCatKey):
|
|
||||||
for index in range(len(envKeys)):
|
for index in range(len(envKeys)):
|
||||||
key = 'NZBPO_HP' + envKeys[index]
|
key = 'NZBPO_WOL' + envKeys[index]
|
||||||
if os.environ.has_key(key):
|
if os.environ.has_key(key):
|
||||||
option = cfgKeys[index]
|
option = cfgKeys[index]
|
||||||
value = os.environ[key]
|
value = os.environ[key]
|
||||||
if os.environ[envCatKey] not in CFG_NEW[section].sections:
|
CFG_NEW[section][option] = value
|
||||||
CFG_NEW[section][os.environ[envCatKey]] = {}
|
|
||||||
CFG_NEW[section][os.environ[envCatKey]][option] = value
|
|
||||||
CFG_NEW[section][os.environ[envCatKey]]['enabled'] = 1
|
|
||||||
|
|
||||||
section = "Mylar"
|
except:
|
||||||
envCatKey = 'NZBPO_MYCATEGORY'
|
return False
|
||||||
envKeys = ['ENABLED', 'HOST', 'PORT', 'USERNAME', 'PASSWORD', 'SSL', 'WEB_ROOT']
|
|
||||||
cfgKeys = ['enabled', 'host', 'port', 'username', 'password', 'ssl', 'web_root']
|
|
||||||
if os.environ.has_key(envCatKey):
|
|
||||||
for index in range(len(envKeys)):
|
|
||||||
key = 'NZBPO_MY' + envKeys[index]
|
|
||||||
if os.environ.has_key(key):
|
|
||||||
option = cfgKeys[index]
|
|
||||||
value = os.environ[key]
|
|
||||||
if os.environ[envCatKey] not in CFG_NEW[section].sections:
|
|
||||||
CFG_NEW[section][os.environ[envCatKey]] = {}
|
|
||||||
CFG_NEW[section][os.environ[envCatKey]][option] = value
|
|
||||||
CFG_NEW[section][os.environ[envCatKey]]['enabled'] = 1
|
|
||||||
|
|
||||||
section = "Gamez"
|
|
||||||
envCatKey = 'NZBPO_GZCATEGORY'
|
|
||||||
envKeys = ['ENABLED', 'APIKEY', 'HOST', 'PORT', 'SSL', 'WEB_ROOT']
|
|
||||||
cfgKeys = ['enabled', 'apikey', 'host', 'port', 'ssl', 'web_root']
|
|
||||||
if os.environ.has_key(envCatKey):
|
|
||||||
for index in range(len(envKeys)):
|
|
||||||
key = 'NZBPO_GZ' + envKeys[index]
|
|
||||||
if os.environ.has_key(key):
|
|
||||||
option = cfgKeys[index]
|
|
||||||
value = os.environ[key]
|
|
||||||
if os.environ[envCatKey] not in CFG_NEW[section].sections:
|
|
||||||
CFG_NEW[section][os.environ[envCatKey]] = {}
|
|
||||||
CFG_NEW[section][os.environ[envCatKey]][option] = value
|
|
||||||
CFG_NEW[section][os.environ[envCatKey]]['enabled'] = 1
|
|
||||||
|
|
||||||
section = "NzbDrone"
|
|
||||||
envCatKey = 'NZBPO_NDCATEGORY'
|
|
||||||
envKeys = ['ENABLED', 'HOST', 'PORT', 'USERNAME', 'PASSWORD', 'SSL', 'WEB_ROOT', 'WATCH_DIR', 'FORK', 'DELETE_FAILED', 'DELAY', 'TIMEPERGIB', 'TORRENT_NOLINK', 'NZBEXTRACTIONBY']
|
|
||||||
cfgKeys = ['enabled', 'host', 'port', 'username', 'password', 'ssl', 'web_root', 'watch_dir', 'fork', 'delete_failed', 'delay', 'TimePerGiB', 'Torrent_NoLink', 'nzbExtractionBy']
|
|
||||||
if os.environ.has_key(envCatKey):
|
|
||||||
for index in range(len(envKeys)):
|
|
||||||
key = 'NZBPO_ND' + envKeys[index]
|
|
||||||
if os.environ.has_key(key):
|
|
||||||
option = cfgKeys[index]
|
|
||||||
value = os.environ[key]
|
|
||||||
if os.environ[envCatKey] not in CFG_NEW[section].sections:
|
|
||||||
CFG_NEW[section][os.environ[envCatKey]] = {}
|
|
||||||
CFG_NEW[section][os.environ[envCatKey]][option] = value
|
|
||||||
CFG_NEW[section][os.environ[envCatKey]]['enabled'] = 1
|
|
||||||
|
|
||||||
section = "Extensions"
|
|
||||||
envKeys = ['COMPRESSEDEXTENSIONS', 'MEDIAEXTENSIONS', 'METAEXTENSIONS']
|
|
||||||
cfgKeys = ['compressedExtensions', 'mediaExtensions', 'metaExtensions']
|
|
||||||
for index in range(len(envKeys)):
|
|
||||||
key = 'NZBPO_' + envKeys[index]
|
|
||||||
if os.environ.has_key(key):
|
|
||||||
option = cfgKeys[index]
|
|
||||||
value = os.environ[key]
|
|
||||||
CFG_NEW[section][option] = value
|
|
||||||
|
|
||||||
section = "Transcoder"
|
|
||||||
envKeys = ['TRANSCODE', 'DUPLICATE', 'IGNOREEXTENSIONS', 'OUTPUTVIDEOEXTENSION', 'OUTPUTVIDEOCODEC', 'OUTPUTVIDEOPRESET', 'OUTPUTVIDEOFRAMERATE', 'OUTPUTVIDEOBITRATE', 'OUTPUTAUDIOCODEC', 'OUTPUTAUDIOBITRATE', 'OUTPUTSUBTITLECODEC']
|
|
||||||
cfgKeys = ['transcode', 'duplicate', 'ignoreExtensions', 'outputVideoExtension', 'outputVideoCodec', 'outputVideoPreset', 'outputVideoFramerate', 'outputVideoBitrate', 'outputAudioCodec', 'outputAudioBitrate', 'outputSubtitleCodec']
|
|
||||||
for index in range(len(envKeys)):
|
|
||||||
key = 'NZBPO_' + envKeys[index]
|
|
||||||
if os.environ.has_key(key):
|
|
||||||
option = cfgKeys[index]
|
|
||||||
value = os.environ[key]
|
|
||||||
CFG_NEW[section][option] = value
|
|
||||||
|
|
||||||
section = "WakeOnLan"
|
|
||||||
envKeys = ['WAKE', 'HOST', 'PORT', 'MAC']
|
|
||||||
cfgKeys = ['wake', 'host', 'port', 'mac']
|
|
||||||
for index in range(len(envKeys)):
|
|
||||||
key = 'NZBPO_WOL' + envKeys[index]
|
|
||||||
if os.environ.has_key(key):
|
|
||||||
option = cfgKeys[index]
|
|
||||||
value = os.environ[key]
|
|
||||||
CFG_NEW[section][option] = value
|
|
||||||
|
|
||||||
# create a backup of our old config
|
|
||||||
CFG_OLD.filename = nzbtomedia.CONFIG_FILE + ".old"
|
|
||||||
CFG_OLD.write()
|
|
||||||
CFG_OLD.clear()
|
|
||||||
|
|
||||||
# write our new config to autoProcessMedia.cfg
|
# write our new config to autoProcessMedia.cfg
|
||||||
CFG_NEW.filename = nzbtomedia.CONFIG_FILE
|
CFG_NEW.filename = nzbtomedia.CONFIG_FILE
|
||||||
CFG_NEW.write()
|
CFG_NEW.write()
|
||||||
CFG_NEW.clear()
|
|
||||||
|
return True
|
||||||
|
|
||||||
configobj.Section = Section
|
configobj.Section = Section
|
||||||
configobj.ConfigObj = ConfigObj
|
configobj.ConfigObj = ConfigObj
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue