diff --git a/config/anidb.json b/auto_bangumi/bangumi_parser/anidb.json similarity index 100% rename from config/anidb.json rename to auto_bangumi/bangumi_parser/anidb.json diff --git a/auto_bangumi/bangumi_parser/fuzz_match.py b/auto_bangumi/bangumi_parser/fuzz_match.py index 4a2da4f3..61241c2e 100644 --- a/auto_bangumi/bangumi_parser/fuzz_match.py +++ b/auto_bangumi/bangumi_parser/fuzz_match.py @@ -10,11 +10,11 @@ class FuzzMatch: def __init__(self): try: anidb_data = json_config.get(settings.anidb_url) - json_config.save(settings.anidb_path, anidb_data) + json_config.save("anidb.json", anidb_data) except Exception as e: logger.debug(e) logger.info(f"Fail to get anidb data, reading local data") - anidb_data = json_config.load(settings.anidb_data) + anidb_data = json_config.load("anidb.json") self.match_data = anidb_data @staticmethod diff --git a/auto_bangumi/core/download_client.py b/auto_bangumi/core/download_client.py index 491fe47a..68bede5b 100644 --- a/auto_bangumi/core/download_client.py +++ b/auto_bangumi/core/download_client.py @@ -68,8 +68,8 @@ class DownloadClient: except ConflictError: logger.info("RSS Already exists.") - def add_collection_feed(self, rss_link): - self.client.rss_add_feed(url=rss_link) + def add_collection_feed(self, rss_link, item_path): + self.client.rss_add_feed(url=rss_link, item_path=item_path) logger.info("Add RSS Feed successfully.") def add_rules(self, bangumi_info, rss_link=settings.rss_link): diff --git a/auto_bangumi/core/rss_collector.py b/auto_bangumi/core/rss_collector.py index 9f141381..b1875737 100644 --- a/auto_bangumi/core/rss_collector.py +++ b/auto_bangumi/core/rss_collector.py @@ -73,7 +73,7 @@ class RSSCollector: rss = self.get_rss_info(rss_link) item = rss.find("item") title = item.title.string - _, data, _ = self.title_parser(title, fuzz_match=True) + _, data, _ = self.title_parser(title, fuzz_match=False) return data diff --git a/auto_bangumi/utils/json_config.py b/auto_bangumi/utils/json_config.py index 51579083..cb520f07 100644 --- a/auto_bangumi/utils/json_config.py +++ b/auto_bangumi/utils/json_config.py @@ -8,7 +8,7 @@ def load(filename): def save(filename, obj): - with open(filename, "w", encoding="utf8") as f: + with open(filename, "w", encoding="utf-8") as f: json.dump(obj, f, indent=4, separators=(",", ": "), ensure_ascii=False) pass diff --git a/auto_bangumi/web.py b/auto_bangumi/web.py index f7504552..08b88d63 100644 --- a/auto_bangumi/web.py +++ b/auto_bangumi/web.py @@ -68,10 +68,12 @@ class RSS(BaseModel): @app.post("/api/v1/subscriptions") async def receive(link: RSS): data = RSSCollector().collect_collection(link.link) + from const_dev import DEV_SETTINGS + settings.init(DEV_SETTINGS) client = DownloadClient() - client.add_collection_feed(link.link) + client.add_collection_feed(link.link, item_path=data["title"]) client.add_rules(data, rss_link=link.link) - return data + return "Successed" if __name__ == "__main__":