fix(scheduler ): scheduler path and check (NewFuture#550)

Author: NewFuture

.github/patch.py

@@ -86,6 +86,110 @@ def add_nuitka_include_modules(pyfile):
     return True
 
 
+def add_nuitka_windows_unbuffered(pyfile):
+    """
+    为Windows平台在现有的 --python-flag 配置中添加 unbuffered 标志
+    """
+    import platform
+
+    # 只在Windows平台执行
+    if platform.system().lower() != "windows":
+        print(f"Skipping unbuffered flag addition: not on Windows (current: {platform.system()})")
+        return False
+
+    with open(pyfile, "r", encoding="utf-8") as f:
+        content = f.read()
+
+    # 查找现有的 --python-flag 配置行
+    python_flag_pattern = r"(# nuitka-project: --python-flag=)([^\n]*)"
+    match = re.search(python_flag_pattern, content)
+
+    if not match:
+        print(f"No existing --python-flag found in {pyfile}")
+        return False
+
+    existing_flags = match.group(2)
+
+    # 检查是否已经包含 unbuffered
+    if "unbuffered" in existing_flags:
+        print(f"unbuffered flag already exists in {pyfile}")
+        return False
+
+    # 添加 unbuffered 到现有标志
+    new_flags = "unbuffered" if not existing_flags.strip() else existing_flags + ",unbuffered"
+    new_content = re.sub(python_flag_pattern, r"\g<1>" + new_flags, content)
+
+    with open(pyfile, "w", encoding="utf-8") as f:
+        f.write(new_content)
+
+    print(f"Added unbuffered to python-flag in {pyfile}: {new_flags}")
+    return True
+
+
+def remove_scheduler_for_docker():
+    """
+    为Docker构建移除scheduler相关代码和task子命令
+    通过注释方式保持行号不变，便于调试
+    """
+    import shutil
+
+    # 1. 移除scheduler文件夹
+    scheduler_dir = os.path.join(ROOT, "ddns", "scheduler")
+    if os.path.exists(scheduler_dir):
+        shutil.rmtree(scheduler_dir)
+        print(f"Removed scheduler directory: {scheduler_dir}")
+
+    # 2. 修改ddns/config/cli.py，注释掉scheduler相关代码（保持行号不变）
+    cli_path = os.path.join(ROOT, "ddns", "config", "cli.py")
+    if not os.path.exists(cli_path):
+        return False
+
+    with open(cli_path, "r", encoding="utf-8") as f:
+        content = f.read()
+
+    # 注释掉scheduler导入
+    content = re.sub(
+        r"^(from \.\.scheduler import get_scheduler)$",
+        r"# \1",
+        content,
+        flags=re.MULTILINE
+    )
+
+    # 注释掉函数调用
+    content = re.sub(
+        r"^(\s*)(_add_task_subcommand_if_needed\(parser\))$",
+        r"\1# \2",
+        content,
+        flags=re.MULTILINE
+    )
+
+    # 注释掉整个函数块，保持行号
+    target_functions = ["_add_task_subcommand_if_needed", "_handle_task_command", "_print_status"]
+    for func_name in target_functions:
+        # 匹配函数定义到下一个函数或文件结尾
+        pattern = rf"([ \t]*def {func_name}\s*\(.*?\):(?:.*?\n)*?)(?=^[ \t]*def |\Z)"
+
+        def comment_block(match):
+            block = match.group(1)
+            lines = block.split("\n")
+            commented_lines = []
+            for line in lines:
+                if line.strip():  # 非空行
+                    # 在每行前加注释
+                    commented_lines.append("# " + line)
+                else:  # 空行保持原样
+                    commented_lines.append(line)
+            return "\n".join(commented_lines)
+
+        content = re.sub(pattern, comment_block, content, flags=re.DOTALL | re.MULTILINE)
+
+    with open(cli_path, "w", encoding="utf-8") as f:
+        f.write(content)
+
+    print(f"Commented out scheduler-related code in {cli_path} (preserving line numbers)")
+    return True
+
+
 def remove_python2_compatibility(pyfile):  # noqa: C901
     """
     自动将所有 try-except python2/3 兼容导入替换为 python3 only 导入，并显示处理日志
@@ -351,9 +455,9 @@ def main():
     mode = sys.argv[1].lower() if len(sys.argv) > 1 else "default"
     version = resolve_version(mode)
 
-    if mode not in ["version", "release", "default"]:
+    if mode not in ["version", "release", "default", "docker"]:
         print(f"unknown mode: {mode}")
-        print("Usage: python patch.py [version|release]")
+        print("Usage: python patch.py [version|release|docker]")
         exit(1)
     elif mode == "release":
         # 同步修改 doc/release.md 的版本与链接
@@ -379,8 +483,14 @@ def main():
     run_py_path = os.path.join(ROOT, "run.py")
     update_nuitka_version(run_py_path, version)
     add_nuitka_file_description(run_py_path)
+    add_nuitka_windows_unbuffered(run_py_path)
     # add_nuitka_include_modules(run_py_path)
 
+    # 检测Docker环境并移除scheduler
+    if mode == "docker":
+        print("Detected Docker environment, removing scheduler components...")
+        remove_scheduler_for_docker()
+
     changed_files = 0
     for dirpath, _, filenames in os.walk(ROOT):
         for fname in filenames:

.github/workflows/build.yml

@@ -148,7 +148,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     env:
       OS_NAME: ${{ contains(matrix.os,'ubuntu') && 'ubuntu' || contains(matrix.os, 'mac') && 'mac' || 'windows' }}
-    timeout-minutes: 10
+    timeout-minutes: ${{ matrix.arch == 'x86' && 20 || contains(matrix.os, 'windows') && 12 || 8 }}
     steps:
       - uses: actions/checkout@v4
       - name: Set up Python 3.12
@@ -327,6 +327,7 @@ jobs:
         }}
     steps:
       - uses: actions/checkout@v4
+      - run: python3 .github/patch.py docker
       - uses: docker/setup-qemu-action@v3 # 仅仅在需要时启用 QEMU 支持
         if: matrix.host == 'qemu'
         with:
@@ -388,9 +389,6 @@ jobs:
             docker run --platform $platform --rm ${{ env.DOCKER_IMG }}:$tag -h
             docker run --platform $platform --rm -v "$(pwd):/ddns/" ${{ env.DOCKER_IMG }}:$tag || test -e "config.json"
             sudo rm -f config.json
-            echo "Testing task functionality..."
-            docker run --platform $platform --rm ${{ env.DOCKER_IMG }}:$tag ddns task -h
-            docker run --platform $platform --rm -v "$(pwd):/ddns/" ${{ env.DOCKER_IMG }}:$tag /ddns/tests/scripts/test-task-cron.sh ddns
             echo "Testing with config files..."
             docker run --platform $platform --rm -v "$(pwd):/ddns/" ${{ env.DOCKER_IMG }}:$tag -c /ddns/tests/config/callback.json
             docker run --platform $platform --rm -v "$(pwd):/ddns/" ${{ env.DOCKER_IMG }}:$tag -c /ddns/tests/config/multi-provider.json

.github/workflows/publish.yml

@@ -23,6 +23,7 @@ jobs:
       platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64/v8,linux/ppc64le,linux/riscv64,linux/s390x
     steps:
       - uses: actions/checkout@v4
+      - run: python3 .github/patch.py docker
       - uses: docker/setup-qemu-action@v3
         with:
           platforms: ${{ env.platforms }}

.vscode/settings.json

@@ -41,4 +41,26 @@
         120
     ],
     "chat.agent.maxRequests": 64,
+    "chat.tools.terminal.autoApprove": {
+        "python": true,
+        "python -c": true,
+        "python -m": true,
+        "python -m unittest": true,
+        "python3": true,
+        "python3 -c": true,
+        "python3 -m": true,
+        "python3 -m unittest": true,
+        "echo": true,
+        "cd": true,
+        "ls": true,
+        "dir": true,
+        "git": true,
+        "git status": true,
+        "rm": true,
+        "del": true,
+        "delete": true,
+        "mv": true,
+        "move": true,
+    },
+    "github.copilot.chat.agent.currentEditorContext.enabled": true
 }

ddns/__main__.py

@@ -107,6 +107,11 @@ def main():
         # 兼容windows 和部分ASCII编码的老旧系统
         sys.stdout = TextIOWrapper(sys.stdout.buffer, encoding="utf-8")
         sys.stderr = TextIOWrapper(sys.stderr.buffer, encoding="utf-8")
+
+    # Windows 下输出一个空行
+    if stdout and sys.platform.startswith("win"):
+        stdout.write("\r\n")
+
     logger.name = "ddns"
 
     # 使用多配置加载器，它会自动处理单个和多个配置

ddns/config/cli.py

@@ -4,13 +4,14 @@
 @author: NewFuture
 """
 
-import sys
 import platform
-from argparse import Action, ArgumentParser, RawTextHelpFormatter, SUPPRESS
-from logging import DEBUG, getLevelName, basicConfig
+import sys
+from argparse import SUPPRESS, Action, ArgumentParser, RawTextHelpFormatter
+from logging import DEBUG, basicConfig, getLevelName
 from os import path as os_path
-from .file import save_config
+
 from ..scheduler import get_scheduler
+from .file import save_config
 
 __all__ = ["load_config", "str_bool"]
 
@@ -246,7 +247,8 @@ def load_config(description, doc, version, date):
     parser = ArgumentParser(description=description, epilog=doc, formatter_class=RawTextHelpFormatter)
     sysinfo = _get_system_info_str()
     pyinfo = _get_python_info_str()
-    version_str = "v{} ({})\n{}\n{}".format(version, date, pyinfo, sysinfo)
+    compiled = getattr(sys.modules["__main__"], "__compiled__", "")
+    version_str = "v{} ({})\n{}\n{}\n{}".format(version, date, pyinfo, sysinfo, compiled)
 
     _add_ddns_args(parser)  # Add common DDNS arguments to main parser
     # Default behavior (no subcommand) - add all the regular DDNS options
@@ -323,23 +325,18 @@ def _handle_task_command(args):  # type: (dict) -> None
     status = scheduler.get_status()
 
     if args.get("status") or status["installed"]:
-        _print_status(status)
+        print("DDNS Task Status:")
+        print("  Installed: {}".format("Yes" if status["installed"] else "No"))
+        print("  Scheduler: {}".format(status["scheduler"]))
+        if status["installed"]:
+            print("  Enabled: {}".format(status.get("enabled", "unknown")))
+            print("  Interval: {} minutes".format(status.get("interval", "unknown")))
+            print("  Command: {}".format(status.get("command", "unknown")))
+            print("  Description: {}".format(status.get("description", "")))
     else:
         print("DDNS task is not installed. Installing with default settings...")
         if scheduler.install(interval, ddns_args):
             print("DDNS task installed successfully with {} minute interval".format(interval))
         else:
             print("Failed to install DDNS task")
             sys.exit(1)
-
-
-def _print_status(status):
-    """Print task status information"""
-    print("DDNS Task Status:")
-    print("  Installed: {}".format("Yes" if status["installed"] else "No"))
-    print("  Scheduler: {}".format(status["scheduler"]))
-    if status["installed"]:
-        print("  Enabled: {}".format(status.get("enabled", "unknown")))
-        print("  Interval: {} minutes".format(status.get("interval", "unknown")))
-        print("  Command: {}".format(status.get("command", "unknown")))
-        print("  Description: {}".format(status.get("description", "")))

ddns/scheduler/__init__.py

@@ -5,17 +5,19 @@
 @author: NewFuture
 """
 
-import platform
 import os
+import platform
 
 from ddns.util.fileio import read_file_safely
 
+from ..util.try_run import try_run
+
 # Import all scheduler classes
 from ._base import BaseScheduler
-from .systemd import SystemdScheduler
 from .cron import CronScheduler
 from .launchd import LaunchdScheduler
 from .schtasks import SchtasksScheduler
+from .systemd import SystemdScheduler
 
 
 def get_scheduler(scheduler=None):
@@ -48,7 +50,10 @@ def get_scheduler(scheduler=None):
             launchd_dirs = ["/Library/LaunchDaemons", "/System/Library/LaunchDaemons"]
             if any(os.path.isdir(d) for d in launchd_dirs):
                 return LaunchdScheduler()
-        elif system == "linux" and read_file_safely("/proc/1/comm", default="").strip() == "systemd":  # type: ignore
+        elif system == "linux" and (
+            (read_file_safely("/proc/1/comm", default="").strip().lower() == "systemd")
+            or (try_run(["systemctl", "--version"]) is not None)
+        ):  # Linux with systemd available
             return SystemdScheduler()
         return CronScheduler()  # Other Unix-like systems, use cron
     elif scheduler == "systemd":

ddns/scheduler/_base.py

@@ -4,7 +4,6 @@
 @author: NewFuture
 """
 
-import subprocess
 import sys
 from datetime import datetime
 from logging import Logger, getLogger  # noqa: F401
@@ -18,20 +17,10 @@ class BaseScheduler(object):
     def __init__(self, logger=None):  # type: (Logger | None) -> None
         self.logger = (logger or getLogger()).getChild("task")
 
-    def _run_command(self, command, **kwargs):  # type: (list[str], **Any) -> str | None
-        """Safely run subprocess command, return decoded string or None if failed"""
-        try:
-            if sys.version_info[0] >= 3:
-                kwargs.setdefault("timeout", 60)  # 60 second timeout to prevent hanging
-            return subprocess.check_output(command, universal_newlines=True, **kwargs)
-        except Exception as e:
-            self.logger.debug("Command failed: %s", e)
-            return None
-
     def _get_ddns_cmd(self):  # type: () -> list[str]
         """Get DDNS command for scheduled execution as array"""
-        if hasattr(sys, "frozen"):
-            return [sys.argv[0] or sys.executable]
+        if hasattr(sys.modules["__main__"], "__compiled__"):
+            return [sys.argv[0]]
         else:
             return [sys.executable, "-m", "ddns"]
 

ddns/scheduler/cron.py

@@ -9,6 +9,7 @@
 import tempfile
 
 from ..util.fileio import write_file
+from ..util.try_run import try_run
 from ._base import BaseScheduler
 
 
@@ -32,13 +33,13 @@ def _update_crontab(self, lines):  # type: (list[str]) -> bool
             return False
 
     def is_installed(self, crontab_content=None):  # type: (str | None) -> bool
-        result = crontab_content or self._run_command(["crontab", "-l"]) or ""
+        result = crontab_content or try_run(["crontab", "-l"], logger=self.logger) or ""
         return self.KEY in result
 
     def get_status(self):
         status = {"scheduler": "cron", "installed": False}  # type: dict[str, str | bool | int | None]
         # Get crontab content once and reuse it for all checks
-        crontab_content = self._run_command(["crontab", "-l"]) or ""
+        crontab_content = try_run(["crontab", "-l"], logger=self.logger) or ""
         lines = crontab_content.splitlines()
         line = next((i for i in lines if self.KEY in i), "").strip()
 
@@ -63,7 +64,7 @@ def install(self, interval, ddns_args=None):
         description = self._get_description()
         cron_entry = '*/{} * * * * cd "{}" && {} # DDNS: {}'.format(interval, os.getcwd(), ddns_command, description)
 
-        crontext = self._run_command(["crontab", "-l"]) or ""
+        crontext = try_run(["crontab", "-l"], logger=self.logger) or ""
         lines = [line for line in crontext.splitlines() if self.KEY not in line]
         lines.append(cron_entry)
 
@@ -84,7 +85,7 @@ def disable(self):
 
     def _modify_cron_lines(self, action):  # type: (str) -> bool
         """Helper to enable, disable, or uninstall cron lines"""
-        crontext = self._run_command(["crontab", "-l"])
+        crontext = try_run(["crontab", "-l"], logger=self.logger)
         if not crontext or self.KEY not in crontext:
             self.logger.info("No crontab found")
             return False