fix: remove the storage used incr for the outline disk

saltbo · Jul 15, 2021 · 2c4ae11 · 2c4ae11
1 parent 4ec91b0
commit 2c4ae11
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/internal/app/dao/matter.go b/internal/app/dao/matter.go
@@ -91,12 +91,16 @@ func (ms *Matter) FindUserMatter(uid int64, alias string) (*model.Matter, error)
  return m, nil
 }
 
-func (ms *Matter) Uploaded(matter *model.Matter) error {
+func (ms *Matter) Uploaded(matter *model.Matter, incrUsed bool) error {
  fc := func(tx *gorm.DB) error {
  if err := tx.First(matter).Update("uploaded_at", time.Now()).Error; err != nil {
  return err
  }
 
+ if !incrUsed {
+ return nil
+ }
+
  // update the storage used of the user
  expr := gorm.Expr("used+?", matter.Size)
  if err := tx.Model(&model.UserStorage{}).Where("uid=?", matter.Uid).Update("used", expr).Error; err != nil {

diff --git a/internal/pkg/fakefs/file.go b/internal/pkg/fakefs/file.go
@@ -67,7 +67,12 @@ func (f *File) UploadDone(uid int64, alias string) (*model.Matter, error) {
  return nil, err
  }
 
- if err := f.dMatter.Uploaded(m); err != nil {
+ s, err := f.sStorage.Get(m.Sid)
+ if err != nil {
+ return nil, err
+ }
+
+ if err := f.dMatter.Uploaded(m, s.Mode == model.StorageModeNetDisk); err != nil {
  return nil, err
  }