diff --git a/crates/engine/src/autosave.rs b/crates/engine/src/autosave.rs index 03b61dd3..20a52880 100644 --- a/crates/engine/src/autosave.rs +++ b/crates/engine/src/autosave.rs @@ -541,8 +541,7 @@ mod tests { assert_eq!((mode(&new), mode(&session), mode(&session.join("Audio Files"))), (0o700, 0o700, 0o700)); w.close(false); w.flush().unwrap(); - // A root that already exists keeps its mode; the folders made inside it are owner-only, - // also the one a session never saved records its takes into. + // A root that already exists keeps its mode; the folders made inside it are owner-only. let old = base.join("old"); std::fs::create_dir_all(&old).unwrap(); std::fs::set_permissions(&old, std::fs::Permissions::from_mode(0o755)).unwrap(); @@ -550,8 +549,17 @@ mod tests { w.write(e.session_arc(), None, None); w.flush().unwrap(); let session = std::fs::read_dir(&old).unwrap().flatten().map(|d| d.path()).next().unwrap(); - create_folder(&old.join("Untitled")).unwrap(); - assert_eq!((mode(&old), mode(&session), mode(&old.join("Untitled"))), (0o755, 0o700, 0o700)); + assert_eq!((mode(&old), mode(&session)), (0o755, 0o700)); + // A session never saved records its takes into `/Audio Files` under the root. Both + // are made owner-only, and so is `Audio Files` in a take folder an earlier version left. + let takes = old.join("Untitled").join("Audio Files"); + create_folder(&takes).unwrap(); + assert_eq!((mode(&old.join("Untitled")), mode(&takes)), (0o700, 0o700)); + let earlier = old.join("Earlier"); + std::fs::create_dir_all(&earlier).unwrap(); + std::fs::set_permissions(&earlier, std::fs::Permissions::from_mode(0o755)).unwrap(); + create_folder(&earlier.join("Audio Files")).unwrap(); + assert_eq!((mode(&earlier), mode(&earlier.join("Audio Files"))), (0o755, 0o700)); w.close(false); w.flush().unwrap(); let _ = std::fs::remove_dir_all(&base); diff --git a/crates/ui-egui/src/lib.rs b/crates/ui-egui/src/lib.rs index 1db64e12..5311d4d9 100644 --- a/crates/ui-egui/src/lib.rs +++ b/crates/ui-egui/src/lib.rs @@ -600,10 +600,12 @@ impl SoundApp { if plan.is_empty() { return Err("no audio track is record-enabled".into()); } - // The takes are unsaved work: the folder under the autosave root is owner-only, like the - // autosaves, before the recorder makes anything in it. + // The takes are unsaved work: the folder they go into under the autosave root is + // owner-only, like the autosaves, before the recorder makes anything in it. if self.engine.path.is_none() && self.autosave_dir.is_some() { - soundcraft_engine::autosave::create_folder(&unsaved_dir).map_err(|e| format!("{}: {e}", unsaved_dir.display()))?; + for dir in plan.iter().filter_map(|(_, _, path)| path.parent()) { + soundcraft_engine::autosave::create_folder(dir).map_err(|e| format!("{}: {e}", dir.display()))?; + } } let takes = plan .iter()