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

fix(files): incorrect delete folder operation order

Browse source
This commit is contained in:
hexxa 2022-03-05 16:55:01 +08:00 • committed by Hexxa
parent 652adba4ad
commit 406f908d9e
4 changed files with 75 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/db/boltstore/bolt_store.go
View file

@ -286,7 +286,7 @@ func (bs *BoltStore) delShareID(tx *bolt.Tx, itemPath string) error {
return nil
}
func (bs *BoltStore) DelInfos(userID uint64, itemPath string) error {
func (bs *BoltStore) DelInfos(userID uint64, itemPath string, isDir bool) error {
return bs.boltdb.Update(func(tx *bolt.Tx) error {
var err error
@ -297,10 +297,11 @@ func (bs *BoltStore) DelInfos(userID uint64, itemPath string) error {
}
fileInfoBytes := fileInfoBucket.Get([]byte(itemPath))
if fileInfoBucket == nil {
if fileInfoBytes == nil {
if !isDir {
return db.ErrKeyNotFound
}
} else {
fileInfo := &db.FileInfo{}
err = json.Unmarshal(fileInfoBytes, fileInfo)
if err != nil {
@ -323,9 +324,10 @@ func (bs *BoltStore) DelInfos(userID uint64, itemPath string) error {
if err != nil {
return err
}
}
// delete share id
if fileInfo.IsDir {
if isDir {
err = bs.delShareID(tx, itemPath)
if err != nil {
return err

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

@ -261,36 +261,30 @@ func (h *FileHandlers) Delete(c *gin.Context) {
return
}
var txErr error
locker := h.NewAutoLocker(c, lockName(filePath))
locker.Exec(func() {
info, err := h.deps.FS().Stat(filePath)
if err != nil {
txErr = err
return
}
err = h.deps.FS().Remove(filePath)
if err != nil {
c.JSON(q.ErrResp(c, 500, err))
txErr = err
return
}
err = h.deps.BoltStore().DelInfos(userIDInt, filePath, info.IsDir())
if err != nil {
txErr = err
return
}
})
// info, err := h.deps.FileInfos().GetInfo(filePath)
// if err != nil {
// c.JSON(q.ErrResp(c, 500, err))
// return
// }
// err = h.deps.Users().SetUsed(userIDInt, false, info.Size)
// if err != nil {
// c.JSON(q.ErrResp(c, 500, err))
// return
// }
// err = h.deps.FileInfos().DelInfo(filePath)
// if err != nil {
// c.JSON(q.ErrResp(c, 500, err))
// return
// }
err = h.deps.BoltStore().DelInfos(userIDInt, filePath)
if err != nil {
c.JSON(q.ErrResp(c, 500, err))
if txErr != nil {
c.JSON(q.ErrResp(c, 500, txErr))
return
}
c.JSON(q.Resp(200))
@ -450,6 +444,8 @@ func (h *FileHandlers) UploadChunk(c *gin.Context) {
return
}
var txErr error
var statusCode int
tmpFilePath := q.UploadPath(userName, req.Path)
locker := h.NewAutoLocker(c, lockName(tmpFilePath))
locker.Exec(func() {
@ -457,28 +453,28 @@ func (h *FileHandlers) UploadChunk(c *gin.Context) {
_, fileSize, uploaded, err := h.deps.FileInfos().GetUploadInfo(userID, tmpFilePath)
if err != nil {
c.JSON(q.ErrResp(c, 500, err))
txErr, statusCode = err, 500
return
} else if uploaded != req.Offset {
c.JSON(q.ErrResp(c, 500, errors.New("offset != uploaded")))
txErr, statusCode = errors.New("offset != uploaded"), 500
return
}
content, err := base64.StdEncoding.DecodeString(req.Content)
if err != nil {
c.JSON(q.ErrResp(c, 500, err))
txErr, statusCode = err, 500
return
}
wrote, err := h.deps.FS().WriteAt(tmpFilePath, []byte(content), req.Offset)
if err != nil {
c.JSON(q.ErrResp(c, 500, err))
txErr, statusCode = err, 500
return
}
err = h.deps.FileInfos().SetUploadInfo(userID, tmpFilePath, req.Offset+int64(wrote))
if err != nil {
c.JSON(q.ErrResp(c, 500, err))
txErr, statusCode = err, 500
return
}
@ -486,19 +482,19 @@ func (h *FileHandlers) UploadChunk(c *gin.Context) {
if uploaded+int64(wrote) == fileSize {
fsFilePath, err := h.getFSFilePath(userID, req.Path)
if err != nil {
c.JSON(q.ErrResp(c, 500, err))
txErr, statusCode = err, 500
return
}
err = h.deps.BoltStore().MoveUploadingInfos(userIDInt, tmpFilePath, fsFilePath)
if err != nil {
c.JSON(q.ErrResp(c, 500, err))
txErr, statusCode = err, 500
return
}
err = h.deps.FS().Rename(tmpFilePath, fsFilePath)
if err != nil {
c.JSON(q.ErrResp(c, 500, fmt.Errorf("%s error: %w", req.Path, err)))
txErr, statusCode = fmt.Errorf("%s error: %w", req.Path, err), 500
return
}
@ -506,7 +502,7 @@ func (h *FileHandlers) UploadChunk(c *gin.Context) {
FilePath: fsFilePath,
})
if err != nil {
c.JSON(q.ErrResp(c, 500, err))
txErr, statusCode = err, 500
return
}
@ -518,11 +514,15 @@ func (h *FileHandlers) UploadChunk(c *gin.Context) {
),
)
if err != nil {
c.JSON(q.ErrResp(c, 500, err))
txErr, statusCode = err, 500
return
}
}
if txErr != nil {
c.JSON(q.ErrResp(c, statusCode, txErr))
return
}
c.JSON(200, &UploadStatusResp{
Path: req.Path,
IsDir: false,
@ -874,6 +874,8 @@ func (h *FileHandlers) DelUploading(c *gin.Context) {
return
}
var txErr error
var statusCode int
tmpFilePath := q.UploadPath(userName, filePath)
locker := h.NewAutoLocker(c, lockName(tmpFilePath))
locker.Exec(func() {
@ -882,17 +884,21 @@ func (h *FileHandlers) DelUploading(c *gin.Context) {
if os.IsNotExist(err) {
// no op
} else {
c.JSON(q.ErrResp(c, 500, err))
txErr, statusCode = err, 500
return
}
} else {
err = h.deps.FS().Remove(tmpFilePath)
if err != nil {
c.JSON(q.ErrResp(c, 500, err))
txErr, statusCode = err, 500
return
}
}
})
if txErr != nil {
c.JSON(q.ErrResp(c, statusCode, txErr))
return
}
err = h.deps.BoltStore().DelUploadingInfos(userIDInt, tmpFilePath)
if err != nil {

9
src/server/server_files_test.go
View file

@ -377,6 +377,15 @@ func TestFileHandlers(t *testing.T) {
t.Fatalf("size not match %d %d \n", len(content), metadata.Size)
}
}
for _, dirPath := range []string{srcDir, dstDir} {
res, _, errs := cl.Delete(dirPath)
if len(errs) > 0 {
t.Fatal(errs)
} else if res.StatusCode != 200 {
t.Fatal(res.StatusCode)
}
}
})
t.Run("test download APIs: Download(normal, ranges)", func(t *testing.T) {

BIN
src/server/testdata/test_quickshare.db vendored
View file

Binary file not shown.