Merge pull request 'Merge pull request 'update-develop' (#26) from update-develop into develop' (#27) from develop into master

Reviewed-on: #27

.gitea/workflows/build.yaml

@@ -1,51 +0,0 @@
-name: build and test
-on:
-  push:
-    branches:
-      - "master"
-      - "develop"
-
-jobs:
-  build:
-    name: artifact builds on linux and windows
-    env: 
-      RUNNER_TOOL_CACHE: /toolcache
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-      - uses: actions/setup-go@v5
-        with:
-          go-version-file: 'go.mod'
-      - name: setup-dependencies
-        run: |
-          apt-get update
-          apt-get install -y gcc-mingw-w64 gcc libgl1-mesa-dev xorg-dev
-
-      - name: build-linux
-        run: |
-          VERSION=${{github.ref_name}}
-          BUILD=${{github.run_number}}
-          GOOS=windows
-          GOARCH=amd64
-          GOFLAGS="-ldflags=-s -ldflags=-w"
-          CGO_ENABLED=1
-          CC=gcc
-          fyne package --appVersion=${VERSION} --appBuild=${BUILD} --exe bin/swiped-mod-switcher-$VERSION-linux-amd64 main.go
-
-      - name: build-windows
-        run: |
-          VERSION=${{github.ref_name}}
-          BUILD=${{github.run_number}}
-          GOOS=windows
-          GOARCH=amd64
-          GOFLAGS="-ldflags=-H=windowsgui -ldflags=-s -ldflags=-w"
-          CGO_ENABLED=1
-          CC=x86_64-w64-mingw32-gcc
-          fyne package --appVersion=${VERSION} --appBuild=${BUILD} --exe bin/swiped-mod-switcher-$VERSION-windows-amd64.exe main.go
-
-      - uses: actions/upload-artifact@v3
-        with:
-          name: swiped-mod-switcher-${{github.ref_name}}
-          path: bin/

.gitea/workflows/pr-validation.yaml

@@ -1,46 +0,0 @@
-name: pull request validation
-on:
-  pull_request:
-    branches:
-      - master
-      - develop
-
-jobs:
-  build:
-    name: build and run tests
-    env: 
-      RUNNER_TOOL_CACHE: /toolcache
-    runs-on: ubuntu-latest
-    steps: 
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-      - uses: actions/setup-go@v5
-        with:
-          go-version-file: 'go.mod'
-      - name: setup dependencies
-        run: |
-          apt-get update
-          apt-get install -y gcc-mingw-w64 gcc libgl1-mesa-dev xorg-dev
-      - name: build
-        run: |
-          VERSION=${{github.ref_name}}
-          BUILD=${{github.run_number}}
-          GOOS=linux
-          GOARCH=amd64
-          GOFLAGS="-ldflags=-s -ldflags=-w"
-          CGO_ENABLED=1
-          CC=gcc
-          fyne package --appVersion=${VERSION} --appBuild=${BUILD} --exe bin/swiped-mod-switcher-${VERSION}.${BUILD}-linux-amd64 main.go
-      - name: run tests
-        run: go test -v ./...
-      - name: Check Vet
-        run: go vet ./...
-      - name: check formatting
-        run: |-
-          gofmt -s -l .
-          if [ "$(gofmt -s -l . | wc -l)" -gt 0 ]; then exit 1; fi
-      - name: check lint
-        uses: golangci/golangci-lint-action@v3
-        with:
-          version: latest

.gitea/workflows/pull-request-ci.yaml

@@ -0,0 +1,124 @@
+name: CI
+on:
+  pull_request:
+
+jobs:
+  lint:
+    name: Lint
+    env: 
+      RUNNER_TOOL_CACHE: /toolcache
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Setup go
+        uses: actions/setup-go@v5
+        with:
+          go-version-file: 'go.mod'
+          check-latest: true
+          cache: true
+
+      - name: Setup OS dependencies
+        run: |
+          apt-get update
+          apt-get install -y gcc-mingw-w64 gcc libgl1-mesa-dev xorg-dev
+
+      - name: Install go dependencies
+        run: go mod tidy
+
+      - name: Lint
+        uses: golangci/golangci-lint-action@v3
+        with:
+          version: latest
+
+  test:
+    name: Test
+    env: 
+      RUNNER_TOOL_CACHE: /toolcache
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Set up go
+        uses: actions/setup-go@v5
+        with:
+          go-version-file: 'go.mod'
+          check-latest: true
+          cache: true
+
+      - name: Setup OS dependencies
+        run: |
+          apt-get update
+          apt-get install -y gcc-mingw-w64 gcc libgl1-mesa-dev xorg-dev
+
+      - name: Get fyne command
+        run: |
+          go install fyne.io/fyne/v2/cmd/fyne@latest
+
+      - name: Get go dependencies
+        run: |
+          go mod tidy
+
+      - name: Test
+        run: go test -race -v -shuffle=on ./...
+
+  build:
+    name: Build
+    env: 
+      RUNNER_TOOL_CACHE: /toolcache
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Set up go
+        uses: actions/setup-go@v5
+        with:
+          go-version-file: 'go.mod'
+          check-latest: true
+          cache: true
+
+      - name: Setup OS dependencies
+        run: |
+          apt-get update
+          apt-get install -y gcc-mingw-w64 gcc libgl1-mesa-dev xorg-dev
+
+      - name: Get fyne command
+        run: |
+          go install fyne.io/fyne/v2/cmd/fyne@latest
+
+      - name: Get go dependencies
+        run: |
+          go mod tidy
+
+      - name: Build for linux
+        run: |
+          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}}
+          GOOS: linux
+          GOARCH: amd64
+          EXE: ""
+          CGO_ENABLED: 1
+          CC: gcc
+
+      - name: Build for windows
+        run: |
+          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}}
+          GOOS: windows
+          GOARCH: amd64
+          EXE: ".exe"
+          CGO_ENABLED: 1
+          CC: x86_64-w64-mingw32-gcc
+
+      - name: Upload artifact
+        uses: actions/upload-artifact@v3
+        with:
+          name: swiped-mod-switcher-${{github.ref_name}}-${{github.run_number}}
+          path: bin/

.gitea/workflows/push-ci.yaml

@@ -0,0 +1,125 @@
+name: CI
+on:
+  push:
+    branches: [master, develop]
+
+jobs:
+  lint:
+    name: Lint
+    env:
+      RUNNER_TOOL_CACHE: /toolcache
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Setup go
+        uses: actions/setup-go@v5
+        with:
+          go-version-file: 'go.mod'
+          check-latest: true
+          cache: true
+
+      - name: Setup OS dependencies
+        run: |
+          apt-get update
+          apt-get install -y gcc-mingw-w64 gcc libgl1-mesa-dev xorg-dev
+
+      - name: Install go dependencies
+        run: go mod tidy
+
+      - name: Lint
+        uses: golangci/golangci-lint-action@v3
+        with:
+          version: latest
+
+  test:
+    name: Test
+    env: 
+      RUNNER_TOOL_CACHE: /toolcache
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Set up go
+        uses: actions/setup-go@v5
+        with:
+          go-version-file: 'go.mod'
+          check-latest: true
+          cache: true
+
+      - name: Setup OS dependencies
+        run: |
+          apt-get update
+          apt-get install -y gcc-mingw-w64 gcc libgl1-mesa-dev xorg-dev
+
+      - name: Get fyne command
+        run: |
+          go install fyne.io/fyne/v2/cmd/fyne@latest
+
+      - name: Get go dependencies
+        run: |
+          go mod tidy
+
+      - name: Test
+        run: go test -race -v -shuffle=on ./...
+
+  build:
+    name: Build
+    env: 
+      RUNNER_TOOL_CACHE: /toolcache
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Set up go
+        uses: actions/setup-go@v5
+        with:
+          go-version-file: 'go.mod'
+          check-latest: true
+          cache: true
+
+      - name: Setup OS dependencies
+        run: |
+          apt-get update
+          apt-get install -y gcc-mingw-w64 gcc libgl1-mesa-dev xorg-dev
+
+      - name: Get fyne command
+        run: |
+          go install fyne.io/fyne/v2/cmd/fyne@latest
+
+      - name: Get go dependencies
+        run: |
+          go mod tidy
+
+      - name: Build for linux
+        run: |
+          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}}
+          BUILD: ${{github.run_number}}
+          GOOS: linux
+          GOARCH: amd64
+          CGO_ENABLED: 1
+          CC: gcc
+
+      - name: Build for windows
+        run: |
+          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}}
+          BUILD: ${{github.run_number}}
+          GOOS: windows
+          GOARCH: amd64
+          CGO_ENABLED: 1
+          CC: x86_64-w64-mingw32-gcc
+
+      - name: Upload artifact
+        uses: actions/upload-artifact@v3
+        with:
+          name: swiped-mod-switcher-${{github.ref_name}}-${{github.run_number}}
+          path: bin/

.gitea/workflows/release-tag.yaml

@@ -1,49 +0,0 @@
-name: release-tag
-on:
-  push:
-    tags:
-      - 'v*'
-
-jobs:
-  release:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-      - uses: actions/setup-go@v5
-        with:
-          go-version-file: 'go.mod'
-      - name: setup-dependencies
-        run: |
-          apt-get update
-          apt-get install -y gcc-mingw-w64 gcc libgl1-mesa-dev xorg-dev
-
-      - name: build-linux
-        run: |
-          VERSION=${{github.ref_name}}
-          BUILD=${{github.run_number}}
-          GOOS=linux
-          GOARCH=amd64
-          GOFLAGS="-ldflags=-s -ldflags=-w"
-          CGO_ENABLED=1
-          CC=gcc
-          fyne package --appVersion=${VERSION} --appBuild=${BUILD} --exe bin/sw1ped-mod-switcher-${VERSION#v}.${BUILD}-linux-amd64 main.go
-
-      - name: build-windows
-        run: |
-          VERSION=${{github.ref_name}}
-          BUILD=${{github.run_number}}
-          GOOS=windows
-          GOARCH=amd64
-          GOFLAGS="-ldflags=-H=windowsgui -ldflags=-s -ldflags=-w"
-          CGO_ENABLED=1
-          CC=x86_64-w64-mingw32-gcc
-          fyne package --appVersion=${VERSION} --appBuild=${BUILD} --exe bin/sw1ped-mod-switcher-${VERSION#v}.${BUILD}-windows-amd64.exe main.go
-
-      - name: add-release-binaries
-        uses: https://gitea.com/actions/release-action@main
-        with:
-          files: |-
-            bin/**            
-          api_key: '${{secrets.RELEASE_TOKEN}}'

.gitea/workflows/tag-release.yaml

@@ -0,0 +1,122 @@
+name: Release versioned tag
+on:
+  push:
+    tags:
+      - 'v*'
+
+jobs:
+  lint:
+    name: Lint
+    env: 
+      RUNNER_TOOL_CACHE: /toolcache
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Setup go
+        uses: actions/setup-go@v5
+        with:
+          go-version-file: 'go.mod'
+          check-latest: true
+          cache: true
+
+      - name: Setup OS dependencies
+        run: |
+          apt-get update
+          apt-get install -y gcc-mingw-w64 gcc libgl1-mesa-dev xorg-dev
+
+      - name: Install go dependencies
+        run: go mod tidy
+
+      - name: Lint
+        uses: golangci/golangci-lint-action@v3
+        with:
+          version: latest
+
+  test:
+    name: Test
+    env: 
+      RUNNER_TOOL_CACHE: /toolcache
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Set up go
+        uses: actions/setup-go@v5
+        with:
+          go-version-file: 'go.mod'
+          check-latest: true
+          cache: true
+
+      - name: Setup OS dependencies
+        run: |
+          apt-get update
+          apt-get install -y gcc-mingw-w64 gcc libgl1-mesa-dev xorg-dev
+
+      - name: Get fyne command
+        run: |
+          go install fyne.io/fyne/v2/cmd/fyne@latest
+
+      - name: Get go dependencies
+        run: |
+          go mod tidy
+
+      - name: Test
+        run: go test -race -v -shuffle=on ./...
+
+  release:
+    name: Build versioned release
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      
+      - name: Setup go
+        uses: actions/setup-go@v5
+        with:
+          go-version-file: 'go.mod'
+      
+      - name: Setup OS dependencies
+        run: |
+          apt-get update
+          apt-get install -y gcc-mingw-w64 gcc libgl1-mesa-dev xorg-dev
+
+      - name: Install fyne command
+        run: |
+          go install fyne.io/fyne/v2/cmd/fyne@latest
+
+      - name: Install go dependencies
+        run: go mod tidy
+
+      - name: Build for linux
+        run: |
+          fyne build --release --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}}
+          GOOS: linux
+          GOARCH: amd64
+          EXE: ""
+          CGO_ENABLED: 1
+          CC: gcc
+
+      - name: Build for windows
+        run: |
+          fyne build --release --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}}
+          GOOS: windows
+          GOARCH: amd64
+          EXE: ".exe"
+          CGO_ENABLED: 1
+          CC: x86_64-w64-mingw32-gcc
+
+      - name: Release binaries
+        uses: https://gitea.com/actions/release-action@main
+        with:
+          files: |-
+            bin/**
+          api_key: '${{secrets.RELEASE_TOKEN}}'

FyneApp.toml

@@ -1,6 +1,4 @@
 [Details]
-Icon = "icon.png"
-Name = "Swiped Mod Switcher"
-ID = "com.s1d3sw1ped.swipedmodswitcher"
-Version = "untracked"
-Build = 1
+  Icon = "icon.png"
+  Name = "Swiped Mod Switcher"
+  ID = "com.s1d3sw1ped.swipedmodswitcher"

main.go

@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"os"
 	"path/filepath"
+	"runtime/debug"
 	"s1d3sw1ped/swipedmodswitcher/admin"
 	"slices"
-	"strconv"
 	"strings"
 
 	"fyne.io/fyne/v2"
@@ -61,16 +61,42 @@ var cfg *Config
 
 func main() {
 	if !admin.Admin() {
+		fmt.Println("not running as administrator relaunching")
 		if err := admin.RunSelfElevated(); err != nil {
 			panic(err)
 		}
 		os.Exit(0)
+		return // just incase
 	}
 
 	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()
 
@@ -136,10 +162,14 @@ func fillGrid(grid *fyne.Container, parent fyne.Window) {
 	grid.Hide()
 	defer grid.Show()
 	grid.RemoveAll()
+	if admin.Admin() {
 		for _, profile := range profiles {
 			profilename := filepath.Base(profile)
 			grid.Add(widget.NewButton(profilename, makeIFunc(profile, archive, parent)))
 		}
+	} else {
+		grid.Add(widget.NewLabel("not running as administrator"))
+	}
 }
 
 func scanProfiles(profilesroot string) []string {
@@ -181,6 +211,6 @@ func makeIFunc(profile, archive string, parent fyne.Window) func() {
 			return
 		}
 
-		dialog.NewInformation("Success", fmt.Sprintf("filinked files from %s to %s", filepath.Base(profile), archive), parent).Show()
+		dialog.NewInformation("Success", fmt.Sprintf("linked files from %s to %s", filepath.Base(profile), archive), parent).Show()
 	}
 }