Merge pull request 'Версия 0.6.0' (#7) from develop into main

Reviewed-on: #7

.gitignore

@@ -1,2 +1 @@
 fyne-cross/*
-ffmpeg/*

convertor/view/form_items/form.go

@@ -2,15 +2,11 @@ package form_items
 
 import (
 	"fyne.io/fyne/v2/widget"
-	"git.kor-elf.net/kor-elf/gui-for-ffmpeg/convertor/view/form_items/h264_nvenc"
 	"git.kor-elf.net/kor-elf/gui-for-ffmpeg/convertor/view/form_items/libx264"
-	"git.kor-elf.net/kor-elf/gui-for-ffmpeg/convertor/view/form_items/libx265"
 	"git.kor-elf.net/kor-elf/gui-for-ffmpeg/encoder"
 	"git.kor-elf.net/kor-elf/gui-for-ffmpeg/kernel"
 )
 
 var Views = map[string]func(encoder encoder.EncoderContract, app kernel.AppContract) []*widget.FormItem{
 	"libx264": libx264.View,
-	"h264_nvenc": h264_nvenc.View,
-	"libx265":    libx265.View,
 }

convertor/view/form_items/h264_nvenc/view.go

@@ -1,65 +0,0 @@
-package h264_nvenc
-
-import (
-	"fyne.io/fyne/v2/container"
-	"fyne.io/fyne/v2/widget"
-	"git.kor-elf.net/kor-elf/gui-for-ffmpeg/encoder"
-	"git.kor-elf.net/kor-elf/gui-for-ffmpeg/encoder/h264_nvenc"
-	"git.kor-elf.net/kor-elf/gui-for-ffmpeg/kernel"
-	"github.com/nicksnyder/go-i18n/v2/i18n"
-)
-
-func View(encoder encoder.EncoderContract, app kernel.AppContract) []*widget.FormItem {
-	items := []*widget.FormItem{}
-
-	items = append(items, presetParameter(encoder, app)...)
-
-	return items
-}
-
-func presetParameter(encoder encoder.EncoderContract, app kernel.AppContract) []*widget.FormItem {
-	parameter, err := encoder.GetParameter("preset")
-	if err != nil {
-		return nil
-	}
-
-	presets := map[string]string{}
-	presetsForSelect := []string{}
-	presetDefault := ""
-
-	for _, name := range h264_nvenc.Presets {
-		title := name
-		presetsForSelect = append(presetsForSelect, name)
-		presets[title] = name
-		if name == parameter.Get() {
-			presetDefault = title
-		}
-	}
-
-	elementSelect := widget.NewSelect(presetsForSelect, func(s string) {
-		if presets[s] == "" {
-			return
-		}
-		parameter.Set(presets[s])
-	})
-	elementSelect.SetSelected(presetDefault)
-	elementSelect.Hide()
-
-	checkboxTitle := app.GetLocalizerService().GetMessage(&i18n.LocalizeConfig{MessageID: "parameterCheckbox"})
-	elementCheckbox := widget.NewCheck(checkboxTitle, func(b bool) {
-		if b == true {
-			parameter.SetEnable()
-			elementSelect.Show()
-			return
-		}
-		parameter.SetDisable()
-		elementSelect.Hide()
-	})
-
-	return []*widget.FormItem{
-		{
-			Text:   app.GetLocalizerService().GetMessage(&i18n.LocalizeConfig{MessageID: "formPreset"}),
-			Widget: container.NewVBox(elementCheckbox, elementSelect),
-		},
-	}
-}

convertor/view/form_items/libx265/view.go

@@ -1,65 +0,0 @@
-package libx265
-
-import (
-	"fyne.io/fyne/v2/container"
-	"fyne.io/fyne/v2/widget"
-	"git.kor-elf.net/kor-elf/gui-for-ffmpeg/encoder"
-	"git.kor-elf.net/kor-elf/gui-for-ffmpeg/encoder/libx265"
-	"git.kor-elf.net/kor-elf/gui-for-ffmpeg/kernel"
-	"github.com/nicksnyder/go-i18n/v2/i18n"
-)
-
-func View(encoder encoder.EncoderContract, app kernel.AppContract) []*widget.FormItem {
-	items := []*widget.FormItem{}
-
-	items = append(items, presetParameter(encoder, app)...)
-
-	return items
-}
-
-func presetParameter(encoder encoder.EncoderContract, app kernel.AppContract) []*widget.FormItem {
-	parameter, err := encoder.GetParameter("preset")
-	if err != nil {
-		return nil
-	}
-
-	presets := map[string]string{}
-	presetsForSelect := []string{}
-	presetDefault := ""
-
-	for _, name := range libx265.Presets {
-		title := app.GetLocalizerService().GetMessage(&i18n.LocalizeConfig{MessageID: "preset_" + name})
-		presetsForSelect = append(presetsForSelect, title)
-		presets[title] = name
-		if name == parameter.Get() {
-			presetDefault = title
-		}
-	}
-
-	elementSelect := widget.NewSelect(presetsForSelect, func(s string) {
-		if presets[s] == "" {
-			return
-		}
-		parameter.Set(presets[s])
-	})
-	elementSelect.SetSelected(presetDefault)
-	elementSelect.Hide()
-
-	checkboxTitle := app.GetLocalizerService().GetMessage(&i18n.LocalizeConfig{MessageID: "parameterCheckbox"})
-	elementCheckbox := widget.NewCheck(checkboxTitle, func(b bool) {
-		if b == true {
-			parameter.SetEnable()
-			elementSelect.Show()
-			return
-		}
-		parameter.SetDisable()
-		elementSelect.Hide()
-	})
-
-	return []*widget.FormItem{
-		{
-			Text:   app.GetLocalizerService().GetMessage(&i18n.LocalizeConfig{MessageID: "formPreset"}),
-			Widget: container.NewVBox(elementCheckbox, elementSelect),
-		},
-	}
-}

convertor/view_setting_button_download_ffmpeg_anyos.go

@@ -1,5 +1,5 @@
-//go:build !windows && !linux
+//go:build !windows
-// +build !windows,!linux
+// +build !windows
 
 package convertor
 

convertor/view_setting_button_download_ffmpeg_linux.go

@@ -1,63 +0,0 @@
-//go:build linux
-// +build linux
-
-package convertor
-
-import (
-	"fyne.io/fyne/v2"
-	"fyne.io/fyne/v2/canvas"
-	"fyne.io/fyne/v2/container"
-	"fyne.io/fyne/v2/widget"
-	"github.com/nicksnyder/go-i18n/v2/i18n"
-	"golang.org/x/image/colornames"
-	"image/color"
-)
-
-func (v View) blockDownloadFFmpeg(
-	donwloadFFmpeg func(progressBar *widget.ProgressBar, progressMessage *canvas.Text) error,
-) *fyne.Container {
-
-	errorDownloadFFmpegMessage := canvas.NewText("", color.RGBA{R: 255, G: 0, B: 0, A: 255})
-	errorDownloadFFmpegMessage.TextSize = 16
-	errorDownloadFFmpegMessage.TextStyle = fyne.TextStyle{Bold: true}
-
-	progressDownloadFFmpegMessage := canvas.NewText("", color.RGBA{R: 49, G: 127, B: 114, A: 255})
-	progressDownloadFFmpegMessage.TextSize = 16
-	progressDownloadFFmpegMessage.TextStyle = fyne.TextStyle{Bold: true}
-
-	progressBar := widget.NewProgressBar()
-
-	var buttonDownloadFFmpeg *widget.Button
-
-	buttonDownloadFFmpeg = widget.NewButton(v.app.GetLocalizerService().GetMessage(&i18n.LocalizeConfig{
-		MessageID: "download",
-	}), func() {
-		buttonDownloadFFmpeg.Disable()
-
-		err := donwloadFFmpeg(progressBar, progressDownloadFFmpegMessage)
-		if err != nil {
-			errorDownloadFFmpegMessage.Text = err.Error()
-		}
-
-		buttonDownloadFFmpeg.Enable()
-	})
-
-	downloadFFmpegFromSiteMessage := v.app.GetLocalizerService().GetMessage(&i18n.LocalizeConfig{
-		MessageID: "downloadFFmpegFromSite",
-	})
-
-	return container.NewVBox(
-		canvas.NewLine(colornames.Darkgreen),
-		widget.NewCard(v.app.GetLocalizerService().GetMessage(&i18n.LocalizeConfig{
-			MessageID: "buttonDownloadFFmpeg",
-		}), "", container.NewVBox(
-			widget.NewRichTextFromMarkdown(
-				downloadFFmpegFromSiteMessage+" [https://github.com/BtbN/FFmpeg-Builds/releases](https://github.com/BtbN/FFmpeg-Builds/releases)",
-			),
-			buttonDownloadFFmpeg,
-			errorDownloadFFmpegMessage,
-			progressDownloadFFmpegMessage,
-			progressBar,
-		)),
-	)
-}

db/db.go

@@ -1,7 +0,0 @@
-package db
-
-import "errors"
-
-var (
-	ErrRecordNotFound = errors.New("record not found")
-)

encoder/h264_nvenc/encoder.go

@@ -1,37 +1,13 @@
 package h264_nvenc
 
 import (
-	"errors"
 	encoder2 "git.kor-elf.net/kor-elf/gui-for-ffmpeg/encoder"
 )
 
-var Presets = []string{
-	"default",
-	"slow",
-	"medium",
-	"fast",
-	"hp",
-	"hq",
-	"bd",
-	"ll",
-	"llhq",
-	"llhp",
-	"lossless",
-	"losslesshp",
-}
-
 func NewEncoder() encoder2.EncoderContract {
-	parameters := map[string]encoder2.ParameterContract{
+	parameters := map[string]encoder2.ParameterContract{}
-		"preset": newParameterPreset(),
-	}
 	getParams := func(parameters map[string]encoder2.ParameterContract) []string {
-		params := []string{"-c:v", "h264_nvenc"}
+		return []string{"-c:v", "h264_nvenc"}
-
-		if parameters["preset"] != nil && parameters["preset"].IsEnabled() {
-			params = append(params, "-preset", parameters["preset"].Get())
-		}
-
-		return params
 	}
 
 	return encoder2.NewEncoder("h264_nvenc", parameters, getParams)
@@ -43,16 +19,3 @@ func NewData() encoder2.EncoderDataContract {
 	fileType := encoder2.FileType(encoder2.Video)
 	return encoder2.NewData(title, formats, fileType, NewEncoder)
 }
-
-func newParameterPreset() encoder2.ParameterContract {
-	setParameter := func(s string) (string, error) {
-		for _, value := range Presets {
-			if value == s {
-				return value, nil
-			}
-		}
-
-		return "", errors.New("preset not found")
-	}
-	return encoder2.NewParameter("preset", false, "default", setParameter)
-}

encoder/libx265/encoder.go

@@ -1,35 +1,11 @@
 package libx265
 
-import (
+import encoder2 "git.kor-elf.net/kor-elf/gui-for-ffmpeg/encoder"
-	"errors"
-	encoder2 "git.kor-elf.net/kor-elf/gui-for-ffmpeg/encoder"
-)
-
-var Presets = []string{
-	"ultrafast",
-	"superfast",
-	"veryfast",
-	"faster",
-	"fast",
-	"medium",
-	"slow",
-	"slower",
-	"veryslow",
-	"placebo",
-}
 
 func NewEncoder() encoder2.EncoderContract {
-	parameters := map[string]encoder2.ParameterContract{
+	parameters := map[string]encoder2.ParameterContract{}
-		"preset": newParameterPreset(),
-	}
 	getParams := func(parameters map[string]encoder2.ParameterContract) []string {
-		params := []string{"-c:v", "libx265"}
+		return []string{"-c:v", "libx265"}
-
-		if parameters["preset"] != nil && parameters["preset"].IsEnabled() {
-			params = append(params, "-preset", parameters["preset"].Get())
-		}
-
-		return params
 	}
 
 	return encoder2.NewEncoder("libx265", parameters, getParams)
@@ -41,16 +17,3 @@ func NewData() encoder2.EncoderDataContract {
 	fileType := encoder2.FileType(encoder2.Video)
 	return encoder2.NewData(title, formats, fileType, NewEncoder)
 }
-
-func newParameterPreset() encoder2.ParameterContract {
-	setParameter := func(s string) (string, error) {
-		for _, value := range Presets {
-			if value == s {
-				return value, nil
-			}
-		}
-
-		return "", errors.New("preset not found")
-	}
-	return encoder2.NewParameter("preset", false, "medium", setParameter)
-}

go.mod

@@ -1,18 +1,15 @@
 module git.kor-elf.net/kor-elf/gui-for-ffmpeg
 
-go 1.23
+go 1.21
-
-toolchain go1.23.9
 
 require (
 	fyne.io/fyne/v2 v2.4.3
 	github.com/BurntSushi/toml v1.3.2
 	github.com/mattn/go-sqlite3 v1.14.21
 	github.com/nicksnyder/go-i18n/v2 v2.4.0
-	github.com/ulikunitz/xz v0.5.12
-	go.etcd.io/bbolt v1.4.0
-	golang.org/x/image v0.11.0
 	golang.org/x/text v0.14.0
+	gorm.io/driver/sqlite v1.5.4
+	gorm.io/gorm v1.25.6
 )
 
 require (
@@ -29,16 +26,19 @@ require (
 	github.com/go-text/typesetting v0.0.0-20230616162802-9c17dd34aa4a // indirect
 	github.com/godbus/dbus/v5 v5.1.0 // indirect
 	github.com/gopherjs/gopherjs v1.17.2 // indirect
+	github.com/jinzhu/inflection v1.0.0 // indirect
+	github.com/jinzhu/now v1.1.5 // indirect
 	github.com/jsummers/gobmp v0.0.0-20151104160322-e2ba15ffa76e // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/srwiley/oksvg v0.0.0-20221011165216-be6e8873101c // indirect
 	github.com/srwiley/rasterx v0.0.0-20220730225603-2ab79fcdd4ef // indirect
-	github.com/stretchr/testify v1.10.0 // indirect
+	github.com/stretchr/testify v1.8.4 // indirect
 	github.com/tevino/abool v1.2.0 // indirect
 	github.com/yuin/goldmark v1.5.5 // indirect
+	golang.org/x/image v0.11.0 // indirect
 	golang.org/x/mobile v0.0.0-20230531173138-3c911d8e3eda // indirect
 	golang.org/x/net v0.20.0 // indirect
-	golang.org/x/sys v0.29.0 // indirect
+	golang.org/x/sys v0.16.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	honnef.co/go/js/dom v0.0.0-20210725211120-f030747120f2 // indirect
 )

go.sum

@@ -73,8 +73,8 @@ github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.m
 github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
 github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
-github.com/felixge/fgprof v0.9.3 h1:VvyZxILNuCiUCSXtPtYmmtGvb65nqXh2QFWc0Wpf2/g=
+github.com/fredbi/uri v1.0.0 h1:s4QwUAZ8fz+mbTsukND+4V5f+mJ/wjaTokwstGUAemg=
-github.com/felixge/fgprof v0.9.3/go.mod h1:RdbpDgzqYVh/T9fPELJyV7EYJuHB55UTEULNun8eiPw=
+github.com/fredbi/uri v1.0.0/go.mod h1:1xC40RnIOGCaQzswaOvrzvG/3M3F0hyDVb3aO/1iGy0=
 github.com/fredbi/uri v1.1.0 h1:OqLpTXtyRg9ABReqvDGdJPqZUxs8cyBDOMXBbskCaB8=
 github.com/fredbi/uri v1.1.0/go.mod h1:aYTUoAXBOq7BLfVJ8GnKmfcuURosB1xyHDIfWeC/iW4=
 github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
@@ -87,6 +87,7 @@ github.com/fyne-io/glfw-js v0.0.0-20220120001248-ee7290d23504/go.mod h1:gLRWYfYn
 github.com/fyne-io/image v0.0.0-20220602074514-4956b0afb3d2 h1:hnLq+55b7Zh7/2IRzWCpiTcAvjv/P8ERF+N7+xXbZhk=
 github.com/fyne-io/image v0.0.0-20220602074514-4956b0afb3d2/go.mod h1:eO7W361vmlPOrykIg+Rsh1SZ3tQBaOsfzZhsIOb/Lm0=
 github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
+github.com/go-gl/gl v0.0.0-20211210172815-726fda9656d6 h1:zDw5v7qm4yH7N8C8uWd+8Ii9rROdgWxQuGoJ9WDXxfk=
 github.com/go-gl/gl v0.0.0-20211210172815-726fda9656d6/go.mod h1:9YTyiznxEY1fVinfM7RvRcjRHbw2xLBJ3AAGIT0I4Nw=
 github.com/go-gl/gl v0.0.0-20231021071112-07e5d0ea2e71 h1:5BVwOaUSBTlVZowGO6VZGw2H/zl9nrd3eCZfYV+NfQA=
 github.com/go-gl/gl v0.0.0-20231021071112-07e5d0ea2e71/go.mod h1:9YTyiznxEY1fVinfM7RvRcjRHbw2xLBJ3AAGIT0I4Nw=
@@ -94,6 +95,8 @@ github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9
 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20211213063430-748e38ca8aec/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
+github.com/go-gl/glfw/v3.3/glfw v0.0.0-20221017161538-93cebf72946b h1:GgabKamyOYguHqHjSkDACcgoPIz3w0Dis/zJ1wyHHHU=
+github.com/go-gl/glfw/v3.3/glfw v0.0.0-20221017161538-93cebf72946b/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20240118000515-a250818d05e3 h1:nanQfMsOs3gnuKRm0E5jXWomedE/9YIFXdmHJNZYeqc=
 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20240118000515-a250818d05e3/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
 github.com/go-text/render v0.0.0-20230619120952-35bccb6164b8 h1:VkKnvzbvHqgEfm351rfr8Uclu5fnwq8HP2ximUzJsBM=
@@ -164,8 +167,6 @@ github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod h1:kpwsk12EmLe
 github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/pprof v0.0.0-20210122040257-d980be63207e/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
-github.com/google/pprof v0.0.0-20211214055906-6f57359322fd h1:1FjCyPC+syAzJ5/2S8fqdZK1R22vvA0J7JZKcuOIQ7Y=
-github.com/google/pprof v0.0.0-20211214055906-6f57359322fd/go.mod h1:KgnwoLYCZ8IQu3XUZ8Nc/bM9CCZFOyjUNOSygVozoDg=
 github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
 github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
@@ -200,6 +201,10 @@ github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/J
 github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
 github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
 github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
+github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E=
+github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc=
+github.com/jinzhu/now v1.1.5 h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ=
+github.com/jinzhu/now v1.1.5/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8=
 github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
 github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
 github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk=
@@ -217,6 +222,8 @@ github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/magiconair/properties v1.8.5/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60=
 github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
 github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
+github.com/mattn/go-sqlite3 v1.14.19 h1:fhGleo2h1p8tVChob4I9HpmVFIAkKGpiukdrgQbWfGI=
+github.com/mattn/go-sqlite3 v1.14.19/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg=
 github.com/mattn/go-sqlite3 v1.14.21 h1:IXocQLOykluc3xPE0Lvy8FtggMz1G+U3mEjg+0zGizc=
 github.com/mattn/go-sqlite3 v1.14.21/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y=
 github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
@@ -233,13 +240,13 @@ github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lN
 github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
 github.com/neelance/astrewrite v0.0.0-20160511093645-99348263ae86/go.mod h1:kHJEU3ofeGjhHklVoIGuVj85JJwZ6kWPaJwCIxgnFmo=
 github.com/neelance/sourcemap v0.0.0-20200213170602-2833bce08e4c/go.mod h1:Qr6/a/Q4r9LP1IltGz7tA7iOK1WonHEYhu1HRBA7ZiM=
+github.com/nicksnyder/go-i18n/v2 v2.3.0 h1:2NPsCsNFCVd7i+Su0xYsBrIhS3bE2XMv5gNTft2O+PQ=
+github.com/nicksnyder/go-i18n/v2 v2.3.0/go.mod h1:nxYSZE9M0bf3Y70gPQjN9ha7XNHX7gMc814+6wVyEI4=
 github.com/nicksnyder/go-i18n/v2 v2.4.0 h1:3IcvPOAvnCKwNm0TB0dLDTuawWEj+ax/RERNC+diLMM=
 github.com/nicksnyder/go-i18n/v2 v2.4.0/go.mod h1:nxYSZE9M0bf3Y70gPQjN9ha7XNHX7gMc814+6wVyEI4=
 github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
 github.com/pelletier/go-toml v1.9.3/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
-github.com/pkg/profile v1.7.0 h1:hnbDkaNWPCLMO9wGLdBFTIZvzDrDfBM2072E1S9gJkA=
-github.com/pkg/profile v1.7.0/go.mod h1:8Uer0jas47ZQMJ7VD+OHknK4YDY07LPUC6dEvqDjvNo=
 github.com/pkg/sftp v1.10.1/go.mod h1:lYOWFsE0bwd1+KfKJaKeuokY15vzFx25BLbzYYoAxZI=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
@@ -267,6 +274,7 @@ github.com/srwiley/oksvg v0.0.0-20221011165216-be6e8873101c/go.mod h1:cNQ3dwVJtS
 github.com/srwiley/rasterx v0.0.0-20220730225603-2ab79fcdd4ef h1:Ch6Q+AZUxDBCVqdkI8FSpFyZDtCVBc2VmejdNrm5rRQ=
 github.com/srwiley/rasterx v0.0.0-20220730225603-2ab79fcdd4ef/go.mod h1:nXTWP6+gD5+LUJ8krVhhoeHjvHTutPxMYl5SvkcnJNE=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
@@ -274,13 +282,12 @@ github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
+github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
-github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
+github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
+github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
 github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw=
 github.com/tevino/abool v1.2.0 h1:heAkClL8H6w+mK5md9dzsuohKeXHUpY7Vw0ZCKW+huA=
 github.com/tevino/abool v1.2.0/go.mod h1:qc66Pna1RiIsPa7O4Egxxs9OqkuxDX55zznh9K07Tzg=
-github.com/ulikunitz/xz v0.5.12 h1:37Nm15o69RwBkXM0J6A5OlE67RZTfzUxTj8fB3dfcsc=
-github.com/ulikunitz/xz v0.5.12/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=
 github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
@@ -290,8 +297,6 @@ github.com/yuin/goldmark v1.4.0/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1
 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
 github.com/yuin/goldmark v1.5.5 h1:IJznPe8wOzfIKETmMkd06F8nXkmlhaHqFRM9l1hAGsU=
 github.com/yuin/goldmark v1.5.5/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
-go.etcd.io/bbolt v1.4.0 h1:TU77id3TnN/zKr7CO/uk+fBCwF2jGcMuw2B/FMAzYIk=
-go.etcd.io/bbolt v1.4.0/go.mod h1:AsD+OCi/qPN1giOX1aiLAha3o1U8rAz65bvN4j0sRuk=
 go.etcd.io/etcd/api/v3 v3.5.0/go.mod h1:cbVKeC6lCfl7j/8jBhAK6aIYO9XOjdptoxU/nLQcPvs=
 go.etcd.io/etcd/client/pkg/v3 v3.5.0/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g=
 go.etcd.io/etcd/client/v2 v2.305.0/go.mod h1:h9puh54ZTgAKtEbut2oe9P4L/oqKCVB6xsXlzd7alYQ=
@@ -396,6 +401,8 @@ golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96b
 golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
 golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
+golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM=
+golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
 golang.org/x/net v0.20.0 h1:aCL9BSgETF1k+blQaYUBx9hJ9LOGP3gAVemcZlf1Kpo=
 golang.org/x/net v0.20.0/go.mod h1:z8BVo6PvndSri0LbOE3hAn0apkU+1YvI6E70E9jsnvY=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
@@ -423,8 +430,6 @@ golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ=
-golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -474,8 +479,10 @@ golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU=
+golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE=
-golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.16.0 h1:xWw16ngr6ZMtmxDyKyIgsE93KNKz5HKmMa3b8ALHidU=
+golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
@@ -670,6 +677,12 @@ gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C
 gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gorm.io/driver/sqlite v1.5.4 h1:IqXwXi8M/ZlPzH/947tn5uik3aYQslP9BVveoax0nV0=
+gorm.io/driver/sqlite v1.5.4/go.mod h1:qxAuCol+2r6PannQDpOP1FP6ag3mKi4esLnB/jHed+4=
+gorm.io/gorm v1.25.5 h1:zR9lOiiYf09VNh5Q1gphfyia1JpiClIWG9hQaxB/mls=
+gorm.io/gorm v1.25.5/go.mod h1:hbnx/Oo0ChWMn1BIhpy1oYozzpM15i4YPuHDmfYtwg8=
+gorm.io/gorm v1.25.6 h1:V92+vVda1wEISSOMtodHVRcUIOPYa2tgQtyF+DfFx+A=
+gorm.io/gorm v1.25.6/go.mod h1:hbnx/Oo0ChWMn1BIhpy1oYozzpM15i4YPuHDmfYtwg8=
 honnef.co/go/js/dom v0.0.0-20210725211120-f030747120f2 h1:oomkgU6VaQDsV6qZby2uz1Lap0eXmku8+2em3A/l700=
 honnef.co/go/js/dom v0.0.0-20210725211120-f030747120f2/go.mod h1:sUMDUKNB2ZcVjt92UnLy3cdGs+wDAcrPdV3JP6sVgA4=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=

handler/convertor_anyos.go

@@ -1,5 +1,5 @@
-//go:build !windows && !linux
+//go:build !windows
-// +build !windows,!linux
+// +build !windows
 
 package handler
 

handler/convertor_linux.go

@@ -1,208 +0,0 @@
-//go:build linux
-// +build linux
-
-package handler
-
-import (
-	"archive/tar"
-	"errors"
-	"fyne.io/fyne/v2/canvas"
-	"fyne.io/fyne/v2/widget"
-	"git.kor-elf.net/kor-elf/gui-for-ffmpeg/kernel"
-	"github.com/nicksnyder/go-i18n/v2/i18n"
-	"github.com/ulikunitz/xz"
-	"io"
-	"net/http"
-	"os"
-	"path/filepath"
-)
-
-func getPathsToFF() []kernel.FFPathUtilities {
-	return []kernel.FFPathUtilities{{"ffmpeg/bin/ffmpeg", "ffmpeg/bin/ffprobe"}, {"ffmpeg", "ffprobe"}}
-}
-
-func (h ConvertorHandler) downloadFFmpeg(progressBar *widget.ProgressBar, progressMessage *canvas.Text) (err error) {
-	isDirectoryFFmpeg := isDirectory("ffmpeg")
-	if isDirectoryFFmpeg == false {
-		err = os.Mkdir("ffmpeg", 0777)
-		if err != nil {
-			return err
-		}
-	}
-	progressMessage.Text = h.app.GetLocalizerService().GetMessage(&i18n.LocalizeConfig{
-		MessageID: "downloadRun",
-	})
-	progressMessage.Refresh()
-	err = downloadFile("ffmpeg/ffmpeg.tar.xz", "https://github.com/BtbN/FFmpeg-Builds/releases/download/latest/ffmpeg-master-latest-linux64-gpl.tar.xz", progressBar)
-	if err != nil {
-		return err
-	}
-
-	progressMessage.Text = h.app.GetLocalizerService().GetMessage(&i18n.LocalizeConfig{
-		MessageID: "unzipRun",
-	})
-	progressMessage.Refresh()
-	err = unTarXz("ffmpeg/ffmpeg.tar.xz", "ffmpeg", progressBar)
-	if err != nil {
-		return err
-	}
-	_ = os.Remove("ffmpeg/ffmpeg.tar.xz")
-
-	progressMessage.Text = h.app.GetLocalizerService().GetMessage(&i18n.LocalizeConfig{
-		MessageID: "testFF",
-	})
-	progressMessage.Refresh()
-
-	err = h.saveSettingFFPath("ffmpeg/ffmpeg-master-latest-linux64-gpl/bin/ffmpeg", "ffmpeg/ffmpeg-master-latest-linux64-gpl/bin/ffprobe")
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func downloadFile(filepath string, url string, progressBar *widget.ProgressBar) (err error) {
-	progressBar.Value = 0
-	progressBar.Max = 100
-
-	req, err := http.NewRequest("GET", url, nil)
-	if err != nil {
-		return err
-	}
-	resp, err := http.DefaultClient.Do(req)
-	if err != nil {
-		return err
-	}
-	defer resp.Body.Close()
-
-	f, err := os.OpenFile(filepath, os.O_CREATE|os.O_WRONLY, 0644)
-	if err != nil {
-		return err
-	}
-	defer f.Close()
-
-	buf := make([]byte, 32*1024)
-	var downloaded int64
-	for {
-		n, err := resp.Body.Read(buf)
-		if err != nil {
-			if err == io.EOF {
-				break
-			}
-			return err
-		}
-		if n > 0 {
-			f.Write(buf[:n])
-			downloaded += int64(n)
-			progressBar.Value = float64(downloaded) / float64(resp.ContentLength) * 100
-			progressBar.Refresh()
-		}
-	}
-	return nil
-}
-
-func unTarXz(fileTar string, directory string, progressBar *widget.ProgressBar) error {
-	progressBar.Value = 0
-	progressBar.Max = 100
-
-	f, err := os.Open(fileTar)
-	if err != nil {
-		return err
-	}
-	defer f.Close()
-
-	xzReader, err := xz.NewReader(f)
-	if err != nil {
-		return err
-	}
-
-	tarReader := tar.NewReader(xzReader)
-
-	totalFiles := 0
-	for {
-		_, err := tarReader.Next()
-		if err == io.EOF {
-			break
-		}
-		if err != nil {
-			return err
-		}
-		totalFiles++
-	}
-
-	// Rewind back to the beginning of the file to re-process
-	_, err = f.Seek(0, 0)
-	if err != nil {
-		return err
-	}
-
-	xzReader, err = xz.NewReader(f)
-	if err != nil {
-		return err
-	}
-
-	tarReader = tar.NewReader(xzReader)
-
-	// We count the number of files already unpacked
-	unpackedFiles := 0
-
-	for {
-		header, err := tarReader.Next()
-		if err == io.EOF {
-			break
-		}
-		if err != nil {
-			return err
-		}
-
-		targetPath := filepath.Join(directory, header.Name)
-		switch header.Typeflag {
-		case tar.TypeDir:
-			err := os.MkdirAll(targetPath, 0755)
-			if err != nil {
-				return err
-			}
-		case tar.TypeReg:
-			outFile, err := os.Create(targetPath)
-			if err != nil {
-				return err
-			}
-			defer outFile.Close()
-
-			_, err = io.Copy(outFile, tarReader)
-
-			if err != nil {
-				return err
-			}
-		default:
-			return errors.New("unsupported file type")
-		}
-
-		unpackedFiles++
-		progressBar.Value = float64(unpackedFiles) / float64(totalFiles) * 100
-		progressBar.Refresh()
-	}
-
-	ffmpegPath := filepath.Join(directory, "ffmpeg-master-latest-linux64-gpl", "bin", "ffmpeg")
-	err = os.Chmod(ffmpegPath, 0755)
-	if err != nil {
-		return err
-	}
-
-	ffprobePath := filepath.Join(directory, "ffmpeg-master-latest-linux64-gpl", "bin", "ffprobe")
-	err = os.Chmod(ffprobePath, 0755)
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func isDirectory(path string) bool {
-	fileInfo, err := os.Stat(path)
-	if err != nil {
-		return false
-	}
-
-	return fileInfo.IsDir()
-}

handler/convertor_windows.go

@@ -42,7 +42,7 @@ func (h ConvertorHandler) downloadFFmpeg(progressBar *widget.ProgressBar, progre
 		MessageID: "unzipRun",
 	})
 	progressMessage.Refresh()
-	err = unZip("ffmpeg/ffmpeg.zip", "ffmpeg", progressBar)
+	err = unZip("ffmpeg/ffmpeg.zip", "ffmpeg")
 	if err != nil {
 		return err
 	}
@@ -100,23 +100,13 @@ func downloadFile(filepath string, url string, progressBar *widget.ProgressBar)
 	return nil
 }
 
-func unZip(fileZip string, directory string, progressBar *widget.ProgressBar) error {
+func unZip(fileZip string, directory string) error {
-	progressBar.Value = 0
-	progressBar.Max = 100
-
 	archive, err := zip.OpenReader(fileZip)
 	if err != nil {
 		return err
 	}
 	defer archive.Close()
 
-	totalBytes := int64(0)
-	for _, f := range archive.File {
-		totalBytes += int64(f.UncompressedSize64)
-	}
-
-	unpackedBytes := int64(0)
-
 	for _, f := range archive.File {
 		filePath := filepath.Join(directory, f.Name)
 
@@ -142,15 +132,10 @@ func unZip(fileZip string, directory string, progressBar *widget.ProgressBar) er
 			return err
 		}
 
-		bytesRead, err := io.Copy(dstFile, fileInArchive)
+		if _, err := io.Copy(dstFile, fileInArchive); err != nil {
-		if err != nil {
 			return err
 		}
 
-		unpackedBytes += bytesRead
-		progressBar.Value = float64(unpackedBytes) / float64(totalBytes) * 100
-		progressBar.Refresh()
-
 		dstFile.Close()
 		fileInArchive.Close()
 	}

main.go

@@ -4,7 +4,6 @@ import (
 	"errors"
 	"fyne.io/fyne/v2"
 	"git.kor-elf.net/kor-elf/gui-for-ffmpeg/convertor"
-	dberror "git.kor-elf.net/kor-elf/gui-for-ffmpeg/db"
 	error2 "git.kor-elf.net/kor-elf/gui-for-ffmpeg/error"
 	"git.kor-elf.net/kor-elf/gui-for-ffmpeg/handler"
 	"git.kor-elf.net/kor-elf/gui-for-ffmpeg/kernel"
@@ -13,10 +12,10 @@ import (
 	"git.kor-elf.net/kor-elf/gui-for-ffmpeg/migration"
 	"git.kor-elf.net/kor-elf/gui-for-ffmpeg/setting"
 	_ "github.com/mattn/go-sqlite3"
-	"go.etcd.io/bbolt"
 	"golang.org/x/text/language"
+	"gorm.io/driver/sqlite"
+	"gorm.io/gorm"
 	"os"
-	"time"
 )
 
 var application kernel.AppContract
@@ -27,7 +26,7 @@ func init() {
 	appMetadata := &fyne.AppMetadata{
 		ID:      "net.kor-elf.projects.gui-for-ffmpeg",
 		Name:    "GUI for FFmpeg",
-		Version: "0.7.0",
+		Version: "0.6.0",
 		Icon:    iconResource,
 	}
 
@@ -51,20 +50,20 @@ func init() {
 
 func main() {
 	errorView := error2.NewView(application)
-	if canCreateFile("data/database.db") != true {
+	if canCreateFile("data/database") != true {
 		errorView.PanicErrorWriteDirectoryData()
 		application.GetWindow().ShowAndRun()
 		return
 	}
 
-	db, err := bbolt.Open("data/database.db", 0600, &bbolt.Options{Timeout: 3 * time.Second})
+	db, err := gorm.Open(sqlite.Open("data/database"), &gorm.Config{})
 	if err != nil {
 		errorView.PanicError(err)
 		application.GetWindow().ShowAndRun()
 		return
 	}
 
-	defer db.Close()
+	defer appCloseWithDb(db)
 
 	err = migration.Run(db)
 	if err != nil {
@@ -76,7 +75,7 @@ func main() {
 	settingRepository := setting.NewRepository(db)
 	convertorRepository := convertor.NewRepository(settingRepository)
 	pathFFmpeg, err := convertorRepository.GetPathFfmpeg()
-	if err != nil && errors.Is(err, dberror.ErrRecordNotFound) == false {
+	if err != nil && errors.Is(err, gorm.ErrRecordNotFound) == false {
 		errorView.PanicError(err)
 		application.GetWindow().ShowAndRun()
 		return
@@ -84,7 +83,7 @@ func main() {
 	ffPathUtilities.FFmpeg = pathFFmpeg
 
 	pathFFprobe, err := convertorRepository.GetPathFfprobe()
-	if err != nil && errors.Is(err, dberror.ErrRecordNotFound) == false {
+	if err != nil && errors.Is(err, gorm.ErrRecordNotFound) == false {
 		errorView.PanicError(err)
 		application.GetWindow().ShowAndRun()
 		return
@@ -109,6 +108,13 @@ func main() {
 	application.GetWindow().ShowAndRun()
 }
 
+func appCloseWithDb(db *gorm.DB) {
+	sqlDB, err := db.DB()
+	if err == nil {
+		_ = sqlDB.Close()
+	}
+}
+
 func canCreateFile(path string) bool {
 	file, err := os.OpenFile(path, os.O_CREATE|os.O_WRONLY, 0666)
 	if err != nil {

migration/migration.go

@@ -1,12 +1,15 @@
 package migration
 
 import (
-	"go.etcd.io/bbolt"
+	"git.kor-elf.net/kor-elf/gui-for-ffmpeg/setting"
+	"gorm.io/gorm"
 )
 
-func Run(db *bbolt.DB) error {
+func Run(db *gorm.DB) error {
-	return db.Update(func(tx *bbolt.Tx) error {
+	err := db.AutoMigrate(&setting.Setting{})
-		_, err := tx.CreateBucketIfNotExists([]byte("settings"))
+	if err != nil {
 		return err
-	})
+	}
+
+	return nil
 }

setting/entity.go

@@ -1,6 +1,7 @@
 package setting
 
 type Setting struct {
-	Code  string `json:"code"`
+	ID    uint   `gorm:"primary_key"`
-	Value string `json:"value"`
+	Code  string `gorm:"type:varchar(100);uniqueIndex;not null"`
+	Value string `gorm:"type:text"`
 }

setting/repository.go

@@ -1,10 +1,8 @@
 package setting
 
 import (
-	"encoding/json"
 	"errors"
-	"git.kor-elf.net/kor-elf/gui-for-ffmpeg/db"
+	"gorm.io/gorm"
-	"go.etcd.io/bbolt"
 )
 
 type RepositoryContract interface {
@@ -14,69 +12,44 @@ type RepositoryContract interface {
 }
 
 type Repository struct {
-	db *bbolt.DB
+	db *gorm.DB
 }
 
-func NewRepository(db *bbolt.DB) *Repository {
+func NewRepository(db *gorm.DB) *Repository {
 	return &Repository{db}
 }
 
 func (r Repository) GetValue(code string) (value string, err error) {
 	var setting Setting
-
+	err = r.db.Where("code = ?", code).First(&setting).Error
-	err = r.db.View(func(tx *bbolt.Tx) error {
-		b := tx.Bucket([]byte("settings"))
-		if b == nil {
-			return errors.New("bucket 'settings' not found")
-		}
-		val := b.Get([]byte(code))
-		if val == nil {
-			return db.ErrRecordNotFound
-		}
-		return json.Unmarshal(val, &setting)
-	})
 	if err != nil {
 		return "", err
 	}
-
+	return setting.Value, err
-	return setting.Value, nil
-
 }
 
 func (r Repository) Create(setting Setting) (Setting, error) {
-	err := r.db.Update(func(tx *bbolt.Tx) error {
+	err := r.db.Create(&setting).Error
-		b := tx.Bucket([]byte("settings"))
-		if b == nil {
-			return errors.New("bucket 'settings' not found")
-		}
-
-		data, err := json.Marshal(setting)
 	if err != nil {
-			return err
+		return setting, err
 	}
-
-		return b.Put([]byte(setting.Code), data)
-	})
 	return setting, err
 }
 
 func (r Repository) CreateOrUpdate(code string, value string) (Setting, error) {
 	var setting Setting
-	setting.Code = code
+	err := r.db.Where("code = ?", code).First(&setting).Error
-	setting.Value = value
-
-	err := r.db.Update(func(tx *bbolt.Tx) error {
-		b := tx.Bucket([]byte("settings"))
-		if b == nil {
-			return errors.New("bucket 'settings' not found")
-		}
-
-		data, err := json.Marshal(setting)
 	if err != nil {
-			return err
+		if errors.Is(err, gorm.ErrRecordNotFound) == true {
+			setting = Setting{Code: code, Value: value}
+			return r.Create(setting)
+		} else {
+			return setting, err
+		}
+	}
+	err = r.db.Model(&setting).UpdateColumn("value", value).Error
+	if err != nil {
+		return setting, err
 	}
-
-		return b.Put([]byte(code), data)
-	})
 	return setting, err
 }