Update dependencies and refactor UI code

Author: weyh

.github/dependabot.yml

@@ -22,7 +22,7 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
 
     steps:
     - name: Checkout code
@@ -45,7 +45,7 @@ jobs:
   deploy:
     if: ${{ github.event.inputs.deploy == 'true' }}
     needs: [build]
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
 
     steps:
       - name: Checkout code

.github/workflows/ci.yml

@@ -1,14 +1,14 @@
 [package]
 name = "gcoma"
-version = "2.1.0"
-edition = "2021"
+version = "2.2.0"
+edition = "2024"
 readme = "README.md"
 license = "Apache-2.0"
 
 [dependencies]
-clap = { version = "4.4.12", features = ["derive"] }
-crossterm = "0.27.0"
-ratatui = "0.26.1"
-serde = { version = "1.0.193", features = ["derive"] }
-serde_json = "1.0.1"
-tui-textarea = "0.4.0"
+clap = { version = "4.5.45", features = ["derive"] }
+crossterm = "0.29.0"
+ratatui = "0.29.0"
+serde = { version = "1.0.219", features = ["derive"] }
+serde_json = "1.0.143"
+tui-textarea = "0.7.0"

Cargo.toml

@@ -27,12 +27,12 @@ fn main() -> io::Result<()> {
     let matches = args::get_args();
     let cfg_path = matches.get_one::<String>("user_config");
 
-    if cfg_path.is_some() {
-        let user_config = load_cfg_from_file(cfg_path.unwrap().as_str());
+    if let Some(path) = cfg_path {
+        let user_config = load_cfg_from_file(path.as_str());
 
         let list_flag = matches.get_one::<bool>("list").unwrap_or(&false).to_owned();
         let connect_idx = matches.get_one::<String>("connect");
-        let rm_sg = matches.get_one::<String>("remove");
+        let remove_sg = matches.get_one::<String>("remove");
 
         if list_flag {
             let mut i = 0;
@@ -45,8 +45,8 @@ fn main() -> io::Result<()> {
                     i += 1;
                 }
             }
-        } else if connect_idx.is_some() {
-            let mut idx: usize = connect_idx.unwrap().parse().unwrap();
+        } else if let Some(idx) = connect_idx {
+            let mut idx: usize = idx.parse().unwrap();
 
             for sg in user_config?.session_groups.iter() {
                 for s in sg.sessions.iter() {
@@ -57,9 +57,9 @@ fn main() -> io::Result<()> {
                     idx -= 1;
                 }
             }
-        } else if rm_sg.is_some() {
+        } else if let Some(rm_sg) = remove_sg {
             let mut ucfg = user_config.unwrap_or(Config::new());
-            let sg_name = rm_sg.unwrap().to_owned();
+            let sg_name = rm_sg.to_owned();
 
             ucfg.session_groups.retain(|sg| sg.name != sg_name);
 

src/main.rs

@@ -1,5 +1,6 @@
 use serde::{Deserialize, Serialize};
 use std::convert::TryFrom;
+use std::fmt;
 
 #[allow(clippy::upper_case_acronyms)]
 #[derive(Serialize, Deserialize, PartialEq, Clone)]
@@ -8,12 +9,13 @@ pub enum ConnectionType {
     SSH,
 }
 
-impl ToString for ConnectionType {
-    fn to_string(&self) -> String {
-        match self {
-            ConnectionType::Telnet => "telnet".to_string(),
-            ConnectionType::SSH => "ssh".to_string(),
-        }
+impl fmt::Display for ConnectionType {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        let s = match self {
+            ConnectionType::Telnet => "telnet",
+            ConnectionType::SSH => "ssh",
+        };
+        write!(f, "{}", s)
     }
 }
 

src/session_core/connection_type.rs

@@ -1,11 +1,11 @@
-use crossterm::{
+use ratatui::crossterm::{
     event::{self, DisableMouseCapture, EnableMouseCapture, Event, KeyCode},
     execute,
-    terminal::{disable_raw_mode, enable_raw_mode, EnterAlternateScreen, LeaveAlternateScreen},
+    terminal::{EnterAlternateScreen, LeaveAlternateScreen, disable_raw_mode, enable_raw_mode},
 };
 use ratatui::{prelude::*, widgets::*};
 
-use std::io::{self, stdout, Stdout};
+use std::io::{self, Stdout, stdout};
 use std::vec;
 use tui_textarea::{Input, Key};
 
@@ -76,10 +76,7 @@ fn remove_selected(state: &mut ViewState) {
 }
 
 fn find_selected(state: &mut ViewState) -> Option<Session> {
-    let mut selected_idx = match state.table_state.selected() {
-        Some(i) => i,
-        None => return None,
-    };
+    let mut selected_idx = state.table_state.selected()?;
 
     for session_group in state.config.session_groups.iter() {
         if selected_idx == 0 {
@@ -101,26 +98,26 @@ fn find_selected(state: &mut ViewState) -> Option<Session> {
 }
 
 fn handle_normal_mode_events(state: &mut ViewState, cfg_path: &str) -> io::Result<bool> {
-    if let Event::Key(key) = event::read()? {
-        if key.kind == event::KeyEventKind::Press {
-            match key.code {
-                KeyCode::Char('q') | KeyCode::Esc => {
-                    // Quit
-                    return Ok(true);
-                }
-                KeyCode::Char('a') => state.popup_state.show(),
-                KeyCode::Char('r') => {
-                    remove_selected(state);
-                    state.config.save(cfg_path);
-                }
-                KeyCode::Char('R') => {
-                    state.config = load_cfg_from_file(cfg_path).unwrap_or(Config::new());
-                }
-                KeyCode::Enter => state.connected = true,
-                KeyCode::Down | KeyCode::Char('j') => state.next(),
-                KeyCode::Up | KeyCode::Char('k') => state.previous(),
-                _ => {}
+    if let Event::Key(key) = event::read()?
+        && key.kind == event::KeyEventKind::Press
+    {
+        match key.code {
+            KeyCode::Char('q') | KeyCode::Esc => {
+                // Quit
+                return Ok(true);
+            }
+            KeyCode::Char('a') => state.popup_state.show(),
+            KeyCode::Char('r') => {
+                remove_selected(state);
+                state.config.save(cfg_path);
+            }
+            KeyCode::Char('R') => {
+                state.config = load_cfg_from_file(cfg_path).unwrap_or(Config::new());
             }
+            KeyCode::Enter => state.connected = true,
+            KeyCode::Down | KeyCode::Char('j') => state.next(),
+            KeyCode::Up | KeyCode::Char('k') => state.previous(),
+            _ => {}
         }
     }
 
@@ -246,21 +243,24 @@ fn table_ui(state: &mut ViewState, frame: &mut Frame, area: &Rect) {
     )
     .header(header)
     .block(Block::default().borders(Borders::ALL).title("Sessions"))
-    .highlight_style(Style::default().add_modifier(Modifier::REVERSED))
+    .row_highlight_style(Style::default().add_modifier(Modifier::REVERSED))
     .highlight_symbol(">> ");
 
     frame.render_stateful_widget(t, *area, &mut state.table_state);
 }
 
 fn popup_ui(state: &mut ViewState, frame: &mut Frame) {
     let create_block = |title, border, modifier, color| {
-        Block::default().borders(border).gray().title(Span::styled(
-            title,
-            Style::default().add_modifier(modifier).fg(color),
-        ))
+        block::Block::default()
+            .borders(border)
+            .gray()
+            .title(Span::styled(
+                title,
+                Style::default().add_modifier(modifier).fg(color),
+            ))
     };
 
-    let area = create_centered_rect(50, 50, frame.size());
+    let area = create_centered_rect(50, 50, frame.area());
     let chunks = Layout::new(
         Direction::Vertical,
         [Constraint::Percentage(100), Constraint::Percentage(100)],
@@ -297,8 +297,8 @@ fn popup_ui(state: &mut ViewState, frame: &mut Frame) {
             ));
             textarea.set_placeholder_text(placeholder);
             frame.render_widget(
-                textarea.widget(),
-                chunks[0].inner(&Margin {
+                &*textarea,
+                chunks[0].inner(Margin {
                     vertical: 1,
                     horizontal: 2,
                 }),
@@ -312,7 +312,7 @@ fn popup_ui(state: &mut ViewState, frame: &mut Frame) {
             let paragraph = Paragraph::new(line).bold();
             frame.render_widget(
                 paragraph,
-                chunks[0].inner(&Margin {
+                chunks[0].inner(Margin {
                     vertical: 1,
                     horizontal: 2,
                 }),
@@ -326,7 +326,7 @@ fn ui(state: &mut ViewState, frame: &mut Frame) {
         Direction::Vertical,
         [Constraint::Length(1), Constraint::Min(0)],
     )
-    .split(frame.size());
+    .split(frame.area());
 
     // Title
     frame.render_widget(
@@ -380,10 +380,10 @@ fn connect_selected_ui(
     terminal.draw(|frame| {
         frame.render_widget(
             Block::default().title(text).borders(Borders::TOP),
-            frame.size(),
+            frame.area(),
         )
     })?;
-    terminal.set_cursor(0, 1)?;
+    terminal.set_cursor_position(Position { x: 0, y: 1 })?;
     terminal.show_cursor()?;
 
     disable_raw_mode()?;