diff --git a/UI b/UI index ebaf4b2..30aac33 160000 --- a/UI +++ b/UI @@ -1 +1 @@ -Subproject commit ebaf4b2fc6b4cf416fff197629dc0f8f02cf3b31 +Subproject commit 30aac33948d96c4c302438f98a435fc51953702a diff --git a/route/v1/file.go b/route/v1/file.go index ce8145f..0fed966 100644 --- a/route/v1/file.go +++ b/route/v1/file.go @@ -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) {