mirrors/rustic
2
0
Fork 0
mirror of https://github.com/rustic-rs/rustic.git synced 2025-10-26 11:18:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

re-allow to use [[backup.sources]] in config file

Browse Source
This commit is contained in:
Alexander Weiss 2023-03-05 04:18:51 +01:00
parent 3fa092cbf0
commit 7936d85e6c
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/commands/backup.rs
View File

@ -10,6 +10,7 @@ use merge::Merge;
use path_dedot::ParseDot;
use serde::Deserialize;
use serde_with::{serde_as, DisplayFromStr};
use toml::Value;
use super::{bytes, progress_bytes, progress_counter, RusticConfig};
use crate::archiver::{Archiver, Parent};
@ -109,7 +110,17 @@ pub(super) struct Opts {
#[clap(value_name = "SOURCE")]
#[merge(skip)]
#[serde(skip)]
sources: Vec<String>,
cli_sources: Vec<String>,
// This is a hack to support serde(deny_unknown_fields) for deserializing the backup options from TOML
// while still being able to use [[backup.sources]] in the config file.
// A drawback is that a unkowen "sources = ..." won't be bailed...
// Note that unfortunately we cannot work with nested flattened structures, see
// https://github.com/serde-rs/serde/issues/1547
#[clap(skip)]
#[merge(skip)]
#[serde(rename = "sources")]
config_sources: Option<Value>,
/// Backup source, used within config file
#[clap(skip)]
@ -127,8 +138,8 @@ pub(super) fn execute(
let mut config_opts: Vec<Opts> = config_file.get("backup.sources")?;
let sources = match (opts.sources.is_empty(), config_opts.is_empty()) {
(false, _) => opts.sources.clone(),
let sources = match (opts.cli_sources.is_empty(), config_opts.is_empty()) {
(false, _) => opts.cli_sources.clone(),
(true, false) => {
info!("using all backup sources from config file.");
config_opts.iter().map(|opt| opt.source.clone()).collect()