wip: refactor(tweaker): revamp tweak tool in Rust

Author: EmixamPP

src/configure.rs

@@ -4,10 +4,12 @@ mod ui;
 pub async fn configure() -> anyhow::Result<()> {
     let res = app::run(&mut ratatui::init()).await;
     ratatui::restore();
+
+    // Print any successful message to the user once the TUI is closed
     if let Ok(msg) = &res
         && !msg.is_empty()
     {
         println!("{}", msg);
     }
-    res.map(|_| ())
+    res.map(|_| ()) // Delete the success message
 }

src/configure/app/ir_enabler.rs

@@ -341,7 +341,7 @@ impl App {
     async fn handle_term_event(&mut self, event: Event) -> Result<()> {
         match event {
             Event::Key(key_event) if key_event.kind == KeyEventKind::Press => {
-                self.handle_key_press(key_event.code.into()).await?;
+                self.handle_key_press(key_event.code).await?;
             }
             _ => {}
         };

src/configure/ui.rs

@@ -50,6 +50,7 @@ mod keys {
     pub const KEY_CONTINUE: Key = Key::new(KeyCode::Enter, "Continue", Color::Green);
     pub const KEY_YES: Key = Key::new(KeyCode::Char('y'), "Yes", Color::Green);
     pub const KEY_NO: Key = Key::new(KeyCode::Char('n'), "No", Color::Red);
+    pub const KEY_EDIT: Key = Key::new(KeyCode::Enter, "Edit", Color::Green);
 }
 
 #[cfg(test)]

src/configure/ui/ir_enabler.rs

@@ -1,12 +1,13 @@
 use super::{
+    DeviceSettingsCtx, SearchSettingsCtx,
     keys::{KEY_CONTINUE, KEY_EXIT, KEY_NAVIGATE, KEY_NO, KEY_YES, keys_to_line},
-    popup_area, render_main_window, render_video_preview,
+    popup_area, render_full_menu, render_main_window, render_video_preview,
 };
 use crate::video::stream::Image;
 
 use ratatui::{
     Frame,
-    layout::{Constraint, Flex, Layout, Rect},
+    layout::{Constraint, Layout, Rect},
     style::{Color, Style, Stylize},
     text::{Line, Text, ToLine},
     widgets::{Block, BorderType, Clear, HighlightSpacing, List, ListItem, ListState, Paragraph},
@@ -25,20 +26,6 @@ pub trait IrEnablerCtx {
     fn show_main_abort_prompt(&self) -> bool;
     fn show_menu_start_prompt(&self) -> bool;
 
-    fn device_settings_list_state(&mut self) -> &mut ListState;
-    fn device_valid(&self) -> (String, bool);
-    fn height(&self) -> Option<u32>;
-    fn width(&self) -> Option<u32>;
-    fn emitters(&self) -> usize;
-    fn fps(&self) -> Option<u32>;
-
-    fn search_settings_list_state(&mut self) -> &mut ListState;
-    fn limit(&self) -> Option<u16>;
-    fn manual(&self) -> bool;
-    fn analyzer_img_count(&self) -> u64;
-    fn ref_intensity_var_coef(&self) -> u64;
-    fn inc_step(&self) -> u8;
-
     fn controls_list_state(&mut self) -> &mut ListState;
     fn controls(&self) -> &[crate::video::uvc::XuControl];
     fn image(&self) -> Option<&Image>;
@@ -86,115 +73,6 @@ fn render_confirm_abort_popup(frame: &mut Frame, area: Rect) {
     frame.render_widget(command_paragraph, command_area);
 }
 
-/// Renders the main menu with device and search settings.
-fn render_menu<A>(frame: &mut Frame, area: Rect, app: &mut A)
-where
-    A: IrEnablerCtx,
-{
-    let [top_info_area, device_area, search_area, bot_info_area] = Layout::vertical([
-        Constraint::Length(1),
-        Constraint::Length(7),
-        Constraint::Length(7),
-        Constraint::Length(1),
-    ])
-    .flex(Flex::Center)
-    .areas(area);
-
-    let top_info_line =
-        Line::from("The tool will iterate through the UVC camera controls and modify them.")
-            .blue()
-            .centered();
-    frame.render_widget(top_info_line, top_info_area);
-
-    let bot_info_line = Line::from(vec![
-        "For more explanation, visit ".into(),
-        "https://github.com/EmixamPP/linux-enable-ir-emitter".underlined(),
-    ])
-    .blue()
-    .centered();
-    frame.render_widget(bot_info_line, bot_info_area);
-
-    let device_block =
-        Block::bordered().title(Line::from(" Device settings ".bold()).left_aligned());
-    let device_settings_list = List::new(vec![
-        ListItem::new(Line::from(vec!["Path: ".into(), {
-            let (device, valid_device) = app.device_valid();
-            if valid_device {
-                device.green()
-            } else {
-                format!("{device} (not a grey camera device)").red()
-            }
-        }])),
-        ListItem::new(Line::from(vec![
-            "Number of emitters: ".into(),
-            app.emitters().to_string().green(),
-        ])),
-        ListItem::new(Line::from(vec![
-            "Resolution height: ".into(),
-            app.height()
-                .map_or("auto".to_string(), |h| h.to_string())
-                .green(),
-        ])),
-        ListItem::new(Line::from(vec![
-            "Resolution width: ".into(),
-            app.width()
-                .map_or("auto".to_string(), |w| w.to_string())
-                .green(),
-        ])),
-        ListItem::new(Line::from(vec![
-            "FPS: ".into(),
-            app.fps()
-                .map_or("auto".to_string(), |f| f.to_string())
-                .green(),
-        ])),
-    ])
-    .highlight_style(Style::default().fg(Color::Yellow))
-    .highlight_symbol(">")
-    .highlight_spacing(HighlightSpacing::Always)
-    .block(device_block);
-    frame.render_stateful_widget(
-        device_settings_list,
-        device_area,
-        app.device_settings_list_state(),
-    );
-
-    let search_block = Block::bordered()
-        .title(Line::from(vec![" Search settings".bold(), " (advanced) ".dim()]).left_aligned());
-    let search_settings_list = List::new(vec![
-        ListItem::new(Line::from(vec![
-            "Manual validation: ".into(),
-            app.manual().to_string().green(),
-        ])),
-        ListItem::new(Line::from(vec![
-            "Images to analyze in auto validation: ".into(),
-            app.analyzer_img_count().to_string().green(),
-        ])),
-        ListItem::new(Line::from(vec![
-            "Light difference significance factor: ".into(),
-            app.ref_intensity_var_coef().to_string().green(),
-        ])),
-        ListItem::new(Line::from(vec![
-            "Rejection threshold per control: ".into(),
-            app.limit()
-                .map_or("none".to_string(), |w| w.to_string())
-                .green(),
-        ])),
-        ListItem::new(Line::from(vec![
-            "Increment step: ".into(),
-            app.inc_step().to_string().green(),
-        ])),
-    ])
-    .highlight_style(Style::default().fg(Color::Yellow))
-    .highlight_symbol(">")
-    .highlight_spacing(HighlightSpacing::Always)
-    .block(search_block);
-    frame.render_stateful_widget(
-        search_settings_list,
-        search_area,
-        app.search_settings_list_state(),
-    );
-}
-
 /// Renders the main application interface showing the camera preview and the list of controls,
 /// as well as extra information for the current control.
 ///
@@ -259,12 +137,17 @@ where
 /// Renders the application UI based on the current application state.
 pub fn ui<A>(frame: &mut Frame, app: &mut A)
 where
-    A: IrEnablerCtx,
+    A: IrEnablerCtx + DeviceSettingsCtx + SearchSettingsCtx,
 {
     match app.view() {
         View::Menu => {
             let main_area = render_main_window(frame, &[KEY_NAVIGATE, KEY_CONTINUE, KEY_EXIT]);
-            render_menu(frame, main_area, app);
+            render_full_menu(
+                frame,
+                main_area,
+                app,
+                "The tool will iterate through the UVC camera controls and modify them.",
+            );
             if app.show_menu_start_prompt() {
                 render_confirm_start_popup(frame, main_area);
             }
@@ -320,6 +203,18 @@ mod tests {
         fn show_menu_start_prompt(&self) -> bool {
             self.show_menu_start_prompt
         }
+        fn controls_list_state(&mut self) -> &mut ListState {
+            &mut self.controls_list_state
+        }
+        fn controls(&self) -> &[crate::video::uvc::XuControl] {
+            &self.controls
+        }
+        fn image(&self) -> Option<&Image> {
+            self.image.as_ref()
+        }
+    }
+
+    impl DeviceSettingsCtx for App {
         fn device_settings_list_state(&mut self) -> &mut ListState {
             &mut self.device_settings_list_state
         }
@@ -338,6 +233,9 @@ mod tests {
         fn fps(&self) -> Option<u32> {
             self.fps
         }
+    }
+
+    impl SearchSettingsCtx for App {
         fn search_settings_list_state(&mut self) -> &mut ListState {
             &mut self.search_settings_list_state
         }
@@ -356,15 +254,6 @@ mod tests {
         fn inc_step(&self) -> u8 {
             self.inc_step
         }
-        fn controls_list_state(&mut self) -> &mut ListState {
-            &mut self.controls_list_state
-        }
-        fn controls(&self) -> &[crate::video::uvc::XuControl] {
-            &self.controls
-        }
-        fn image(&self) -> Option<&Image> {
-            self.image.as_ref()
-        }
     }
 
     #[test]