refactor: use ratatui instead of tui

vicanso · Nov 29, 2023 · ef5f279 · ef5f279
1 parent 04862b8
commit ef5f279
Show file tree

Hide file tree

Showing 8 changed files with 101 additions and 99 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "diving"
-version = "0.5.10"
+version = "0.6.0"
 authors = ["Tree Xie <[email protected]>"]
 edition = "2021"
 keywords = ["diving", "image", "dive"]
@@ -29,6 +29,7 @@ mime_guess = "2.0.4"
 nanoid = "0.4.0"
 once_cell = "1.18.0"
 pad = "0.1.6"
+ratatui = "0.24.0"
 regex = "1.10.2"
 reqwest = { version = "0.11.22", default-features = false, features = ["rustls-tls", "json"] }
 rust-embed = { version = "8.0.0", features = ["compression", "mime-guess"] }
@@ -47,7 +48,6 @@ tokio-cron-scheduler = "0.9.4"
 tower = { version = "0.4.13", features = ["timeout"] }
 tracing = "0.1.40"
 tracing-subscriber = { version = "0.3.18", features = [ "local-time"] }
-tui = "0.19.0"
 unicode-width = "0.1.11"
 unix_mode = "0.1.4"
 zstd = "0.13.0"

diff --git a/src/ui/files.rs b/src/ui/files.rs
@@ -1,11 +1,6 @@
 use bytesize::ByteSize;
 use pad::PadStr;
-use tui::{
-    layout::{Constraint, Direction, Layout, Rect},
-    style::{Color, Modifier, Style},
-    text::{Span, Spans},
-    widgets::{Block, List, ListItem, Paragraph},
-};
+use ratatui::{prelude::*, widgets::*};
 
 use crate::image::{FileTreeItem, Op};
 
@@ -112,7 +107,7 @@ fn add_to_file_tree_view(
         if !item.link.is_empty() {
             name = format!("{name} → {}", item.link);
         }
-        list.push(ListItem::new(Spans::from(vec![
+        list.push(ListItem::new(Line::from(vec![
             Span::styled(get_file_mode_str(&item.mode), style),
             space_span.clone(),
             Span::styled(get_id_str(&id), style),
@@ -163,11 +158,11 @@ pub fn new_files_widget(
         opt.mode
     );
     let content = Paragraph::new(vec![
-        Spans::from(vec![Span::styled(
+        Line::from(vec![Span::styled(
             mode_tips,
             Style::default().add_modifier(Modifier::BOLD),
         )]),
-        Spans::from(vec![
+        Line::from(vec![
             Span::from(name_list[0]),
             space_span.clone(),
             Span::from(name_list[1]),

diff --git a/src/ui/image_detail.rs b/src/ui/image_detail.rs
@@ -1,10 +1,6 @@
 use bytesize::ByteSize;
 use pad::PadStr;
-use tui::{
-    style::{Modifier, Style},
-    text::{Span, Spans},
-    widgets::Paragraph,
-};
+use ratatui::{prelude::*, widgets::*};
 
 use super::util;
 use crate::image::ImageFileSummary;
@@ -70,36 +66,36 @@ pub fn new_image_detail_widget<'a>(opt: ImageDetailWidgetOption) -> ImageDetailW
         name += &format!("({}/{})", opt.os, opt.arch);
     }
     let mut spans_list = vec![
-        Spans::from(vec![
+        Line::from(vec![
             Span::styled(
                 "Image name: ",
                 Style::default().add_modifier(Modifier::BOLD),
             ),
             Span::from(name),
         ]),
-        Spans::from(vec![
+        Line::from(vec![
             Span::styled(
                 "Total Image size: ",
                 Style::default().add_modifier(Modifier::BOLD),
             ),
             Span::from(format!("{} / {}", ByteSize(total_size), ByteSize(size),)),
         ]),
-        Spans::from(vec![
+        Line::from(vec![
             Span::styled(
                 "Potential wasted space: ",
                 Style::default().add_modifier(Modifier::BOLD),
             ),
             Span::from(ByteSize(wasted_size).to_string()),
         ]),
-        Spans::from(vec![
+        Line::from(vec![
             Span::styled(
                 "Image efficiency score: ",
                 Style::default().add_modifier(Modifier::BOLD),
             ),
             Span::from(format!("{score} %")),
         ]),
-        Spans::from(vec![]),
-        Spans::from(vec![
+        Line::from(vec![]),
+        Line::from(vec![
             Span::styled(headers[0], Style::default().add_modifier(Modifier::BOLD)),
             space_span.clone(),
             Span::styled(headers[1], Style::default().add_modifier(Modifier::BOLD)),
@@ -117,7 +113,7 @@ pub fn new_image_detail_widget<'a>(opt: ImageDetailWidgetOption) -> ImageDetailW
         let size_str = ByteSize(wasted.total_size)
             .to_string()
             .pad_to_width_with_alignment(size_pad_width, pad::Alignment::Right);
-        spans_list.push(Spans::from(vec![
+        spans_list.push(Line::from(vec![
             Span::from(count_str),
             space_span.clone(),
             Span::from(size_str),

diff --git a/src/ui/layer_detail.rs b/src/ui/layer_detail.rs
@@ -1,11 +1,5 @@
 use chrono::{DateTime, Local, TimeZone};
-
-use tui::{
-    layout::Alignment,
-    style::{Modifier, Style},
-    text::{Span, Spans},
-    widgets::{Paragraph, Wrap},
-};
+use ratatui::{prelude::*, widgets::*};
 
 use super::util;
 use crate::image::ImageLayer;
@@ -32,18 +26,12 @@ pub fn new_layer_detail_widget(layer: &ImageLayer, opt: DetailWidgetOption) -> D
             .to_rfc3339();
     };
 
-    let paragraph = Paragraph::new(vec![
-        Spans::from(Span::styled(
-            "Created:",
-            Style::default().add_modifier(Modifier::BOLD),
-        )),
-        Spans::from(create_at),
-        Spans::from(Span::styled(
-            "Command:",
-            Style::default().add_modifier(Modifier::BOLD),
-        )),
-        Spans::from(cmd),
-    ])
+    let paragraph = Paragraph::new(Line::from(vec![
+        Span::styled("Created:", Style::default().add_modifier(Modifier::BOLD)),
+        Span::from(create_at),
+        Span::styled("Command:", Style::default().add_modifier(Modifier::BOLD)),
+        Span::from(cmd),
+    ]))
     .block(util::create_block(" Layer Details "))
     .alignment(Alignment::Left)
     .wrap(Wrap { trim: true });

diff --git a/src/ui/layers.rs b/src/ui/layers.rs
@@ -1,13 +1,7 @@
 use bytesize::ByteSize;
 
 use pad::PadStr;
-
-use tui::{
-    layout::Constraint,
-    style::{Color, Modifier, Style},
-    text::Spans,
-    widgets::{Cell, Row, Table},
-};
+use ratatui::{prelude::*, widgets::*};
 
 use super::util;
 use crate::image::ImageLayer;
@@ -50,7 +44,7 @@ pub fn new_layers_widget<'a>(layers: &[ImageLayer], opt: LayersWidgetOption) ->
                     pad::Alignment::Right,
                 )));
             } else {
-                cells.push(Cell::from(Spans::from(value)));
+                cells.push(Cell::from(value));
             }
         }
         let mut style = Style::default();