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

50
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,35 +297,37 @@ func (bs *BoltStore) DelInfos(userID uint64, itemPath string) error {
}
fileInfoBytes := fileInfoBucket.Get([]byte(itemPath))
if fileInfoBucket == nil {
return db.ErrKeyNotFound
}
if fileInfoBytes == nil {
if !isDir {
return db.ErrKeyNotFound
}
} else {
fileInfo := &db.FileInfo{}
err = json.Unmarshal(fileInfoBytes, fileInfo)
if err != nil {
return err
}
fileInfo := &db.FileInfo{}
err = json.Unmarshal(fileInfoBytes, fileInfo)
if err != nil {
return err
}
err = fileInfoBucket.Delete([]byte(itemPath))
if err != nil {
return err
}
err = fileInfoBucket.Delete([]byte(itemPath))
if err != nil {
return err
}
// decr used space
userInfo, err := bs.getUserInfo(tx, userID)
if err != nil {
return err
}
// decr used space
userInfo, err := bs.getUserInfo(tx, userID)
if err != nil {
return err
}
userInfo.UsedSpace -= fileInfo.Size
err = bs.setUserInfo(tx, userID, userInfo)
if err != nil {
return err
userInfo.UsedSpace -= fileInfo.Size
err = bs.setUserInfo(tx, userID, userInfo)
if err != nil {
return err
}
}
// delete share id
if fileInfo.IsDir {
if isDir {
err = bs.delShareID(tx, itemPath)
if err != nil {
return err