github
/
alist
mirror of https://github.com/Xhofe/alist
1
0
Fork 0
Code Issues Releases Wiki Activity

perf: return cache before check obj to reduce recursion

pull/1853/head
Noah Hsu 2022-09-28 21:19:36 +08:00
parent 4e13b1a83c
commit 451e418b18
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
internal/op/fs.go
View File

@ -38,6 +38,13 @@ func List(ctx context.Context, storage driver.Driver, path string, args model.Li
} }
path = utils.StandardizePath(path) path = utils.StandardizePath(path)
log.Debugf("op.List %s", path) log.Debugf("op.List %s", path)
key := Key(storage, path)
if len(refresh) == 0 || !refresh[0] {
if files, ok := listCache.Get(key); ok {
log.Debugf("use cache when list %s", path)
return files, nil
}
}
dir, err := Get(ctx, storage, path) dir, err := Get(ctx, storage, path)
if err != nil { if err != nil {
return nil, errors.WithMessage(err, "failed get dir") return nil, errors.WithMessage(err, "failed get dir")
@ -46,22 +53,14 @@ func List(ctx context.Context, storage driver.Driver, path string, args model.Li
if !dir.IsDir() { if !dir.IsDir() {
return nil, errors.WithStack(errs.NotFolder) return nil, errors.WithStack(errs.NotFolder)
} }
if storage.Config().NoCache {
objs, err := storage.List(ctx, dir, args)
return objs, errors.WithStack(err)
}
key := Key(storage, path)
if len(refresh) == 0 || !refresh[0] {
if files, ok := listCache.Get(key); ok && len(files) > 0 {
return files, nil
}
}
objs, err, _ := listG.Do(key, func() ([]model.Obj, error) { objs, err, _ := listG.Do(key, func() ([]model.Obj, error) {
files, err := storage.List(ctx, dir, args) files, err := storage.List(ctx, dir, args)
if err != nil { if err != nil {
return nil, errors.Wrapf(err, "failed to list objs") return nil, errors.Wrapf(err, "failed to list objs")
} }
listCache.Set(key, files, cache.WithEx[[]model.Obj](time.Minute*time.Duration(storage.GetStorage().CacheExpiration))) if !storage.Config().NoCache && len(files) > 0 {
listCache.Set(key, files, cache.WithEx[[]model.Obj](time.Minute*time.Duration(storage.GetStorage().CacheExpiration)))
}
return files, nil return files, nil
}) })
return objs, err return objs, err
@ -128,6 +127,7 @@ func Get(ctx context.Context, storage driver.Driver, path string) (model.Obj, er
return f, nil return f, nil
} }
} }
log.Debugf("cant find obj with name: %s", name)
return nil, errors.WithStack(errs.ObjectNotFound) return nil, errors.WithStack(errs.ObjectNotFound)
} }