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

chore: rename `index` to `order` of storage

pull/1628/head
Noah Hsu 2022-09-07 15:55:15 +08:00
parent 53fc2f32d8
commit 71d30b6819
6 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
internal/aria2/aria2_test.go
View File

@ -42,7 +42,7 @@ func TestDown(t *testing.T) {
err := op.CreateStorage(context.Background(), model.Storage{ err := op.CreateStorage(context.Background(), model.Storage{
ID: 0, ID: 0,
MountPath: "/", MountPath: "/",
Index: 0, Order: 0,
Driver: "Local", Driver: "Local",
Status: "", Status: "",
Addition: `{"root_folder":"../../data"}`, Addition: `{"root_folder":"../../data"}`,

2
internal/bootstrap/data/dev.go
View File

@ -14,7 +14,7 @@ import (
func initDevData() { func initDevData() {
err := op.CreateStorage(context.Background(), model.Storage{ err := op.CreateStorage(context.Background(), model.Storage{
MountPath: "/", MountPath: "/",
Index: 0, Order: 0,
Driver: "Local", Driver: "Local",
Status: "", Status: "",
Addition: `{"root_folder":"."}`, Addition: `{"root_folder":"."}`,

2
internal/model/storage.go
View File

@ -5,7 +5,7 @@ import "time"
type Storage struct { type Storage struct {
ID uint `json:"id" gorm:"primaryKey"` // unique key ID uint `json:"id" gorm:"primaryKey"` // unique key
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 Order int `json:"order"` // use to sort
Driver string `json:"driver"` // driver used Driver string `json:"driver"` // driver used
CacheExpiration int `json:"cache_expiration"` // cache expire time CacheExpiration int `json:"cache_expiration"` // cache expire time
Status string `json:"status"` Status string `json:"status"`

9
internal/op/driver.go
View File

@ -60,15 +60,12 @@ func getMainItems(config driver.Config) []driver.Item {
Required: true, Required: true,
Help: "", Help: "",
}, { }, {
Name: "index", Name: "order",
Type: conf.TypeNumber, Type: conf.TypeNumber,
Help: "use to sort", Help: "use to sort",
}, { }, {
Name: "remark", Name: "remark",
Type: conf.TypeText, Type: conf.TypeText,
}, {
Name: "down_proxy_url",
Type: conf.TypeText,
}} }}
if !config.NoCache { if !config.NoCache {
items = append(items, driver.Item{ items = append(items, driver.Item{
@ -100,6 +97,10 @@ func getMainItems(config driver.Config) []driver.Item {
Required: true, Required: true,
}) })
} }
items = append(items, driver.Item{
Name: "down_proxy_url",
Type: conf.TypeText,
})
if config.LocalSort { if config.LocalSort {
items = append(items, []driver.Item{{ items = append(items, []driver.Item{{
Name: "order_by", Name: "order_by",

4
internal/op/storage.go
View File

@ -268,10 +268,10 @@ func GetStorageVirtualFilesByPath(prefix string) []model.Obj {
files := make([]model.Obj, 0) files := make([]model.Obj, 0)
storages := storagesMap.Values() storages := storagesMap.Values()
sort.Slice(storages, func(i, j int) bool { sort.Slice(storages, func(i, j int) bool {
if storages[i].GetStorage().Index == storages[j].GetStorage().Index { if storages[i].GetStorage().Order == storages[j].GetStorage().Order {
return storages[i].GetStorage().MountPath < storages[j].GetStorage().MountPath return storages[i].GetStorage().MountPath < storages[j].GetStorage().MountPath
} }
return storages[i].GetStorage().Index < storages[j].GetStorage().Index return storages[i].GetStorage().Order < storages[j].GetStorage().Order
}) })
prefix = utils.StandardizePath(prefix) prefix = utils.StandardizePath(prefix)
if prefix != "/" { if prefix != "/" {

10
internal/op/storage_test.go
View File

@ -70,11 +70,11 @@ func TestGetBalancedStorage(t *testing.T) {
func setupStorages(t *testing.T) { func setupStorages(t *testing.T) {
var storages = []model.Storage{ var storages = []model.Storage{
{Driver: "Local", MountPath: "/a/b", Index: 0, Addition: `{"root_folder":"."}`}, {Driver: "Local", MountPath: "/a/b", Order: 0, Addition: `{"root_folder":"."}`},
{Driver: "Local", MountPath: "/a/c", Index: 1, Addition: `{"root_folder":"."}`}, {Driver: "Local", MountPath: "/a/c", Order: 1, Addition: `{"root_folder":"."}`},
{Driver: "Local", MountPath: "/a/d", Index: 2, Addition: `{"root_folder":"."}`}, {Driver: "Local", MountPath: "/a/d", Order: 2, Addition: `{"root_folder":"."}`},
{Driver: "Local", MountPath: "/a/d/e", Index: 3, Addition: `{"root_folder":"."}`}, {Driver: "Local", MountPath: "/a/d/e", Order: 3, Addition: `{"root_folder":"."}`},
{Driver: "Local", MountPath: "/a/d/e.balance", Index: 4, Addition: `{"root_folder":"."}`}, {Driver: "Local", MountPath: "/a/d/e.balance", Order: 4, Addition: `{"root_folder":"."}`},
} }
for _, storage := range storages { for _, storage := range storages {
err := op.CreateStorage(context.Background(), storage) err := op.CreateStorage(context.Background(), storage)