|
|
|
@@ -341,11 +341,9 @@ func GetAllObjectByBucketAndPrefix(bucket string, prefix string) ([]FileInfo, er |
|
|
|
index++ |
|
|
|
for _, val := range output.Contents { |
|
|
|
var isDir bool |
|
|
|
log.Info("val.key=" + val.Key) |
|
|
|
if prefixLen == len(val.Key) { |
|
|
|
continue |
|
|
|
} |
|
|
|
|
|
|
|
if strings.HasSuffix(val.Key, "/") { |
|
|
|
isDir = true |
|
|
|
} else { |
|
|
|
@@ -358,7 +356,6 @@ func GetAllObjectByBucketAndPrefix(bucket string, prefix string) ([]FileInfo, er |
|
|
|
IsDir: isDir, |
|
|
|
ParenDir: "", |
|
|
|
} |
|
|
|
log.Info("file name=" + val.Key) |
|
|
|
fileInfos = append(fileInfos, fileInfo) |
|
|
|
} |
|
|
|
if output.IsTruncated { |
|
|
|
@@ -374,9 +371,7 @@ func GetAllObjectByBucketAndPrefix(bucket string, prefix string) ([]FileInfo, er |
|
|
|
return nil, err |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
return fileInfos, nil |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
func GetObsListObject(jobName, parentDir string) ([]FileInfo, error) { |
|
|
|
|