From 0239561276d21ed04cb1ae81a81b7d78a1b9095d Mon Sep 17 00:00:00 2001 From: eeeXun Date: Sun, 12 Feb 2023 17:22:04 +0800 Subject: [PATCH] style: Declare string only once in `Translate` & `PlayTTS` --- internal/translate/argostranslate/translator.go | 6 +----- internal/translate/argostranslate/tts.go | 2 +- internal/translate/googletranslate/translator.go | 6 +----- internal/translate/googletranslate/tts.go | 2 +- internal/translate/translator.go | 8 ++------ 5 files changed, 6 insertions(+), 18 deletions(-) diff --git a/internal/translate/argostranslate/translator.go b/internal/translate/argostranslate/translator.go index e47e307..7afcc86 100644 --- a/internal/translate/argostranslate/translator.go +++ b/internal/translate/argostranslate/translator.go @@ -50,11 +50,7 @@ func (t *ArgosTranslate) SwapLang() { t.srcLang, t.dstLang = t.dstLang, t.srcLang } -func (t *ArgosTranslate) Translate(message string) ( - translation string, - definition string, - partOfSpeech string, - err error) { +func (t *ArgosTranslate) Translate(message string) (translation, definition, partOfSpeech string, err error) { var data interface{} res, err := http.PostForm(textURL, diff --git a/internal/translate/argostranslate/tts.go b/internal/translate/argostranslate/tts.go index 3cb91f7..ef53866 100644 --- a/internal/translate/argostranslate/tts.go +++ b/internal/translate/argostranslate/tts.go @@ -16,7 +16,7 @@ func (t *ArgosTranslate) StopTTS() { t.SoundLock.Stop = true } -func (t *ArgosTranslate) PlayTTS(lang string, message string) error { +func (t *ArgosTranslate) PlayTTS(lang, message string) error { t.SoundLock.Release() return errors.New(t.EngineName + " does not support text to speech") } diff --git a/internal/translate/googletranslate/translator.go b/internal/translate/googletranslate/translator.go index 0a2aee7..0822efc 100644 --- a/internal/translate/googletranslate/translator.go +++ b/internal/translate/googletranslate/translator.go @@ -50,11 +50,7 @@ func (t *GoogleTranslate) SwapLang() { t.srcLang, t.dstLang = t.dstLang, t.srcLang } -func (t *GoogleTranslate) Translate(message string) ( - translation string, - definition string, - partOfSpeech string, - err error) { +func (t *GoogleTranslate) Translate(message string) (translation, definition, partOfSpeech string, err error) { var data []interface{} urlStr := fmt.Sprintf( diff --git a/internal/translate/googletranslate/tts.go b/internal/translate/googletranslate/tts.go index a305ab8..e6c0e3f 100644 --- a/internal/translate/googletranslate/tts.go +++ b/internal/translate/googletranslate/tts.go @@ -26,7 +26,7 @@ func (t *GoogleTranslate) StopTTS() { t.SoundLock.Stop = true } -func (t *GoogleTranslate) PlayTTS(lang string, message string) error { +func (t *GoogleTranslate) PlayTTS(lang, message string) error { urlStr := fmt.Sprintf( ttsURL, url.QueryEscape(message), diff --git a/internal/translate/translator.go b/internal/translate/translator.go index a0635ae..fcdf4f9 100644 --- a/internal/translate/translator.go +++ b/internal/translate/translator.go @@ -20,16 +20,12 @@ type Translator interface { SetSrcLang(srcLang string) SetDstLang(dstLang string) SwapLang() - Translate(message string) ( - translation string, - definition string, - partOfSpeech string, - err error) + Translate(message string) (translation, definition, partOfSpeech string, err error) // text to speech LockAvailable() bool LockAcquire() StopTTS() - PlayTTS(lang string, message string) error + PlayTTS(lang, message string) error } func NewTranslator(name string) Translator {