Reorg

src/cli.rs → src/cli/mod.rs

@@ -1,3 +1,8 @@
+mod args;
+mod completions;
+
+pub use args::*;
+
 use {
     crate::*,
     anyhow::anyhow,
@@ -25,8 +30,6 @@ use termimad::crossterm::event::{
     EnableMouseCapture,
 };
 
-pub mod completions;
-
 /// The Write type used by all GUI writing functions
 pub type W = std::io::BufWriter<std::io::Stdout>;
 
@@ -105,7 +108,7 @@ pub fn run() -> anyhow::Result<()> {
         w.queue(EnableMouseCapture)?;
         w.flush()?;
     }
-    let result = app::run(&mut w, settings, &args, context, headless);
+    let result = tui::app::run(&mut w, settings, &args, context, headless);
     if !headless {
         #[cfg(windows)]
         w.queue(DisableMouseCapture)?;

src/conf/mod.rs

@@ -1,5 +1,5 @@
 mod action;
-mod args;
+mod auto_refresh;
 mod cargo_wrapped_config;
 mod config;
 mod defaults;
@@ -9,7 +9,7 @@ mod settings;
 
 pub use {
     action::*,
-    args::*,
+    auto_refresh::*,
     cargo_wrapped_config::*,
     config::*,
     defaults::*,

src/help/help_line.rs

@@ -112,7 +112,7 @@ impl HelpLine {
             if let Some(s) = &self.clear_search {
                 parts.push(s);
             }
-            if state.is_search_input_focused() {
+            if state.search.focused() {
                 if let Some(s) = &self.validate_search {
                     parts.push(s);
                 }

src/lib.rs

@@ -1,53 +1,42 @@
 mod analysis;
-mod app;
-mod auto_refresh;
 pub mod burp;
 mod cli;
 mod conf;
 mod context;
 mod context_nature;
-mod drawing;
 mod exec;
 mod export;
 mod help;
 mod ignorer;
 mod internal;
 mod jobs;
-mod messages;
 mod mission;
 mod result;
-mod scroll;
 mod search;
 mod sound;
-mod state;
 mod tty;
+mod tui;
 mod watcher;
-mod wrap;
 
 pub use {
     analysis::*,
-    auto_refresh::*,
     cli::*,
     conf::*,
     context::*,
     context_nature::*,
-    drawing::*,
     exec::*,
     export::*,
     help::*,
     ignorer::*,
     internal::*,
     jobs::*,
-    messages::*,
     mission::*,
     result::*,
-    scroll::*,
     search::*,
     sound::*,
-    state::*,
     tty::*,
+    tui::*,
     watcher::*,
-    wrap::*,
 };
 
 #[macro_use]