⚠ This page is served via a proxy. Original site: https://github.com
This service does not collect credentials or authentication data.
Skip to content

Fix multi-segment recording data loss during recovery #1514

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
blakesims wants to merge 1 commit into
base: main
Choose a base branch
from
+15 −8
Open

Fix multi-segment recording data loss during recovery #1514

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 15 additions & 8 deletions crates/recording/src/recovery.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,11 +136,22 @@ impl RecoveryManager {
.filter(|e| e.path().is_dir())
.collect();

segment_dirs.sort_by_key(|e| e.file_name());
segment_dirs.sort_by_key(|e| {
let name = e.file_name().to_string_lossy().to_string();
name.strip_prefix("segment-")
.and_then(|s| s.parse::<u32>().ok())
.unwrap_or(u32::MAX)
});

for (index, segment_entry) in segment_dirs.iter().enumerate() {
for segment_entry in &segment_dirs {
let segment_path = segment_entry.path();

let folder_name = segment_entry.file_name().to_string_lossy().to_string();
let index: u32 = folder_name
.strip_prefix("segment-")
.and_then(|s| s.parse().ok())
.unwrap_or(0);

let display_dir = segment_path.join("display");
let display_info = Self::find_complete_fragments_with_init(&display_dir);
let mut display_fragments = display_info.fragments;
Expand Down Expand Up @@ -186,7 +197,7 @@ impl RecoveryManager {
let cursor_path = Self::probe_cursor(&segment_path.join("cursor.json"));

recoverable_segments.push(RecoverableSegment {
index: index as u32,
index,
display_fragments,
display_init_segment,
camera_fragments,
Expand Down Expand Up @@ -899,11 +910,7 @@ impl RecoveryManager {
.iter()
.enumerate()
.filter_map(|(i, segment)| {
let segment_base = format!("content/segments/segment-{i}");
let display_path = recording
.project_path
.join(&segment_base)
.join("display.mp4");
let display_path = recording.project_path.join(segment.display.path.as_str());

let duration = get_media_duration(&display_path)
.map(|d| d.as_secs_f64())
Expand Down