Compare commits
No commits in common. "f631c55eae581d326d43fc0b4488dbae097d64c7" and "0cd32bb0f0f18d4838c5b25152837627713c864c" have entirely different histories.
f631c55eae
...
0cd32bb0f0
File diff suppressed because it is too large
Load Diff
44
README.md
44
README.md
@ -1,43 +1,5 @@
|
||||
# GUI for FFmpeg
|
||||
# ffmpeg-gui
|
||||
|
||||
<p>Простенький интерфейс для консольной утилиты FFmpeg. Но я <strong>не являюсь</strong> автором самой утилиты <strong>FFmpeg</strong>.</p>
|
||||
<p><strong>FFmpeg</strong> — торговая марка <strong><a href="http://bellard.org/" target="_blank">Fabrice Bellard</a></strong>, создателя проекта <strong><a href="https://ffmpeg.org/about.html" target="_blank">FFmpeg</a></strong>.</p>
|
||||
Простенький интерфейс к программе ffmpeg.
|
||||
|
||||
<p>Программное обеспечение является MIT (см. <a href="https://git.kor-elf.net/kor-elf/gui-for-ffmpeg/src/branch/main/LICENSE">LICENSE</a>) и использует сторонние библиотеки, которые распространяются на их собственных условиях (см. <a href="https://git.kor-elf.net/kor-elf/gui-for-ffmpeg/src/branch/main/LICENSE-3RD-PARTY.txt">LICENSE-3RD-PARTY.txt</a>).</p>
|
||||
|
||||
<img src="images/screenshot-gui-for-ffmpeg.png">
|
||||
|
||||
<p>Скачать скомпилированные готовые версии можно тут: <a href="https://git.kor-elf.net/kor-elf/gui-for-ffmpeg/releases">https://git.kor-elf.net/kor-elf/gui-for-ffmpeg/releases</a>.</p>
|
||||
|
||||
## Установка через fyne:
|
||||
1. go install fyne.io/fyne/v2/cmd/fyne@latest
|
||||
2. fyne get git.kor-elf.net/kor-elf/gui-for-ffmpeg/src
|
||||
|
||||
## Скомпилировать через исходники:
|
||||
1. git clone https://git.kor-elf.net/kor-elf/gui-for-ffmpeg.git
|
||||
2. Переходим в папку проекта и там переходим в папку src: **cd gui-for-ffmpeg/src**
|
||||
3. Ознакамливаемся, что нужно ещё установить для Вашей ОС для простого запуска (через go run) тут: https://docs.fyne.io/started/
|
||||
4. *(не обязательный шаг)* Просто запустить можно так: **go run main.go**
|
||||
5. go install github.com/fyne-io/fyne-cross@latest
|
||||
* У Вас так же должен быть установлен docker
|
||||
* О fyne-cross можно по подробней почитать тут: https://github.com/fyne-io/fyne-cross
|
||||
6. * fyne-cross windows --icon icon.png --app-id "." -name "gui-for-ffmpeg"
|
||||
* fyne-cross linux --icon icon.png --app-id "." -name "gui-for-ffmpeg"
|
||||
7. Создаться папка **fyne-cross/bin** и там будет созданна папка с тем названием под которую Вы компилировали приложения (linux-amd64 или windows-amd64).
|
||||
8. В папку **fyne-cross/bin/linux-amd64** или **fyne-cross/bin/windows-amd64** копируете:
|
||||
* src/icon.png
|
||||
* src/data
|
||||
* src/languages
|
||||
* LICENSE
|
||||
* LICENSE-3RD-PARTY.txt
|
||||
<p><strong>Структура должна получиться такая:</strong></p>
|
||||
<img src="images/screenshot-folder-structure.png">
|
||||
|
||||
## Работа с переводами:
|
||||
1. go install -v github.com/nicksnyder/go-i18n/v2/goi18n@latest
|
||||
2. Переходим в папке проекта в папку src: **cd ./src**
|
||||
3. goi18n merge -sourceLanguage ru -outdir languages languages/active.\*.toml languages/translate.\*.toml
|
||||
4. В файлах **languages/translate.\*.toml** переводим текст на нужный язык
|
||||
5. goi18n merge -sourceLanguage ru -outdir languages languages/active.\*.toml languages/translate.\*.toml
|
||||
|
||||
Более подробно можно почитать тут: https://github.com/nicksnyder/go-i18n
|
||||
<img src="images/screenshot-ffmpeg-gui.png">
|
||||
BIN
images/screenshot-ffmpeg-gui.png
Executable file
BIN
images/screenshot-ffmpeg-gui.png
Executable file
Binary file not shown.
|
After Width: | Height: | Size: 39 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 7.4 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 31 KiB |
@ -1,36 +0,0 @@
|
||||
package convertor
|
||||
|
||||
import (
|
||||
"git.kor-elf.net/kor-elf/gui-for-ffmpeg/setting"
|
||||
)
|
||||
|
||||
type RepositoryContract interface {
|
||||
GetPathFfmpeg() (string, error)
|
||||
SavePathFfmpeg(code string) (setting.Setting, error)
|
||||
GetPathFfprobe() (string, error)
|
||||
SavePathFfprobe(code string) (setting.Setting, error)
|
||||
}
|
||||
|
||||
type Repository struct {
|
||||
settingRepository setting.RepositoryContract
|
||||
}
|
||||
|
||||
func NewRepository(settingRepository setting.RepositoryContract) *Repository {
|
||||
return &Repository{settingRepository: settingRepository}
|
||||
}
|
||||
|
||||
func (r Repository) GetPathFfmpeg() (string, error) {
|
||||
return r.settingRepository.GetValue("ffmpeg")
|
||||
}
|
||||
|
||||
func (r Repository) SavePathFfmpeg(path string) (setting.Setting, error) {
|
||||
return r.settingRepository.CreateOrUpdate("ffmpeg", path)
|
||||
}
|
||||
|
||||
func (r Repository) GetPathFfprobe() (string, error) {
|
||||
return r.settingRepository.GetValue("ffprobe")
|
||||
}
|
||||
|
||||
func (r Repository) SavePathFfprobe(path string) (setting.Setting, error) {
|
||||
return r.settingRepository.CreateOrUpdate("ffprobe", path)
|
||||
}
|
||||
@ -2,7 +2,7 @@ package convertor
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"git.kor-elf.net/kor-elf/gui-for-ffmpeg/helper"
|
||||
"ffmpegGui/helper"
|
||||
"io"
|
||||
"os/exec"
|
||||
"regexp"
|
||||
|
||||
@ -2,13 +2,13 @@ package convertor
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"ffmpegGui/helper"
|
||||
"ffmpegGui/localizer"
|
||||
"fyne.io/fyne/v2"
|
||||
"fyne.io/fyne/v2/canvas"
|
||||
"fyne.io/fyne/v2/container"
|
||||
"fyne.io/fyne/v2/dialog"
|
||||
"fyne.io/fyne/v2/widget"
|
||||
"git.kor-elf.net/kor-elf/gui-for-ffmpeg/helper"
|
||||
"git.kor-elf.net/kor-elf/gui-for-ffmpeg/localizer"
|
||||
"github.com/nicksnyder/go-i18n/v2/i18n"
|
||||
"image/color"
|
||||
)
|
||||
@ -17,13 +17,6 @@ type ViewContract interface {
|
||||
Main(
|
||||
runConvert func(setting HandleConvertSetting, progressbar *widget.ProgressBar) error,
|
||||
)
|
||||
SelectFFPath(
|
||||
ffmpegPath string,
|
||||
ffprobePath string,
|
||||
save func(ffmpegPath string, ffprobePath string) error,
|
||||
cancel func(),
|
||||
donwloadFFmpeg func(progressBar *widget.ProgressBar, progressMessage *canvas.Text) error,
|
||||
)
|
||||
}
|
||||
|
||||
type View struct {
|
||||
@ -55,7 +48,7 @@ func (v View) Main(
|
||||
) {
|
||||
form := &widget.Form{}
|
||||
|
||||
conversionMessage := canvas.NewText("", color.RGBA{R: 255, G: 0, B: 0, A: 255})
|
||||
conversionMessage := canvas.NewText("", color.RGBA{255, 0, 0, 255})
|
||||
conversionMessage.TextSize = 16
|
||||
conversionMessage.TextStyle = fyne.TextStyle{Bold: true}
|
||||
|
||||
@ -139,7 +132,7 @@ func (v View) Main(
|
||||
func (v View) getButtonFileVideoForConversion(form *widget.Form, progress *widget.ProgressBar, conversionMessage *canvas.Text) (*widget.Button, *canvas.Text, *File) {
|
||||
fileInput := &File{}
|
||||
|
||||
fileVideoForConversionMessage := canvas.NewText("", color.RGBA{R: 255, G: 0, B: 0, A: 255})
|
||||
fileVideoForConversionMessage := canvas.NewText("", color.RGBA{255, 0, 0, 255})
|
||||
fileVideoForConversionMessage.TextSize = 16
|
||||
fileVideoForConversionMessage.TextStyle = fyne.TextStyle{Bold: true}
|
||||
|
||||
@ -179,7 +172,7 @@ func (v View) getButtonFileVideoForConversion(form *widget.Form, progress *widge
|
||||
}
|
||||
|
||||
func (v View) getButtonForSelectingDirectoryForSaving() (button *widget.Button, buttonMessage *canvas.Text, dirPath *string) {
|
||||
buttonMessage = canvas.NewText("", color.RGBA{R: 255, G: 0, B: 0, A: 255})
|
||||
buttonMessage = canvas.NewText("", color.RGBA{255, 0, 0, 255})
|
||||
buttonMessage.TextSize = 16
|
||||
buttonMessage.TextStyle = fyne.TextStyle{Bold: true}
|
||||
|
||||
@ -215,12 +208,12 @@ func (v View) getButtonForSelectingDirectoryForSaving() (button *widget.Button,
|
||||
}
|
||||
|
||||
func setStringErrorStyle(text *canvas.Text) {
|
||||
text.Color = color.RGBA{R: 255, G: 0, B: 0, A: 255}
|
||||
text.Color = color.RGBA{255, 0, 0, 255}
|
||||
text.Refresh()
|
||||
}
|
||||
|
||||
func setStringSuccessStyle(text *canvas.Text) {
|
||||
text.Color = color.RGBA{R: 49, G: 127, B: 114, A: 255}
|
||||
text.Color = color.RGBA{49, 127, 114, 255}
|
||||
text.Refresh()
|
||||
}
|
||||
|
||||
|
||||
@ -1,17 +0,0 @@
|
||||
//go:build !windows
|
||||
// +build !windows
|
||||
|
||||
package convertor
|
||||
|
||||
import (
|
||||
"fyne.io/fyne/v2"
|
||||
"fyne.io/fyne/v2/canvas"
|
||||
"fyne.io/fyne/v2/container"
|
||||
"fyne.io/fyne/v2/widget"
|
||||
)
|
||||
|
||||
func (v View) blockDownloadFFmpeg(
|
||||
donwloadFFmpeg func(progressBar *widget.ProgressBar, progressMessage *canvas.Text) error,
|
||||
) *fyne.Container {
|
||||
return container.NewVBox()
|
||||
}
|
||||
@ -1,63 +0,0 @@
|
||||
//go:build windows
|
||||
// +build windows
|
||||
|
||||
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.localizerService.GetMessage(&i18n.LocalizeConfig{
|
||||
MessageID: "download",
|
||||
}), func() {
|
||||
buttonDownloadFFmpeg.Disable()
|
||||
|
||||
err := donwloadFFmpeg(progressBar, progressDownloadFFmpegMessage)
|
||||
if err != nil {
|
||||
errorDownloadFFmpegMessage.Text = err.Error()
|
||||
}
|
||||
|
||||
buttonDownloadFFmpeg.Enable()
|
||||
})
|
||||
|
||||
downloadFFmpegFromSiteMessage := v.localizerService.GetMessage(&i18n.LocalizeConfig{
|
||||
MessageID: "downloadFFmpegFromSite",
|
||||
})
|
||||
|
||||
return container.NewVBox(
|
||||
canvas.NewLine(colornames.Darkgreen),
|
||||
widget.NewCard(v.localizerService.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,
|
||||
)),
|
||||
)
|
||||
}
|
||||
@ -1,10 +1,10 @@
|
||||
package error
|
||||
|
||||
import (
|
||||
"ffmpegGui/localizer"
|
||||
"fyne.io/fyne/v2"
|
||||
"fyne.io/fyne/v2/container"
|
||||
"fyne.io/fyne/v2/widget"
|
||||
"git.kor-elf.net/kor-elf/gui-for-ffmpeg/localizer"
|
||||
"github.com/nicksnyder/go-i18n/v2/i18n"
|
||||
)
|
||||
|
||||
|
||||
29
src/go.mod
29
src/go.mod
@ -1,27 +1,19 @@
|
||||
module git.kor-elf.net/kor-elf/gui-for-ffmpeg
|
||||
module ffmpegGui
|
||||
|
||||
go 1.21
|
||||
|
||||
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
|
||||
golang.org/x/text v0.14.0
|
||||
gorm.io/driver/sqlite v1.5.4
|
||||
gorm.io/gorm v1.25.6
|
||||
)
|
||||
|
||||
require (
|
||||
fyne.io/fyne/v2 v2.4.3 // indirect
|
||||
fyne.io/systray v1.10.1-0.20231115130155-104f5ef7839e // indirect
|
||||
github.com/BurntSushi/toml v1.3.2 // indirect
|
||||
github.com/davecgh/go-spew v1.1.1 // indirect
|
||||
github.com/fredbi/uri v1.1.0 // indirect
|
||||
github.com/fredbi/uri v1.0.0 // indirect
|
||||
github.com/fsnotify/fsnotify v1.6.0 // indirect
|
||||
github.com/fyne-io/gl-js v0.0.0-20220119005834-d2da28d9ccfe // indirect
|
||||
github.com/fyne-io/glfw-js v0.0.0-20220120001248-ee7290d23504 // indirect
|
||||
github.com/fyne-io/image v0.0.0-20220602074514-4956b0afb3d2 // indirect
|
||||
github.com/go-gl/gl v0.0.0-20231021071112-07e5d0ea2e71 // indirect
|
||||
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20240118000515-a250818d05e3 // indirect
|
||||
github.com/go-gl/gl v0.0.0-20211210172815-726fda9656d6 // indirect
|
||||
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20221017161538-93cebf72946b // indirect
|
||||
github.com/go-text/render v0.0.0-20230619120952-35bccb6164b8 // indirect
|
||||
github.com/go-text/typesetting v0.0.0-20230616162802-9c17dd34aa4a // indirect
|
||||
github.com/godbus/dbus/v5 v5.1.0 // indirect
|
||||
@ -29,6 +21,8 @@ require (
|
||||
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/mattn/go-sqlite3 v1.14.19 // indirect
|
||||
github.com/nicksnyder/go-i18n/v2 v2.3.0 // 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
|
||||
@ -37,8 +31,11 @@ require (
|
||||
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.16.0 // indirect
|
||||
golang.org/x/net v0.17.0 // indirect
|
||||
golang.org/x/sys v0.13.0 // indirect
|
||||
golang.org/x/text v0.14.0 // indirect
|
||||
gopkg.in/yaml.v3 v3.0.1 // indirect
|
||||
gorm.io/driver/sqlite v1.5.4 // indirect
|
||||
gorm.io/gorm v1.25.5 // indirect
|
||||
honnef.co/go/js/dom v0.0.0-20210725211120-f030747120f2 // indirect
|
||||
)
|
||||
|
||||
26
src/go.sum
26
src/go.sum
@ -75,8 +75,6 @@ github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7
|
||||
github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
|
||||
github.com/fredbi/uri v1.0.0 h1:s4QwUAZ8fz+mbTsukND+4V5f+mJ/wjaTokwstGUAemg=
|
||||
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=
|
||||
github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY=
|
||||
github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw=
|
||||
@ -89,22 +87,16 @@ github.com/fyne-io/image v0.0.0-20220602074514-4956b0afb3d2/go.mod h1:eO7W361vml
|
||||
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=
|
||||
github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
|
||||
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=
|
||||
github.com/go-text/render v0.0.0-20230619120952-35bccb6164b8/go.mod h1:h29xCucjNsDcYb7+0rJokxVwYAq+9kQ19WiFuBKkYtc=
|
||||
github.com/go-text/typesetting v0.0.0-20230616162802-9c17dd34aa4a h1:VjN8ttdfklC0dnAdKbZqGNESdERUxtE3l8a/4Grgarc=
|
||||
github.com/go-text/typesetting v0.0.0-20230616162802-9c17dd34aa4a/go.mod h1:evDBbvNR/KaVFZ2ZlDSOWWXIUKq0wCOEtzLxRM8SG3k=
|
||||
github.com/go-text/typesetting-utils v0.0.0-20230616150549-2a7df14b6a22 h1:LBQTFxP2MfsyEDqSKmUBZaDuDHN1vpqDyOZjcqS7MYI=
|
||||
github.com/go-text/typesetting-utils v0.0.0-20230616150549-2a7df14b6a22/go.mod h1:DDxDdQEnB70R8owOx3LVpEFvpMK9eeH1o2r0yZhFI9o=
|
||||
github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
|
||||
github.com/godbus/dbus/v5 v5.1.0 h1:4KLkAxT3aOY8Li4FRJe/KvhoNFFxo0m6fNuFUO8QJUk=
|
||||
github.com/godbus/dbus/v5 v5.1.0/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
|
||||
@ -214,18 +206,14 @@ github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfV
|
||||
github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
|
||||
github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
|
||||
github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg=
|
||||
github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
|
||||
github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
|
||||
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
|
||||
github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
|
||||
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=
|
||||
github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc=
|
||||
github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
|
||||
@ -242,8 +230,6 @@ github.com/neelance/astrewrite v0.0.0-20160511093645-99348263ae86/go.mod h1:kHJE
|
||||
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=
|
||||
@ -403,8 +389,6 @@ golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug
|
||||
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=
|
||||
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
|
||||
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
|
||||
@ -481,8 +465,6 @@ golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBc
|
||||
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||
golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE=
|
||||
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=
|
||||
@ -497,6 +479,8 @@ golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
|
||||
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
|
||||
golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
|
||||
golang.org/x/text v0.12.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
|
||||
golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k=
|
||||
golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
|
||||
golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
|
||||
golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
|
||||
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
|
||||
@ -664,14 +648,12 @@ google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlba
|
||||
google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
|
||||
google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
|
||||
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
||||
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
|
||||
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
||||
gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
|
||||
gopkg.in/ini.v1 v1.62.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
|
||||
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
|
||||
gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
|
||||
gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
|
||||
gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
|
||||
gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
|
||||
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
|
||||
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
|
||||
@ -679,10 +661,10 @@ 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.2-0.20230530020048-26663ab9bf55 h1:sC1Xj4TYrLqg1n3AN10w871An7wJM0gzgcm8jkIkECQ=
|
||||
gorm.io/gorm v1.25.2-0.20230530020048-26663ab9bf55/go.mod h1:L4uxeKpfBml98NYqVqwAdmV1a2nBtAec/cf3fpucW/k=
|
||||
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=
|
||||
|
||||
@ -3,10 +3,11 @@ package handler
|
||||
import (
|
||||
"bufio"
|
||||
"errors"
|
||||
"ffmpegGui/convertor"
|
||||
"ffmpegGui/helper"
|
||||
"ffmpegGui/localizer"
|
||||
"ffmpegGui/setting"
|
||||
"fyne.io/fyne/v2/widget"
|
||||
"git.kor-elf.net/kor-elf/gui-for-ffmpeg/convertor"
|
||||
"git.kor-elf.net/kor-elf/gui-for-ffmpeg/helper"
|
||||
"git.kor-elf.net/kor-elf/gui-for-ffmpeg/localizer"
|
||||
"github.com/nicksnyder/go-i18n/v2/i18n"
|
||||
"io"
|
||||
"regexp"
|
||||
@ -14,54 +15,45 @@ import (
|
||||
"strings"
|
||||
)
|
||||
|
||||
type ConvertorHandlerContract interface {
|
||||
MainConvertor()
|
||||
FfPathSelection()
|
||||
GetFfmpegVersion() (string, error)
|
||||
GetFfprobeVersion() (string, error)
|
||||
}
|
||||
|
||||
type ConvertorHandler struct {
|
||||
convertorService convertor.ServiceContract
|
||||
convertorView convertor.ViewContract
|
||||
convertorRepository convertor.RepositoryContract
|
||||
settingView setting.ViewContract
|
||||
localizerView localizer.ViewContract
|
||||
settingRepository setting.RepositoryContract
|
||||
localizerService localizer.ServiceContract
|
||||
}
|
||||
|
||||
func NewConvertorHandler(
|
||||
convertorService convertor.ServiceContract,
|
||||
convertorView convertor.ViewContract,
|
||||
convertorRepository convertor.RepositoryContract,
|
||||
settingView setting.ViewContract,
|
||||
localizerView localizer.ViewContract,
|
||||
settingRepository setting.RepositoryContract,
|
||||
localizerService localizer.ServiceContract,
|
||||
) *ConvertorHandler {
|
||||
return &ConvertorHandler{
|
||||
convertorService: convertorService,
|
||||
convertorView: convertorView,
|
||||
convertorRepository: convertorRepository,
|
||||
settingView: settingView,
|
||||
localizerView: localizerView,
|
||||
settingRepository: settingRepository,
|
||||
localizerService: localizerService,
|
||||
}
|
||||
}
|
||||
|
||||
func (h ConvertorHandler) MainConvertor() {
|
||||
func (h ConvertorHandler) LanguageSelection() {
|
||||
h.localizerView.LanguageSelection(func(lang localizer.Lang) {
|
||||
h.GetConvertor()
|
||||
})
|
||||
}
|
||||
|
||||
func (h ConvertorHandler) GetConvertor() {
|
||||
if h.checkingFFPathUtilities() == true {
|
||||
h.convertorView.Main(h.runConvert)
|
||||
return
|
||||
}
|
||||
h.convertorView.SelectFFPath("", "", h.saveSettingFFPath, nil, h.downloadFFmpeg)
|
||||
}
|
||||
|
||||
func (h ConvertorHandler) FfPathSelection() {
|
||||
ffmpeg, _ := h.convertorRepository.GetPathFfmpeg()
|
||||
ffprobe, _ := h.convertorRepository.GetPathFfprobe()
|
||||
h.convertorView.SelectFFPath(ffmpeg, ffprobe, h.saveSettingFFPath, h.MainConvertor, h.downloadFFmpeg)
|
||||
}
|
||||
|
||||
func (h ConvertorHandler) GetFfmpegVersion() (string, error) {
|
||||
return h.convertorService.GetFFmpegVesrion()
|
||||
}
|
||||
|
||||
func (h ConvertorHandler) GetFfprobeVersion() (string, error) {
|
||||
return h.convertorService.GetFFprobeVersion()
|
||||
h.settingView.SelectFFPath(h.saveSettingFFPath)
|
||||
}
|
||||
|
||||
func (h ConvertorHandler) runConvert(setting convertor.HandleConvertSetting, progressbar *widget.ProgressBar) error {
|
||||
@ -100,8 +92,10 @@ func (h ConvertorHandler) checkingFFPathUtilities() bool {
|
||||
if ffprobeChecking == false {
|
||||
continue
|
||||
}
|
||||
_, _ = h.convertorRepository.SavePathFfmpeg(item.FFmpeg)
|
||||
_, _ = h.convertorRepository.SavePathFfprobe(item.FFprobe)
|
||||
ffmpegEntity := setting.Setting{Code: "ffmpeg", Value: item.FFmpeg}
|
||||
_, _ = h.settingRepository.Create(ffmpegEntity)
|
||||
ffprobeEntity := setting.Setting{Code: "ffprobe", Value: item.FFprobe}
|
||||
_, _ = h.settingRepository.Create(ffprobeEntity)
|
||||
return true
|
||||
}
|
||||
|
||||
@ -125,10 +119,12 @@ func (h ConvertorHandler) saveSettingFFPath(ffmpegPath string, ffprobePath strin
|
||||
return errors.New(errorText)
|
||||
}
|
||||
|
||||
_, _ = h.convertorRepository.SavePathFfmpeg(ffmpegPath)
|
||||
_, _ = h.convertorRepository.SavePathFfprobe(ffprobePath)
|
||||
ffmpegEntity := setting.Setting{Code: "ffmpeg", Value: ffmpegPath}
|
||||
_, _ = h.settingRepository.Create(ffmpegEntity)
|
||||
ffprobeEntity := setting.Setting{Code: "ffprobe", Value: ffprobePath}
|
||||
_, _ = h.settingRepository.Create(ffprobeEntity)
|
||||
|
||||
h.MainConvertor()
|
||||
h.GetConvertor()
|
||||
|
||||
return nil
|
||||
}
|
||||
@ -147,15 +143,15 @@ func (h ConvertorHandler) checkingFFPath() bool {
|
||||
return true
|
||||
}
|
||||
|
||||
type Progress struct {
|
||||
type progress struct {
|
||||
totalDuration float64
|
||||
progressbar *widget.ProgressBar
|
||||
protocol string
|
||||
localizerService localizer.ServiceContract
|
||||
}
|
||||
|
||||
func NewProgress(totalDuration float64, progressbar *widget.ProgressBar, localizerService localizer.ServiceContract) Progress {
|
||||
return Progress{
|
||||
func NewProgress(totalDuration float64, progressbar *widget.ProgressBar, localizerService localizer.ServiceContract) progress {
|
||||
return progress{
|
||||
totalDuration: totalDuration,
|
||||
progressbar: progressbar,
|
||||
protocol: "pipe:",
|
||||
@ -163,11 +159,11 @@ func NewProgress(totalDuration float64, progressbar *widget.ProgressBar, localiz
|
||||
}
|
||||
}
|
||||
|
||||
func (p Progress) GetProtocole() string {
|
||||
func (p progress) GetProtocole() string {
|
||||
return p.protocol
|
||||
}
|
||||
|
||||
func (p Progress) Run(stdOut io.ReadCloser, stdErr io.ReadCloser) error {
|
||||
func (p progress) Run(stdOut io.ReadCloser, stdErr io.ReadCloser) error {
|
||||
isProcessCompleted := false
|
||||
var errorText string
|
||||
|
||||
|
||||
@ -3,16 +3,8 @@
|
||||
|
||||
package handler
|
||||
|
||||
import (
|
||||
"fyne.io/fyne/v2/canvas"
|
||||
"fyne.io/fyne/v2/widget"
|
||||
"git.kor-elf.net/kor-elf/gui-for-ffmpeg/convertor"
|
||||
)
|
||||
import "ffmpegGui/convertor"
|
||||
|
||||
func getPathsToFF() []convertor.FFPathUtilities {
|
||||
return []convertor.FFPathUtilities{{"ffmpeg/bin/ffmpeg", "ffmpeg/bin/ffprobe"}, {"ffmpeg", "ffprobe"}}
|
||||
}
|
||||
|
||||
func (h ConvertorHandler) downloadFFmpeg(progressBar *widget.ProgressBar, progressMessage *canvas.Text) (err error) {
|
||||
return nil
|
||||
}
|
||||
|
||||
@ -3,151 +3,8 @@
|
||||
|
||||
package handler
|
||||
|
||||
import (
|
||||
"archive/zip"
|
||||
"errors"
|
||||
"fyne.io/fyne/v2/canvas"
|
||||
"fyne.io/fyne/v2/widget"
|
||||
"git.kor-elf.net/kor-elf/gui-for-ffmpeg/convertor"
|
||||
"github.com/nicksnyder/go-i18n/v2/i18n"
|
||||
"io"
|
||||
"net/http"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"strings"
|
||||
)
|
||||
import "ffmpegGui/convertor"
|
||||
|
||||
func getPathsToFF() []convertor.FFPathUtilities {
|
||||
return []convertor.FFPathUtilities{{"ffmpeg\\bin\\ffmpeg.exe", "ffmpeg\\bin\\ffprobe.exe"}}
|
||||
}
|
||||
|
||||
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.localizerService.GetMessage(&i18n.LocalizeConfig{
|
||||
MessageID: "downloadRun",
|
||||
})
|
||||
progressMessage.Refresh()
|
||||
err = downloadFile("ffmpeg/ffmpeg.zip", "https://github.com/BtbN/FFmpeg-Builds/releases/download/latest/ffmpeg-master-latest-win64-gpl.zip", progressBar)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
progressMessage.Text = h.localizerService.GetMessage(&i18n.LocalizeConfig{
|
||||
MessageID: "unzipRun",
|
||||
})
|
||||
progressMessage.Refresh()
|
||||
err = unZip("ffmpeg/ffmpeg.zip", "ffmpeg")
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
_ = os.Remove("ffmpeg/ffmpeg.zip")
|
||||
|
||||
progressMessage.Text = h.localizerService.GetMessage(&i18n.LocalizeConfig{
|
||||
MessageID: "testFF",
|
||||
})
|
||||
progressMessage.Refresh()
|
||||
err = h.saveSettingFFPath("ffmpeg/ffmpeg-master-latest-win64-gpl/bin/ffmpeg.exe", "ffmpeg/ffmpeg-master-latest-win64-gpl/bin/ffprobe.exe")
|
||||
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 unZip(fileZip string, directory string) error {
|
||||
archive, err := zip.OpenReader(fileZip)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
defer archive.Close()
|
||||
|
||||
for _, f := range archive.File {
|
||||
filePath := filepath.Join(directory, f.Name)
|
||||
|
||||
if !strings.HasPrefix(filePath, filepath.Clean(directory)+string(os.PathSeparator)) {
|
||||
return errors.New("invalid file path")
|
||||
}
|
||||
if f.FileInfo().IsDir() {
|
||||
os.MkdirAll(filePath, os.ModePerm)
|
||||
continue
|
||||
}
|
||||
|
||||
if err := os.MkdirAll(filepath.Dir(filePath), os.ModePerm); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
dstFile, err := os.OpenFile(filePath, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, f.Mode())
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
fileInArchive, err := f.Open()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
if _, err := io.Copy(dstFile, fileInArchive); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
dstFile.Close()
|
||||
fileInArchive.Close()
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func isDirectory(path string) bool {
|
||||
fileInfo, err := os.Stat(path)
|
||||
if err != nil {
|
||||
return false
|
||||
}
|
||||
|
||||
return fileInfo.IsDir()
|
||||
}
|
||||
|
||||
@ -1,37 +0,0 @@
|
||||
package handler
|
||||
|
||||
import (
|
||||
"git.kor-elf.net/kor-elf/gui-for-ffmpeg/localizer"
|
||||
)
|
||||
|
||||
type MainHandler struct {
|
||||
convertorHandler ConvertorHandlerContract
|
||||
menuHandler MenuHandlerContract
|
||||
localizerRepository localizer.RepositoryContract
|
||||
localizerService localizer.ServiceContract
|
||||
}
|
||||
|
||||
func NewMainHandler(
|
||||
convertorHandler ConvertorHandlerContract,
|
||||
menuHandler MenuHandlerContract,
|
||||
localizerRepository localizer.RepositoryContract,
|
||||
localizerService localizer.ServiceContract,
|
||||
) *MainHandler {
|
||||
return &MainHandler{
|
||||
convertorHandler: convertorHandler,
|
||||
menuHandler: menuHandler,
|
||||
localizerRepository: localizerRepository,
|
||||
localizerService: localizerService,
|
||||
}
|
||||
}
|
||||
|
||||
func (h MainHandler) Start() {
|
||||
language, err := h.localizerRepository.GetCode()
|
||||
if err != nil {
|
||||
h.menuHandler.LanguageSelection()
|
||||
return
|
||||
}
|
||||
_ = h.localizerService.SetCurrentLanguageByCode(language)
|
||||
|
||||
h.convertorHandler.MainConvertor()
|
||||
}
|
||||
@ -1,125 +0,0 @@
|
||||
package handler
|
||||
|
||||
import (
|
||||
"fyne.io/fyne/v2"
|
||||
"git.kor-elf.net/kor-elf/gui-for-ffmpeg/localizer"
|
||||
"git.kor-elf.net/kor-elf/gui-for-ffmpeg/menu"
|
||||
"github.com/nicksnyder/go-i18n/v2/i18n"
|
||||
)
|
||||
|
||||
type MenuHandlerContract interface {
|
||||
GetMainMenu() *fyne.MainMenu
|
||||
LanguageSelection()
|
||||
}
|
||||
|
||||
type menuItems struct {
|
||||
menuItem map[string]*fyne.MenuItem
|
||||
menu map[string]*fyne.Menu
|
||||
}
|
||||
|
||||
type MenuHandler struct {
|
||||
convertorHandler ConvertorHandlerContract
|
||||
menuView menu.ViewContract
|
||||
localizerService localizer.ServiceContract
|
||||
localizerView localizer.ViewContract
|
||||
localizerRepository localizer.RepositoryContract
|
||||
menuItems *menuItems
|
||||
}
|
||||
|
||||
func NewMenuHandler(
|
||||
convertorHandler ConvertorHandlerContract,
|
||||
menuView menu.ViewContract,
|
||||
localizerService localizer.ServiceContract,
|
||||
localizerView localizer.ViewContract,
|
||||
localizerRepository localizer.RepositoryContract,
|
||||
) *MenuHandler {
|
||||
return &MenuHandler{
|
||||
convertorHandler: convertorHandler,
|
||||
menuView: menuView,
|
||||
localizerService: localizerService,
|
||||
localizerView: localizerView,
|
||||
localizerRepository: localizerRepository,
|
||||
menuItems: &menuItems{menuItem: map[string]*fyne.MenuItem{}, menu: map[string]*fyne.Menu{}},
|
||||
}
|
||||
}
|
||||
|
||||
func (h MenuHandler) GetMainMenu() *fyne.MainMenu {
|
||||
settings := h.getMenuSettings()
|
||||
help := h.getMenuHelp()
|
||||
|
||||
return fyne.NewMainMenu(settings, help)
|
||||
}
|
||||
|
||||
func (h MenuHandler) getMenuSettings() *fyne.Menu {
|
||||
quit := fyne.NewMenuItem(h.localizerService.GetMessage(&i18n.LocalizeConfig{
|
||||
MessageID: "exit",
|
||||
}), nil)
|
||||
quit.IsQuit = true
|
||||
h.menuItems.menuItem["exit"] = quit
|
||||
|
||||
languageSelection := fyne.NewMenuItem(h.localizerService.GetMessage(&i18n.LocalizeConfig{
|
||||
MessageID: "changeLanguage",
|
||||
}), h.LanguageSelection)
|
||||
h.menuItems.menuItem["changeLanguage"] = languageSelection
|
||||
|
||||
ffPathSelection := fyne.NewMenuItem(h.localizerService.GetMessage(&i18n.LocalizeConfig{
|
||||
MessageID: "changeFFPath",
|
||||
}), h.convertorHandler.FfPathSelection)
|
||||
h.menuItems.menuItem["changeFFPath"] = ffPathSelection
|
||||
|
||||
settings := fyne.NewMenu(h.localizerService.GetMessage(&i18n.LocalizeConfig{
|
||||
MessageID: "settings",
|
||||
}), languageSelection, ffPathSelection, quit)
|
||||
h.menuItems.menu["settings"] = settings
|
||||
|
||||
return settings
|
||||
}
|
||||
|
||||
func (h MenuHandler) getMenuHelp() *fyne.Menu {
|
||||
about := fyne.NewMenuItem(h.localizerService.GetMessage(&i18n.LocalizeConfig{
|
||||
MessageID: "about",
|
||||
}), h.openAbout)
|
||||
h.menuItems.menuItem["about"] = about
|
||||
|
||||
help := fyne.NewMenu(h.localizerService.GetMessage(&i18n.LocalizeConfig{
|
||||
MessageID: "help",
|
||||
}), about)
|
||||
h.menuItems.menu["help"] = help
|
||||
|
||||
return help
|
||||
}
|
||||
|
||||
func (h MenuHandler) openAbout() {
|
||||
ffmpeg, err := h.convertorHandler.GetFfmpegVersion()
|
||||
if err != nil {
|
||||
ffmpeg = h.localizerService.GetMessage(&i18n.LocalizeConfig{
|
||||
MessageID: "errorFFmpegVersion",
|
||||
})
|
||||
}
|
||||
ffprobe, err := h.convertorHandler.GetFfprobeVersion()
|
||||
if err != nil {
|
||||
ffprobe = h.localizerService.GetMessage(&i18n.LocalizeConfig{
|
||||
MessageID: "errorFFprobeVersion",
|
||||
})
|
||||
}
|
||||
|
||||
h.menuView.About(ffmpeg, ffprobe)
|
||||
}
|
||||
|
||||
func (h MenuHandler) LanguageSelection() {
|
||||
h.localizerView.LanguageSelection(func(lang localizer.Lang) {
|
||||
_, _ = h.localizerRepository.Save(lang.Code)
|
||||
h.menuMessageReload()
|
||||
h.convertorHandler.MainConvertor()
|
||||
})
|
||||
}
|
||||
|
||||
func (h MenuHandler) menuMessageReload() {
|
||||
for messageID, menu := range h.menuItems.menuItem {
|
||||
menu.Label = h.localizerService.GetMessage(&i18n.LocalizeConfig{MessageID: messageID})
|
||||
}
|
||||
for messageID, menu := range h.menuItems.menu {
|
||||
menu.Label = h.localizerService.GetMessage(&i18n.LocalizeConfig{MessageID: messageID})
|
||||
menu.Refresh()
|
||||
}
|
||||
}
|
||||
BIN
src/icon.png
BIN
src/icon.png
Binary file not shown.
|
Before Width: | Height: | Size: 29 KiB After Width: | Height: | Size: 15 KiB |
@ -1,35 +1,7 @@
|
||||
[AlsoUsedProgram]
|
||||
hash = "sha1-a72be72e7808bb8a0144ed7a93acb29c568b1ed4"
|
||||
other = "The program also uses:"
|
||||
|
||||
[about]
|
||||
hash = "sha1-3da0b9ef719fd707f443ac00404447f29445976f"
|
||||
other = "About"
|
||||
|
||||
[aboutText]
|
||||
hash = "sha1-8bd565814118ba8b90c40eb5b62acf8d2676e7d6"
|
||||
other = "A simple interface for the FFmpeg console utility. \nBut I am not the author of the FFmpeg utility itself."
|
||||
|
||||
[buttonDownloadFFmpeg]
|
||||
hash = "sha1-c223c2e15171156192bc3146aee91e6094bb475b"
|
||||
other = "Download FFmpeg automatically"
|
||||
|
||||
[buttonForSelectedDirTitle]
|
||||
hash = "sha1-52b13f1b13e82d22e8c4102332db5d4ec551247b"
|
||||
other = "Folder where it will be saved:"
|
||||
|
||||
[cancel]
|
||||
hash = "sha1-0ec753be8df955a117404fb634b01b45eb386e2a"
|
||||
other = "Cancel"
|
||||
|
||||
[changeFFPath]
|
||||
hash = "sha1-46793a2844600d0eb19fa3540fb9564ee5705491"
|
||||
other = "FFmpeg and FFprobe"
|
||||
|
||||
[changeLanguage]
|
||||
hash = "sha1-8b276eaf378d485c769fb3d5dcc06dfc25b0c01b"
|
||||
other = "Change language"
|
||||
|
||||
[checkboxOverwriteOutputFilesTitle]
|
||||
hash = "sha1-5860124bb781e7ef680f573fa93977e96328d4e7"
|
||||
other = "Allow file to be overwritten"
|
||||
@ -46,18 +18,6 @@ other = "Convert"
|
||||
hash = "sha1-4d972809e4c7f9c9ff2c110a126bbc183c9429ce"
|
||||
other = "Converter video files to mp4"
|
||||
|
||||
[download]
|
||||
hash = "sha1-fe8f79f29da457de2f6bc9531de6e536e0c426ad"
|
||||
other = "Download"
|
||||
|
||||
[downloadFFmpegFromSite]
|
||||
hash = "sha1-0889c95aa3a8659d8d903b4dab7097699c4d8aa4"
|
||||
other = "Will be downloaded from the site:"
|
||||
|
||||
[downloadRun]
|
||||
hash = "sha1-55f87f114628fa2d5d8e67d1e1cda22c0e4f9271"
|
||||
other = "Downloading..."
|
||||
|
||||
[error]
|
||||
hash = "sha1-a7df8f8b5d754f226ac4cb320577fe692b33e483"
|
||||
other = "An error has occurred!"
|
||||
@ -74,42 +34,18 @@ other = "could not create file 'database' in folder 'data'"
|
||||
hash = "sha1-ccf0b95c0d1b392dc215258d917eb4e5d0b88ed0"
|
||||
other = "this is not FFmpeg"
|
||||
|
||||
[errorFFmpegVersion]
|
||||
hash = "sha1-9a4148d42186b6b32cf83bef726e23022c53283f"
|
||||
other = "Could not determine FFmpeg version"
|
||||
|
||||
[errorFFprobe]
|
||||
hash = "sha1-86d1b0b4c4ccd6a4f71e758fc67ce11aff4ba9b8"
|
||||
other = "this is not FFprobe"
|
||||
|
||||
[errorFFprobeVersion]
|
||||
hash = "sha1-da7b37d7df3fafbd153665b13888413d52b24c17"
|
||||
other = "Failed to determine FFprobe version"
|
||||
|
||||
[errorSelectedFolderSave]
|
||||
hash = "sha1-83da899677cdc90e4344e3b94ee03c46b51bee4c"
|
||||
other = "You haven't selected a folder to save!"
|
||||
|
||||
[exit]
|
||||
hash = "sha1-c42457057d1ab7950cea00719cbe0b078891775f"
|
||||
other = "Exit"
|
||||
|
||||
[ffmpegLGPL]
|
||||
hash = "sha1-d395b16cc8f8eab98a8a970307c5b010ba22dde6"
|
||||
other = "This software uses libraries from the **FFmpeg** project under the **[LGPLv2.1](http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html)**."
|
||||
|
||||
[ffmpegTrademark]
|
||||
hash = "sha1-45f772b2eca5098cd6d31f2d1dc6edec1987a617"
|
||||
other = "**FFmpeg** is a trademark of **[Fabrice Bellard](http://bellard.org/)**, originator of the **[FFmpeg](https://ffmpeg.org/about.html)** project."
|
||||
|
||||
[fileVideoForConversionTitle]
|
||||
hash = "sha1-5e727d4a2ff3f21080e51e81641595b2e668f3be"
|
||||
other = "File for conversion:"
|
||||
|
||||
[help]
|
||||
hash = "sha1-6a45cef900c668effcb2ab10da05855c1fd10f6f"
|
||||
other = "Help"
|
||||
|
||||
[languageSelectionFormHead]
|
||||
hash = "sha1-0ff5fa82cf684112660128cba1711297acf11003"
|
||||
other = "Switch language"
|
||||
@ -118,29 +54,13 @@ other = "Switch language"
|
||||
hash = "sha1-daf1108fc10d3b1a908288d611f749b3cc651e4b"
|
||||
other = "Choose language"
|
||||
|
||||
[licenseLink]
|
||||
hash = "sha1-ea18ab849f0eea030d770da82c2a6b3484a7bd13"
|
||||
other = "License information"
|
||||
|
||||
[licenseLinkOther]
|
||||
hash = "sha1-359fff328717c05104e51a2d29f05bf1875d26b7"
|
||||
other = "Licenses from other products used in the program"
|
||||
|
||||
[pathToFfmpeg]
|
||||
hash = "sha1-fafc50f1db0f720fe83a96cd70a9e1ad824e96b6"
|
||||
other = "Path to FFmpeg:"
|
||||
hash = "sha1-2eba439f365640ff77e0ed6a7486fcb662573850"
|
||||
other = "Path to ffmpeg:"
|
||||
|
||||
[pathToFfprobe]
|
||||
hash = "sha1-b872edc9633a2e81ef678dc46fe46a7e91732024"
|
||||
other = "Path to FFprobe:"
|
||||
|
||||
[programmLink]
|
||||
hash = "sha1-18f9a3fad6aacefe1b05eed23122800b391ff5ca"
|
||||
other = "Project website"
|
||||
|
||||
[programmVersion]
|
||||
hash = "sha1-fa2e4994a301bb24bc2a8fa166e5486ea95a7475"
|
||||
other = "**Program version:** {{.Version}}"
|
||||
hash = "sha1-02ad53337801906f8ebfee4616100dd9f43eabd7"
|
||||
other = "Path to ffprobe:"
|
||||
|
||||
[save]
|
||||
hash = "sha1-4864057d626a868fa60f999bed3191d61d045ddc"
|
||||
@ -150,18 +70,6 @@ other = "Save"
|
||||
hash = "sha1-95581446a28d968ff1a027c623159a7eb08654cf"
|
||||
other = "Specify the path to FFmpeg and FFprobe"
|
||||
|
||||
[settings]
|
||||
hash = "sha1-7f17c7c62a7fd8d1a508481f4778688927734c2f"
|
||||
other = "Settings"
|
||||
|
||||
[testFF]
|
||||
hash = "sha1-f5b8ed88e9609963035d2235be0a79bbec619976"
|
||||
other = "Checking FFmpeg for serviceability..."
|
||||
|
||||
[titleDownloadLink]
|
||||
hash = "sha1-92df86371f6c3a06ca1e4754f113142776a32d49"
|
||||
other = "You can download it from here"
|
||||
|
||||
[unzipRun]
|
||||
hash = "sha1-c554dad13026668a1f6adf3171837c5d51bbac36"
|
||||
other = "Unpacked..."
|
||||
|
||||
@ -1,35 +1,7 @@
|
||||
[AlsoUsedProgram]
|
||||
hash = "sha1-a72be72e7808bb8a0144ed7a93acb29c568b1ed4"
|
||||
other = "Бағдарлама сонымен қатар пайдаланады:"
|
||||
|
||||
[about]
|
||||
hash = "sha1-3da0b9ef719fd707f443ac00404447f29445976f"
|
||||
other = "Бағдарлама туралы"
|
||||
|
||||
[aboutText]
|
||||
hash = "sha1-8bd565814118ba8b90c40eb5b62acf8d2676e7d6"
|
||||
other = "FFmpeg консоль утилитасы үшін қарапайым интерфейс. \nБірақ мен FFmpeg утилитасының авторы емеспін."
|
||||
|
||||
[buttonDownloadFFmpeg]
|
||||
hash = "sha1-c223c2e15171156192bc3146aee91e6094bb475b"
|
||||
other = "FFmpeg автоматты түрде жүктеп алыңыз"
|
||||
|
||||
[buttonForSelectedDirTitle]
|
||||
hash = "sha1-52b13f1b13e82d22e8c4102332db5d4ec551247b"
|
||||
other = "Файлды сақтауға арналған каталог:"
|
||||
|
||||
[cancel]
|
||||
hash = "sha1-0ec753be8df955a117404fb634b01b45eb386e2a"
|
||||
other = "Болдырмау"
|
||||
|
||||
[changeFFPath]
|
||||
hash = "sha1-46793a2844600d0eb19fa3540fb9564ee5705491"
|
||||
other = "FFmpeg және FFprobe"
|
||||
|
||||
[changeLanguage]
|
||||
hash = "sha1-8b276eaf378d485c769fb3d5dcc06dfc25b0c01b"
|
||||
other = "Тілді өзгерту"
|
||||
|
||||
[checkboxOverwriteOutputFilesTitle]
|
||||
hash = "sha1-5860124bb781e7ef680f573fa93977e96328d4e7"
|
||||
other = "Файлды қайта жазуға рұқсат беріңіз"
|
||||
@ -46,18 +18,6 @@ other = "Файлды түрлендіру"
|
||||
hash = "sha1-4d972809e4c7f9c9ff2c110a126bbc183c9429ce"
|
||||
other = "Бейне файлдарын mp4 форматына түрлендіру"
|
||||
|
||||
[download]
|
||||
hash = "sha1-fe8f79f29da457de2f6bc9531de6e536e0c426ad"
|
||||
other = "Жүктеп алу"
|
||||
|
||||
[downloadFFmpegFromSite]
|
||||
hash = "sha1-0889c95aa3a8659d8d903b4dab7097699c4d8aa4"
|
||||
other = "Сайттан жүктеледі:"
|
||||
|
||||
[downloadRun]
|
||||
hash = "sha1-55f87f114628fa2d5d8e67d1e1cda22c0e4f9271"
|
||||
other = "Жүктеп алынуда..."
|
||||
|
||||
[error]
|
||||
hash = "sha1-a7df8f8b5d754f226ac4cb320577fe692b33e483"
|
||||
other = "Қате орын алды!"
|
||||
@ -74,42 +34,18 @@ other = "'data' қалтасында 'database' файлын жасау мүмк
|
||||
hash = "sha1-ccf0b95c0d1b392dc215258d917eb4e5d0b88ed0"
|
||||
other = "бұл FFmpeg емес"
|
||||
|
||||
[errorFFmpegVersion]
|
||||
hash = "sha1-9a4148d42186b6b32cf83bef726e23022c53283f"
|
||||
other = "FFmpeg нұсқасын анықтау мүмкін болмады"
|
||||
|
||||
[errorFFprobe]
|
||||
hash = "sha1-86d1b0b4c4ccd6a4f71e758fc67ce11aff4ba9b8"
|
||||
other = "бұл FFprobe емес"
|
||||
|
||||
[errorFFprobeVersion]
|
||||
hash = "sha1-da7b37d7df3fafbd153665b13888413d52b24c17"
|
||||
other = "FFprobe нұсқасын анықтау мүмкін болмады"
|
||||
|
||||
[errorSelectedFolderSave]
|
||||
hash = "sha1-83da899677cdc90e4344e3b94ee03c46b51bee4c"
|
||||
other = "Сіз сақталатын қалтаны таңдамадыңыз!"
|
||||
|
||||
[exit]
|
||||
hash = "sha1-c42457057d1ab7950cea00719cbe0b078891775f"
|
||||
other = "Шығу"
|
||||
|
||||
[ffmpegLGPL]
|
||||
hash = "sha1-d395b16cc8f8eab98a8a970307c5b010ba22dde6"
|
||||
other = "Бұл бағдарламалық құрал **[LGPLv2.1](http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html)** астында **FFmpeg** жобасының кітапханаларын пайдаланады."
|
||||
|
||||
[ffmpegTrademark]
|
||||
hash = "sha1-45f772b2eca5098cd6d31f2d1dc6edec1987a617"
|
||||
other = "FFmpeg — **[FFmpeg](https://ffmpeg.org/about.html)** жобасын жасаушы **[Fabrice Bellard](http://bellard.org/)** сауда белгісі."
|
||||
|
||||
[fileVideoForConversionTitle]
|
||||
hash = "sha1-5e727d4a2ff3f21080e51e81641595b2e668f3be"
|
||||
other = "Түрлендіруге арналған файл:"
|
||||
|
||||
[help]
|
||||
hash = "sha1-6a45cef900c668effcb2ab10da05855c1fd10f6f"
|
||||
other = "Анықтама"
|
||||
|
||||
[languageSelectionFormHead]
|
||||
hash = "sha1-0ff5fa82cf684112660128cba1711297acf11003"
|
||||
other = "Тілді ауыстыру"
|
||||
@ -118,29 +54,13 @@ other = "Тілді ауыстыру"
|
||||
hash = "sha1-daf1108fc10d3b1a908288d611f749b3cc651e4b"
|
||||
other = "Тілді таңдаңыз"
|
||||
|
||||
[licenseLink]
|
||||
hash = "sha1-ea18ab849f0eea030d770da82c2a6b3484a7bd13"
|
||||
other = "Лицензия туралы ақпарат"
|
||||
|
||||
[licenseLinkOther]
|
||||
hash = "sha1-359fff328717c05104e51a2d29f05bf1875d26b7"
|
||||
other = "Бағдарламада пайдаланылатын басқа өнімдердің лицензиялары"
|
||||
|
||||
[pathToFfmpeg]
|
||||
hash = "sha1-fafc50f1db0f720fe83a96cd70a9e1ad824e96b6"
|
||||
other = "FFmpeg жол:"
|
||||
hash = "sha1-2eba439f365640ff77e0ed6a7486fcb662573850"
|
||||
other = "ffmpeg жол:"
|
||||
|
||||
[pathToFfprobe]
|
||||
hash = "sha1-b872edc9633a2e81ef678dc46fe46a7e91732024"
|
||||
other = "FFprobe жол:"
|
||||
|
||||
[programmLink]
|
||||
hash = "sha1-18f9a3fad6aacefe1b05eed23122800b391ff5ca"
|
||||
other = "Жобаның веб-сайты"
|
||||
|
||||
[programmVersion]
|
||||
hash = "sha1-fa2e4994a301bb24bc2a8fa166e5486ea95a7475"
|
||||
other = "**Бағдарлама нұсқасы:** {{.Version}}"
|
||||
hash = "sha1-02ad53337801906f8ebfee4616100dd9f43eabd7"
|
||||
other = "ffprobe жол:"
|
||||
|
||||
[save]
|
||||
hash = "sha1-4864057d626a868fa60f999bed3191d61d045ddc"
|
||||
@ -150,18 +70,6 @@ other = "Сақтау"
|
||||
hash = "sha1-95581446a28d968ff1a027c623159a7eb08654cf"
|
||||
other = "FFmpeg және FFprobe жолын көрсетіңіз"
|
||||
|
||||
[settings]
|
||||
hash = "sha1-7f17c7c62a7fd8d1a508481f4778688927734c2f"
|
||||
other = "Параметрлер"
|
||||
|
||||
[testFF]
|
||||
hash = "sha1-f5b8ed88e9609963035d2235be0a79bbec619976"
|
||||
other = "FFmpeg функционалдығы тексерілуде..."
|
||||
|
||||
[titleDownloadLink]
|
||||
hash = "sha1-92df86371f6c3a06ca1e4754f113142776a32d49"
|
||||
other = "Сіз оны осы жерден жүктей аласыз"
|
||||
|
||||
[unzipRun]
|
||||
hash = "sha1-c554dad13026668a1f6adf3171837c5d51bbac36"
|
||||
other = "Орамнан шығарылуда..."
|
||||
|
||||
@ -1,42 +1,19 @@
|
||||
AlsoUsedProgram = "Также в программе используется:"
|
||||
about = "О программе"
|
||||
aboutText = "Простенький интерфейс для консольной утилиты FFmpeg. \nНо я не являюсь автором самой утилиты FFmpeg."
|
||||
buttonDownloadFFmpeg = "Скачать автоматически FFmpeg"
|
||||
buttonForSelectedDirTitle = "Папка куда будет сохраняться:"
|
||||
cancel = "Отмена"
|
||||
changeFFPath = "FFmpeg и FFprobe"
|
||||
changeLanguage = "Поменять язык"
|
||||
checkboxOverwriteOutputFilesTitle = "Разрешить перезаписать файл"
|
||||
choose = "выбрать"
|
||||
converterVideoFilesSubmitTitle = "Конвертировать"
|
||||
converterVideoFilesTitle = "Конвертор видео файлов в mp4"
|
||||
download = "Скачать"
|
||||
downloadFFmpegFromSite = "Будет скачано с сайта:"
|
||||
downloadRun = "Скачивается..."
|
||||
error = "Произошла ошибка!"
|
||||
errorConverter = "не смогли отконвертировать видео"
|
||||
errorDatabase = "не смогли создать файл 'database' в папке 'data'"
|
||||
errorFFmpeg = "это не FFmpeg"
|
||||
errorFFmpegVersion = "Не смогли определить версию FFmpeg"
|
||||
errorFFprobe = "это не FFprobe"
|
||||
errorFFprobeVersion = "Не смогли определить версию FFprobe"
|
||||
errorSelectedFolderSave = "Не выбрали папку для сохранения!"
|
||||
exit = "Выход"
|
||||
ffmpegLGPL = "Это программное обеспечение использует библиотеки из проекта **FFmpeg** под **[LGPLv2.1](http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html)**."
|
||||
ffmpegTrademark = "**FFmpeg** — торговая марка **[Fabrice Bellard](http://bellard.org/)** , создателя проекта **[FFmpeg](https://ffmpeg.org/about.html)**."
|
||||
fileVideoForConversionTitle = "Файл для ковертации:"
|
||||
help = "Справка"
|
||||
languageSelectionFormHead = "Переключить язык"
|
||||
languageSelectionHead = "Выберите язык"
|
||||
licenseLink = "Сведения о лицензии"
|
||||
licenseLinkOther = "Лицензии от других продуктов, которые используются в программе"
|
||||
pathToFfmpeg = "Путь к FFmpeg:"
|
||||
pathToFfprobe = "Путь к FFprobe:"
|
||||
programmLink = "Сайт проекта"
|
||||
programmVersion = "**Версия программы:** {{.Version}}"
|
||||
pathToFfmpeg = "Путь к ffmpeg:"
|
||||
pathToFfprobe = "Путь к ffprobe:"
|
||||
save = "Сохранить"
|
||||
selectFFPathTitle = "Укажите путь к FFmpeg и к FFprobe"
|
||||
settings = "Настройки"
|
||||
testFF = "Проверка FFmpeg на работоспособность..."
|
||||
titleDownloadLink = "Скачать можно от сюда"
|
||||
unzipRun = "Распаковывается..."
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
[testFF]
|
||||
hash = "sha1-f5b8ed88e9609963035d2235be0a79bbec619976"
|
||||
other = "Checking FFmpeg for serviceability..."
|
||||
@ -1,3 +0,0 @@
|
||||
[testFF]
|
||||
hash = "sha1-f5b8ed88e9609963035d2235be0a79bbec619976"
|
||||
other = "FFmpeg функционалдығы тексерілуде..."
|
||||
@ -1,26 +0,0 @@
|
||||
package localizer
|
||||
|
||||
import (
|
||||
"git.kor-elf.net/kor-elf/gui-for-ffmpeg/setting"
|
||||
)
|
||||
|
||||
type RepositoryContract interface {
|
||||
GetCode() (string, error)
|
||||
Save(code string) (setting.Setting, error)
|
||||
}
|
||||
|
||||
type Repository struct {
|
||||
settingRepository setting.RepositoryContract
|
||||
}
|
||||
|
||||
func NewRepository(settingRepository setting.RepositoryContract) *Repository {
|
||||
return &Repository{settingRepository: settingRepository}
|
||||
}
|
||||
|
||||
func (r Repository) GetCode() (string, error) {
|
||||
return r.settingRepository.GetValue("language")
|
||||
}
|
||||
|
||||
func (r Repository) Save(code string) (setting.Setting, error) {
|
||||
return r.settingRepository.CreateOrUpdate("language", code)
|
||||
}
|
||||
@ -14,7 +14,6 @@ type ServiceContract interface {
|
||||
GetLanguages() []Lang
|
||||
GetMessage(localizeConfig *i18n.LocalizeConfig) string
|
||||
SetCurrentLanguage(lang Lang) error
|
||||
SetCurrentLanguageByCode(code string) error
|
||||
GetCurrentLanguage() *CurrentLanguage
|
||||
}
|
||||
|
||||
@ -68,12 +67,12 @@ func initLanguages(directory string, bundle *i18n.Bundle) ([]Lang, error) {
|
||||
return nil, err
|
||||
}
|
||||
for _, file := range files {
|
||||
lang, err := bundle.LoadMessageFile(file)
|
||||
language, err := bundle.LoadMessageFile(file)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
title := cases.Title(lang.Tag).String(display.Self.Name(lang.Tag))
|
||||
languages = append(languages, Lang{Code: lang.Tag.String(), Title: title})
|
||||
title := cases.Title(language.Tag).String(display.Self.Name(language.Tag))
|
||||
languages = append(languages, Lang{Code: language.Tag.String(), Title: title})
|
||||
}
|
||||
|
||||
sort.Sort(languagesSort(languages))
|
||||
@ -102,15 +101,6 @@ func (s Service) SetCurrentLanguage(lang Lang) error {
|
||||
return nil
|
||||
}
|
||||
|
||||
func (s Service) SetCurrentLanguageByCode(code string) error {
|
||||
lang, err := language.Parse(code)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
title := cases.Title(lang).String(display.Self.Name(lang))
|
||||
return s.SetCurrentLanguage(Lang{Code: lang.String(), Title: title})
|
||||
}
|
||||
|
||||
func (s Service) GetCurrentLanguage() *CurrentLanguage {
|
||||
return s.currentLanguage
|
||||
}
|
||||
|
||||
34
src/main.go
34
src/main.go
@ -2,17 +2,16 @@ package main
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"ffmpegGui/convertor"
|
||||
error2 "ffmpegGui/error"
|
||||
"ffmpegGui/handler"
|
||||
"ffmpegGui/localizer"
|
||||
"ffmpegGui/migration"
|
||||
"ffmpegGui/setting"
|
||||
"fyne.io/fyne/v2"
|
||||
"fyne.io/fyne/v2/app"
|
||||
"fyne.io/fyne/v2/container"
|
||||
"fyne.io/fyne/v2/widget"
|
||||
"git.kor-elf.net/kor-elf/gui-for-ffmpeg/convertor"
|
||||
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/localizer"
|
||||
"git.kor-elf.net/kor-elf/gui-for-ffmpeg/menu"
|
||||
"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"
|
||||
"golang.org/x/text/language"
|
||||
"gorm.io/driver/sqlite"
|
||||
@ -20,7 +19,7 @@ import (
|
||||
"os"
|
||||
)
|
||||
|
||||
const appVersion string = "0.3.0"
|
||||
//const appVersion string = "0.2.0"
|
||||
|
||||
func main() {
|
||||
a := app.New()
|
||||
@ -28,7 +27,7 @@ func main() {
|
||||
if err == nil {
|
||||
a.SetIcon(iconResource)
|
||||
}
|
||||
w := a.NewWindow("GUI for FFmpeg")
|
||||
w := a.NewWindow("GUI FFMpeg!")
|
||||
w.Resize(fyne.Size{Width: 800, Height: 600})
|
||||
w.CenterOnScreen()
|
||||
|
||||
@ -63,14 +62,13 @@ func main() {
|
||||
}
|
||||
|
||||
settingRepository := setting.NewRepository(db)
|
||||
convertorRepository := convertor.NewRepository(settingRepository)
|
||||
pathFFmpeg, err := convertorRepository.GetPathFfmpeg()
|
||||
pathFFmpeg, err := settingRepository.GetValue("ffmpeg")
|
||||
if err != nil && errors.Is(err, gorm.ErrRecordNotFound) == false {
|
||||
errorView.PanicError(err)
|
||||
w.ShowAndRun()
|
||||
return
|
||||
}
|
||||
pathFFprobe, err := convertorRepository.GetPathFfprobe()
|
||||
pathFFprobe, err := settingRepository.GetValue("ffprobe")
|
||||
if err != nil && errors.Is(err, gorm.ErrRecordNotFound) == false {
|
||||
errorView.PanicError(err)
|
||||
w.ShowAndRun()
|
||||
@ -81,18 +79,12 @@ func main() {
|
||||
|
||||
localizerView := localizer.NewView(w, localizerService)
|
||||
convertorView := convertor.NewView(w, localizerService)
|
||||
settingView := setting.NewView(w, localizerService)
|
||||
convertorService := convertor.NewService(ffPathUtilities)
|
||||
defer appCloseWithConvert(convertorService)
|
||||
convertorHandler := handler.NewConvertorHandler(convertorService, convertorView, convertorRepository, localizerService)
|
||||
mainHandler := handler.NewConvertorHandler(convertorService, convertorView, settingView, localizerView, settingRepository, localizerService)
|
||||
|
||||
localizerRepository := localizer.NewRepository(settingRepository)
|
||||
menuView := menu.NewView(w, a, appVersion, localizerService)
|
||||
mainMenu := handler.NewMenuHandler(convertorHandler, menuView, localizerService, localizerView, localizerRepository)
|
||||
|
||||
mainHandler := handler.NewMainHandler(convertorHandler, mainMenu, localizerRepository, localizerService)
|
||||
mainHandler.Start()
|
||||
|
||||
w.SetMainMenu(mainMenu.GetMainMenu())
|
||||
mainHandler.LanguageSelection()
|
||||
|
||||
w.ShowAndRun()
|
||||
}
|
||||
|
||||
641
src/menu/view.go
641
src/menu/view.go
@ -1,641 +0,0 @@
|
||||
package menu
|
||||
|
||||
import (
|
||||
"fyne.io/fyne/v2"
|
||||
"fyne.io/fyne/v2/canvas"
|
||||
"fyne.io/fyne/v2/container"
|
||||
"fyne.io/fyne/v2/widget"
|
||||
"git.kor-elf.net/kor-elf/gui-for-ffmpeg/localizer"
|
||||
"github.com/nicksnyder/go-i18n/v2/i18n"
|
||||
"golang.org/x/image/colornames"
|
||||
"net/url"
|
||||
)
|
||||
|
||||
type ViewContract interface {
|
||||
About(ffmpegVersion string, ffprobeVersion string)
|
||||
}
|
||||
|
||||
type View struct {
|
||||
w fyne.Window
|
||||
app fyne.App
|
||||
appVersion string
|
||||
localizerService localizer.ServiceContract
|
||||
}
|
||||
|
||||
func NewView(w fyne.Window, app fyne.App, appVersion string, localizerService localizer.ServiceContract) *View {
|
||||
return &View{
|
||||
w: w,
|
||||
app: app,
|
||||
appVersion: appVersion,
|
||||
localizerService: localizerService,
|
||||
}
|
||||
}
|
||||
|
||||
func (v View) About(ffmpegVersion string, ffprobeVersion string) {
|
||||
view := v.app.NewWindow(v.localizerService.GetMessage(&i18n.LocalizeConfig{
|
||||
MessageID: "about",
|
||||
}))
|
||||
view.Resize(fyne.Size{Width: 793, Height: 550})
|
||||
view.SetFixedSize(true)
|
||||
|
||||
programmName := canvas.NewText(" GUI for FFmpeg", colornames.Darkgreen)
|
||||
programmName.TextStyle = fyne.TextStyle{Bold: true}
|
||||
programmName.TextSize = 20
|
||||
|
||||
programmLink := widget.NewHyperlink(v.localizerService.GetMessage(&i18n.LocalizeConfig{
|
||||
MessageID: "programmLink",
|
||||
}), &url.URL{
|
||||
Scheme: "https",
|
||||
Host: "git.kor-elf.net",
|
||||
Path: "kor-elf/gui-for-ffmpeg/releases",
|
||||
})
|
||||
|
||||
licenseLink := widget.NewHyperlink(v.localizerService.GetMessage(&i18n.LocalizeConfig{
|
||||
MessageID: "licenseLink",
|
||||
}), &url.URL{
|
||||
Scheme: "https",
|
||||
Host: "git.kor-elf.net",
|
||||
Path: "kor-elf/gui-for-ffmpeg/src/branch/main/LICENSE",
|
||||
})
|
||||
|
||||
licenseLinkOther := widget.NewHyperlink(v.localizerService.GetMessage(&i18n.LocalizeConfig{
|
||||
MessageID: "licenseLinkOther",
|
||||
}), &url.URL{
|
||||
Scheme: "https",
|
||||
Host: "git.kor-elf.net",
|
||||
Path: "kor-elf/gui-for-ffmpeg/src/branch/main/LICENSE-3RD-PARTY.txt",
|
||||
})
|
||||
|
||||
programmVersion := widget.NewRichTextFromMarkdown(v.localizerService.GetMessage(&i18n.LocalizeConfig{
|
||||
MessageID: "programmVersion",
|
||||
TemplateData: map[string]string{
|
||||
"Version": v.appVersion,
|
||||
},
|
||||
}))
|
||||
|
||||
aboutText := widget.NewRichText(
|
||||
&widget.TextSegment{
|
||||
Text: v.localizerService.GetMessage(&i18n.LocalizeConfig{
|
||||
MessageID: "aboutText",
|
||||
}),
|
||||
},
|
||||
)
|
||||
image := canvas.NewImageFromFile("icon.png")
|
||||
image.SetMinSize(fyne.Size{Width: 100, Height: 100})
|
||||
image.FillMode = canvas.ImageFillContain
|
||||
|
||||
ffmpegTrademark := widget.NewRichTextFromMarkdown(v.localizerService.GetMessage(&i18n.LocalizeConfig{
|
||||
MessageID: "ffmpegTrademark",
|
||||
}))
|
||||
ffmpegLGPL := widget.NewRichTextFromMarkdown(v.localizerService.GetMessage(&i18n.LocalizeConfig{
|
||||
MessageID: "ffmpegLGPL",
|
||||
}))
|
||||
|
||||
view.SetContent(
|
||||
container.NewScroll(container.NewVBox(
|
||||
container.NewBorder(nil, nil, container.NewVBox(image), nil, container.NewVBox(
|
||||
programmName,
|
||||
programmVersion,
|
||||
aboutText,
|
||||
ffmpegTrademark,
|
||||
ffmpegLGPL,
|
||||
v.getCopyright(),
|
||||
container.NewHBox(programmLink, licenseLink),
|
||||
container.NewHBox(licenseLinkOther),
|
||||
)),
|
||||
v.getAboutFfmpeg(ffmpegVersion),
|
||||
v.getAboutFfprobe(ffprobeVersion),
|
||||
widget.NewCard(v.localizerService.GetMessage(&i18n.LocalizeConfig{
|
||||
MessageID: "AlsoUsedProgram",
|
||||
}), "", v.getOther()),
|
||||
)),
|
||||
)
|
||||
view.CenterOnScreen()
|
||||
view.Show()
|
||||
}
|
||||
|
||||
func (v View) getCopyright() *widget.RichText {
|
||||
return widget.NewRichTextFromMarkdown("Copyright (c) 2024 **[Leonid Nikitin (kor-elf)](https://git.kor-elf.net/kor-elf/)**.")
|
||||
}
|
||||
|
||||
func (v View) getAboutFfmpeg(version string) *fyne.Container {
|
||||
programmName := canvas.NewText(" FFmpeg", colornames.Darkgreen)
|
||||
programmName.TextStyle = fyne.TextStyle{Bold: true}
|
||||
programmName.TextSize = 20
|
||||
|
||||
programmLink := widget.NewHyperlink(v.localizerService.GetMessage(&i18n.LocalizeConfig{
|
||||
MessageID: "programmLink",
|
||||
}), &url.URL{
|
||||
Scheme: "https",
|
||||
Host: "ffmpeg.org",
|
||||
Path: "",
|
||||
})
|
||||
|
||||
licenseLink := widget.NewHyperlink(v.localizerService.GetMessage(&i18n.LocalizeConfig{
|
||||
MessageID: "licenseLink",
|
||||
}), &url.URL{
|
||||
Scheme: "https",
|
||||
Host: "ffmpeg.org",
|
||||
Path: "legal.html",
|
||||
})
|
||||
|
||||
return container.NewVBox(
|
||||
programmName,
|
||||
widget.NewLabel(version),
|
||||
widget.NewRichTextFromMarkdown("**FFmpeg** is a trademark of **[Fabrice Bellard](http://bellard.org/)**, originator of the **[FFmpeg](https://ffmpeg.org/about.html)** project."),
|
||||
widget.NewRichTextFromMarkdown("This software uses libraries from the **FFmpeg** project under the **[LGPLv2.1](http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html)**."),
|
||||
container.NewHBox(programmLink, licenseLink),
|
||||
)
|
||||
}
|
||||
|
||||
func (v View) getAboutFfprobe(version string) *fyne.Container {
|
||||
programmName := canvas.NewText(" FFprobe", colornames.Darkgreen)
|
||||
programmName.TextStyle = fyne.TextStyle{Bold: true}
|
||||
programmName.TextSize = 20
|
||||
|
||||
programmLink := widget.NewHyperlink(v.localizerService.GetMessage(&i18n.LocalizeConfig{
|
||||
MessageID: "programmLink",
|
||||
}), &url.URL{
|
||||
Scheme: "https",
|
||||
Host: "ffmpeg.org",
|
||||
Path: "ffprobe.html",
|
||||
})
|
||||
|
||||
licenseLink := widget.NewHyperlink(v.localizerService.GetMessage(&i18n.LocalizeConfig{
|
||||
MessageID: "licenseLink",
|
||||
}), &url.URL{
|
||||
Scheme: "https",
|
||||
Host: "ffmpeg.org",
|
||||
Path: "legal.html",
|
||||
})
|
||||
|
||||
return container.NewVBox(
|
||||
programmName,
|
||||
widget.NewLabel(version),
|
||||
widget.NewRichTextFromMarkdown("**FFmpeg** is a trademark of **[Fabrice Bellard](http://bellard.org/)**, originator of the **[FFmpeg](https://ffmpeg.org/about.html)** project."),
|
||||
widget.NewRichTextFromMarkdown("This software uses libraries from the **FFmpeg** project under the **[LGPLv2.1](http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html)**."),
|
||||
container.NewHBox(programmLink, licenseLink),
|
||||
)
|
||||
}
|
||||
|
||||
func (v View) getOther() *fyne.Container {
|
||||
return container.NewVBox(
|
||||
canvas.NewLine(colornames.Darkgreen),
|
||||
|
||||
container.NewHBox(widget.NewHyperlink("fyne.io/fyne/v2", &url.URL{
|
||||
Scheme: "https",
|
||||
Host: "github.com",
|
||||
Path: "fyne-io/fyne",
|
||||
})),
|
||||
container.NewHBox(widget.NewHyperlink("BSD 3-Clause License", &url.URL{
|
||||
Scheme: "https",
|
||||
Host: "github.com",
|
||||
Path: "fyne-io/fyne/blob/master/LICENSE",
|
||||
})),
|
||||
widget.NewRichTextFromMarkdown("Copyright (C) 2018 Fyne.io developers (see [AUTHORS](https://github.com/fyne-io/fyne/blob/master/AUTHORS))"),
|
||||
canvas.NewLine(colornames.Darkgreen),
|
||||
|
||||
container.NewHBox(widget.NewHyperlink("fyne.io/systray", &url.URL{
|
||||
Scheme: "https",
|
||||
Host: "github.com",
|
||||
Path: "fyne-io/systray",
|
||||
})),
|
||||
container.NewHBox(widget.NewHyperlink("Apache License", &url.URL{
|
||||
Scheme: "https",
|
||||
Host: "github.com",
|
||||
Path: "fyne-io/systray/blob/master/LICENSE",
|
||||
})),
|
||||
canvas.NewLine(colornames.Darkgreen),
|
||||
|
||||
container.NewHBox(widget.NewHyperlink("github.com/BurntSushi/toml", &url.URL{
|
||||
Scheme: "https",
|
||||
Host: "github.com",
|
||||
Path: "BurntSushi/toml",
|
||||
})),
|
||||
container.NewHBox(widget.NewHyperlink("The MIT License (MIT)", &url.URL{
|
||||
Scheme: "https",
|
||||
Host: "github.com",
|
||||
Path: "BurntSushi/toml/blob/master/COPYING",
|
||||
})),
|
||||
widget.NewLabel("Copyright (c) 2013 TOML authors"),
|
||||
canvas.NewLine(colornames.Darkgreen),
|
||||
|
||||
container.NewHBox(widget.NewHyperlink("github.com/davecgh/go-spew", &url.URL{
|
||||
Scheme: "https",
|
||||
Host: "github.com",
|
||||
Path: "davecgh/go-spew",
|
||||
})),
|
||||
container.NewHBox(widget.NewHyperlink("ISC License", &url.URL{
|
||||
Scheme: "https",
|
||||
Host: "github.com",
|
||||
Path: "davecgh/go-spew/blob/master/LICENSE",
|
||||
})),
|
||||
widget.NewLabel("Copyright (c) 2012-2016 Dave Collins <dave@davec.name>"),
|
||||
canvas.NewLine(colornames.Darkgreen),
|
||||
|
||||
container.NewHBox(widget.NewHyperlink("github.com/fredbi/uri", &url.URL{
|
||||
Scheme: "https",
|
||||
Host: "github.com",
|
||||
Path: "fredbi/uri",
|
||||
})),
|
||||
container.NewHBox(widget.NewHyperlink("The MIT License (MIT)", &url.URL{
|
||||
Scheme: "https",
|
||||
Host: "github.com",
|
||||
Path: "fredbi/uri/blob/master/LICENSE.md",
|
||||
})),
|
||||
widget.NewLabel("Copyright (c) 2018 Frederic Bidon"),
|
||||
widget.NewLabel("Copyright (c) 2015 Trey Tacon"),
|
||||
canvas.NewLine(colornames.Darkgreen),
|
||||
|
||||
container.NewHBox(widget.NewHyperlink("github.com/fsnotify/fsnotify", &url.URL{
|
||||
Scheme: "https",
|
||||
Host: "github.com",
|
||||
Path: "fsnotify/fsnotify",
|
||||
})),
|
||||
container.NewHBox(widget.NewHyperlink("BSD-3-Clause license", &url.URL{
|
||||
Scheme: "https",
|
||||
Host: "github.com",
|
||||
Path: "fsnotify/fsnotify/blob/main/LICENSE",
|
||||
})),
|
||||
widget.NewLabel("Copyright © 2012 The Go Authors. All rights reserved."),
|
||||
widget.NewLabel("Copyright © fsnotify Authors. All rights reserved."),
|
||||
canvas.NewLine(colornames.Darkgreen),
|
||||
|
||||
container.NewHBox(widget.NewHyperlink("github.com/fyne-io/gl-js", &url.URL{
|
||||
Scheme: "https",
|
||||
Host: "github.com",
|
||||
Path: "fyne-io/gl-js",
|
||||
})),
|
||||
container.NewHBox(widget.NewHyperlink("BSD-3-Clause license", &url.URL{
|
||||
Scheme: "https",
|
||||
Host: "github.com",
|
||||
Path: "fyne-io/gl-js/blob/master/LICENSE",
|
||||
})),
|
||||
widget.NewLabel("Copyright (c) 2009 The Go Authors. All rights reserved."),
|
||||
canvas.NewLine(colornames.Darkgreen),
|
||||
|
||||
container.NewHBox(widget.NewHyperlink("github.com/fyne-io/glfw-js", &url.URL{
|
||||
Scheme: "https",
|
||||
Host: "github.com",
|
||||
Path: "fyne-io/glfw-js",
|
||||
})),
|
||||
container.NewHBox(widget.NewHyperlink("MIT License", &url.URL{
|
||||
Scheme: "https",
|
||||
Host: "github.com",
|
||||
Path: "fyne-io/glfw-js/blob/master/LICENSE",
|
||||
})),
|
||||
widget.NewLabel("Copyright (c) 2014 Dmitri Shuralyov"),
|
||||
canvas.NewLine(colornames.Darkgreen),
|
||||
|
||||
container.NewHBox(widget.NewHyperlink("github.com/fyne-io/image", &url.URL{
|
||||
Scheme: "https",
|
||||
Host: "github.com",
|
||||
Path: "fyne-io/image",
|
||||
})),
|
||||
container.NewHBox(widget.NewHyperlink("BSD 3-Clause License", &url.URL{
|
||||
Scheme: "https",
|
||||
Host: "github.com",
|
||||
Path: "fyne-io/image/blob/main/LICENSE",
|
||||
})),
|
||||
widget.NewLabel("Copyright (c) 2022, Fyne.io"),
|
||||
canvas.NewLine(colornames.Darkgreen),
|
||||
|
||||
container.NewHBox(widget.NewHyperlink("github.com/go-gl/gl", &url.URL{
|
||||
Scheme: "https",
|
||||
Host: "github.com",
|
||||
Path: "go-gl/gl",
|
||||
})),
|
||||
container.NewHBox(widget.NewHyperlink("The MIT License (MIT)", &url.URL{
|
||||
Scheme: "https",
|
||||
Host: "github.com",
|
||||
Path: "go-gl/gl/blob/master/LICENSE",
|
||||
})),
|
||||
widget.NewLabel("Copyright (c) 2014 Eric Woroshow"),
|
||||
canvas.NewLine(colornames.Darkgreen),
|
||||
|
||||
container.NewHBox(widget.NewHyperlink("github.com/go-gl/glfw/v3.3/glfw", &url.URL{
|
||||
Scheme: "https",
|
||||
Host: "github.com",
|
||||
Path: "go-gl/glfw/",
|
||||
})),
|
||||
container.NewHBox(widget.NewHyperlink("BSD-3-Clause license", &url.URL{
|
||||
Scheme: "https",
|
||||
Host: "github.com",
|
||||
Path: "go-gl/glfw/blob/master/LICENSE",
|
||||
})),
|
||||
widget.NewLabel("Copyright (c) 2012 The glfw3-go Authors. All rights reserved."),
|
||||
canvas.NewLine(colornames.Darkgreen),
|
||||
|
||||
container.NewHBox(widget.NewHyperlink("github.com/go-text/render", &url.URL{
|
||||
Scheme: "https",
|
||||
Host: "github.com",
|
||||
Path: "go-text/render",
|
||||
})),
|
||||
container.NewHBox(widget.NewHyperlink("Unlicense OR BSD-3-Clause", &url.URL{
|
||||
Scheme: "https",
|
||||
Host: "github.com",
|
||||
Path: "go-text/render/blob/main/LICENSE",
|
||||
})),
|
||||
widget.NewLabel("Copyright 2021 The go-text authors"),
|
||||
canvas.NewLine(colornames.Darkgreen),
|
||||
|
||||
container.NewHBox(widget.NewHyperlink("github.com/go-text/typesetting", &url.URL{
|
||||
Scheme: "https",
|
||||
Host: "github.com",
|
||||
Path: "go-text/typesetting",
|
||||
})),
|
||||
container.NewHBox(widget.NewHyperlink("Unlicense OR BSD-3-Clause", &url.URL{
|
||||
Scheme: "https",
|
||||
Host: "github.com",
|
||||
Path: "go-text/typesetting/blob/main/LICENSE",
|
||||
})),
|
||||
widget.NewLabel("Copyright 2021 The go-text authors"),
|
||||
canvas.NewLine(colornames.Darkgreen),
|
||||
|
||||
container.NewHBox(widget.NewHyperlink("github.com/godbus/dbus/v5", &url.URL{
|
||||
Scheme: "https",
|
||||
Host: "github.com",
|
||||
Path: "godbus/dbus",
|
||||
})),
|
||||
container.NewHBox(widget.NewHyperlink("BSD 2-Clause \"Simplified\" License", &url.URL{
|
||||
Scheme: "https",
|
||||
Host: "github.com",
|
||||
Path: "godbus/dbus/blob/master/LICENSE",
|
||||
})),
|
||||
widget.NewLabel("Copyright (c) 2013, Georg Reinke (<guelfey at gmail dot com>), Google"),
|
||||
canvas.NewLine(colornames.Darkgreen),
|
||||
|
||||
container.NewHBox(widget.NewHyperlink("github.com/gopherjs/gopherjs", &url.URL{
|
||||
Scheme: "https",
|
||||
Host: "github.com",
|
||||
Path: "gopherjs/gopherjs",
|
||||
})),
|
||||
container.NewHBox(widget.NewHyperlink("BSD 2-Clause \"Simplified\" License", &url.URL{
|
||||
Scheme: "https",
|
||||
Host: "github.com",
|
||||
Path: "gopherjs/gopherjs/blob/master/LICENSE",
|
||||
})),
|
||||
widget.NewLabel("Copyright (c) 2013 Richard Musiol. All rights reserved."),
|
||||
canvas.NewLine(colornames.Darkgreen),
|
||||
|
||||
container.NewHBox(widget.NewHyperlink("github.com/jinzhu/inflection", &url.URL{
|
||||
Scheme: "https",
|
||||
Host: "github.com",
|
||||
Path: "jinzhu/inflection",
|
||||
})),
|
||||
container.NewHBox(widget.NewHyperlink("The MIT License (MIT)", &url.URL{
|
||||
Scheme: "https",
|
||||
Host: "github.com",
|
||||
Path: "jinzhu/inflection/blob/master/LICENSE",
|
||||
})),
|
||||
widget.NewLabel("Copyright (c) 2015 - Jinzhu"),
|
||||
canvas.NewLine(colornames.Darkgreen),
|
||||
|
||||
container.NewHBox(widget.NewHyperlink("github.com/jsummers/gobmp", &url.URL{
|
||||
Scheme: "https",
|
||||
Host: "github.com",
|
||||
Path: "jsummers/gobmp",
|
||||
})),
|
||||
container.NewHBox(widget.NewHyperlink("The MIT License (MIT)", &url.URL{
|
||||
Scheme: "https",
|
||||
Host: "github.com",
|
||||
Path: "jsummers/gobmp/blob/master/COPYING.txt",
|
||||
})),
|
||||
widget.NewLabel("Copyright (c) 2012-2015 Jason Summers"),
|
||||
canvas.NewLine(colornames.Darkgreen),
|
||||
|
||||
container.NewHBox(widget.NewHyperlink("github.com/mattn/go-sqlite3", &url.URL{
|
||||
Scheme: "https",
|
||||
Host: "github.com",
|
||||
Path: "mattn/go-sqlite3",
|
||||
})),
|
||||
container.NewHBox(widget.NewHyperlink("The MIT License (MIT)", &url.URL{
|
||||
Scheme: "https",
|
||||
Host: "github.com",
|
||||
Path: "mattn/go-sqlite3/blob/master/LICENSE",
|
||||
})),
|
||||
widget.NewLabel("Copyright (c) 2014 Yasuhiro Matsumoto"),
|
||||
canvas.NewLine(colornames.Darkgreen),
|
||||
|
||||
container.NewHBox(widget.NewHyperlink("github.com/nicksnyder/go-i18n/v2", &url.URL{
|
||||
Scheme: "https",
|
||||
Host: "github.com",
|
||||
Path: "nicksnyder/go-i18n",
|
||||
})),
|
||||
container.NewHBox(widget.NewHyperlink("The MIT License (MIT)", &url.URL{
|
||||
Scheme: "https",
|
||||
Host: "github.com",
|
||||
Path: "nicksnyder/go-i18n/blob/main/LICENSE",
|
||||
})),
|
||||
widget.NewRichTextFromMarkdown("Copyright (c) 2014 Nick Snyder [https://github.com/nicksnyder](https://github.com/nicksnyder)"),
|
||||
canvas.NewLine(colornames.Darkgreen),
|
||||
|
||||
container.NewHBox(widget.NewHyperlink("github.com/pmezard/go-difflib", &url.URL{
|
||||
Scheme: "https",
|
||||
Host: "github.com",
|
||||
Path: "pmezard/go-difflib",
|
||||
})),
|
||||
container.NewHBox(widget.NewHyperlink("License", &url.URL{
|
||||
Scheme: "https",
|
||||
Host: "github.com",
|
||||
Path: "pmezard/go-difflib/blob/master/LICENSE",
|
||||
})),
|
||||
widget.NewLabel("Copyright (c) 2013, Patrick Mezard"),
|
||||
canvas.NewLine(colornames.Darkgreen),
|
||||
|
||||
container.NewHBox(widget.NewHyperlink("github.com/srwiley/oksvg", &url.URL{
|
||||
Scheme: "https",
|
||||
Host: "github.com",
|
||||
Path: "srwiley/oksvg",
|
||||
})),
|
||||
container.NewHBox(widget.NewHyperlink("BSD 3-Clause License", &url.URL{
|
||||
Scheme: "https",
|
||||
Host: "github.com",
|
||||
Path: "srwiley/oksvg/blob/master/LICENSE",
|
||||
})),
|
||||
widget.NewLabel("Copyright (c) 2018, Steven R Wiley"),
|
||||
canvas.NewLine(colornames.Darkgreen),
|
||||
|
||||
container.NewHBox(widget.NewHyperlink("github.com/srwiley/rasterx", &url.URL{
|
||||
Scheme: "https",
|
||||
Host: "github.com",
|
||||
Path: "srwiley/rasterx",
|
||||
})),
|
||||
container.NewHBox(widget.NewHyperlink("BSD 3-Clause License", &url.URL{
|
||||
Scheme: "https",
|
||||
Host: "github.com",
|
||||
Path: "srwiley/rasterx/blob/master/LICENSE",
|
||||
})),
|
||||
widget.NewLabel("Copyright (c) 2018, Steven R Wiley"),
|
||||
canvas.NewLine(colornames.Darkgreen),
|
||||
|
||||
container.NewHBox(widget.NewHyperlink("github.com/stretchr/testify", &url.URL{
|
||||
Scheme: "https",
|
||||
Host: "github.com",
|
||||
Path: "stretchr/testify",
|
||||
})),
|
||||
container.NewHBox(widget.NewHyperlink("MIT License", &url.URL{
|
||||
Scheme: "https",
|
||||
Host: "github.com",
|
||||
Path: "stretchr/testify/blob/master/LICENSE",
|
||||
})),
|
||||
widget.NewLabel("Copyright (c) 2012-2020 Mat Ryer, Tyler Bunnell and contributors."),
|
||||
canvas.NewLine(colornames.Darkgreen),
|
||||
|
||||
container.NewHBox(widget.NewHyperlink("github.com/tevino/abool", &url.URL{
|
||||
Scheme: "https",
|
||||
Host: "github.com",
|
||||
Path: "tevino/abool",
|
||||
})),
|
||||
container.NewHBox(widget.NewHyperlink("The MIT License (MIT)", &url.URL{
|
||||
Scheme: "https",
|
||||
Host: "github.com",
|
||||
Path: "tevino/abool/blob/master/LICENSE",
|
||||
})),
|
||||
widget.NewLabel("Copyright (c) 2016 Tevin Zhang"),
|
||||
canvas.NewLine(colornames.Darkgreen),
|
||||
|
||||
container.NewHBox(widget.NewHyperlink("github.com/yuin/goldmark", &url.URL{
|
||||
Scheme: "https",
|
||||
Host: "github.com",
|
||||
Path: "yuin/goldmark",
|
||||
})),
|
||||
container.NewHBox(widget.NewHyperlink("MIT License", &url.URL{
|
||||
Scheme: "https",
|
||||
Host: "github.com",
|
||||
Path: "yuin/goldmark/blob/master/LICENSE",
|
||||
})),
|
||||
widget.NewLabel("Copyright (c) 2019 Yusuke Inuzuka"),
|
||||
canvas.NewLine(colornames.Darkgreen),
|
||||
|
||||
container.NewHBox(widget.NewHyperlink("golang.org/x/image", &url.URL{
|
||||
Scheme: "https",
|
||||
Host: "pkg.go.dev",
|
||||
Path: "golang.org/x/image",
|
||||
})),
|
||||
container.NewHBox(widget.NewHyperlink("License", &url.URL{
|
||||
Scheme: "https",
|
||||
Host: "cs.opensource.google",
|
||||
Path: "go/x/image/+/master:LICENSE",
|
||||
})),
|
||||
widget.NewLabel("Copyright (c) 2009 The Go Authors. All rights reserved."),
|
||||
canvas.NewLine(colornames.Darkgreen),
|
||||
|
||||
container.NewHBox(widget.NewHyperlink("golang.org/x/mobile", &url.URL{
|
||||
Scheme: "https",
|
||||
Host: "pkg.go.dev",
|
||||
Path: "golang.org/x/mobile",
|
||||
})),
|
||||
container.NewHBox(widget.NewHyperlink("License", &url.URL{
|
||||
Scheme: "https",
|
||||
Host: "cs.opensource.google",
|
||||
Path: "go/x/mobile/+/master:LICENSE",
|
||||
})),
|
||||
widget.NewLabel("Copyright (c) 2009 The Go Authors. All rights reserved."),
|
||||
canvas.NewLine(colornames.Darkgreen),
|
||||
|
||||
container.NewHBox(widget.NewHyperlink("golang.org/x/net", &url.URL{
|
||||
Scheme: "https",
|
||||
Host: "pkg.go.dev",
|
||||
Path: "golang.org/x/net",
|
||||
})),
|
||||
container.NewHBox(widget.NewHyperlink("License", &url.URL{
|
||||
Scheme: "https",
|
||||
Host: "cs.opensource.google",
|
||||
Path: "go/x/net/+/master:LICENSE",
|
||||
})),
|
||||
widget.NewLabel("Copyright (c) 2009 The Go Authors. All rights reserved."),
|
||||
canvas.NewLine(colornames.Darkgreen),
|
||||
|
||||
container.NewHBox(widget.NewHyperlink("golang.org/x/sys", &url.URL{
|
||||
Scheme: "https",
|
||||
Host: "pkg.go.dev",
|
||||
Path: "golang.org/x/sys",
|
||||
})),
|
||||
container.NewHBox(widget.NewHyperlink("License", &url.URL{
|
||||
Scheme: "https",
|
||||
Host: "cs.opensource.google",
|
||||
Path: "go/x/sys/+/master:LICENSE",
|
||||
})),
|
||||
widget.NewLabel("Copyright (c) 2009 The Go Authors. All rights reserved."),
|
||||
canvas.NewLine(colornames.Darkgreen),
|
||||
|
||||
container.NewHBox(widget.NewHyperlink("golang.org/x/text", &url.URL{
|
||||
Scheme: "https",
|
||||
Host: "pkg.go.dev",
|
||||
Path: "golang.org/x/text",
|
||||
})),
|
||||
container.NewHBox(widget.NewHyperlink("License", &url.URL{
|
||||
Scheme: "https",
|
||||
Host: "cs.opensource.google",
|
||||
Path: "go/x/text/+/master:LICENSE",
|
||||
})),
|
||||
widget.NewLabel("Copyright (c) 2009 The Go Authors. All rights reserved."),
|
||||
canvas.NewLine(colornames.Darkgreen),
|
||||
|
||||
container.NewHBox(widget.NewHyperlink("gopkg.in/yaml.v3", &url.URL{
|
||||
Scheme: "https",
|
||||
Host: "github.com",
|
||||
Path: "go-yaml/yaml/tree/v3.0.1",
|
||||
})),
|
||||
container.NewHBox(widget.NewHyperlink("Licensed under the Apache License, Version 2.0", &url.URL{
|
||||
Scheme: "http",
|
||||
Host: "www.apache.org",
|
||||
Path: "licenses/LICENSE-2.0",
|
||||
})),
|
||||
widget.NewLabel("Copyright 2011-2016 Canonical Ltd."),
|
||||
canvas.NewLine(colornames.Darkgreen),
|
||||
|
||||
container.NewHBox(widget.NewHyperlink("gorm.io/gorm", &url.URL{
|
||||
Scheme: "https",
|
||||
Host: "github.com",
|
||||
Path: "go-gorm/gorm",
|
||||
})),
|
||||
container.NewHBox(widget.NewHyperlink("The MIT License (MIT)", &url.URL{
|
||||
Scheme: "https",
|
||||
Host: "github.com",
|
||||
Path: "go-gorm/gorm/blob/master/LICENSE",
|
||||
})),
|
||||
widget.NewLabel("Copyright (c) 2013-NOW Jinzhu <wosmvp@gmail.com>"),
|
||||
canvas.NewLine(colornames.Darkgreen),
|
||||
|
||||
container.NewHBox(widget.NewHyperlink("honnef.co/go/js/dom", &url.URL{
|
||||
Scheme: "https",
|
||||
Host: "github.com",
|
||||
Path: "dominikh/go-js-dom",
|
||||
})),
|
||||
container.NewHBox(widget.NewHyperlink("The MIT License (MIT)", &url.URL{
|
||||
Scheme: "https",
|
||||
Host: "github.com",
|
||||
Path: "dominikh/go-js-dom/blob/master/LICENSE",
|
||||
})),
|
||||
widget.NewLabel("Copyright (c) 2014 Dominik Honnef"),
|
||||
canvas.NewLine(colornames.Darkgreen),
|
||||
|
||||
container.NewHBox(widget.NewHyperlink("github.com/golang/go", &url.URL{
|
||||
Scheme: "https",
|
||||
Host: "github.com",
|
||||
Path: "golang/go",
|
||||
})),
|
||||
container.NewHBox(widget.NewHyperlink("BSD 3-Clause \"New\" or \"Revised\" License", &url.URL{
|
||||
Scheme: "https",
|
||||
Host: "github.com",
|
||||
Path: "golang/go/blob/master/LICENSE",
|
||||
})),
|
||||
widget.NewLabel("Copyright (c) 2009 The Go Authors. All rights reserved."),
|
||||
canvas.NewLine(colornames.Darkgreen),
|
||||
|
||||
container.NewHBox(widget.NewHyperlink("github.com/golang/go", &url.URL{
|
||||
Scheme: "https",
|
||||
Host: "github.com",
|
||||
Path: "golang/go",
|
||||
})),
|
||||
container.NewHBox(widget.NewHyperlink("BSD 3-Clause \"New\" or \"Revised\" License", &url.URL{
|
||||
Scheme: "https",
|
||||
Host: "github.com",
|
||||
Path: "golang/go/blob/master/LICENSE",
|
||||
})),
|
||||
widget.NewLabel("Copyright (c) 2009 The Go Authors. All rights reserved."),
|
||||
canvas.NewLine(colornames.Darkgreen),
|
||||
)
|
||||
}
|
||||
@ -1,7 +1,7 @@
|
||||
package migration
|
||||
|
||||
import (
|
||||
"git.kor-elf.net/kor-elf/gui-for-ffmpeg/setting"
|
||||
"ffmpegGui/setting"
|
||||
"gorm.io/gorm"
|
||||
)
|
||||
|
||||
|
||||
@ -1,13 +1,11 @@
|
||||
package setting
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"gorm.io/gorm"
|
||||
)
|
||||
|
||||
type RepositoryContract interface {
|
||||
Create(setting Setting) (Setting, error)
|
||||
CreateOrUpdate(code string, value string) (Setting, error)
|
||||
GetValue(code string) (value string, err error)
|
||||
}
|
||||
|
||||
@ -35,21 +33,3 @@ func (r Repository) Create(setting Setting) (Setting, error) {
|
||||
}
|
||||
return setting, err
|
||||
}
|
||||
|
||||
func (r Repository) CreateOrUpdate(code string, value string) (Setting, error) {
|
||||
var setting Setting
|
||||
err := r.db.Where("code = ?", code).First(&setting).Error
|
||||
if err != nil {
|
||||
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 setting, err
|
||||
}
|
||||
|
||||
@ -1,30 +1,41 @@
|
||||
package convertor
|
||||
package setting
|
||||
|
||||
import (
|
||||
"ffmpegGui/helper"
|
||||
"ffmpegGui/localizer"
|
||||
"fyne.io/fyne/v2"
|
||||
"fyne.io/fyne/v2/canvas"
|
||||
"fyne.io/fyne/v2/container"
|
||||
"fyne.io/fyne/v2/dialog"
|
||||
"fyne.io/fyne/v2/widget"
|
||||
"git.kor-elf.net/kor-elf/gui-for-ffmpeg/helper"
|
||||
"github.com/nicksnyder/go-i18n/v2/i18n"
|
||||
"image/color"
|
||||
"net/url"
|
||||
)
|
||||
|
||||
func (v View) SelectFFPath(
|
||||
currentPathFfmpeg string,
|
||||
currentPathFfprobe string,
|
||||
save func(ffmpegPath string, ffprobePath string) error,
|
||||
cancel func(),
|
||||
donwloadFFmpeg func(progressBar *widget.ProgressBar, progressMessage *canvas.Text) error,
|
||||
) {
|
||||
errorMessage := canvas.NewText("", color.RGBA{R: 255, G: 0, B: 0, A: 255})
|
||||
type ViewContract interface {
|
||||
SelectFFPath(func(ffmpegPath string, ffprobePath string) error)
|
||||
}
|
||||
|
||||
type View struct {
|
||||
w fyne.Window
|
||||
localizerService localizer.ServiceContract
|
||||
}
|
||||
|
||||
func NewView(w fyne.Window, localizerService localizer.ServiceContract) *View {
|
||||
return &View{
|
||||
w: w,
|
||||
localizerService: localizerService,
|
||||
}
|
||||
}
|
||||
|
||||
func (v View) SelectFFPath(save func(ffmpegPath string, ffprobePath string) error) {
|
||||
errorMessage := canvas.NewText("", color.RGBA{255, 0, 0, 255})
|
||||
errorMessage.TextSize = 16
|
||||
errorMessage.TextStyle = fyne.TextStyle{Bold: true}
|
||||
|
||||
ffmpegPath, buttonFFmpeg, buttonFFmpegMessage := v.getButtonSelectFile(currentPathFfmpeg)
|
||||
ffprobePath, buttonFFprobe, buttonFFprobeMessage := v.getButtonSelectFile(currentPathFfprobe)
|
||||
ffmpegPath, buttonFFmpeg, buttonFFmpegMessage := v.getButtonSelectFile()
|
||||
ffprobePath, buttonFFprobe, buttonFFprobeMessage := v.getButtonSelectFile()
|
||||
|
||||
link := widget.NewHyperlink("https://ffmpeg.org/download.html", &url.URL{
|
||||
Scheme: "https",
|
||||
@ -66,32 +77,23 @@ func (v View) SelectFFPath(
|
||||
MessageID: "save",
|
||||
}),
|
||||
OnSubmit: func() {
|
||||
err := save(*ffmpegPath, *ffprobePath)
|
||||
err := save(string(*ffmpegPath), string(*ffprobePath))
|
||||
if err != nil {
|
||||
errorMessage.Text = err.Error()
|
||||
}
|
||||
},
|
||||
}
|
||||
if cancel != nil {
|
||||
form.OnCancel = cancel
|
||||
form.CancelText = v.localizerService.GetMessage(&i18n.LocalizeConfig{
|
||||
MessageID: "cancel",
|
||||
})
|
||||
}
|
||||
selectFFPathTitle := v.localizerService.GetMessage(&i18n.LocalizeConfig{
|
||||
MessageID: "selectFFPathTitle",
|
||||
})
|
||||
|
||||
v.w.SetContent(widget.NewCard(selectFFPathTitle, "", container.NewVBox(
|
||||
form,
|
||||
v.blockDownloadFFmpeg(donwloadFFmpeg),
|
||||
)))
|
||||
v.w.SetContent(widget.NewCard(selectFFPathTitle, "", container.NewVBox(form)))
|
||||
}
|
||||
|
||||
func (v View) getButtonSelectFile(path string) (filePath *string, button *widget.Button, buttonMessage *canvas.Text) {
|
||||
func (v View) getButtonSelectFile() (filePath *string, button *widget.Button, buttonMessage *canvas.Text) {
|
||||
path := ""
|
||||
filePath = &path
|
||||
|
||||
buttonMessage = canvas.NewText(path, color.RGBA{R: 49, G: 127, B: 114, A: 255})
|
||||
buttonMessage = canvas.NewText("", color.RGBA{255, 0, 0, 255})
|
||||
buttonMessage.TextSize = 16
|
||||
buttonMessage.TextStyle = fyne.TextStyle{Bold: true}
|
||||
|
||||
@ -122,3 +124,13 @@ func (v View) getButtonSelectFile(path string) (filePath *string, button *widget
|
||||
|
||||
return
|
||||
}
|
||||
|
||||
func setStringErrorStyle(text *canvas.Text) {
|
||||
text.Color = color.RGBA{255, 0, 0, 255}
|
||||
text.Refresh()
|
||||
}
|
||||
|
||||
func setStringSuccessStyle(text *canvas.Text) {
|
||||
text.Color = color.RGBA{49, 127, 114, 255}
|
||||
text.Refresh()
|
||||
}
|
||||
Loading…
Reference in New Issue
Block a user