Added --depth and --short to sdf status for more concise summaries.

 - New friendlier, concise status options. First, --depth merges statuses
   by a certain level of directory depth. Second, --short is --depth 2
   plus an even more concise message per directory.

 - Fixed issue where file names were not being sorted lexicographically
   when displayed with sdf status.

 - Option --no-color added.

 - Time sorting (-t/--time) and reversed order (-r/--remote) added
   to sdf status.

 - Some refactor of code into src/lib/status.rs.

 - Fixed bug with total counts.

CITATION.cff

@@ -5,7 +5,7 @@ authors:
   given-names: "Vince"
   orcid: "https://orcid.org/0000-0003-4510-1609"
 title: "SciDataFlow: A Tool for Improving the Flow of Data through Science"
-version: 0.8.11
+version: 0.8.12
 doi: http://dx.doi.org/10.1093/bioinformatics/btad754
 date-released: 2024-01-05
 url: "https://github.com/vsbuffalo/scidataflow/"

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "scidataflow"
-version = "0.8.11"
+version = "0.8.12"
 edition = "2021"
 exclude = ["logo.png", "tests/test_data/**"]
 license = "MIT"

src/lib.rs

@@ -11,6 +11,7 @@ pub mod lib {
     pub mod progress;
     pub mod project;
     pub mod remote;
+    pub mod status;
     pub mod test_utilities;
     pub mod utils;
 }

src/lib/project.rs

@@ -21,6 +21,7 @@ use crate::lib::utils::{load_file, pluralize, print_status};
 #[allow(unused_imports)]
 use crate::{print_info, print_warn};
 
+use super::status::StatusDisplayOptions;
 use super::utils::is_directory;
 
 const MANIFEST: &str = "data_manifest.yml";
@@ -309,13 +310,16 @@ impl Project {
         self.save()
     }
 
-    pub async fn status(&mut self, include_remotes: bool, all: bool) -> Result<()> {
+    pub async fn status(&mut self, display_options: &StatusDisplayOptions) -> Result<()> {
         // if include_remotes (e.g. --remotes) is set, we need to merge
         // in the remotes, so we authenticate first and then get them.
         let path_context = &canonicalize(self.path_context())?;
-        let status_rows = self.data.status(path_context, include_remotes).await?;
-        //let remotes: Option<_> = include_remotes.then(|| &self.data.remotes);
-        print_status(status_rows, Some(&self.data.remotes), all);
+        let status_rows = self
+            .data
+            .status(path_context, display_options.remotes)
+            .await?;
+
+        print_status(status_rows, Some(&self.data.remotes), display_options);
         Ok(())
     }
 

src/lib/status.rs

@@ -0,0 +1,47 @@
+use clap::Parser;
+
+/// Status display options
+#[derive(Parser, Debug)]
+pub struct StatusDisplayOptions {
+    /// Show remotes status (requires network).
+    #[arg(short = 'm', long)]
+    pub remotes: bool,
+
+    /// Show statuses of all files, including those on remote(s)
+    /// but not in the manifest.
+    #[arg(short, long)]
+    pub all: bool,
+
+    /// Don't print status with terminal colors.
+    #[arg(long)]
+    pub no_color: bool,
+
+    /// A more terse summary, with --depth 2.
+    #[arg(short, long)]
+    pub short: bool,
+
+    /// Depth to summarize over.
+    #[arg(short, long)]
+    depth: Option<usize>,
+
+    /// Sort by time, showing the most recently modified files at
+    /// the top.
+    #[arg(short, long)]
+    pub time: bool,
+
+    /// Reverse file order (if --time set, will show the files
+    /// with the oldest modification time at the top; otherwise
+    /// it will list files in reverse lexicographic order).
+    #[arg(short, long)]
+    pub reverse: bool,
+}
+
+impl StatusDisplayOptions {
+    pub fn get_depth(&self) -> Option<usize> {
+        if self.short {
+            // --short includes
+            return Some(2);
+        }
+        self.depth
+    }
+}