javara999/ff_freegame
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert FreeGame load-time scheduler changes

Browse Source
This commit is contained in:
javara999
2026-05-28 17:39:14 +09:00
parent a1d901dbea
commit 3c03c50216
1 changed files with 44 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
logic.py
+23 -21
View File
@@ -96,6 +96,7 @@ def _telegram_send(bot_token, chat_id, games):
class Logic(PluginModuleBase): class Logic(PluginModuleBase):
instance = None
db_default = { db_default = {
"auto_start": "False", "auto_start": "False",
"auto_interval": "0 */2 * * *", "auto_interval": "0 */2 * * *",
@@ -113,14 +114,12 @@ class Logic(PluginModuleBase):
def __init__(self, PM): def __init__(self, PM):
super().__init__(PM, name="main", first_menu="setting") super().__init__(PM, name="main", first_menu="setting")
Logic.instance = self
def plugin_load(self): def plugin_load(self):
ModelFreeGameItem.ensure_schema() ModelFreeGameItem.ensure_schema()
if _truthy(ModelSetting.get("auto_start")): if _truthy(ModelSetting.get("auto_start")):
Logic.scheduler_start() self.scheduler_start()
def plugin_unload(self):
Logic.scheduler_stop()
def process_menu(self, sub, req): def process_menu(self, sub, req):
arg = ModelSetting.to_dict() arg = ModelSetting.to_dict()
@@ -140,17 +139,17 @@ class Logic(PluginModuleBase):
if sub == "setting_save": if sub == "setting_save":
ret, _ = ModelSetting.setting_save(req) ret, _ = ModelSetting.setting_save(req)
if F.scheduler.is_include(package_name): if F.scheduler.is_include(package_name):
Logic.scheduler_stop() self.scheduler_stop()
Logic.scheduler_start() self.scheduler_start()
elif _truthy(ModelSetting.get("auto_start")): elif _truthy(ModelSetting.get("auto_start")):
Logic.scheduler_start() self.scheduler_start()
ret["ret"] = "success" ret["ret"] = "success"
return jsonify(ret) return jsonify(ret)
if sub == "scheduler_toggle": if sub == "scheduler_toggle":
if req.form["scheduler"] == "true": if req.form["scheduler"] == "true":
Logic.scheduler_start() self.scheduler_start()
else: else:
Logic.scheduler_stop() self.scheduler_stop()
return jsonify({"ret": "success"}) return jsonify({"ret": "success"})
if sub == "execute_once": if sub == "execute_once":
Logic.execute_once() Logic.execute_once()
@@ -166,8 +165,7 @@ class Logic(PluginModuleBase):
logger.error(traceback.format_exc()) logger.error(traceback.format_exc())
return jsonify({"ret": "error", "log": str(e)}) return jsonify({"ret": "error", "log": str(e)})
@staticmethod def scheduler_start(self):
def scheduler_start():
try: try:
interval = ModelSetting.get("auto_interval") or "0 */2 * * *" interval = ModelSetting.get("auto_interval") or "0 */2 * * *"
if F.scheduler.is_include(package_name): if F.scheduler.is_include(package_name):
@@ -179,26 +177,31 @@ class Logic(PluginModuleBase):
logger.error("Exception:%s", e) logger.error("Exception:%s", e)
logger.error(traceback.format_exc()) logger.error(traceback.format_exc())
@staticmethod def scheduler_stop(self):
def scheduler_stop():
try: try:
if F.scheduler.is_include(package_name):
scheduler.remove_job(package_name) scheduler.remove_job(package_name)
except Exception as e: except Exception as e:
logger.error("FreeGame scheduler stop failed: %s", e) logger.error("Exception:%s", e)
logger.error(traceback.format_exc()) logger.error(traceback.format_exc())
@staticmethod @staticmethod
def execute_once(): def execute_once():
threading.Thread(target=Logic.scheduler_function, daemon=True).start() threading.Thread(target=Logic.scheduler_function_static, daemon=True).start()
@staticmethod @staticmethod
def scheduler_function(): def scheduler_function_static():
logic = Logic.instance
if logic is None:
logger.error("FreeGame scheduler skipped: Logic instance is not initialized")
return
with F.app.app_context():
logic.scheduler_function()
def scheduler_function(self):
if not _fetch_lock.acquire(blocking=False): if not _fetch_lock.acquire(blocking=False):
logger.info("FreeGame fetch skipped: already running") logger.info("FreeGame fetch skipped: already running")
return return
try: try:
with F.app.app_context():
logger.info("FreeGame scheduled fetch started") logger.info("FreeGame scheduled fetch started")
ModelFreeGameItem.ensure_schema() ModelFreeGameItem.ensure_schema()
enabled_sources = set(_enabled_sources()) enabled_sources = set(_enabled_sources())
@@ -223,7 +226,7 @@ class Logic(PluginModuleBase):
logger.info("FreeGame fetch completed: free_candidates=%d enabled_sources=%d", len(fresh_free_games), len(enabled_sources)) logger.info("FreeGame fetch completed: free_candidates=%d enabled_sources=%d", len(fresh_free_games), len(enabled_sources))
ModelFetchLog("all", "ok", f"free_candidates={len(fresh_free_games)} enabled_sources={len(enabled_sources)}", len(fresh_free_games)).save() ModelFetchLog("all", "ok", f"free_candidates={len(fresh_free_games)} enabled_sources={len(enabled_sources)}", len(fresh_free_games)).save()
Logic._notify(fresh_free_games) self._notify(fresh_free_games)
except Exception as e: except Exception as e:
logger.error("Exception:%s", e) logger.error("Exception:%s", e)
logger.error(traceback.format_exc()) logger.error(traceback.format_exc())
@@ -231,8 +234,7 @@ class Logic(PluginModuleBase):
finally: finally:
_fetch_lock.release() _fetch_lock.release()
@staticmethod def _notify(self, games):
def _notify(games):
if _truthy(ModelSetting.get("notify_enabled")) is False: if _truthy(ModelSetting.get("notify_enabled")) is False:
return return
targets = list(games or []) targets = list(games or [])