From a8dbb36f6c3c46dc9ffbc5ea77f50668702b88aa Mon Sep 17 00:00:00 2001 From: clinton-hall Date: Thu, 1 May 2014 09:56:25 +0930 Subject: [PATCH 1/3] added debugging to resolve migration issues. helps #355 --- nzbtomedia/__init__.py | 16 ++++++---------- nzbtomedia/nzbToMediaConfig.py | 23 +++++++++++++---------- 2 files changed, 19 insertions(+), 20 deletions(-) diff --git a/nzbtomedia/__init__.py b/nzbtomedia/__init__.py index 290565d2..623b52c2 100644 --- a/nzbtomedia/__init__.py +++ b/nzbtomedia/__init__.py @@ -196,21 +196,17 @@ def initialize(section=None): if not config.migrate(): logger.error("Unable to migrate config file %s, exiting ..." % (CONFIG_FILE)) if os.environ.has_key('NZBOP_SCRIPTDIR'): - sys.exit(NZBGET_POSTPROCESS_ERROR) + pass # We will try and read config from Environment. else: 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 not config.addnzbget(): - logger.error("Unable to migrate NzbGet config file %s, exiting ..." % (CONFIG_FILE)) - if os.environ.has_key('NZBOP_SCRIPTDIR'): - sys.exit(NZBGET_POSTPROCESS_ERROR) - else: - sys.exit(-1) - # load newly migrated config - logger.info("Loading config from [%s]" % (CONFIG_FILE)) - CFG = config() + CFG = config.addnzbget(): + + else: # load newly migrated config + logger.info("Loading config from [%s]" % (CONFIG_FILE)) + CFG = config() # Enable/Disable DEBUG Logging LOG_DEBUG = int(CFG['General']['log_debug']) diff --git a/nzbtomedia/nzbToMediaConfig.py b/nzbtomedia/nzbToMediaConfig.py index eeb48c28..f819ebe6 100644 --- a/nzbtomedia/nzbToMediaConfig.py +++ b/nzbtomedia/nzbToMediaConfig.py @@ -105,16 +105,16 @@ class ConfigObj(configobj.ConfigObj, Section): if not os.path.isfile(nzbtomedia.CONFIG_FILE): shutil.copyfile(nzbtomedia.CONFIG_SPEC_FILE, nzbtomedia.CONFIG_FILE) CFG_OLD = config(nzbtomedia.CONFIG_FILE) - except: - pass + except Exception, e: + logger.debug("Error %s when copying to .cfg" % (e)) try: # check for autoProcessMedia.cfg.spec and create if it does not exist if not os.path.isfile(nzbtomedia.CONFIG_SPEC_FILE): shutil.copyfile(nzbtomedia.CONFIG_FILE, nzbtomedia.CONFIG_SPEC_FILE) CFG_NEW = config(nzbtomedia.CONFIG_SPEC_FILE) - except: - pass + except Exception, e: + logger.debug("Error %s when copying to .cfg" % (e)) # check for autoProcessMedia.cfg and autoProcessMedia.cfg.spec and if they don't exist return and fail if CFG_NEW is None or CFG_OLD is None: @@ -358,14 +358,17 @@ class ConfigObj(configobj.ConfigObj, Section): value = os.environ[key] CFG_NEW[section][option] = value - except: - return False + except Exception, e: + logger.debug("Error %s when applying NZBGet config" % (e)) - # write our new config to autoProcessMedia.cfg - CFG_NEW.filename = nzbtomedia.CONFIG_FILE - CFG_NEW.write() + try: + # write our new config to autoProcessMedia.cfg + CFG_NEW.filename = nzbtomedia.CONFIG_FILE + CFG_NEW.write() + except Exception, e: + logger.debug("Error %s when writing changes to .cfg" % (e)) - return True + return CFG_NEW configobj.Section = Section configobj.ConfigObj = ConfigObj From 5fdf4e10e3a342b29fe2be2483c77fb595a79039 Mon Sep 17 00:00:00 2001 From: Clinton Hall Date: Thu, 1 May 2014 22:36:54 +0930 Subject: [PATCH 2/3] Error fix for #355 --- nzbtomedia/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nzbtomedia/__init__.py b/nzbtomedia/__init__.py index 623b52c2..42b2f241 100644 --- a/nzbtomedia/__init__.py +++ b/nzbtomedia/__init__.py @@ -202,7 +202,7 @@ def initialize(section=None): # run migrate to convert NzbGet data from old cfg style to new cfg style if os.environ.has_key('NZBOP_SCRIPTDIR'): - CFG = config.addnzbget(): + CFG = config.addnzbget() else: # load newly migrated config logger.info("Loading config from [%s]" % (CONFIG_FILE)) From 607fe185a480fef0871366a6f83c2fa82a12c390 Mon Sep 17 00:00:00 2001 From: Clinton Hall Date: Thu, 1 May 2014 23:00:58 +0930 Subject: [PATCH 3/3] Fix logger. #355 --- nzbtomedia/nzbToMediaConfig.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nzbtomedia/nzbToMediaConfig.py b/nzbtomedia/nzbToMediaConfig.py index f819ebe6..02b94ece 100644 --- a/nzbtomedia/nzbToMediaConfig.py +++ b/nzbtomedia/nzbToMediaConfig.py @@ -3,6 +3,7 @@ import shutil import copy import nzbtomedia from configobj import * +from nzbtomedia import logger from itertools import chain @@ -114,7 +115,7 @@ class ConfigObj(configobj.ConfigObj, Section): shutil.copyfile(nzbtomedia.CONFIG_FILE, nzbtomedia.CONFIG_SPEC_FILE) CFG_NEW = config(nzbtomedia.CONFIG_SPEC_FILE) except Exception, e: - logger.debug("Error %s when copying to .cfg" % (e)) + logger.debug("Error %s when copying to .spec" % (e)) # check for autoProcessMedia.cfg and autoProcessMedia.cfg.spec and if they don't exist return and fail if CFG_NEW is None or CFG_OLD is None: