feat: clear cache after change

refactor/fs
Noah Hsu 2022-06-30 22:51:49 +08:00
parent 2b1726614b
commit 53416172e7
5 changed files with 31 additions and 3 deletions

View File

@ -1,6 +1,7 @@
package fs package fs
import ( import (
"github.com/alist-org/alist/v3/internal/operations"
"io" "io"
"mime" "mime"
"net/http" "net/http"
@ -12,6 +13,14 @@ import (
"github.com/pkg/errors" "github.com/pkg/errors"
) )
func ClearCache(path string) {
account, actualPath, err := operations.GetAccountAndActualPath(path)
if err != nil {
return
}
operations.ClearCache(account, actualPath)
}
func containsByName(files []model.Obj, file model.Obj) bool { func containsByName(files []model.Obj, file model.Obj) bool {
for _, f := range files { for _, f := range files {
if f.GetName() == file.GetName() { if f.GetName() == file.GetName() {

View File

@ -22,6 +22,11 @@ import (
var filesCache = cache.NewMemCache(cache.WithShards[[]model.Obj](64)) var filesCache = cache.NewMemCache(cache.WithShards[[]model.Obj](64))
var filesG singleflight.Group[[]model.Obj] var filesG singleflight.Group[[]model.Obj]
func ClearCache(account driver.Driver, path string) {
key := stdpath.Join(account.GetAccount().VirtualPath, path)
filesCache.Del(key)
}
// List files in storage, not contains virtual file // List files in storage, not contains virtual file
func List(ctx context.Context, account driver.Driver, path string, refresh ...bool) ([]model.Obj, error) { func List(ctx context.Context, account driver.Driver, path string, refresh ...bool) ([]model.Obj, error) {
path = utils.StandardizePath(path) path = utils.StandardizePath(path)

View File

@ -41,6 +41,7 @@ func FsMkdir(c *gin.Context) {
common.ErrorResp(c, err, 500) common.ErrorResp(c, err, 500)
return return
} }
fs.ClearCache(stdpath.Dir(req.Path))
common.SuccessResp(c) common.SuccessResp(c)
} }
@ -81,6 +82,8 @@ func FsMove(c *gin.Context) {
return return
} }
} }
fs.ClearCache(req.SrcDir)
fs.ClearCache(req.DstDir)
common.SuccessResp(c) common.SuccessResp(c)
} }
@ -112,6 +115,9 @@ func FsCopy(c *gin.Context) {
return return
} }
} }
if len(req.Names) != len(addedTask) {
fs.ClearCache(req.DstDir)
}
if len(addedTask) > 0 { if len(addedTask) > 0 {
common.SuccessResp(c, fmt.Sprintf("Added %d tasks", len(addedTask))) common.SuccessResp(c, fmt.Sprintf("Added %d tasks", len(addedTask)))
} else { } else {
@ -140,11 +146,12 @@ func FsRename(c *gin.Context) {
common.ErrorResp(c, err, 500) common.ErrorResp(c, err, 500)
return return
} }
fs.ClearCache(stdpath.Dir(req.Path))
common.SuccessResp(c) common.SuccessResp(c)
} }
type RemoveReq struct { type RemoveReq struct {
Path string `json:"path"` Dir string `json:"dir"`
Names []string `json:"names"` Names []string `json:"names"`
} }
@ -163,14 +170,15 @@ func FsRemove(c *gin.Context) {
common.ErrorResp(c, errs.PermissionDenied, 403) common.ErrorResp(c, errs.PermissionDenied, 403)
return return
} }
req.Path = stdpath.Join(user.BasePath, req.Path) req.Dir = stdpath.Join(user.BasePath, req.Dir)
for _, name := range req.Names { for _, name := range req.Names {
err := fs.Remove(c, stdpath.Join(req.Path, name)) err := fs.Remove(c, stdpath.Join(req.Dir, name))
if err != nil { if err != nil {
common.ErrorResp(c, err, 500) common.ErrorResp(c, err, 500)
return return
} }
} }
fs.ClearCache(req.Dir)
common.SuccessResp(c) common.SuccessResp(c)
} }

View File

@ -31,6 +31,8 @@ func moveFiles(ctx context.Context, src, dst string, overwrite bool) (status int
if err != nil { if err != nil {
return http.StatusInternalServerError, err return http.StatusInternalServerError, err
} }
fs.ClearCache(path.Dir(src))
fs.ClearCache(path.Dir(dst))
// TODO if there are no files copy, should return 204 // TODO if there are no files copy, should return 204
return http.StatusCreated, nil return http.StatusCreated, nil
} }
@ -43,6 +45,7 @@ func copyFiles(ctx context.Context, src, dst string, overwrite bool) (status int
if err != nil { if err != nil {
return http.StatusInternalServerError, err return http.StatusInternalServerError, err
} }
fs.ClearCache(path.Dir(dst))
// TODO if there are no files copy, should return 204 // TODO if there are no files copy, should return 204
return http.StatusCreated, nil return http.StatusCreated, nil
} }

View File

@ -267,6 +267,7 @@ func (h *Handler) handleDelete(w http.ResponseWriter, r *http.Request) (status i
if err := fs.Remove(ctx, reqPath); err != nil { if err := fs.Remove(ctx, reqPath); err != nil {
return http.StatusMethodNotAllowed, err return http.StatusMethodNotAllowed, err
} }
fs.ClearCache(path.Dir(reqPath))
return http.StatusNoContent, nil return http.StatusNoContent, nil
} }
@ -311,6 +312,7 @@ func (h *Handler) handlePut(w http.ResponseWriter, r *http.Request) (status int,
return http.StatusInternalServerError, err return http.StatusInternalServerError, err
} }
w.Header().Set("ETag", etag) w.Header().Set("ETag", etag)
fs.ClearCache(path.Dir(reqPath))
return http.StatusCreated, nil return http.StatusCreated, nil
} }
@ -338,6 +340,7 @@ func (h *Handler) handleMkcol(w http.ResponseWriter, r *http.Request) (status in
} }
return http.StatusMethodNotAllowed, err return http.StatusMethodNotAllowed, err
} }
fs.ClearCache(path.Dir(reqPath))
return http.StatusCreated, nil return http.StatusCreated, nil
} }