some improvements

Author: lunny

modules/git/attribute/attribute.go

@@ -20,6 +20,15 @@ const (
 	GitlabLanguage        = "gitlab-language"
 )
 
+var LinguistAttributes = []string{
+	LinguistVendored,
+	LinguistGenerated,
+	LinguistDocumentation,
+	LinguistDetectable,
+	LinguistLanguage,
+	GitlabLanguage,
+}
+
 func (a Attribute) ToString() optional.Option[string] {
 	if a != "" && a != "unspecified" {
 		return optional.Some(string(a))

modules/git/attribute/batch.go

@@ -34,6 +34,48 @@ type BatchChecker struct {
 	cancel      context.CancelFunc
 }
 
+// NewBatchChecker creates a check attribute reader for the current repository and provided commit ID
+func NewBatchChecker(repo *git.Repository, treeish string, attributes ...string) (*BatchChecker, error) {
+	indexFilename, worktree, deleteTemporaryFile, err := repo.ReadTreeToTemporaryIndex(treeish)
+	if err != nil {
+		return nil, err
+	}
+
+	if len(attributes) == 0 {
+		attributes = LinguistAttributes
+	}
+
+	ctx, cancel := context.WithCancel(repo.Ctx)
+
+	checker := &BatchChecker{
+		Attributes: attributes,
+		Repo:       repo,
+		IndexFile:  indexFilename,
+		WorkTree:   worktree,
+		ctx:        ctx,
+		cancel: func() {
+			cancel()
+			deleteTemporaryFile()
+		},
+	}
+
+	if err := checker.init(ctx); err != nil {
+		log.Error("Unable to open attribute checker for commit %s, error: %v", treeish, err)
+		checker.Close()
+		return nil, err
+	}
+
+	go func() {
+		err := checker.run(ctx)
+		if err != nil && !git.IsErrCanceledOrKilled(err) {
+			log.Error("Attribute checker for commit %s exits with error: %v", treeish, err)
+		}
+		cancel()
+	}()
+
+	return checker, nil
+}
+
 // init initializes the AttributeChecker
 func (c *BatchChecker) init(ctx context.Context) error {
 	if len(c.Attributes) == 0 {
@@ -46,7 +88,6 @@ func (c *BatchChecker) init(ctx context.Context) error {
 		return errors.New("no provided Attributes to check")
 	}
 
-	c.ctx, c.cancel = context.WithCancel(ctx)
 	c.cmd = git.NewCommand("check-attr", "--stdin", "-z")
 
 	if len(c.IndexFile) > 0 {
@@ -77,13 +118,13 @@ func (c *BatchChecker) init(ctx context.Context) error {
 	return nil
 }
 
-func (c *BatchChecker) run() error {
+func (c *BatchChecker) run(ctx context.Context) error {
 	defer func() {
 		_ = c.stdinReader.Close()
 		_ = c.stdOut.Close()
 	}()
 	stdErr := new(bytes.Buffer)
-	err := c.cmd.Run(c.ctx, &git.RunOpts{
+	err := c.cmd.Run(ctx, &git.RunOpts{
 		Env:    c.env,
 		Dir:    c.Repo.Path,
 		Stdin:  c.stdinReader,
@@ -221,46 +262,3 @@ func (wr *nulSeparatedAttributeWriter) Close() error {
 	close(wr.closed)
 	return nil
 }
-
-// NewBatchChecker creates a check attribute reader for the current repository and provided commit ID
-func NewBatchChecker(repo *git.Repository, commitID string) (*BatchChecker, context.CancelFunc, error) {
-	indexFilename, worktree, deleteTemporaryFile, err := repo.ReadTreeToTemporaryIndex(commitID)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	checker := &BatchChecker{
-		Attributes: []string{
-			LinguistVendored,
-			LinguistGenerated,
-			LinguistDocumentation,
-			LinguistDetectable,
-			LinguistLanguage,
-			GitlabLanguage,
-		},
-		Repo:      repo,
-		IndexFile: indexFilename,
-		WorkTree:  worktree,
-	}
-	ctx, cancel := context.WithCancel(repo.Ctx)
-	deferrable := func() {
-		_ = checker.Close()
-		cancel()
-		deleteTemporaryFile()
-	}
-	if err := checker.init(ctx); err != nil {
-		log.Error("Unable to open attribute checker for commit %s, error: %v", commitID, err)
-		deferrable()
-		return nil, nil, err
-	}
-
-	go func() {
-		err := checker.run()
-		if err != nil && !git.IsErrCanceledOrKilled(err) {
-			log.Error("Attribute checker for commit %s exits with error: %v", commitID, err)
-		}
-		cancel()
-	}()
-
-	return checker, deferrable, nil
-}

modules/git/languagestats/language_stats_nogogit.go

@@ -64,11 +64,11 @@ func GetLanguageStats(repo *git.Repository, commitID string) (map[string]int64,
 		return nil, err
 	}
 
-	checker, deferable, err := attribute.NewBatchChecker(repo, commitID)
+	checker, err := attribute.NewBatchChecker(repo, commitID)
 	if err != nil {
 		return nil, err
 	}
-	defer deferable()
+	defer checker.Close()
 
 	contentBuf := bytes.Buffer{}
 	var content []byte

routers/web/repo/view_file.go

@@ -285,12 +285,13 @@ func prepareToRenderFile(ctx *context.Context, entry *git.TreeEntry) {
 	}
 
 	if ctx.Repo.GitRepo != nil {
-		checker, deferable, err := attribute.NewBatchChecker(ctx.Repo.GitRepo, ctx.Repo.CommitID)
+		checker, err := attribute.NewBatchChecker(ctx.Repo.GitRepo, ctx.Repo.CommitID, attribute.LinguistGenerated, attribute.LinguistVendored)
 		if err != nil {
 			ctx.ServerError("NewAttributeChecker", err)
 			return
 		}
-		defer deferable()
+		defer checker.Close()
+
 		attrs, err := checker.CheckPath(ctx.Repo.TreePath)
 		if err == nil {
 			ctx.Data["IsVendored"] = attrs.HasVendored().Value()

services/gitdiff/gitdiff.go

@@ -1238,26 +1238,22 @@ func GetDiffForRender(ctx context.Context, gitRepo *git.Repository, opts *DiffOp
 		return nil, err
 	}
 
-	checker, deferrable, err := attribute.NewBatchChecker(gitRepo, opts.AfterCommitID)
+	checker, err := attribute.NewBatchChecker(gitRepo, opts.AfterCommitID)
 	if err != nil {
 		return nil, err
 	}
-	defer deferrable()
+	defer checker.Close()
 
 	for _, diffFile := range diff.Files {
 		isVendored := optional.None[bool]()
 		isGenerated := optional.None[bool]()
-		if checker != nil {
-			attrs, err := checker.CheckPath(diffFile.Name)
-			if err == nil {
-				isVendored = attrs.HasVendored()
-				isGenerated = attrs.HasGenerated()
-				language := attrs.Language()
-				if language.Has() {
-					diffFile.Language = language.Value()
-				}
-			} else {
-				checker = nil // CheckPath fails, it's not impossible to "check" anymore
+		attrs, err := checker.CheckPath(diffFile.Name)
+		if err == nil {
+			isVendored = attrs.HasVendored()
+			isGenerated = attrs.HasGenerated()
+			language := attrs.Language()
+			if language.Has() {
+				diffFile.Language = language.Value()
 			}
 		}