use struct.f

This commit is contained in:
2019-12-15 11:36:48 +08:00
parent d3c2d2bb9e
commit 24a8eba20b
2 changed files with 15 additions and 12 deletions

View File

@@ -62,7 +62,14 @@ pub struct OSSBackupdConfig {
pub items: Vec<OSSBackupdConfigItem>,
}
pub fn make_oss_key(oss_backupd_config: &OSSBackupdConfig, oss_backupd_config_item: &OSSBackupdConfigItem, suffix: &str) -> String {
impl OSSBackupdConfigItem {
pub fn make_oss_key(&self, oss_backupd_config: &OSSBackupdConfig, suffix: &str) -> String {
real_make_oss_key(oss_backupd_config, &self, suffix)
}
}
fn real_make_oss_key(oss_backupd_config: &OSSBackupdConfig, oss_backupd_config_item: &OSSBackupdConfigItem, suffix: &str) -> String {
let mut key = String::with_capacity(1024);
key.push_str(&(if oss_backupd_config.prefix.is_some() {
remove_start_end_slash(&oss_backupd_config.prefix.as_ref().unwrap().as_str())

View File

@@ -57,17 +57,13 @@ fn main() -> XResult<()> {
// TODO ...
// let j = config_json.unwrap();
// println!("{}", j);
// let c = parse_config(&j);
// println!("{:?}", c);
// println!("");
// for i in &c.items {
// println!("{:?}", i);
// println!("{}", make_oss_key(&c, &i, "gpg"));
// println!("{}", make_oss_key(&c, &i, "asc"));
// }
println!("{:?}", oss_backupd_config);
println!("");
for i in &oss_backupd_config.items {
println!("{:?}", i);
println!("{}", i.make_oss_key(&oss_backupd_config, "gpg"));
println!("{}", i.make_oss_key(&oss_backupd_config, "asc"));
}
Ok(())
}