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

add zip file support

Browse Source
This commit is contained in:
Hatter Jiang
2020-04-04 01:38:54 +08:00
parent 13fff9569b
commit 831d66fddb
5 changed files with 31 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/config_util.rs
View File

@@ -3,6 +3,7 @@ use std::{
path::Path,
};
use rust_util::{
iff,
XResult,
new_box_ioerror,
util_msg::*,
@@ -211,11 +212,7 @@ fn parse_oss_backupd_config_item(item: &json::JsonValue, root_oss_config_object:
fn parse_sub_oss_config(json: &json::JsonValue) -> Option<OSSConfig> {
let root_oss_config = &json["oss_config"];
let root_oss_config_object: Option<OSSConfig> = match root_oss_config.is_null() {
true => None,
false => Some(parse_oss_config(root_oss_config)),
};
root_oss_config_object
iff!(root_oss_config.is_null(), None, Some(parse_oss_config(root_oss_config)))
}
fn parse_oss_config(oss_config: &json::JsonValue) -> OSSConfig {
@@ -230,10 +227,7 @@ fn parse_oss_config(oss_config: &json::JsonValue) -> OSSConfig {
fn get_string_value(json: &json::JsonValue, key: &str) -> Option<String> {
let value = &json[key];
match value.is_string() {
true => Some(value.as_str().unwrap().to_string()),
false => None,
}
value.as_str().map(|s| s.to_owned())
}
fn get_u32_value(json: &json::JsonValue, key: &str) -> Option<u32> {