ProjectHentai/alist
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: set cache_expiration for each storage (close #1455)

Browse Source
This commit is contained in:
Noah Hsu 2022-08-07 13:33:53 +08:00
parent 5b40254e3b
commit 2e8322e99b
4 changed files with 30 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
internal/conf/config.go
View File

@ -35,7 +35,7 @@ type Config struct {
Address string `json:"address" env:"ADDR"` Address string `json:"address" env:"ADDR"`
Port int `json:"port" env:"PORT"` Port int `json:"port" env:"PORT"`
JwtSecret string `json:"jwt_secret" env:"JWT_SECRET"` JwtSecret string `json:"jwt_secret" env:"JWT_SECRET"`
CaCheExpiration int `json:"cache_expiration" env:"CACHE_EXPIRATION"` // CaCheExpiration int `json:"cache_expiration" env:"CACHE_EXPIRATION"`
Assets string `json:"assets" env:"ASSETS"` Assets string `json:"assets" env:"ASSETS"`
Database Database `json:"database"` Database Database `json:"database"`
Scheme Scheme `json:"scheme"` Scheme Scheme `json:"scheme"`
@ -56,7 +56,7 @@ func DefaultConfig() *Config {
TablePrefix: "x_", TablePrefix: "x_",
DBFile: "data/data.db", DBFile: "data/data.db",
}, },
CaCheExpiration: 30, // CaCheExpiration: 30,
Log: LogConfig{ Log: LogConfig{
Enable: true, Enable: true,
Path: "log/%Y-%m-%d-%H:%M.log", Path: "log/%Y-%m-%d-%H:%M.log",

1
internal/model/storage.go
View File

@ -7,6 +7,7 @@ type Storage struct {
MountPath string `json:"mount_path" gorm:"unique" binding:"required"` // must be standardized MountPath string `json:"mount_path" gorm:"unique" binding:"required"` // must be standardized
Index int `json:"index"` // use to sort Index int `json:"index"` // use to sort
Driver string `json:"driver"` // driver used Driver string `json:"driver"` // driver used
CacheExpiration int `json:"cache_expiration"` // cache expire time
Status string `json:"status"` Status string `json:"status"`
Addition string `json:"addition" gorm:"type:text"` // Additional information, defined in the corresponding driver Addition string `json:"addition" gorm:"type:text"` // Additional information, defined in the corresponding driver
Remark string `json:"remark"` Remark string `json:"remark"`

9
internal/operations/driver.go
View File

@ -69,6 +69,15 @@ func getMainItems(config driver.Config) []driver.Item {
Name: "down_proxy_url", Name: "down_proxy_url",
Type: conf.TypeText, Type: conf.TypeText,
}} }}
if !config.NoCache {
items = append(items, driver.Item{
Name: "cache_expiration",
Type: conf.TypeNumber,
Default: "30",
Required: true,
Help: "The cache expiration time for this storage",
})
}
if !config.OnlyProxy && !config.OnlyLocal { if !config.OnlyProxy && !config.OnlyLocal {
items = append(items, []driver.Item{{ items = append(items, []driver.Item{{
Name: "web_proxy", Name: "web_proxy",

4
internal/operations/fs.go
View File

@ -8,7 +8,6 @@ import (
"time" "time"
"github.com/Xhofe/go-cache" "github.com/Xhofe/go-cache"
"github.com/alist-org/alist/v3/internal/conf"
"github.com/alist-org/alist/v3/internal/driver" "github.com/alist-org/alist/v3/internal/driver"
"github.com/alist-org/alist/v3/internal/errs" "github.com/alist-org/alist/v3/internal/errs"
"github.com/alist-org/alist/v3/internal/model" "github.com/alist-org/alist/v3/internal/model"
@ -53,8 +52,7 @@ func List(ctx context.Context, storage driver.Driver, path string, refresh ...bo
if err != nil { if err != nil {
return nil, errors.WithMessage(err, "failed to list files") return nil, errors.WithMessage(err, "failed to list files")
} }
// TODO: maybe can get duration from storage's config filesCache.Set(key, files, cache.WithEx[[]model.Obj](time.Minute*time.Duration(storage.GetStorage().CacheExpiration)))
filesCache.Set(key, files, cache.WithEx[[]model.Obj](time.Minute*time.Duration(conf.Conf.CaCheExpiration)))
return files, nil return files, nil
}) })
return files, err return files, err