src/convertor/view.go

@@ -6,13 +6,11 @@ import (
 	"fyne.io/fyne/v2/canvas"
 	"fyne.io/fyne/v2/container"
 	"fyne.io/fyne/v2/dialog"
-	"fyne.io/fyne/v2/storage"
 	"fyne.io/fyne/v2/widget"
 	"git.kor-elf.net/kor-elf/gui-for-ffmpeg/src/helper"
 	"git.kor-elf.net/kor-elf/gui-for-ffmpeg/src/localizer"
 	"github.com/nicksnyder/go-i18n/v2/i18n"
 	"image/color"
-	"path/filepath"
 )
 
 type ViewContract interface {
@@ -80,14 +78,14 @@ func (v View) Main(
 			Widget: fileVideoForConversion,
 		},
 		{
-			Widget: container.NewHScroll(fileVideoForConversionMessage),
+			Widget: fileVideoForConversionMessage,
 		},
 		{
 			Text:   v.localizerService.GetMessage(&i18n.LocalizeConfig{MessageID: "buttonForSelectedDirTitle"}),
 			Widget: buttonForSelectedDir,
 		},
 		{
-			Widget: container.NewHScroll(buttonForSelectedDirMessage),
+			Widget: buttonForSelectedDirMessage,
 		},
 		{
 			Widget: checkboxOverwriteOutputFiles,
@@ -149,8 +147,6 @@ func (v View) getButtonFileVideoForConversion(form *widget.Form, progress *widge
 		MessageID: "choose",
 	})
 
-	var locationURI fyne.ListableURI
-
 	button := widget.NewButton(buttonTitle, func() {
 		fileDialog := dialog.NewFileOpen(
 			func(r fyne.URIReadCloser, err error) {
@@ -174,15 +170,9 @@ func (v View) getButtonFileVideoForConversion(form *widget.Form, progress *widge
 				progress.Value = 0
 				progress.Refresh()
 				conversionMessage.Text = ""
-
-				listableURI := storage.NewFileURI(filepath.Dir(r.URI().Path()))
-				locationURI, err = storage.ListerForURI(listableURI)
 			}, v.w)
 		helper.FileDialogResize(fileDialog, v.w)
 		fileDialog.Show()
-		if locationURI != nil {
-			fileDialog.SetLocation(locationURI)
-		}
 	})
 
 	return button, fileVideoForConversionMessage, fileInput
@@ -200,8 +190,6 @@ func (v View) getButtonForSelectingDirectoryForSaving() (button *widget.Button,
 		MessageID: "choose",
 	})
 
-	var locationURI fyne.ListableURI
-
 	button = widget.NewButton(buttonTitle, func() {
 		fileDialog := dialog.NewFolderOpen(
 			func(r fyne.ListableURI, err error) {
@@ -218,14 +206,9 @@ func (v View) getButtonForSelectingDirectoryForSaving() (button *widget.Button,
 
 				buttonMessage.Text = r.Path()
 				setStringSuccessStyle(buttonMessage)
-				locationURI, _ = storage.ListerForURI(r)
-
 			}, v.w)
 		helper.FileDialogResize(fileDialog, v.w)
 		fileDialog.Show()
-		if locationURI != nil {
-			fileDialog.SetLocation(locationURI)
-		}
 	})
 
 	return

src/convertor/view_setting.go

@@ -5,13 +5,11 @@ import (
 	"fyne.io/fyne/v2/canvas"
 	"fyne.io/fyne/v2/container"
 	"fyne.io/fyne/v2/dialog"
-	"fyne.io/fyne/v2/storage"
 	"fyne.io/fyne/v2/widget"
 	"git.kor-elf.net/kor-elf/gui-for-ffmpeg/src/helper"
 	"github.com/nicksnyder/go-i18n/v2/i18n"
 	"image/color"
 	"net/url"
-	"path/filepath"
 )
 
 func (v View) SelectFFPath(
@@ -49,7 +47,7 @@ func (v View) SelectFFPath(
 				Widget: buttonFFmpeg,
 			},
 			{
-				Widget: container.NewHScroll(buttonFFmpegMessage),
+				Widget: buttonFFmpegMessage,
 			},
 			{
 				Text: v.localizerService.GetMessage(&i18n.LocalizeConfig{
@@ -58,7 +56,7 @@ func (v View) SelectFFPath(
 				Widget: buttonFFprobe,
 			},
 			{
-				Widget: container.NewHScroll(buttonFFprobeMessage),
+				Widget: buttonFFprobeMessage,
 			},
 			{
 				Widget: errorMessage,
@@ -101,12 +99,6 @@ func (v View) getButtonSelectFile(path string) (filePath *string, button *widget
 		MessageID: "choose",
 	})
 
-	var locationURI fyne.ListableURI
-	if len(path) > 0 {
-		listableURI := storage.NewFileURI(filepath.Dir(path))
-		locationURI, _ = storage.ListerForURI(listableURI)
-	}
-
 	button = widget.NewButton(buttonTitle, func() {
 		fileDialog := dialog.NewFileOpen(
 			func(r fyne.URIReadCloser, err error) {
@@ -123,15 +115,9 @@ func (v View) getButtonSelectFile(path string) (filePath *string, button *widget
 
 				buttonMessage.Text = r.URI().Path()
 				setStringSuccessStyle(buttonMessage)
-
-				listableURI := storage.NewFileURI(filepath.Dir(r.URI().Path()))
-				locationURI, _ = storage.ListerForURI(listableURI)
 			}, v.w)
 		helper.FileDialogResize(fileDialog, v.w)
 		fileDialog.Show()
-		if locationURI != nil {
-			fileDialog.SetLocation(locationURI)
-		}
 	})
 
 	return

src/handler/convertor.go

@@ -178,30 +178,19 @@ func (p Progress) Run(stdOut io.ReadCloser, stdErr io.ReadCloser) error {
 	progress := 0.0
 
 	go func() {
-		scannerErr := bufio.NewReader(stdErr)
-		for {
-			line, _, err := scannerErr.ReadLine()
-			if err != nil {
-				if err == io.EOF {
-					break
-				}
-				continue
-			}
-			data := strings.TrimSpace(string(line))
-			errorText = data
+		scannerErr := bufio.NewScanner(stdErr)
+		for scannerErr.Scan() {
+			errorText = scannerErr.Text()
+		}
+		if err := scannerErr.Err(); err != nil {
+			errorText = err.Error()
 		}
 	}()
 
-	scannerOut := bufio.NewReader(stdOut)
-	for {
-		line, _, err := scannerOut.ReadLine()
-		if err != nil {
-			if err == io.EOF {
-				break
-			}
-			continue
-		}
-		data := strings.TrimSpace(string(line))
+	scannerOut := bufio.NewScanner(stdOut)
+	for scannerOut.Scan() {
+		data := scannerOut.Text()
+
 		if strings.Contains(data, "progress=end") {
 			p.progressbar.Value = p.totalDuration
 			p.progressbar.Refresh()