github/nzbToMedia
1
0
Fork 0
mirror of https://github.com/clinton-hall/nzbToMedia.git synced 2025-08-20 21:33:13 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix migrate issue for remote_path and categories enabled. #417 #412 #414

Browse source
This commit is contained in:
clinton-hall 2014-06-04 08:05:28 +09:30
commit df4001c9e4
1 changed files with 14 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
nzbtomedia/nzbToMediaConfig.py
View file

@ -163,18 +163,16 @@ class ConfigObj(configobj.ConfigObj, Section):
CFG_NEW['Extensions'][option] = value CFG_NEW['Extensions'][option] = value
values.pop(option) values.pop(option)
if option == "useLink": # Sym links supported now as well. if option == "useLink": # Sym links supported now as well.
if isinstance(value, int): if value in ['1', 1]:
num_value = int(value)
if num_value == 1:
value = 'hard' value = 'hard'
else: elif value in ['0', 0]:
value = 'no' value = 'no'
values[option] = value values[option] = value
if option == "forceClean": if option == "forceClean":
CFG_NEW['General']['force_clean'] = value CFG_NEW['General']['force_clean'] = value
values.pop(option) values.pop(option)
if option == "remote_path": if option == "remote_path":
if value and not isinstance(value, int): if value and not value in ['0', '1', 0, 1]:
value = 1 value = 1
elif not value: elif not value:
value = 0 value = 0
@ -236,6 +234,10 @@ class ConfigObj(configobj.ConfigObj, Section):
CFG_NEW = config() CFG_NEW = config()
try: try:
if os.environ.has_key('NZBPO_NDCATEGORY') and os.environ.has_key('NZBPO_SBCATEGORY'):
if os.environ('NZBPO_NDCATEGORY') == os.environ('NZBPO_SBCATEGORY'):
logger.warning("%s category is set for SickBeard and NzbDrone. Please check your config in NZBGet" % (os.environ('NZBPO_NDCATEGORY')))
section = "Nzb" section = "Nzb"
key = 'NZBOP_DESTDIR' key = 'NZBOP_DESTDIR'
if os.environ.has_key(key): if os.environ.has_key(key):
@ -292,6 +294,8 @@ class ConfigObj(configobj.ConfigObj, Section):
CFG_NEW[section][os.environ[envCatKey]] = {} CFG_NEW[section][os.environ[envCatKey]] = {}
CFG_NEW[section][os.environ[envCatKey]][option] = value CFG_NEW[section][os.environ[envCatKey]][option] = value
CFG_NEW[section][os.environ[envCatKey]]['enabled'] = 1 CFG_NEW[section][os.environ[envCatKey]]['enabled'] = 1
if os.environ[envCatKey] in CFG_NEW['NzbDrone'].sections:
CFG_NEW['NzbDrone'][envCatKey]['enabled'] = 0
section = "HeadPhones" section = "HeadPhones"
envCatKey = 'NZBPO_HPCATEGORY' envCatKey = 'NZBPO_HPCATEGORY'
@ -352,6 +356,8 @@ class ConfigObj(configobj.ConfigObj, Section):
CFG_NEW[section][os.environ[envCatKey]] = {} CFG_NEW[section][os.environ[envCatKey]] = {}
CFG_NEW[section][os.environ[envCatKey]][option] = value CFG_NEW[section][os.environ[envCatKey]][option] = value
CFG_NEW[section][os.environ[envCatKey]]['enabled'] = 1 CFG_NEW[section][os.environ[envCatKey]]['enabled'] = 1
if os.environ[envCatKey] in CFG_NEW['SickBeard'].sections:
CFG_NEW['SickBeard'][envCatKey]['enabled'] = 0
section = "Extensions" section = "Extensions"
envKeys = ['COMPRESSEDEXTENSIONS', 'MEDIAEXTENSIONS', 'METAEXTENSIONS'] envKeys = ['COMPRESSEDEXTENSIONS', 'MEDIAEXTENSIONS', 'METAEXTENSIONS']