From 1d1b355f9ea48492dcba938f6b3457a5115cff41 Mon Sep 17 00:00:00 2001 From: Chris Lu Date: Thu, 11 Jul 2019 04:20:03 -0700 Subject: [PATCH] filer: set file name when uploading to a directory fix https://github.com/chrislusf/seaweedfs/issues/1005 --- weed/server/filer_server_handlers_write.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/weed/server/filer_server_handlers_write.go b/weed/server/filer_server_handlers_write.go index 30fd26702..0bf1218ce 100644 --- a/weed/server/filer_server_handlers_write.go +++ b/weed/server/filer_server_handlers_write.go @@ -150,15 +150,15 @@ func (fs *FilerServer) updateFilerStore(ctx context.Context, r *http.Request, w }() path := r.URL.Path + if strings.HasSuffix(path, "/") { + if ret.Name != "" { + path += ret.Name + } + } existingEntry, err := fs.filer.FindEntry(ctx, filer2.FullPath(path)) crTime := time.Now() if err == nil && existingEntry != nil { - // glog.V(4).Infof("existing %s => %+v", path, existingEntry) - if existingEntry.IsDirectory() { - path += "/" + ret.Name - } else { - crTime = existingEntry.Crtime - } + crTime = existingEntry.Crtime } entry := &filer2.Entry{ FullPath: filer2.FullPath(path),