Skip to content

Commit

Permalink
XML Encode the windows XML data
Browse files Browse the repository at this point in the history
  • Loading branch information
andydotxyz committed Mar 12, 2023
1 parent 79e5ad2 commit b1690af
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 4 deletions.
7 changes: 7 additions & 0 deletions cmd/fyne/internal/commands/encode.go
@@ -0,0 +1,7 @@
package commands

import "strings"

func encodeXMLString(in string) string {
return strings.ReplaceAll(in, "&", "&")
}
14 changes: 14 additions & 0 deletions cmd/fyne/internal/commands/encode_test.go
@@ -0,0 +1,14 @@
package commands

import (
"testing"

"github.com/stretchr/testify/assert"
)

func TestEncodeXMLString(t *testing.T) {
assert.Equal(t, "", encodeXMLString(""))
assert.Equal(t, "Hello", encodeXMLString("Hello"))
assert.Equal(t, "Hi & bye", encodeXMLString("Hi & bye"))
assert.Equal(t, "Hi & bye", encodeXMLString("Hi & bye"))
}
2 changes: 1 addition & 1 deletion cmd/fyne/internal/commands/package-windows.go
Expand Up @@ -59,7 +59,7 @@ func (p *Packager) packageWindows(tags []string) error {
manifestFile, _ := os.Create(manifest)

tplData := windowsData{
Name: p.Name,
Name: encodeXMLString(p.Name),
CombinedVersion: p.combinedVersion(),
}
err := templates.ManifestWindows.Execute(manifestFile, tplData)
Expand Down
6 changes: 3 additions & 3 deletions cmd/fyne/internal/commands/release.go
Expand Up @@ -346,9 +346,9 @@ func (r *Releaser) packageWindowsRelease(outFile string) error {
manifestData := struct{ AppID, Developer, DeveloperName, Name, Version string }{
AppID: r.AppID,
// TODO read this info
Developer: r.developer,
DeveloperName: r.nameFromCertInfo(r.developer),
Name: r.Name,
Developer: encodeXMLString(r.developer),
DeveloperName: encodeXMLString(r.nameFromCertInfo(r.developer)),
Name: encodeXMLString(r.Name),
Version: r.combinedVersion(),
}
err = templates.AppxManifestWindows.Execute(manifest, manifestData)
Expand Down

0 comments on commit b1690af

Please sign in to comment.