Infrastructure/Cloudreve
0
Fork 0
Code Issues Pull requests Activity

Fix: trigger err when move folder into itself (#1128)

Browse source
This commit is contained in:
vvisionnn 2022-02-04 12:07:56 +08:00 • committed by GitHub
parent c31c77a089
commit c84d0114ae
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
models/folder.go
View file

@ -263,6 +263,13 @@ func (folder *Folder) CopyFolderTo(folderID uint, dstFolder *Folder) (size uint6
// MoveFolderTo 将folder目录下的dirs子目录复制或移动到dstFolder， // MoveFolderTo 将folder目录下的dirs子目录复制或移动到dstFolder，
// 返回此过程中增加的容量 // 返回此过程中增加的容量
func (folder *Folder) MoveFolderTo(dirs []uint, dstFolder *Folder) error { func (folder *Folder) MoveFolderTo(dirs []uint, dstFolder *Folder) error {
// 如果目标位置为待移动的目录，会导致 parent 为自己
// 造成死循环且无法被除搜索以外的组件展示
if folder.OwnerID == dstFolder.OwnerID && util.ContainsUint(dirs, dstFolder.ID) {
return errors.New("cannot move a folder into itself")
}
// 更改顶级要移动目录的父目录指向 // 更改顶级要移动目录的父目录指向
err := DB.Model(Folder{}).Where( err := DB.Model(Folder{}).Where(
"id in (?) and owner_id = ? and parent_id = ?", "id in (?) and owner_id = ? and parent_id = ?",

7
models/folder_test.go
View file

@ -494,6 +494,7 @@ func TestFolder_MoveOrCopyFolderTo_Move(t *testing.T) {
// 目标目录 // 目标目录
dstFolder := Folder{ dstFolder := Folder{
Model: gorm.Model{ID: 10}, Model: gorm.Model{ID: 10},
OwnerID: 1,
} }
// 成功 // 成功
@ -507,6 +508,12 @@ func TestFolder_MoveOrCopyFolderTo_Move(t *testing.T) {
asserts.NoError(mock.ExpectationsWereMet()) asserts.NoError(mock.ExpectationsWereMet())
asserts.NoError(err) asserts.NoError(err)
} }
// 移动自己到自己内部，失败
{
err := parFolder.MoveFolderTo([]uint{10, 2}, &dstFolder)
asserts.Error(err)
}
} }
func TestFolder_FileInfoInterface(t *testing.T) { func TestFolder_FileInfoInterface(t *testing.T) {