From 15ac19196ee2f773664c9e8fdf062eec6c463b60 Mon Sep 17 00:00:00 2001 From: "koizumi.aoi" Date: Tue, 13 Dec 2022 03:20:00 +0000 Subject: [PATCH] Clean up Signed-off-by: Aoi K git-svn-id: file:///srv/svn/repo/suwako/trunk@4 0b558ee1-521d-8b46-a41b-40029c97c055 --- main.go | 37 ++++++++++++------------------------- 1 file changed, 12 insertions(+), 25 deletions(-) diff --git a/main.go b/main.go index 38a0c33..397e015 100644 --- a/main.go +++ b/main.go @@ -1,6 +1,3 @@ -// Yet another command-line client for SimplyTranslate -// All Rites Reversed (ΔΈ) 3188 Aoi Koizumi, Czar of KST, mutefall, shokara, Baobab - package main import ( @@ -34,33 +31,23 @@ func init() { } func main() { flag.Parse() - - if len(text) == 0 { - log.Printf("Text to translate is required. \n") - os.Exit(1) - } else if len(toLang) == 0 { - log.Printf("Target language is missing. \n") + if len(text) == 0 || len(toLang) == 0 { + log.Fatal("Missing either the text or the target language.") os.Exit(1) } - - var queryURL = instanceURL + "?engine=" + engine + "&from=" + fromLang + "&to=" + toLang + "&text=" + text - - req, err1 := http.Get(queryURL) var o TranslateAPI - - if err1 != nil { - log.Printf("Couldn't process request %s\n", err1) - } - + var queryURL = instanceURL + "?engine=" + engine + "&from=" + fromLang + "&to=" + toLang + "&text=" + text + req, err := http.Get(queryURL) + sanityCheck(err) defer req.Body.Close() - resp, err2 := io.ReadAll(req.Body) - - if err2 != nil { - log.Printf("Couldn't process response %s\n", err2) - } - + resp, err := io.ReadAll(req.Body) _ = json.Unmarshal([]byte(resp), &o) - + sanityCheck(err) fmt.Printf("Input: %s (%s)\n",text,fromLang) fmt.Printf("Output: %s (%s)\n",o.OutText,toLang) } +func sanityCheck(err error) { + if err != nil { + log.Fatal(err) + } +}