q792602257/VptPassiveAdapter
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

s3循环列表

Browse Source
This commit is contained in:
Jerry Yan 2025-03-01 10:45:54 +08:00
parent 087def8015
commit 06f7e007f0
1 changed files with 45 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
fs/s3_adapter.go
View File

@ -57,44 +57,59 @@ func (s *S3Adapter) GetFileList(dirPath string, relDt time.Time) ([]dto.File, er
if err != nil { if err != nil {
return nil, err return nil, err
} }
result, err := client.ListObjectsV2(context.TODO(), listObjectsInput)
if err != nil {
return nil, err
}
var fileList []dto.File var fileList []dto.File
for _, object := range result.Contents { var continuationToken *string
key := *object.Key
if !util.IsVideoFile(path.Base(key)) { for {
continue if continuationToken != nil {
listObjectsInput.ContinuationToken = continuationToken
} }
startTime, stopTime, err := util.ParseStartStopTime(path.Base(key), relDt)
result, err := client.ListObjectsV2(context.TODO(), listObjectsInput)
if err != nil { if err != nil {
continue return nil, err
} }
if startTime.Equal(stopTime) || stopTime.IsZero() {
stopTime = stopTime.Add(time.Second * time.Duration(config.Config.Record.Duration)) for _, object := range result.Contents {
key := *object.Key
if !util.IsVideoFile(path.Base(key)) {
continue
}
startTime, stopTime, err := util.ParseStartStopTime(path.Base(key), relDt)
if err != nil {
continue
}
if startTime.Equal(stopTime) || stopTime.IsZero() {
stopTime = stopTime.Add(time.Second * time.Duration(config.Config.Record.Duration))
}
presignClient := s3.NewPresignClient(client)
request, err := presignClient.PresignGetObject(context.TODO(), &s3.GetObjectInput{
Bucket: aws.String(s.StorageConfig.S3.Bucket),
Key: aws.String(key),
}, func(presignOptions *s3.PresignOptions) {
presignOptions.Expires = 10 * time.Minute
})
if err != nil {
log.Println("Error presigning GetObject request:", err)
continue
}
fileList = append(fileList, dto.File{
BasePath: s.StorageConfig.S3.Bucket,
Name: path.Base(key),
Path: path.Dir(key),
Url: request.URL,
StartTime: startTime,
EndTime: stopTime,
})
} }
presignClient := s3.NewPresignClient(client)
request, err := presignClient.PresignGetObject(context.TODO(), &s3.GetObjectInput{ if !*result.IsTruncated {
Bucket: aws.String(s.StorageConfig.S3.Bucket), break
Key: aws.String(key),
}, func(presignOptions *s3.PresignOptions) {
presignOptions.Expires = 10 * time.Minute
})
if err != nil {
log.Println("Error presigning GetObject request:", err)
continue
} }
fileList = append(fileList, dto.File{ continuationToken = result.NextContinuationToken
BasePath: s.StorageConfig.S3.Bucket,
Name: path.Base(key),
Path: path.Dir(key),
Url: request.URL,
StartTime: startTime,
EndTime: stopTime,
})
} }
sort.Slice(fileList, func(i, j int) bool { sort.Slice(fileList, func(i, j int) bool {
return fileList[i].StartTime.Before(fileList[j].StartTime) return fileList[i].StartTime.Before(fileList[j].StartTime)
}) })