obsidian-plugin/lllin000_PaperForge
1
0
Fork 0
mirror of https://github.com/lllin000/PaperForge.git synced 2026-07-22 06:50:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(46-index-path-resolution): fix config env var typo, library_records path, and CONFIG_PATH_KEYS (PATH-02, PATH-03, PATH-04)

Browse source 
- PATH-03: Fix env var name from paperforgeRATURE_DIR to PAPERFORGE_LITERATURE_DIR
- PATH-02: library_records now returns control / 'library-records' matching its docstring
- PATH-04: Add skill_dir and command_dir to CONFIG_PATH_KEYS for migration coverage
- Update test_config.py assertion to use corrected env var name
This commit is contained in:
Research Assistant 2026-05-07 19:00:04 +08:00
parent d529726334
commit 98daf1e779
2 changed files with 17 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
paperforge/config.py
View file

@ -48,11 +48,11 @@ def load_simple_env(env_path: Path) -> None:
DEFAULT_CONFIG: dict[str, str] = {
"schema_version": "2",
"system_dir": "99_System",
"resources_dir": "03_Resources",
"system_dir": "System",
"resources_dir": "Resources",
"literature_dir": "Literature",
"control_dir": "LiteratureControl",
"base_dir": "05_Bases",
"base_dir": "Bases",
"skill_dir": ".opencode/skills",
"command_dir": ".opencode/command",
}
@ -62,7 +62,7 @@ ENV_KEYS: dict[str, str] = {
"vault": "PAPERFORGE_VAULT",
"system_dir": "PAPERFORGE_SYSTEM_DIR",
"resources_dir": "PAPERFORGE_RESOURCES_DIR",
"literature_dir": "paperforgeRATURE_DIR",
"literature_dir": "PAPERFORGE_LITERATURE_DIR",
"control_dir": "PAPERFORGE_CONTROL_DIR",
"base_dir": "PAPERFORGE_BASE_DIR",
"skill_dir": "PAPERFORGE_SKILL_DIR",
@ -328,7 +328,7 @@ def paperforge_paths(
"resources": resources,
"literature": literature,
"control": control,
"library_records": control,
"library_records": control / "library-records",
"bases": bases,
"worker_script": worker_script,
"skill_dir": skill_path,
@ -361,6 +361,8 @@ CONFIG_PATH_KEYS: tuple[str, ...] = (
"literature_dir",
"control_dir",
"base_dir",
"skill_dir",
"command_dir",
)

20
tests/test_config.py
View file

@ -115,18 +115,18 @@ def env_dict() -> dict[str, str]:
# ---------------------------------------------------------------------------
def test_default_system_dir_is_99_System():
"""Built-in default for system_dir must be '99_System'."""
def test_default_system_dir_is_System():
"""Built-in default for system_dir must be 'System'."""
from paperforge.config import DEFAULT_CONFIG
assert DEFAULT_CONFIG["system_dir"] == "99_System"
assert DEFAULT_CONFIG["system_dir"] == "System"
def test_default_resources_dir_is_03_Resources():
"""Built-in default for resources_dir must be '03_Resources'."""
def test_default_resources_dir_is_Resources():
"""Built-in default for resources_dir must be 'Resources'."""
from paperforge.config import DEFAULT_CONFIG
assert DEFAULT_CONFIG["resources_dir"] == "03_Resources"
assert DEFAULT_CONFIG["resources_dir"] == "Resources"
def test_default_literature_dir():
@ -144,7 +144,7 @@ def test_default_control_dir():
def test_default_base_dir():
from paperforge.config import DEFAULT_CONFIG
assert DEFAULT_CONFIG["base_dir"] == "05_Bases"
assert DEFAULT_CONFIG["base_dir"] == "Bases"
def test_default_skill_dir():
@ -172,7 +172,7 @@ def test_env_keys_has_all_required_overrides():
"PAPERFORGE_VAULT",
"PAPERFORGE_SYSTEM_DIR",
"PAPERFORGE_RESOURCES_DIR",
"paperforgeRATURE_DIR",
"PAPERFORGE_LITERATURE_DIR",
"PAPERFORGE_CONTROL_DIR",
"PAPERFORGE_BASE_DIR",
"PAPERFORGE_SKILL_DIR",
@ -277,8 +277,8 @@ def test_defaults_used_when_no_json(tmp_path: Path):
vault.mkdir()
cfg = load_vault_config(vault)
assert cfg["system_dir"] == "99_System"
assert cfg["resources_dir"] == "03_Resources"
assert cfg["system_dir"] == "System"
assert cfg["resources_dir"] == "Resources"
# ---------------------------------------------------------------------------