NyxErinys/crunchy-cli
1
0
Fork 0
mirror of https://github.com/crunchy-labs/crunchy-cli.git synced 2026-01-21 12:12:00 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix for some chapters being sent by CR as floats.

Browse source 
See: 3f3a80f7f7
This commit is contained in:
Amelia Frost 2024-03-11 15:10:39 -07:00
parent 26a858c1a1
commit facfa4528e
No known key found for this signature in database
1 changed files with 22 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

41
crunchy-cli-core/src/utils/download.rs
View file

@ -1225,41 +1225,44 @@ fn write_ffmpeg_chapters(
) -> Result<()> { ) -> Result<()> {
let video_len = video_len let video_len = video_len
.signed_duration_since(NaiveTime::MIN) .signed_duration_since(NaiveTime::MIN)
.num_seconds() as u32; .num_milliseconds() as f32 / 1000.0;
events.sort_by(|(_, event_a), (_, event_b)| event_a.start.cmp(&event_b.start)); events.sort_by(|(_, event_a), (_, event_b)| event_a.start.total_cmp(&event_b.start));
writeln!(file, ";FFMETADATA1")?; writeln!(file, ";FFMETADATA1")?;
let mut last_end_time = 0; let mut last_end_time = 0.0;
for (name, event) in events { for (name, event) in events {
// include an extra 'Episode' chapter if the start of the current chapter is more than 10 /*
// seconds later than the end of the last chapter. - Convert from seconds to milliseconds for the correct timescale
// this is done before writing the actual chapter of this loop to keep the chapter - Include an extra 'Episode' chapter if the start of the current chapter is more than 10
// chronologically in order seconds later than the end of the last chapter.
if event.start as i32 - last_end_time as i32 > 10 { This is done before writing the actual chapter of this loop to keep the chapter
chronologically in order
*/
if event.start - last_end_time > 10.0 {
writeln!(file, "[CHAPTER]")?; writeln!(file, "[CHAPTER]")?;
writeln!(file, "TIMEBASE=1/1")?; writeln!(file, "TIMEBASE=1/1000")?;
writeln!(file, "START={}", last_end_time)?; writeln!(file, "START={}", last_end_time * 1000u32)?;
writeln!(file, "END={}", event.start)?; writeln!(file, "END={}", event.start * 1000u32)?;
writeln!(file, "title=Episode")?; writeln!(file, "title=Episode")?;
} }
writeln!(file, "[CHAPTER]")?; writeln!(file, "[CHAPTER]")?;
writeln!(file, "TIMEBASE=1/1")?; writeln!(file, "TIMEBASE=1/1000")?;
writeln!(file, "START={}", event.start)?; writeln!(file, "START={}", event.start * 1000u32)?;
writeln!(file, "END={}", event.end)?; writeln!(file, "END={}", event.end * 1000u32)?;
writeln!(file, "title={}", name)?; writeln!(file, "title={}", name)?;
last_end_time = event.end; last_end_time = event.end;
} }
// only add a traling chapter if the gab between the end of the last chapter and the total video // only add a trailing chapter if the gap between the end of the last chapter and the total video
// length is greater than 10 seconds // length is greater than 10 seconds
if video_len as i32 - last_end_time as i32 > 10 { if video_len - last_end_time > 10.0 {
writeln!(file, "[CHAPTER]")?; writeln!(file, "[CHAPTER]")?;
writeln!(file, "TIMEBASE=1/1")?; writeln!(file, "TIMEBASE=1/1000")?;
writeln!(file, "START={}", last_end_time)?; writeln!(file, "START={}", last_end_time * 1000u32)?;
writeln!(file, "END={}", video_len)?; writeln!(file, "END={}", video_len * 1000u32)?;
writeln!(file, "title=Episode")?; writeln!(file, "title=Episode")?;
} }