rebase
This commit is contained in:
parent
cb98852772
commit
85b5d2653c
1 changed files with 6 additions and 2 deletions
|
@ -9,6 +9,7 @@ import (
|
||||||
"regexp"
|
"regexp"
|
||||||
"strings"
|
"strings"
|
||||||
"time"
|
"time"
|
||||||
|
"net/url"
|
||||||
|
|
||||||
"github.com/minio/minio-go/v7"
|
"github.com/minio/minio-go/v7"
|
||||||
)
|
)
|
||||||
|
@ -37,8 +38,11 @@ func HandleBucketView(s3 S3, templates fs.FS, allowDelete bool, listRecursive bo
|
||||||
regex := regexp.MustCompile(`\/buckets\/([^\/]*)\/?(.*)`)
|
regex := regexp.MustCompile(`\/buckets\/([^\/]*)\/?(.*)`)
|
||||||
matches := regex.FindStringSubmatch(r.RequestURI)
|
matches := regex.FindStringSubmatch(r.RequestURI)
|
||||||
bucketName := matches[1]
|
bucketName := matches[1]
|
||||||
path := matches[2]
|
path, rqerr := url.QueryUnescape(matches[2])
|
||||||
|
if rqerr != nil {
|
||||||
|
handleHTTPError(w, rqerr)
|
||||||
|
return
|
||||||
|
}
|
||||||
var objs []objectWithIcon
|
var objs []objectWithIcon
|
||||||
doneCh := make(chan struct{})
|
doneCh := make(chan struct{})
|
||||||
defer close(doneCh)
|
defer close(doneCh)
|
||||||
|
|
Loading…
Reference in a new issue