1
0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-19 05:19:28 +08:00

Merge branch 'master' into master_morealas

# Conflicts:
#	module/webui/app.py
This commit is contained in:
xhqss
2024-11-23 00:11:04 +08:00
51 changed files with 1036 additions and 66 deletions

View File

@@ -1,6 +1,7 @@
import argparse
import os
import sys
import queue
import argparse
import threading
from multiprocessing import Process
from typing import Dict, List, Union
@@ -9,6 +10,12 @@ import inflection
from filelock import FileLock
from rich.console import Console, ConsoleRenderable
# Since this file does not run under the same process or subprocess of app.py
# the following code needs to be repeated
# Import fake module before import pywebio to avoid importing unnecessary module PIL
from module.webui.fake_pil_module import *
import_fake_pil_module()
from module.config.utils import filepath_config
from module.logger import logger, set_file_logger, set_func_logger
from module.submodule.submodule import load_mod
@@ -149,6 +156,9 @@ class ProcessManager:
from module.config.config import AzurLaneConfig
# Remove fake PIL module, because subprocess will use it
remove_fake_pil_module()
AzurLaneConfig.stop_event = e
try:
# Run alas