test(release): adapt suite to explicit ReleaseKnowledge injection
- test_release.py / test_release_fixtures.py: module-level _KB = YamlReleaseKnowledge() + thin _parse(name) helper threading it into parse_release. test_show_folder_name_strips_windows_chars renamed to test_show_folder_name_uses_already_safe_title to reflect the Option B contract (caller sanitizes via kb.sanitize_for_fs). - test_detect_media_type.py: same _KB pattern, all detect_media_type(parsed, path) calls now pass kb. - test_filesystem_extras.py: find_video_file(path) calls now pass kb. - test_enrich_from_probe.py: _bare() helper adds the new title_sanitized field. - test_resolve_destination.py: drop _sanitize import + TestSanitize class (helper deleted), add tmdb_title_safe arg to _resolve_series_folder calls. 987 passed, 8 skipped.
This commit is contained in:
@@ -20,13 +20,20 @@ import pytest
|
||||
|
||||
from alfred.domain.release.services import parse_release
|
||||
from alfred.domain.release.value_objects import ParsedRelease
|
||||
from alfred.infrastructure.knowledge.release_kb import YamlReleaseKnowledge
|
||||
|
||||
_KB = YamlReleaseKnowledge()
|
||||
|
||||
|
||||
def _parse(name: str) -> ParsedRelease:
|
||||
return parse_release(name, _KB)
|
||||
|
||||
|
||||
class TestParseTVEpisode:
|
||||
"""Single-episode TV releases."""
|
||||
|
||||
def test_basic_tv_episode(self):
|
||||
r = parse_release("Oz.S03E01.1080p.WEBRip.x265-KONTRAST")
|
||||
r = _parse("Oz.S03E01.1080p.WEBRip.x265-KONTRAST")
|
||||
assert r.title == "Oz"
|
||||
assert r.season == 3
|
||||
assert r.episode == 1
|
||||
@@ -40,27 +47,27 @@ class TestParseTVEpisode:
|
||||
assert r.is_season_pack is False
|
||||
|
||||
def test_multi_episode(self):
|
||||
r = parse_release("Archer.S14E09E10.1080p.WEB.x265-GRP")
|
||||
r = _parse("Archer.S14E09E10.1080p.WEB.x265-GRP")
|
||||
assert r.season == 14
|
||||
assert r.episode == 9
|
||||
assert r.episode_end == 10
|
||||
|
||||
def test_nxnn_alt_form(self):
|
||||
# Alt season/episode form: 1x05 instead of S01E05.
|
||||
r = parse_release("Some.Show.1x05.720p.HDTV.x264-GRP")
|
||||
r = _parse("Some.Show.1x05.720p.HDTV.x264-GRP")
|
||||
assert r.season == 1
|
||||
assert r.episode == 5
|
||||
assert r.episode_end is None
|
||||
assert r.media_type == "tv_show"
|
||||
|
||||
def test_nxnnxnn_multi_episode_alt_form(self):
|
||||
r = parse_release("Some.Show.2x07x08.1080p.WEB.x265-GRP")
|
||||
r = _parse("Some.Show.2x07x08.1080p.WEB.x265-GRP")
|
||||
assert r.season == 2
|
||||
assert r.episode == 7
|
||||
assert r.episode_end == 8
|
||||
|
||||
def test_season_pack(self):
|
||||
r = parse_release("Oz.S03.1080p.WEBRip.x265-KONTRAST")
|
||||
r = _parse("Oz.S03.1080p.WEBRip.x265-KONTRAST")
|
||||
assert r.season == 3
|
||||
assert r.episode is None
|
||||
assert r.is_season_pack is True
|
||||
@@ -71,7 +78,7 @@ class TestParseMovie:
|
||||
"""Movie releases."""
|
||||
|
||||
def test_basic_movie(self):
|
||||
r = parse_release("Inception.2010.1080p.BluRay.x264-GROUP")
|
||||
r = _parse("Inception.2010.1080p.BluRay.x264-GROUP")
|
||||
assert r.title == "Inception"
|
||||
assert r.year == 2010
|
||||
assert r.season is None
|
||||
@@ -83,13 +90,13 @@ class TestParseMovie:
|
||||
assert r.media_type == "movie"
|
||||
|
||||
def test_movie_multi_word_title(self):
|
||||
r = parse_release("The.Dark.Knight.2008.2160p.UHD.BluRay.x265-TERMINAL")
|
||||
r = _parse("The.Dark.Knight.2008.2160p.UHD.BluRay.x265-TERMINAL")
|
||||
assert r.title == "The.Dark.Knight"
|
||||
assert r.year == 2008
|
||||
assert r.quality == "2160p"
|
||||
|
||||
def test_movie_without_year_still_movie_if_tech_present(self):
|
||||
r = parse_release("UntitledFilm.1080p.WEBRip.x264-GRP")
|
||||
r = _parse("UntitledFilm.1080p.WEBRip.x264-GRP")
|
||||
# No season, no year, but tech markers → still movie
|
||||
assert r.media_type == "movie"
|
||||
assert r.year is None
|
||||
@@ -99,39 +106,39 @@ class TestParseEdgeCases:
|
||||
"""Site tags, malformed names, and unknown media types."""
|
||||
|
||||
def test_site_tag_prefix_stripped(self):
|
||||
r = parse_release("[ OxTorrent.vc ] The.Title.S01E01.1080p.WEB.x265-GRP")
|
||||
r = _parse("[ OxTorrent.vc ] The.Title.S01E01.1080p.WEB.x265-GRP")
|
||||
assert r.site_tag == "OxTorrent.vc"
|
||||
assert r.parse_path == "sanitized"
|
||||
assert r.season == 1
|
||||
assert r.episode == 1
|
||||
|
||||
def test_site_tag_suffix_stripped(self):
|
||||
r = parse_release("The.Title.S01E01.1080p.WEB.x265-NTb[TGx]")
|
||||
r = _parse("The.Title.S01E01.1080p.WEB.x265-NTb[TGx]")
|
||||
assert r.site_tag == "TGx"
|
||||
# Suffix-tagged names are well-formed (only [] in tag → after strip clean)
|
||||
assert r.season == 1
|
||||
|
||||
def test_irrecoverably_malformed(self):
|
||||
# @ is a forbidden char and not stripped by _sanitize → stays malformed
|
||||
r = parse_release("foo@bar@baz")
|
||||
r = _parse("foo@bar@baz")
|
||||
assert r.media_type == "unknown"
|
||||
assert r.parse_path == "ai"
|
||||
assert r.group == "UNKNOWN"
|
||||
|
||||
def test_empty_unknown_when_no_evidence(self):
|
||||
r = parse_release("Some.Random.Title")
|
||||
r = _parse("Some.Random.Title")
|
||||
# No season, no year, no tech markers → unknown
|
||||
assert r.media_type == "unknown"
|
||||
|
||||
def test_missing_group_defaults_to_unknown(self):
|
||||
r = parse_release("Movie.2020.1080p.WEBRip.x265")
|
||||
r = _parse("Movie.2020.1080p.WEBRip.x265")
|
||||
# No "-GROUP" suffix → group = "UNKNOWN"
|
||||
assert r.group == "UNKNOWN"
|
||||
|
||||
def test_yts_bracket_release(self):
|
||||
# YTS-style: spaces, parens for year, multiple bracketed tech tokens.
|
||||
# The tokenizer must handle ' ', '(', ')', '[', ']' transparently.
|
||||
r = parse_release("The Father (2020) [1080p] [WEBRip] [5.1] [YTS.MX]")
|
||||
r = _parse("The Father (2020) [1080p] [WEBRip] [5.1] [YTS.MX]")
|
||||
assert r.title == "The.Father"
|
||||
assert r.year == 2020
|
||||
assert r.quality == "1080p"
|
||||
@@ -141,7 +148,7 @@ class TestParseEdgeCases:
|
||||
|
||||
def test_human_friendly_spaces(self):
|
||||
# Spaces as separators (no brackets).
|
||||
r = parse_release("Inception 2010 1080p BluRay x264-GROUP")
|
||||
r = _parse("Inception 2010 1080p BluRay x264-GROUP")
|
||||
assert r.title == "Inception"
|
||||
assert r.year == 2010
|
||||
assert r.quality == "1080p"
|
||||
@@ -151,7 +158,7 @@ class TestParseEdgeCases:
|
||||
|
||||
def test_underscore_separators(self):
|
||||
# Old usenet style: underscores between tokens.
|
||||
r = parse_release("Some_Show_S01E01_1080p_WEB_x265-GRP")
|
||||
r = _parse("Some_Show_S01E01_1080p_WEB_x265-GRP")
|
||||
assert r.season == 1
|
||||
assert r.episode == 1
|
||||
assert r.quality == "1080p"
|
||||
@@ -162,15 +169,15 @@ class TestParseAudioVideoEdition:
|
||||
"""Audio, video metadata, edition extraction."""
|
||||
|
||||
def test_audio_codec_and_channels(self):
|
||||
r = parse_release("Movie.2020.1080p.BluRay.DTS.5.1.x264-GRP")
|
||||
r = _parse("Movie.2020.1080p.BluRay.DTS.5.1.x264-GRP")
|
||||
assert r.audio_channels == "5.1"
|
||||
|
||||
def test_language_token(self):
|
||||
r = parse_release("Movie.2020.MULTI.1080p.WEBRip.x265-GRP")
|
||||
r = _parse("Movie.2020.MULTI.1080p.WEBRip.x265-GRP")
|
||||
assert "MULTI" in r.languages
|
||||
|
||||
def test_edition_token(self):
|
||||
r = parse_release("Movie.2020.UNRATED.1080p.BluRay.x264-GRP")
|
||||
r = _parse("Movie.2020.UNRATED.1080p.BluRay.x264-GRP")
|
||||
assert r.edition == "UNRATED"
|
||||
|
||||
|
||||
@@ -178,19 +185,21 @@ class TestParsedReleaseFolderNames:
|
||||
"""Helpers that build filesystem-safe folder/filenames."""
|
||||
|
||||
def _parsed_tv(self) -> ParsedRelease:
|
||||
return parse_release("Oz.S03E01.1080p.WEBRip.x265-KONTRAST")
|
||||
return _parse("Oz.S03E01.1080p.WEBRip.x265-KONTRAST")
|
||||
|
||||
def _parsed_movie(self) -> ParsedRelease:
|
||||
return parse_release("Inception.2010.1080p.BluRay.x264-GROUP")
|
||||
return _parse("Inception.2010.1080p.BluRay.x264-GROUP")
|
||||
|
||||
def test_show_folder_name(self):
|
||||
r = self._parsed_tv()
|
||||
assert r.show_folder_name("Oz", 1997) == "Oz.1997.1080p.WEBRip.x265-KONTRAST"
|
||||
|
||||
def test_show_folder_name_strips_windows_chars(self):
|
||||
def test_show_folder_name_uses_already_safe_title(self):
|
||||
# Option B: callers sanitize at the use-case boundary via
|
||||
# kb.sanitize_for_fs(...) before passing the title in.
|
||||
r = self._parsed_tv()
|
||||
# Colons and question marks are Windows-forbidden — must be stripped.
|
||||
result = r.show_folder_name("Oz: The Series?", 1997)
|
||||
safe = _KB.sanitize_for_fs("Oz: The Series?")
|
||||
result = r.show_folder_name(safe, 1997)
|
||||
assert ":" not in result
|
||||
assert "?" not in result
|
||||
|
||||
@@ -202,7 +211,7 @@ class TestParsedReleaseFolderNames:
|
||||
assert "E01" not in result
|
||||
|
||||
def test_season_folder_name_multi_episode(self):
|
||||
r = parse_release("Archer.S14E09E10E11.1080p.WEB.x265-GRP")
|
||||
r = _parse("Archer.S14E09E10E11.1080p.WEB.x265-GRP")
|
||||
result = r.season_folder_name()
|
||||
assert "S14" in result
|
||||
assert "E09" not in result
|
||||
@@ -251,21 +260,21 @@ class TestParsedReleaseInvariants:
|
||||
|
||||
def test_raw_is_preserved(self):
|
||||
raw = "Oz.S03E01.1080p.WEBRip.x265-KONTRAST"
|
||||
r = parse_release(raw)
|
||||
r = _parse(raw)
|
||||
assert r.raw == raw
|
||||
|
||||
def test_languages_defaults_to_empty_list_not_none(self):
|
||||
r = parse_release("Movie.2020.1080p.BluRay.x264-GRP")
|
||||
r = _parse("Movie.2020.1080p.BluRay.x264-GRP")
|
||||
# __post_init__ ensures languages is a list, never None
|
||||
assert r.languages == []
|
||||
|
||||
def test_tech_string_joined(self):
|
||||
r = parse_release("Movie.2020.1080p.BluRay.x264-GRP")
|
||||
r = _parse("Movie.2020.1080p.BluRay.x264-GRP")
|
||||
assert r.tech_string == "1080p.BluRay.x264"
|
||||
|
||||
def test_tech_string_partial(self):
|
||||
# Codec-only release (no quality/source): tech_string == codec
|
||||
r = parse_release("Show.S01E01.x265-GRP")
|
||||
r = _parse("Show.S01E01.x265-GRP")
|
||||
assert r.tech_string == "x265"
|
||||
assert r.codec == "x265"
|
||||
assert r.quality is None
|
||||
@@ -280,4 +289,4 @@ class TestParsedReleaseInvariants:
|
||||
],
|
||||
)
|
||||
def test_media_type_inference(self, name, expected_type):
|
||||
assert parse_release(name).media_type == expected_type
|
||||
assert _parse(name).media_type == expected_type
|
||||
|
||||
@@ -19,8 +19,10 @@ from dataclasses import asdict
|
||||
import pytest
|
||||
|
||||
from alfred.domain.release.services import parse_release
|
||||
from alfred.infrastructure.knowledge.release_kb import YamlReleaseKnowledge
|
||||
from tests.fixtures.releases.conftest import ReleaseFixture, discover_fixtures
|
||||
|
||||
_KB = YamlReleaseKnowledge()
|
||||
FIXTURES = discover_fixtures()
|
||||
|
||||
|
||||
@@ -34,9 +36,9 @@ def test_parse_matches_fixture(fixture: ReleaseFixture, tmp_path) -> None:
|
||||
# plausible filesystem paths. Catches typos / missing leading dirs early.
|
||||
fixture.materialize(tmp_path)
|
||||
|
||||
result = asdict(parse_release(fixture.release_name))
|
||||
result = asdict(parse_release(fixture.release_name, _KB))
|
||||
# ``is_season_pack`` is a @property — asdict() does not include it.
|
||||
result["is_season_pack"] = parse_release(fixture.release_name).is_season_pack
|
||||
result["is_season_pack"] = parse_release(fixture.release_name, _KB).is_season_pack
|
||||
|
||||
for field, expected in fixture.expected_parsed.items():
|
||||
assert field in result, (
|
||||
|
||||
Reference in New Issue
Block a user