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

now can run

Browse Source
This commit is contained in:
Hatter Jiang
2020-03-30 00:48:57 +08:00
parent 9af3cae5a0
commit 86eb80dd73
4 changed files with 39 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/main.rs
View File

@@ -28,7 +28,7 @@ use opt::{
fn main() -> XResult<()> {
let options = Options::new_and_parse_args()?;
if options.version {
print_message(MessageType::INFO, "ossbackupd v0.1");
print_message(MessageType::INFO, "ossbackupd v0.1.0");
return Ok(());
}
@@ -50,7 +50,7 @@ fn main() -> XResult<()> {
let mut item_index = -1;
for config_item in &oss_backupd_config.items {
item_index += 1;
if options.verbose {
print_message(MessageType::DEBUG, &format!("Process config item index: {}, config: {:?}", item_index, config_item));
}
@@ -133,9 +133,9 @@ fn main() -> XResult<()> {
}
let oss_client = OSSClient::new(endpoint, access_key_id, access_key_secret);
let default_limit = 10_usize;
let meta_file_name = &format!("ossbackupd_meta_{}.json", path);
let new_file = config_item.make_oss_key(&oss_backupd_config, "gpg");
let default_limit = 10_usize; // TODO read from config!
let meta_file_name = &format!("{}/ossbackupd_meta_{}_{}.json", &oss_backupd_config.get_prefix(), &oss_backupd_config.get_host(), &config_item.get_file_name());
let new_file = format!("{}/{}", path, config_item.make_oss_key(&oss_backupd_config, "gpg"));
if options.verbose {
print_message(MessageType::DEBUG, &format!("Default limit: {}", default_limit));
@@ -197,16 +197,14 @@ fn main() -> XResult<()> {
print_message(MessageType::ERROR, &format!("Error: {}, at item index: {}", e, item_index));
},
Ok(_) => {
print_message(MessageType::ERROR, &format!("Success, at item index: {}", item_index));
print_message(MessageType::OK, &format!("Success, at item index: {}", item_index));
},
};
fs::remove_file(temp_zip_file).ok();
fs::remove_file(temp_pgp_file).ok();
}
if options.verbose {
print_message(MessageType::DEBUG, "Backup all file(s) finished!");
}
print_message(MessageType::OK, "Backup all file(s) finished!");
Ok(())
}
@@ -229,9 +227,8 @@ pub fn process_oss_files(oss_client: &OSSClient, bucket_name: &str, path: &str,
oss_client.put_file_content(bucket_name, meta_file_key, &new_meta_file_content)?;
if !removed_file.is_empty() {
for rm_file in removed_file {
let rm_file_key = &format!("{}/{}", path, rm_file);
print_message(MessageType::INFO, &format!("Remove OSS key: {}", rm_file_key));
oss_client.delete_file(bucket_name, rm_file_key)?;
print_message(MessageType::INFO, &format!("Remove OSS key: {}", &rm_file));
oss_client.delete_file(bucket_name, &rm_file)?;
}
}
Ok(())