switch tui to ratatui (#3155)

microsoft · Jun 5, 2023 · c76cb9b · c76cb9b
1 parent bada352
commit c76cb9b
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 41 deletions.
diff --git a/src/agent/Cargo.lock b/src/agent/Cargo.lock
diff --git a/src/agent/onefuzz-task/Cargo.toml b/src/agent/onefuzz-task/Cargo.toml
@@ -48,7 +48,7 @@ thiserror = "1.0"
 tokio = { version = "1.28", features = ["full"] }
 tokio-util = { version = "0.7", features = ["full"] }
 tokio-stream = "0.1"
-tui = { version = "0.19", default-features = false, features = ['crossterm'] }
+tui = { package = "ratatui", version = "0.21.0", default-features = false, features = ['crossterm']}
 url = { version = "2.3", features = ["serde"] }
 uuid = { version = "1.3", features = ["serde", "v4"] }
 chrono = { version = "0.4", default-features = false, features = [

diff --git a/src/agent/onefuzz-task/src/local/common.rs b/src/agent/onefuzz-task/src/local/common.rs
@@ -22,7 +22,6 @@ use crate::tasks::config::CommonConfig;
 use crate::tasks::utils::parse_key_value;
 
 pub const SETUP_DIR: &str = "setup_dir";
-pub const EXTRA_DIR: &str = "extra_dir";
 pub const INPUTS_DIR: &str = "inputs_dir";
 pub const CRASHES_DIR: &str = "crashes_dir";
 pub const TARGET_WORKERS: &str = "target_workers";
@@ -238,7 +237,7 @@ pub async fn build_local_context(
     });
     let instance_id = get_uuid("instance_id", args).unwrap_or_default();
 
-    let extra_dir = args.get_one::<PathBuf>(EXTRA_DIR).cloned();
+    // let extra_dir = args.get_one::<PathBuf>(EXTRA_DIR).cloned();
     let setup_dir = if let Some(setup_dir) = args.get_one::<PathBuf>(SETUP_DIR) {
         setup_dir.clone()
     } else if let Some(target_exe) = args.get_one::<String>(TARGET_EXE) {
@@ -255,7 +254,7 @@ pub async fn build_local_context(
         task_id,
         instance_id,
         setup_dir,
-        extra_dir,
+        extra_dir: None,
         machine_identity: MachineIdentity {
             machine_id: Uuid::nil(),
             machine_name: "local".to_string(),

diff --git a/src/agent/onefuzz-task/src/local/tui.rs b/src/agent/onefuzz-task/src/local/tui.rs
@@ -31,7 +31,7 @@ use tui::{
     backend::CrosstermBackend,
     layout::{Alignment, Constraint, Corner, Direction, Layout},
     style::{Color, Modifier, Style},
-    text::{Span, Spans},
+    text::{Line, Span},
     widgets::{Block, Borders},
     widgets::{Gauge, List, ListItem, ListState, Paragraph, Wrap},
     Terminal,
@@ -354,7 +354,7 @@ impl TerminalUi {
             stats_spans.pop();
         }
 
-        Paragraph::new(Spans::from(stats_spans))
+        Paragraph::new(Line::from(stats_spans))
             .style(Style::default())
             .alignment(Alignment::Left)
             .wrap(Wrap { trim: true })
@@ -390,7 +390,7 @@ impl TerminalUi {
             files_spans.pop();
         } // removing the last ","
 
-        Paragraph::new(Spans::from(files_spans))
+        Paragraph::new(Line::from(files_spans))
             .style(Style::default())
             .alignment(Alignment::Left)
             .wrap(Wrap { trim: true })
@@ -408,7 +408,7 @@ impl TerminalUi {
                     Level::Trace => Style::default(),
                 };
 
-                ListItem::new(Spans::from(vec![
+                ListItem::new(Line::from(vec![
                     Span::styled(format!("{level:<9}"), style),
                     Span::raw(" "),
                     Span::raw(log),