diff --git a/modules/storage/obs.go b/modules/storage/obs.go index 52e05a60d..57ef63029 100755 --- a/modules/storage/obs.go +++ b/modules/storage/obs.go @@ -360,63 +360,6 @@ func obsCopyFile(srcBucket string, srcKeyName string, destBucket string, destKey return nil } -/* -func GetOneLevelAllObjectUnderDir(bucket string, prefixRootPath string, relativePath string) ([]FileInfo, error) { - input := &obs.ListObjectsInput{} - input.Bucket = bucket - input.Prefix = prefixRootPath + relativePath - if !strings.HasSuffix(input.Prefix, "/") { - input.Prefix += "/" - } - output, err := ObsCli.ListObjects(input) - fileInfos := make([]FileInfo, 0) - prefixLen := len(input.Prefix) - fileMap := make(map[string]bool, 0) - if err == nil { - 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 - } else { - fileMap[files[0]] = true - } - ParenDir := relativePath - fileName = files[0] - if len(files) > 1 { - isDir = true - ParenDir += fileName + "/" - } else { - isDir = false - } - fileInfo := FileInfo{ - ModTime: val.LastModified.Local().Format("2006-01-02 15:04:05"), - FileName: fileName, - Size: val.Size, - IsDir: isDir, - ParenDir: ParenDir, - } - fileInfos = append(fileInfos, fileInfo) - } - return fileInfos, err - } else { - if obsError, ok := err.(obs.ObsError); ok { - log.Error("Code:%s, Message:%s", obsError.Code, obsError.Message) - } - return nil, err - } - -} - -*/ - func GetOneLevelAllObjectUnderDir(bucket string, prefixRootPath string, relativePath string) ([]FileInfo, error) { input := &obs.ListObjectsInput{} input.Bucket = bucket