feat(commands): allow to identify snapshots with "latest" or "latest~N" (N >= 0)

src/commands/check.rs

@@ -14,6 +14,8 @@ use rustic_core::CheckOptions;
 #[derive(clap::Parser, Command, Debug)]
 pub(crate) struct CheckCmd {
     /// Snapshots to check. If none is given, use filter options to filter from all snapshots
+    ///
+    /// Snapshots can be identified the following ways: "01a2b3c4" or "latest" or "latest~N" (N >= 0)
     #[clap(value_name = "ID")]
     ids: Vec<String>,
 

src/commands/copy.rs

@@ -18,7 +18,9 @@ use rustic_core::{CopySnapshot, Id, KeyOptions, repofile::SnapshotFile};
 /// `copy` subcommand
 #[derive(clap::Parser, Command, Default, Clone, Debug, Serialize, Deserialize, Merge)]
 pub struct CopyCmd {
-    /// Snapshots to copy. If none is given, use filter options to filter from all snapshots.
+    /// Snapshots to copy. If none is given, use filter options to filter from all snapshots
+    ///
+    /// Snapshots can be identified the following ways: "01a2b3c4" or "latest" or "latest~N" (N >= 0)
     #[clap(value_name = "ID")]
     #[serde(skip)]
     #[merge(skip)]
@@ -77,7 +79,7 @@ impl CopyCmd {
         let mut snapshots = if self.ids.is_empty() {
             get_filtered_snapshots(&repo)?
         } else {
-            repo.get_snapshots(&self.ids)?
+            repo.get_snapshots_from_strs(&self.ids, |sn| config.snapshot_filter.matches(sn))?
         };
         // sort for nicer output
         snapshots.sort_unstable();

src/commands/diff.rs

@@ -28,10 +28,14 @@ use crate::commands::tui;
 #[derive(clap::Parser, Command, Debug)]
 pub(crate) struct DiffCmd {
     /// Reference snapshot/path
+    ///
+    /// Snapshot can be identified the following ways: "01a2b3c4" or "latest" or "latest~N" (N >= 0)
     #[clap(value_name = "SNAPSHOT1[:PATH1]")]
     snap1: String,
 
     /// New snapshot/path (uses PATH2 = PATH1, if not given; uses local path if no snapshot is given)
+    ///
+    /// Snapshot can be identified the following ways: "01a2b3c4" or "latest" or "latest~N" (N >= 0)
     #[clap(value_name = "SNAPSHOT2[:PATH2]|PATH2", value_hint = ValueHint::AnyPath)]
     snap2: Option<String>,
 
@@ -83,7 +87,9 @@ impl DiffCmd {
         match (id1, id2) {
             (Some(id1), Some(id2)) => {
                 // diff between two snapshots
-                let snaps = repo.get_snapshots(&[id1, id2])?;
+                let snaps = repo.get_snapshots_from_strs(&[id1, id2], |sn| {
+                    config.snapshot_filter.matches(sn)
+                })?;
 
                 let snap1 = &snaps[0];
                 let snap2 = &snaps[1];

src/commands/dump.rs

@@ -26,6 +26,8 @@ use zip::{ZipWriter, write::SimpleFileOptions};
 #[derive(clap::Parser, Command, Debug)]
 pub(crate) struct DumpCmd {
     /// file from snapshot to dump
+    ///
+    /// Snapshot can be identified the following ways: "01a2b3c4" or "latest" or "latest~N" (N >= 0)
     #[clap(value_name = "SNAPSHOT[:PATH]")]
     snap: String,
 

src/commands/find.rs

@@ -37,6 +37,8 @@ pub(crate) struct FindCmd {
     path: Option<PathBuf>,
 
     /// Snapshots to search in. If none is given, use filter options to filter from all snapshots
+    ///
+    /// Snapshots can be identified the following ways: "01a2b3c4" or "latest" or "latest~N" (N >= 0)
     #[clap(value_name = "ID")]
     ids: Vec<String>,
 

src/commands/forget.rs

@@ -22,6 +22,8 @@ use rustic_core::{
 #[derive(clap::Parser, Command, Debug)]
 pub(super) struct ForgetCmd {
     /// Snapshots to forget. If none is given, use filter options to filter from all snapshots
+    ///
+    /// Snapshots can be identified the following ways: "01a2b3c4" or "latest" or "latest~N" (N >= 0)
     #[clap(value_name = "ID")]
     ids: Vec<String>,
 
@@ -127,7 +129,7 @@ impl ForgetCmd {
             let item = ForgetGroup {
                 group: SnapshotGroup::default(),
                 snapshots: repo
-                    .get_snapshots(&self.ids)?
+                    .get_snapshots_from_strs(&self.ids, |sn| config.snapshot_filter.matches(sn))?
                     .into_iter()
                     .map(|sn| {
                         if sn.must_keep(&now) {

src/commands/ls.rs

@@ -34,7 +34,9 @@ use constants::{S_IRGRP, S_IROTH, S_IRUSR, S_IWGRP, S_IWOTH, S_IWUSR, S_IXGRP, S
 /// `ls` subcommand
 #[derive(clap::Parser, Command, Debug)]
 pub(crate) struct LsCmd {
-    /// Snapshot/path to list
+    /// Snapshot:path to list
+    ///
+    /// The snapshot can be an id: "01a2b3c4" or "latest" or "latest~N" (N >= 0)
     #[clap(value_name = "SNAPSHOT[:PATH]")]
     snap: String,
 

src/commands/merge.rs

@@ -53,7 +53,7 @@ impl MergeCmd {
         let snapshots = if self.ids.is_empty() {
             get_filtered_snapshots(&repo)?
         } else {
-            repo.get_snapshots(&self.ids)?
+            repo.get_snapshots_from_strs(&self.ids, |sn| config.snapshot_filter.matches(sn))?
         };
 
         // Handle dry-run mode

src/commands/mount.rs

@@ -51,6 +51,8 @@ pub struct MountCmd {
     mount_point: Option<PathBuf>,
 
     /// Specify directly which snapshot/path to mount
+    ///
+    /// Snapshot can be identified the following ways: "01a2b3c4" or "latest" or "latest~N" (N >= 0)
     #[clap(value_name = "SNAPSHOT[:PATH]")]
     #[merge(strategy=conflate::option::overwrite_none)]
     snapshot_path: Option<String>,

src/commands/repair.rs

@@ -41,7 +41,9 @@ struct SnapSubCmd {
     #[clap(flatten)]
     opts: RepairSnapshotsOptions,
 
-    /// Snapshots to repair. If none is given, use filter to filter from all snapshots.
+    /// Snapshots to repair. If none is given, use filter to filter from all snapshots
+    ///
+    /// Snapshots can be identified the following ways: "01a2b3c4" or "latest" or "latest~N" (N >= 0)
     #[clap(value_name = "ID")]
     ids: Vec<String>,
 }
@@ -86,7 +88,7 @@ impl SnapSubCmd {
         let snaps = if self.ids.is_empty() {
             repo.get_all_snapshots()?
         } else {
-            repo.get_snapshots(&self.ids)?
+            repo.get_snapshots_from_strs(&self.ids, |_| true)?
         };
         repo.repair_snapshots(&self.opts, snaps, config.global.dry_run)?;
         Ok(())

src/commands/restore.rs

@@ -17,6 +17,8 @@ use crate::filtering::SnapshotFilter;
 #[derive(clap::Parser, Command, Debug)]
 pub(crate) struct RestoreCmd {
     /// Snapshot/path to restore
+    ///
+    /// Snapshot can be identified the following ways: "01a2b3c4" or "latest" or "latest~N" (N >= 0)
     #[clap(value_name = "SNAPSHOT[:PATH]")]
     snap: String,
 

src/commands/rewrite.rs

@@ -18,6 +18,8 @@ use rustic_core::{StringList, repofile::DeleteOption};
 #[derive(clap::Parser, Command, Debug, Default)]
 pub(crate) struct RewriteCmd {
     /// Snapshots to rewrite. If none is given, use filter to filter from all snapshots.
+    ///
+    /// Snapshot can be identified the following ways: "01a2b3c4" or "latest" or "latest~N" (N >= 0)
     #[clap(value_name = "ID")]
     pub ids: Vec<String>,
 
@@ -112,7 +114,7 @@ impl RewriteCmd {
         let snapshots = if self.ids.is_empty() {
             get_filtered_snapshots(&repo)?
         } else {
-            repo.get_snapshots(&self.ids)?
+            repo.get_snapshots_from_strs(&self.ids, |sn| config.snapshot_filter.matches(sn))?
         };
 
         let delete = match (

src/commands/snapshots.rs

@@ -1,4 +1,4 @@
-//! `smapshot` subcommand
+//! `snapshot` subcommand
 
 use crate::{
     Application, RUSTIC_APP,
@@ -27,6 +27,8 @@ use crate::commands::tui;
 #[derive(clap::Parser, Command, Debug)]
 pub(crate) struct SnapshotCmd {
     /// Snapshots to show. If none is given, use filter options to filter from all snapshots
+    ///
+    /// Snapshots can be identified the following ways: "01a2b3c4" or "latest" or "latest~N" (N >= 0)
     #[clap(value_name = "ID")]
     ids: Vec<String>,
 

src/commands/tag.rs

@@ -7,8 +7,9 @@ use crate::commands::rewrite::RewriteCmd;
 /// `tag` subcommand
 #[derive(clap::Parser, Command, Debug)]
 pub(crate) struct TagCmd {
-    /// Snapshots to change tags. If none is given, use filter to filter from all
-    /// snapshots.
+    /// Snapshots to change tags. If none is given, use filter to filter from all snapshots
+    ///
+    /// Snapshots can be identified the following ways: "01a2b3c4" or "latest" or "latest~N" (N >= 0)
     #[clap(value_name = "ID")]
     ids: Vec<String>,
 

src/commands/webdav.rs

@@ -50,6 +50,8 @@ pub struct WebDavCmd {
     file_access: Option<String>,
 
     /// Specify directly which snapshot/path to serve
+    ///
+    /// Snapshot can be identified the following ways: "01a2b3c4" or "latest" or "latest~N" (N >= 0)
     #[clap(value_name = "SNAPSHOT[:PATH]")]
     #[merge(strategy=conflate::option::overwrite_none)]
     snapshot_path: Option<String>,