wsy182/Cloudreve
1
0
Fork 0
mirror of https://github.com/halejohn/Cloudreve.git synced 2026-01-26 09:34:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

Test: delete objects related methods

Browse Source
This commit is contained in:
HFO4
2019-12-01 14:31:29 +08:00
parent ceb25ce1c3
commit 081c92067f
10 changed files with 647 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/filesystem/errors.go
View File

@@ -18,4 +18,5 @@ var (
ErrObjectNotExist = serializer.NewError(404, "文件不存在", nil)
ErrIO = serializer.NewError(serializer.CodeIOFailed, "无法读取文件数据", nil)
ErrDBListObjects = serializer.NewError(serializer.CodeDBError, "无法列取对象记录", nil)
ErrDBDeleteObjects = serializer.NewError(serializer.CodeDBError, "无法删除对象记录", nil)
)

8
pkg/filesystem/file.go
View File

@@ -138,13 +138,13 @@ func (fs *FileSystem) GroupFileByPolicy(ctx context.Context, files []model.File)
var policyGroup = make(map[uint][]*model.File)
for key := range files {
if file, ok := policyGroup[files[key].GetPolicy().ID]; ok {
if file, ok := policyGroup[files[key].PolicyID]; ok {
// 如果已存在分组，直接追加
policyGroup[files[key].GetPolicy().ID] = append(file, &files[key])
policyGroup[files[key].PolicyID] = append(file, &files[key])
} else {
// 分布不存在，创建
policyGroup[files[key].GetPolicy().ID] = make([]*model.File, 0)
policyGroup[files[key].GetPolicy().ID] = append(policyGroup[files[key].GetPolicy().ID], &files[key])
policyGroup[files[key].PolicyID] = make([]*model.File, 0)
policyGroup[files[key].PolicyID] = append(policyGroup[files[key].PolicyID], &files[key])
}
}

109
pkg/filesystem/file_test.go
View File

@@ -139,3 +139,112 @@ func TestFileSystem_GetDownloadContent(t *testing.T) {
asserts.NoError(err)
asserts.NoError(mock.ExpectationsWereMet())
}
func TestFileSystem_GroupFileByPolicy(t *testing.T) {
asserts := assert.New(t)
ctx := context.Background()
files := []model.File{
model.File{
PolicyID: 1,
Name: "1_1.txt",
},
model.File{
PolicyID: 2,
Name: "2_1.txt",
},
model.File{
PolicyID: 3,
Name: "3_1.txt",
},
model.File{
PolicyID: 2,
Name: "2_2.txt",
},
model.File{
PolicyID: 1,
Name: "1_2.txt",
},
}
fs := FileSystem{}
policyGroup := fs.GroupFileByPolicy(ctx, files)
asserts.Equal(map[uint][]*model.File{
1: {&files[0], &files[4]},
2: {&files[1], &files[3]},
3: {&files[2]},
}, policyGroup)
}
func TestFileSystem_deleteGroupedFile(t *testing.T) {
asserts := assert.New(t)
ctx := context.Background()
fs := FileSystem{}
files := []model.File{
{
PolicyID: 1,
Name: "1_1.txt",
SourceName: "1_1.txt",
Policy: model.Policy{Model: gorm.Model{ID: 1}, Type: "local"},
},
{
PolicyID: 2,
Name: "2_1.txt",
SourceName: "2_1.txt",
Policy: model.Policy{Model: gorm.Model{ID: 1}, Type: "local"},
},
{
PolicyID: 3,
Name: "3_1.txt",
SourceName: "3_1.txt",
Policy: model.Policy{Model: gorm.Model{ID: 1}, Type: "local"},
},
{
PolicyID: 2,
Name: "2_2.txt",
SourceName: "2_2.txt",
Policy: model.Policy{Model: gorm.Model{ID: 1}, Type: "local"},
},
{
PolicyID: 1,
Name: "1_2.txt",
SourceName: "1_2.txt",
Policy: model.Policy{Model: gorm.Model{ID: 1}, Type: "local"},
},
}
// 全部失败
{
failed := fs.deleteGroupedFile(ctx, fs.GroupFileByPolicy(ctx, files))
asserts.Equal(map[uint][]string{
1: {"1_1.txt", "1_2.txt"},
2: {"2_1.txt", "2_2.txt"},
3: {"3_1.txt"},
}, failed)
}
// 部分失败
{
file, err := os.Create("1_1.txt")
asserts.NoError(err)
_ = file.Close()
failed := fs.deleteGroupedFile(ctx, fs.GroupFileByPolicy(ctx, files))
asserts.Equal(map[uint][]string{
1: {"1_2.txt"},
2: {"2_1.txt", "2_2.txt"},
3: {"3_1.txt"},
}, failed)
}
// 部分失败,包含整组未知存储策略导致的失败
{
file, err := os.Create("1_1.txt")
asserts.NoError(err)
_ = file.Close()
files[1].Policy.Type = "unknown"
files[3].Policy.Type = "unknown"
failed := fs.deleteGroupedFile(ctx, fs.GroupFileByPolicy(ctx, files))
asserts.Equal(map[uint][]string{
1: {"1_2.txt"},
2: {"2_1.txt", "2_2.txt"},
3: {"3_1.txt"},
}, failed)
}
}

8
pkg/filesystem/path.go
View File

@@ -67,8 +67,8 @@ func (fs *FileSystem) Delete(ctx context.Context, dirs, files []string) error {
// TODO 删除失败时不删除文件记录及父目录
} else {
deletedFileIDs = append(deletedFileIDs, fs.FileTarget[i].ID)
deletedStorage[fs.FileTarget[i].ID] = fs.FileTarget[i].Size
}
deletedStorage[fs.FileTarget[i].ID] = fs.FileTarget[i].Size
allFileIDs = append(allFileIDs, fs.FileTarget[i].ID)
}
}
@@ -76,7 +76,7 @@ func (fs *FileSystem) Delete(ctx context.Context, dirs, files []string) error {
// 删除文件记录
err := model.DeleteFileByIDs(allFileIDs)
if err != nil {
return ErrDBListObjects.WithError(err)
return ErrDBDeleteObjects.WithError(err)
}
// 归还容量
@@ -84,7 +84,7 @@ func (fs *FileSystem) Delete(ctx context.Context, dirs, files []string) error {
for _, value := range deletedStorage {
total += value
}
fs.User.IncreaseStorage(total)
fs.User.DeductionStorage(total)
// 删除目录
var allFolderIDs = make([]uint, 0, len(fs.DirTarget))
@@ -93,7 +93,7 @@ func (fs *FileSystem) Delete(ctx context.Context, dirs, files []string) error {
}
err = model.DeleteFolderByIDs(allFolderIDs)
if err != nil {
return ErrDBListObjects.WithError(err)
return ErrDBDeleteObjects.WithError(err)
}
if notDeleted := len(fs.FileTarget) - len(deletedFileIDs); notDeleted > 0 {

192
pkg/filesystem/path_test.go
View File

@@ -2,10 +2,13 @@ package filesystem
import (
"context"
"errors"
"github.com/DATA-DOG/go-sqlmock"
model "github.com/HFO4/cloudreve/models"
"github.com/HFO4/cloudreve/pkg/serializer"
"github.com/jinzhu/gorm"
"github.com/stretchr/testify/assert"
"os"
"testing"
)
@@ -170,3 +173,192 @@ func TestFileSystem_CreateDirectory(t *testing.T) {
asserts.NoError(err)
asserts.NoError(mock.ExpectationsWereMet())
}
func TestFileSystem_ListDeleteFiles(t *testing.T) {
asserts := assert.New(t)
fs := &FileSystem{User: &model.User{
Model: gorm.Model{
ID: 1,
},
}}
// 成功
{
mock.ExpectQuery("SELECT(.+)").WillReturnRows(sqlmock.NewRows([]string{"id", "name"}).AddRow(1, "1.txt").AddRow(2, "2.txt"))
err := fs.ListDeleteFiles(context.Background(), []string{"/"})
asserts.NoError(err)
asserts.NoError(mock.ExpectationsWereMet())
}
// 失败
{
mock.ExpectQuery("SELECT(.+)").WillReturnError(errors.New("error"))
err := fs.ListDeleteFiles(context.Background(), []string{"/"})
asserts.Error(err)
asserts.Equal(serializer.CodeDBError, err.(serializer.AppError).Code)
asserts.NoError(mock.ExpectationsWereMet())
}
}
func TestFileSystem_ListDeleteDirs(t *testing.T) {
asserts := assert.New(t)
fs := &FileSystem{User: &model.User{
Model: gorm.Model{
ID: 1,
},
}}
// 成功
{
mock.ExpectQuery("SELECT(.+)").
WillReturnRows(
sqlmock.NewRows([]string{"id"}).
AddRow(1).
AddRow(2).
AddRow(3),
)
mock.ExpectQuery("SELECT(.+)").
WithArgs(1, 2, 3).
WillReturnRows(
sqlmock.NewRows([]string{"id", "name"}).
AddRow(4, "1.txt").
AddRow(5, "2.txt").
AddRow(6, "3.txt"),
)
err := fs.ListDeleteDirs(context.Background(), []string{"/"})
asserts.NoError(err)
asserts.Len(fs.FileTarget, 3)
asserts.Len(fs.DirTarget, 3)
asserts.NoError(mock.ExpectationsWereMet())
}
// 检索文件发生错误
{
mock.ExpectQuery("SELECT(.+)").
WillReturnRows(
sqlmock.NewRows([]string{"id"}).
AddRow(1).
AddRow(2).
AddRow(3),
)
mock.ExpectQuery("SELECT(.+)").
WithArgs(1, 2, 3).
WillReturnError(errors.New("error"))
err := fs.ListDeleteDirs(context.Background(), []string{"/"})
asserts.Error(err)
asserts.Len(fs.DirTarget, 6)
asserts.NoError(mock.ExpectationsWereMet())
}
// 检索目录发生错误
{
mock.ExpectQuery("SELECT(.+)").
WillReturnError(errors.New("error"))
err := fs.ListDeleteDirs(context.Background(), []string{"/"})
asserts.Error(err)
asserts.NoError(mock.ExpectationsWereMet())
}
}
func TestFileSystem_Delete(t *testing.T) {
asserts := assert.New(t)
fs := &FileSystem{User: &model.User{
Model: gorm.Model{
ID: 1,
},
Storage: 3,
Group: model.Group{MaxStorage: 3},
}}
ctx := context.Background()
// 全部未成功
{
mock.ExpectQuery("SELECT(.+)").
WillReturnRows(
sqlmock.NewRows([]string{"id"}).
AddRow(1).
AddRow(2).
AddRow(3),
)
mock.ExpectQuery("SELECT(.+)").
WithArgs(1, 2, 3).
WillReturnRows(
sqlmock.NewRows([]string{"id", "name", "source_name", "policy_id", "size"}).
AddRow(4, "1.txt", "1.txt", 2, 1),
)
mock.ExpectQuery("SELECT(.+)").WillReturnRows(sqlmock.NewRows([]string{"id", "name", "source_name", "policy_id", "size"}).AddRow(1, "1.txt", "1.txt", 1, 2))
mock.ExpectQuery("SELECT(.+)files(.+)").
WillReturnRows(sqlmock.NewRows([]string{"id", "policy_id", "source_name"}))
// 查询上传策略
mock.ExpectQuery("SELECT(.+)").WillReturnRows(sqlmock.NewRows([]string{"id", "type"}).AddRow(1, "local"))
mock.ExpectQuery("SELECT(.+)").WillReturnRows(sqlmock.NewRows([]string{"id", "type"}).AddRow(1, "local"))
// 删除文件记录
mock.ExpectBegin()
mock.ExpectExec("UPDATE(.+)delete(.+)").
WillReturnResult(sqlmock.NewResult(0, 3))
mock.ExpectCommit()
// 归还容量
mock.ExpectBegin()
mock.ExpectExec("UPDATE(.+)").
WillReturnResult(sqlmock.NewResult(0, 3))
mock.ExpectCommit()
// 删除目录
mock.ExpectBegin()
mock.ExpectExec("UPDATE(.+)delete(.+)").
WillReturnResult(sqlmock.NewResult(0, 3))
mock.ExpectCommit()
err := fs.Delete(ctx, []string{"/"}, []string{"2.txt"})
asserts.Error(err)
asserts.Equal(203, err.(serializer.AppError).Code)
asserts.Equal(uint64(0), fs.User.Storage)
}
// 全部成功
{
file, err := os.Create("1.txt")
file2, err := os.Create("2.txt")
file.Close()
file2.Close()
asserts.NoError(err)
mock.ExpectQuery("SELECT(.+)").
WillReturnRows(
sqlmock.NewRows([]string{"id"}).
AddRow(1).
AddRow(2).
AddRow(3),
)
mock.ExpectQuery("SELECT(.+)").
WithArgs(1, 2, 3).
WillReturnRows(
sqlmock.NewRows([]string{"id", "name", "source_name", "policy_id", "size"}).
AddRow(4, "1.txt", "1.txt", 2, 1),
)
mock.ExpectQuery("SELECT(.+)").WillReturnRows(sqlmock.NewRows([]string{"id", "name", "source_name", "policy_id", "size"}).AddRow(1, "2.txt", "2.txt", 1, 2))
mock.ExpectQuery("SELECT(.+)files(.+)").
WillReturnRows(sqlmock.NewRows([]string{"id", "policy_id", "source_name"}))
// 查询上传策略
mock.ExpectQuery("SELECT(.+)").WillReturnRows(sqlmock.NewRows([]string{"id", "type"}).AddRow(1, "local"))
mock.ExpectQuery("SELECT(.+)").WillReturnRows(sqlmock.NewRows([]string{"id", "type"}).AddRow(1, "local"))
// 删除文件记录
mock.ExpectBegin()
mock.ExpectExec("UPDATE(.+)delete(.+)").
WillReturnResult(sqlmock.NewResult(0, 3))
mock.ExpectCommit()
// 归还容量
mock.ExpectBegin()
mock.ExpectExec("UPDATE(.+)").
WillReturnResult(sqlmock.NewResult(0, 3))
mock.ExpectCommit()
// 删除目录
mock.ExpectBegin()
mock.ExpectExec("UPDATE(.+)delete(.+)").
WillReturnResult(sqlmock.NewResult(0, 3))
mock.ExpectCommit()
fs.FileTarget = []model.File{}
fs.DirTarget = []model.Folder{}
err = fs.Delete(ctx, []string{"/"}, []string{"2.txt"})
asserts.NoError(err)
asserts.Equal(uint64(0), fs.User.Storage)
}
}

37
pkg/util/common_test.go
View File

@@ -25,3 +25,40 @@ func TestRandStringRunes(t *testing.T) {
sameLenStr2 := RandStringRunes(32)
asserts.NotEqual(sameLenStr1, sameLenStr2)
}
func TestContainsUint(t *testing.T) {
asserts := assert.New(t)
asserts.True(ContainsUint([]uint{0, 2, 3, 65, 4}, 65))
asserts.True(ContainsUint([]uint{65}, 65))
asserts.False(ContainsUint([]uint{65}, 6))
}
func TestContainsString(t *testing.T) {
asserts := assert.New(t)
asserts.True(ContainsString([]string{"", "1"}, ""))
asserts.True(ContainsString([]string{"", "1"}, "1"))
asserts.False(ContainsString([]string{"", "1"}, " "))
}
func TestReplace(t *testing.T) {
asserts := assert.New(t)
asserts.Equal("origin", Replace(map[string]string{
"123": "321",
}, "origin"))
asserts.Equal("321origin321", Replace(map[string]string{
"123": "321",
}, "123origin123"))
asserts.Equal("321new321", Replace(map[string]string{
"123": "321",
"origin": "new",
}, "123origin123"))
}
func TestBuildRegexp(t *testing.T) {
asserts := assert.New(t)
asserts.Equal("^/dir/", BuildRegexp([]string{"/dir"}, "^", "/", "|"))
asserts.Equal("^/dir/|^/dir/di\\*r/", BuildRegexp([]string{"/dir", "/dir/di*r"}, "^", "/", "|"))
}