johanels/rclone
1
0
Fork 0
mirror of https://github.com/rclone/rclone.git synced 2025-12-11 22:14:05 +01:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

serve webdav: fix serveDir not being updated with changes from webdav

Browse Source 
Fixes an issue where changes such as renaming done using webdav
would not be reflected in the html directory listing
This commit is contained in:
Gary Kim
2019-06-13 17:51:16 +08:00
committed by Nick Craig-Wood
parent 5597d6d871
commit 6e8e620e71
3 changed files with 55 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
cmd/serve/http/http.go
View File

@@ -43,7 +43,7 @@ control the stats printing.
cmd.CheckArgs(1, 1, command, args)
f := cmd.NewFsSrc(args)
cmd.Run(false, true, command, func() error {
s := NewServer(f, &httpflags.Opt)
s := newServer(f, &httpflags.Opt)
err := s.Serve()
if err != nil {
return err
@@ -54,29 +54,28 @@ control the stats printing.
},
}
// Server contains everything to run the Server
type Server struct {
// server contains everything to run the server
type server struct {
*httplib.Server
f fs.Fs
vfs *vfs.VFS
}
// NewServer creates a new http server
func NewServer(f fs.Fs, opt *httplib.Options) *Server {
func newServer(f fs.Fs, opt *httplib.Options) *server {
mux := http.NewServeMux()
s := &Server{
s := &server{
Server: httplib.NewServer(mux, opt),
f: f,
vfs: vfs.New(f, &vfsflags.Opt),
}
mux.HandleFunc("/", s.Handler)
mux.HandleFunc("/", s.handler)
return s
}
// Serve runs the http Server in the background.
// Serve runs the http server in the background.
//
// Use s.Close() and s.Wait() to shutdown Server
func (s *Server) Serve() error {
// Use s.Close() and s.Wait() to shutdown server
func (s *server) Serve() error {
err := s.Server.Serve()
if err != nil {
return err
@@ -85,8 +84,8 @@ func (s *Server) Serve() error {
return nil
}
// Handler reads incoming requests and dispatches them
func (s *Server) Handler(w http.ResponseWriter, r *http.Request) {
// handler reads incoming requests and dispatches them
func (s *server) handler(w http.ResponseWriter, r *http.Request) {
if r.Method != "GET" && r.Method != "HEAD" {
http.Error(w, "Method not allowed", http.StatusMethodNotAllowed)
return
@@ -105,7 +104,7 @@ func (s *Server) Handler(w http.ResponseWriter, r *http.Request) {
}
// serveDir serves a directory index at dirRemote
func (s *Server) serveDir(w http.ResponseWriter, r *http.Request, dirRemote string) {
func (s *server) serveDir(w http.ResponseWriter, r *http.Request, dirRemote string) {
// List the directory
node, err := s.vfs.Stat(dirRemote)
if err == vfs.ENOENT {
@@ -136,7 +135,7 @@ func (s *Server) serveDir(w http.ResponseWriter, r *http.Request, dirRemote stri
}
// serveFile serves a file object at remote
func (s *Server) serveFile(w http.ResponseWriter, r *http.Request, remote string) {
func (s *server) serveFile(w http.ResponseWriter, r *http.Request, remote string) {
node, err := s.vfs.Stat(remote)
if err == vfs.ENOENT {
fs.Infof(remote, "%s: File not found", r.RemoteAddr)