diff --git a/couchpotato/core/plugins/manage/main.py b/couchpotato/core/plugins/manage/main.py index 7ce0ecad..9db06f52 100644 --- a/couchpotato/core/plugins/manage/main.py +++ b/couchpotato/core/plugins/manage/main.py @@ -41,7 +41,7 @@ class Manage(Plugin): def updateLibrary(self, full = True): - last_update = float(Env.prop('manage.last_update')) + last_update = float(Env.prop('manage.last_update', default = 0)) if self.isDisabled() or (last_update > time.time() - 20): return diff --git a/couchpotato/core/settings/__init__.py b/couchpotato/core/settings/__init__.py index 9c4c8fff..48c7c329 100644 --- a/couchpotato/core/settings/__init__.py +++ b/couchpotato/core/settings/__init__.py @@ -199,9 +199,8 @@ class Settings(object): db = get_session() try: prop = db.query(Properties).filter_by(identifier = identifier).first() - return prop.value + return prop.value if prop else None except: - print traceback.format_exc() return None def setProperty(self, identifier, value = ''): diff --git a/couchpotato/environment.py b/couchpotato/environment.py index ec2fbbf1..1ac184f0 100644 --- a/couchpotato/environment.py +++ b/couchpotato/environment.py @@ -62,10 +62,11 @@ class Env(object): return s @staticmethod - def prop(identifier, value = None): + def prop(identifier, value = None, default = None): s = Env.get('settings') if value == None: - return s.getProperty(identifier) + v = s.getProperty(identifier) + return v if v else default s.setProperty(identifier, value)