|
|
|
@@ -421,7 +421,6 @@ func GetOneLevelAllObjectUnderDir(bucket string, prefixRootPath string, relative |
|
|
|
input := &obs.ListObjectsInput{} |
|
|
|
input.Bucket = bucket |
|
|
|
input.Prefix = prefixRootPath + relativePath |
|
|
|
log.Info(input.Prefix) |
|
|
|
if !strings.HasSuffix(input.Prefix, "/") { |
|
|
|
input.Prefix += "/" |
|
|
|
} |
|
|
|
@@ -435,14 +434,12 @@ func GetOneLevelAllObjectUnderDir(bucket string, prefixRootPath string, relative |
|
|
|
log.Info("Page:%d\n", index) |
|
|
|
index++ |
|
|
|
for _, val := range output.Contents { |
|
|
|
log.Info("val key=" + val.Key) |
|
|
|
var isDir bool |
|
|
|
var fileName string |
|
|
|
if val.Key == input.Prefix { |
|
|
|
continue |
|
|
|
} |
|
|
|
fileName = val.Key[prefixLen:] |
|
|
|
//log.Info("fileName =" + fileName) |
|
|
|
files := strings.Split(fileName, "/") |
|
|
|
if fileMap[files[0]] { |
|
|
|
continue |
|
|
|
|