move stargazer data into internal state file

commit-id:6429b70a
ejoffe · Mar 29, 2023 · 9198098 · 9198098
1 parent fe13ac2
commit 9198098
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 18 deletions.
diff --git a/config/config.go b/config/config.go
@@ -51,13 +51,13 @@ type UserConfig struct {
 	CreateDraftPRs       bool `default:"false" yaml:"createDraftPRs"`
 	PreserveTitleAndBody bool `default:"false" yaml:"preserveTitleAndBody"`
 	NoRebase             bool `default:"false" yaml:"noRebase"`
-
-	Stargazer bool `default:"false" yaml:"stargazer"`
-	RunCount  int  `default:"0" yaml:"runcount"`
 }
 
 type InternalConfig struct {
 	MergeCheckCommit map[string]string `yaml:"mergeCheckCommit"`
+
+	Stargazer bool `default:"false" yaml:"stargazer"`
+	RunCount  int  `default:"0" yaml:"runcount"`
 }
 
 func EmptyConfig() *Config {
@@ -117,13 +117,11 @@ func ParseConfig(gitcmd git.GitInterface) *Config {
 		rake.YamlFileSource(InternalConfigFilePath()),
 	)
 
-	if !cfg.User.Stargazer {
-		cfg.User.RunCount = cfg.User.RunCount + 1
-	}
-
 	rake.LoadSources(cfg.User,
 		rake.YamlFileWriter(UserConfigFilePath()))
 
+	cfg.Internal.RunCount = cfg.Internal.RunCount + 1
+
 	rake.LoadSources(cfg.Internal,
 		rake.YamlFileWriter(InternalConfigFilePath()))
 

diff --git a/config/config_test.go b/config/config_test.go
@@ -87,8 +87,6 @@ func TestDefaultConfig(t *testing.T) {
 			LogGitHubCalls:   false,
 			StatusBitsHeader: true,
 			StatusBitsEmojis: true,
-			Stargazer:        false,
-			RunCount:         0,
 		},
 		Internal: &InternalConfig{
 			MergeCheckCommit: map[string]string{},
@@ -118,8 +116,6 @@ func TestGitHubRemoteSource(t *testing.T) {
 			LogGitCommands:   false,
 			LogGitHubCalls:   false,
 			StatusBitsHeader: false,
-			Stargazer:        false,
-			RunCount:         0,
 		},
 	}
 

diff --git a/github/githubclient/star.go b/github/githubclient/star.go
@@ -20,12 +20,12 @@ const (
 )
 
 func (c *client) MaybeStar(ctx context.Context, cfg *config.Config) {
-	if !cfg.User.Stargazer && cfg.User.RunCount%promptCycle == 0 {
+	if !cfg.Internal.Stargazer && cfg.Internal.RunCount%promptCycle == 0 {
 		if c.isStar(ctx) {
 			log.Debug().Bool("stargazer", true).Msg("MaybeStar")
-			cfg.User.Stargazer = true
-			rake.LoadSources(cfg.User,
-				rake.YamlFileWriter(config.UserConfigFilePath()))
+			cfg.Internal.Stargazer = true
+			rake.LoadSources(cfg.Internal,
+				rake.YamlFileWriter(config.InternalConfigFilePath()))
 		} else {
 			log.Debug().Bool("stargazer", false).Msg("MaybeStar")
 			fmt.Print("enjoying git spr? add a GitHub star? [Y/n]:")
@@ -35,9 +35,9 @@ func (c *client) MaybeStar(ctx context.Context, cfg *config.Config) {
 			if line != "n" {
 				log.Debug().Msg("MaybeStar : adding star")
 				c.addStar(ctx)
-				cfg.User.Stargazer = true
-				rake.LoadSources(cfg.User,
-					rake.YamlFileWriter(config.UserConfigFilePath()))
+				cfg.Internal.Stargazer = true
+				rake.LoadSources(cfg.Internal,
+					rake.YamlFileWriter(config.InternalConfigFilePath()))
 				fmt.Println("Thank you! Happy Coding!")
 			}
 		}