Added translation visualization by showing pictures ffrom urls

internal/fakeapi/data.go

@@ -1,6 +1,7 @@
 package fakeapi
 
 import (
+	"net/url"
 	"strings"
 	"testing"
 
@@ -9,7 +10,17 @@ import (
 )
 
 var (
-	SoundURL     = "http://audiocdn.lingualeo.com/v2/3/102085-631152000.mp3"
+	SoundURL    = "http://audiocdn.lingualeo.com/v2/3/102085-631152000.mp3"
+	u1, _       = url.Parse("http://contentcdn.lingualeo.com/uploads/picture/31064.png")
+	u2, _       = url.Parse("http://contentcdn.lingualeo.com/uploads/picture/335521.png")
+	u3, _       = url.Parse("http://contentcdn.lingualeo.com/uploads/picture/374830.png")
+	u4, _       = url.Parse("http://contentcdn.lingualeo.com/uploads/picture/620779.png")
+	PictureUrls = []*url.URL{
+		u1,
+		u2,
+		u3,
+		u4,
+	}
 	ResponseData = []byte(`{"error_msg":"","translate_source":"base","is_user":0,
 	"word_forms":[{"word":"accommodation","type":"прил."}],
 	"pic_url":"http:\/\/contentcdn.lingualeo.com\/uploads\/picture\/3589594.png",

internal/files/download.go

@@ -28,8 +28,8 @@ func (f File) GetIndex() int {
 // FileDownloader structure
 type FileDownloader struct{}
 
-// NewFileDownloader initialize new file downloader
-func NewFileDownloader() *FileDownloader {
+// New initialize new file downloader
+func New() *FileDownloader {
 	return &FileDownloader{}
 }
 
@@ -77,3 +77,7 @@ func (f *FileDownloader) Download(url string) (string, error) {
 	}
 	return filename, nil
 }
+
+func (f *FileDownloader) Remove(path string) error {
+	return os.Remove(path)
+}

internal/player/player.go

@@ -0,0 +1,37 @@
+package player
+
+import (
+	"os/exec"
+	"strings"
+)
+
+const (
+	separator = " "
+)
+
+type Player struct {
+	player string
+	params []string
+}
+
+func New(player string) Player {
+	parts := strings.Split(player, separator)
+	playerExec := parts[0]
+	params := parts[1:]
+	return Player{
+		params: params,
+		player: playerExec,
+	}
+}
+
+func (p Player) Play(url string) error {
+	params := append(p.params[:len(p.params):len(p.params)], url)
+	cmd := exec.Command(p.player, params...)
+	if err := cmd.Start(); err != nil {
+		return err
+	}
+	if err := cmd.Wait(); err != nil {
+		return err
+	}
+	return nil
+}

internal/visualizer/browser/browser.go

@@ -0,0 +1,33 @@
+package browser
+
+import (
+	"net/url"
+	"os/exec"
+	"runtime"
+)
+
+func open(u *url.URL) error {
+	var cmd string
+	var args []string
+	switch runtime.GOOS {
+	case "windows":
+		cmd = "cmd"
+		args = []string{"/c", "start"}
+	case "darwin":
+		cmd = "open"
+	default: // "linux", "freebsd", "openbsd", "netbsd"
+		cmd = "xdg-open"
+	}
+	args = append(args, u.String())
+	return exec.Command(cmd, args...).Start()
+}
+
+type Visualizer func(u *url.URL) error
+
+func (v Visualizer) Show(u *url.URL) error {
+	return v(u)
+}
+
+func New() Visualizer {
+	return Visualizer(open)
+}

pkg/translator/args.go

@@ -180,6 +180,12 @@ func prepareArgs(version string) (Lingualeo, error) {
 			Usage:       "Pronounce words",
 			Destination: &args.Sound,
 		},
+		&cli.BoolFlag{
+			Name:        "picture",
+			Aliases:     []string{"pc"},
+			Usage:       "Open translate pictures",
+			Destination: &args.Picture,
+		},
 		&cli.BoolFlag{
 			Name:        "download",
 			Aliases:     []string{"dl"},
@@ -339,6 +345,9 @@ func (args *Lingualeo) mergeConfigs(a *Lingualeo) {
 	if a.Sound {
 		args.Sound = a.Sound
 	}
+	if a.Picture {
+		args.Picture = a.Picture
+	}
 	if a.DownloadSoundFile {
 		args.DownloadSoundFile = a.DownloadSoundFile
 	}

pkg/translator/download.go

@@ -13,10 +13,11 @@ import (
 //go:generate mockery
 type Downloader interface {
 	Download(url string) (string, error)
+	Remove(path string) error
 }
 
-// DownloadFiles download files from URLs channel
-func DownloadFiles(ctx context.Context, urls <-chan string, downloader Downloader) <-chan files.File {
+// downloadFiles download files from URLs channel
+func downloadFiles(ctx context.Context, urls <-chan string, downloader Downloader) <-chan files.File {
 	out := make(chan files.File)
 	var wg sync.WaitGroup
 	wg.Add(1)

pkg/translator/download_file_test.go

@@ -21,7 +21,7 @@ func TestDownloadWordFile(t *testing.T) {
 
 	close(inChan)
 
-	out := DownloadFiles(ctx, inChan, downloader)
+	out := downloadFiles(ctx, inChan, downloader)
 	fileName := (<-out).Filename
 	assert.Equal(t, fileName, testFile)
 }

pkg/translator/get_word_test.go

@@ -3,7 +3,6 @@ package translator
 import (
 	"context"
 	"log/slog"
-	"sync"
 	"testing"
 
 	"github.com/trezorg/lingualeo/internal/logger"
@@ -23,11 +22,17 @@ func TestProcessTranslationResponseJson(t *testing.T) {
 	testFile := "/tmp/test.file"
 	count := 1000 // max for race checking
 	translator := NewMock_Translator(t)
-
+	player := NewMock_Pronouncer(t)
+	visualizer := NewMock_Visualizer(t)
 	res := translateWordResult(fakeapi.SearchWord)
 
 	downloader.EXPECT().Download(fakeapi.SoundURL).Return(testFile, nil).Times(count)
+	downloader.EXPECT().Remove(testFile).Return(nil).Times(count)
 	translator.EXPECT().TranslateWord(fakeapi.SearchWord).Return(res).Times(count)
+	player.EXPECT().Play(testFile).Return(nil).Times(count)
+	for _, u := range fakeapi.PictureUrls {
+		visualizer.EXPECT().Show(u).Return(nil).Times(count)
+	}
 
 	logger.Prepare(slog.LevelError + 10)
 	searchWords := make([]string, 0, count)
@@ -37,18 +42,21 @@ func TestProcessTranslationResponseJson(t *testing.T) {
 	}
 	ctx := context.Background()
 
-	args := Lingualeo{Sound: true, Words: searchWords, Add: false, Translator: translator}
-	var wg sync.WaitGroup
-
-	wg.Add(1)
-	soundChan, _, resultChan := args.Process(ctx, &wg)
-	wg.Add(1)
+	args := Lingualeo{
+		Sound:             true,
+		Words:             searchWords,
+		Add:               false,
+		Picture:           true,
+		DownloadSoundFile: true,
+		Translator:        translator,
+		Downloader:        downloader,
+		Pronouncer:        player,
+		Visualizer:        visualizer,
+	}
 
-	go args.downloadAndPronounce(ctx, soundChan, &wg, downloader)
+	ch := args.translateToChan(ctx)
 
-	for result := range resultChan {
+	for result := range ch {
 		fakeapi.CheckResult(t, result, searchWords[0], fakeapi.Expected)
 	}
-
-	wg.Wait()
 }

pkg/translator/helpers.go

@@ -1,33 +1,9 @@
 package translator
 
 import (
-	"os/exec"
-	"strings"
 	"unicode"
 )
 
-func PlaySound(player string, url string) error {
-	parts := strings.Split(player, " ")
-	playerExec := parts[0]
-	params := append(parts[1:], url)
-	cmd := exec.Command(playerExec, params...)
-	err := cmd.Start()
-	if err != nil {
-		return err
-	}
-	err = cmd.Wait()
-	if err != nil {
-		return err
-	}
-	return nil
-}
-
-func isCommandAvailable(name string) bool {
-	execName := strings.Split(name, " ")[0]
-	_, err := exec.LookPath(execName)
-	return err == nil
-}
-
 func isRussianWord(s string) bool {
 	for _, symbol := range s {
 		if !unicode.Is(unicode.Cyrillic, symbol) && !unicode.Is(unicode.Number, symbol) {