Merge branch 'main' into prompt_confirm_password

changelog/new.txt

@@ -11,4 +11,5 @@ New features:
 - restore: Files are now allocated just before being first processed. This allows easier resumed restores.
 - New option: `no-require-git` for backup - if enabled, a git repository is not required to apply `git-ignore` rule.
 - fix: wait for password-command to successfully exit, allowing to input something into the command, and read password from stdout.
-- Creation of new keys now enforces confirmation of entered key. This helps to prevent mistype of passwords during the initial entry
+- repoinfo: Added new options --json, --only-files, --only-index
+- Creation of new keys now enforces confirmation of entered key. This helps to prevent mistype of passwords during the initial entry

crates/rustic_core/examples/prune.rs

@@ -0,0 +1,21 @@
+//! `prune` example
+use rustic_core::{PruneOpts, Repository, RepositoryOptions};
+use simplelog::{Config, LevelFilter, SimpleLogger};
+
+fn main() {
+    // Display info logs
+    let _ = SimpleLogger::init(LevelFilter::Info, Config::default());
+
+    // Open repository
+    let mut repo_opts = RepositoryOptions::default();
+    repo_opts.repository = Some("/tmp/repo".to_string());
+    repo_opts.password = Some("test".to_string());
+    let repo = Repository::new(&repo_opts).unwrap().open().unwrap();
+
+    let prune_opts = PruneOpts::default();
+    let prune_plan = repo.prune_plan(&prune_opts).unwrap();
+    println!("{:?}", prune_plan.stats);
+    println!("to repack: {:?}", prune_plan.repack_packs());
+    // to run the plan uncomment this line:
+    // prune_plan.do_prune(&repo, &prune_opts).unwrap();
+}

crates/rustic_core/src/backend.rs

@@ -15,6 +15,7 @@ use std::{io::Read, path::PathBuf};
 use bytes::Bytes;
 use displaydoc::Display;
 use log::trace;
+use serde::{Deserialize, Serialize};
 
 use crate::{backend::node::Node, error::BackendErrorKind, id::Id, RusticResult};
 
@@ -27,17 +28,22 @@ pub const ALL_FILE_TYPES: [FileType; 4] = [
 ];
 
 /// Type for describing the kind of a file that can occur.
-#[derive(Clone, Copy, Debug, PartialEq, Eq, Display)]
+#[derive(Clone, Copy, Debug, PartialEq, Eq, Display, Serialize, Deserialize)]
 pub enum FileType {
     /// config
+    #[serde(rename = "config")]
     Config,
     /// index
+    #[serde(rename = "index")]
     Index,
     /// keys
+    #[serde(rename = "key")]
     Key,
     /// snapshots
+    #[serde(rename = "snapshot")]
     Snapshot,
     /// data
+    #[serde(rename = "pack")]
     Pack,
 }
 

crates/rustic_core/src/commands.rs

@@ -1,2 +1,5 @@
 pub mod cat;
 pub mod check;
+pub mod prune;
+pub mod repoinfo;
+pub mod snapshots;