Add unix permissions

README.md

@@ -160,7 +160,7 @@ The current data format (called "0.6") will be readable by future releases for a
 
 Be aware Conserve is developed as a part-time non-commercial project and there's no guarantee of support or reliability. Bug reports are welcome but I cannot promise they will receive a resolution within any particular time frame.
 
-As of October 2022 I am primarily spending my open-souce time on [cargo-mutants](https://github.com/sourcefrog/cargo-mutants). When that is feature complete, which is anticipated by early-mid 2023, I will likely come back to working more on Conserve.
+As of October 2022 I am primarily spending my open-source time on [cargo-mutants](https://github.com/sourcefrog/cargo-mutants). When that is feature complete, which is anticipated by early-mid 2023, I will likely come back to working more on Conserve.
 
 There is still room for several performance improvements and features. See the [issue tracker][issues] for a list.
 

src/backup.rs

@@ -35,6 +35,9 @@ pub struct BackupOptions {
     /// Exclude these globs from the backup.
     pub exclude: Exclude,
 
+    /// If printing filenames, include metadata such as file permissions
+    pub long_listing: bool,
+
     pub max_entries_per_hunk: usize,
 }
 
@@ -44,6 +47,7 @@ impl Default for BackupOptions {
             print_filenames: false,
             exclude: Exclude::nothing(),
             max_entries_per_hunk: crate::index::MAX_ENTRIES_PER_HUNK,
+            long_listing: false,
         }
     }
 }
@@ -117,7 +121,17 @@ pub fn backup(
                 }
                 Ok(Some(diff_kind)) => {
                     if options.print_filenames && diff_kind != DiffKind::Unchanged {
-                        writeln!(view, "{} {}", diff_kind.as_sigil(), entry.apath())?;
+                        if options.long_listing {
+                            writeln!(
+                                view,
+                                "{} {} {}",
+                                diff_kind.as_sigil(),
+                                entry.umode(),
+                                entry.apath()
+                            )?;
+                        } else {
+                            writeln!(view, "{} {}", diff_kind.as_sigil(), entry.apath())?;
+                        }
                     }
                     view.update(|model| match diff_kind {
                         DiffKind::Changed => model.entries_changed += 1,

src/bin/conserve.rs

@@ -61,6 +61,8 @@ enum Command {
         exclude_from: Vec<String>,
         #[clap(long)]
         no_stats: bool,
+        #[clap(long, short = 'l')]
+        long_listing: bool,
     },
 
     #[clap(subcommand)]
@@ -134,6 +136,9 @@ enum Command {
         exclude: Vec<String>,
         #[clap(long, short = 'E', number_of_values = 1)]
         exclude_from: Vec<String>,
+
+        #[clap(short = 'l')]
+        long_listing: bool,
     },
 
     /// Copy a stored tree to a restore directory.
@@ -154,6 +159,8 @@ enum Command {
         only_subtree: Option<Apath>,
         #[clap(long)]
         no_stats: bool,
+        #[clap(long, short = 'l')]
+        long_listing: bool,
     },
 
     /// Show the total size of files in a stored tree or source directory, with exclusions.
@@ -259,12 +266,14 @@ impl Command {
                 exclude,
                 exclude_from,
                 no_stats,
+                long_listing,
             } => {
                 let exclude = ExcludeBuilder::from_args(exclude, exclude_from)?.build()?;
                 let source = &LiveTree::open(source)?;
                 let options = BackupOptions {
                     print_filenames: *verbose,
                     exclude,
+                    long_listing: *long_listing,
                     ..Default::default()
                 };
                 let stats = backup(&Archive::open(open_transport(archive)?)?, source, &options)?;
@@ -359,6 +368,7 @@ impl Command {
                 stos,
                 exclude,
                 exclude_from,
+                long_listing,
             } => {
                 let exclude = ExcludeBuilder::from_args(exclude, exclude_from)?.build()?;
                 if let Some(archive) = &stos.archive {
@@ -367,12 +377,14 @@ impl Command {
                         stored_tree_from_opt(archive, &stos.backup)?
                             .iter_entries(Apath::root(), exclude)?,
                         &mut stdout,
+                        *long_listing,
                     )?;
                 } else {
                     show::show_entry_names(
                         LiveTree::open(stos.source.clone().unwrap())?
                             .iter_entries(Apath::root(), exclude)?,
                         &mut stdout,
+                        *long_listing,
                     )?;
                 }
             }
@@ -386,6 +398,7 @@ impl Command {
                 exclude_from,
                 only_subtree,
                 no_stats,
+                long_listing,
             } => {
                 let band_selection = band_selection_policy_from_opt(backup);
                 let archive = Archive::open(open_transport(archive)?)?;
@@ -396,6 +409,7 @@ impl Command {
                     only_subtree: only_subtree.clone(),
                     band_selection,
                     overwrite: *force_overwrite,
+                    long_listing: *long_listing,
                 };
 
                 let stats = restore(&archive, destination, &options)?;

src/entry.rs

@@ -17,6 +17,7 @@
 use std::fmt::Debug;
 
 use crate::kind::Kind;
+use crate::unix_mode::UnixMode;
 use crate::unix_time::UnixTime;
 use crate::*;
 
@@ -26,12 +27,14 @@ pub trait Entry: Debug + Eq + PartialEq {
     fn mtime(&self) -> UnixTime;
     fn size(&self) -> Option<u64>;
     fn symlink_target(&self) -> &Option<String>;
+    fn umode(&self) -> UnixMode;
 
     /// True if the metadata supports an assumption the file contents have
     /// not changed.
     fn is_unchanged_from<O: Entry>(&self, basis_entry: &O) -> bool {
         basis_entry.kind() == self.kind()
             && basis_entry.mtime() == self.mtime()
             && basis_entry.size() == self.size()
+            && basis_entry.umode() == self.umode()
     }
 }

src/index.rs

@@ -25,6 +25,7 @@ use crate::kind::Kind;
 use crate::stats::{IndexReadStats, IndexWriterStats};
 use crate::transport::local::LocalTransport;
 use crate::transport::Transport;
+use crate::unix_mode::UnixMode;
 use crate::unix_time::UnixTime;
 use crate::*;
 
@@ -49,6 +50,10 @@ pub struct IndexEntry {
     #[serde(default)]
     pub mtime: i64,
 
+    /// Discretionary Access Control permissions (such as read/write/execute on unix)
+    #[serde(default)]
+    pub umode: UnixMode,
+
     /// Fractional nanoseconds for modification time.
     ///
     /// This is zero in indexes written prior to 0.6.2, but treating it as
@@ -103,6 +108,10 @@ impl Entry for IndexEntry {
     fn symlink_target(&self) -> &Option<String> {
         &self.target
     }
+
+    fn umode(&self) -> UnixMode {
+        self.umode
+    }
 }
 
 impl IndexEntry {
@@ -120,6 +129,7 @@ impl IndexEntry {
             target: source.symlink_target().clone(),
             mtime: mtime.secs,
             mtime_nanos: mtime.nanosecs,
+            umode: source.umode(),
         }
     }
 }
@@ -511,6 +521,7 @@ mod tests {
             kind: Kind::File,
             addrs: vec![],
             target: None,
+            umode: UnixMode::default(),
         }
     }
 
@@ -523,14 +534,16 @@ mod tests {
             kind: Kind::File,
             addrs: vec![],
             target: None,
+            umode: UnixMode::default(),
         }];
         let index_json = serde_json::to_string(&entries).unwrap();
         println!("{}", index_json);
         assert_eq!(
             index_json,
             "[{\"apath\":\"/a/b\",\
              \"kind\":\"File\",\
-             \"mtime\":1461736377}]"
+             \"mtime\":1461736377,\
+             \"umode\":{\"mode\":33277}}]"
         );
     }
 
@@ -585,7 +598,7 @@ mod tests {
         assert_eq!(stats.index_hunks, 1);
         assert!(stats.compressed_index_bytes > 30);
         assert!(
-            stats.compressed_index_bytes < 70,
+            stats.compressed_index_bytes <= 90,
             "expected shorter compressed index: {}",
             stats.compressed_index_bytes
         );

src/lib.rs

@@ -43,6 +43,7 @@ pub mod test_fixtures;
 pub mod transport;
 mod tree;
 pub mod ui;
+mod unix_mode;
 pub mod unix_time;
 mod validate;
 

src/live_tree.rs

@@ -19,6 +19,7 @@ use std::io::ErrorKind;
 use std::path::{Path, PathBuf};
 
 use crate::stats::LiveTreeIterStats;
+use crate::unix_mode::UnixMode;
 use crate::unix_time::UnixTime;
 use crate::*;
 
@@ -55,6 +56,7 @@ pub struct LiveEntry {
     mtime: UnixTime,
     size: Option<u64>,
     symlink_target: Option<String>,
+    umode: UnixMode,
 }
 
 impl tree::ReadTree for LiveTree {
@@ -102,6 +104,10 @@ impl Entry for LiveEntry {
     fn symlink_target(&self) -> &Option<String> {
         &self.symlink_target
     }
+
+    fn umode(&self) -> UnixMode {
+        self.umode
+    }
 }
 
 impl LiveEntry {
@@ -120,12 +126,14 @@ impl LiveEntry {
         } else {
             None
         };
+        let umode = UnixMode::from(metadata.permissions());
         LiveEntry {
             apath,
             kind: metadata.file_type().into(),
             mtime,
             symlink_target,
             size,
+            umode,
         }
     }
 }