From e3e399da70caea047cdb7401cdf4e6242da01328 Mon Sep 17 00:00:00 2001 From: Codex Date: Thu, 21 May 2026 00:07:56 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E5=85=A5=E5=8F=A3=E8=84=9A?= =?UTF-8?q?=E6=9C=AC=E8=BF=81=E7=A7=BB=E5=88=B0=20bin/?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 将 4 个入口脚本从根目录迁移到 bin/: - run_cli.py - gui_app.py - webgui_launcher.py - manage_logs.py 配套修改: - 修复 bin/*.py 内部 ROOT_DIR 计算(parent.parent) - bin/run_cli.py 在 sys.path 加入项目根,shim 加载逻辑保持不变 - bin/manage_logs.py 在 sys.path 加入项目根 - path_config.get_run_cli_path() 返回 bin/run_cli.py 启动方式变化: - 原: python run_cli.py / python gui_app.py - 新: python bin/run_cli.py / python bin/gui_app.py GUI 内部通过 path_config.get_run_cli_path() 调用,自动适配。 Co-Authored-By: Claude Opus 4.5 --- gui_app.py => bin/gui_app.py | 2 +- manage_logs.py => bin/manage_logs.py | 4 ++-- run_cli.py => bin/run_cli.py | 5 ++++- webgui_launcher.py => bin/webgui_launcher.py | 2 +- path_config.py | 2 +- 5 files changed, 9 insertions(+), 6 deletions(-) rename gui_app.py => bin/gui_app.py (93%) rename manage_logs.py => bin/manage_logs.py (98%) rename run_cli.py => bin/run_cli.py (99%) rename webgui_launcher.py => bin/webgui_launcher.py (93%) diff --git a/gui_app.py b/bin/gui_app.py similarity index 93% rename from gui_app.py rename to bin/gui_app.py index 29480f0..a4ace2e 100644 --- a/gui_app.py +++ b/bin/gui_app.py @@ -9,7 +9,7 @@ import sys from pathlib import Path -ROOT_DIR = Path(__file__).resolve().parent +ROOT_DIR = Path(__file__).resolve().parent.parent TARGET = ROOT_DIR / "gui" / "gui_app.py" VENV_PYTHON = ROOT_DIR / ".venv" / "Scripts" / "python.exe" diff --git a/manage_logs.py b/bin/manage_logs.py similarity index 98% rename from manage_logs.py rename to bin/manage_logs.py index ff22fb0..c5b186f 100644 --- a/manage_logs.py +++ b/bin/manage_logs.py @@ -27,8 +27,8 @@ import argparse from datetime import datetime, timedelta from typing import Dict, Any -# 添加项目路径 -sys.path.insert(0, os.path.dirname(os.path.abspath(__file__))) +# 添加项目根到 sys.path(从 bin/ 目录运行时需要) +sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) from douyin.logging.douyin_logging import ( cleanup_old_logs, diff --git a/run_cli.py b/bin/run_cli.py similarity index 99% rename from run_cli.py rename to bin/run_cli.py index a0ea4dd..8e0a379 100644 --- a/run_cli.py +++ b/bin/run_cli.py @@ -47,7 +47,10 @@ except Exception as e: # 如果需要从外部工作树加载兼容模块,可显式设置 EXTERNAL_DOUYIN_FUDAI_DIR。 # 默认只使用当前仓库内置实现,避免绑定到某台机器的 Cursor worktree 路径。 -_BASE_DIR = os.path.dirname(__file__) +_BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) +# 确保项目根在 sys.path 中(脚本从 bin/ 目录启动时) +if _BASE_DIR not in sys.path: + sys.path.insert(0, _BASE_DIR) _EXTERNAL_DOUYIN_FUDAI_DIR = os.environ.get("EXTERNAL_DOUYIN_FUDAI_DIR", "").strip() diff --git a/webgui_launcher.py b/bin/webgui_launcher.py similarity index 93% rename from webgui_launcher.py rename to bin/webgui_launcher.py index 3ed9607..e33d641 100644 --- a/webgui_launcher.py +++ b/bin/webgui_launcher.py @@ -9,7 +9,7 @@ import sys from pathlib import Path -ROOT_DIR = Path(__file__).resolve().parent +ROOT_DIR = Path(__file__).resolve().parent.parent TARGET = ROOT_DIR / "gui" / "webgui_launcher.py" VENV_PYTHON = ROOT_DIR / ".venv" / "Scripts" / "python.exe" diff --git a/path_config.py b/path_config.py index c5861ca..93abb61 100644 --- a/path_config.py +++ b/path_config.py @@ -127,7 +127,7 @@ def get_robot_verify_pic_path(save_subdir: bool = False) -> str: def get_run_cli_path() -> str: """返回 run_cli.py 的路径(绝对路径)""" - return os.path.abspath(os.path.join(PROJECT_ROOT, "run_cli.py")) + return os.path.abspath(os.path.join(PROJECT_ROOT, "bin", "run_cli.py")) def ensure_dir(path: str) -> None: