feat: support png, jpg, jpeg, gif for icon auto-detection #509
+132
−161
refactor: extract icon resolution to internal/icon package
Consolidate duplicated icon path resolution logic from install.go and slack_yaml.go into a shared internal/icon package per review feedback.
- Loading branch information
commit c9abb3046b301ad85f67a9402bd11d3857ecb1a8
There are no files selected for viewing
This file contains hidden or 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 |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| // Copyright 2022-2026 Salesforce, Inc. | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| package icon | ||
|
|
||
| import ( | ||
| "path/filepath" | ||
|
|
||
| "github.com/spf13/afero" | ||
| ) | ||
|
|
||
| var SupportedExtensions = []string{".png", ".jpg", ".jpeg", ".gif"} | ||
|
|
||
| func ResolveIconPath(fs afero.Fs, manifestIcon string) string { | ||
| if manifestIcon != "" { | ||
| return manifestIcon | ||
| } | ||
| for _, dir := range []string{"assets", "."} { | ||
| for _, ext := range SupportedExtensions { | ||
| candidate := filepath.Join(dir, "icon"+ext) | ||
| if _, err := fs.Stat(candidate); err == nil { | ||
| return candidate | ||
| } | ||
| } | ||
| } | ||
| return "" | ||
| } | ||
This file contains hidden or 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 |
|---|---|---|
| @@ -0,0 +1,86 @@ | ||
| // Copyright 2022-2026 Salesforce, Inc. | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| package icon | ||
|
|
||
| import ( | ||
| "testing" | ||
|
|
||
| "github.com/spf13/afero" | ||
| "github.com/stretchr/testify/assert" | ||
| "github.com/stretchr/testify/require" | ||
| ) | ||
|
|
||
| func Test_ResolveIconPath(t *testing.T) { | ||
| tests := map[string]struct { | ||
| manifestIcon string | ||
| files []string | ||
| expected string | ||
| }{ | ||
| "manifest icon set returns it directly": { | ||
| manifestIcon: "custom/my-icon.png", | ||
| expected: "custom/my-icon.png", | ||
| }, | ||
|
Comment on lines
+31
to
+34
Member
There was a problem hiding this comment. 🧪 suggestion: Can we include a test that manifest icon is found before magic icons too? |
||
| "assets/icon.png found": { | ||
| files: []string{"assets/icon.png"}, | ||
| expected: "assets/icon.png", | ||
| }, | ||
| "assets/icon.jpg found": { | ||
| files: []string{"assets/icon.jpg"}, | ||
| expected: "assets/icon.jpg", | ||
| }, | ||
| "assets/icon.jpeg found": { | ||
| files: []string{"assets/icon.jpeg"}, | ||
| expected: "assets/icon.jpeg", | ||
| }, | ||
| "assets/icon.gif found": { | ||
| files: []string{"assets/icon.gif"}, | ||
| expected: "assets/icon.gif", | ||
| }, | ||
| "png wins over gif in assets": { | ||
| files: []string{"assets/icon.png", "assets/icon.gif"}, | ||
|
srtaalej marked this conversation as resolved.
Outdated
|
||
| expected: "assets/icon.png", | ||
| }, | ||
| "jpg wins over gif in assets": { | ||
| files: []string{"assets/icon.jpg", "assets/icon.gif"}, | ||
| expected: "assets/icon.jpg", | ||
| }, | ||
| "root icon.png found when no assets": { | ||
| files: []string{"icon.png"}, | ||
| expected: "icon.png", | ||
| }, | ||
| "root icon.jpg found when no assets": { | ||
| files: []string{"icon.jpg"}, | ||
| expected: "icon.jpg", | ||
| }, | ||
| "assets takes priority over root": { | ||
| files: []string{"assets/icon.gif", "icon.png"}, | ||
| expected: "assets/icon.gif", | ||
| }, | ||
| "no icon files returns empty": { | ||
| files: []string{}, | ||
| expected: "", | ||
| }, | ||
| } | ||
| for name, tc := range tests { | ||
| t.Run(name, func(t *testing.T) { | ||
| fs := afero.NewMemMapFs() | ||
| for _, f := range tc.files { | ||
| require.NoError(t, afero.WriteFile(fs, f, []byte("img"), 0o644)) | ||
| } | ||
| result := ResolveIconPath(fs, tc.manifestIcon) | ||
| assert.Equal(t, tc.expected, result) | ||
| }) | ||
| } | ||
| } | ||
This file contains hidden or 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 hidden or 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 hidden or 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 hidden or 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
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.
Uh oh!
There was an error while loading. Please reload this page.