Add all repositories in the given directory

Signed-off-by: Javi Fontan <[email protected]>

Author: jfontan

cmd/gitquery/query_base.go

@@ -3,12 +3,10 @@ package main
 import (
 	"io"
 	"os"
-	"path/filepath"
 
 	"github.com/src-d/gitquery"
 	"github.com/src-d/gitquery/internal/format"
 
-	gogit "gopkg.in/src-d/go-git.v4"
 	"gopkg.in/src-d/go-git.v4/utils/ioutil"
 	sqle "gopkg.in/src-d/go-mysql-server.v0"
 	"gopkg.in/src-d/go-mysql-server.v0/sql"
@@ -17,7 +15,7 @@ import (
 type cmdQueryBase struct {
 	cmd
 
-	Path []string `short:"p" long:"path" description:"Path where the git repository is located, can be used several times"`
+	Path string `short:"p" long:"path" description:"Path where the git repositories are located, one per dir"`
 
 	engine *sqle.Engine
 	name   string
@@ -33,16 +31,10 @@ func (c *cmdQueryBase) buildDatabase() error {
 	var err error
 
 	pool := gitquery.NewRepositoryPool()
-
-	for _, path := range c.Path {
-		r, err := gogit.PlainOpen(path)
-		if err != nil {
-			return err
-		}
-
-		pool.Add(path, r)
-
-		c.name = filepath.Base(filepath.Join(path, ".."))
+	err = pool.AddDir(c.Path)
+	if err != nil {
+		println("ERR", err.Error())
+		return err
 	}
 
 	c.engine.AddDatabase(gitquery.NewDatabase(c.name, &pool))

repository_pool.go

@@ -2,6 +2,8 @@ package gitquery
 
 import (
 	"io"
+	"io/ioutil"
+	"path/filepath"
 	"runtime"
 	"sync"
 
@@ -53,6 +55,28 @@ func (p *RepositoryPool) AddGit(path string) (string, error) {
 	return path, nil
 }
 
+// AddDir adds all direct subdirectories from path as repos
+func (p *RepositoryPool) AddDir(path string) error {
+	dirs, err := ioutil.ReadDir(path)
+	if err != nil {
+		return err
+	}
+
+	for _, f := range dirs {
+		if f.IsDir() {
+			name := filepath.Join(path, f.Name())
+			repo, err := git.PlainOpen(name)
+			if err != nil {
+				// TODO: log that the repo could not be opened
+			} else {
+				p.Add(f.Name(), repo)
+			}
+		}
+	}
+
+	return nil
+}
+
 // GetPos retrieves a repository at a given position. It returns false
 // as second return value if the position is out of bounds.
 func (p *RepositoryPool) GetPos(pos int) (*Repository, bool) {
@@ -130,7 +154,6 @@ func NewRowRepoIter(
 	pool *RepositoryPool,
 	iter RowRepoIter,
 ) (*rowRepoIter, error) {
-
 	rIter, err := pool.RepoIter()
 	if err != nil {
 		return nil, err

repository_pool_test.go

@@ -2,6 +2,10 @@ package gitquery
 
 import (
 	"io"
+	"io/ioutil"
+	"os"
+	"path/filepath"
+	"strconv"
 	"sync"
 	"testing"
 
@@ -213,3 +217,55 @@ func TestRepositoryRowIterator(t *testing.T) {
 
 	wg.Wait()
 }
+
+func TestRepositoryPoolAddDir(t *testing.T) {
+	require := require.New(t)
+
+	tmpDir, err := ioutil.TempDir("", "gitquery-test")
+	require.Nil(err)
+
+	max := 64
+
+	for i := 0; i < max; i++ {
+		orig := fixtures.Basic().ByTag("worktree").One().Worktree().Root()
+		p := filepath.Join(tmpDir, strconv.Itoa(i))
+
+		err := os.Rename(orig, p)
+		require.Nil(err)
+	}
+
+	pool := NewRepositoryPool()
+	err = pool.AddDir(tmpDir)
+	require.Nil(err)
+
+	require.Equal(max, len(pool.repositories))
+
+	arrayID := make([]string, max)
+	arrayExpected := make([]string, max)
+
+	for i := 0; i < max; i++ {
+		repo, ok := pool.GetPos(i)
+		require.True(ok)
+		arrayID[i] = repo.ID
+		arrayExpected[i] = strconv.Itoa(i)
+
+		iter, err := repo.Repo.CommitObjects()
+		require.Nil(err)
+
+		counter := 0
+		for {
+			commit, err := iter.Next()
+			if err == io.EOF {
+				break
+			}
+
+			require.Nil(err)
+			require.NotNil(commit)
+			counter++
+		}
+
+		require.Equal(9, counter)
+	}
+
+	require.ElementsMatch(arrayExpected, arrayID)
+}