feat: sort obj list
This commit is contained in:
@ -2,16 +2,19 @@ package fs
|
||||
|
||||
import (
|
||||
"context"
|
||||
"github.com/alist-org/alist/v3/internal/db"
|
||||
"github.com/alist-org/alist/v3/internal/model"
|
||||
"github.com/alist-org/alist/v3/internal/operations"
|
||||
"github.com/alist-org/alist/v3/pkg/utils"
|
||||
"github.com/pkg/errors"
|
||||
log "github.com/sirupsen/logrus"
|
||||
)
|
||||
|
||||
// List files
|
||||
// TODO: hide
|
||||
// TODO: sort
|
||||
func list(ctx context.Context, path string) ([]model.Obj, error) {
|
||||
meta, _ := db.GetNearestMeta(path)
|
||||
user := ctx.Value("user").(*model.User)
|
||||
account, actualPath, err := operations.GetAccountAndActualPath(path)
|
||||
virtualFiles := operations.GetAccountVirtualFilesByPath(path)
|
||||
if err != nil {
|
||||
@ -20,18 +23,54 @@ func list(ctx context.Context, path string) ([]model.Obj, error) {
|
||||
}
|
||||
return nil, errors.WithMessage(err, "failed get account")
|
||||
}
|
||||
files, err := operations.List(ctx, account, actualPath)
|
||||
objs, err := operations.List(ctx, account, actualPath)
|
||||
if err != nil {
|
||||
log.Errorf("%+v", err)
|
||||
if len(virtualFiles) != 0 {
|
||||
return virtualFiles, nil
|
||||
}
|
||||
return nil, errors.WithMessage(err, "failed get files")
|
||||
return nil, errors.WithMessage(err, "failed get objs")
|
||||
}
|
||||
for _, accountFile := range virtualFiles {
|
||||
if !containsByName(files, accountFile) {
|
||||
files = append(files, accountFile)
|
||||
if !containsByName(objs, accountFile) {
|
||||
objs = append(objs, accountFile)
|
||||
}
|
||||
}
|
||||
return files, nil
|
||||
if whetherHide(user, meta, path) {
|
||||
hide(objs, meta)
|
||||
}
|
||||
// sort objs
|
||||
if account.Config().LocalSort {
|
||||
model.SortFiles(objs, account.GetAccount().OrderBy, account.GetAccount().OrderDirection)
|
||||
}
|
||||
model.ExtractFolder(objs, account.GetAccount().ExtractFolder)
|
||||
return objs, nil
|
||||
}
|
||||
|
||||
func whetherHide(user *model.User, meta *model.Meta, path string) bool {
|
||||
// if is admin, don't hide
|
||||
if user.IsAdmin() {
|
||||
return false
|
||||
}
|
||||
// if meta is nil, don't hide
|
||||
if meta == nil {
|
||||
return false
|
||||
}
|
||||
// if meta.Hide is empty, don't hide
|
||||
if meta.Hide == "" {
|
||||
return false
|
||||
}
|
||||
// if meta doesn't apply to sub_folder, don't hide
|
||||
if !utils.PathEqual(meta.Path, path) && !meta.SubFolder {
|
||||
return false
|
||||
}
|
||||
// if is guest, hide
|
||||
if user.IsGuest() {
|
||||
return true
|
||||
}
|
||||
return !user.IgnoreHide
|
||||
}
|
||||
|
||||
func hide(objs []model.Obj, meta *model.Meta) {
|
||||
// TODO: hide
|
||||
}
|
||||
|
Reference in New Issue
Block a user