ff_plugins/youtube-dl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

3.10

Browse Source
This commit is contained in:
flaskfarm
2022-10-12 15:40:54 +09:00
parent 250cc5084f
commit ba1808fd3f
7 changed files with 67 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/plugin/logic.py
View File

@@ -47,21 +47,20 @@ class Logic(object):
return
for key, value in Logic.db_default.items():
if F.db.session.query(self.P.ModelSetting).filter_by(key=key).count() == 0:
F.db.session.add(self.P.ModelSetting(key, value))
if self.P.ModelSetting.get(key) == None:
self.P.ModelSetting.set(key, value)
for module in self.P.module_list:
if module.page_list is not None:
for page_instance in module.page_list:
if page_instance.db_default is not None:
for key, value in page_instance.db_default.items():
if F.db.session.query(self.P.ModelSetting).filter_by(key=key).count() == 0:
F.db.session.add(self.P.ModelSetting(key, value))
if self.P.ModelSetting.get(key) == None:
self.P.ModelSetting.set(key, value)
if module.db_default is not None:
for key, value in module.db_default.items():
if F.db.session.query(self.P.ModelSetting).filter_by(key=key).count() == 0:
F.db.session.add(self.P.ModelSetting(key, value))
F.db.session.commit()
if self.P.ModelSetting.get(key) == None:
self.P.ModelSetting.set(key, value)
except Exception as e:
self.P.logger.error(f'Exception:{str(e)}')
self.P.logger.error(traceback.format_exc())

29
lib/plugin/model_setting.py
View File

@@ -4,7 +4,7 @@ from framework import F
def get_model_setting(package_name, logger, table_name=None):
class ModelSetting(F.db.Model):
__tablename__ = '%s_setting' % package_name if table_name is None else table_name
__table_args__ = {'mysql_collate': 'utf8_general_ci'}
@@ -27,17 +27,19 @@ def get_model_setting(package_name, logger, table_name=None):
@staticmethod
def get(key):
try:
ret = F.db.session.query(ModelSetting).filter_by(key=key).first()
if ret is not None:
return ret.value.strip()
return None
with F.app.app_context():
ret = F.db.session.query(ModelSetting).filter_by(key=key).first()
if ret is not None:
return ret.value.strip()
return None
except Exception as exception:
logger.error('Exception:%s %s', exception, key)
logger.error(traceback.format_exc())
@staticmethod
def has_key(key):
return (F.db.session.query(ModelSetting).filter_by(key=key).first() is not None)
with F.app.app_context():
return (F.db.session.query(ModelSetting).filter_by(key=key).first() is not None)
@staticmethod
def get_int(key):
@@ -58,13 +60,14 @@ def get_model_setting(package_name, logger, table_name=None):
@staticmethod
def set(key, value):
try:
item = F.db.session.query(ModelSetting).filter_by(key=key).with_for_update().first()
if item is not None:
item.value = value.strip() if value is not None else value
F.db.session.commit()
else:
F.db.session.add(ModelSetting(key, value.strip()))
F.db.session.commit()
with F.app.app_context():
item = F.db.session.query(ModelSetting).filter_by(key=key).with_for_update().first()
if item is not None:
item.value = value.strip() if value is not None else value
F.db.session.commit()
else:
F.db.session.add(ModelSetting(key, value.strip()))
F.db.session.commit()
except Exception as exception:
logger.error('Exception:%s %s', exception, key)
logger.error(traceback.format_exc())