tui is unmaintained; use ratatui instead

Signed-off-by: chengqinglin <[email protected]>
imuxin · Oct 25, 2023 · c2bc615 · c2bc615
1 parent 52af49e
commit c2bc615
Show file tree

Hide file tree

Showing 8 changed files with 180 additions and 83 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,4 @@
 [workspace]
 default-members = ["kubectl-watch"]
-members = [
-  "kubectl-watch",
-  "difftastic-lib",
-]
+members = ["kubectl-watch", "difftastic-lib"]
+resolver = "2"
diff --git a/README.md b/README.md
@@ -83,7 +83,7 @@ kubectl-watch {resource} -include-managed-fields
 
 ## Acknowledgment
 
-- [tui-rs](https://github.com/fdehau/tui-rs)
+- [ratatui](https://github.com/ratatui-org/ratatui)
 - [difftastic](https://github.com/Wilfred/difftastic)
 - [kube-rs](https://github.com/kube-rs/kube-rs)
 - [rust](https://github.com/rust-lang/rust)
diff --git a/difftastic-lib/Cargo.toml b/difftastic-lib/Cargo.toml
@@ -8,7 +8,7 @@ version = "0.0.2"
 authors = ["Wilfred Hughes <[email protected]>", "chengqinglin <[email protected]>"]
 keywords = ["diff", "syntax"]
 categories = ["development-tools", "command-line-utilities", "parser-implementations"]
-edition = "2018"
+edition = "2021"
 include = [
         "/build.rs",
         "/src/",
@@ -63,7 +63,7 @@ version_check = "0.9.4"
 # flamegraph.
 #
 # https://doc.rust-lang.org/cargo/reference/profiles.html#release
-debug = false
+# debug = false
 
 [[bin]]
 name = "difft"

diff --git a/kubectl-watch/Cargo.toml b/kubectl-watch/Cargo.toml
@@ -12,17 +12,26 @@ readme = "../README.md"
 
 [dependencies]
 anyhow = "1.0.44"
-clap = { version = "3.1.9", default-features = false, features = ["std", "cargo", "derive"] }
+clap = { version = "3.1.9", default-features = false, features = [
+    "std",
+    "cargo",
+    "derive",
+] }
 colored = "2"
 crossterm = "0.26"
 # difftastic-lib = "0.0.1"
-difftastic-lib = { path = "../difftastic-lib" , version = "0.0.2"}
+difftastic-lib = { path = "../difftastic-lib", version = "0.0.2" }
 edit = "0.1.3"
 either = "1.6.1"
 futures = "0.3.17"
 grep-cli = "0.1.6"
 itertools = "0.10.5"
-kube = { version = "0.78.0", default-features = false, features = ["runtime", "derive", "client", "rustls-tls"] }
+kube = { version = "0.78.0", default-features = false, features = [
+    "runtime",
+    "derive",
+    "client",
+    "rustls-tls",
+] }
 k8s-openapi = { version = "0.17.0", features = ["v1_24"] }
 serde = { version = "1.0.144", features = ["derive"] }
 serde_json = "1.0.85"
@@ -32,4 +41,4 @@ tracing = "0.1.29"
 tracing-subscriber = "0.3.3"
 terminal_size = "0.2.1"
 term_size = "0.3.2"
-tui = "0.19"
+ratatui = "0.24.0"
diff --git a/kubectl-watch/src/diff/difft.rs b/kubectl-watch/src/diff/difft.rs
@@ -6,12 +6,12 @@ use crate::persistent;
 
 use difft_lib::{diff_file, options, print_diff_result, tui_diff_result, FgColor};
 use kube::api::DynamicObject;
-use std::path::PathBuf;
-use tui::{
+use ratatui::{
     style::{Color, Style},
-    text::{Span, Spans},
+    text::{Line, Span},
     widgets::{Paragraph, Wrap},
 };
+use std::path::PathBuf;
 
 pub struct Difft {
     include_managed_fields: bool,
@@ -127,7 +127,7 @@ fn to_paragraph<'a>(result: Vec<Vec<(String, FgColor)>>) -> Paragraph<'a> {
                         Span::styled(content.clone(), Style::default().fg(c))
                     })
                     .collect::<Vec<_>>();
-                Spans::from(spans)
+                Line::from(spans)
             })
             .collect::<Vec<_>>(),
     )

diff --git a/kubectl-watch/src/diff/mod.rs b/kubectl-watch/src/diff/mod.rs
@@ -6,7 +6,7 @@ use crate::options;
 
 use kube::api::DynamicObject;
 use std::path::PathBuf;
-use tui::widgets::Paragraph;
+use ratatui::widgets::Paragraph;
 
 pub trait Diff<'a> {
     fn diff(&mut self, minus_file: PathBuf, plus_file: PathBuf) -> std::io::Result<i32>;

diff --git a/kubectl-watch/src/output/tui.rs b/kubectl-watch/src/output/tui.rs
@@ -11,9 +11,7 @@ use crossterm::{
     terminal::{disable_raw_mode, enable_raw_mode, EnterAlternateScreen, LeaveAlternateScreen},
 };
 use kube::{api::DynamicObject, ResourceExt};
-use std::{collections::HashMap, io};
-use tokio::sync::mpsc;
-use tui::{
+use ratatui::{
     backend::{Backend, CrosstermBackend},
     layout::{Constraint, Direction, Layout, Rect},
     style::{Color, Style},
@@ -22,6 +20,8 @@ use tui::{
     Frame,
     Terminal,
 };
+use std::{collections::HashMap, io};
+use tokio::sync::mpsc;
 
 impl UID for DynamicObject {
     fn resource_version(&self) -> String {
@@ -262,7 +262,7 @@ async fn run_tui<B: Backend>(
     }
 }
 
-fn ui<B: Backend>(f: &mut Frame<B>, ctrl: &mut Controller) {
+fn ui(f: &mut Frame, ctrl: &mut Controller) {
     let chunks = Layout::default()
         .constraints([Constraint::Length(10), Constraint::Min(10)].as_ref())
         .split(f.size());
@@ -271,10 +271,7 @@ fn ui<B: Backend>(f: &mut Frame<B>, ctrl: &mut Controller) {
     draw_diff(f, ctrl, chunks[1]);
 }
 
-fn draw_resources_event<B>(f: &mut Frame<B>, ctrl: &mut Controller, area: Rect)
-where
-    B: Backend,
-{
+fn draw_resources_event(f: &mut Frame, ctrl: &mut Controller, area: Rect) {
     let selected_style = Style::default().bg(Color::Black).fg(Color::LightRed);
     let header = Row::new(ctrl.get_header())
         .style(Style::default().fg(Color::LightBlue))
@@ -311,10 +308,7 @@ where
     f.render_stateful_widget(t, area, &mut ctrl.state);
 }
 
-fn draw_diff<B>(f: &mut Frame<B>, ctrl: &mut Controller, area: Rect)
-where
-    B: Backend,
-{
+fn draw_diff(f: &mut Frame, ctrl: &mut Controller, area: Rect) {
     f.render_widget(
         Block::default().borders(Borders::ALL).title("Diff Result"),
         area,