tmp: improve binsider integration

godzie44 · Oct 9, 2024 · 30abee3 · 30abee3
1 parent 8bb8de5
commit 30abee3
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 25 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -73,7 +73,7 @@ toml = "0.8.13"
 home = "0.5.9"
 which = "6.0.1"
 ratatui = { version = "0.28", optional = true }
-binsider = { version = "0.2.0", optional = true }
+binsider = { git = "https://github.com/godzie44/binsider.git", branch = "godzie44/run_as_widget", optional = true }
 
 [dev-dependencies]
 serial_test = "3.0.0"

diff --git a/src/ui/third_party/binsider.rs b/src/ui/third_party/binsider.rs
@@ -2,16 +2,11 @@ use crate::debugger::Debugger;
 use crate::ui::tui::app::port::DebuggerEventQueue;
 use crate::ui::tui::TuiHook;
 use crate::ui::{console, supervisor, DebugeeOutReader};
-use binsider::prelude::{Command, Event};
-use binsider::{prelude::*, tui::ui::Tab};
-use ratatui::{
-    crossterm::event::{self, Event as CrosstermEvent, KeyCode},
-    Frame,
-};
+use binsider::prelude::Event;
+use binsider::prelude::*;
+use ratatui::{crossterm::event::KeyCode, Frame};
 use std::fs;
 use std::path::PathBuf;
-use std::sync::mpsc;
-use std::time::Duration;
 
 pub struct AppBuilder {
     debugee_out: DebugeeOutReader,
@@ -65,8 +60,8 @@ impl BinsiderApplication {
         )?;
         let analyzer = Analyzer::new(file_info, 15, vec![])?;
         let mut state = State::new(analyzer)?;
-        let (sender, receiver) = mpsc::channel();
-        state.analyzer.extract_strings(sender.clone());
+        let events = EventHandler::new(250);
+        state.analyzer.extract_strings(events.sender.clone());
 
         let mut terminal = ratatui::init();
         loop {
@@ -75,26 +70,34 @@ impl BinsiderApplication {
                 render(&mut state, frame);
             })?;
 
-            // Handle terminal events.
-            if event::poll(Duration::from_millis(16))? {
-                if let CrosstermEvent::Key(key) = event::read()? {
-                    if key.code == KeyCode::Char('q') {
+            let event = events.next()?;
+            match event {
+                Event::Key(key_event) => {
+                    if key_event.code == KeyCode::Char('q') {
                         break;
                     }
-                    let command = Command::from(key);
-                    state.run_command(command, sender.clone())?;
+                    binsider::handle_event(Event::Key(key_event), &events, &mut state)?;
                 }
-            }
+                Event::Restart(None) => {
+                    break;
+                }
+                Event::Restart(Some(path)) => {
+                    let Some(path) = path.to_str() else { break };
+                    let file_data = std::fs::read(path)?;
+                    let bytes = file_data.as_slice();
+                    let file_info = FileInfo::new(path, Some(vec![]), bytes)?;
+                    let analyzer = Analyzer::new(file_info, 15, vec![])?;
 
-            // Handle binsider events.
-            if let Ok(Event::FileStrings(strings)) = receiver.try_recv() {
-                state.strings_loaded = true;
-                state.analyzer.strings = Some(strings?.into_iter().map(|(v, l)| (l, v)).collect());
-                if state.tab == Tab::Strings {
+                    state.change_analyzer(analyzer);
                     state.handle_tab()?;
+                    state.analyzer.extract_strings(events.sender.clone());
+                }
+                _ => {
+                    binsider::handle_event(event, &events, &mut state)?;
                 }
             }
         }
+        events.stop();
         ratatui::restore();
 
         let builder = console::AppBuilder::new(self.debugee_out, self.debugee_err);