Skip to content

fix(studio): surface write/reload errors, restore debounce, avoid mutex poisoning #30

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

Merged
LeadcodeDev merged 1 commit into from
Jul 18, 2026
Merged

fix(studio): surface write/reload errors, restore debounce, avoid mutex poisoning #30

Show file tree
Hide file tree
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
17 changes: 9 additions & 8 deletions crates/rustmotion-studio/src/app/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ pub fn run_preview_root(
if let Some(p) = input_path.clone() {
let _ = tx.send(WatchMsg::Retarget(p));
}
library.lock().unwrap().watch_tx = Some(tx);
library.lock().unwrap_or_else(|e| e.into_inner()).watch_tx = Some(tx);
}

dioxus::LaunchBuilder::desktop()
Expand Down Expand Up @@ -129,13 +129,14 @@ fn spawn_watcher(shared: Shared) -> Sender<WatchMsg> {
}
WatchMsg::Changed => {
if let Some(p) = current.clone() {
if let Ok(scenario) = rustmotion::loader::load_input(&p) {
if let Ok(mut m) = shared.lock() {
let g = m.generation.wrapping_add(1);
*m = StudioModel::new(scenario, None, Some(p.clone()));
m.generation = g;
}
}
let (scenario, error) = match rustmotion::loader::load_input(&p) {
Ok(s) => (s, None),
Err(e) => (crate::scenario::empty_scenario(), Some(e.to_string())),
};
let mut m = shared.lock().unwrap_or_else(|e| e.into_inner());
let g = m.generation.wrapping_add(1);
*m = StudioModel::new(scenario, error, Some(p.clone()));
m.generation = g;
}
}
}
Expand Down
8 changes: 6 additions & 2 deletions crates/rustmotion-studio/src/app/root.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ pub fn StudioRoot() -> Element {
.unwrap_or(usize::MAX);

let (cached, path) = {
let lib = thumb_lib.lock().unwrap();
let lib = thumb_lib.lock().unwrap_or_else(|e| e.into_inner());
let path = lib.path_at(i);
let cached = path.as_ref().and_then(|p| lib.thumb_cache.get(p).cloned());
(cached, path)
Expand All @@ -131,7 +131,11 @@ pub fn StudioRoot() -> Element {
match render_thumbnail(&p) {
Some(jpeg) => {
let arc = Arc::new(jpeg);
thumb_lib.lock().unwrap().thumb_cache.insert(p, arc.clone());
thumb_lib
.lock()
.unwrap_or_else(|e| e.into_inner())
.thumb_cache
.insert(p, arc.clone());
(*arc).clone()
}
None => Vec::new(),
Expand Down
100 changes: 67 additions & 33 deletions crates/rustmotion-studio/src/editor/annotations.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,11 @@ use crate::{
scenario::{append_annotation, remove_annotation, Shared},
};

/// Write `content` to `path`, returning a user-facing error string on failure.
fn write_file(path: &std::path::Path, content: &str) -> Result<(), String> {
std::fs::write(path, content).map_err(|e| format!("write: {e}"))
}

/// The left-hand "Comments" panel: lists the scenario's annotations, with
/// per-comment "go to frame" and "delete" actions.
#[component]
Expand Down Expand Up @@ -60,36 +65,58 @@ pub fn AnnotationBox(pointer: String, kind: String, current: Signal<u32>) -> Ele
let shared = use_context::<Shared>();
let mut note = use_signal(String::new);

let submit = move |_| {
let text = note();
if text.trim().is_empty() {
return;
}
let frame = current();
let (path, raw, view, scene) = {
let m = shared.lock().unwrap();
let (view, scene) = match m.tasks.get(frame as usize) {
Some(rustmotion::encode::video::FrameTask::Normal {
view_idx,
scene_idx,
..
}) => (*view_idx, *scene_idx),
_ => (0, 0),
let submit = {
let shared = shared.clone();
move |_| {
let text = note();
if text.trim().is_empty() {
return;
}
let frame = current();
let (path, raw, view, scene) = {
let m = shared.lock().unwrap_or_else(|e| e.into_inner());
let (view, scene) = match m.tasks.get(frame as usize) {
Some(rustmotion::encode::video::FrameTask::Normal {
view_idx,
scene_idx,
..
}) => (*view_idx, *scene_idx),
_ => (0, 0),
};
(m.path.clone(), m.raw.clone(), view, scene)
};
(m.path.clone(), m.raw.clone(), view, scene)
};
let ann = serde_json::json!({
"id": annotation_id(), "note": text, "status": "open", "frame": frame,
"view": view, "scene": scene,
"target": { "pointer": pointer, "kind": kind }
});
let raw = append_annotation(raw, ann);
// Annotations live in the scenario JSON; HTML sources have no place to
// store them, so skip the write rather than overwrite the HTML.
if let (Some(path), Ok(t)) = (path, serde_json::to_string_pretty(&raw)) {
if !rustmotion::loader::is_html_path(&path) {
let _ = std::fs::write(&path, t);
note.set(String::new());
let ann = serde_json::json!({
"id": annotation_id(), "note": text, "status": "open", "frame": frame,
"view": view, "scene": scene,
"target": { "pointer": pointer, "kind": kind }
});
let updated = append_annotation(raw, ann);
// Annotations live in the scenario JSON; HTML sources have no place to
// store them, so skip the write rather than overwrite the HTML.
if let Some(path) = path {
if !rustmotion::loader::is_html_path(&path) {
match serde_json::to_string_pretty(&updated) {
Ok(t) => {
let write_result = write_file(&path, &t);
let mut m = shared.lock().unwrap_or_else(|e| e.into_inner());
match write_result {
Ok(()) => {
m.write_error = None;
note.set(String::new());
}
Err(e) => {
m.write_error = Some(e);
m.generation = m.generation.wrapping_add(1);
}
}
}
Err(e) => {
let mut m = shared.lock().unwrap_or_else(|e| e.into_inner());
m.write_error = Some(format!("json: {e}"));
m.generation = m.generation.wrapping_add(1);
}
}
}
}
}
};
Expand Down Expand Up @@ -118,13 +145,20 @@ pub fn AnnotationBox(pointer: String, kind: String, current: Signal<u32>) -> Ele
/// Remove an annotation by id from the scenario file (the watcher reloads).
fn delete_annotation(shared: &Shared, id: &str) {
let (path, raw) = {
let m = shared.lock().unwrap();
let m = shared.lock().unwrap_or_else(|e| e.into_inner());
(m.path.clone(), m.raw.clone())
};
let raw = remove_annotation(raw, id);
if let (Some(path), Ok(t)) = (path, serde_json::to_string_pretty(&raw)) {
let updated = remove_annotation(raw, id);
if let Some(path) = path {
if !rustmotion::loader::is_html_path(&path) {
let _ = std::fs::write(&path, t);
let write_result = serde_json::to_string_pretty(&updated)
.map_err(|e| format!("json: {e}"))
.and_then(|t| write_file(&path, &t));
if let Err(e) = write_result {
let mut m = shared.lock().unwrap_or_else(|e2| e2.into_inner());
m.write_error = Some(e);
m.generation = m.generation.wrapping_add(1);
}
}
}
}
Expand Down
Loading
Loading