diff --git a/auto_bangumi/api.py b/auto_bangumi/api.py index cb96eeaa..8a8d0306 100644 --- a/auto_bangumi/api.py +++ b/auto_bangumi/api.py @@ -55,7 +55,7 @@ def remove_rule(name: str): return "Not matched" -@app.get("/api/v1/subscribe/{link}") +@app.get("/api/v1/collection/{link}") async def receive(link: str): client = DownloadClient() try: @@ -67,6 +67,18 @@ async def receive(link: str): return "Error" +@app.get("/api/v1/subscribe/{link}") +async def add_link(link: str): + client = DownloadClient() + try: + data = RSSAnalyser().rss_to_data(link.link) + client.set_rule(data, link.link) + return data + except Exception as e: + logger.debug(e) + return "Error" + + class AddRule(BaseModel): title: str season: int @@ -87,7 +99,7 @@ def run(): logger.debug("Please copy `const_dev.py` to `const_dev.py` to use custom settings") else: settings.init() - LOGGING_CONFIG["formatters"]["default"]["fmt"] = "[%(asctime)s] %(levelprefix)s\t%(message)s" + LOGGING_CONFIG["formatters"]["default"]["fmt"] = "[%(asctime)s] %(levelprefix)s %(message)s" uvicorn.run(app, host="0.0.0.0", port=settings.webui_port) diff --git a/auto_bangumi/conf/log.py b/auto_bangumi/conf/log.py index 5c0772d5..face367d 100644 --- a/auto_bangumi/conf/log.py +++ b/auto_bangumi/conf/log.py @@ -4,7 +4,10 @@ from conf import settings def setup_logger(): level = logging.DEBUG if settings.debug_mode else logging.INFO - LOGGING_FORMAT = "[%(asctime)s] %(levelname)s:\t%(message)s" + logging.addLevelName(logging.DEBUG, 'DEBUG:') + logging.addLevelName(logging.INFO, 'INFO:') + logging.addLevelName(logging.WARNING, 'WARNING:') + LOGGING_FORMAT = "[%(asctime)s] %(levelname)-8s %(message)s" logging.basicConfig( level=level, format=LOGGING_FORMAT, diff --git a/auto_bangumi/parser/analyser/rename_parser.py b/auto_bangumi/parser/analyser/rename_parser.py index a1b4c6f4..ed8bc503 100644 --- a/auto_bangumi/parser/analyser/rename_parser.py +++ b/auto_bangumi/parser/analyser/rename_parser.py @@ -84,7 +84,7 @@ class DownloadParser: return new_name @staticmethod - def rename_none(self, info_dict): + def rename_none(info_dict): return info_dict["name"] def download_rename(self, name, folder_name, season,suffix, method): @@ -102,11 +102,11 @@ class DownloadParser: "none": self.rename_none } logger.debug(f"Name: {folder_name}, File type: {path.splitext(name)[-1]}, Season {season}") - return method_dict[method](info_dict) + return method_dict[method.lower()](info_dict) if __name__ == "__main__": name = "[Isekai Meikyuu de Harem wo][01][BIG5][1080P][AT-X].mp4" rename = DownloadParser() - new_name = rename.download_rename(name, "Made abyess", 1, ".mp4", "pn") + new_name = rename.download_rename(name, "Made abyess", 1, ".mp4", "Advance") print(new_name) \ No newline at end of file