Fix interprerter error handling

ales-tsurko · Oct 27, 2024 · 8411548 · 8411548
1 parent 5c6acc2
commit 8411548
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 16 deletions.
diff --git a/src/app/app.rs b/src/app/app.rs
@@ -242,21 +242,26 @@ pub fn view(state: &State) -> Element<Message> {
 }
 
 fn view_top_panel(state: &State) -> Element<Message> {
-    row![
-        button(text("").font(iced_fonts::NERD_FONT).size(16.0))
-            .style(button::text)
-            .on_press(Message::SetScratchDir),
-        text(&state.scratch_dir),
-        horizontal_space(),
-        text("Tempo:"),
-        number_input(state.midi_player_state.tempo(), 20..=600, Message::SetTempo,)
-            .step(1)
-            .width(60.0),
-        text("BPM"),
+    column![
+        row![
+            horizontal_space(),
+            text("Tempo:"),
+            number_input(state.midi_player_state.tempo(), 20..=600, Message::SetTempo,)
+                .step(1)
+                .width(60.0),
+            text("BPM"),
+        ]
+        .spacing(10.0)
+        .align_y(iced::Alignment::Center),
+        row![
+            button(text("").font(iced_fonts::NERD_FONT).size(16.0))
+                .style(button::text)
+                .on_press(Message::SetScratchDir),
+            text(&state.scratch_dir),
+        ]
+        .spacing(10.0)
+        .align_y(iced::Alignment::Center),
     ]
-    .spacing(10.0)
-    .align_y(iced::Alignment::Center)
-    .height(40.0)
     .into()
 }
 

diff --git a/src/interpreter/mod.rs b/src/interpreter/mod.rs
@@ -61,8 +61,7 @@ impl InterpreterWorker {
                             .map(|_| Message::ScratchDir(value)),
                         _ => continue,
                     }
-                    .map_err(Into::<Message>::into)
-                    .unwrap();
+                    .into();
 
                     s.send_blocking(msg).expect("cannot send message to gui");
                 }
@@ -115,6 +114,15 @@ impl From<Error> for Message {
     }
 }
 
+impl From<InterpreterResult<Message>> for Message {
+    fn from(value: InterpreterResult<Message>) -> Self {
+        match value {
+            Ok(msg) => msg,
+            Err(e) => Self::from(e),
+        }
+    }
+}
+
 struct Interpreter {
     py_interpreter: PyInterpreter,
     ath_interpreter: PyObjectRef,