beenull/CasaOS
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #125 from IceWhaleTech/dev

Browse source 
upload file manage
This commit is contained in:
link 2022-03-10 13:41:15 +08:00 committed by GitHub
commit 4473056d5c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
UI

@ -1 +1 @@
Subproject commit ebaf4b2fc6b4cf416fff197629dc0f8f02cf3b31
Subproject commit 30aac33948d96c4c302438f98a435fc51953702a

16
route/v1/file.go
View file

@ -293,6 +293,7 @@ func GetFileUpload(c *gin.Context) {
relative := c.Query("relativePath")
fileName := c.Query("filename")
chunkNumber := c.Query("chunkNumber")
totalChunks, _ := strconv.Atoi(c.DefaultQuery("totalChunks", "0"))
path := c.Query("path")
dirPath := ""
if fileName != relative {
@ -300,12 +301,7 @@ func GetFileUpload(c *gin.Context) {
file.MkDir(path + "/" + dirPath)
}
hash := file.GetHashByContent([]byte(fileName))
tempDir := path + "/"
if len(dirPath) > 0 {
tempDir += dirPath + "/" + hash + "/" + chunkNumber
} else {
tempDir += hash + "/" + chunkNumber
}
tempDir := "/casaOS/temp/" + hash + strconv.Itoa(totalChunks) + "/" + chunkNumber
if !file.CheckNotExist(tempDir) {
c.JSON(200, model.Result{Success: 200, Message: oasis_err2.GetMsg(oasis_err2.FILE_ALREADY_EXISTS)})
return
@ -343,12 +339,8 @@ func PostFileUpload(c *gin.Context) {
dirPath = strings.TrimSuffix(relative, fileName)
file.MkDir(path + "/" + dirPath)
}
tempDir := path + "/"
if len(dirPath) > 0 {
tempDir += dirPath + "/" + hash
} else {
tempDir += hash
}
tempDir := "/casaOS/temp/" + hash + strconv.Itoa(totalChunks)
path += "/" + relative
if !file.CheckNotExist(tempDir + "/" + chunkNumber) {