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

Simple the result2 to result.

Browse Source
This commit is contained in:
zicla
2019-04-26 03:19:47 +08:00
parent d030a60721
commit c55e8699b4
20 changed files with 204 additions and 204 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
code/tool/dav/prop.go
View File

@ -11,7 +11,7 @@ import (
"io"
"net/http"
"tank/code/tool/dav/xml"
result2 "tank/code/tool/result"
"tank/code/tool/result"
)
// Proppatch describes a property update instruction as defined in RFC 4918.
@ -239,20 +239,20 @@ func ReadPropfind(reader io.Reader) (propfind *Propfind) {
err = errInvalidPropfind
}
panic(result2.BadRequest(err.Error()))
panic(result.BadRequest(err.Error()))
}
if propfind.Allprop == nil && propfind.Include != nil {
panic(result2.BadRequest(errInvalidPropfind.Error()))
panic(result.BadRequest(errInvalidPropfind.Error()))
}
if propfind.Allprop != nil && (propfind.Prop != nil || propfind.Propname != nil) {
panic(result2.BadRequest(errInvalidPropfind.Error()))
panic(result.BadRequest(errInvalidPropfind.Error()))
}
if propfind.Prop != nil && propfind.Propname != nil {
panic(result2.BadRequest(errInvalidPropfind.Error()))
panic(result.BadRequest(errInvalidPropfind.Error()))
}
if propfind.Propname == nil && propfind.Allprop == nil && propfind.Prop == nil {
panic(result2.BadRequest(errInvalidPropfind.Error()))
panic(result.BadRequest(errInvalidPropfind.Error()))
}
return propfind

6
code/tool/util/util_path.go
View File

@ -9,7 +9,7 @@ import (
"os/user"
"path/filepath"
"strings"
result2 "tank/code/tool/result"
"tank/code/tool/result"
)
//判断文件或文件夹是否已经存在
@ -126,13 +126,13 @@ func GetFilenameOfPath(fullPath string) string {
func DeleteEmptyDir(dirPath string) bool {
dir, err := ioutil.ReadDir(dirPath)
if err != nil {
panic(result2.BadRequest("尝试读取目录%s时出错 %s", dirPath, err.Error()))
panic(result.BadRequest("尝试读取目录%s时出错 %s", dirPath, err.Error()))
}
if len(dir) == 0 {
//空文件夹
err = os.Remove(dirPath)
if err != nil {
panic(result2.BadRequest("删除磁盘上的文件夹%s出错 %s", dirPath, err.Error()))
panic(result.BadRequest("删除磁盘上的文件夹%s出错 %s", dirPath, err.Error()))
}
return true
}