github
/
Cloudreve
mirror of https://github.com/cloudreve/Cloudreve
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix: file should be deleted when callback return error

pull/247/head
HFO4 2020-01-17 14:24:51 +08:00
parent f7ecbce64c
commit b862ddb666
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/filesystem/file.go
View File

@ -46,7 +46,10 @@ func (fs *FileSystem) AddFile(ctx context.Context, parent *model.Folder) (*model
// 添加文件记录前的钩子 // 添加文件记录前的钩子
err := fs.Trigger(ctx, "BeforeAddFile") err := fs.Trigger(ctx, "BeforeAddFile")
if err != nil { if err != nil {
return nil, err if err := fs.Trigger(ctx, "BeforeAddFileFailed"); err != nil {
util.Log().Debug("BeforeAddFileFailed 钩子执行失败，%s", err)
}
return nil, ErrFileExisted.WithError(err)
} }
file := ctx.Value(fsctx.FileHeaderCtx).(FileHeader) file := ctx.Value(fsctx.FileHeaderCtx).(FileHeader)

2
service/callback/upload.go
View File

@ -82,6 +82,8 @@ func ProcessCallback(service CallbackProcessService, c *gin.Context) serializer.
fs.Use("BeforeAddFile", filesystem.HookValidateFile) fs.Use("BeforeAddFile", filesystem.HookValidateFile)
fs.Use("BeforeAddFile", filesystem.HookValidateCapacity) fs.Use("BeforeAddFile", filesystem.HookValidateCapacity)
fs.Use("AfterValidateFailed", filesystem.HookGiveBackCapacity) fs.Use("AfterValidateFailed", filesystem.HookGiveBackCapacity)
fs.Use("AfterValidateFailed", filesystem.HookDeleteTempFile)
fs.Use("BeforeAddFileFailed", filesystem.HookDeleteTempFile)
// 向数据库中添加文件 // 向数据库中添加文件
file, err := fs.AddFile(ctx, parentFolder) file, err := fs.AddFile(ctx, parentFolder)