From 281508dc4b3eeeed22c6701f0886d67601a9c1a3 Mon Sep 17 00:00:00 2001 From: FredApps <153173854+FredApps@users.noreply.github.com> Date: Mon, 16 Nov 2026 07:06:09 +0100 Subject: [PATCH] timeline: share one limited-push path for report levels; keep transition diagnostic levels; cover export limit --- crates/timeline/src/fcpxml.rs | 2 +- crates/timeline/src/report.rs | 47 +++++++++++++++++++++++------- crates/timeline/tests/it/fcpxml.rs | 13 +++++++++ 3 files changed, 50 insertions(+), 12 deletions(-) diff --git a/crates/timeline/src/fcpxml.rs b/crates/timeline/src/fcpxml.rs index 88cbce1cf..074f35b6c 100644 --- a/crates/timeline/src/fcpxml.rs +++ b/crates/timeline/src/fcpxml.rs @@ -516,7 +516,7 @@ impl<'a> Imp<'a, '_, '_> { let effect = transition_effect(self.b.catalog, &name, false, &mut temporary); for e in temporary.entries { for _ in 0..e.count { - self.report.warn_limited(self.report_limit, &e.message); + self.report.push_limited(e.level, self.report_limit, &e.message); } } let id = TransitionId(self.b.alloc()); diff --git a/crates/timeline/src/report.rs b/crates/timeline/src/report.rs index 2d72add9c..9a51ba9ff 100644 --- a/crates/timeline/src/report.rs +++ b/crates/timeline/src/report.rs @@ -40,25 +40,23 @@ impl Report { /// budget this replaces; past it a new message is counted under "further diagnostics omitted". /// Existing messages continue to be counted. pub fn warn_limited(&mut self, limit: Option, message: impl Into) { - let mut message = message.into(); - if let Some(limit) = limit - && self.entries.len() >= limit - && !self.entries.iter().any(|e| e.level == Level::Warning && e.message == message) - { - message = "further diagnostics omitted".into(); - } - self.push(Level::Warning, message); + self.push_limited(Level::Warning, limit, message); } - /// Add an informational diagnostic while bounding distinct messages. + /// Add an informational diagnostic under the same distinct-entry budget as [`Report::warn_limited`]. pub fn info_limited(&mut self, limit: Option, message: impl Into) { + self.push_limited(Level::Info, limit, message); + } + /// Add a diagnostic at `level`, counting a new message past `limit` distinct entries under + /// "further diagnostics omitted"; a message already in the report keeps its own count. + pub fn push_limited(&mut self, level: Level, limit: Option, message: impl Into) { let mut message = message.into(); if let Some(limit) = limit && self.entries.len() >= limit - && !self.entries.iter().any(|e| e.level == Level::Info && e.message == message) + && !self.entries.iter().any(|e| e.level == level && e.message == message) { message = "further diagnostics omitted".into(); } - self.push(Level::Info, message); + self.push(level, message); } pub fn warn(&mut self, message: impl Into) { self.push(Level::Warning, message); @@ -98,3 +96,30 @@ impl std::fmt::Display for Report { Ok(()) } } + +#[cfg(test)] +mod tests { + use super::*; + + #[test] + fn limited_entries_share_one_budget_and_keep_existing_counts() { + let mut r = Report::default(); + r.info_limited(Some(2), "a"); + r.warn_limited(Some(2), "b"); + r.info_limited(Some(2), "c"); + r.info_limited(Some(2), "a"); + r.warn_limited(Some(2), "a"); + r.push_limited(Level::Warning, None, "d"); + let got: Vec<_> = r.entries.iter().map(|e| (e.level, e.message.as_str(), e.count)).collect(); + assert_eq!( + got, + [ + (Level::Info, "a", 2), + (Level::Warning, "b", 1), + (Level::Info, "further diagnostics omitted", 1), + (Level::Warning, "further diagnostics omitted", 1), + (Level::Warning, "d", 1), + ] + ); + } +} diff --git a/crates/timeline/tests/it/fcpxml.rs b/crates/timeline/tests/it/fcpxml.rs index 3f543c10b..113fe1ff0 100644 --- a/crates/timeline/tests/it/fcpxml.rs +++ b/crates/timeline/tests/it/fcpxml.rs @@ -630,3 +630,16 @@ fn optional_report_limit_bounds_distinct_fcpxml_diagnostics() { assert!(craft_timeline::fcpxml::import(&doc, &opts, &mut ordinary).is_ok()); assert_eq!(ordinary.entries.len(), 10); } + +#[test] +fn optional_report_limit_bounds_fcpxml_export_diagnostics_without_changing_output() { + let (p, s) = project(); + let mut ordinary = Report::default(); + let text = craft_timeline::fcpxml::export(&p, s, &xopts(), &mut ordinary).unwrap(); + let mut limited = Report::default(); + let bounded = craft_timeline::fcpxml::export_with_report_limit(&p, s, &xopts(), &mut limited, Some(0)).unwrap(); + assert_eq!(bounded, text); + let total = |r: &Report| r.entries.iter().map(|e| e.count).sum::(); + assert_eq!(total(&limited), total(&ordinary)); + assert!(limited.entries.iter().all(|e| e.message == "further diagnostics omitted"), "{limited}"); +}