feat: add home/end support

Author: alexeev-prog

README.md

@@ -42,7 +42,7 @@
 
  > Read the f*cking manual NOW!
 
-RTFM - blazingly fast util for searching manuals & docs. Blazingly fast terminal utility for exploring man pages and tldr cheatsheets.
+RTFM - blazingly fast util for exploring man pages and tldr cheatsheets.
 
 We are support [tldr](https://github.com/tldr-pages/tldr). You should install `man` and `tldr`.
 

src/man_db.rs

@@ -122,7 +122,7 @@ impl ManDb {
         let output_str = String::from_utf8_lossy(&output.stdout);
         let mut man_map = HashMap::new();
         let mut commands = Vec::new();
-        let re = Regex::new(r"\((\d)\)").unwrap();
+        let re = Regex::new(r"\((\d)\)")?;
 
         for line in output_str.lines() {
             if let Some((name, desc)) = line.split_once(" - ") {

src/trie.rs

@@ -90,7 +90,7 @@ mod trie_tests {
         trie.insert("pythonic");
 
         let results = trie.words_starting_with("ru");
-        assert_eq!(results, vec!["ruby", "rust"]);
+        assert_eq!(results, vec!["rust", "ruby"]);
 
         let results = trie.words_starting_with("rust");
         assert_eq!(results, vec!["rust"]);

src/tui.rs

@@ -6,17 +6,17 @@ use crossterm::{
         KeyModifiers,
     },
     execute,
-    terminal::{EnterAlternateScreen, LeaveAlternateScreen, disable_raw_mode, enable_raw_mode},
+    terminal::{disable_raw_mode, enable_raw_mode, EnterAlternateScreen, LeaveAlternateScreen},
 };
 use std::sync::Arc;
 use std::time::{Duration, Instant};
 use tui::{
-    Terminal,
     backend::CrosstermBackend,
     layout::{Constraint, Direction, Layout, Rect},
     style::{Color, Modifier, Style},
     text::{Span, Spans},
     widgets::{Block, Borders, List, ListItem, ListState, Paragraph, Wrap},
+    Terminal,
 };
 
 const PAGE_SIZE: usize = 30;
@@ -71,6 +71,14 @@ enum PageSource {
     Tldr,
 }
 
+fn scroll_to_top(app: &mut AppState) {
+    app.man_page.scroll = 0;
+}
+
+fn scroll_to_bottom(app: &mut AppState) {
+    app.man_page.scroll = app.man_page.content.len().saturating_sub(PAGE_SIZE);
+}
+
 /// Runs the TUI application
 pub async fn run_tui(man_db: ManDb) -> Result<()> {
     enable_raw_mode()?;
@@ -129,10 +137,13 @@ pub async fn run_tui(man_db: ManDb) -> Result<()> {
 
                 // Handle Ctrl combinations first
                 if let KeyEvent {
-                        code: KeyCode::Char('c'),
-                        modifiers: KeyModifiers::CONTROL,
-                        ..
-                    } = key { break }
+                    code: KeyCode::Char('c'),
+                    modifiers: KeyModifiers::CONTROL,
+                    ..
+                } = key
+                {
+                    break;
+                }
 
                 match key.code {
                     KeyCode::Char('q') => break,
@@ -149,6 +160,20 @@ pub async fn run_tui(man_db: ManDb) -> Result<()> {
                     }
                     _ => handle_key(&mut app, key).await,
                 }
+
+                match key {
+                    KeyEvent {
+                        code: KeyCode::Home,
+                        modifiers: KeyModifiers::CONTROL,
+                        ..
+                    } => scroll_to_top(&mut app), // Исправлено: добавлено &mut
+                    KeyEvent {
+                        code: KeyCode::End,
+                        modifiers: KeyModifiers::CONTROL,
+                        ..
+                    } => scroll_to_bottom(&mut app), // Исправлено: добавлено &mut
+                    _ => {}
+                }
             }
         }
 
@@ -224,6 +249,18 @@ async fn handle_command_list_keys(app: &mut AppState, key: KeyEvent) {
                 app.last_input_time = Instant::now();
             }
         }
+        KeyCode::Home if commands_len > 0 => {
+            app.command_list.selected_idx = 0;
+            update_list_scroll(app);
+            app.pending_man_load = true;
+            app.last_input_time = Instant::now();
+        }
+        KeyCode::End if commands_len > 0 => {
+            app.command_list.selected_idx = commands_len - 1;
+            update_list_scroll(app);
+            app.pending_man_load = true;
+            app.last_input_time = Instant::now();
+        }
         KeyCode::PageUp if commands_len > 0 => {
             app.command_list.selected_idx = app
                 .command_list
@@ -254,7 +291,11 @@ fn update_list_scroll(app: &mut AppState) {
     let visible_height = app.command_list.visible_range.1 - app.command_list.visible_range.0;
     let selected_idx = app.command_list.selected_idx;
 
-    if selected_idx < app.command_list.list_scroll {
+    if selected_idx == 0 {
+        app.command_list.list_scroll = 0;
+    } else if selected_idx == app.command_list.filtered_commands.len() - 1 {
+        app.command_list.list_scroll = selected_idx.saturating_sub(visible_height - 1);
+    } else if selected_idx < app.command_list.list_scroll {
         app.command_list.list_scroll = selected_idx;
     } else if selected_idx >= app.command_list.list_scroll + visible_height {
         app.command_list.list_scroll = selected_idx - visible_height + 1;
@@ -304,8 +345,16 @@ async fn load_current_page(app: &mut AppState) {
 
 fn handle_man_page_keys(app: &mut AppState, key: KeyEvent) {
     match key.code {
+        KeyCode::Char('f') => {
+            app.focus = Focus::Search;
+            app.search.query.clear();
+        }
         KeyCode::Up => app.man_page.scroll = app.man_page.scroll.saturating_sub(1),
         KeyCode::Down => app.man_page.scroll = app.man_page.scroll.saturating_add(1),
+        KeyCode::Home => app.man_page.scroll = 0,
+        KeyCode::End => {
+            app.man_page.scroll = app.man_page.content.len().saturating_sub(PAGE_SIZE)
+        }
         KeyCode::PageUp => app.man_page.scroll = app.man_page.scroll.saturating_sub(PAGE_SIZE),
         KeyCode::PageDown => {
             app.man_page.scroll = (app.man_page.scroll + PAGE_SIZE)
@@ -319,6 +368,8 @@ fn handle_man_page_keys(app: &mut AppState, key: KeyEvent) {
 
 fn handle_search_keys(app: &mut AppState, key: KeyEvent) {
     match key.code {
+        KeyCode::Char('j') => next_search_match(app),
+        KeyCode::Char('k') => prev_search_match(app),
         KeyCode::Enter => {
             update_search_matches(app);
             app.focus = Focus::ManPage;
@@ -396,7 +447,7 @@ fn render_ui<B: tui::backend::Backend>(f: &mut tui::Frame<B>, app: &mut AppState
                 Constraint::Length(3),
                 Constraint::Min(10),
             ]
-            .as_ref(),
+                .as_ref(),
         )
         .split(f.size());
 
@@ -412,18 +463,19 @@ fn render_status_bar<B: tui::backend::Backend>(f: &mut tui::Frame<B>, app: &AppS
     };
 
     let status = if app.loading {
-        format!("Loading {source_label}...")
+        format!("Loading {}...", source_label)
     } else {
         let x = &*format!(
-            "RTFM // {source_label} PAGE [Tab:Switch /:Search n/N:Next/Prev t:Toggle]"
+            "RTFM // {} PAGE [Tab:Switch /:Search t:Toggle Home/End]",
+            source_label
         );
         match app.focus {
-            Focus::CommandList => "RTFM // COMMAND LIST [Tab:Switch]",
+            Focus::CommandList => "RTFM // COMMAND LIST [Tab:Switch Home/End]",
             Focus::ManPage => x,
             Focus::Search => "RTFM // SEARCH MODE [Enter:Apply Esc:Cancel]",
         }
-        .parse()
-        .unwrap()
+            .parse()
+            .unwrap()
     };
 
     let status_bar = Paragraph::new(status)
@@ -503,7 +555,7 @@ fn render_command_list_items<B: tui::backend::Backend>(
         .iter()
         .map(|cmd| {
             let prefix = { "  " };
-            ListItem::new(format!("{prefix}{cmd}"))
+            ListItem::new(format!("{}{}", prefix, cmd))
         })
         .collect();
 
@@ -656,4 +708,4 @@ fn syntax_highlight(line: &str) -> Vec<Span> {
     }
 
     spans
-}
+}