From 09cdb2f80b9422ac15c1bcc6472e34b8fc7f9331 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=B8=AD=E9=B8=AD=E3=80=8C=E3=82=AB=E3=83=A2=E3=80=8D?= <89643991+DuckDuckStudio@users.noreply.github.com> Date: Fri, 20 Mar 2026 03:15:10 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=AD=A3=20pygments=20?= =?UTF-8?q?=E5=AF=BC=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/tools/cat.py | 13 ++++++++----- src/tools/maintain/config.py | 28 +++++++++++++--------------- src/tools/verify.py | 25 ++++++++++++++----------- 3 files changed, 35 insertions(+), 31 deletions(-) diff --git a/src/tools/cat.py b/src/tools/cat.py index c550f739..c4edfe43 100644 --- a/src/tools/cat.py +++ b/src/tools/cat.py @@ -1,11 +1,14 @@ import os -from colorama import Fore + from catfood.functions.print import 消息头 -from pygments import highlight # type: ignore -from pygments.lexers import YamlLexer # type: ignore -from function.maintain.config import 读取配置 +from colorama import Fore +from pygments import highlight # pyright: ignore[reportUnknownVariableType] +from pygments.formatters.terminal import TerminalFormatter +from pygments.lexers.data import YamlLexer # pyright: ignore[reportMissingTypeStubs] + from function.files.manifest import 获取清单目录 -from pygments.formatters import TerminalFormatter +from function.maintain.config import 读取配置 + def 读取和输出(清单文件: str): if not os.path.exists(清单文件): diff --git a/src/tools/maintain/config.py b/src/tools/maintain/config.py index 3527d819..4d486340 100644 --- a/src/tools/maintain/config.py +++ b/src/tools/maintain/config.py @@ -1,21 +1,19 @@ -import os import json -import jsonschema +import os from typing import Any -from colorama import Fore -from catfood.constant import YES, NO -from function.maintain.config import ( - 配置信息, - 转换配置值, - 读取配置项, 读取配置, - 获取当前配置版本, 获取配置schema -) -from catfood.functions.print import 消息头 -from catfood.functions.files import open_file -from pygments import highlight # type: ignore -from pygments.lexers import JsonLexer # type: ignore -from pygments.formatters import TerminalFormatter + +import jsonschema +from catfood.constant import NO, YES from catfood.exceptions.operation import OperationFailed +from catfood.functions.files import open_file +from catfood.functions.print import 消息头 +from colorama import Fore +from pygments import highlight # pyright: ignore[reportUnknownVariableType] +from pygments.formatters.terminal import TerminalFormatter +from pygments.lexers.data import JsonLexer # pyright: ignore[reportMissingTypeStubs] + +from function.maintain.config import 获取当前配置版本, 获取配置schema, 读取配置, 读取配置项, 转换配置值, 配置信息 + def 获取用户输入(配置项: str) -> str | bool: 提示消息映射: dict[str, str] = { diff --git a/src/tools/verify.py b/src/tools/verify.py index 5627ca09..6e2d97e9 100644 --- a/src/tools/verify.py +++ b/src/tools/verify.py @@ -1,21 +1,24 @@ -import re -import os import csv -import json -import yaml import ctypes -import winreg +import json +import os +import re import shutil import subprocess -from colorama import Fore +import winreg + +import yaml from catfood.functions.print import 消息头 -from function.github.token import read_token -from function.maintain.config import 读取配置 +from colorama import Fore from pygments import highlight # pyright: ignore[reportUnknownVariableType] -from pygments.lexers import YamlLexer # pyright: ignore[reportUnknownVariableType] -from pygments.formatters import TerminalFormatter +from pygments.formatters.terminal import TerminalFormatter +from pygments.lexers.data import YamlLexer # pyright: ignore[reportMissingTypeStubs] + from function.constant.paths import VERIFY_TEMP_DIR -from function.files.manifest import 获取清单目录, 获取PR清单 +from function.files.manifest import 获取PR清单, 获取清单目录 +from function.github.token import read_token +from function.maintain.config import 读取配置 + def main(args: list[str]) -> int: # 初始化