haiwen/seafile-server
1
0
Fork 0
mirror of https://github.com/haiwen/seafile-server.git synced 2025-09-16 15:18:58 +00:00
Code Issues Releases Wiki Activity

stop task when request canceled (#449)

Browse Source
This commit is contained in:
Xiangyue Cai
2021-02-07 17:21:18 +08:00
committed by GitHub
parent 705a1dd0eb
commit 5090725ff8
4 changed files with 53 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
fileserver/diff/diff.go
View File

@@ -1,6 +1,7 @@
package diff
import (
"context"
"fmt"
"path/filepath"
"strings"
@@ -15,13 +16,14 @@ const (
EmptySha1 = "0000000000000000000000000000000000000000"
)
type fileCB func(string, []*fsmgr.SeafDirent, interface{}) error
type dirCB func(string, []*fsmgr.SeafDirent, interface{}, *bool) error
type fileCB func(context.Context, string, []*fsmgr.SeafDirent, interface{}) error
type dirCB func(context.Context, string, []*fsmgr.SeafDirent, interface{}, *bool) error
type DiffOptions struct {
FileCB fileCB
DirCB dirCB
RepoID string
Ctx context.Context
Data interface{}
}
@@ -131,7 +133,7 @@ func diffFiles(baseDir string, dents []*fsmgr.SeafDirent, opt *DiffOptions) erro
return nil
}
return opt.FileCB(baseDir, files, opt.Data)
return opt.FileCB(opt.Ctx, baseDir, files, opt.Data)
}
func diffDirectories(baseDir string, dents []*fsmgr.SeafDirent, opt *DiffOptions) error {
@@ -150,7 +152,7 @@ func diffDirectories(baseDir string, dents []*fsmgr.SeafDirent, opt *DiffOptions
}
recurse := true
err := opt.DirCB(baseDir, dirs, opt.Data, &recurse)
err := opt.DirCB(opt.Ctx, baseDir, dirs, opt.Data, &recurse)
if err != nil {
err := fmt.Errorf("failed to call dir callback: %v", err)
return err
@@ -248,7 +250,7 @@ func DiffMergeRoots(storeID, mergedRoot, p1Root, p2Root string, results *[]*Diff
return nil
}
func threewayDiffFiles(baseDir string, dents []*fsmgr.SeafDirent, optData interface{}) error {
func threewayDiffFiles(ctx context.Context, baseDir string, dents []*fsmgr.SeafDirent, optData interface{}) error {
m := dents[0]
p1 := dents[1]
p2 := dents[2]
@@ -285,7 +287,7 @@ func threewayDiffFiles(baseDir string, dents []*fsmgr.SeafDirent, optData interf
return nil
}
func threewayDiffDirs(baseDir string, dents []*fsmgr.SeafDirent, optData interface{}, recurse *bool) error {
func threewayDiffDirs(ctx context.Context, baseDir string, dents []*fsmgr.SeafDirent, optData interface{}, recurse *bool) error {
*recurse = true
return nil
}
@@ -335,7 +337,7 @@ func DiffCommits(commit1, commit2 *commitmgr.Commit, results *[]*DiffEntry, fold
return nil
}
func twowayDiffFiles(baseDir string, dents []*fsmgr.SeafDirent, optData interface{}) error {
func twowayDiffFiles(ctx context.Context, baseDir string, dents []*fsmgr.SeafDirent, optData interface{}) error {
p1 := dents[0]
p2 := dents[1]
data, ok := optData.(diffData)
@@ -366,7 +368,7 @@ func twowayDiffFiles(baseDir string, dents []*fsmgr.SeafDirent, optData interfac
return nil
}
func twowayDiffDirs(baseDir string, dents []*fsmgr.SeafDirent, optData interface{}, recurse *bool) error {
func twowayDiffDirs(ctx context.Context, baseDir string, dents []*fsmgr.SeafDirent, optData interface{}, recurse *bool) error {
p1 := dents[0]
p2 := dents[1]
data, ok := optData.(diffData)