diff --git a/.github/workflows/dev-latest.yml b/.github/workflows/dev-latest.yml index de98e0d0..2e1eeaae 100644 --- a/.github/workflows/dev-latest.yml +++ b/.github/workflows/dev-latest.yml @@ -35,6 +35,5 @@ jobs: push: true tags: | estrellaxd/auto_bangumi:dev-latest - estrellaxd/auto_bangumi:dev-${{ github.sha }} estrellaxd/auto_bangumi:${{ github.ref_name }} file: Dockerfile diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 81ed6af1..7befefc9 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -41,6 +41,5 @@ jobs: push: true tags: | estrellaxd/auto_bangumi:latest - estrellaxd/auto_bangumi:${{ github.sha }} estrellaxd/auto_bangumi:${{ github.ref_name }} labels: ${{ steps.meta.outputs.labels }} diff --git a/src/icon b/src/icon new file mode 100644 index 00000000..b5ddfb0a --- /dev/null +++ b/src/icon @@ -0,0 +1,8 @@ + _ ____ _ + /\ | | | _ \ (_) + / \ _ _| |_ ___ | |_) | __ _ _ __ __ _ _ _ _ __ ___ _ + / /\ \| | | | __/ _ \| _ < / _` | '_ \ / _` | | | | '_ ` _ \| | + / ____ \ |_| | || (_) | |_) | (_| | | | | (_| | |_| | | | | | | | + /_/ \_\__,_|\__\___/|____/ \__,_|_| |_|\__, |\__,_|_| |_| |_|_| + __/ | + |___/ \ No newline at end of file diff --git a/src/main.py b/src/main.py index 4496dec6..3763ae31 100644 --- a/src/main.py +++ b/src/main.py @@ -1,9 +1,26 @@ +import multiprocessing +import logging + from module import app from module import api +from module.conf import VERSION, setup_logger + + +logger = logging.getLogger(__name__) + + +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...") -import multiprocessing if __name__ == "__main__": + setup_logger() + show_info() num_processes = 2 processes = [] p1 = multiprocessing.Process(target=app.run) diff --git a/src/module/app.py b/src/module/app.py index dd720977..70210b5f 100644 --- a/src/module/app.py +++ b/src/module/app.py @@ -2,13 +2,14 @@ import os import time import logging -from module.conf import settings, setup_logger, LOG_PATH, DATA_PATH, VERSION +from module.conf import settings, LOG_PATH, DATA_PATH from module.utils import json_config from module.core import DownloadClient from module.manager import Renamer, FullSeasonGet from module.rss import RSSAnalyser + logger = logging.getLogger(__name__) @@ -42,20 +43,6 @@ def save_data_file(bangumi_data): logger.debug("Saved") -def show_info(): - logger.info(r" _ ____ _ ") - logger.info(r" /\ | | | _ \ (_)") - logger.info(r" / \ _ _| |_ ___ | |_) | __ _ _ __ __ _ _ _ _ __ ___ _ ") - logger.info(r" / /\ \| | | | __/ _ \| _ < / _` | '_ \ / _` | | | | '_ ` _ \| |") - logger.info(r" / ____ \ |_| | || (_) | |_) | (_| | | | | (_| | |_| | | | | | | |") - logger.info(r" /_/ \_\__,_|\__\___/|____/ \__,_|_| |_|\__, |\__,_|_| |_| |_|_|") - logger.info(" __/ | ") - logger.info(" |___/ ") - 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...") - - def main_process(bangumi_data, download_client: DownloadClient): rename = Renamer(download_client) rss_analyser = RSSAnalyser() @@ -77,8 +64,6 @@ def main_process(bangumi_data, download_client: DownloadClient): def run(): # 初始化 reset_log() - setup_logger() - show_info() download_client = DownloadClient() download_client.init_downloader() if settings.rss_parser.link is None: