From ec7ad60726c6e6b5e98d6a7ea884732242b37151 Mon Sep 17 00:00:00 2001 From: EstrellaXD Date: Thu, 26 May 2022 16:40:29 +0800 Subject: [PATCH] 2.3.4 --- AutoBangumi/Dockerfile | 1 + AutoBangumi/app/collect_bangumi_info.py | 10 +++++++--- AutoBangumi/app/env.py | 2 ++ 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/AutoBangumi/Dockerfile b/AutoBangumi/Dockerfile index e9658924..d7a641a0 100644 --- a/AutoBangumi/Dockerfile +++ b/AutoBangumi/Dockerfile @@ -13,6 +13,7 @@ ENV PASSWORD=adminadmin ENV METHOD=pn ENV GROUP_TAG=False ENV NOT_CONTAIN=720 +ENV RULE_DEBUG=False COPY ./app /app COPY ./config /config diff --git a/AutoBangumi/app/collect_bangumi_info.py b/AutoBangumi/app/collect_bangumi_info.py index 49fa396b..23ce19f1 100644 --- a/AutoBangumi/app/collect_bangumi_info.py +++ b/AutoBangumi/app/collect_bangumi_info.py @@ -37,7 +37,8 @@ class CollectRSS: for item in self.items: name = item.title.string # debug 用 - # print(name) + if EnvInfo.get_rule_debug: + sys.stdout.write(f"[{EnvInfo.time_show_obj}] Raw {name}") exit_flag = False for rule in self.rules: for group in rule["group_name"]: @@ -78,7 +79,7 @@ class CollectRSS: if exit_flag: break if not exit_flag: - print(f"[{EnvInfo.time_show_obj}] ERROR Not match with {name}") + sys.stdout.write(f"[{EnvInfo.time_show_obj}] ERROR Not match with {name}") def put_info_json(self): had_data = [] @@ -105,6 +106,7 @@ class CollectRSS: "group": item["group"], "added": False }) + had_data.append(json_title) sys.stdout.write(f"[{EnvInfo.time_show_obj}] add {json_title} {json_season}" + "\n") sys.stdout.flush() with open(EnvInfo.info_path, 'w', encoding='utf8') as f: @@ -116,4 +118,6 @@ class CollectRSS: if __name__ == "__main__": - cr = CollectRSS() \ No newline at end of file + cr = CollectRSS() + cr.get_info_list() + cr.put_info_json() \ No newline at end of file diff --git a/AutoBangumi/app/env.py b/AutoBangumi/app/env.py index 53afac0c..7d6c0303 100644 --- a/AutoBangumi/app/env.py +++ b/AutoBangumi/app/env.py @@ -17,6 +17,7 @@ class EnvInfo: info_path = "/config/bangumi.json" rule_path = "/config/rule.json" not_contain = os.environ["NOT_CONTAIN"] + get_rule_debug = os.getenv("RULE_DEBUG", 'False').lower() in ('true', '1', 't') else: # Debug ENV host_ip = "localhost:8181" @@ -30,6 +31,7 @@ class EnvInfo: info_path = "../config/bangumi.json" rule_path = "../config/rule.json" not_contain = "720" + get_rule_debug = True # Static ENV rule_url = "https://raw.githubusercontent.com/EstrellaXD/Bangumi_Auto_Collector/main/AutoBangumi/config/rule.json" time_show_obj = time.strftime('%Y-%m-%d %X')