snapstep 0.2.0__tar.gz → 0.2.2__tar.gz

{snapstep-0.2.0/src/snapstep.egg-info → snapstep-0.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: snapstep
-Version: 0.2.0
+Version: 0.2.2
 Summary: 录屏自动生成图文教程 / Record your screen, get a step-by-step guide with screenshots — automatically.
 Author: Felixssss-106
 License-Expression: MIT

{snapstep-0.2.0 → snapstep-0.2.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "snapstep"
-version = "0.2.0"
+version = "0.2.2"
 description = "录屏自动生成图文教程 / Record your screen, get a step-by-step guide with screenshots — automatically."
 readme = "README.md"
 requires-python = ">=3.10"

{snapstep-0.2.0 → snapstep-0.2.2}/src/snapstep/__init__.py

@@ -1,3 +1,3 @@
 """SnapStep — 录屏自动生成图文教程。"""
 
-__version__ = "0.2.0"
+__version__ = "0.2.2"

{snapstep-0.2.0 → snapstep-0.2.2}/src/snapstep/cli.py

@@ -21,12 +21,35 @@ from .models import Session
 from .writer import AIWriter, TemplateWriter, apply_copy
 
 
+def resolve_export_dir(
+    cfg: Config, session_dir: Path, session: Session, explicit: Path | None = None
+) -> Path:
+    """决定导出目录：显式指定 > 配置项 > 默认 <会话目录>/export。
+
+    配置的自定义目录按会话建子文件夹（SnapStep-<时间戳>），避免多次导出互相覆盖。
+    """
+    if explicit is not None:
+        return explicit
+    raw = (cfg.export.dir or "").strip()
+    if not raw:
+        return session_dir / "export"
+    base = Path(raw).expanduser()
+    if not base.is_absolute():
+        base = Path.home() / base
+    ts = session.created_at or ""
+    slug = ts[:10].replace("-", "") + "-" + ts[11:19].replace(":", "")
+    if not slug.strip("-"):
+        slug = session.id
+    return base / f"SnapStep-{slug}"
+
+
 def generate_and_export(
     session: Session,
     session_dir: Path,
     cfg: Config,
     fmt: str | None = None,
     use_ai: bool | None = None,
+    out_dir: Path | None = None,
 ) -> tuple[str, list[Path]]:
     """生成文案并导出。CLI 与 GUI 共用。返回 (writer 名称, 导出文件列表)。"""
     from .export import export_session
@@ -39,8 +62,13 @@ def generate_and_export(
     )
     used = apply_copy(session, TemplateWriter(cfg.api.language), ai)
     session.save(session_dir)
+    target = resolve_export_dir(cfg, session_dir, session, out_dir)
     paths = export_session(
-        session, session_dir, fmt or cfg.export.format, None, cfg.export.embed_images
+        session,
+        session_dir,
+        fmt or cfg.export.format,
+        target,
+        cfg.export.embed_images,
     )
     return used, paths
 
@@ -158,7 +186,10 @@ def _valid_keys(cfg: Config) -> list[str]:
 
 def cmd_demo(args, cfg: Config) -> int:
     session = _build_demo_session()
-    session_dir = Path(args.out)
+    # 默认输出到用户主目录：相对路径会在 system32 等只读目录里炸掉
+    session_dir = (
+        Path(args.out).expanduser() if args.out else Path.home() / "snapstep-demo"
+    )
     _render_demo_screenshots(session, session_dir)
     used, paths = generate_and_export(
         session, session_dir, cfg, fmt=args.format, use_ai=not args.no_ai
@@ -272,7 +303,7 @@ def main(argv: list[str] | None = None) -> int:
     p_config.add_argument("value", nargs="?", help="set 时的新值")
 
     p_demo = sub.add_parser("demo", help="生成示例教程，验证安装")
-    p_demo.add_argument("--out", default="snapstep-demo")
+    p_demo.add_argument("--out", help="输出目录（默认 ~/snapstep-demo）")
     p_demo.add_argument("--format", choices=["md", "html", "docx", "all"])
     p_demo.add_argument("--no-ai", action="store_true")
 

{snapstep-0.2.0 → snapstep-0.2.2}/src/snapstep/config.py

@@ -49,6 +49,7 @@ class ApiConfig:
 class ExportConfig:
     format: str = "html"  # md / html / docx
     embed_images: bool = True  # HTML 单文件内嵌 base64，方便直接分享
+    dir: str = ""  # 自定义导出目录（空 = 默认 <会话目录>/export）；支持 ~，相对路径基于用户主目录
 
 
 @dataclass

{snapstep-0.2.0 → snapstep-0.2.2}/src/snapstep/ui/settings.py

@@ -2,6 +2,8 @@
 
 from __future__ import annotations
 
+from pathlib import Path
+
 from ..config import API_PRESETS, Config, load_config, save_config
 
 
@@ -92,6 +94,16 @@ class SettingsDialog:
         self.combo_format.addItems(["html", "md", "docx"])
         self.combo_format.setCurrentText(self.cfg.export.format)
         form_export.addRow("默认格式", self.combo_format)
+        self.edit_export_dir = QLineEdit(self.cfg.export.dir)
+        self.edit_export_dir.setPlaceholderText("默认：<会话目录>\\export")
+        from PySide6.QtWidgets import QPushButton
+
+        row_dir = QHBoxLayout()
+        row_dir.addWidget(self.edit_export_dir)
+        btn_browse = QPushButton("浏览…")
+        btn_browse.clicked.connect(self._browse_export_dir)
+        row_dir.addWidget(btn_browse)
+        form_export.addRow("导出目录", row_dir)
         self.check_embed = QCheckBox("HTML 内嵌截图（单文件，方便分享）")
         self.check_embed.setChecked(self.cfg.export.embed_images)
         form_export.addRow(self.check_embed)
@@ -117,6 +129,15 @@ class SettingsDialog:
 
         self._dialog = dialog
 
+    def _browse_export_dir(self) -> None:
+        from PySide6.QtWidgets import QFileDialog
+
+        chosen = QFileDialog.getExistingDirectory(
+            self._dialog, "选择导出目录", self.edit_export_dir.text() or str(Path.home())
+        )
+        if chosen:
+            self.edit_export_dir.setText(chosen)
+
     def _apply_preset(self, name: str) -> None:
         preset = API_PRESETS.get(name)
         if not preset:
@@ -145,5 +166,6 @@ class SettingsDialog:
         self.cfg.api.language = self.combo_lang.currentText()
         self.cfg.export.format = self.combo_format.currentText()
         self.cfg.export.embed_images = self.check_embed.isChecked()
+        self.cfg.export.dir = self.edit_export_dir.text().strip()
         save_config(self.cfg)
         return True

{snapstep-0.2.0 → snapstep-0.2.2/src/snapstep.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: snapstep
-Version: 0.2.0
+Version: 0.2.2
 Summary: 录屏自动生成图文教程 / Record your screen, get a step-by-step guide with screenshots — automatically.
 Author: Felixssss-106
 License-Expression: MIT

{snapstep-0.2.0 → snapstep-0.2.2}/src/snapstep.egg-info/SOURCES.txt

@@ -30,6 +30,7 @@ src/snapstep/ui/settings.py
 src/snapstep/ui/tray.py
 tests/test_config_recorder.py
 tests/test_export.py
+tests/test_export_dir.py
 tests/test_finalize.py
 tests/test_imports.py
 tests/test_models.py

snapstep-0.2.2/tests/test_export_dir.py

@@ -0,0 +1,63 @@
+"""自定义导出目录：解析规则与端到端导出落点。"""
+
+from pathlib import Path
+
+from snapstep.cli import (
+    _build_demo_session,
+    _render_demo_screenshots,
+    generate_and_export,
+    resolve_export_dir,
+)
+from snapstep.config import Config
+from snapstep.models import Session
+
+
+def test_resolve_default(tmp_path):
+    session = Session(created_at="2026-09-12T10:34:20")
+    cfg = Config()  # dir 为空
+    assert (
+        resolve_export_dir(cfg, tmp_path, session) == tmp_path / "export"
+    )
+
+
+def test_resolve_custom_absolute(tmp_path):
+    session = Session(created_at="2026-09-12T10:34:20")
+    cfg = Config()
+    cfg.export.dir = str(tmp_path / "outbox")
+    target = resolve_export_dir(cfg, tmp_path, session)
+    assert target == tmp_path / "outbox" / "SnapStep-20260912-103420"
+
+
+def test_resolve_relative_based_on_home(tmp_path):
+    session = Session(created_at="2026-09-12T10:34:20")
+    cfg = Config()
+    cfg.export.dir = "docs/tutorials"
+    target = resolve_export_dir(cfg, tmp_path, session)
+    assert target == Path.home() / "docs" / "tutorials" / "SnapStep-20260912-103420"
+
+
+def test_explicit_wins_over_config(tmp_path):
+    session = Session(created_at="2026-09-12T10:34:20")
+    cfg = Config()
+    cfg.export.dir = str(tmp_path / "outbox")
+    assert (
+        resolve_export_dir(cfg, tmp_path, session, explicit=tmp_path / "x")
+        == tmp_path / "x"
+    )
+
+
+def test_generate_and_export_uses_custom_dir(tmp_path):
+    session = _build_demo_session()
+    session.created_at = "2026-09-12T10:34:20"
+    session_dir = tmp_path / "sess"
+    _render_demo_screenshots(session, session_dir)
+    cfg = Config()
+    cfg.export.dir = str(tmp_path / "outbox")
+
+    used, paths = generate_and_export(session, session_dir, cfg, fmt="md")
+
+    assert used in ("ai", "template")
+    target = tmp_path / "outbox" / "SnapStep-20260912-103420"
+    assert (target / "guide.md").exists()
+    for p in paths:
+        assert str(p).startswith(str(target))