From 0c9dcec9cdcb0416e630116adee090b4640635e8 Mon Sep 17 00:00:00 2001 From: jack roble <74554363+0daysseus@users.noreply.github.com> Date: Fri, 19 Apr 2024 05:22:16 -0400 Subject: [PATCH] fix: init storages in order (#6346) --- internal/bootstrap/storage.go | 4 ++-- internal/db/storage.go | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/internal/bootstrap/storage.go b/internal/bootstrap/storage.go index 44af99c56e1..86288edcb16 100644 --- a/internal/bootstrap/storage.go +++ b/internal/bootstrap/storage.go @@ -21,8 +21,8 @@ func LoadStorages() { if err != nil { utils.Log.Errorf("failed get enabled storages: %+v", err) } else { - utils.Log.Infof("success load storage: [%s], driver: [%s]", - storages[i].MountPath, storages[i].Driver) + utils.Log.Infof("success load storage: [%s], driver: [%s], order: [%d]", + storages[i].MountPath, storages[i].Driver, storages[i].Order) } } conf.StoragesLoaded = true diff --git a/internal/db/storage.go b/internal/db/storage.go index 105bc0aafda..d4e0730f064 100644 --- a/internal/db/storage.go +++ b/internal/db/storage.go @@ -2,6 +2,7 @@ package db import ( "fmt" + "sort" "github.com/alist-org/alist/v3/internal/model" "github.com/pkg/errors" @@ -65,5 +66,8 @@ func GetEnabledStorages() ([]model.Storage, error) { if err := db.Where(fmt.Sprintf("%s = ?", columnName("disabled")), false).Find(&storages).Error; err != nil { return nil, errors.WithStack(err) } + sort.Slice(storages, func(i, j int) bool { + return storages[i].Order < storages[j].Order + }) return storages, nil }