make build increment function using lib/config works ok so far

1 files changed, 34 insertions, 10 deletions

diff --git a/doBuild.debian.go b/doBuild.debian.go
index 746fb4d..29f4d8c 100644
--- a/doBuild.debian.go
+++ b/doBuild.debian.go
@@ -145,24 +145,37 @@ func shouldBuild(repo *gitpb.Repo) string {
 }
 
 func getBuildVersion(repo *gitpb.Repo) (int, error) {
+	_, reponame := filepath.Split(repo.Namespace)
 	if !config.InitValid() {
+		log.Info("Config.Get() InitValid() false", reponame)
 		return 0, config.NotInitialized
 	}
-	_, reponame := filepath.Split(repo.Namespace)
 	if config.Get(reponame) == "" {
 		// first time for this repo
-		config.Get(log.Sprintf("%s %s %s", reponame, repo.DebianCurrentVersion(0), "0"))
-		config.Save()
-		return 0, nil
+		config.Set(reponame, log.Sprintf("%s %s", repo.DebianCurrentVersion(0), "0"))
+		err := config.Save()
+		log.Info("Config.Get() was blank", reponame, err)
+		return 0, err
 	}
 	parts := strings.Fields(config.Get(reponame))
-	if len(parts) != 3 {
+	// log.Printf("Config.Get() worked var(%s) parts[%v]\n", reponame, parts)
+	if len(parts) != 2 {
 		log.Info("Config.Get() wierd setting. fix manually:", reponame, parts)
 		return 0, errors.New("fix manually in ~/.config/mirrors/config.text")
 	}
-	i, err := strconv.Atoi(parts[2])
-	log.Info("Config.Get() worked", parts, err, i)
-	return i, err
+	i, err := strconv.Atoi(parts[1])
+	newi := i + 1
+	if err != nil {
+		log.Info("Config.Save() strconv.Atoi() err:", reponame, parts, err)
+	}
+
+	// log.Info("Config.Get() worked", parts, err, i, newi)
+	config.Set(reponame, log.Sprintf("%s %d", repo.DebianCurrentVersion(0), newi))
+	errors.Join(err, config.Save())
+	if err != nil {
+		log.Info("Config.Save() err:", reponame, err)
+	}
+	return newi, err
 }
 
 func buildDeb(repo *gitpb.Repo) error {
@@ -185,11 +198,22 @@ func buildDeb(repo *gitpb.Repo) error {
 		cmd = append(cmd, "--arch", argv.Build.Debian.Arch)
 	}
 	if argv.Build.Debian.BuildVersion != 0 {
-		cmd = append(cmd, "--buildversion", log.Sprintf("%d", argv.Build.Debian.BuildVersion))
+	}
+	_, reponame := filepath.Split(repo.Namespace)
+	if reponame != "autogenpb" {
+		// return nil
 	}
 	// try to use lib/config
 	bvers, err := getBuildVersion(repo)
-	log.Info("Config.Get() gave back", bvers, err)
+	if err == nil {
+		log.Info("Config.Get() gave back new buildId", bvers, repo.Namespace)
+	} else {
+		log.Info("Config.Get() gave back err new buildId", bvers, err, repo.Namespace)
+		panic("config.Get() error")
+	}
+	cmd = append(cmd, "--buildversion", log.Sprintf("%d", bvers))
+	return nil
+	panic("config test")
 
 	if shouldBuild(repo) != "yes" {
 		return nil