Skip to content

Commit c556b25

Browse files
authored
Merge pull request #31 from damoxc/fix-index
Fix empty object name error
2 parents ef9ab67 + 29a2128 commit c556b25

File tree

1 file changed

+12
-2
lines changed

1 file changed

+12
-2
lines changed

Diff for: main.go

+12-2
Original file line numberDiff line numberDiff line change
@@ -97,13 +97,23 @@ func wrapper(fn func(w http.ResponseWriter, r *http.Request)) http.HandlerFunc {
9797
}
9898

9999
func fetchObjectAttrs(ctx context.Context, bucket, object string) (*storage.ObjectAttrs, error) {
100+
var err error
101+
var indexAppended bool
102+
if object == "" && *defaultIndex != "" {
103+
object, err = url.JoinPath(object, *defaultIndex)
104+
if err != nil {
105+
return nil, err
106+
}
107+
indexAppended = true
108+
}
109+
100110
attrs, err := client.Bucket(bucket).Object(strings.TrimSuffix(object, "/")).Attrs(ctx)
101111
if err != nil {
102112
if errors.Is(err, storage.ErrObjectNotExist) {
103-
if *defaultIndex == "" {
113+
if *defaultIndex == "" || indexAppended {
104114
return nil, err
105115
}
106-
object, err := url.JoinPath(object, *defaultIndex)
116+
object, err = url.JoinPath(object, *defaultIndex)
107117
if err != nil {
108118
return nil, err
109119
}

0 commit comments

Comments
 (0)