{snap,wrappers}: improve desktop file to snap app matching #14503
Conversation
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 allows associating a desktop file with a specific snap app easily. Signed-off-by: Zeyad Gouda <zeyad.gouda@canonical.com>
Now that desktop-file-ids are supported, the simple "$PREFIX_$APP.desktop" heuristic when looking up snap app's desktop file won't cut it. Instead, Loop through desktop-file-ids desktop interface plug attribute in order to have deterministic output and return the first matching desktop file found if X-SnapAppName entry matches the app name and fallback to the simple heuristic if no matches are found. Signed-off-by: Zeyad Gouda <zeyad.gouda@canonical.com>
ZeyadYasser
added
the
Needs Samuele review
pedronis
reviewed
Sep 16, 2024
snap/info.go
Outdated
| @@ -1422,9 +1423,48 @@ func (app *AppInfo) SecurityTag() string { | |||
| return AppSecurityTag(app.Snap.InstanceName(), app.Name) | |||
| } | |||
|
|
|||
| func snapAppNameFromDesktopFile(desktopFile string) (string, error) { | |||
There was a problem hiding this comment.
shouldn't we use code from desktopentry for this?
There was a problem hiding this comment.
Moved parsing to desktopentry, Thanks!
ZeyadYasser
force-pushed
the
improve-desktop-file-app-matching
branch
from
7c6f13f
to
f4d4863
Compare
…sktopentry package desktopentry can now parse X-SnapInstanceName and X-SnapAppName Signed-off-by: Zeyad Gouda <zeyad.gouda@canonical.com>
ZeyadYasser
force-pushed
the
improve-desktop-file-app-matching
branch
from
f4d4863
to
ee90032
Compare
Yes, desktop files are generated when snapd starts snapd/overlord/snapstate/snapmgr.go Line 1600 in f48133c |
Signed-off-by: Zeyad Gouda <zeyad.gouda@canonical.com>
ZeyadYasser
force-pushed
the
improve-desktop-file-app-matching
branch
from
2d960f0
to
84441c0
Compare
Signed-off-by: Zeyad Gouda <zeyad.gouda@canonical.com>
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## master #14503 +/- ##
==========================================
+ Coverage 78.77% 78.83% +0.05%
==========================================
Files 1073 1078 +5
Lines 143693 145210 +1517
==========================================
+ Hits 113191 114473 +1282
- Misses 23401 23568 +167
- Partials 7101 7169 +68
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Now that
desktop-file-idsare supported, the simple$PREFIX_$APP.desktopheuristic when looking up snap app's desktop file won't cut it.Instead, Loop through
desktop-file-idsdesktop interface plug attribute in order to have deterministic output and return the first matching desktop file found if (the newly added)X-SnapAppNameentry matches the app name and fallback to the simple heuristic if no matches are found.This follows the SD170 - Custom desktop file IDs for snaps spec.