1f349/go-webdav
4
0
Fork 0
mirror of https://github.com/1f349/go-webdav.git synced 2024-12-22 08:14:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

webdav: FileSystem.Create() returns FileInfo and is used to set PUT response headers

Browse Source
This commit is contained in:
Thomas Müller 2024-04-17 14:48:24 +02:00 committed by Simon Ser
parent 948f33c2fc
commit ffd81465fd
2 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
fs_local.go
View File

@ -114,25 +114,25 @@ func (fs LocalFileSystem) ReadDir(ctx context.Context, name string, recursive bo
return l, errFromOS(err) return l, errFromOS(err)
} }
func (fs LocalFileSystem) Create(ctx context.Context, name string, body io.ReadCloser) error { func (fs LocalFileSystem) Create(ctx context.Context, name string, body io.ReadCloser) (*FileInfo, error) {
p, err := fs.localPath(name) p, err := fs.localPath(name)
if err != nil { if err != nil {
return err return nil, err
} }
wc, err := os.Create(p) wc, err := os.Create(p)
if err != nil { if err != nil {
return errFromOS(err) return nil, errFromOS(err)
} }
defer wc.Close() defer wc.Close()
if _, err := io.Copy(wc, body); err != nil { if _, err := io.Copy(wc, body); err != nil {
return err return nil, err
} }
if err := wc.Close(); err != nil { if err := wc.Close(); err != nil {
return err return nil, err
} }
return nil return fs.Stat(ctx, name)
} }
func (fs LocalFileSystem) RemoveAll(ctx context.Context, name string) error { func (fs LocalFileSystem) RemoveAll(ctx context.Context, name string) error {

18
server.go
View File

@ -17,7 +17,7 @@ type FileSystem interface {
Open(ctx context.Context, name string) (io.ReadCloser, error) Open(ctx context.Context, name string) (io.ReadCloser, error)
Stat(ctx context.Context, name string) (*FileInfo, error) Stat(ctx context.Context, name string) (*FileInfo, error)
ReadDir(ctx context.Context, name string, recursive bool) ([]FileInfo, error) ReadDir(ctx context.Context, name string, recursive bool) ([]FileInfo, error)
Create(ctx context.Context, name string, body io.ReadCloser) error Create(ctx context.Context, name string, body io.ReadCloser) (*FileInfo, error)
RemoveAll(ctx context.Context, name string) error RemoveAll(ctx context.Context, name string) error
Mkdir(ctx context.Context, name string) error Mkdir(ctx context.Context, name string) error
Copy(ctx context.Context, name, dest string, options *CopyOptions) (created bool, err error) Copy(ctx context.Context, name, dest string, options *CopyOptions) (created bool, err error)
@ -45,7 +45,7 @@ func (h *Handler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
// NewHTTPError creates a new error that is associated with an HTTP status code // NewHTTPError creates a new error that is associated with an HTTP status code
// and optionally an error that lead to it. Backends can use this functions to // and optionally an error that lead to it. Backends can use this functions to
// return errors that convey some semantics (e.g. 404 not found, 403 access // return errors that convey some semantics (e.g. 404 not found, 403 access
// denied, etc) while also providing an (optional) arbitrary error context // denied, etc.) while also providing an (optional) arbitrary error context
// (intended for humans). // (intended for humans).
func NewHTTPError(statusCode int, cause error) error { func NewHTTPError(statusCode int, cause error) error {
return &internal.HTTPError{Code: statusCode, Err: cause} return &internal.HTTPError{Code: statusCode, Err: cause}
@ -194,14 +194,22 @@ func (b *backend) PropPatch(r *http.Request, update *internal.PropertyUpdate) (*
} }
func (b *backend) Put(w http.ResponseWriter, r *http.Request) error { func (b *backend) Put(w http.ResponseWriter, r *http.Request) error {
err := b.FileSystem.Create(r.Context(), r.URL.Path, r.Body) fi, err := b.FileSystem.Create(r.Context(), r.URL.Path, r.Body)
if err != nil { if err != nil {
return err return err
} }
w.Header().Set("Content-Length", strconv.FormatInt(fi.Size, 10))
if fi.MIMEType != "" {
w.Header().Set("Content-Type", fi.MIMEType)
}
if !fi.ModTime.IsZero() {
w.Header().Set("Last-Modified", fi.ModTime.UTC().Format(http.TimeFormat))
}
if fi.ETag != "" {
w.Header().Set("ETag", internal.ETag(fi.ETag).String())
}
w.WriteHeader(http.StatusCreated) w.WriteHeader(http.StatusCreated)
// TODO: Last-Modified, ETag, Content-Type if the request has been copied
// verbatim
// TODO: http.StatusNoContent if the resource already existed // TODO: http.StatusNoContent if the resource already existed
return nil return nil
} }