Browse Source

Property fix

pull/110/head
Ruud 13 years ago
parent
commit
187cd09f04
  1. 2
      couchpotato/core/plugins/manage/main.py
  2. 3
      couchpotato/core/settings/__init__.py
  3. 5
      couchpotato/environment.py

2
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

3
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 = ''):

5
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)

Loading…
Cancel
Save