refactor: 简化 gui_app.format_gui_log_line 为薄包装
原本 64 行的 fallback 实现实际上是死代码—— gui.components.log_viewer.format_gui_log_line 一直存在, import 失败几乎不可能发生。 简化为薄包装函数,import 失败时返回原字符串。 文件行数:5857 -> 5804(减 53 行) Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
This commit is contained in:
1 parent
41c3f28eb7
commit
ba4c131b2d
1 file changed
+7
-60
+7
-60
@@ -60,70 +60,17 @@ warnings.filterwarnings("ignore", message=".*accelerator.*", category=UserWarnin
|
||||
|
||||
|
||||
def format_gui_log_line(line: str) -> str:
|
||||
"""
|
||||
将完整日志行转换为GUI显示用的精简版本。
|
||||
"""将完整日志行转换为 GUI 显示用的精简版本。
|
||||
|
||||
使用新的日志格式化模块进行美化和格式化处理。
|
||||
实际实现位于 gui.components.log_viewer,此处仅作 re-export,
|
||||
失败时回退到原始字符串。
|
||||
"""
|
||||
try:
|
||||
# 尝试使用新的日志格式化模块
|
||||
from gui.components.log_viewer import format_gui_log_line as enhanced_formatter
|
||||
from gui.components.log_viewer import format_gui_log_line as _impl
|
||||
|
||||
return enhanced_formatter(line)
|
||||
except ImportError:
|
||||
# 如果新模块不可用,回退到原来的实现
|
||||
pass
|
||||
|
||||
# 回退到原来的精简规则(兼容统一日志格式)
|
||||
s = (line or "").rstrip("\n")
|
||||
if not s:
|
||||
return s
|
||||
|
||||
ts_part: str | None = None
|
||||
msg_part: str | None = None
|
||||
|
||||
# 1)新统一日志格式:[YYYY-MM-DD HH:MM:SS.xxx] [LEVEL] ... 业务内容 字段_xxx=...
|
||||
m = re.match(r"^\[(\d{4}-\d{2}-\d{2} [0-9:.]+)\]\s+\[[A-Z]+\]\s+(.*)$", s)
|
||||
if m:
|
||||
ts_part = m.group(1).strip()
|
||||
msg_part = m.group(2).strip()
|
||||
# 2)旧统一日志格式:YYYY-MM-DD HH:MM:SS.xxx - [LEVEL] - ... - 业务内容
|
||||
elif s[0].isdigit() and " - " in s:
|
||||
parts = s.split(" - ")
|
||||
if len(parts) >= 3:
|
||||
ts_part = parts[0].strip()
|
||||
msg_part = parts[-1].strip()
|
||||
|
||||
# 如果没解析出时间戳和消息,返回原字符串
|
||||
if not ts_part or msg_part is None:
|
||||
return s
|
||||
|
||||
# 从业务文案中拆分出字段_xxx=yyy,非score类字段在GUI中隐藏
|
||||
keep_tokens: list[str] = []
|
||||
|
||||
def _is_score_field(k: str) -> bool:
|
||||
kl = k.lower()
|
||||
return (
|
||||
"score" in kl or "match" in kl or "匹配" in k or "相似" in k or "耗时" in k
|
||||
)
|
||||
|
||||
# 解析字段
|
||||
words = msg_part.split()
|
||||
clean_words = []
|
||||
for word in words:
|
||||
if "=" in word:
|
||||
k, v = word.split("=", 1)
|
||||
if _is_score_field(k):
|
||||
keep_tokens.append(word)
|
||||
# else: 其他字段在GUI中隐藏
|
||||
else:
|
||||
clean_words.append(word)
|
||||
|
||||
clean_msg = " ".join(clean_words)
|
||||
if keep_tokens:
|
||||
clean_msg = f"{clean_msg} ({', '.join(keep_tokens)})"
|
||||
|
||||
return f"{ts_part} {clean_msg}"
|
||||
return _impl(line)
|
||||
except Exception:
|
||||
return (line or "").rstrip("\n")
|
||||
|
||||
|
||||
def main():
|
||||
|
||||
Reference in new issue
Block a user