hatter/oss-backupd
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

use consts

Browse Source
This commit is contained in:
Hatter Jiang
2020-04-04 22:47:32 +08:00
parent 926d557ab0
commit ce5e884841
2 changed files with 57 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
src/config_util.rs
View File

@@ -106,34 +106,6 @@ impl OSSBackupdConfigItem {
}
}
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(&oss_backupd_config.get_prefix());
key.push_str("/");
key.push_str(&oss_backupd_config.get_host());
key.push_str("/");
key.push_str(&oss_backupd_config_item.get_file_name());
key.push_str("_");
key.push_str(&get_now_ymdhms());
if !suffix.is_empty() {
key.push_str(&format!(".{}", suffix));
}
key
}
pub fn remove_start_end_slash(s: &str) -> String {
let mut ss = s;
while ss.starts_with("/") {
ss = &ss[1..]
}
while ss.ends_with("/") {
ss = &ss[0..(ss.len() - 1)];
}
ss.to_owned()
}
pub fn parse_config(config_json: &json::JsonValue) -> OSSBackupdConfig {
let root_oss_config_object = parse_sub_oss_config(config_json);
let encrypt_pubkey_file = get_string_value(config_json, "encrypt_pubkey_file");
@@ -157,6 +129,28 @@ pub fn parse_config(config_json: &json::JsonValue) -> OSSBackupdConfig {
}
}
pub fn get_config_json(custom_oss_backupd_config: Option<&str>, verbose: bool) -> Option<json::JsonValue> {
let config_content = get_config_content(custom_oss_backupd_config, verbose)?;
match json::parse(&config_content) {
Err(e) => {
print_message(MessageType::ERROR, &format!("Parse config json failed: {}", e));
None
},
Ok(o) => Some(o),
}
}
fn remove_start_end_slash(s: &str) -> String {
let mut ss = s;
while ss.starts_with("/") {
ss = &ss[1..]
}
while ss.ends_with("/") {
ss = &ss[0..(ss.len() - 1)];
}
ss.to_owned()
}
fn parse_oss_backupd_config_item(item: &json::JsonValue, root_oss_config_object: &Option<OSSConfig>, root_encrypt_pubkey_file: &Option<String>, root_backup_count: &Option<u32>) -> OSSBackupdConfigItem {
let target = get_string_value(item, "target");
let file_name = get_string_value(item, "file_name");
@@ -203,6 +197,23 @@ fn parse_oss_backupd_config_item(item: &json::JsonValue, root_oss_config_object:
}
}
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(&oss_backupd_config.get_prefix());
key.push_str("/");
key.push_str(&oss_backupd_config.get_host());
key.push_str("/");
key.push_str(&oss_backupd_config_item.get_file_name());
key.push_str("_");
key.push_str(&get_now_ymdhms());
if !suffix.is_empty() {
key.push_str(&format!(".{}", suffix));
}
key
}
fn parse_sub_oss_config(json: &json::JsonValue) -> Option<OSSConfig> {
let root_oss_config = &json["oss_config"];
iff!(root_oss_config.is_null(), None, Some(parse_oss_config(root_oss_config)))
@@ -232,17 +243,6 @@ fn get_u32_value(json: &json::JsonValue, key: &str) -> Option<u32> {
}
}
pub fn get_config_json(custom_oss_backupd_config: Option<&str>, verbose: bool) -> Option<json::JsonValue> {
let config_content = get_config_content(custom_oss_backupd_config, verbose)?;
match json::parse(&config_content) {
Err(e) => {
print_message(MessageType::ERROR, &format!("Parse config json failed: {}", e));
None
},
Ok(o) => Some(o),
}
}
fn get_config_content(custom_oss_backupd_config: Option<&str>, verbose: bool) -> Option<String> {
if let Some(custom_oss_backupd_config_val) = custom_oss_backupd_config {
if verbose {