Skip to content

Commit 2c4ae11

Browse files
committed
fix: remove the storage used incr for the outline disk
1 parent 4ec91b0 commit 2c4ae11

File tree

2 files changed

+11
-2
lines changed

2 files changed

+11
-2
lines changed

internal/app/dao/matter.go

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,12 +91,16 @@ func (ms *Matter) FindUserMatter(uid int64, alias string) (*model.Matter, error)
9191
return m, nil
9292
}
9393

94-
func (ms *Matter) Uploaded(matter *model.Matter) error {
94+
func (ms *Matter) Uploaded(matter *model.Matter, incrUsed bool) error {
9595
fc := func(tx *gorm.DB) error {
9696
if err := tx.First(matter).Update("uploaded_at", time.Now()).Error; err != nil {
9797
return err
9898
}
9999

100+
if !incrUsed {
101+
return nil
102+
}
103+
100104
// update the storage used of the user
101105
expr := gorm.Expr("used+?", matter.Size)
102106
if err := tx.Model(&model.UserStorage{}).Where("uid=?", matter.Uid).Update("used", expr).Error; err != nil {

internal/pkg/fakefs/file.go

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,12 @@ func (f *File) UploadDone(uid int64, alias string) (*model.Matter, error) {
6767
return nil, err
6868
}
6969

70-
if err := f.dMatter.Uploaded(m); err != nil {
70+
s, err := f.sStorage.Get(m.Sid)
71+
if err != nil {
72+
return nil, err
73+
}
74+
75+
if err := f.dMatter.Uploaded(m, s.Mode == model.StorageModeNetDisk); err != nil {
7176
return nil, err
7277
}
7378

0 commit comments

Comments
 (0)