forged pull & list

1 files changed, 6 insertions, 42 deletions

diff --git a/main.go b/main.go
index fca5e83..b9dde90 100644
--- a/main.go
+++ b/main.go
@@ -4,11 +4,8 @@ import (
 	"embed"
 	"fmt"
 	"net/http"
-	"os"
-	"path/filepath"
 	"time"
 
-	"go.wit.com/lib/protobuf/forgepb"
 	"go.wit.com/log"
 )
 
@@ -29,47 +26,14 @@ func main() {
 	if argv.Hostname != "" {
 		HOSTNAME = argv.Hostname
 	}
+
+	if argv.List != nil {
+		doList()
+		okExit("")
+	}
 	// forge = forgepb.Init()
 	if argv.Pull != nil {
-		log.Info("do pull here")
-		dirs, err := scanForgedDir(FORGEDIR)
-		if err != nil {
-			badExit(err)
-		}
-		os.Chdir(FORGEDIR)
-		forge := forgepb.InitPB()
-		log.Info("forge len", forge.Repos.Len())
-		forge.PrintHumanTable(forge.Repos)
-
-		for i, dir := range dirs {
-			log.Info("found repo", i, dir)
-			// repo, err := forge.AddNamespaceDir(ns string, fullpath string)
-			repo, err := readGitPB(dir)
-			if err != nil {
-				log.Info(dir, err)
-				continue
-			}
-			log.Info("repo:", repo.Namespace, repo.URL)
-
-			// check to see if 'git clone' has already been run
-			_, err = os.Stat(filepath.Join(dir, "git.clone"))
-			if os.IsNotExist(err) {
-				log.Info("repo needs cloning", dir)
-				if err := forgepb.RunGitClone("git.clone", dir, "https://"+repo.Namespace); err != nil {
-					log.Info("git clone failed", err)
-					if giturl, err := forgepb.FindGoImport("https://" + repo.Namespace); err == nil {
-						log.Info("TRY THIS INSTEAD!!!!", giturl)
-						if err := forgepb.RunGitClone("git.clone", dir, giturl); err != nil {
-							log.Info("git clone still failed", giturl, err)
-						}
-					}
-
-				}
-			} else {
-				log.Info("repo is already cloned", dir)
-			}
-			break
-		}
+		doPull()
 		okExit("")
 	}