feat: allow moving multiple items to top

dhth · dhth · commit fb09705aa491 · 2024-12-19T22:24:41.000+01:00
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -24,3 +24,5 @@ jobs:
         uses: dtolnay/rust-toolchain@stable
       - name: Build
         run: cargo build
+      - name: Test
+        run: cargo test
diff --git a/src/common.rs b/src/common.rs
@@ -2,6 +2,7 @@ use ratatui::style::Color;
 
 pub const TITLE_FG_COLOR: Color = Color::from_u32(0x282828);
 pub const PRIMARY_COLOR: Color = Color::from_u32(0xd3869b);
+pub const SELECTED_COLOR: Color = Color::from_u32(0x83a598);
 pub const TITLE: &str = " shfl ";
 pub const UNEXPECTED_ERROR_MESSAGE: &str =
     "something unexpected happened, please let @dhth know via https://github.com/dhth/shfl/issues";
diff --git a/src/main.rs b/src/main.rs
@@ -7,8 +7,8 @@ mod view;
 
 use anyhow::Context;
 use clap::Parser;
-use common::{View, UNEXPECTED_ERROR_MESSAGE};
-use model::{Lines, Model, RunningState, UserMessage};
+use common::UNEXPECTED_ERROR_MESSAGE;
+use model::{Model, RunningState, UserMessage};
 use std::fs::File;
 use update::{handle_event, update};
 use utils::read_from_file;
@@ -42,14 +42,7 @@ fn main() -> anyhow::Result<()> {
     let mut terminal = ratatui::init();
     terminal.clear().context(UNEXPECTED_ERROR_MESSAGE)?;
 
-    let mut model = Model {
-        view: View::List,
-        running_state: RunningState::Running,
-        file_path: args.path,
-        lines: Lines::from(&lines),
-        message: None,
-        save_on_exit: args.save_on_exit,
-    };
+    let mut model = Model::default(args.path, &lines, args.save_on_exit);
 
     while model.running_state != RunningState::Done {
         terminal
diff --git a/src/message.rs b/src/message.rs
@@ -9,7 +9,7 @@ pub(crate) enum Message {
     GoToLastItem,
     SwitchWithNextItem,
     SwitchWithPreviousItem,
-    SwitchWithFirstItem,
+    MoveToTop,
     ToggleSelection,
     SaveSelection,
     ShowView(View),
diff --git a/src/model.rs b/src/model.rs
@@ -1,5 +1,6 @@
-use crate::common::{View, PRIMARY_COLOR};
+use crate::common::{View, SELECTED_COLOR};
 use ratatui::{
+    style::Style,
     text::Line,
     widgets::{ListItem, ListState},
 };
@@ -10,23 +11,38 @@ pub(crate) struct Model {
     pub(crate) running_state: RunningState,
     pub(crate) file_path: String,
     pub(crate) lines: Lines,
+    pub(crate) selected_count: usize,
     pub(crate) message: Option<UserMessage>,
     pub(crate) save_on_exit: bool,
 }
 
+impl Model {
+    pub(crate) fn default(file_path: String, lines: &Vec<String>, save_on_exit: bool) -> Self {
+        Self {
+            view: View::List,
+            running_state: RunningState::Running,
+            file_path,
+            lines: Lines::from(lines),
+            selected_count: 0,
+            message: None,
+            save_on_exit,
+        }
+    }
+}
+
 #[derive(Debug)]
 pub(crate) struct Lines {
     pub(crate) items: Vec<LineItem>,
     pub(crate) state: ListState,
 }
 
-#[derive(Debug)]
+#[derive(Debug, Clone)]
 pub(crate) struct LineItem {
     pub(crate) content: String,
     pub(crate) status: Selected,
 }
 
-#[derive(Debug)]
+#[derive(Debug, Clone, PartialEq)]
 pub(crate) enum Selected {
     Yes,
     No,
@@ -74,10 +90,16 @@ impl LineItem {
         }
     }
 
-    pub(crate) fn toggle(&mut self) {
+    pub(crate) fn toggle(&mut self) -> bool {
         match self.status {
-            Selected::Yes => self.status = Selected::No,
-            Selected::No => self.status = Selected::Yes,
+            Selected::Yes => {
+                self.status = Selected::No;
+                false
+            }
+            Selected::No => {
+                self.status = Selected::Yes;
+                true
+            }
         }
     }
 }
@@ -86,7 +108,10 @@ impl From<&LineItem> for ListItem<'_> {
     fn from(value: &LineItem) -> Self {
         let line = match value.status {
             Selected::No => Line::from(value.content.clone()),
-            Selected::Yes => Line::styled(value.content.clone(), PRIMARY_COLOR),
+            Selected::Yes => Line::styled(
+                format!("> {}", value.content.clone()),
+                Style::new().fg(SELECTED_COLOR),
+            ),
         };
         ListItem::new(line)
     }
diff --git a/src/static/help.txt b/src/static/help.txt
@@ -6,12 +6,13 @@ Keymaps
 
 J                    move item one position below
 K                    move item one position above
-Enter                move item to the start of the list
+Enter                move item/selection to the start of the list
 j / Down             go down
-k | Up               go up
+k / Up               go up
 [1-9]                move current item to index in list
 g                    go to the start of the list
 G                    go to the end of the list
 w                    write to file
+space / s            select/unselect item
 ?                    show/hide help view
-Esc / q              go back/exit
+Esc / q              go back/reset selection/exit
diff --git a/src/update.rs b/src/update.rs
