Compare commits
2 Commits
0eda768c03
...
a4a03ca4c5
| Author | SHA1 | Date |
|---|---|---|
|
|
a4a03ca4c5 | |
|
|
5159bfdddd |
|
|
@ -9,7 +9,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
|
||||||
|
|
||||||
### Added
|
### Added
|
||||||
|
|
||||||
* `backup` CLI command
|
|
||||||
* Incremental backups
|
* Incremental backups
|
||||||
* Chain length describes how many incremental backups to create from the
|
* Chain length describes how many incremental backups to create from the
|
||||||
same full backup
|
same full backup
|
||||||
|
|
@ -18,6 +17,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
|
||||||
* Backup layers
|
* Backup layers
|
||||||
* Store multiple chains of backups in parallel, configuring each with
|
* Store multiple chains of backups in parallel, configuring each with
|
||||||
different parameters (son-father-grandfather principle)
|
different parameters (son-father-grandfather principle)
|
||||||
|
* CLI commands for creating, restoring & listing backups
|
||||||
|
|
||||||
### Changed
|
### Changed
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,6 @@
|
||||||
use serde::{Deserialize, Serialize};
|
use serde::{Deserialize, Serialize};
|
||||||
use std::collections::{HashMap, HashSet};
|
use std::collections::{HashMap, HashSet};
|
||||||
|
use std::fmt;
|
||||||
use std::path::PathBuf;
|
use std::path::PathBuf;
|
||||||
|
|
||||||
/// Represents the changes relative to the previous backup
|
/// Represents the changes relative to the previous backup
|
||||||
|
|
@ -74,3 +75,12 @@ impl Delta {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
impl fmt::Display for Delta {
|
||||||
|
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
|
||||||
|
let added_count: usize = self.added.values().map(|s| s.len()).sum();
|
||||||
|
let removed_count: usize = self.removed.values().map(|s| s.len()).sum();
|
||||||
|
|
||||||
|
write!(f, "+{}-{}", added_count, removed_count)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
|
||||||
|
|
@ -127,4 +127,8 @@ where
|
||||||
.get(layer)
|
.get(layer)
|
||||||
.map(|manager| manager.restore_backup(start_time))
|
.map(|manager| manager.restore_backup(start_time))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub fn managers(&self) -> &HashMap<String, Manager<T>> {
|
||||||
|
&self.managers
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -181,4 +181,9 @@ where
|
||||||
|
|
||||||
Err(other("Unknown backup."))
|
Err(other("Unknown backup."))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Get a reference to the underlying chains
|
||||||
|
pub fn chains(&self) -> &Vec<Vec<Backup<T>>> {
|
||||||
|
&self.chains
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -14,6 +14,7 @@ use flate2::Compression;
|
||||||
use path::PathExt;
|
use path::PathExt;
|
||||||
use serde::{Deserialize, Serialize};
|
use serde::{Deserialize, Serialize};
|
||||||
use std::collections::{HashMap, HashSet};
|
use std::collections::{HashMap, HashSet};
|
||||||
|
use std::fmt;
|
||||||
use std::fs::File;
|
use std::fs::File;
|
||||||
use std::io;
|
use std::io;
|
||||||
use std::path::{Path, PathBuf};
|
use std::path::{Path, PathBuf};
|
||||||
|
|
@ -205,3 +206,20 @@ impl<T: Clone> Backup<T> {
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
impl<T: Clone> fmt::Display for Backup<T> {
|
||||||
|
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
|
||||||
|
let letter = match self.type_ {
|
||||||
|
BackupType::Full => 'F',
|
||||||
|
BackupType::Incremental => 'I',
|
||||||
|
};
|
||||||
|
|
||||||
|
write!(
|
||||||
|
f,
|
||||||
|
"{} ({}, {})",
|
||||||
|
self.start_time.format(Backup::FILENAME_FORMAT),
|
||||||
|
letter,
|
||||||
|
self.delta
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
|
||||||
|
|
@ -9,7 +9,7 @@ use std::path::PathBuf;
|
||||||
#[derive(Subcommand)]
|
#[derive(Subcommand)]
|
||||||
pub enum BackupCommands {
|
pub enum BackupCommands {
|
||||||
/// List all tracked backups
|
/// List all tracked backups
|
||||||
List,
|
List(BackupListArgs),
|
||||||
/// Manually create a new backup
|
/// Manually create a new backup
|
||||||
Create(BackupCreateArgs),
|
Create(BackupCreateArgs),
|
||||||
/// Restore a backup
|
/// Restore a backup
|
||||||
|
|
@ -28,6 +28,12 @@ pub struct BackupCreateArgs {
|
||||||
layer: String,
|
layer: String,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[derive(Args)]
|
||||||
|
pub struct BackupListArgs {
|
||||||
|
/// What layer to list
|
||||||
|
layer: Option<String>,
|
||||||
|
}
|
||||||
|
|
||||||
#[derive(Args)]
|
#[derive(Args)]
|
||||||
pub struct BackupRestoreArgs {
|
pub struct BackupRestoreArgs {
|
||||||
/// Path to the backup inside the backup directory
|
/// Path to the backup inside the backup directory
|
||||||
|
|
@ -41,7 +47,7 @@ impl BackupArgs {
|
||||||
pub fn run(&self, cli: &Cli) -> io::Result<()> {
|
pub fn run(&self, cli: &Cli) -> io::Result<()> {
|
||||||
match &self.command {
|
match &self.command {
|
||||||
BackupCommands::Create(args) => args.run(cli),
|
BackupCommands::Create(args) => args.run(cli),
|
||||||
BackupCommands::List => Ok(()),
|
BackupCommands::List(args) => args.run(cli),
|
||||||
BackupCommands::Restore(args) => args.run(cli),
|
BackupCommands::Restore(args) => args.run(cli),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -120,3 +126,24 @@ impl BackupRestoreArgs {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
impl BackupListArgs {
|
||||||
|
pub fn run(&self, cli: &Cli) -> io::Result<()> {
|
||||||
|
let meta = cli.meta()?;
|
||||||
|
|
||||||
|
for (name, manager) in meta.managers().iter() {
|
||||||
|
println!("{}", name);
|
||||||
|
|
||||||
|
for chain in manager.chains().iter().filter(|c| !c.is_empty()) {
|
||||||
|
let mut iter = chain.iter();
|
||||||
|
println!(" {}", iter.next().unwrap());
|
||||||
|
|
||||||
|
for backup in iter {
|
||||||
|
println!(" {}", backup);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue