Handle bad notes in note container

* Fix deserialization of synth voice presets
Ameobea · Feb 1, 2025 · 70d7ff3 · 70d7ff3
1 parent 51ad5d9
commit 70d7ff3
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 3 deletions.
diff --git a/backend/src/models/synth_preset.rs b/backend/src/models/synth_preset.rs
@@ -110,6 +110,7 @@ pub struct FilterParams {
   pub q: Option<f64>,
   #[serde(default)]
   pub gain: f64,
+  #[serde(default)]
   pub detune: f64,
 }
 

diff --git a/engine/note_container/src/lib.rs b/engine/note_container/src/lib.rs
@@ -5,6 +5,9 @@
 
 #![feature(vec_into_raw_parts)]
 
+#[macro_use]
+extern crate log;
+
 pub mod exports;
 pub mod note_container;
 pub mod note_lines;
diff --git a/engine/note_container/src/note_container.rs b/engine/note_container/src/note_container.rs
@@ -73,9 +73,19 @@ impl NoteContainer {
   }
 
   pub fn add_note(&mut self, start_point: f64, note: Note) {
-    assert!(note.length.is_normal() && note.length > 0.);
-    assert!(start_point >= 0.);
-    println!("Inserting {:?} at {}", note, start_point);
+    debug_assert!(note.length.is_normal() && note.length > 0.);
+    if !note.length.is_normal() {
+      error!(
+        "Tried to add note with invalid length of {}; ignoring",
+        note.length
+      );
+      return;
+    }
+    debug_assert!(start_point >= 0.);
+    if start_point < 0. {
+      error!("Found note with invalid start point of {start_point}; ignoring");
+      return;
+    }
 
     let end_point = start_point + note.length;
     // We check to see if there are any notes intersecting the point we're trying to insert