From e7209158b4ff4ac5efbbfe234ad1cdf347bab63b Mon Sep 17 00:00:00 2001 From: jxxghp Date: Wed, 26 Jul 2023 12:27:01 +0800 Subject: [PATCH] fix bug --- app/plugins/autosignin/__init__.py | 4 ++-- app/plugins/doubansync/__init__.py | 31 +++++++++++++++++++++--------- 2 files changed, 24 insertions(+), 11 deletions(-) diff --git a/app/plugins/autosignin/__init__.py b/app/plugins/autosignin/__init__.py index ac4280e4..f0ac89c3 100644 --- a/app/plugins/autosignin/__init__.py +++ b/app/plugins/autosignin/__init__.py @@ -270,7 +270,7 @@ class AutoSignIn(_PluginBase): current_day = "" sign_data = [] for day in date_list: - current_day = datetime.now().strftime('%-m月%-d日') + current_day = f"{datetime.now().month}月{datetime.now().day}日" sign_data = self.get_data(current_day) if sign_data: break @@ -379,7 +379,7 @@ class AutoSignIn(_PluginBase): if status: logger.info("站点签到任务完成!") # 获取今天的日期 - key = datetime.now().strftime('%-m月%-d日') + key = f"{datetime.now().month}月{datetime.now().day}日" # 保存数据 self.save_data(key, [{ "site": s[0], diff --git a/app/plugins/doubansync/__init__.py b/app/plugins/doubansync/__init__.py index 5123e1bf..fcb8e365 100644 --- a/app/plugins/doubansync/__init__.py +++ b/app/plugins/doubansync/__init__.py @@ -238,8 +238,21 @@ class DoubanSync(_PluginBase): """ 拼装插件详情页面,需要返回页面配置,同时附带数据 """ - # TODO 查询同步详情 - pass + # 查询同步详情 + history = self.get_data('history') + if not history: + return [ + { + 'component': 'div', + 'text': '暂无数据', + 'props': { + 'class': 'text-center', + } + } + ] + return [ + + ] def stop_service(self): """ @@ -262,6 +275,8 @@ class DoubanSync(_PluginBase): return # 读取缓存 caches = self._cache_path.read_text().split("\n") if self._cache_path.exists() else [] + # 读取历史记录 + history = self.get_data('history') or [] for user_id in self._users.split(","): # 同步每个用户的豆瓣数据 if not user_id: @@ -325,8 +340,7 @@ class DoubanSync(_PluginBase): season=meta.begin_season, exist_ok=True, username="豆瓣想看") - # 保存记录 - self.save_data('history', { + history.append({ "action": 'subscribe', "media": mediainfo.to_dict(), "time": datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S") @@ -337,8 +351,7 @@ class DoubanSync(_PluginBase): if downloads and not lefts: # 全部下载完成 logger.info(f'{mediainfo.title_year} 下载完成') - # 保存记录 - self.save_data('history', { + history.append({ "action": 'download', "media": mediainfo.to_dict(), "time": datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S") @@ -354,14 +367,14 @@ class DoubanSync(_PluginBase): season=meta.begin_season, exist_ok=True, username="豆瓣想看") - # 保存记录 - self.save_data('history', { + history.append({ "action": 'subscribe', "media": mediainfo.to_dict(), "time": datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S") }) - logger.info(f"用户 {user_id} 豆瓣想看同步完成") + # 保存历史记录 + self.save_data('history', history) # 保存缓存 self._cache_path.write_text("\n".join(caches))