Refactoring

preiter93 · Sep 28, 2024 · 6e87c32 · 6e87c32
1 parent 87e0880
commit 6e87c32
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 16 deletions.
diff --git a/wireman/src/events.rs b/wireman/src/events.rs
@@ -159,15 +159,19 @@ impl App {
                 resp.set(&mut self.ctx.messages.borrow_mut().response.editor);
                 self.ctx.messages.borrow_mut().handler.take();
             }
-            InternalStreamData::Reflection(desc) => {
-                if let Ok(desc) = desc {
+            InternalStreamData::Reflection(desc) => match desc {
+                Ok(desc) => {
                     self.ctx
                         .selection
                         .borrow_mut()
                         .update_proto_descriptor(desc.clone());
                     self.ctx.selection.borrow_mut().selection_mode = SelectionMode::Reflection;
                 }
-            }
+                Err(err) => {
+                    // TODO: Handle error
+                    Logger::critical(err)
+                }
+            },
         }
     }
 

diff --git a/wireman/src/model/reflection.rs b/wireman/src/model/reflection.rs
@@ -1,6 +1,5 @@
 #![allow(clippy::module_name_repetitions)]
 use core::ProtoDescriptor;
-use logger::Logger;
 use std::cell::RefCell;
 use std::rc::Rc;
 use tokio::sync::mpsc::Sender;
@@ -40,27 +39,20 @@ impl ReflectionModel {
     }
 
     pub fn dispatch_reflection(&mut self) {
-        Logger::debug("boom toggle");
         self.dispatch_reflection = true;
     }
 
     pub fn handle_reflection(&mut self, sx: Sender<InternalStreamData>) {
         let host = self.headers.borrow().address();
         self.dispatch_reflection = false;
         tokio::spawn(async move {
-            Logger::debug("spawn");
-            match ProtoDescriptor::reflect(&host).await {
-                Ok(desc) => {
-                    let _ = sx.send(InternalStreamData::Reflection(Ok(desc))).await;
-                }
+            let event = match ProtoDescriptor::reflect(&host).await {
+                Ok(desc) => InternalStreamData::Reflection(Ok(desc)),
                 Err(err) => {
-                    let err_str = format!("Server reflection failed: {err}");
-                    let _ = sx
-                        .send(InternalStreamData::Reflection(Err(err_str.clone())))
-                        .await;
-                    Logger::critical(err_str)
+                    InternalStreamData::Reflection(Err(format!("Server reflection failed: {err}")))
                 }
-            }
+            };
+            let _ = sx.send(event).await;
         });
     }
 }