refactor: remove archive mode

Author: ynqa

README.md

@@ -28,8 +28,8 @@ Interactive grep
     and it is possible to switch to a mode
     where you can grep through these N entries
     based on key inputs at any given moment.
-  - Additionally, by starting in this mode,
-    it is also possible to grep through static data such as files.
+  - For static data such as files, *sig* automatically switches
+    to archived mode when the input reaches EOF.
     - like [ugrep](https://github.com/Genivia/ugrep) with `-Q` option.
 
 ## Installation
@@ -76,7 +76,7 @@ nix shell github:ynqa/sig
 
 Or run it directly:
 ```nix
-cat README.md | nix run github:ynqa/sig -- --archived
+cat README.md | nix run github:ynqa/sig
 ```
 
 ### Nix (classic)
@@ -109,12 +109,9 @@ stern --context kind-kind etcd |& sig
 sig --cmd "stern --context kind-kind etcd" # this is able to retry command by ctrl+r.
 ```
 
-### Archived mode
-
+Static input (switches to archived view after EOF):
 ```bash
-cat README.md |& sig -a
-# or
-sig -a --cmd "cat README.md"
+cat README.md |& sig
 ```
 
 ## Keymap
@@ -156,10 +153,8 @@ $ stern --context kind-kind etcd |& sig
 Or the method to retry command by pressing ctrl+r:
 $ sig --cmd "stern --context kind-kind etcd"
 
-Archived mode:
-$ cat README.md |& sig -a
-Or
-$ sig -a --cmd "cat README.md"
+Static input (switches to archived view after EOF):
+$ cat README.md |& sig
 
 Options:
       --retrieval-timeout <RETRIEVAL_TIMEOUT_MILLIS>
@@ -168,8 +163,6 @@ Options:
           Interval to render a line in milliseconds.
   -q, --queue-capacity <QUEUE_CAPACITY>
           Queue capacity to store lines. [default: 1000]
-  -a, --archived
-          Archived mode to grep through static data.
   -i, --ignore-case
           Case insensitive search.
       --cmd <CMD>

src/main.rs

@@ -1,10 +1,7 @@
-use std::{collections::VecDeque, io};
+use std::io;
 
 use clap::Parser;
-use tokio::{
-    sync::mpsc,
-    time::{timeout, Duration},
-};
+use tokio::time::Duration;
 
 use promkit_core::crossterm::{
     self, cursor,
@@ -47,10 +44,8 @@ $ stern --context kind-kind etcd |& sig
 Or the method to retry command by pressing ctrl+r:
 $ sig --cmd \"stern --context kind-kind etcd\"
 
-Archived mode:
-$ cat README.md |& sig -a
-Or
-$ sig -a --cmd \"cat README.md\"
+Static input (switches to archived view after EOF):
+$ cat README.md |& sig
 
 Options:
 {options}
@@ -86,14 +81,6 @@ pub struct Args {
     )]
     pub queue_capacity: usize,
 
-    #[arg(
-        short = 'a',
-        long = "archived",
-        default_value = "false",
-        help = "Archived mode to grep through static data."
-    )]
-    pub archived: bool,
-
     #[arg(
         short = 'i',
         long = "ignore-case",
@@ -139,149 +126,78 @@ async fn main() -> anyhow::Result<()> {
         ..Default::default()
     };
 
-    if args.archived {
-        let (tx, mut rx) = mpsc::channel(1);
-
-        let input_task = match &args.cmd {
-            Some(cmd) => spawn::spawn_cmd_result_sender(
-                cmd,
-                tx,
-                Duration::from_millis(args.retrieval_timeout_millis),
-            ),
-            None => {
-                spawn::spawn_stdin_sender(tx, Duration::from_millis(args.retrieval_timeout_millis))
-            }
-        }?;
-
-        let mut queue = VecDeque::with_capacity(args.queue_capacity);
-        loop {
-            match timeout(
-                Duration::from_millis(args.retrieval_timeout_millis),
-                rx.recv(),
-            )
-            .await
-            {
-                Ok(Some(line)) => {
-                    if queue.len() > args.queue_capacity {
-                        queue.pop_front().unwrap();
-                    }
-                    queue.push_back(line.clone());
-                }
-                Ok(None) => break,
-                Err(_) => break,
-            }
-        }
-
-        // Stop the input task
-        input_task.handle.abort();
-
+    while let Ok((signal, queue)) = sig::run(
+        text_editor::State {
+            texteditor: TextEditor::new(args.query.clone().unwrap_or_default()),
+            prefix: String::from("❯❯ "),
+            prefix_style: ContentStyle {
+                foreground_color: Some(Color::DarkGreen),
+                ..Default::default()
+            },
+            active_char_style: ContentStyle {
+                background_color: Some(Color::DarkCyan),
+                ..Default::default()
+            },
+            ..Default::default()
+        },
+        highlight_style,
+        Duration::from_millis(args.retrieval_timeout_millis),
+        args.render_interval_millis.map(Duration::from_millis),
+        args.queue_capacity,
+        args.case_insensitive,
+        args.cmd.clone(),
+    )
+    .await
+    {
         crossterm::execute!(
             io::stdout(),
             crossterm::terminal::Clear(crossterm::terminal::ClearType::All),
             cursor::MoveTo(0, 0),
         )?;
 
-        archived::run(
-            text_editor::State {
-                texteditor: TextEditor::new(args.query.clone().unwrap_or_default()),
-                prefix: String::from("❯❯❯ "),
-                prefix_style: ContentStyle {
-                    foreground_color: Some(Color::DarkBlue),
-                    ..Default::default()
-                },
-                active_char_style: ContentStyle {
-                    background_color: Some(Color::DarkCyan),
-                    ..Default::default()
-                },
-                ..Default::default()
-            },
-            listbox::State {
-                listbox: listbox::Listbox::from_displayable(queue),
-                cursor: String::from("❯ "),
-                active_item_style: None,
-                inactive_item_style: None,
-                lines: Default::default(),
-            },
-            highlight_style,
-            args.case_insensitive,
-            // In archived mode, command for retry is meaningless.
-            None,
-        )
-        .await?;
-    } else {
-        while let Ok((signal, queue)) = sig::run(
-            text_editor::State {
-                texteditor: TextEditor::new(args.query.clone().unwrap_or_default()),
-                prefix: String::from("❯❯ "),
-                prefix_style: ContentStyle {
-                    foreground_color: Some(Color::DarkGreen),
-                    ..Default::default()
-                },
-                active_char_style: ContentStyle {
-                    background_color: Some(Color::DarkCyan),
-                    ..Default::default()
-                },
-                ..Default::default()
-            },
-            highlight_style,
-            Duration::from_millis(args.retrieval_timeout_millis),
-            args.render_interval_millis.map(Duration::from_millis),
-            args.queue_capacity,
-            args.case_insensitive,
-            args.cmd.clone(),
-        )
-        .await
-        {
-            crossterm::execute!(
-                io::stdout(),
-                crossterm::terminal::Clear(crossterm::terminal::ClearType::All),
-                cursor::MoveTo(0, 0),
-            )?;
-
-            match signal {
-                Signal::GotoArchived => {
-                    archived::run(
-                        text_editor::State {
-                            prefix: String::from("❯❯❯ "),
-                            prefix_style: ContentStyle {
-                                foreground_color: Some(Color::DarkBlue),
-                                ..Default::default()
-                            },
-                            active_char_style: ContentStyle {
-                                background_color: Some(Color::DarkCyan),
-                                ..Default::default()
-                            },
+        match signal {
+            Signal::GotoArchived => {
+                archived::run(
+                    text_editor::State {
+                        prefix: String::from("❯❯❯ "),
+                        prefix_style: ContentStyle {
+                            foreground_color: Some(Color::DarkBlue),
                             ..Default::default()
                         },
-                        listbox::State {
-                            listbox: listbox::Listbox::from_displayable(queue),
-                            cursor: String::from("❯ "),
-                            active_item_style: None,
-                            inactive_item_style: None,
-                            lines: Default::default(),
+                        active_char_style: ContentStyle {
+                            background_color: Some(Color::DarkCyan),
+                            ..Default::default()
                         },
-                        highlight_style,
-                        args.case_insensitive,
-                        args.cmd.clone(),
-                    )
-                    .await?;
-
-                    // Re-enable raw mode and hide the cursor again here
-                    // because they are disabled and shown, respectively, by promkit.
-                    enable_raw_mode()?;
-                    execute!(io::stdout(), EnableMouseCapture, cursor::Hide)?;
-
-                    crossterm::execute!(
-                        io::stdout(),
-                        crossterm::terminal::Clear(crossterm::terminal::ClearType::All),
-                        cursor::MoveTo(0, 0),
-                    )?;
-                }
-                Signal::GotoStreaming => {
-                    continue;
-                }
-                _ => {}
+                        ..Default::default()
+                    },
+                    listbox::State {
+                        listbox: listbox::Listbox::from_displayable(queue),
+                        cursor: String::from("❯ "),
+                        active_item_style: None,
+                        inactive_item_style: None,
+                        lines: Default::default(),
+                    },
+                    highlight_style,
+                    args.case_insensitive,
+                    args.cmd.clone(),
+                )
+                .await?;
+
+                // Re-enable raw mode and hide the cursor again here
+                // because they are disabled and shown, respectively, by promkit.
+                enable_raw_mode()?;
+                execute!(io::stdout(), EnableMouseCapture, cursor::Hide)?;
+
+                crossterm::execute!(
+                    io::stdout(),
+                    crossterm::terminal::Clear(crossterm::terminal::ClearType::All),
+                    cursor::MoveTo(0, 0),
+                )?;
+            }
+            Signal::GotoStreaming => {
+                continue;
             }
+            _ => {}
         }
     }
 

src/sig.rs

@@ -183,21 +183,29 @@ pub async fn run(
         Ok(queue)
     });
 
-    let mut signal: Signal;
-    loop {
+    let signal = loop {
+        // Treat an exhausted input source as archived data.
+        if keeping.is_finished() {
+            break Signal::GotoArchived;
+        }
+
+        if !event::poll(retrieval_timeout)? {
+            continue;
+        }
+
         let event = event::read()?;
         let mut text_editor = shared_text_editor.write().await;
-        signal = evaluate_event(&event, &mut text_editor, cmd.clone())?;
+        let signal = evaluate_event(&event, &mut text_editor, cmd.clone())?;
         if signal == Signal::GotoArchived || signal == Signal::GotoStreaming {
-            break;
+            break signal;
         }
 
         let size = crossterm::terminal::size()?;
         let pane = text_editor.create_pane(size.0, size.1);
         let mut term = shared_term.write().await;
         term.sync_layout(size, Terminal::pane_rows(size, &pane))?;
         term.draw_pane(&pane)?;
-    }
+    };
 
     if let Some(mut child) = input_task.child {
         let _ = child.kill().await;

src/spawn.rs

@@ -70,30 +70,43 @@ pub fn spawn_cmd_result_sender(
 
     Ok(InputTask {
         handle: tokio::spawn(async move {
+            let mut stdout_closed = false;
+            let mut stderr_closed = false;
+
             loop {
+                if stdout_closed && stderr_closed {
+                    break;
+                }
+
                 tokio::select! {
-                    stdout_res = timeout(retrieval_timeout, stdout_reader.next_line()) => {
+                    stdout_res = timeout(retrieval_timeout, stdout_reader.next_line()), if !stdout_closed => {
                         match stdout_res {
                             Ok(Ok(Some(line))) => {
                                 let escaped = strip_ansi_escapes::strip_str(line.replace(['\n', '\t'], " "));
                                 tx.send(escaped).await?;
                             },
-                            // Don't break on stdout end, continue to read stderr (maybe)
-                            _ => continue,
+                            Ok(Ok(None)) => stdout_closed = true,
+                            Ok(Err(err)) => return Err(err.into()),
+                            // ignore timeout and continue
+                            Err(_) => continue,
                         }
                     },
-                    stderr_res = timeout(retrieval_timeout, stderr_reader.next_line()) => {
+                    stderr_res = timeout(retrieval_timeout, stderr_reader.next_line()), if !stderr_closed => {
                         match stderr_res {
                             Ok(Ok(Some(line))) => {
                                 let escaped = strip_ansi_escapes::strip_str(line.replace(['\n', '\t'], " "));
                                 tx.send(escaped).await?;
                             },
-                            // Don't break on stdout end, continue to read stdout (maybe)
-                            _ => continue,
+                            Ok(Ok(None)) => stderr_closed = true,
+                            Ok(Err(err)) => return Err(err.into()),
+                            // ignore timeout and continue
+                            Err(_) => continue,
                         }
                     }
                 }
             }
+
+            Ok(())
         }),
         child: Some(child),
     })