mirror of
https://github.com/halejohn/Cloudreve.git
synced 2026-01-26 09:34:57 +08:00
Fix: uint may overflow / Test: get user storage
This commit is contained in:
@@ -107,6 +107,7 @@ func (fs *FileSystem) GetContent(ctx context.Context, path string) (io.ReadSeeke
|
||||
// 返回每个分组失败的文件列表
|
||||
func (fs *FileSystem) deleteGroupedFile(ctx context.Context, files map[uint][]*model.File) map[uint][]string {
|
||||
// 失败的文件列表
|
||||
// TODO 并行删除
|
||||
failed := make(map[uint][]string, len(files))
|
||||
|
||||
for policyID, toBeDeletedFiles := range files {
|
||||
|
||||
@@ -7,6 +7,7 @@ import (
|
||||
"github.com/HFO4/cloudreve/pkg/serializer"
|
||||
"github.com/HFO4/cloudreve/pkg/util"
|
||||
"path"
|
||||
"sync"
|
||||
)
|
||||
|
||||
/* =================
|
||||
@@ -209,12 +210,25 @@ func (fs *FileSystem) List(ctx context.Context, dirPath string, pathProcessor fu
|
||||
return []Object{}, nil
|
||||
}
|
||||
|
||||
var wg sync.WaitGroup
|
||||
var childFolders []model.Folder
|
||||
var childFiles []model.File
|
||||
wg.Add(2)
|
||||
|
||||
// 获取子目录
|
||||
childFolders, _ := folder.GetChildFolder()
|
||||
go func() {
|
||||
childFolders, _ = folder.GetChildFolder()
|
||||
wg.Done()
|
||||
}()
|
||||
|
||||
// 获取子文件
|
||||
childFiles, _ := folder.GetChildFile()
|
||||
go func() {
|
||||
childFiles, _ = folder.GetChildFile()
|
||||
wg.Done()
|
||||
}()
|
||||
|
||||
// 汇总处理结果
|
||||
wg.Wait()
|
||||
objects := make([]Object, 0, len(childFiles)+len(childFolders))
|
||||
// 所有对象的父目录
|
||||
var processedPath string
|
||||
|
||||
@@ -299,17 +299,17 @@ func TestFileSystem_Delete(t *testing.T) {
|
||||
mock.ExpectQuery("SELECT(.+)").WillReturnRows(sqlmock.NewRows([]string{"id", "type"}).AddRow(1, "local"))
|
||||
// 删除文件记录
|
||||
mock.ExpectBegin()
|
||||
mock.ExpectExec("DELETE(.+)").
|
||||
mock.ExpectExec("DELETE(.+)files").
|
||||
WillReturnResult(sqlmock.NewResult(0, 3))
|
||||
mock.ExpectCommit()
|
||||
// 归还容量
|
||||
mock.ExpectBegin()
|
||||
mock.ExpectExec("UPDATE(.+)").
|
||||
mock.ExpectExec("UPDATE(.+)users").
|
||||
WillReturnResult(sqlmock.NewResult(0, 3))
|
||||
mock.ExpectCommit()
|
||||
// 删除目录
|
||||
mock.ExpectBegin()
|
||||
mock.ExpectExec("DELETE(.+)").
|
||||
mock.ExpectExec("DELETE(.+)folders").
|
||||
WillReturnResult(sqlmock.NewResult(0, 3))
|
||||
mock.ExpectCommit()
|
||||
|
||||
|
||||
Reference in New Issue
Block a user