summaryrefslogtreecommitdiff
path: root/vendor/github.com/minio/minio-go/v7/api-list.go
diff options
context:
space:
mode:
authorLibravatar kim <grufwub@gmail.com>2025-06-30 15:19:09 +0200
committerLibravatar kim <gruf@noreply.codeberg.org>2025-06-30 15:19:09 +0200
commit8b0ea560279a5bf4479555d3924c763ddeecfcad (patch)
tree005e26d4a658e565594fb259cc17948659195822 /vendor/github.com/minio/minio-go/v7/api-list.go
parent[chore] bumps ncruces/go-sqlite3 v0.26.1 => v0.26.3 (#4302) (diff)
downloadgotosocial-8b0ea560279a5bf4479555d3924c763ddeecfcad.tar.xz
[chore] update go dependencies (#4304)
- github.com/KimMachineGun/automemlimit v0.7.2 => v0.7.3 - github.com/gin-contrib/cors v1.7.5 => v1.7.6 - github.com/minio/minio-go/v7 v7.0.92 => v7.0.94 - github.com/spf13/cast v1.8.0 => v1.9.2 - github.com/uptrace/bun{,/*} v1.2.11 => v1.2.14 - golang.org/x/image v0.27.0 => v0.28.0 - golang.org/x/net v0.40.0 => v0.41.0 - code.superseriousbusiness.org/go-swagger v0.31.0-gts-go1.23-fix => v0.32.3-gts-go1.23-fix Reviewed-on: https://codeberg.org/superseriousbusiness/gotosocial/pulls/4304 Co-authored-by: kim <grufwub@gmail.com> Co-committed-by: kim <grufwub@gmail.com>
Diffstat (limited to 'vendor/github.com/minio/minio-go/v7/api-list.go')
-rw-r--r--vendor/github.com/minio/minio-go/v7/api-list.go49
1 files changed, 27 insertions, 22 deletions
diff --git a/vendor/github.com/minio/minio-go/v7/api-list.go b/vendor/github.com/minio/minio-go/v7/api-list.go
index 1af0fadbf..5bf67a666 100644
--- a/vendor/github.com/minio/minio-go/v7/api-list.go
+++ b/vendor/github.com/minio/minio-go/v7/api-list.go
@@ -285,7 +285,7 @@ func (c *Client) listObjectsV2Query(ctx context.Context, bucketName, objectPrefi
// sure proper responses are received.
if listBucketResult.IsTruncated && listBucketResult.NextContinuationToken == "" {
return listBucketResult, ErrorResponse{
- Code: "NotImplemented",
+ Code: NotImplemented,
Message: "Truncated response should have continuation token set",
}
}
@@ -419,19 +419,25 @@ func (c *Client) listObjectVersions(ctx context.Context, bucketName string, opts
}
for _, version := range vers {
info := ObjectInfo{
- ETag: trimEtag(version.ETag),
- Key: version.Key,
- LastModified: version.LastModified.Truncate(time.Millisecond),
- Size: version.Size,
- Owner: version.Owner,
- StorageClass: version.StorageClass,
- IsLatest: version.IsLatest,
- VersionID: version.VersionID,
- IsDeleteMarker: version.isDeleteMarker,
- UserTags: version.UserTags,
- UserMetadata: version.UserMetadata,
- Internal: version.Internal,
- NumVersions: numVersions,
+ ETag: trimEtag(version.ETag),
+ Key: version.Key,
+ LastModified: version.LastModified.Truncate(time.Millisecond),
+ Size: version.Size,
+ Owner: version.Owner,
+ StorageClass: version.StorageClass,
+ IsLatest: version.IsLatest,
+ VersionID: version.VersionID,
+ IsDeleteMarker: version.isDeleteMarker,
+ UserTags: version.UserTags,
+ UserMetadata: version.UserMetadata,
+ Internal: version.Internal,
+ NumVersions: numVersions,
+ ChecksumMode: version.ChecksumType,
+ ChecksumCRC32: version.ChecksumCRC32,
+ ChecksumCRC32C: version.ChecksumCRC32C,
+ ChecksumSHA1: version.ChecksumSHA1,
+ ChecksumSHA256: version.ChecksumSHA256,
+ ChecksumCRC64NVME: version.ChecksumCRC64NVME,
}
if !yield(info) {
return false
@@ -753,13 +759,9 @@ func (c *Client) ListObjects(ctx context.Context, bucketName string, opts ListOb
objectStatCh := make(chan ObjectInfo, 1)
go func() {
defer close(objectStatCh)
- send := func(obj ObjectInfo) bool {
- select {
- case <-ctx.Done():
- return false
- case objectStatCh <- obj:
- return true
- }
+ if contextCanceled(ctx) {
+ objectStatCh <- ObjectInfo{Err: ctx.Err()}
+ return
}
var objIter iter.Seq[ObjectInfo]
@@ -777,8 +779,11 @@ func (c *Client) ListObjects(ctx context.Context, bucketName string, opts ListOb
}
}
for obj := range objIter {
- if !send(obj) {
+ select {
+ case <-ctx.Done():
+ objectStatCh <- ObjectInfo{Err: ctx.Err()}
return
+ case objectStatCh <- obj:
}
}
}()