AutoClock模块分离(UI与runner模块分离)

Signed-off-by: wuqiongjin <suchinfinity@qq.com>

Author: wuqiongjin

Dockerfile.build

@@ -15,6 +15,7 @@ RUN sed -i 's/deb.debian.org/mirrors.aliyun.com/g' /etc/apt/sources.list && \
 
 # 安装系统依赖
 RUN apt-get update && apt-get install -y \
+    file \
     curl \
     wget \
     git \
@@ -59,4 +60,8 @@ RUN python3 -m pip install --upgrade pip && \
     python3 -m pip install pyinstaller
 
 # 构建脚本，并修复生成文件的权限
-CMD bash linux_build.sh && chmod -R 777 /build/dist
+ENV HOST_UID=1000
+ENV HOST_GID=1000
+
+# 构建脚本，并修复生成文件的权限/归属
+CMD bash linux_build.sh && chown -R ${HOST_UID}:${HOST_GID} /build/dist || true && chmod -R 775 /build/dist

docker_build.sh

@@ -26,27 +26,34 @@ fi
 # 在容器中打包
 echo ""
 echo "步骤2: 在Docker容器中打包应用..."
-docker run --rm -v "$(pwd)/dist:/build/dist" auto-clock-builder
+HOST_UID=$(id -u)
+HOST_GID=$(id -g)
+docker run --rm \
+  -e HOST_UID=${HOST_UID} \
+  -e HOST_GID=${HOST_GID} \
+  -v "$(pwd)/dist:/build/dist" \
+  auto-clock-builder
 
 if [ $? -ne 0 ]; then
     echo "打包失败"
     exit 1
 fi
 
-# 检查结果
-if [ -f "dist/auto_clock" ]; then
+# 检查结果 (onedir)
+if [ -f "dist/auto_clock/auto_clock" ]; then
     echo ""
     echo "================================"
     echo "打包成功！"
     echo "================================"
     echo ""
-    echo "可执行文件: dist/auto_clock"
+    echo "可执行文件: dist/auto_clock/auto_clock"
+    echo "Runner: dist/auto_clock/auto-clock-runner"
     echo ""
     echo "检查GLIBC依赖:"
-    ldd dist/auto_clock | grep GLIBC || echo "  (无GLIBC依赖显示)"
+    ldd dist/auto_clock/auto_clock | grep GLIBC || echo "  (无GLIBC依赖显示)"
     echo ""
     echo "此版本应该可以在 Ubuntu 20.04+ 系统上运行"
 else
-    echo "打包失败，未找到可执行文件"
+    echo "打包失败，未找到可执行文件 dist/auto_clock/auto_clock"
     exit 1
 fi

entry.py

@@ -3,6 +3,7 @@
 import time
 import random
 import argparse
+import subprocess
 from datetime import datetime, date
 
 from PyQt5.QtWidgets import QApplication
@@ -11,9 +12,7 @@
 from src.utils.log import Log
 from src.utils.utils import Utils
 from src.ui.ui import ConfigWindow
-from src.core.clock_manager import run_clock
 from src.utils.const import Key, AppPath
-from src.extend.email_server import send_email_by_result
 from ui.init_ui import init_ui
 import chinese_calendar as calendar
 
@@ -114,108 +113,16 @@ def run_windows_sleep(delay=30):
             Log.error("使用 --help 参数查看所有可用选项")
             sys.exit(1)
 
-        config_data = Utils.read_dict_from_json(AppPath.DataJson)
-        send_email_success = False
-        send_email_failed = False
-        email = None
-        if config_data and config_data.get(Key.NotificationEmail):
-            email = config_data.get(Key.NotificationEmail)
-            send_email_success = config_data.get(Key.SendEmailWhenSuccess, False)
-            send_email_failed = config_data.get(Key.SendEmailWhenFailed, False)
-
-        ok = False
-        error = None
-        task = None
-        try:
-            if args.task_id:
-                task = Utils.find_task(args.task_id)
-                Log.info(f"Auto Clock Get Task Id: {args.task_id}")
-                if not task:
-                    raise Exception(f"Task ID: {args.task_id} not found.")
-                operation = task.get(Key.Operation)
-                day_time_type = task.get(Key.DayTimeType)
-                trigger_type = task.get(Key.TriggerType)
-
-                # SmartHoliday: only execute on Chinese workdays within the same year
-                if trigger_type == Key.SmartHoliday:
-                    try:
-                        start_year = int(task.get(Key.Year))
-                        start_month = int(task.get(Key.Month))
-                        start_day = int(task.get(Key.Day))
-                        start_date = date(start_year, start_month, start_day)
-                    except Exception as e:
-                        Log.error(f"SmartHoliday task missing or invalid start date, skip execution. Error: {e}")
-                        sys.exit(1)
-
-                    today = date.today()
-
-                    # Only valid in the creation year
-                    if today.year != start_year:
-                        Log.info(f"SmartHoliday task year mismatch (task: {start_year}, today: {today.year}), skip execution.")
-                        sys.exit(0)
-
-                    # Only valid between start_date and end of year
-                    if today < start_date or today > date(start_year, 12, 31):
-                        Log.info(f"SmartHoliday: today {today} is out of valid range [{start_date}, {start_year}-12-31], skip execution.")
-                        sys.exit(0)
-
-                    # Only execute on Chinese workdays (including adjusted workdays/holidays)
-                    if not calendar.is_workday(today):
-                        Log.info(f"SmartHoliday: today {today} is not a Chinese workday, skip execution.")
-                        sys.exit(0)
-
-                if day_time_type and day_time_type == Key.Random:
-                    time_offset = task.get(Key.TimeOffset, 0)
-                    random_sec = random.randint(0, time_offset)
-                    Log.info(f"将等待 {random_sec} 秒...")
-                    time.sleep(random_sec)
-                    Log.info("等待结束！继续执行任务")
-
-                Log.info(f"Task ID: {args.task_id} has found, Task Name: {task.get(Key.TaskName)} Operation: {operation}")
-                start_time = datetime.now()
-
-                if operation == Key.AutoClock:
-                    ok, error = run_clock()
-                elif operation == Key.ShutDownSystem:
-                    ok, error = run_windows_shutdown(30)
-                elif operation == Key.SystemSleep:
-                    ok, error = run_windows_sleep(30)
-                elif operation == Key.DisconnectNetwork:
-                    # 对于断网操作，Windows和Linux都支持延迟参数
-                    ok, error = disconnect_network(30)
-                elif operation == Key.ConnectNetwork:
-                    # 对于联网操作，通常不需要延迟
-                    ok, error = connect_network()
-                    # 联网后等待10秒，确保网络已经稳定连接
-                    if ok:
-                        Log.info("网络连接成功，等待10秒确保网络稳定...")
-                        time.sleep(10)
-                        Log.info("网络稳定等待完成")
-                else:
-                    error = f"No operation specified for: {operation}"
-
-                end_time = datetime.now()
-                elapsed_time = end_time - start_time
-                elapsed_sec = elapsed_time.total_seconds()
-                task[Key.CostTime] = int(elapsed_sec)
-                Log.info(f"Finish Task. Start at: {start_time} End at: {end_time} Cost time: {elapsed_sec} sec")
-            else:
-                exit()
-        except Exception as e:
-            error = str(e)
-
-        config_data = Utils.read_dict_from_json(AppPath.DataJson)
-        if not config_data or not config_data.get(Key.NotificationEmail): exit()
+        if not args.task_id:
+            Log.error("任务模式需要提供task_id参数")
+            sys.exit(1)
 
-        email = config_data.get(Key.NotificationEmail)
-        send_email_success = config_data.get(Key.SendEmailWhenSuccess, False)
-        send_email_failed = config_data.get(Key.SendEmailWhenFailed, False)
+        runner_cmd = Utils.get_runner_execute_file()
+        cmd = f"{runner_cmd} --task_id={args.task_id}"
+        if args.headless:
+            cmd += " --headless"
 
-        if not error: error = "Unknow Error"
-        Log.info(f"task: {task}")
-        Log.info(f"ok: {ok} error: {error}")
-        Log.info(f"email: {email} send_email_success: {send_email_success} send_email_failed: {send_email_failed}")
-        
-        send_email_by_result(task=task, email=email, send_email_success=send_email_success,
-                             send_email_failed=send_email_failed, ok=ok, error=error)
+        Log.info(f"Delegate task to runner: {cmd}")
+        result = subprocess.run(cmd, shell=True)
+        sys.exit(result.returncode)
     Log.close()

linux_build.sh

@@ -37,31 +37,41 @@ fi
 # 开始打包
 echo ""
 echo "开始打包应用程序..."
-pyinstaller pack_linux.spec
+pyinstaller --clean --noconfirm pack_linux.spec
 
 # 检查打包是否成功
-if [ -f "dist/auto_clock" ]; then
+if [ -f "dist/auto_clock/auto_clock" ]; then
     echo ""
     echo "设置驱动文件执行权限..."
     # 查找并设置所有msedgedriver文件的执行权限
     find dist -name "msedgedriver" -type f -exec chmod +x {} \;
+
+    if [ ! -f "dist/auto_clock/auto-clock-runner" ]; then
+        echo ""
+        echo "================================"
+        echo "打包失败！"
+        echo "================================"
+        echo "缺少runner可执行文件: dist/auto_clock/auto-clock-runner"
+        exit 1
+    fi
 
     echo ""
     echo "================================"
     echo "打包成功！"
     echo "================================"
     echo ""
-    echo "可执行文件位置: dist/auto_clock"
+    echo "可执行文件位置: dist/auto_clock/auto_clock"
+    echo "Runner位置: dist/auto_clock/auto-clock-runner"
     echo ""
     echo "使用方法:"
     echo "  1. 图形界面模式:"
-    echo "     ./dist/auto_clock"
+    echo "     ./dist/auto_clock/auto_clock"
     echo ""
     echo "  2. 无头模式执行任务:"
-    echo "     ./dist/auto_clock --headless --task_id=YOUR_TASK_ID"
+    echo "     ./dist/auto_clock/auto_clock --headless --task_id=YOUR_TASK_ID"
     echo ""
     echo "  3. 任务模式:"
-    echo "     ./dist/auto_clock --task_id=YOUR_TASK_ID"
+    echo "     ./dist/auto_clock/auto_clock --task_id=YOUR_TASK_ID"
     echo ""
     echo "注意事项:"
     echo "  - 首次运行需要配置 config.json"

pack.spec

@@ -9,6 +9,7 @@ from PyInstaller.building.build_main import Analysis, PYZ, EXE, COLLECT
 project_root = r"."
 # 主脚本路径
 main_script = os.path.join(project_root, "entry.py")
+runner_script = os.path.join(project_root, "src", "runner", "runner_main.py")
 ico = os.path.join(project_root, "icon.ico")
 
 # 依赖的额外文件
@@ -24,7 +25,7 @@ if os.path.exists(ico_dir):
 if os.path.exists(resource_path):
     extra_files.append((str(resource_path), os.path.join(".", "ui", "resource")))
 
-a = Analysis(
+a_ui = Analysis(
     [str(main_script)],
     pathex=[str(project_root)],
     binaries=[],
@@ -40,28 +41,86 @@ a = Analysis(
     noarchive=False,
 )
 
-pyz = PYZ(a.pure, a.zipped_data, cipher=None)
+a_runner = Analysis(
+    [str(runner_script)],
+    pathex=[str(project_root)],
+    binaries=[],
+    datas=[],
+    hiddenimports=[],
+    hookspath=[],
+    hooksconfig={},
+    runtime_hooks=[],
+    excludes=[],
+    win_no_prefer_redirects=False,
+    win_private_assemblies=False,
+    cipher=None,
+    noarchive=False,
+)
+
+pyz_ui = PYZ(a_ui.pure, a_ui.zipped_data, cipher=None)
+pyz_runner = PYZ(a_runner.pure, a_runner.zipped_data, cipher=None)
 
-exe = EXE(
-    pyz,
-    a.scripts,
-    a.binaries,
-    a.zipfiles,
-    a.datas,
+exe_ui = EXE(
+    pyz_ui,
+    a_ui.scripts,
+    [],
+    [],
     [],
-    name="auto_clock",  # exe 文件名
+    [],
+    name="auto_clock",
     debug=False,
     bootloader_ignore_signals=False,
     strip=False,
     upx=False,
     upx_exclude=[],
     runtime_tmpdir=None,
     console=False,
+    exclude_binaries=True,
+    disable_windowed_traceback=False,
+    argv_emulation=False,
+    target_arch=None,
+    codesign_identity=None,
+    entitlements_file=None,
+    icon=ico,
+    uac_admin=True
+)
+
+exe_runner = EXE(
+    pyz_runner,
+    a_runner.scripts,
+    [],
+    [],
+    [],
+    [],
+    name="auto-clock-runner",
+    debug=False,
+    bootloader_ignore_signals=False,
+    strip=False,
+    upx=False,
+    upx_exclude=[],
+    runtime_tmpdir=None,
+    console=True,
+    exclude_binaries=True,
     disable_windowed_traceback=False,
     argv_emulation=False,
     target_arch=None,
     codesign_identity=None,
     entitlements_file=None,
     icon=ico,
     uac_admin=True
+)
+
+coll = COLLECT(
+    exe_ui,
+    exe_runner,
+    a_ui.binaries,
+    a_ui.zipfiles,
+    a_ui.datas,
+    a_runner.binaries,
+    a_runner.zipfiles,
+    a_runner.datas,
+    strip=False,
+    upx=False,
+    upx_exclude=[],
+    name="auto_clock"
 )