Fixing infinite loop :o

woodpecker-ci · Jul 17, 2019 · e2b76ac · e2b76ac
1 parent e22d41d
commit e2b76ac
Showing 1 changed file with 7 additions and 20 deletions.
diff --git a/remote/github/github.go b/remote/github/github.go
@@ -23,7 +23,6 @@ import (
 	"regexp"
 	"strconv"
 	"strings"
-	"sync"
 
 	"github.com/laszlocph/drone-oss-08/model"
 	"github.com/laszlocph/drone-oss-08/remote"
@@ -253,9 +252,6 @@ func (c *client) Dir(u *model.User, r *model.Repo, b *model.Build, f string) ([]
 	fc := make(chan *remote.FileMeta)
 	errc := make(chan error)
 
-	wg := &sync.WaitGroup{}
-	wg.Add(len(data))
-
 	for _, file := range data {
 		go func(path string) {
 			content, err := c.File(u, r, b, path)
@@ -273,24 +269,15 @@ func (c *client) Dir(u *model.User, r *model.Repo, b *model.Build, f string) ([]
 	var files []*remote.FileMeta
 	var errors []error
 
-	go func() {
-		for {
-			select {
-			case err, open := <-errc:
-				if open {
-					errors = append(errors, err)
-					wg.Done()
-				}
-			case fileMeta, open := <-fc:
-				if open {
-					files = append(files, fileMeta)
-					wg.Done()
-				}
-			}
+	for i := 0; i < len(data); i++ {
+		select {
+		case err, _ := <-errc:
+			errors = append(errors, err)
+		case fileMeta, _ := <-fc:
+			files = append(files, fileMeta)
 		}
-	}()
+	}
 
-	wg.Wait()
 	close(fc)
 	close(errc)