From 6ada3f85e66b5cfd7cca4903d8ff1f388f41b227 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Tue, 21 Jun 2022 16:44:21 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=A0=91=E5=BD=A2=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E5=99=A8=E4=BB=A3=E7=A0=81=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 modules/storage/obs.go | 53 ++++++++++++++++++++++++++++--------------
 1 file changed, 35 insertions(+), 18 deletions(-)

diff --git a/modules/storage/obs.go b/modules/storage/obs.go
index 1e347d145..fdfa3d5bb 100755
--- a/modules/storage/obs.go
+++ b/modules/storage/obs.go
@@ -362,28 +362,45 @@ func GetOneLevelAllObjectUnderDir(bucket string, prefixRootPath string, relative
 			if val.Key == input.Prefix {
 				continue
 			}
-			if strings.Contains(val.Key[prefixLen:len(val.Key)-1], "/") {
-				fileName = val.Key[prefixLen : len(val.Key)-1]
-				files := strings.Split(fileName, "/")
-				fileName = files[0]
+			fileName = val.Key[prefixLen : len(val.Key)-1]
+			log.Info("fileName =" + fileName)
+			files := strings.Split(fileName, "/")
+			if fileMap[files[0]] {
+				continue
+			} else {
+				fileMap[files[0]] = true
+			}
+			ParenDir := relativePath
+			fileName = files[0]
+			if len(files) > 1 {
 				isDir = true
-				if fileMap[files[0]] {
-					continue
-				} else {
-					fileMap[files[0]] = true
-				}
+				ParenDir += fileName
 			} else {
-				if strings.HasSuffix(val.Key, "/") {
-					isDir = true
-					fileName = val.Key[prefixLen : len(val.Key)-1]
-					relativePath += val.Key[prefixLen:]
-				} else {
-					isDir = false
-					fileName = val.Key[prefixLen:]
-				}
-				fileMap[fileName] = true
+				isDir = false
 			}
 
+			// if strings.Contains(val.Key[prefixLen:len(val.Key)-1], "/") {
+
+			// 	files := strings.Split(fileName, "/")
+			// 	fileName = files[0]
+			// 	isDir = true
+			// 	if fileMap[files[0]] {
+			// 		continue
+			// 	} else {
+			// 		fileMap[files[0]] = true
+			// 	}
+			// } else {
+			// 	if strings.HasSuffix(val.Key, "/") {
+			// 		isDir = true
+			// 		fileName = val.Key[prefixLen : len(val.Key)-1]
+			// 		relativePath += val.Key[prefixLen:]
+			// 	} else {
+			// 		isDir = false
+			// 		fileName = val.Key[prefixLen:]
+			// 	}
+			// 	fileMap[fileName] = true
+			// }
+
 			fileInfo := FileInfo{
 				ModTime:  val.LastModified.Local().Format("2006-01-02 15:04:05"),
 				FileName: fileName,