doesnm/quickshare
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(files): used space is incorrect

Browse source
This commit is contained in:
hexxa 2021-09-27 22:24:22 +08:00 • committed by Hexxa
parent d85a46d039
commit ffd8131dfd
3 changed files with 37 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

29
src/handlers/fileshdr/handlers.go
View file

@ -145,26 +145,19 @@ func (h *FileHandlers) Create(c *gin.Context) {
tmpFilePath := q.UploadPath(userName, req.Path)
locker := h.NewAutoLocker(c, lockName(tmpFilePath))
locker.Exec(func() {
err = h.deps.Users().SetUsed(userIDInt, true, req.FileSize)
ok, err := h.deps.Users().CanIncrUsed(userIDInt, req.FileSize)
if err != nil {
if userstore.IsReachedLimitErr(err) {
c.JSON(q.ErrResp(c, 429, err))
} else {
c.JSON(q.ErrResp(c, 500, err))
}
c.JSON(q.ErrResp(c, 500, err))
return
} else if !ok {
c.JSON(q.ErrResp(c, 429, err))
return
}
err = h.deps.FS().Create(tmpFilePath)
if err != nil {
if os.IsExist(err) {
// avoid adding file size more than once
err = h.deps.Users().SetUsed(userIDInt, false, req.FileSize)
if err != nil {
c.JSON(q.ErrResp(c, 500, err))
} else {
c.JSON(q.ErrResp(c, 304, fmt.Errorf("file(%s) exists", tmpFilePath)))
}
c.JSON(q.ErrResp(c, 304, fmt.Errorf("file(%s) exists", tmpFilePath)))
} else {
c.JSON(q.ErrResp(c, 500, err))
}
@ -182,6 +175,12 @@ func (h *FileHandlers) Create(c *gin.Context) {
return
}
err = h.deps.Users().SetUsed(userIDInt, true, req.FileSize)
if err != nil {
c.JSON(q.ErrResp(c, 500, err))
return
}
c.JSON(q.Resp(200))
})
}
@ -800,13 +799,13 @@ func (h *FileHandlers) DelUploading(c *gin.Context) {
return
}
err = h.deps.Users().SetUsed(userIDInt, false, size)
err = h.uploadMgr.DelInfo(userID, tmpFilePath)
if err != nil {
c.JSON(q.ErrResp(c, 500, err))
return
}
err = h.uploadMgr.DelInfo(userID, tmpFilePath)
err = h.deps.Users().SetUsed(userIDInt, false, size)
if err != nil {
c.JSON(q.ErrResp(c, 500, err))
return