fix: Fixed an issue where the list_objects_v2 API did not return dire… (#352)

shiroleeee · web-flow · commit c42fbed3d2aa · 2025-08-07T11:05:05.000+08:00
* fix: Fixed an issue where the list_objects_v2 API did not return directory names when they conflicted with file names in the same bucket (e.g., test/ vs. test.txt, aaa/ vs. aaa.csv) (#335) * fix: adjusted the order of directory listings
diff --git a/crates/ecstore/src/disk/local.rs b/crates/ecstore/src/disk/local.rs
@@ -953,9 +953,8 @@ impl LocalDisk {
             let name = path_join_buf(&[current, entry]);
 
             if !dir_stack.is_empty() {
-                if let Some(pop) = dir_stack.pop() {
+                if let Some(pop) = dir_stack.last().cloned() {
                     if pop < name {
-                        //
                         out.write_obj(&MetaCacheEntry {
                             name: pop.clone(),
                             ..Default::default()
@@ -969,6 +968,7 @@ impl LocalDisk {
                                 error!("scan_dir err {:?}", er);
                             }
                         }
+                        dir_stack.pop();
                     }
                 }
             }

Original file line number	Diff line number	Diff line change
`@@ -953,9 +953,8 @@ impl LocalDisk {`
`953`	`953`	`let name = path_join_buf(&[current, entry]);`
`954`	`954`
`955`	`955`	`if !dir_stack.is_empty() {`
`956`		`- if let Some(pop) = dir_stack.pop() {`
	`956`	`+ if let Some(pop) = dir_stack.last().cloned() {`
`957`	`957`	`if pop < name {`
`958`		`- //`
`959`	`958`	`out.write_obj(&MetaCacheEntry {`
`960`	`959`	`name: pop.clone(),`
`961`	`960`	`..Default::default()`
`@@ -969,6 +968,7 @@ impl LocalDisk {`
`969`	`968`	`error!("scan_dir err {:?}", er);`
`970`	`969`	`}`
`971`	`970`	`}`
	`971`	`+ dir_stack.pop();`
`972`	`972`	`}`
`973`	`973`	`}`
`974`	`974`	`}`