lsm/seaweedfs
1
0
Fork 0
mirror of https://github.com/seaweedfs/seaweedfs.git synced 2025-12-17 17:51:20 +08:00
Code Issues Actions 18 Packages Projects Releases Wiki Activity

refactor

Browse Source
This commit is contained in:
Chris Lu
2021-06-10 21:50:21 -07:00
parent 33b87244ef
commit 8b382a8209
19 changed files with 215 additions and 269 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
weed/s3api/s3api_objects_list_handlers.go
View File

@@ -44,11 +44,11 @@ func (s3a *S3ApiServer) ListObjectsV2Handler(w http.ResponseWriter, r *http.Requ
originalPrefix, continuationToken, startAfter, delimiter, _, maxKeys := getListObjectsV2Args(r.URL.Query())
if maxKeys < 0 {
writeErrorResponse(w, s3err.ErrInvalidMaxKeys, r)
s3err.WriteErrorResponse(w, s3err.ErrInvalidMaxKeys, r)
return
}
if delimiter != "" && delimiter != "/" {
writeErrorResponse(w, s3err.ErrNotImplemented, r)
s3err.WriteErrorResponse(w, s3err.ErrNotImplemented, r)
return
}
@@ -60,13 +60,13 @@ func (s3a *S3ApiServer) ListObjectsV2Handler(w http.ResponseWriter, r *http.Requ
response, err := s3a.listFilerEntries(bucket, originalPrefix, maxKeys, marker, delimiter)
if err != nil {
writeErrorResponse(w, s3err.ErrInternalError, r)
s3err.WriteErrorResponse(w, s3err.ErrInternalError, r)
return
}
if len(response.Contents) == 0 {
if exists, existErr := s3a.exists(s3a.option.BucketsPath, bucket, true); existErr == nil && !exists {
writeErrorResponse(w, s3err.ErrNoSuchBucket, r)
s3err.WriteErrorResponse(w, s3err.ErrNoSuchBucket, r)
return
}
}
@@ -86,7 +86,7 @@ func (s3a *S3ApiServer) ListObjectsV2Handler(w http.ResponseWriter, r *http.Requ
StartAfter: startAfter,
}
writeSuccessResponseXML(w, encodeResponse(responseV2))
writeSuccessResponseXML(w, responseV2)
}
func (s3a *S3ApiServer) ListObjectsV1Handler(w http.ResponseWriter, r *http.Request) {
@@ -99,29 +99,29 @@ func (s3a *S3ApiServer) ListObjectsV1Handler(w http.ResponseWriter, r *http.Requ
originalPrefix, marker, delimiter, maxKeys := getListObjectsV1Args(r.URL.Query())
if maxKeys < 0 {
writeErrorResponse(w, s3err.ErrInvalidMaxKeys, r)
s3err.WriteErrorResponse(w, s3err.ErrInvalidMaxKeys, r)
return
}
if delimiter != "" && delimiter != "/" {
writeErrorResponse(w, s3err.ErrNotImplemented, r)
s3err.WriteErrorResponse(w, s3err.ErrNotImplemented, r)
return
}
response, err := s3a.listFilerEntries(bucket, originalPrefix, maxKeys, marker, delimiter)
if err != nil {
writeErrorResponse(w, s3err.ErrInternalError, r)
s3err.WriteErrorResponse(w, s3err.ErrInternalError, r)
return
}
if len(response.Contents) == 0 {
if exists, existErr := s3a.exists(s3a.option.BucketsPath, bucket, true); existErr == nil && !exists {
writeErrorResponse(w, s3err.ErrNoSuchBucket, r)
s3err.WriteErrorResponse(w, s3err.ErrNoSuchBucket, r)
return
}
}
writeSuccessResponseXML(w, encodeResponse(response))
writeSuccessResponseXML(w, response)
}
func (s3a *S3ApiServer) listFilerEntries(bucket string, originalPrefix string, maxKeys int, marker string, delimiter string) (response ListBucketResult, err error) {