admin/rclone-jav
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Step 10a + 10b: scaffold rcjav/ package, extract ID rules

Browse Source 
Carves the first slice out of the monolithic rc-jav.py (now 2017
lines, was 2230). Two new modules:

  rcjav/model.py    FileEntry dataclass — the one shared shape that
                    every other submodule will need.
  rcjav/ids.py      Single source of truth for everything that
                    influences a FileEntry.jav_id: PRIMARY_ID_RE,
                    FALLBACK_ID_RE, COMPOUND_ID_RE, BUILTIN_PART_RES,
                    configure_part_patterns, detect_part,
                    detect_part_from_stem, part_key, extract_id,
                    normalize_id, describe_id_match, expand_range,
                    plus the supporting "private" regexes
                    (_BRACKET_ID_RE, _RESOLUTION_TAG_RE, etc.) that
                    other code in rc-jav.py still reads.

rcjav/__init__.py re-exports the public surface so future external
consumers can `from rcjav import extract_id` without caring which
submodule it lives in.

rc-jav.py drops the inline ID block and pulls everything from
rcjav.ids via a single import statement. PART_RES is intentionally
NOT imported — it's mutated by configure_part_patterns at runtime, so
a captured top-level reference would go stale. A small helper
`_current_part_res()` reads it dynamically via `_rcjav_ids.PART_RES`.

fixtures/run.py fix: synthesized importlib module name changed from
"rcjav" (which now collides with the real package directory) to
"rcjav_script". Also prepends ROOT to sys.path so rc-jav.py's
`from rcjav.model import …` resolves when run as
`python fixtures/run.py`.

Verified:
  - python rc-jav.py --help              → usage banner prints
  - python fixtures/run.py               → 17/17 cases pass
  - python -m unittest tests.test_rules  → 5/5 OK

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
This commit is contained in:
admin
2026-05-22 21:43:57 +02:00
parent e029e898e9
commit ba57b7fd21
5 changed files with 327 additions and 240 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fixtures/run.py
+8 -1
View File
@@ -15,7 +15,14 @@ from pathlib import Path
ROOT = Path(__file__).resolve().parents[1]
FIXTURES = Path(__file__).resolve().parent
SPEC = importlib.util.spec_from_file_location("rcjav", ROOT / "rc-jav.py")
# rc-jav.py now imports from the `rcjav/` package at ROOT, so the parent dir
# must be on sys.path before we exec it.
if str(ROOT) not in sys.path:
sys.path.insert(0, str(ROOT))
# Synthesized module name avoids collision with the real `rcjav` package
# directory (rc-jav.py now imports from it).
SPEC = importlib.util.spec_from_file_location("rcjav_script", ROOT / "rc-jav.py")
RCJAV = importlib.util.module_from_spec(SPEC)
sys.modules[SPEC.name] = RCJAV
SPEC.loader.exec_module(RCJAV)