Browse Source

filer: set file name when uploading to a directory

fix https://github.com/chrislusf/seaweedfs/issues/1005
pull/1020/head
Chris Lu 6 years ago
parent
commit
1d1b355f9e
  1. 10
      weed/server/filer_server_handlers_write.go

10
weed/server/filer_server_handlers_write.go

@ -150,16 +150,16 @@ func (fs *FilerServer) updateFilerStore(ctx context.Context, r *http.Request, w
}() }()
path := r.URL.Path path := r.URL.Path
if strings.HasSuffix(path, "/") {
if ret.Name != "" {
path += ret.Name
}
}
existingEntry, err := fs.filer.FindEntry(ctx, filer2.FullPath(path)) existingEntry, err := fs.filer.FindEntry(ctx, filer2.FullPath(path))
crTime := time.Now() crTime := time.Now()
if err == nil && existingEntry != nil { 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{ entry := &filer2.Entry{
FullPath: filer2.FullPath(path), FullPath: filer2.FullPath(path),
Attr: filer2.Attr{ Attr: filer2.Attr{

Loading…
Cancel
Save