github
/
Cloudreve
mirror of https://github.com/cloudreve/Cloudreve
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix: skip the wrong root folder in move path handler

pull/247/head
HFO4 2019-12-02 19:08:15 +08:00
parent adf7f3deeb
commit a13530f969
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
models/folder.go
View File

@ -162,14 +162,14 @@ func (folder *Folder) MoveFolderTo(dirs []string, dstFolder *Folder) error {
}
// 更新被移动的目录递归的子目录和文件
for _, toBeMoved := range subFolders {
for parKey, toBeMoved := range subFolders {
ignorePath := fullDirs[parKey]
// TODO 找到更好的修改办法
for key, subFolder := range toBeMoved {
for _, subFolder := range toBeMoved {
// 每个分组的第一个目录已经变更指向，直接跳过
if key > 0 {
newPosition := path.Join(dstFolder.PositionAbsolute, strings.Replace(subFolder.Position, folder.Position, "", 1))
if subFolder.PositionAbsolute != ignorePath {
newPosition := path.Join(dstFolder.PositionAbsolute, strings.Replace(subFolder.Position, folder.PositionAbsolute, "", 1))
DB.Model(&subFolder).Updates(map[string]interface{}{
"position": newPosition,
"position_absolute": path.Join(newPosition, subFolder.Name),