Support reading .ico icon files if passed to packaging #3008
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||||
|---|---|---|---|---|---|---|---|---|
|
|
@@ -4,15 +4,17 @@ import ( | |||||||
| "errors" | ||||||||
| "flag" | ||||||||
| "fmt" | ||||||||
| "image" | ||||||||
| _ "image/jpeg" // import image encodings | ||||||||
| "image/png" // import image encodings | ||||||||
| "io/ioutil" | ||||||||
| "log" | ||||||||
| "os" | ||||||||
| "path/filepath" | ||||||||
| "strconv" | ||||||||
| "strings" | ||||||||
|
|
||||||||
| _ "github.com/biessek/golang-ico" // import image encodings | ||||||||
| "github.com/urfave/cli/v2" | ||||||||
| "golang.org/x/mod/modfile" | ||||||||
| "golang.org/x/mod/module" | ||||||||
|
|
@@ -347,6 +349,13 @@ func (p *Packager) validate() error { | |||||||
| if !util.Exists(p.icon) { | ||||||||
| return errors.New("Missing application icon at \"" + p.icon + "\"") | ||||||||
| } | ||||||||
| if strings.ToLower(filepath.Ext(p.icon)) != ".png" { | ||||||||
| tmp, err := normaliseIcon(p.icon) | ||||||||
| if err != nil { | ||||||||
| return err | ||||||||
| } | ||||||||
| p.icon = tmp | ||||||||
| } | ||||||||
|
|
||||||||
| p.appID, err = validateAppID(p.appID, p.os, p.name, p.release) | ||||||||
| if err != nil { | ||||||||
|
|
@@ -412,6 +421,35 @@ func mergeMetadata(p *appData, data *metadata.FyneApp) { | |||||||
| } | ||||||||
| } | ||||||||
|
|
||||||||
| // normaliseIcon takes a non-png image file and converts it to PNG for use in packaging. | ||||||||
| // Successful conversion will return a path to the new file. | ||||||||
| // Any errors that occur will be returned with an empty string for new path. | ||||||||
| func normaliseIcon(path string) (string, error) { | ||||||||
| // convert icon | ||||||||
| img, err := os.Open(path) | ||||||||
| if err != nil { | ||||||||
| return "", fmt.Errorf("failed to open source image: %w", err) | ||||||||
| } | ||||||||
| defer img.Close() | ||||||||
| srcImg, _, err := image.Decode(img) | ||||||||
| if err != nil { | ||||||||
| return "", fmt.Errorf("failed to decode source image: %w", err) | ||||||||
| } | ||||||||
|
|
||||||||
| tmpPath := filepath.Join(os.TempDir(), "fyne-ico-tmp.png") | ||||||||
| out, err := os.Create(tmpPath) | ||||||||
|
There was a problem hiding this comment. How about using ioutil.TempFile() instead?
Suggested change
There was a problem hiding this comment. I used that originally, but it's not in Go 1.14 There was a problem hiding this comment. Are you sure about that? It seems to exist in Go 1.14 if you look at this: https://pkg.go.dev/io/ioutil@go1.14#TempFile. The There was a problem hiding this comment. Oh good catch, I must have got the two confused sorry. |
||||||||
| if err != nil { | ||||||||
| return "", fmt.Errorf("failed to open image output file: %w", err) | ||||||||
| } | ||||||||
|
|
||||||||
| err = png.Encode(out, srcImg) | ||||||||
| if err != nil { | ||||||||
| return "", fmt.Errorf("failed to encode icon: %w", err) | ||||||||
|
There was a problem hiding this comment. The variable |
||||||||
| } | ||||||||
|
|
||||||||
| return tmpPath, out.Close() | ||||||||
| } | ||||||||
|
|
||||||||
| func validateAppID(appID, os, name string, release bool) (string, error) { | ||||||||
| // old darwin compatibility | ||||||||
| if os == "darwin" { | ||||||||
|
|
||||||||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file not shown.
Binary file not shown.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Would it be possible to remove the file once it is not necessary anymore?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is a good idea.
I don't think we have a hook for the processed completing at this time.
Can you think of a clean way to do that?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
doPackage use
defer p.removeBuild(files). Maybe make doPackage and validate return a[]stringof files that need to be cleaned and set a defer in the caller to those function?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We could create a folder in the temp directory using https://pkg.go.dev/io/ioutil#TempDir and save everything there when we create temporary files. We then simply make sure to remove the whole folder before exiting the command (we could probably even hook up the interup signal https://www.tutorialspoint.com/how-to-handle-signals-in-golang so that it removes it before exiting using ctrl+c).