dynamic columns; macro keydefs

src/view.rs

@@ -3,21 +3,63 @@ use tek_tui::ratatui::{style::{Color, Style}, prelude::Stylize};
 use pad::PadStr;
 use std::fmt::Display;
 
+pub struct Column<T> {
+    title: Arc<str>,
+    width: usize,
+    value: Box<dyn Fn(&T)->Option<Arc<str>> + Send + Sync>,
+}
+
+impl<T> Column<T> {
+    pub fn new (
+        title: &impl AsRef<str>,
+        width: usize,
+        value: impl Fn(&T)->Option<Arc<str>> + Send + Sync + 'static
+    ) -> Self {
+        Self { width, value: Box::new(value), title: title.as_ref().into() }
+    }
+}
+
+pub struct Columns<T>(pub Vec<Column<T>>);
+
+impl Default for Columns<Entry> {
+    fn default () -> Self {
+        Self(vec![
+            Column::new(&"HASH",    16, |entry: &Entry|entry.hash()),
+            Column::new(&"FILE",    80, |entry: &Entry|entry.name()),
+            Column::new(&"ARTIST",  30, |entry: &Entry|entry.artist()),
+            Column::new(&"RELEASE", 30, |entry: &Entry|entry.album()),
+            Column::new(&"TRACK",   5,  |entry: &Entry|entry.track()),
+            Column::new(&"TITLE",   80, |entry: &Entry|entry.title()),
+        ])
+    }
+}
+
+impl<T> Columns<T> {
+    pub fn header (&self) -> Arc<str> {
+        let mut output = String::new();
+        for Column { width, value, title } in self.0.iter() {
+            let cell = title.pad_to_width(*width);
+            output = format!("{output}{cell}│");
+        }
+        output.into()
+    }
+    pub fn row (&self, entry: &T) -> Arc<str> {
+        let mut output = String::new();
+        for Column { width, value, .. } in self.0.iter() {
+            let cell = value(entry).unwrap_or_default().pad_to_width(*width);
+            output = format!("{output}{cell}│");
+        }
+        output.into()
+    }
+}
+
 impl Content<TuiOut> for Taggart {
     fn content (&self) -> impl Render<TuiOut> {
         let sizer    = Fill::xy(&self.size);
         let size     = format!("{}x{}", self.size.w(), self.size.h());
         let size_bar = status_bar(Align::e(size));
-        let titlebar = status_bar(Align::w(table_row(
-            Some("HASH".into()),
-            "FILE",
-            Some("ARTIST".into()),
-            Some("RELEASE".into()),
-            "TRACK",
-            Some("TITLE".into())
-        )));
-        let table    = Fill::xy(TreeTable(self));
-        Bsp::n(size_bar, Bsp::s(titlebar, Bsp::b(sizer, table)))
+        let titlebar = status_bar(Align::w(self.columns.header()));
+        Bsp::n(size_bar, Bsp::s(titlebar, Bsp::b(sizer, Fill::xy(TreeTable(self)))))
     }
 }
 
@@ -28,8 +70,8 @@ impl<'a> Content<TuiOut> for TreeTable<'a> {
         let area = to.area();
         let Taggart { offset, paths, cursor, column, .. } = self.0;
         let mut x = 0;
-        for (index, _width) in COLUMN_WIDTHS.iter().enumerate() {
-            let w = COLUMN_WIDTHS[index] + 1;
+        for (index, Column { width, .. }) in self.0.columns.0.iter().enumerate() {
+            let w = *width as u16 + 1;
             if index == *column {
                 to.fill_bg([area.x() + x, area.y(), w, area.h()], Color::Rgb(0, 0, 0));
                 break
@@ -44,10 +86,8 @@ impl<'a> Content<TuiOut> for TreeTable<'a> {
                 for (index, fragment) in entry.path.iter().enumerate() {
                     if index == entry.depth - 1 {
                         let cursor = if selected { ">" } else { " " };
-                        let icon   = entry.icon();
-                        let style  = entry.style();
-                        let label  = entry.label(icon, &fragment.display());
-                        to.blit(&label, area.x(), y, style);
+                        let label  = self.0.columns.row(&entry);
+                        to.blit(&label, area.x(), y, entry.style());
                         if selected {
                             let fill = [area.x(), y, area.w(), 1];
                             to.fill_fg(fill, Color::Rgb(0, 0, 0));
@@ -63,6 +103,12 @@ impl<'a> Content<TuiOut> for TreeTable<'a> {
 }
 
 impl Entry {
+    pub fn name (&self) -> Option<Arc<str>> {
+        let indent = "".pad_to_width((self.depth - 1) * 2);
+        let icon   = self.icon();
+        let name   = self.path.iter().last().expect("empty path").display();
+        Some(format!("{indent}{icon} {name}").into())
+    }
     fn icon (&self) -> &'static str {
         if self.is_dir() {
             "" //"+"
@@ -81,34 +127,6 @@ impl Entry {
             Some(Style::default().bold())
         }
     }
-    fn label (&self, icon: &str, name: &impl Display) -> String {
-        let indent = "".pad_to_width((self.depth - 1) * 2);
-        table_row(
-            self.hash(),
-            &format!("{indent}{icon} {name}"),
-            self.artist(),
-            self.album(),
-            "",
-            self.title()
-        )
-    }
-}
-
-fn table_row (
-    hash:   Option<Arc<str>>,
-    label:  &str,
-    artist: Option<Arc<str>>,
-    album:  Option<Arc<str>>,
-    track:  &str,
-    title:  Option<Arc<str>>,
-) -> String {
-    let hash   = hash.unwrap_or_default().pad_to_width(COLUMN_WIDTHS[0] as usize);
-    let label  = label.pad_to_width(COLUMN_WIDTHS[1] as usize);
-    let artist = artist.unwrap_or_default().pad_to_width(COLUMN_WIDTHS[2] as usize);
-    let album  = album.unwrap_or_default().pad_to_width(COLUMN_WIDTHS[3] as usize);
-    let track  = track.pad_to_width(COLUMN_WIDTHS[4] as usize);
-    let title  = title.unwrap_or_default().pad_to_width(COLUMN_WIDTHS[5] as usize);
-    format!("{hash}│{label}│{artist}╎{album}╎{track}╎{title}")
 }
 
 fn status_bar (content: impl Content<TuiOut>) -> impl Content<TuiOut> {