fyne metadata sucks so jst custom stuff
All checks were successful
CI / Test (pull_request) Successful in 1m17s
CI / Lint (pull_request) Successful in 1m58s
CI / Build (pull_request) Successful in 2m36s

This commit is contained in:
2024-05-20 01:37:58 -05:00
parent 1f09482950
commit 83cb34001f
4 changed files with 32 additions and 8 deletions

View File

@@ -95,7 +95,7 @@ jobs:
- name: Build for linux
run: |
fyne build --os=${GOOS} --metadata Build=${BUILD} -o bin/swiped-mod-switcher-${VERSION#v}.${BUILD}-${GOOS}-${GOARCH}
fyne build --os=${GOOS} --metadata BuildVersion=${VERSION} --metadata BuildNumber=${BUILD} -o bin/swiped-mod-switcher-${VERSION}.${BUILD}-${GOOS}-${GOARCH}
env:
VERSION: ${{github.ref_name}}
BUILD: ${{github.run_number}}
@@ -107,7 +107,7 @@ jobs:
- name: Build for windows
run: |
fyne build --os=${GOOS} --metadata Build=${BUILD} -o bin/swiped-mod-switcher-${VERSION#v}.${BUILD}-${GOOS}-${GOARCH}.exe
fyne build --os=${GOOS} --metadata BuildVersion=${VERSION} --metadata BuildNumber=${BUILD} -o bin/swiped-mod-switcher-${VERSION}.${BUILD}-${GOOS}-${GOARCH}.exe
env:
VERSION: ${{github.ref_name}}
BUILD: ${{github.run_number}}

View File

@@ -91,7 +91,7 @@ jobs:
- name: Build for linux
run: |
fyne build --os=${GOOS} --metadata Build=${BUILD} -o bin/swiped-mod-switcher-${VERSION#v}.${BUILD}-${GOOS}-${GOARCH}
fyne build --os=${GOOS} --metadata BuildVersion=${VERSION} --metadata BuildNumber=${BUILD} -o bin/swiped-mod-switcher-${VERSION}.${BUILD}-${GOOS}-${GOARCH}
ls bin
env:
VERSION: ${{github.ref_name}}
@@ -103,7 +103,7 @@ jobs:
- name: Build for windows
run: |
fyne build --os=${GOOS} --metadata Build=${BUILD} -o bin/swiped-mod-switcher-${VERSION#v}.${BUILD}-${GOOS}-${GOARCH}.exe
fyne build --os=${GOOS} --metadata BuildVersion=${VERSION} --metadata BuildNumber=${BUILD} -o bin/swiped-mod-switcher-${VERSION}.${BUILD}-${GOOS}-${GOARCH}.exe
ls bin
env:
VERSION: ${{github.ref_name}}

View File

@@ -87,7 +87,7 @@ jobs:
- name: Build for linux
run: |
fyne build --os=${GOOS} --metadata Build=${BUILD} -o bin/swiped-mod-switcher-${VERSION#v}.${BUILD}-${GOOS}-${GOARCH}
fyne build --os=${GOOS} --metadata BuildVersion=${VERSION} --metadata BuildNumber=${BUILD} -o bin/swiped-mod-switcher-${VERSION#v}.${BUILD}-${GOOS}-${GOARCH}
env:
VERSION: ${{github.ref_name}}
BUILD: ${{github.run_number}}
@@ -99,7 +99,7 @@ jobs:
- name: Build for windows
run: |
fyne build --os=${GOOS} --metadata Build=${BUILD} -o bin/swiped-mod-switcher-${VERSION#v}.${BUILD}-${GOOS}-${GOARCH}.exe
fyne build --os=${GOOS} --metadata BuildVersion=${VERSION} --metadata BuildNumber=${BUILD} -o bin/swiped-mod-switcher-${VERSION#v}.${BUILD}-${GOOS}-${GOARCH}.exe
env:
VERSION: ${{github.ref_name}}
BUILD: ${{github.run_number}}

28
main.go
View File

@@ -4,9 +4,9 @@ import (
"fmt"
"os"
"path/filepath"
"runtime/debug"
"s1d3sw1ped/swipedmodswitcher/admin"
"slices"
"strconv"
"strings"
"fyne.io/fyne/v2"
@@ -72,7 +72,31 @@ func main() {
cfg = loadConfig()
ap := app.New()
wp := ap.NewWindow(ap.Metadata().Name + " v" + ap.Metadata().Version + "." + strconv.Itoa(ap.Metadata().Build))
commithash := func() string {
if info, ok := debug.ReadBuildInfo(); ok {
for _, setting := range info.Settings {
if setting.Key == "vcs.revision" {
return setting.Value
}
}
}
return ""
}()
buildversion := ap.Metadata().Custom["BuildVersion"]
if buildversion == "" {
buildversion = ""
}
buildnumber := ap.Metadata().Custom["BuildNumber"]
if buildnumber == "" {
buildnumber = "commit " + commithash
} else {
buildnumber = "build " + buildnumber
}
wp := ap.NewWindow(ap.Metadata().Name + " " + buildversion + " " + buildnumber)
wp.Resize(fyne.NewSize(600, 1))
wp.CenterOnScreen()