more improvements

Author: lunny

modules/actions/workflows.go

@@ -56,17 +56,16 @@ func ListWorkflows(commit *git.Commit) (git.Entries, error) {
 		return nil, err
 	}
 
-	entries, err := tree.ListEntriesRecursiveFast(context.Background())
-	if err != nil {
-		return nil, err
-	}
-
-	ret := make(git.Entries, 0, len(entries))
-	for _, entry := range entries {
+	ret := make(git.Entries, 0, 5)
+	if err := tree.IterateEntriesRecursive(context.Background(), func(entry *git.TreeEntry) error {
 		if strings.HasSuffix(entry.Name(), ".yml") || strings.HasSuffix(entry.Name(), ".yaml") {
 			ret = append(ret, entry)
 		}
+		return nil
+	}, nil); err != nil {
+		return nil, err
 	}
+
 	return ret, nil
 }
 

modules/git/repo_language_stats_nogogit.go

@@ -72,7 +72,7 @@ func (repo *Repository) GetLanguageStats(commitID string) (map[string]int64, err
 	firstExcludedLanguage := ""
 	firstExcludedLanguageSize := int64(0)
 
-	if err := tree.IterateEntriesRecursiveWithSize(func(f *TreeEntry) error {
+	if err := tree.IterateEntriesRecursive(repo.Ctx, func(f *TreeEntry) error {
 		contentBuf.Reset()
 		content = contentBuf.Bytes()
 
@@ -190,7 +190,7 @@ func (repo *Repository) GetLanguageStats(commitID string) (map[string]int64, err
 			firstExcludedLanguageSize += f.Size()
 		}
 		return nil
-	}); err != nil {
+	}, TrustedCmdArgs{"--long"}); err != nil { // add --long to get size
 		return sizes, err
 	}
 

modules/git/tree_nogogit.go

@@ -99,7 +99,7 @@ func (t *Tree) listEntriesRecursive(ctx context.Context, extraArgs TrustedCmdArg
 	}
 
 	t.entriesRecursive = make([]*TreeEntry, 0)
-	if err := t.iterateEntriesRecursive(ctx, func(entry *TreeEntry) error {
+	if err := t.IterateEntriesRecursive(ctx, func(entry *TreeEntry) error {
 		t.entriesRecursive = append(t.entriesRecursive, entry)
 		return nil
 	}, extraArgs); err != nil {
@@ -121,9 +121,9 @@ func (t *Tree) ListEntriesRecursiveWithSize(ctx context.Context) (Entries, error
 	return t.listEntriesRecursive(ctx, TrustedCmdArgs{"--long"})
 }
 
-// iterateEntriesRecursive returns iterate entries of current tree recursively including all subtrees
+// IterateEntriesRecursive returns iterate entries of current tree recursively including all subtrees
 // extraArgs could be "-l" to get the size, which is slower
-func (t *Tree) iterateEntriesRecursive(ctx context.Context, f func(entry *TreeEntry) error, extraArgs TrustedCmdArgs) error {
+func (t *Tree) IterateEntriesRecursive(ctx context.Context, f func(entry *TreeEntry) error, extraArgs TrustedCmdArgs) error {
 	reader, writer := io.Pipe()
 	done := make(chan error)
 
@@ -167,7 +167,3 @@ func (t *Tree) iterateEntriesRecursive(ctx context.Context, f func(entry *TreeEn
 	}
 	return nil
 }
-
-func (t *Tree) IterateEntriesRecursiveWithSize(f func(*TreeEntry) error) error {
-	return t.iterateEntriesRecursive(t.repo.Ctx, f, TrustedCmdArgs{"--long"})
-}