daemon: look for snap icon in icons directory as fallback

If a snap doesn't ship an icon in `meta/gui/icon.*`, then look for an icon for the snap in question in the snap icons install directory. Signed-off-by: Oliver Calder <[email protected]>
canonical · Feb 5, 2025 · 8d41659 · 8d41659
1 parent 0cd5115
commit 8d41659
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 8 deletions.
diff --git a/daemon/api_icons.go b/daemon/api_icons.go
@@ -61,7 +61,7 @@ func iconGet(st *state.State, name string) Response {
 		return NotFound("snap has no current revision")
 	}
 
-	icon := snapIcon(snap.MinimalPlaceInfo(name, sideInfo.Revision))
+	icon := snapIcon(snap.MinimalPlaceInfo(name, sideInfo.Revision), sideInfo.SnapID)
 
 	if icon == "" {
 		return NotFound("local snap has no icon")

diff --git a/daemon/api_icons_test.go b/daemon/api_icons_test.go
@@ -112,6 +112,6 @@ func (s *iconsSuite) TestAppIconGetNoApp(c *check.C) {
 
 func (s *iconsSuite) TestNotInstalledSnapIcon(c *check.C) {
 	info := &snap.Info{SuggestedName: "notInstalledSnap", Media: []snap.MediaInfo{{Type: "icon", URL: "icon.svg"}}}
-	iconfile := daemon.SnapIcon(info)
+	iconfile := daemon.SnapIcon(info, "notInstalledSnapID")
 	c.Check(iconfile, check.Equals, "")
 }
diff --git a/daemon/snap.go b/daemon/snap.go
@@ -30,6 +30,7 @@ import (
 	"github.com/snapcore/snapd/client"
 	"github.com/snapcore/snapd/client/clientutil"
 	"github.com/snapcore/snapd/logger"
+	"github.com/snapcore/snapd/osutil"
 	"github.com/snapcore/snapd/overlord/assertstate"
 	"github.com/snapcore/snapd/overlord/healthstate"
 	"github.com/snapcore/snapd/overlord/snapstate"
@@ -241,7 +242,7 @@ func mapLocal(about aboutSnap, sd clientutil.StatusDecorator) *client.Snap {
 	}
 	result.InstalledSize = localSnap.Size
 
-	if icon := snapIcon(localSnap); icon != "" {
+	if icon := snapIcon(localSnap, localSnap.SnapID); icon != "" {
 		result.Icon = icon
 	}
 
@@ -339,12 +340,21 @@ func fillComponentInfo(about aboutSnap) []client.Component {
 	return comps
 }
 
-// snapIcon tries to find the icon inside the snap
-func snapIcon(info snap.PlaceInfo) string {
+// snapIcon tries to find the icon inside the snap at meta/gui/icon.*, and if
+// the snap does not ship an icon there, then tries to find the fallback icon
+// in the icons install directory.
+func snapIcon(info snap.PlaceInfo, snapID string) string {
+	// Look in the snap itself
 	found, _ := filepath.Glob(filepath.Join(info.MountDir(), "meta", "gui", "icon.*"))
-	if len(found) == 0 {
-		return ""
+	if len(found) > 0 {
+		return found[0]
 	}
 
-	return found[0]
+	// Look in the snap icons directory as a fallback
+	if fallback := snapstate.IconInstallFilename(snapID); fallback != "" && osutil.FileExists(fallback) {
+		return fallback
+	}
+
+	// Didn't find an icon
+	return ""
 }