diff --git a/auto_bangumi/app.py b/auto_bangumi/app.py index b3fb5540..02c44185 100644 --- a/auto_bangumi/app.py +++ b/auto_bangumi/app.py @@ -43,12 +43,12 @@ def run(): else: settings.init() setup_logger() - bangumi_data = load_data_file() download_client = DownloadClient() download_client.rss_feed() rss_collector = RSSCollector() renamer = Renamer(download_client) while True: + bangumi_data = load_data_file() try: rss_collector.collect(bangumi_data) if settings.enable_eps_complete: diff --git a/auto_bangumi/bangumi_parser/analyser/rss_parser.py b/auto_bangumi/bangumi_parser/analyser/rss_parser.py index 39b27caf..ee0986eb 100644 --- a/auto_bangumi/bangumi_parser/analyser/rss_parser.py +++ b/auto_bangumi/bangumi_parser/analyser/rss_parser.py @@ -43,7 +43,10 @@ class ParserLV2: if not seasons: name = name_season season_number = 1 - season_raw = "" + if settings.season_one_tag: + season_raw = "S01" + else: + season_raw = "" else: name = re.sub(season_rule, "", name_season) for season in seasons: diff --git a/auto_bangumi/const.py b/auto_bangumi/const.py index f0618af1..2287a955 100644 --- a/auto_bangumi/const.py +++ b/auto_bangumi/const.py @@ -16,7 +16,8 @@ DEFAULT_SETTINGS = { "rule_url": "https://raw.githubusercontent.com/EstrellaXD/Bangumi_Auto_Collector/main/AutoBangumi/config/rule.json", "rule_name_re": r"\:|\/|\.", "connect_retry_interval": 5, - "debug_mode": True + "debug_mode": True, + "season_one_tag": True } ENV_TO_ATTR = { @@ -33,8 +34,9 @@ ENV_TO_ATTR = { "AB_DEBUG_MODE": ("debug_mode", lambda e: e.lower() in ("true", "1", "t")), "AB_EP_COMPLETE": ( "enable_eps_complete", - lambda e: e.lower() in ("true", "1", "t"), + lambda e: e.lower() in ("true", "1", "t") ), + "AB_SEASON_ONE": ("season_one_tag", lambda e: e.lower() in ("true", "1", "t")) } FULL_SEASON_SUPPORT_GROUP = ["Lilith-Raws"] diff --git a/auto_bangumi/core/download_client.py b/auto_bangumi/core/download_client.py index cc9446b2..7a70830d 100644 --- a/auto_bangumi/core/download_client.py +++ b/auto_bangumi/core/download_client.py @@ -73,8 +73,6 @@ class DownloadClient: if info["download_past"]: FullSeasonGet(info["group"], info["title"], info["season"]).run() info["download_past"] = False - json_config.save(settings.info_path, bangumi_info,) - def get_torrent_info(self): return self.client.torrents_info( diff --git a/auto_bangumi/core/rss_collector.py b/auto_bangumi/core/rss_collector.py index 96cd1c94..9f2c3c8d 100644 --- a/auto_bangumi/core/rss_collector.py +++ b/auto_bangumi/core/rss_collector.py @@ -47,4 +47,4 @@ class RSSCollector: "download_past": download_past } ) - logger.info(f"add {title} Season {season.raw}") + logger.info(f"add {title} Season {season.number}") diff --git a/auto_bangumi/log.py b/auto_bangumi/log.py index 04a72d6b..5d18c5aa 100644 --- a/auto_bangumi/log.py +++ b/auto_bangumi/log.py @@ -1,16 +1,11 @@ import logging -from conf import settings -if settings.debug_mode: - debug_level = logging.DEBUG -else: - debug_level = logging.INFO def setup_logger(): DATE_FORMAT = "%Y-%m-%d %X" LOGGING_FORMAT = "%(asctime)s %(levelname)s: %(message)s" logging.basicConfig( - level=debug_level, + level=logging.INFO, datefmt=DATE_FORMAT, format=LOGGING_FORMAT, encoding="utf-8",