mirror of
https://github.com/storytold/filmcraft.git
synced 2026-10-24 10:10:05 -06:00
Fix "-0.000" in Seconds time display for tiny negative times
Found while testing crates/time/src/lib.rs:423 (format_time, TimeDisplay::Seconds) Co-Authored-By: Claude Haiku 5.5 <noreply@anthropic.com> Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
This commit is contained in:
co-authored by
Claude Haiku 5.5
parent
6c3948a36c
commit
405619b417
+15
-1
@@ -420,7 +420,11 @@ pub fn format_time(t: Tick, rate: FrameRate, drop_frame: bool, display: TimeDisp
|
||||
let rem = Tick(t.0.rem_euclid(TICKS_PER_SECOND)).to_units_floor(sample_rate);
|
||||
format!("{:02}:{:02}:{:02}:{rem:05}", secs / 3600, (secs / 60) % 60, secs % 60)
|
||||
}
|
||||
TimeDisplay::Seconds => format!("{:.3}", t.seconds()),
|
||||
TimeDisplay::Seconds => {
|
||||
let s = format!("{:.3}", t.seconds());
|
||||
// A tiny negative time rounds to zero but keeps its sign: drop it.
|
||||
if s == "-0.000" { "0.000".to_string() } else { s }
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -507,6 +511,16 @@ mod tests {
|
||||
use super::*;
|
||||
use proptest::prelude::*;
|
||||
|
||||
#[test]
|
||||
fn seconds_display_has_no_negative_zero() {
|
||||
let f = |t: i64| format_time(Tick(t), FrameRate::default(), false, TimeDisplay::Seconds, 48000);
|
||||
assert_eq!(f(-1), "0.000");
|
||||
assert_eq!(f(-2), "0.000");
|
||||
assert_eq!(f(-(TICKS_PER_SECOND / 2500)), "0.000");
|
||||
assert_eq!(f(-TICKS_PER_SECOND), "-1.000");
|
||||
assert_eq!(f(-TICKS_PER_SECOND / 1000), "-0.001");
|
||||
}
|
||||
|
||||
/// Damaged files and projects can carry zero / negative rates and timebases, and users or
|
||||
/// agents can type huge timecodes: these used to panic (division by zero, overflow,
|
||||
/// crossed `clamp` bounds).
|
||||
|
||||
Reference in New Issue
Block a user