fix(core): waive untagged audio on main roots (#282)
ci / web (push) Successful in 42s
e2e / e2e (push) Successful in 2m6s
ci / rust (push) Successful in 2m50s
ci / image (push) Successful in 3m23s

This commit was merged in pull request #282.
This commit is contained in:
2026-11-15 13:22:29 +00:00
parent 5a18facc4f
commit 9adbca3acd
9 changed files with 69 additions and 29 deletions
+1 -2
View File
@@ -243,8 +243,7 @@ async fn probe_subtitles(state: &AppState) -> SubtitleHealth {
// quiet rather than failing on data the operator has not entered yet.
let enabled = settings
.as_ref()
.map(|settings| settings.providers_enabled.as_slice())
.unwrap_or_default();
.map_or_default(|settings| settings.providers_enabled.as_slice());
let engine = settings
.as_ref()
.and_then(|settings| settings.translation_engine.as_deref());
+1
View File
@@ -947,6 +947,7 @@ fn rule_name(rule: &Rule) -> String {
Rule::RequiredAudio => "required_audio".into(),
Rule::DubBlacklist(_) => "dub_blacklist".into(),
Rule::PortugueseUnverified => "portuguese_unverified".into(),
Rule::AudioLanguageUntagged => "audio_language_untagged".into(),
Rule::DolbyVisionProfile(_) => "dolby_vision_profile".into(),
Rule::Resolution(_) => "resolution".into(),
Rule::Source(_) => "source".into(),
+1 -4
View File
@@ -641,10 +641,7 @@ async fn embedded_tracks_of(
.fetch_optional(pool(state)?)
.await?
.flatten();
Ok(probed
.as_deref()
.map(extractable_tracks)
.unwrap_or_default())
Ok(probed.as_deref().map_or_default(extractable_tracks))
}
/// The `sub_tracks` array of a `probed` blob, filtered to what §15 allows an
+4
View File
@@ -422,6 +422,9 @@ pub enum Rule {
DubBlacklist(Language),
/// A Portuguese track whose pt-PT / pt-BR flavour no signal resolved.
PortugueseUnverified,
/// An audio track tagged `und` (or untagged) where none matched the
/// original language: probably the original, but nothing says so.
AudioLanguageUntagged,
DolbyVisionProfile(DolbyVisionProfile),
Resolution(Resolution),
Source(Source),
@@ -438,6 +441,7 @@ impl Rule {
Self::RequiredAudio => "required_audio".into(),
Self::DubBlacklist(_) => "dub_blacklist".into(),
Self::PortugueseUnverified => "portuguese_unverified".into(),
Self::AudioLanguageUntagged => "audio_language_untagged".into(),
Self::DolbyVisionProfile(_) => "dolby_vision_profile".into(),
Self::Resolution(_) => "resolution".into(),
Self::Source(_) => "source".into(),
+34
View File
@@ -470,6 +470,13 @@ impl PolicyRule for RequiredAudioRule {
if context.overrides.allow_english_audio && languages.contains(&english) {
return RuleEvaluation::SoftFail(Rule::RequiredAudio);
}
if matches!(
context.policy.required_audio,
RequiredAudio::OriginalLanguage
) && languages.contains(&Language::Other("und".to_owned()))
{
return RuleEvaluation::SoftFail(Rule::AudioLanguageUntagged);
}
Self::failure(context)
}
}
@@ -1242,6 +1249,33 @@ mod tests {
);
}
#[test]
fn main_untagged_audio_is_waived_not_rejected() {
let media = probed_audio(vec![track(Language::Other("und".to_owned()))]);
assert_eq!(
verdict_for(&policy(), &en(), Candidate::PostDownload(&media)),
Verdict::Waived(Rule::AudioLanguageUntagged)
);
}
#[test]
fn main_untagged_audio_beside_the_original_stays_eligible() {
let media = probed_audio(vec![track(en()), track(Language::Other("und".to_owned()))]);
assert_eq!(
verdict_for(&policy(), &en(), Candidate::PostDownload(&media)),
Verdict::Eligible
);
}
#[test]
fn kids_untagged_audio_keeps_the_required_audio_waiver() {
let media = probed_audio(vec![track(Language::Other("und".to_owned()))]);
assert_eq!(
verdict_for(&kids_policy(), &en(), Candidate::PostDownload(&media)),
Verdict::Waived(Rule::RequiredAudio)
);
}
// §5.2 truth table, `kids` root: require pt-PT, or the original language
// when that is already Portuguese; pt-BR never satisfies the requirement.
+3 -5
View File
@@ -165,14 +165,13 @@ impl FakeQbit {
.torrents()
.into_iter()
.find(|torrent| torrent.hash.eq_ignore_ascii_case(&hash))
.map(|torrent| {
.map_or_default(|torrent| {
torrent
.files
.into_iter()
.map(|(path, size)| json!({"name": path, "size": size}))
.collect()
})
.unwrap_or_default();
});
ResponseTemplate::new(200).set_body_json(files)
}
@@ -281,8 +280,7 @@ fn decode(input: &str) -> String {
fn text(parts: &HashMap<String, Vec<u8>>, key: &str) -> String {
parts
.get(key)
.map(|bytes| String::from_utf8_lossy(bytes).into_owned())
.unwrap_or_default()
.map_or_default(|bytes| String::from_utf8_lossy(bytes).into_owned())
}
/// The named parts of a `multipart/form-data` body.
+15 -18
View File
@@ -787,21 +787,19 @@ impl From<RawVideo> for Video {
}
fn cast_from(raw: Option<RawCredits>) -> Vec<CastMember> {
let mut cast: Vec<CastMember> = raw
.map(|credits| {
credits
.cast
.into_iter()
.map(|member| CastMember {
tmdb_id: member.id,
name: member.name,
character: member.character,
profile_path: non_empty(member.profile_path),
order: member.order,
})
.collect()
})
.unwrap_or_default();
let mut cast: Vec<CastMember> = raw.map_or_default(|credits| {
credits
.cast
.into_iter()
.map(|member| CastMember {
tmdb_id: member.id,
name: member.name,
character: member.character,
profile_path: non_empty(member.profile_path),
order: member.order,
})
.collect()
});
// TMDB's own ordering is by `order`; sorting makes the truncation hold
// even if a fixture or future API revision sends them shuffled.
cast.sort_by_key(|member| member.order);
@@ -810,9 +808,8 @@ fn cast_from(raw: Option<RawCredits>) -> Vec<CastMember> {
}
fn trailer_from(raw: Option<RawVideoList>) -> Option<Video> {
let videos: Vec<Video> = raw
.map(|list| list.results.into_iter().map(Into::into).collect())
.unwrap_or_default();
let videos: Vec<Video> =
raw.map_or_default(|list| list.results.into_iter().map(Into::into).collect());
select_trailer(&videos)
}