diff --git a/.gitignore b/.gitignore index ea8c4bf..d0df364 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,4 @@ /target +/result +/.vscode + diff --git a/src/main.rs b/src/main.rs index c459311..4c738ed 100644 --- a/src/main.rs +++ b/src/main.rs @@ -4,7 +4,7 @@ mod utils; use models::CloudS3; use std::fs; -use utils::print_bucket_contents; +use utils::handle_bucket_contents; use crate::utils::s3_utils::{create_client, create_config}; @@ -24,7 +24,7 @@ async fn main() { println!("Bucket tartalom listázása: {}", cloud.name); - match print_bucket_contents(&client, &cloud).await { + match handle_bucket_contents(&client, &cloud).await { Ok(_) => (), Err(e) => eprintln!("Hiba a bucket listázásakor: {}", e), } diff --git a/src/utils/file_utils.rs b/src/utils/file_utils.rs index 0bb741c..56553d0 100644 --- a/src/utils/file_utils.rs +++ b/src/utils/file_utils.rs @@ -9,6 +9,7 @@ pub fn create_directory_if_not_exists(folder_name: &str) -> std::io::Result<()> } pub fn create_file_if_not_exist_or_differ( + root_folder: &str, bucket_item: &S3Item, content: &[u8], ) -> std::io::Result<()> { @@ -16,7 +17,9 @@ pub fn create_file_if_not_exist_or_differ( use std::io::Write; use std::path::Path; - let path = Path::new(bucket_item.key.as_str()); + let path_str = format!("{}/{}", root_folder, bucket_item.key); + + let path = Path::new(&path_str); if path.exists() && bucket_item @@ -26,6 +29,10 @@ pub fn create_file_if_not_exist_or_differ( return Ok(()); } + if let Some(parent) = path.parent() { + fs::create_dir_all(parent)?; + } + // Ha a fájl nem létezik vagy a tartalom különbözik, írjuk a fájlt let mut file = fs::File::create(path)?; file.write_all(content)?; diff --git a/src/utils/mod.rs b/src/utils/mod.rs index ab244a4..54a759f 100644 --- a/src/utils/mod.rs +++ b/src/utils/mod.rs @@ -1,5 +1,3 @@ pub mod file_utils; pub mod s3_utils; -pub use file_utils::create_directory_if_not_exists; -pub use s3_utils::print_bucket_contents; - +pub use s3_utils::handle_bucket_contents; diff --git a/src/utils/s3_utils.rs b/src/utils/s3_utils.rs index 6696961..5af8a16 100644 --- a/src/utils/s3_utils.rs +++ b/src/utils/s3_utils.rs @@ -1,10 +1,8 @@ -use super::file_utils::create_directory_if_not_exists; +use super::file_utils::create_file_if_not_exist_or_differ; use crate::models::CloudS3; use crate::models::S3Item; -use crate::utils::file_utils::create_file_if_not_exist_or_differ; use aws_config::BehaviorVersion; use aws_sdk_s3::config::{Credentials, Region}; -use aws_sdk_s3::operation::get_object::GetObjectOutput; use aws_sdk_s3::{Client, Error}; pub fn create_config(s3: &CloudS3) -> aws_sdk_s3::Config { @@ -119,7 +117,7 @@ pub async fn download_file( } /// Egyszerű listázó függvény, ami kiírja a tartalmat -pub async fn print_bucket_contents( +pub async fn handle_bucket_contents( client: &Client, s3: &CloudS3, ) -> Result<(), Box> { @@ -131,13 +129,14 @@ pub async fn print_bucket_contents( } println!("{}", "-".repeat(60)); + let root_folder = format!("./result/{}", s3.name); + for item in &items { - println!("{}", item); + print!("\r{}", item.key); let content = download_file(client, &s3, &item).await?; - create_directory_if_not_exists(item.folder_name.as_deref().unwrap_or("")); - create_file_if_not_exist_or_differ(item, &content); + create_file_if_not_exist_or_differ(&root_folder, &item, &content); } println!("Contents count: {}", items.len());