From 6cb5af9845affadddc8ee21c2eeba20b2952a71c Mon Sep 17 00:00:00 2001 From: feco Date: Thu, 1 Jan 2026 21:58:42 +0100 Subject: [PATCH] create folder but does not work yet --- src/models/mod.rs | 6 +++++- src/models/s3_items.rs | 20 ++++++++++++++++++++ src/utils/s3_utils.rs | 38 ++++++++++++++++++-------------------- 3 files changed, 43 insertions(+), 21 deletions(-) create mode 100644 src/models/s3_items.rs diff --git a/src/models/mod.rs b/src/models/mod.rs index fdb80f6..243e6f4 100644 --- a/src/models/mod.rs +++ b/src/models/mod.rs @@ -1,2 +1,6 @@ pub mod cloud; -pub use cloud::CloudS3; \ No newline at end of file +pub mod s3_items; + +pub use cloud::CloudS3; +pub use s3_items::S3Item; + diff --git a/src/models/s3_items.rs b/src/models/s3_items.rs new file mode 100644 index 0000000..17bbb62 --- /dev/null +++ b/src/models/s3_items.rs @@ -0,0 +1,20 @@ +#[derive(Debug)] +pub struct S3Item { + pub key: String, + pub is_folder: bool, + pub folder_name: Option, + pub size: Option, + pub last_modified: Option, +} + +impl std::fmt::Display for S3Item { + fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { + let item_type = if self.is_folder { "[MAPPA]" } else { "[FÁJL]" }; + let size_str = if let Some(size) = self.size { + format!("{} bytes", size) + } else { + "-".to_string() + }; + write!(f, "{} {} (méret: {})", item_type, self.key, size_str) + } +} diff --git a/src/utils/s3_utils.rs b/src/utils/s3_utils.rs index 8f3c357..5157df9 100644 --- a/src/utils/s3_utils.rs +++ b/src/utils/s3_utils.rs @@ -1,29 +1,10 @@ use crate::models::CloudS3; +use crate::models::S3Item; 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}; -#[derive(Debug)] -pub struct S3Item { - pub key: String, - pub is_folder: bool, - pub size: Option, - pub last_modified: Option, -} - -impl std::fmt::Display for S3Item { - fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - let item_type = if self.is_folder { "[MAPPA]" } else { "[FÁJL]" }; - let size_str = if let Some(size) = self.size { - format!("{} bytes", size) - } else { - "-".to_string() - }; - write!(f, "{} {} (méret: {})", item_type, self.key, size_str) - } -} - pub fn create_config(s3: &CloudS3) -> aws_sdk_s3::Config { let credentials = Credentials::new(&s3.accesskey, &s3.secretekey, None, None, "cloudbackup"); @@ -78,6 +59,7 @@ pub async fn list_bucket(client: &Client, s3: &CloudS3) -> Result, E key: prefix_str.to_string(), is_folder: true, size: None, + folder_name: Some(prefix_str.to_string()), last_modified: None, }); } @@ -88,12 +70,20 @@ pub async fn list_bucket(client: &Client, s3: &CloudS3) -> Result, E if let Some(key) = object.key() { // Kihagyjuk a mappa neveket (amik '/' karakterrel végződnek) if !key.ends_with('/') { + let folder_name = if let Some(pos) = key.rfind('/') { + Some(key[..pos].to_string()) + } else { + None + }; + println!("Folder neve: {}", folder_name.as_deref().unwrap_or("N/A")); items.push(S3Item { key: key.to_string(), is_folder: false, + folder_name: folder_name.clone(), size: object.size(), last_modified: object.last_modified().map(|dt| dt.to_string()), }); + create_directory_if_not_exists(folder_name.as_deref().unwrap_or("")); } } } @@ -143,3 +133,11 @@ pub async fn print_bucket_contents(client: &Client, s3: &CloudS3) -> Result<(), Ok(()) } + +async fn create_directory_if_not_exists(folder_name: &str) -> std::io::Result<()> { + let folder_name_with_root = "./result".to_string() + "/" + folder_name; + if !std::path::Path::new(&folder_name_with_root).exists() { + std::fs::create_dir_all(folder_name_with_root)?; + } + Ok(()) +}