feat: make host of DeepLX configurable

eeeXun · Feb 10, 2024 · 943def5 · 943def5
1 parent ff46861
commit 943def5
Show file tree

Hide file tree

Showing 14 changed files with 55 additions and 36 deletions.
diff --git a/README.md b/README.md
@@ -38,7 +38,7 @@ See the example in [server.yaml](example/server.yaml) file.
 api_key:
   deeplx: DEEPLX_API_KEY # <- Replace with your API Key
 host:
-  deeplx: 127.0.0.1:1188 # <- Replace with your DeepLX server IP address and port
+  deeplx: 127.0.0.1:1188 # <- Replace with your server IP address and port
 ```
 
 ## ScreenShot

diff --git a/config.go b/config.go
@@ -156,13 +156,18 @@ func configInit() {
 	uiStyle.Transparent = config.GetBool("transparent")
 	uiStyle.SetSrcBorderColor(config.GetString("source.border_color")).
 		SetDstBorderColor(config.GetString("destination.border_color"))
-	// Import api key if file exists
+	// Import api key and host if file exists
 	if err := serverConfig.ReadInConfig(); err == nil {
+		// api key
 		for _, name := range []string{"ChatGPT", "DeepL", "DeepLX"} {
 			if serverConfig.Get(fmt.Sprintf("api_key.%s", name)) != nil {
 				translators[name].SetAPIKey(serverConfig.GetString(fmt.Sprintf("api_key.%s", name)))
 			}
 		}
+		// host
+		if serverConfig.Get("host.deeplx") != nil {
+			translators["DeepLX"].SetHost(serverConfig.GetString("host.deeplx"))
+		}
 	}
 	// Set argument language
 	if len(*srcLangArg) > 0 {

diff --git a/example/server.yaml b/example/server.yaml
@@ -3,3 +3,5 @@ api_key:
   chatgpt: CHATGPT_API_KEY
   deepl: DEEPL_API_KEY
   deeplx: DEEPLX_API_KEY
+host:
+  deeplx: 127.0.0.1:1188
diff --git a/internal/translate/apertium/translator.go b/internal/translate/apertium/translator.go
@@ -16,15 +16,15 @@ const (
 )
 
 type Translator struct {
-	*core.APIKey
+	*core.Server
 	*core.Language
 	*core.TTSLock
 	core.EngineName
 }
 
 func NewTranslator() *Translator {
 	return &Translator{
-		APIKey:     new(core.APIKey),
+		Server:     new(core.Server),
 		Language:   new(core.Language),
 		TTSLock:    core.NewTTSLock(),
 		EngineName: core.NewEngineName("Apertium"),

diff --git a/internal/translate/argos/translator.go b/internal/translate/argos/translator.go
@@ -15,15 +15,15 @@ const (
 )
 
 type Translator struct {
-	*core.APIKey
+	*core.Server
 	*core.Language
 	*core.TTSLock
 	core.EngineName
 }
 
 func NewTranslator() *Translator {
 	return &Translator{
-		APIKey:     new(core.APIKey),
+		Server:     new(core.Server),
 		Language:   new(core.Language),
 		TTSLock:    core.NewTTSLock(),
 		EngineName: core.NewEngineName("Argos"),

diff --git a/internal/translate/bing/translator.go b/internal/translate/bing/translator.go
@@ -25,7 +25,7 @@ const (
 )
 
 type Translator struct {
-	*core.APIKey
+	*core.Server
 	*core.Language
 	*core.TTSLock
 	core.EngineName
@@ -40,7 +40,7 @@ type setUpData struct {
 
 func NewTranslator() *Translator {
 	return &Translator{
-		APIKey:     new(core.APIKey),
+		Server:     new(core.Server),
 		Language:   new(core.Language),
 		TTSLock:    core.NewTTSLock(),
 		EngineName: core.NewEngineName("Bing"),

diff --git a/internal/translate/chatgpt/translator.go b/internal/translate/chatgpt/translator.go
@@ -16,15 +16,15 @@ const (
 )
 
 type Translator struct {
-	*core.APIKey
+	*core.Server
 	*core.Language
 	*core.TTSLock
 	core.EngineName
 }
 
 func NewTranslator() *Translator {
 	return &Translator{
-		APIKey:     new(core.APIKey),
+		Server:     new(core.Server),
 		Language:   new(core.Language),
 		TTSLock:    core.NewTTSLock(),
 		EngineName: core.NewEngineName("ChatGPT"),

diff --git a/internal/translate/core/apikey.go b/internal/translate/core/apikey.go
diff --git a/internal/translate/core/server.go b/internal/translate/core/server.go
@@ -0,0 +1,22 @@
+package core
+
+type Server struct {
+	host   string
+	apiKey string
+}
+
+func (s *Server) SetHost(host string) {
+	s.host = host
+}
+
+func (s *Server) GetHost() string {
+	return s.host
+}
+
+func (s *Server) SetAPIKey(key string) {
+	s.apiKey = key
+}
+
+func (s *Server) GetAPIKey() string {
+	return s.apiKey
+}
diff --git a/internal/translate/deepl/translator.go b/internal/translate/deepl/translator.go
@@ -16,15 +16,15 @@ const (
 )
 
 type Translator struct {
-	*core.APIKey
+	*core.Server
 	*core.Language
 	*core.TTSLock
 	core.EngineName
 }
 
 func NewTranslator() *Translator {
 	return &Translator{
-		APIKey:     new(core.APIKey),
+		Server:     new(core.Server),
 		Language:   new(core.Language),
 		TTSLock:    core.NewTTSLock(),
 		EngineName: core.NewEngineName("DeepL"),

diff --git a/internal/translate/deeplx/translator.go b/internal/translate/deeplx/translator.go
@@ -10,20 +10,16 @@ import (
 	"github.com/eeeXun/gtt/internal/translate/core"
 )
 
-const (
-	textURL = "http://localhost:1188/translate"
-)
-
 type Translator struct {
-	*core.APIKey
+	*core.Server
 	*core.Language
 	*core.TTSLock
 	core.EngineName
 }
 
 func NewTranslator() *Translator {
 	return &Translator{
-		APIKey:     new(core.APIKey),
+		Server:     new(core.Server),
 		Language:   new(core.Language),
 		TTSLock:    core.NewTTSLock(),
 		EngineName: core.NewEngineName("DeepLX"),
@@ -38,13 +34,17 @@ func (t *Translator) Translate(message string) (translation *core.Translation, e
 	translation = new(core.Translation)
 	var data map[string]interface{}
 
+	if len(t.GetHost()) <= 0 {
+		return nil, errors.New("Please write your host in config file for " + t.GetEngineName())
+	}
+
 	userData, _ := json.Marshal(map[string]interface{}{
 		"text":        message,
 		"source_lang": langCode[t.GetSrcLang()],
 		"target_lang": langCode[t.GetDstLang()],
 	})
 	req, _ := http.NewRequest(http.MethodPost,
-		textURL,
+		"http://"+t.GetHost()+"/translate",
 		bytes.NewBuffer(userData),
 	)
 	req.Header.Add("Content-Type", "application/json")

diff --git a/internal/translate/google/translator.go b/internal/translate/google/translator.go
@@ -20,15 +20,15 @@ const (
 )
 
 type Translator struct {
-	*core.APIKey
+	*core.Server
 	*core.Language
 	*core.TTSLock
 	core.EngineName
 }
 
 func NewTranslator() *Translator {
 	return &Translator{
-		APIKey:     new(core.APIKey),
+		Server:     new(core.Server),
 		Language:   new(core.Language),
 		TTSLock:    core.NewTTSLock(),
 		EngineName: core.NewEngineName("Google"),

diff --git a/internal/translate/reverso/translator.go b/internal/translate/reverso/translator.go
@@ -22,15 +22,15 @@ const (
 )
 
 type Translator struct {
-	*core.APIKey
+	*core.Server
 	*core.Language
 	*core.TTSLock
 	core.EngineName
 }
 
 func NewTranslator() *Translator {
 	return &Translator{
-		APIKey:     new(core.APIKey),
+		Server:     new(core.Server),
 		Language:   new(core.Language),
 		TTSLock:    core.NewTTSLock(),
 		EngineName: core.NewEngineName("Reverso"),

diff --git a/internal/translate/translator.go b/internal/translate/translator.go
@@ -50,6 +50,9 @@ type Translator interface {
 	// Set API Key
 	SetAPIKey(key string)
 
+	// Set host
+	SetHost(host string)
+
 	// Check if lock is available
 	LockAvailable() bool