Fix #247

src/module/app.py

@@ -34,12 +34,4 @@ async def rename_loop(renamer: Renamer, wait_time: int = 360):
     await asyncio.sleep(wait_time)
 
 
-def show_info():
-    with open("icon", "r") as f:
-        for line in f.readlines():
-            logger.info(line.strip("\n"))
-    logger.info(
-        f"Version {VERSION}  Author: EstrellaXD Twitter: https://twitter.com/Estrella_Pan"
-    )
-    logger.info("GitHub: https://github.com/EstrellaXD/Auto_Bangumi/")
-    logger.info("Starting AutoBangumi...")
+

src/module/conf/log.py

@@ -1,19 +1,18 @@
 import logging
 
-from .config import settings
-
 LOG_PATH = "data/log.txt"
 
 
-def setup_logger():
-    level = logging.DEBUG if settings.log.debug_enable else logging.INFO
+def setup_logger(level):
     logging.addLevelName(logging.DEBUG, "DEBUG:")
     logging.addLevelName(logging.INFO, "INFO:")
     logging.addLevelName(logging.WARNING, "WARNING:")
     LOGGING_FORMAT = "[%(asctime)s] %(levelname)-8s  %(message)s"
+    TIME_FORMAT = "%Y-%m-%d %H:%M:%S"
     logging.basicConfig(
         level=level,
         format=LOGGING_FORMAT,
+        datefmt=TIME_FORMAT,
         encoding="utf-8",
         handlers=[
             logging.FileHandler(LOG_PATH, encoding="utf-8"),

src/module/conf/logging.conf

@@ -1,72 +0,0 @@
-[loggers]
-keys=root, gunicorn.error, gunicorn.access,uvicorn.error,uvicorn.access
-
-[handlers]
-keys=console, error_file, access_file, accesscustom
-
-[formatters]
-keys=generic, access, AccessFormatter
-
-[logger_root]
-level=INFO
-handlers=console
-propagate=1
-
-[logger_gunicorn.error]
-level=INFO
-handlers=error_file
-propagate=0
-qualname=gunicorn.error
-
-[logger_gunicorn.access]
-level=INFO
-handlers=accesscustom
-propagate=0
-qualname=gunicorn.access
-
-[logger_uvicorn.error]
-level=INFO
-handlers=error_file
-propagate=0
-qualname=uvicorn.error
-
-[logger_uvicorn.access]
-level=INFO
-handlers=accesscustom
-propagate=0
-qualname=uvicorn.access
-
-[handler_console]
-class=StreamHandler
-formatter=generic
-args=(sys.stdout, )
-
-[handler_error_file]
-class=StreamHandler
-formatter=generic
-args=(sys.stdout, )
-
-[handler_access_file]
-class=StreamHandler
-formatter=access
-args=(sys.stdout, )
-
-[handler_accesscustom]
-class=StreamHandler
-formatter=AccessFormatter
-args=(sys.stdout, )
-
-[formatter_generic]
-format=%(levelname)s: %(message)s
-datefmt=%Y-%m-%dT%H:%M:%S
-class=uvicorn.logging.DefaultFormatter
-
-[formatter_access]
-format=%(levelname)s: %(message)s
-datefmt=%Y-%m-%dT%H:%M:%S
-class=customlogger.CustomFormatter
-
-[formatter_AccessFormatter]
-format={"event":"access_log","ip":"%(h)s","status":"%(s)s","method":"%(m)s","path":"%(U)s","referer":"%(f)s","x_session_id":"%(x-session-id)s","x_google_id":"%(x-google-id)s","x_server_time":"%(x-server-time)s","agent":"%(a)s"}
-datefmt=%Y-%m-%dT%H:%M:%S
-class=customlogger.CustomFormatter

src/module/conf/uvicorn_logging.py

@@ -7,7 +7,7 @@ logging_config = {
             "handlers": ["default"],
             "propagate": True,
         },
-        "uvicorn.access": {
+        "uvicorn.asgi": {  # 更改 "uvicorn.access" 为 "uvicorn.asgi"
             "level": "INFO",
             "handlers": ["access"],
             "propagate": True,
@@ -18,18 +18,16 @@ logging_config = {
             "class": "logging.StreamHandler",
             "level": "INFO",
             "formatter": "default",
-            "stream": "ext://sys.stderr",
         },
         "access": {
             "class": "logging.StreamHandler",
-            "level": "INFO",
+            "level": "DEBUG",
             "formatter": "access",
-            "stream": "ext://sys.stdout",
         },
     },
     "formatters": {
         "default": {
-            "format": "[%(asctime)s] %(levelname)s: %(message)s",
+            "format": "[%(asctime)s] %(levelname)-8s  %(message)s",
             "datefmt": "%Y-%m-%d %H:%M:%S",
         },
         "access": {

src/module/manager/renamer.py

@@ -227,10 +227,3 @@ class Renamer(DownloadClient):
                     )
             else:
                 logger.warning(f"{info.name} has no media file")
-
-
-if __name__ == '__main__':
-    from module.conf import setup_logger
-    setup_logger()
-    with Renamer() as renamer:
-        renamer.rename()

src/module/parser/analyser/torrent_parser.py

@@ -35,6 +35,8 @@ def get_group(group_and_title) -> tuple[str | None, str]:
     while "" in n:
         n.remove("")
     if len(n) > 1:
+        if re.match(r"\d+", n[1]):
+            return None, group_and_title
         return n[0], n[1]
     else:
         return None, n[0]
@@ -96,3 +98,9 @@ def torrent_parser(
                     episode=episode,
                     suffix=suffix
                 )
+
+
+if __name__ == '__main__':
+    name = "海盗战记 (2019) S01E01.mp4"
+    bf = torrent_parser(name, file_type="media")
+    print(bf)