fix: configを列挙型に変更

mochi-yu · mochi-yu · commit 58b57ddb1bf0 · 2023-09-10T09:53:48.000+09:00
diff --git a/cmd/config.go b/cmd/config.go
@@ -12,11 +12,18 @@ import (
 )
 
 var (
-	configKey    = [...]string{"api-key", "language", "format"}
-	configOption = [][]string{
+	configKey    = [...]string{"api-key", "language", "format", "ai-source"}
+	configOption = [][]int{
+		{},
+		{int(entity.JP), int(entity.EN)},
+		{int(entity.NormalFormat), int(entity.EmojiFormat), int(entity.PrefixFormat)},
+		{int(entity.WrapServer), int(entity.OpenAiAPI)},
+	}
+	configOptionLabel = [][]string{
 		{},
 		{"Japanese", "English"},
-		{"Format 1", "Format 2"},
+		{"Normal Format", "Emoji Format", "PrefixFormat"},
+		{"Wrap Server", "OpenAI API"},
 	}
 )
 
@@ -152,7 +159,7 @@ func (cm configModel) View() string {
 			b.WriteString(white("設定内容を選んでください:\n"))
 			b.WriteString(white("  ↑↓の矢印キーで項目を移動、Enterで選択\n"))
 
-			for i, option := range configOption[cm.configKeyIndex] {
+			for i, option := range configOptionLabel[cm.configKeyIndex] {
 				cyan := color.New(color.FgCyan).SprintFunc()
 				hiCyan := color.New(color.FgHiCyan).SprintFunc()
 				if i == cm.configOptionIndex {
@@ -194,6 +201,8 @@ func saveConfig(cm configModel) {
 		currentConfig.UseLanguage = configOption[cm.configKeyIndex][cm.configOptionIndex]
 	case 2:
 		currentConfig.CommitFormat = configOption[cm.configKeyIndex][cm.configOptionIndex]
+	case 3:
+		currentConfig.AISource = configOption[cm.configKeyIndex][cm.configOptionIndex]
 	}
 
 	err = entity.WriteConfig(currentConfig)
diff --git a/internal/entity/config.go b/internal/entity/config.go
@@ -4,31 +4,77 @@ import (
 	"encoding/json"
 	"fmt"
 
+	pb "github.com/cocoide/commitify/pkg/grpc"
 	"github.com/spf13/viper"
 )
 
+type Language int
+
+const (
+	JP Language = iota
+	EN
+)
+
+type CodeFormat int
+
+const (
+	EmojiFormat CodeFormat = iota
+	PrefixFormat
+	NormalFormat
+)
+
+type AISource int
+
+const (
+	WrapServer AISource = iota
+	OpenAiAPI
+)
+
 type Config struct {
-	ChatGptApiKey string `json:"chatGptApiKey"`
-	UseLanguage   string `json:"UseLanguage"`
-	CommitFormat  string `json:"CommitFormat"`
+	ChatGptApiKey string `json:"chatGpt_ApiKey"`
+	UseLanguage   int    `json:"Use_Language"`
+	CommitFormat  int    `json:"Commit_Format"`
+	AISource      int    `json:"AI_Source"`
+}
+
+func (c *Config) Config2PbVars() (pb.CodeFormatType, pb.LanguageType) {
+	var codeFormatType pb.CodeFormatType
+	switch c.CommitFormat {
+	case int(EmojiFormat):
+		codeFormatType = pb.CodeFormatType_EMOJI
+	case int(PrefixFormat):
+		codeFormatType = pb.CodeFormatType_PREFIX
+	default:
+		codeFormatType = pb.CodeFormatType_NORMAL
+	}
+
+	var languageType pb.LanguageType
+	switch c.UseLanguage {
+	case int(JP):
+		languageType = pb.LanguageType_JAPANESE
+	default:
+		languageType = pb.LanguageType_JAPANESE
+	}
+
+	return codeFormatType, languageType
 }
 
-func ReadConfig() (*Config, error) {
+func ReadConfig() (Config, error) {
 	var result Config
 
 	viper.AddConfigPath(".")
 	viper.SetConfigName("config")
 	viper.SetConfigType("yaml")
 	if err := viper.ReadInConfig(); err != nil {
-		return &result, fmt.Errorf("error reading config file, %s", err.Error())
+		return result, fmt.Errorf("error reading config file, %s", err.Error())
 	}
 	if err := viper.Unmarshal(&result); err != nil {
-		return &result, fmt.Errorf("unable to decode into struct, %v", err.Error())
+		return result, fmt.Errorf("unable to decode into struct, %v", err.Error())
 	}
-	return &result, nil
+	return result, nil
 }
 
-func WriteConfig(config *Config) error {
+func WriteConfig(config Config) error {
 	viper.AddConfigPath(".")
 	viper.SetConfigName("config")
 	viper.SetConfigType("yaml")
