Merge pull request fyne-io#4715 from andydotxyz/fix/4688

Read from FyneApp.toml when developing with go tools

app/app_goxjs.go

@@ -6,7 +6,7 @@ import (
 	"fyne.io/fyne/v2"
 )
 
-func (app *fyneApp) SendNotification(_ *fyne.Notification) {
+func (a *fyneApp) SendNotification(_ *fyne.Notification) {
 	// TODO #2735
 	fyne.LogError("Sending notification is not supported yet.", nil)
 }

app/app_openurl_wasm.go

@@ -8,7 +8,7 @@ import (
 	"syscall/js"
 )
 
-func (app *fyneApp) OpenURL(url *url.URL) error {
+func (a *fyneApp) OpenURL(url *url.URL) error {
 	window := js.Global().Call("open", url.String(), "_blank", "")
 	if window.Equal(js.Null()) {
 		return fmt.Errorf("Unable to open a new window/tab for URL: %v.", url)

app/app_openurl_web.go

@@ -7,6 +7,6 @@ import (
 	"net/url"
 )
 
-func (app *fyneApp) OpenURL(url *url.URL) error {
+func (a *fyneApp) OpenURL(url *url.URL) error {
 	return errors.New("OpenURL is not supported with the test web driver.")
 }

app/meta.go

@@ -24,5 +24,9 @@ func SetMetadata(m fyne.AppMetadata) {
 }
 
 func (a *fyneApp) Metadata() fyne.AppMetadata {
+	if meta.ID == "" && meta.Name == "" {
+		checkLocalMetadata()
+	}
+
 	return meta
 }

app/meta_development.go

@@ -0,0 +1,64 @@
+package app
+
+import (
+	"os"
+	"path/filepath"
+	"strings"
+
+	"fyne.io/fyne/v2"
+	"fyne.io/fyne/v2/internal/build"
+	"fyne.io/fyne/v2/internal/metadata"
+)
+
+func checkLocalMetadata() {
+	if build.NoMetadata || build.Mode == fyne.BuildRelease {
+		return
+	}
+
+	dir := getProjectPath()
+	file := filepath.Join(dir, "FyneApp.toml")
+	ref, err := os.Open(file)
+	if err != nil { // no worries, this is just an optional fallback
+		return
+	}
+	defer ref.Close()
+
+	data, err := metadata.Load(ref)
+	if err != nil || data == nil {
+		fyne.LogError("failed to parse FyneApp.toml", err)
+		return
+	}
+
+	meta.ID = data.Details.ID
+	meta.Name = data.Details.Name
+	meta.Version = data.Details.Version
+	meta.Build = data.Details.Build
+
+	if data.Details.Icon != "" {
+		res, err := fyne.LoadResourceFromPath(data.Details.Icon)
+		if err == nil {
+			meta.Icon = res
+		}
+	}
+
+	meta.Release = false
+	meta.Custom = data.Development
+}
+
+func getProjectPath() string {
+	exe, err := os.Executable()
+	work, _ := os.Getwd()
+
+	if err != nil {
+		fyne.LogError("failed to lookup build executable", err)
+		return work
+	}
+
+	temp := os.TempDir()
+	if strings.Contains(exe, temp) { // this happens with "go run"
+		return work
+	}
+
+	// we were called with an executable from "go build"
+	return filepath.Dir(exe)
+}

cmd/fyne/internal/commands/build.go

@@ -13,8 +13,8 @@ import (
 	"github.com/urfave/cli/v2"
 
 	"fyne.io/fyne/v2"
-	"fyne.io/fyne/v2/cmd/fyne/internal/metadata"
 	"fyne.io/fyne/v2/cmd/fyne/internal/templates"
+	"fyne.io/fyne/v2/internal/metadata"
 )
 
 // Builder generate the executables.

cmd/fyne/internal/commands/data.go

@@ -1,6 +1,6 @@
 package commands
 
-import "fyne.io/fyne/v2/cmd/fyne/internal/metadata"
+import "fyne.io/fyne/v2/internal/metadata"
 
 type appData struct {
 	icon, Name        string

cmd/fyne/internal/commands/package-unix.go

@@ -7,8 +7,8 @@ import (
 	"path/filepath"
 	"strings"
 
-	"fyne.io/fyne/v2/cmd/fyne/internal/metadata"
 	"fyne.io/fyne/v2/cmd/fyne/internal/templates"
+	"fyne.io/fyne/v2/internal/metadata"
 
 	"golang.org/x/sys/execabs"
 )

cmd/fyne/internal/commands/package.go

@@ -21,7 +21,7 @@ import (
 
 	"fyne.io/fyne/v2"
 
-	"fyne.io/fyne/v2/cmd/fyne/internal/metadata"
+	"fyne.io/fyne/v2/internal/metadata"
 )
 
 const (

cmd/fyne/internal/commands/package_test.go

@@ -10,7 +10,7 @@ import (
 	"github.com/josephspurrier/goversioninfo"
 	"github.com/stretchr/testify/assert"
 
-	"fyne.io/fyne/v2/cmd/fyne/internal/metadata"
+	"fyne.io/fyne/v2/internal/metadata"
 )
 
 func Test_calculateExeName(t *testing.T) {

internal/build/metadata.go

@@ -0,0 +1,6 @@
+//go:build !no_metadata
+
+package build
+
+// NoMetadata is false if the compiler flags have not turned off metadata support.
+const NoMetadata = false

internal/build/metadata_disabled.go

@@ -0,0 +1,6 @@
+//go:build no_metadata
+
+package build
+
+// NoMetadata is true if the compiler flags have turned off metadata support.
+const NoMetadata = true