The first display of paths to be deleted!

Still no way to show that one is contained in others... probably not needed right now... .
Byron · Jun 6, 2019 · b79b1ae · b79b1ae
1 parent f54a5aa
commit b79b1ae
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 7 deletions.
diff --git a/src/interactive/app/eventloop.rs b/src/interactive/app/eventloop.rs
@@ -29,6 +29,7 @@ impl Default for FocussedPane {
 pub type EntryMarkMap = BTreeMap<TreeIndex, EntryMark>;
 pub struct EntryMark {
     pub size: u64,
+    pub path: PathBuf,
 }
 
 #[derive(Default)]

diff --git a/src/interactive/app/handlers.rs b/src/interactive/app/handlers.rs
@@ -136,9 +136,13 @@ impl TerminalApp {
                 self.state.marked.remove(&index);
             } else {
                 if let Some(e) = self.state.entries.iter().find(|e| e.index == index) {
-                    self.state
-                        .marked
-                        .insert(index, EntryMark { size: e.data.size });
+                    self.state.marked.insert(
+                        index,
+                        EntryMark {
+                            size: e.data.size,
+                            path: path_of(&self.traversal.tree, index),
+                        },
+                    );
                 }
             }
             if self.state.marked.is_empty() {

diff --git a/src/interactive/widgets/entries.rs b/src/interactive/widgets/entries.rs
@@ -166,8 +166,7 @@ impl Entries {
                         ..style
                     },
                 );
-                let column_segments = vec![bytes, percentage, name];
-                column_segments
+                vec![bytes, percentage, name]
             },
         );
 

diff --git a/src/interactive/widgets/mark.rs b/src/interactive/widgets/mark.rs
@@ -2,7 +2,10 @@ use crate::interactive::EntryMarkMap;
 use dua::traverse::TreeIndex;
 use itertools::Itertools;
 use std::borrow::Borrow;
-use tui::{buffer::Buffer, layout::Rect, style::Style, widgets::Block, widgets::Borders};
+use tui::{
+    buffer::Buffer, layout::Rect, style::Color, style::Style, widgets::Block, widgets::Borders,
+    widgets::Text,
+};
 use tui_react::{List, ListProps};
 
 #[derive(Default)]
@@ -41,10 +44,21 @@ impl MarkPane {
                 .map(|(pos, _)| pos)
         });
 
+        let entries = marked.iter().map(|(_, v)| {
+            let name = Text::Styled(
+                v.path.to_string_lossy(),
+                Style {
+                    fg: Color::LightRed,
+                    ..Style::default()
+                },
+            );
+            vec![name]
+        });
+
         let props = ListProps {
             block: Some(block),
             entry_in_view,
         };
-        self.list.render(props, vec![], area, buf)
+        self.list.render(props, entries, area, buf)
     }
 }