Merge remote-tracking branch 'origin/2.6.0-dev' into 2.6.0-dev

# Conflicts:
#	src/module/conf/config.py
This commit is contained in:
EstrellaXD
2023-04-22 16:30:36 +08:00
5 changed files with 28 additions and 20 deletions

8
src/icon Normal file
View File

@@ -0,0 +1,8 @@
_ ____ _
/\ | | | _ \ (_)
/ \ _ _| |_ ___ | |_) | __ _ _ __ __ _ _ _ _ __ ___ _
/ /\ \| | | | __/ _ \| _ < / _` | '_ \ / _` | | | | '_ ` _ \| |
/ ____ \ |_| | || (_) | |_) | (_| | | | | (_| | |_| | | | | | | |
/_/ \_\__,_|\__\___/|____/ \__,_|_| |_|\__, |\__,_|_| |_| |_|_|
__/ |
|___/

View File

@@ -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)

View File

@@ -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: