mirror of
https://github.com/unshackle-dl/unshackle.git
synced 2026-11-22 00:45:10 +00:00
feat(tracks)!: match a language tag to the variant it means
A tag with a region (en-US, es-419) matches only that variant and reports a miss instead of taking another region. A bare tag takes the variant it means (pt -> pt-BR, es -> es-ES) and falls back to any variant only when that one is missing. `orig` prefers the title's own tag, `-sl orig` resolves, forced and SDH subtitles are picked from their own pools, and the track name no longer strips the region from the cached language. BREAKING CHANGE: -l es-419 no longer selects es-ES, and language_priority, language_tags and muxing.default_language treat a regional tag as exact.
This commit is contained in:
@@ -4,7 +4,7 @@ from typing import Sequence
|
||||
|
||||
import pytest
|
||||
|
||||
from unshackle.core.utilities import matching_languages
|
||||
from unshackle.core.utilities import ServiceTag, matching_languages
|
||||
|
||||
POOL = ["ar", "en", "en-GB", "en-US", "ja"]
|
||||
|
||||
@@ -12,12 +12,31 @@ POOL = ["ar", "en", "en-GB", "en-US", "ja"]
|
||||
@pytest.mark.parametrize(
|
||||
("language", "available", "exact", "expected"),
|
||||
[
|
||||
("en", POOL, False, {"en", "en-GB", "en-US"}),
|
||||
# a bare tag takes the variant it means, and every regional form only when that is missing
|
||||
("en", POOL, False, {"en"}),
|
||||
("en", ["en-US", "en-GB"], False, {"en-US"}),
|
||||
("pt", ["pt-PT", "pt-BR"], False, {"pt-BR"}),
|
||||
("es", ["es-419", "es-ES"], False, {"es-ES"}),
|
||||
("es", ["es-419", "es-MX"], False, {"es-419", "es-MX"}),
|
||||
("es", ["es-419", "es-MX"], True, set()),
|
||||
# CLDR rates en/en-US at distance 0, so exact mode leans on the RFC 4647 string preference
|
||||
("en", POOL, True, {"en"}),
|
||||
("en-GB", POOL, True, {"en-GB"}),
|
||||
# no string-equal tag, so exact mode falls back to the distance match
|
||||
("zh", ["ar", "cmn", "ja"], True, {"cmn"}),
|
||||
# a region asks for that variant in either mode: never another region, a bare tag only
|
||||
# when it means the same variant
|
||||
("en-US", POOL, False, {"en-US"}),
|
||||
("en-US", ["en", "en-GB"], False, {"en"}),
|
||||
("en-US", ["en-GB", "en-AU"], False, set()),
|
||||
("es-419", ["es-419", "es-MX", "es-ES"], False, {"es-419"}),
|
||||
("es-419", ["es-MX", "es-ES"], False, set()),
|
||||
("es-419", ["es", "es-ES"], False, set()),
|
||||
("pt-BR", ["pt", "pt-PT"], False, {"pt"}),
|
||||
("pt-PT", ["pt", "pt-BR"], False, set()),
|
||||
# a script alone is not a region: zh-Hant means zh-TW, else any Traditional Chinese
|
||||
("zh-Hant", ["zh-TW", "zh-HK", "zh-Hans"], False, {"zh-TW"}),
|
||||
("zh-Hant", ["zh-HK", "zh-Hans"], False, {"zh-HK"}),
|
||||
("en", ["ar", "ja"], False, set()),
|
||||
("en", [], False, set()),
|
||||
("en", ["ar", None, "en"], True, {"en"}),
|
||||
@@ -31,3 +50,26 @@ POOL = ["ar", "en", "en-GB", "en-US", "ja"]
|
||||
)
|
||||
def test_matching_languages(language: str, available: Sequence[str], exact: bool, expected: set[str]) -> None:
|
||||
assert matching_languages(language, available, exact) == expected
|
||||
|
||||
|
||||
@pytest.mark.parametrize(
|
||||
("title", "available", "expected"),
|
||||
[
|
||||
# the title's own variant beats the one a bare tag would mean
|
||||
("fr-CA", ["fr-FR", "fr-CA"], {"fr-CA"}),
|
||||
("en-GB", ["en-US", "en-GB"], {"en-GB"}),
|
||||
("zh-HK", ["zh-TW", "zh-HK", "zh-CN"], {"zh-HK"}),
|
||||
("sr-ME", ["sr", "sr-ME"], {"sr-ME"}),
|
||||
# without its own variant, it takes the close regional forms
|
||||
("en-US", ["en-GB", "fr"], {"en-GB"}),
|
||||
("zh-TW", ["zh-HK", "zh-CN"], {"zh-HK"}),
|
||||
],
|
||||
)
|
||||
def test_a_service_tag_prefers_its_own_variant(title: str, available: Sequence[str], expected: set[str]) -> None:
|
||||
assert matching_languages(ServiceTag(title), available) == expected
|
||||
|
||||
|
||||
def test_every_variant_returns_each_regional_form_of_a_bare_tag() -> None:
|
||||
assert matching_languages("es", ["es-419", "es-ES", "en"], every_variant=True) == {"es-419", "es-ES"}
|
||||
# a region still asks for one variant
|
||||
assert matching_languages("es-ES", ["es-419", "es-ES"], every_variant=True) == {"es-ES"}
|
||||
|
||||
Reference in New Issue
Block a user