evan/tank
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Refine the directories.

Browse Source
This commit is contained in:
zicla
2019-04-26 02:30:04 +08:00
parent 61b14fe82b
commit b3c52ea50e
40 changed files with 214 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
rest/dav_service.go
View File

@ -1,17 +1,17 @@
package rest
import (
"fmt"
"net/http"
"net/url"
"path"
"regexp"
"strings"
"tank/rest/dav"
"tank/rest/dav/xml"
"tank/rest/tool"
)
/**
*
* WebDav协议文档
@ -223,8 +223,8 @@ func (this *DavService) HandlePut(writer http.ResponseWriter, request *http.Requ
fmt.Printf("PUT %s\n", subPath)
filename := GetFilenameOfPath(subPath)
dirPath := GetDirOfPath(subPath)
filename := tool.GetFilenameOfPath(subPath)
dirPath := tool.GetDirOfPath(subPath)
//寻找符合条件的matter.
dirMatter := this.matterDao.CheckWithRootByPath(dirPath, user)
@ -255,8 +255,8 @@ func (this *DavService) HandleMkcol(writer http.ResponseWriter, request *http.Re
fmt.Printf("MKCOL %s\n", subPath)
thisDirName := GetFilenameOfPath(subPath)
dirPath := GetDirOfPath(subPath)
thisDirName := tool.GetFilenameOfPath(subPath)
dirPath := tool.GetDirOfPath(subPath)
//寻找符合条件的matter.
dirMatter := this.matterDao.CheckWithRootByPath(dirPath, user)
@ -327,6 +327,9 @@ func (this *DavService) prepareMoveCopy(
fullDestinationPath = destinationUrl.Path
}
//去除 路径中的相对路径 比如 /a/b/../ => /a/
fullDestinationPath = path.Clean(fullDestinationPath)
//去除前缀
pattern := fmt.Sprintf(`^%s(.*)$`, WEBDAV_PREFFIX)
reg := regexp.MustCompile(pattern)
@ -337,9 +340,9 @@ func (this *DavService) prepareMoveCopy(
this.PanicBadRequest("目标前缀必须为：%s", WEBDAV_PREFFIX)
}
destinationName = GetFilenameOfPath(destinationPath)
destinationDirPath = GetDirOfPath(destinationPath)
srcDirPath = GetDirOfPath(subPath)
destinationName = tool.GetFilenameOfPath(destinationPath)
destinationDirPath = tool.GetDirOfPath(destinationPath)
srcDirPath = tool.GetDirOfPath(subPath)
overwrite = false
if overwriteStr == "T" {
@ -360,6 +363,9 @@ func (this *DavService) prepareMoveCopy(
this.PanicBadRequest("你不能移动根目录！")
}
//寻找目标文件夹matter
destDirMatter = this.matterDao.CheckWithRootByPath(destinationDirPath, user)
return srcMatter, destDirMatter, srcDirPath, destinationDirPath, destinationName, overwrite
}
@ -389,7 +395,7 @@ func (this *DavService) HandleCopy(writer http.ResponseWriter, request *http.Req
srcMatter, destDirMatter, _, _, destinationName, overwrite := this.prepareMoveCopy(writer, request, user, subPath)
//复制到新目录中去。
this.matterService.AtomicCopy(srcMatter, destDirMatter, destinationName,overwrite)
this.matterService.AtomicCopy(srcMatter, destDirMatter, destinationName, overwrite)
this.logger.Info("完成复制 %s => %s", subPath, destDirMatter.Path)