From 04206cf2ae8595ec082d8daedb17e59724d7380e Mon Sep 17 00:00:00 2001 From: nyne Date: Thu, 15 May 2025 15:41:28 +0800 Subject: [PATCH] fix file delete --- server/service/file.go | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/server/service/file.go b/server/service/file.go index 2768c58..14fe144 100644 --- a/server/service/file.go +++ b/server/service/file.go @@ -330,17 +330,19 @@ func DeleteFile(uid uint, fid string) error { return model.NewUnAuthorizedError("user cannot delete file") } - iStorage := storage.NewStorage(file.Storage) - if iStorage == nil { - log.Error("failed to find storage: ", err) - return model.NewInternalServerError("failed to find storage") - } + if file.StorageID != nil { + iStorage := storage.NewStorage(file.Storage) + if iStorage == nil { + log.Error("failed to find storage: ", err) + return model.NewInternalServerError("failed to find storage") + } - if err := iStorage.Delete(file.StorageKey); err != nil { - log.Error("failed to delete file from storage: ", err) - return model.NewInternalServerError("failed to delete file from storage") + if err := iStorage.Delete(file.StorageKey); err != nil { + log.Error("failed to delete file from storage: ", err) + return model.NewInternalServerError("failed to delete file from storage") + } + _ = dao.AddStorageUsage(*file.StorageID, -file.Size) } - _ = dao.AddStorageUsage(*file.StorageID, -file.Size) if err := dao.DeleteFile(fid); err != nil { log.Error("failed to delete file from db: ", err)