fileflow-cli 0.2.0__tar.gz → 0.2.1__tar.gz

{fileflow_cli-0.2.0/src/fileflow_cli.egg-info → fileflow_cli-0.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fileflow-cli
-Version: 0.2.0
+Version: 0.2.1
 Summary: 🧹 智能文件整理器 — YAML 规则引擎驱动的 CLI 文件分类/移动/清理工具
 Author-email: Yuluo <lingeryuluo@gmail.com>
 License-Expression: MIT

{fileflow_cli-0.2.0 → fileflow_cli-0.2.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "fileflow-cli"
-version = "0.2.0"
+version = "0.2.1"
 description = "🧹 智能文件整理器 — YAML 规则引擎驱动的 CLI 文件分类/移动/清理工具"
 readme = "README.md"
 requires-python = ">=3.10"
@@ -71,6 +71,11 @@ python_version = "3.10"
 exclude = ["tests/"]
 ignore_missing_imports = true
 
+# Typer decorators don't have type stubs
+[[tool.mypy.overrides]]
+module = "fileflow.cli"
+disable_error_code = ["untyped-decorator"]
+
 [tool.pytest.ini_options]
 testpaths = ["tests"]
 python_files = ["test_*.py"]

{fileflow_cli-0.2.0 → fileflow_cli-0.2.1}/src/fileflow/__init__.py

@@ -1,3 +1,3 @@
 """FileFlow — 智能文件整理器."""
 
-__version__ = "0.2.0"
+__version__ = "0.2.1"

{fileflow_cli-0.2.0 → fileflow_cli-0.2.1}/src/fileflow/actions.py

@@ -9,9 +9,9 @@
 from __future__ import annotations
 
 import shutil
+from collections.abc import Callable
 from enum import Enum
 from pathlib import Path
-from typing import Callable
 
 from .templates import resolve_path
 

{fileflow_cli-0.2.0 → fileflow_cli-0.2.1}/src/fileflow/cli.py

@@ -6,7 +6,6 @@
 from __future__ import annotations
 
 from pathlib import Path
-from typing import Optional
 
 import typer
 from rich import box
@@ -23,7 +22,7 @@ from .config import (
     load_config,
 )
 from .engine import run
-from .history import HistoryManager
+from .history import HistoryEntry, HistoryManager
 from .report import (
     print_banner,
     print_config_preview,
@@ -51,7 +50,9 @@ def _version_callback(value: bool) -> None:
 @app.callback()
 def main(
     version: bool = typer.Option(
-        False, "--version", "-V",
+        False,
+        "--version",
+        "-V",
         help="显示版本号并退出",
         callback=_version_callback,
         is_eager=True,
@@ -64,30 +65,41 @@ def main(
 @app.command(name="run")
 def run_command(
     source_dir: str = typer.Argument(
-        ".", help="要整理的目录路径（默认当前目录）",
+        ".",
+        help="要整理的目录路径（默认当前目录）",
     ),
-    config: Optional[str] = typer.Option(
-        None, "--config", "-c",
+    config: str | None = typer.Option(
+        None,
+        "--config",
+        "-c",
         help="配置文件路径（默认自动搜索 .fileflow.yaml）",
     ),
     force: bool = typer.Option(
-        False, "--force", "-f",
+        False,
+        "--force",
+        "-f",
         help="跳过预览，直接执行整理",
     ),
     dry_run: bool = typer.Option(
-        False, "--dry-run", "-n",
+        False,
+        "--dry-run",
+        "-n",
         help="仅预览，不执行任何操作",
     ),
     yes: bool = typer.Option(
-        False, "--yes", "-y",
+        False,
+        "--yes",
+        "-y",
         help="自动确认所有提示",
     ),
     no_recursive: bool = typer.Option(
-        False, "--no-recursive",
+        False,
+        "--no-recursive",
         help="不递归扫描子目录",
     ),
     no_progress: bool = typer.Option(
-        False, "--no-progress",
+        False,
+        "--no-progress",
         help="不显示进度条",
     ),
 ) -> None:
@@ -116,9 +128,14 @@ def run_command(
                     console.print("[red]❌ 请先运行 [bold]fileflow init[/] 创建配置文件[/]")
                     raise typer.Exit(code=1)
 
-        is_dry_run: bool | None = dry_run or None
+        # ── 确定 dry-run 模式 ────────────────────────────
+        # 优先级: --force > --dry-run > 配置文件 > 默认值
         if force:
             is_dry_run = False
+        elif dry_run:
+            is_dry_run = True
+        else:
+            is_dry_run = None  # 由 engine.run() 读取配置文件
 
         # ── 执行引擎 ──────────────────────────────────────
         result = run(
@@ -157,8 +174,6 @@ def run_command(
             result.print()
             # 保存操作历史
             if result.results:
-                from .history import HistoryEntry, HistoryManager
-
                 entry = HistoryEntry.from_results(Path(source_dir).resolve(), result.results)
                 hm = HistoryManager()
                 hm.append(entry)
@@ -167,8 +182,6 @@ def run_command(
             console.print("[dim]已取消，未执行任何操作[/]")
     elif result.results and not result.dry_run:
         # 非 dry-run 模式，直接保存历史
-        from .history import HistoryEntry, HistoryManager
-
         entry = HistoryEntry.from_results(Path(source_dir).resolve(), result.results)
         hm = HistoryManager()
         hm.append(entry)
@@ -177,15 +190,14 @@ def run_command(
 @app.command()
 def init(
     global_config: bool = typer.Option(
-        False, "--global", "-g",
+        False,
+        "--global",
+        "-g",
         help="生成到用户目录 (~/.fileflow.yaml)",
     ),
 ) -> None:
     """🚀 生成默认配置文件 .fileflow.yaml"""
-    if global_config:
-        target = Path.home() / ".fileflow.yaml"
-    else:
-        target = Path.cwd() / ".fileflow.yaml"
+    target = Path.home() / ".fileflow.yaml" if global_config else Path.cwd() / ".fileflow.yaml"
 
     if target.exists():
         overwrite = typer.confirm(
@@ -201,19 +213,23 @@ def init(
 
     console.print(f"[green]✅ 已生成配置文件:[/] {target}")
     console.print()
-    console.print(Panel.fit(
-        "[bold]📋 下一步:[/]\n"
-        f"  1. 编辑 [cyan]{target.name}[/] 自定义规则\n"
-        f"  2. 运行 [bold cyan]fileflow run .[/] 预览效果\n"
-        f"  3. 加 [bold yellow]--force[/] 执行整理",
-        border_style="green",
-    ))
+    console.print(
+        Panel.fit(
+            "[bold]📋 下一步:[/]\n"
+            f"  1. 编辑 [cyan]{target.name}[/] 自定义规则\n"
+            f"  2. 运行 [bold cyan]fileflow run .[/] 预览效果\n"
+            f"  3. 加 [bold yellow]--force[/] 执行整理",
+            border_style="green",
+        )
+    )
 
 
 @app.command()
 def validate(
-    config: Optional[str] = typer.Option(
-        None, "--config", "-c",
+    config: str | None = typer.Option(
+        None,
+        "--config",
+        "-c",
         help="配置文件路径",
     ),
 ) -> None:
@@ -232,11 +248,15 @@ def validate(
 @app.command(name="list-rules")
 def list_rules_command(
     verbose: bool = typer.Option(
-        False, "--verbose", "-v",
+        False,
+        "--verbose",
+        "-v",
         help="显示详细的匹配条件",
     ),
-    config: Optional[str] = typer.Option(
-        None, "--config", "-c",
+    config: str | None = typer.Option(
+        None,
+        "--config",
+        "-c",
         help="配置文件路径",
     ),
 ) -> None:
@@ -248,7 +268,7 @@ def list_rules_command(
         if not rules:
             console.print("[yellow]⚠ 配置中没有定义任何规则[/]")
             console.print("[dim]用 [bold]fileflow init[/] 可以生成默认规则[/]")
-            raise typer.Exit()
+            raise typer.Exit(code=1)
 
         print_rule_list(rules, verbose=verbose)
     except ConfigError as e:
@@ -259,12 +279,17 @@ def list_rules_command(
 @app.command()
 def undo(
     steps: int = typer.Option(
-        1, "--steps", "-n",
+        1,
+        "--steps",
+        "-n",
         help="撤销最近 N 步操作（默认 1）",
-        min=1, max=10,
+        min=1,
+        max=10,
     ),
     all: bool = typer.Option(
-        False, "--all", "-a",
+        False,
+        "--all",
+        "-a",
         help="撤销所有操作",
     ),
 ) -> None:
@@ -298,13 +323,14 @@ def undo(
 
 @app.command()
 def stats(
-    config: Optional[str] = typer.Option(
-        None, "--config", "-c",
+    config: str | None = typer.Option(
+        None,
+        "--config",
+        "-c",
         help="配置文件路径",
     ),
 ) -> None:
     """📊 查看整理统计信息."""
-    from datetime import datetime
 
     # 历史统计
     hm = HistoryManager()

{fileflow_cli-0.2.0 → fileflow_cli-0.2.1}/src/fileflow/config.py

@@ -7,9 +7,6 @@ from typing import Any
 
 import yaml
 
-from .rules import RuleSet
-
-
 DEFAULT_CONFIG = {
     "version": "1.0",
     "settings": {
@@ -63,10 +60,7 @@ def load_config(path: Path | str | None = None) -> dict[str, Any]:
     """
     resolved = find_config(path)
     if resolved is None:
-        msg = (
-            "未找到 .fileflow.yaml 配置文件。\n"
-            "请先在目标目录运行: fileflow init"
-        )
+        msg = "未找到 .fileflow.yaml 配置文件。\n请先在目标目录运行: fileflow init"
         raise ConfigError(msg)
 
     try:
@@ -89,11 +83,9 @@ def _merge_defaults(data: dict[str, Any]) -> dict[str, Any]:
 
     # 合并 settings
     if "settings" in data and isinstance(data["settings"], dict):
-        merged_settings = merged["settings"].copy()
-        merged_settings.update({
-            k: v for k, v in data["settings"].items()
-            if v is not None
-        })
+        default_settings: dict[str, Any] = merged["settings"]  # type: ignore[assignment]
+        merged_settings = default_settings.copy()
+        merged_settings.update({k: v for k, v in data["settings"].items() if v is not None})
         merged["settings"] = merged_settings
 
     return merged
@@ -106,8 +98,7 @@ def validate_config(config: dict[str, Any]) -> None:
     on_conflict = settings.get("on_conflict", "skip")
     if on_conflict not in valid_conflicts:
         raise ConfigError(
-            f"无效的 on_conflict 值: {on_conflict!r}。"
-            f" 可选: {', '.join(valid_conflicts)}"
+            f"无效的 on_conflict 值: {on_conflict!r}。 可选: {', '.join(valid_conflicts)}"
         )
 
     rules = config.get("rules", [])

fileflow_cli-0.2.1/src/fileflow/engine.py

@@ -0,0 +1,283 @@
+"""核心编排引擎：扫描 → 匹配 → 执行."""
+
+from __future__ import annotations
+
+from pathlib import Path
+
+from rich.progress import (
+    BarColumn,
+    Progress,
+    SpinnerColumn,
+    TextColumn,
+    TimeElapsedColumn,
+)
+
+from .actions import ActionResult, ConflictStrategy, get_action
+from .config import load_config
+from .matchers import matches
+from .report import print_summary
+from .rules import RuleSet
+from .templates import resolve_path
+
+
+class EngineResult:
+    """一次引擎运行的结果."""
+
+    def __init__(
+        self,
+        source_dir: Path,
+        results: list[ActionResult],
+        dry_run: bool,
+        rule_matches: dict[str, int],
+        total_scanned: int = 0,
+    ) -> None:
+        self.source_dir = source_dir
+        self.results = results
+        self.dry_run = dry_run
+        self.rule_matches = rule_matches
+        self.total_scanned = total_scanned
+
+    @property
+    def success_count(self) -> int:
+        return sum(1 for r in self.results if r.success and not r.skipped)
+
+    @property
+    def skipped_count(self) -> int:
+        return sum(1 for r in self.results if r.skipped)
+
+    @property
+    def error_count(self) -> int:
+        return sum(1 for r in self.results if not r.success)
+
+    def print(self) -> None:
+        """打印结果到终端."""
+        print_summary(self)
+
+
+def run(
+    source_dir: str | Path,
+    config_path: str | Path | None = None,
+    dry_run: bool | None = None,
+    force: bool = False,
+    recursive: bool = True,
+    show_progress: bool = True,
+) -> EngineResult:
+    """运行文件整理.
+
+    1. 加载配置
+    2. 扫描源目录
+    3. 对每个文件匹配规则
+    4. 执行操作（或预览）
+
+    Args:
+        source_dir: 要整理的目录路径.
+        config_path: 配置文件路径，None 则自动搜索.
+        dry_run: 是否仅预览；None 则使用配置中的 dry_run_by_default.
+        force: 忽略 dry_run 设置，强制执行.
+        recursive: 是否递归扫描子目录.
+        show_progress: 是否显示进度条.
+    """
+    source = Path(source_dir).resolve()
+    if not source.is_dir():
+        raise ValueError(f"源路径不是目录: {source}")
+
+    config = load_config(config_path)
+    settings = config.get("settings", {})
+
+    # 确定 dry-run 模式
+    # 优先级: --force > --dry-run > 配置文件 > 默认值
+    if force:
+        dry_run = False
+    elif dry_run is None:
+        dry_run = settings.get("dry_run_by_default", True)
+
+    conflict_str = ConflictStrategy(settings.get("on_conflict", "skip"))
+    create_dirs = settings.get("create_target_dirs", True)
+
+    rule_set = RuleSet.load_from_yaml(config.get("rules", []))
+
+    # ── 扫描文件 ───────────────────────────────────────────
+    if show_progress:
+        spinner = Progress(
+            SpinnerColumn(),
+            TextColumn("[bold cyan]🔍 扫描文件中...[/]"),
+            transient=True,
+        )
+        with spinner:
+            spinner.add_task("", total=None)
+            files = _scan_files(source, recursive)
+    else:
+        files = _scan_files(source, recursive)
+
+    # ── 匹配 + 执行 ─────────────────────────────────────────
+    results: list[ActionResult] = []
+    rule_matches: dict[str, int] = {}
+
+    if show_progress and files:
+        _run_with_progress(
+            files,
+            rule_set,
+            dry_run,
+            source,
+            conflict_str,
+            create_dirs,
+            results,
+            rule_matches,
+        )
+    else:
+        _run_simple(
+            files,
+            rule_set,
+            dry_run,
+            source,
+            conflict_str,
+            create_dirs,
+            results,
+            rule_matches,
+        )
+
+    return EngineResult(
+        source_dir=source,
+        results=results,
+        dry_run=dry_run,
+        rule_matches=rule_matches,
+        total_scanned=len(files),
+    )
+
+
+def _match_and_execute(
+    file_path: Path,
+    rule_set: RuleSet,
+    dry_run: bool,
+    source: Path,
+    conflict_str: ConflictStrategy,
+    create_dirs: bool,
+    results: list[ActionResult],
+    rule_matches: dict[str, int],
+) -> bool:
+    """对一个文件尝试所有规则，匹配则执行/记录操作.
+
+    Returns:
+        True 表示匹配到了规则，False 表示没有匹配.
+    """
+    for rule in rule_set.active_rules:
+        if matches(file_path, rule):
+            rule_matches[rule.name] = rule_matches.get(rule.name, 0) + 1
+            if dry_run:
+                try:
+                    dest = resolve_path(rule.target, file_path, source)
+                    results.append(
+                        ActionResult(
+                            file_path,
+                            target=dest,
+                            success=True,
+                            action=f"[dry-run] {rule.action}",
+                        )
+                    )
+                except Exception as e:
+                    results.append(
+                        ActionResult(
+                            file_path,
+                            error=str(e),
+                            success=False,
+                            action=rule.action,
+                        )
+                    )
+            else:
+                action_func = get_action(rule.action)
+                result = action_func(
+                    file_path,
+                    rule.target,
+                    source,
+                    create_dirs=create_dirs,
+                    conflict=conflict_str,
+                )
+                results.append(result)
+            return True
+    return False
+
+
+def _run_with_progress(
+    files: list[Path],
+    rule_set: RuleSet,
+    dry_run: bool,
+    source: Path,
+    conflict_str: ConflictStrategy,
+    create_dirs: bool,
+    results: list[ActionResult],
+    rule_matches: dict[str, int],
+) -> None:
+    """带进度条的文件匹配执行."""
+    progress = Progress(
+        TextColumn("[bold cyan]📦[/]"),
+        TextColumn("[progress.percentage]{task.percentage:>3.0f}%"),
+        BarColumn(),
+        TextColumn("[bold]{task.completed}/{task.total}"),
+        TextColumn("[dim]{task.fields[status]}"),
+        TimeElapsedColumn(),
+        transient=True,
+    )
+    with progress:
+        task = progress.add_task(
+            "预览中..." if dry_run else "整理中...",
+            total=len(files),
+            status="",
+        )
+        for file_path in files:
+            _match_and_execute(
+                file_path,
+                rule_set,
+                dry_run,
+                source,
+                conflict_str,
+                create_dirs,
+                results,
+                rule_matches,
+            )
+            progress.update(
+                task,
+                advance=1,
+                status=f"[dim]{file_path.name}[/]",
+            )
+
+
+def _run_simple(
+    files: list[Path],
+    rule_set: RuleSet,
+    dry_run: bool,
+    source: Path,
+    conflict_str: ConflictStrategy,
+    create_dirs: bool,
+    results: list[ActionResult],
+    rule_matches: dict[str, int],
+) -> None:
+    """无进度条的简单文件匹配执行."""
+    for file_path in files:
+        _match_and_execute(
+            file_path,
+            rule_set,
+            dry_run,
+            source,
+            conflict_str,
+            create_dirs,
+            results,
+            rule_matches,
+        )
+
+
+def _scan_files(directory: Path, recursive: bool) -> list[Path]:
+    """扫描目录中的普通文件（忽略隐藏文件）."""
+    files: list[Path] = []
+
+    if recursive:
+        for entry in directory.rglob("*"):
+            if entry.is_file() and not any(
+                part.startswith(".") for part in entry.relative_to(directory).parts
+            ):
+                files.append(entry)
+    else:
+        for entry in directory.iterdir():
+            if entry.is_file() and not entry.name.startswith("."):
+                files.append(entry)
+
+    return sorted(files)

{fileflow_cli-0.2.0 → fileflow_cli-0.2.1}/src/fileflow/history.py

@@ -11,8 +11,7 @@ from datetime import datetime
 from pathlib import Path
 from typing import Any
 
-from .actions import ActionResult, move_file, ConflictStrategy
-
+from .actions import ActionResult, ConflictStrategy, move_file
 
 HISTORY_FILE = ".fileflow_history.json"
 
@@ -42,11 +41,13 @@ class HistoryEntry:
         operations = []
         for r in results:
             if r.success and not r.skipped and r.target and r.target != r.source:
-                operations.append({
-                    "source": str(r.source),
-                    "target": str(r.target),
-                    "action": r.action.replace("[dry-run] ", ""),
-                })
+                operations.append(
+                    {
+                        "source": str(r.source),
+                        "target": str(r.target),
+                        "action": r.action.replace("[dry-run] ", ""),
+                    }
+                )
 
         return cls(
             timestamp=datetime.now().isoformat(),
@@ -138,7 +139,6 @@ class HistoryManager:
 
         # 反向执行：把文件从 target 移回 source
         for op in reversed(entry.operations):
-            source = Path(op["source"])
             target = Path(op["target"])
             if target.exists():
                 try:

{fileflow_cli-0.2.0 → fileflow_cli-0.2.1}/src/fileflow/matchers.py

@@ -73,10 +73,7 @@ class ExtensionsMatcher(Matcher):
 
     def __init__(self, value: list[str]) -> None:
         # 统一处理：确保 . 开头、小写
-        self.extensions = {
-            e.lower() if e.startswith(".") else f".{e.lower()}"
-            for e in value
-        }
+        self.extensions = {e.lower() if e.startswith(".") else f".{e.lower()}" for e in value}
 
     def __call__(self, path: Path) -> bool:
         if not path.is_file():
@@ -86,7 +83,7 @@ class ExtensionsMatcher(Matcher):
 
 @register("patterns")
 class PatternsMatcher(Matcher):
-    """按文件名通配符模式匹配（如 *.txt, data_*.csv）. """
+    """按文件名通配符模式匹配（如 *.txt, data_*.csv）."""
 
     def __init__(self, value: list[str]) -> None:
         import fnmatch
@@ -134,6 +131,8 @@ class SizeMatcher(Matcher):
 
     def __init__(self, value: float | int) -> None:
         self.limit = value
+        self.min_bytes: int | None = None
+        self.max_bytes: int | None = None
 
     @classmethod
     def from_rule(cls, rule: Rule) -> SizeMatcher | None:
@@ -171,9 +170,7 @@ class SizeMatcher(Matcher):
 
         if min_b is not None and size < min_b:
             return False
-        if max_b is not None and size > max_b:
-            return False
-        return True
+        return not (max_b is not None and size > max_b)
 
 
 # ── 规则匹配引擎 ──────────────────────────────────────────

{fileflow_cli-0.2.0 → fileflow_cli-0.2.1}/src/fileflow/report.py

@@ -2,14 +2,12 @@
 
 from __future__ import annotations
 
-from pathlib import Path
 from typing import TYPE_CHECKING, Any
 
 from rich import box
 from rich.console import Console
 from rich.panel import Panel
 from rich.table import Table
-from rich.text import Text
 
 from .actions import ActionResult
 
@@ -22,7 +20,7 @@ console = Console()
 def print_banner() -> None:
     """打印 FileFlow 启动横幅."""
     banner = Panel.fit(
-        "[bold cyan]🧹 FileFlow[/] [yellow]v0.2.0[/]  [dim]— 智能文件整理器[/]",
+        "[bold cyan]🧹 FileFlow[/] [yellow]v0.2.1[/]  [dim]— 智能文件整理器[/]",
         border_style="cyan",
     )
     console.print(banner)

{fileflow_cli-0.2.0 → fileflow_cli-0.2.1}/src/fileflow/rules.py

@@ -3,7 +3,6 @@
 from __future__ import annotations
 
 from dataclasses import dataclass, field
-from pathlib import Path
 from typing import Any
 
 
@@ -49,7 +48,7 @@ class Rule:
         )
 
     def to_dict(self) -> dict[str, Any]:
-        """转换为可序列化字典（用于历史记录等）. """
+        """转换为可序列化字典（用于历史记录等）."""
         return {
             "name": self.name,
             "description": self.description,

{fileflow_cli-0.2.0 → fileflow_cli-0.2.1}/src/fileflow/templates.py

@@ -16,6 +16,7 @@
 
 from __future__ import annotations
 
+import re
 import string
 from dataclasses import dataclass
 from datetime import datetime
@@ -67,8 +68,15 @@ class TemplateFormatter(string.Formatter):
 
 _formatter = TemplateFormatter()
 _ALLOWED_VARS = {
-    "filename", "name", "ext", "ext_no_dot",
-    "year", "month", "day", "hour", "minute",
+    "filename",
+    "name",
+    "ext",
+    "ext_no_dot",
+    "year",
+    "month",
+    "day",
+    "hour",
+    "minute",
 }
 
 
@@ -100,8 +108,6 @@ def render(template: str, path: Path) -> str:
 
 def _find_unresolved_braces(text: str) -> list[str]:
     """查找未解析的 {var} 模式."""
-    import re
-
     return re.findall(r"\{(\w+)\}", text)
 
 

{fileflow_cli-0.2.0 → fileflow_cli-0.2.1/src/fileflow_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fileflow-cli
-Version: 0.2.0
+Version: 0.2.1
 Summary: 🧹 智能文件整理器 — YAML 规则引擎驱动的 CLI 文件分类/移动/清理工具
 Author-email: Yuluo <lingeryuluo@gmail.com>
 License-Expression: MIT

{fileflow_cli-0.2.0 → fileflow_cli-0.2.1}/src/fileflow_cli.egg-info/SOURCES.txt

@@ -21,6 +21,7 @@ src/fileflow_cli.egg-info/top_level.txt
 tests/test_actions.py
 tests/test_config.py
 tests/test_engine.py
+tests/test_history.py
 tests/test_matchers.py
 tests/test_rules.py
 tests/test_templates.py

{fileflow_cli-0.2.0 → fileflow_cli-0.2.1}/tests/test_actions.py

@@ -48,7 +48,9 @@ class TestMoveFile:
         dest.write_text("existing")
 
         result = move_file(
-            src, "moved/{filename}", temp_dir,
+            src,
+            "moved/{filename}",
+            temp_dir,
             conflict=ConflictStrategy.RENAME,
         )
         assert result.success is True
@@ -64,7 +66,9 @@ class TestMoveFile:
         dest.write_text("old content")
 
         result = move_file(
-            src, "moved/{filename}", temp_dir,
+            src,
+            "moved/{filename}",
+            temp_dir,
             conflict=ConflictStrategy.OVERWRITE,
         )
         assert result.success is True

{fileflow_cli-0.2.0 → fileflow_cli-0.2.1}/tests/test_engine.py

@@ -7,9 +7,7 @@ from pathlib import Path
 import pytest
 import yaml
 
-from fileflow.config import load_config
-from fileflow.engine import EngineResult, _scan_files, run
-from fileflow.rules import RuleSet
+from fileflow.engine import _scan_files, run
 
 
 class TestScanFiles:
@@ -129,12 +127,17 @@ class TestEngineResult:
         (temp_dir / "test.jpg").write_text("jpeg")
         # 创建临时配置文件
         cfg = temp_dir / ".fileflow.yaml"
-        cfg.write_text(yaml.dump({
-            "version": "1.0",
-            "rules": [
-                {"name": "IMG", "match": {"extensions": [".jpg"]}, "target": "Images/"},
-            ],
-        }), encoding="utf-8")
+        cfg.write_text(
+            yaml.dump(
+                {
+                    "version": "1.0",
+                    "rules": [
+                        {"name": "IMG", "match": {"extensions": [".jpg"]}, "target": "Images/"},
+                    ],
+                }
+            ),
+            encoding="utf-8",
+        )
 
         result = run(source_dir=temp_dir, config_path=cfg, dry_run=True)
         result.print()

fileflow_cli-0.2.1/tests/test_history.py

@@ -0,0 +1,132 @@
+"""测试历史记录和撤销功能."""
+
+from __future__ import annotations
+
+from pathlib import Path
+
+from fileflow.actions import ActionResult
+from fileflow.history import HistoryEntry, HistoryManager
+
+
+class TestHistoryEntry:
+    def test_from_results_empty(self) -> None:
+        entry = HistoryEntry.from_results(Path("/tmp"), [])
+        assert entry.operations == []
+        assert entry.action == "run"
+
+    def test_from_results_filters_skipped(self) -> None:
+        results = [
+            ActionResult(Path("/a.txt"), target=Path("/b.txt"), success=True),
+            ActionResult(Path("/c.txt"), skipped=True),
+            ActionResult(Path("/d.txt"), success=False, error="err"),
+        ]
+        entry = HistoryEntry.from_results(Path("/tmp"), results)
+        assert len(entry.operations) == 1  # 只记录成功的
+        assert entry.operations[0]["source"] == str(Path("/a.txt"))
+
+    def test_to_dict(self) -> None:
+        entry = HistoryEntry(
+            timestamp="2026-01-01T00:00:00",
+            action="run",
+            source_dir="/tmp",
+            operations=[{"source": "/a.txt", "target": "/b.txt", "action": "move"}],
+        )
+        d = entry.to_dict()
+        assert d["timestamp"] == "2026-01-01T00:00:00"
+        assert len(d["operations"]) == 1
+
+
+class TestHistoryManager:
+    def test_append_and_load(self, temp_dir: Path) -> None:
+        hm = HistoryManager(temp_dir / ".history.json")
+        entry = HistoryEntry(
+            timestamp="2026-01-01T00:00:00",
+            action="run",
+            source_dir=str(temp_dir),
+            operations=[
+                {
+                    "source": str(temp_dir / "a.txt"),
+                    "target": str(temp_dir / "Docs" / "a.txt"),
+                    "action": "move",
+                }
+            ],
+        )
+        hm.append(entry)
+
+        entries = hm.get_all()
+        assert len(entries) == 1
+        assert entries[0].timestamp == "2026-01-01T00:00:00"
+
+    def test_get_latest_empty(self) -> None:
+        hm = HistoryManager()
+        assert hm.get_latest() is None
+
+    def test_get_latest(self, temp_dir: Path) -> None:
+        hm = HistoryManager(temp_dir / ".history.json")
+        e1 = HistoryEntry("2026-01-01T00:00:00", "run", str(temp_dir), [])
+        e2 = HistoryEntry("2026-01-02T00:00:00", "run", str(temp_dir), [])
+        hm.append(e1)
+        hm.append(e2)
+
+        latest = hm.get_latest()
+        assert latest is not None
+        assert latest.timestamp == "2026-01-02T00:00:00"
+
+    def test_clear(self, temp_dir: Path) -> None:
+        path = temp_dir / ".history.json"
+        hm = HistoryManager(path)
+        hm.append(HistoryEntry("2026-01-01T00:00:00", "run", str(temp_dir), []))
+        assert path.exists()
+        hm.clear()
+        assert not path.exists()
+
+    def test_multiple_append(self, temp_dir: Path) -> None:
+        hm = HistoryManager(temp_dir / ".history.json")
+        for i in range(3):
+            hm.append(
+                HistoryEntry(
+                    f"2026-01-0{i + 1}T00:00:00",
+                    "run",
+                    str(temp_dir),
+                    [],
+                )
+            )
+        assert len(hm.get_all()) == 3
+
+    def test_invalid_json(self, temp_dir: Path) -> None:
+        path = temp_dir / ".history.json"
+        path.write_text("invalid json", encoding="utf-8")
+        hm = HistoryManager(path)
+        assert hm.get_all() == []  # 不会崩溃
+
+    def test_undo_latest_with_real_files(self, temp_dir: Path) -> None:
+        """集成测试：创建文件 → 记录历史 → 撤销."""
+        # 创建源文件
+        src = temp_dir / "test.txt"
+        src.write_text("hello")
+        target = temp_dir / "Moved" / "test.txt"
+        target.parent.mkdir(parents=True)
+        target.write_text("hello")
+
+        hm = HistoryManager(temp_dir / ".history.json")
+        entry = HistoryEntry(
+            timestamp="2026-01-01T00:00:00",
+            action="run",
+            source_dir=str(temp_dir),
+            operations=[
+                {
+                    "source": str(src),
+                    "target": str(target),
+                    "action": "move",
+                }
+            ],
+        )
+        hm.append(entry)
+
+        # 执行撤销
+        success, failed = hm.undo_latest()
+        assert success == 1
+        assert failed == 0
+        # 文件应该被移回
+        assert src.exists()
+        assert not target.exists()

{fileflow_cli-0.2.0 → fileflow_cli-0.2.1}/tests/test_matchers.py

@@ -11,9 +11,8 @@ from fileflow.matchers import (
     PatternsMatcher,
     SizeMatcher,
     build_matchers,
-    matches,
-    register,
     list_matchers,
+    matches,
 )
 from fileflow.rules import Rule
 

{fileflow_cli-0.2.0 → fileflow_cli-0.2.1}/tests/test_templates.py

@@ -3,7 +3,6 @@
 from __future__ import annotations
 
 from pathlib import Path
-from unittest.mock import patch
 
 import pytest
 
@@ -65,7 +64,7 @@ class TestRender:
             render("{unknown}", f)
 
     def test_directory_path(self, temp_dir: Path) -> None:
-        """对目录路径也能正常渲染（虽然一般不用于目录）. """
+        """对目录路径也能正常渲染（虽然一般不用于目录）."""
         result = render("Backup/{name}", temp_dir)
         name = temp_dir.name
         assert result == f"Backup/{name}"

fileflow_cli-0.2.0/src/fileflow/engine.py

@@ -1,251 +0,0 @@
-"""核心编排引擎：扫描 → 匹配 → 执行."""
-
-from __future__ import annotations
-
-from pathlib import Path
-from typing import Any
-
-from rich.progress import (
-    BarColumn,
-    Progress,
-    SpinnerColumn,
-    TextColumn,
-    TimeElapsedColumn,
-)
-
-from .actions import (
-    ConflictStrategy,
-    ActionResult,
-    get_action,
-)
-from .config import load_config
-from .matchers import matches
-from .report import print_summary
-from .rules import RuleSet
-
-
-class EngineResult:
-    """一次引擎运行的结果."""
-
-    def __init__(
-        self,
-        source_dir: Path,
-        results: list[ActionResult],
-        dry_run: bool,
-        rule_matches: dict[str, int],
-        total_scanned: int = 0,
-    ) -> None:
-        self.source_dir = source_dir
-        self.results = results
-        self.dry_run = dry_run
-        self.rule_matches = rule_matches
-        self.total_scanned = total_scanned
-
-    @property
-    def success_count(self) -> int:
-        return sum(1 for r in self.results if r.success and not r.skipped)
-
-    @property
-    def skipped_count(self) -> int:
-        return sum(1 for r in self.results if r.skipped)
-
-    @property
-    def error_count(self) -> int:
-        return sum(1 for r in self.results if not r.success)
-
-    def print(self) -> None:
-        """打印结果到终端."""
-        print_summary(self)
-
-
-def run(
-    source_dir: str | Path,
-    config_path: str | Path | None = None,
-    dry_run: bool | None = None,
-    force: bool = False,
-    recursive: bool = True,
-    show_progress: bool = True,
-) -> EngineResult:
-    """运行文件整理.
-
-    1. 加载配置
-    2. 扫描源目录
-    3. 对每个文件匹配规则
-    4. 执行操作（或预览）
-
-    Args:
-        source_dir: 要整理的目录路径.
-        config_path: 配置文件路径，None 则自动搜索.
-        dry_run: 是否仅预览；None 则使用配置中的 dry_run_by_default.
-        force: 如果 True 且 dry_run 未明确设置，则 dry_run=False.
-        recursive: 是否递归扫描子目录.
-        show_progress: 是否显示进度条.
-    """
-    source = Path(source_dir).resolve()
-    if not source.is_dir():
-        raise ValueError(f"源路径不是目录: {source}")
-
-    config = load_config(config_path)
-    settings = config.get("settings", {})
-
-    # 确定 dry-run 模式
-    if dry_run is None:
-        dry_run = settings.get("dry_run_by_default", True)
-
-    if force and dry_run is None:
-        dry_run = False
-
-    conflict_str = ConflictStrategy(settings.get("on_conflict", "skip"))
-    create_dirs = settings.get("create_target_dirs", True)
-
-    rule_set = RuleSet.load_from_yaml(config.get("rules", []))
-
-    # ── 扫描文件 ───────────────────────────────────────────
-    if show_progress:
-        spinner = Progress(
-            SpinnerColumn(),
-            TextColumn("[bold cyan]🔍 扫描文件中...[/]"),
-            TextColumn("[progress.description]{task.description}"),
-            transient=True,
-        )
-        with spinner:
-            scan_task = spinner.add_task("", total=None)
-            files = _scan_files(source, recursive)
-            spinner.update(scan_task, visible=False)
-    else:
-        files = _scan_files(source, recursive)
-
-    # ── 匹配 + 执行 ─────────────────────────────────────────
-    results: list[ActionResult] = []
-    rule_matches: dict[str, int] = {}
-
-    if show_progress and files:
-        progress = Progress(
-            TextColumn("[bold cyan]📦[/]"),
-            TextColumn("[progress.percentage]{task.percentage:>3.0f}%"),
-            BarColumn(),
-            TextColumn("[bold]{task.completed}/{task.total}"),
-            TextColumn("[dim]{task.fields[status]}"),
-            TimeElapsedColumn(),
-            transient=True,
-        )
-        with progress:
-            task = progress.add_task(
-                "预览中..." if dry_run else "整理中...",
-                total=len(files),
-                status="",
-            )
-
-            for file_path in files:
-                matched = False
-                for rule in rule_set.active_rules:
-                    if matches(file_path, rule):
-                        matched = True
-                        rule_matches[rule.name] = rule_matches.get(rule.name, 0) + 1
-
-                        if dry_run:
-                            from .templates import resolve_path
-
-                            try:
-                                dest = resolve_path(rule.target, file_path, source)
-                                results.append(
-                                    ActionResult(
-                                        file_path,
-                                        target=dest,
-                                        success=True,
-                                        action=f"[dry-run] {rule.action}",
-                                    )
-                                )
-                            except Exception as e:
-                                results.append(
-                                    ActionResult(
-                                        file_path,
-                                        error=str(e),
-                                        success=False,
-                                        action=rule.action,
-                                    )
-                                )
-                        else:
-                            action_func = get_action(rule.action)
-                            result = action_func(
-                                file_path,
-                                rule.target,
-                                source,
-                                create_dirs=create_dirs,
-                                conflict=conflict_str,
-                            )
-                            results.append(result)
-                        break
-
-                progress.update(
-                    task,
-                    advance=1,
-                    status=f"[dim]{file_path.name}[/]",
-                )
-    else:
-        # 无进度条模式
-        for file_path in files:
-            matched = False
-            for rule in rule_set.active_rules:
-                if matches(file_path, rule):
-                    matched = True
-                    rule_matches[rule.name] = rule_matches.get(rule.name, 0) + 1
-                    if dry_run:
-                        from .templates import resolve_path
-
-                        try:
-                            dest = resolve_path(rule.target, file_path, source)
-                            results.append(
-                                ActionResult(
-                                    file_path,
-                                    target=dest,
-                                    success=True,
-                                    action=f"[dry-run] {rule.action}",
-                                )
-                            )
-                        except Exception as e:
-                            results.append(
-                                ActionResult(
-                                    file_path,
-                                    error=str(e),
-                                    success=False,
-                                    action=rule.action,
-                                )
-                            )
-                    else:
-                        action_func = get_action(rule.action)
-                        result = action_func(
-                            file_path,
-                            rule.target,
-                            source,
-                            create_dirs=create_dirs,
-                            conflict=conflict_str,
-                        )
-                        results.append(result)
-                    break
-
-    return EngineResult(
-        source_dir=source,
-        results=results,
-        dry_run=dry_run,
-        rule_matches=rule_matches,
-        total_scanned=len(files),
-    )
-
-
-def _scan_files(directory: Path, recursive: bool) -> list[Path]:
-    """扫描目录中的普通文件（忽略隐藏文件）. """
-    files: list[Path] = []
-
-    if recursive:
-        for entry in directory.rglob("*"):
-            if entry.is_file() and not any(
-                part.startswith(".") for part in entry.relative_to(directory).parts
-            ):
-                files.append(entry)
-    else:
-        for entry in directory.iterdir():
-            if entry.is_file() and not entry.name.startswith("."):
-                files.append(entry)
-
-    return sorted(files)