desktop: stop renaming desktop file by soumyaDghosh · Pull Request #5150 · canonical/snapcraft

soumyaDghosh · 2024-11-22T19:03:21Z

With snapd 2.66, it supports custom desktop file names. This patch allows it to happen from snapcraft side.

Have you followed the guidelines for contributing?
Have you signed the CLA?
Have you successfully run tox run -m lint?
Have you successfully run tox run -e test-py310? (supported versions: py39, py310, py311, py312)

mr-cal

Do you know what effect this will have when running a snap on a system with snapd<2.66?

soumyaDghosh · 2024-11-22T21:04:58Z

Do you know what effect this will have when running a snap on a system with snapd<2.66?

As I tested before, snapd will install the file with a <snap_name>, which snapd will do here also if the desktop file names aren't explicitly mentioned before hand. It was never really an issue to fix with.

soumyaDghosh · 2024-11-22T21:14:02Z

I think I'll need to fix the spread tests too.

codecov · 2024-11-22T21:59:57Z

Codecov Report

All modified and coverable lines are covered by tests ✅

Please upload report for BASE (feature/desktop-files@c7d11ac). Learn more about missing BASE report.

Additional details and impacted files

@@                   Coverage Diff                    @@
##             feature/desktop-files    #5150   +/-   ##
========================================================
  Coverage                         ?   89.71%           
========================================================
  Files                            ?      342           
  Lines                            ?    22641           
  Branches                         ?        0           
========================================================
  Hits                             ?    20312           
  Misses                           ?     2329           
  Partials                         ?        0

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚨 Try these New Features:

Flaky Tests Detection - Detect and resolve failed and flaky tests
JS Bundle Analysis - Avoid shipping oversized bundles

mr-cal

After discussing during the Starcraft clinic, this should be a safe change to make. The only environment that wouldn't locate these new files is unity 8.

Approving to land in a feature branch so it can be published and tested before landing on main. Landing on main will require a new PR and approvals.

tigarmo · 2024-11-27T11:04:22Z

snapcraft/parts/desktop_file.py

-        target = gui_dir / f"{self._app_name}.desktop"
+        desktop_filename = os.path.basename(self._filename)
+
+        # Stop renaming the desktop file. From snapd 2.66 onwards,


this comment is very good, but I think we should drop the first sentence - it's awkward and potentially confusing to refer to something the code no longer does

tigarmo · 2024-11-27T11:06:42Z

snapcraft/parts/desktop_file.py

+        # in the format of {SNAP_NAME}_{APP_NAME}.desktop
+        # https://snapcraft.io/docs/desktop-interface
+        target = gui_dir / desktop_filename
+        if not (desktop_filename.endswith(".desktop")):


you can replace this code with a with_suffix(".desktop") call

>>> Path("file").with_suffix(".desktop") PosixPath('file.desktop') >>> Path("file.desktop").with_suffix(".desktop") PosixPath('file.desktop')

tigarmo · 2024-11-27T11:06:54Z

tests/conftest.py

+
+    prime_dir = Path(f"{new_dir}/meta/gui")
+
+    yield prime_dir


Suggested change

yield prime_dir

return prime_dir

soumyaDghosh · 2024-12-09T15:13:23Z

This PR has a blocker

snap store frontend still doesn't understand the desktop-file-ids attribute

Signed-off-by: Callahan Kovacs <callahan.kovacs@canonical.com>

Signed-off-by: Callahan <callahan.kovacs@canonical.com> Co-authored-by: Claudio Matsuoka <claudio.matsuoka@canonical.com> Co-authored-by: Callahan <callahan.kovacs@canonical.com>

Signed-off-by: Callahan Kovacs <callahan.kovacs@canonical.com>

Signed-off-by: Sergio Schvezov <sergio.schvezov@canonical.com>

Signed-off-by: Callahan Kovacs <callahan.kovacs@canonical.com>

* docs: update CONTRIBUTING.md * docs: remove HACKING.md * docs: clean up conf.py --------- Signed-off-by: JJ Coldiron <jj.coldiron@canonical.com>

Move its pages to the root of how-to collection.

Co-authored-by: Callahan <callahan.kovacs@canonical.com>

Signed-off-by: Callahan Kovacs <callahan.kovacs@canonical.com>

Signed-off-by: Claudio Matsuoka <claudio.matsuoka@canonical.com> Co-authored-by: Callahan <callahan.kovacs@canonical.com>

Signed-off-by: Callahan Kovacs <callahan.kovacs@canonical.com>

Co-authored-by: Imani Pelton <imani.pelton@canonical.com>

Signed-off-by: Callahan Kovacs <callahan.kovacs@canonical.com> Co-authored-by: Michael DuBelko <michael.dubelko@canonical.com>

Using `--all-files` for pre-commit format affects more files than `make format` would otherwise do. Signed-off-by: Alex Lowe <alex.lowe@canonical.com>

Signed-off-by: Benjamin Schimke <benjamin.schimke@canonical.com>

Signed-off-by: Claudio Matsuoka <claudio.matsuoka@canonical.com>

Signed-off-by: Paul Mars <paul.mars@canonical.com>

Signed-off-by: Callahan Kovacs <callahan.kovacs@canonical.com>

Fixes canonical#5600

Signed-off-by: Callahan Kovacs <callahan.kovacs@canonical.com>

Merges 8.10.2 into main.

mr-cal · 2025-07-17T19:51:51Z

snap store frontend still doesn't understand the desktop-file-ids attribute

Apparently this has been fixed it review-tools, we'll need to find the commit to verify.

With snapd 2.66, it supports custom desktop file names. This patch allows it to happen from snapcraft side.

soumyaDghosh force-pushed the stop-rename-desktop-file branch from dffe5e6 to af19add Compare November 22, 2024 19:33

mr-cal reviewed Nov 22, 2024

View reviewed changes

soumyaDghosh force-pushed the stop-rename-desktop-file branch from af19add to 32dea06 Compare November 22, 2024 21:38

soumyaDghosh force-pushed the stop-rename-desktop-file branch 3 times, most recently from 2883282 to 99f4e85 Compare November 23, 2024 05:23

soumyaDghosh requested a review from mr-cal November 23, 2024 05:27

mr-cal changed the base branch from main to feature/desktop-files November 25, 2024 15:44

mr-cal approved these changes Nov 25, 2024

View reviewed changes

mr-cal requested a review from a team November 25, 2024 15:48

tigarmo approved these changes Nov 27, 2024

View reviewed changes

mr-cal and others added 5 commits April 1, 2025 12:55

build(deps): refresh uv.lock

ca3adf0

Signed-off-by: Callahan Kovacs <callahan.kovacs@canonical.com>

chore(merge): starbase/main into work/starbase

2c6ca53

chore(merge): starbase into main (canonical#5364)

c5461c5

feat: add 'test' command (canonical#5366)

89b9467

docs(release-notes): add 8.8 release notes (canonical#5365)

5a1bcec

Signed-off-by: Callahan Kovacs <callahan.kovacs@canonical.com>

soumyaDghosh mentioned this pull request Apr 4, 2025

snap: patch desktop file name snapcrafters/discord#270

Merged

st3v3nmw and others added 9 commits April 7, 2025 07:36

feat: rename confdbs to confdb-schema (canonical#5356)

de5ab3e

Signed-off-by: Callahan <callahan.kovacs@canonical.com> Co-authored-by: Claudio Matsuoka <claudio.matsuoka@canonical.com> Co-authored-by: Callahan <callahan.kovacs@canonical.com>

test(spread): update store tests (canonical#5371)

3067b4b

Signed-off-by: Callahan Kovacs <callahan.kovacs@canonical.com>

test: fix command tests (canonical#5375)

28cb1b8

Signed-off-by: Callahan Kovacs <callahan.kovacs@canonical.com>

build: pin python-apt for oracular (canonical#5377)

581889c

Signed-off-by: Callahan Kovacs <callahan.kovacs@canonical.com>

test(spread): update store tests (canonical#5371)

6979dd6

Signed-off-by: Callahan Kovacs <callahan.kovacs@canonical.com>

build: pin python-apt for oracular (canonical#5377)

c68f1fd

Signed-off-by: Callahan Kovacs <callahan.kovacs@canonical.com>

build(deps): bump craft-platforms to 0.7.0 (canonical#5379)

7901bef

Signed-off-by: Callahan Kovacs <callahan.kovacs@canonical.com>

chore: update the Jira project to SNAPCRAFT (canonical#5385)

1a3afe8

Signed-off-by: Sergio Schvezov <sergio.schvezov@canonical.com>

test: fix extension tests (canonical#5378)

510908e

Signed-off-by: Callahan Kovacs <callahan.kovacs@canonical.com>

jahn-junior and others added 27 commits June 26, 2025 10:21

docs: update CONTRIBUTING.md (canonical#5578)

889bd6c

* docs: update CONTRIBUTING.md * docs: remove HACKING.md * docs: clean up conf.py --------- Signed-off-by: JJ Coldiron <jj.coldiron@canonical.com>

docs: switch from UK to US spellings (canonical#5573)

3af48bf

docs: improve and move setup guides (canonical#5586)

dacb9c7

Move its pages to the root of how-to collection.

fix(kde-neon): update cmake prefix path (canonical#5585)

e2daf4c

chore(snapcraft_legacy): drop sentry error reporting (canonical#5592)

0a120c6

Co-authored-by: Callahan <callahan.kovacs@canonical.com>

fix!: use platform name in snap file name (canonical#5588)

57080e5

Signed-off-by: Callahan Kovacs <callahan.kovacs@canonical.com>

build(deps): update craft-application to 5.4.0 (canonical#5593)

d496342

Signed-off-by: Claudio Matsuoka <claudio.matsuoka@canonical.com> Co-authored-by: Callahan <callahan.kovacs@canonical.com>

fix(gnome): update cmake prefix path (canonical#5589)

d30f563

Signed-off-by: Callahan Kovacs <callahan.kovacs@canonical.com>

docs: drop unused sphinx requirements file (canonical#5598)

f42ae1e

Signed-off-by: Callahan Kovacs <callahan.kovacs@canonical.com>

ci: add release-drafter workflow (canonical#5597)

a6f8791

Signed-off-by: Callahan Kovacs <callahan.kovacs@canonical.com>

style: fix linting for ruff 0.12 (canonical#408)

dc41fe4

Co-authored-by: Imani Pelton <imani.pelton@canonical.com>

build(deps): update craft-parts to 2.16.0 (canonical#5603)

161cf6c

Signed-off-by: Callahan Kovacs <callahan.kovacs@canonical.com> Co-authored-by: Michael DuBelko <michael.dubelko@canonical.com>

fix: walk back pre-commit all-files

2443e63

Using `--all-files` for pre-commit format affects more files than `make format` would otherwise do. Signed-off-by: Alex Lowe <alex.lowe@canonical.com>

docs: fix typo in "debug a snap" (canonical#5607)

0b0bd7b

Signed-off-by: Benjamin Schimke <benjamin.schimke@canonical.com>

fix: terminate services and fix typo in test template (canonical#5608)

71fc80f

Signed-off-by: Claudio Matsuoka <claudio.matsuoka@canonical.com>

style: add TC001, TC002 and TC003 rules (canonical#415)

3cc0e96

Signed-off-by: Paul Mars <paul.mars@canonical.com>

chore(merge): starbase into merge/starbase

be561ac

style: use type-checking guards

f507bd4

Signed-off-by: Callahan Kovacs <callahan.kovacs@canonical.com>

build: update license metadata

42460ca

Signed-off-by: Callahan Kovacs <callahan.kovacs@canonical.com>

chore(merge): starbase into main (canonical#5581)

40b9a35

fix(plugins/ros): separate stderr from stdout (canonical#5615)

721d869

Fixes canonical#5600

docs: remove craft parts from intersphinx map

45504c1

build(deps): update dependency pydantic-kitbash to 0.0.6

2940939

build(deps): update dependency craft-parts to 2.17.0

b91dc8e

docs: finalize 8.10.2 release notes (canonical#5619)

3927cdf

Signed-off-by: Callahan Kovacs <callahan.kovacs@canonical.com>

chore(merge): 8.10.2 into merge/8.10.2

31e75b9

chore(merge): 8.10.2 into main (canonical#5620)

9828bbd

Merges 8.10.2 into main.

desktop: stop renaming desktop file

93d7283

With snapd 2.66, it supports custom desktop file names. This patch allows it to happen from snapcraft side.

soumyaDghosh force-pushed the stop-rename-desktop-file branch from 99f4e85 to 93d7283 Compare July 17, 2025 20:00

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

desktop: stop renaming desktop file#5150

desktop: stop renaming desktop file#5150
soumyaDghosh wants to merge 747 commits intocanonical:feature/desktop-filesfrom
soumyaDghosh:stop-rename-desktop-file

soumyaDghosh commented Nov 22, 2024

Uh oh!

mr-cal left a comment

Uh oh!

soumyaDghosh commented Nov 22, 2024

Uh oh!

soumyaDghosh commented Nov 22, 2024

Uh oh!

codecov bot commented Nov 22, 2024 •

edited

Loading

Uh oh!

mr-cal left a comment •

edited

Loading

Uh oh!

tigarmo Nov 27, 2024

Uh oh!

tigarmo Nov 27, 2024

Uh oh!

tigarmo Nov 27, 2024

Uh oh!

soumyaDghosh commented Dec 9, 2024

Uh oh!

mr-cal commented Jul 17, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

20 participants

Conversation

soumyaDghosh commented Nov 22, 2024

Uh oh!

mr-cal left a comment

Choose a reason for hiding this comment

Uh oh!

soumyaDghosh commented Nov 22, 2024

Uh oh!

soumyaDghosh commented Nov 22, 2024

Uh oh!

codecov bot commented Nov 22, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

mr-cal left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

tigarmo Nov 27, 2024

Choose a reason for hiding this comment

Uh oh!

tigarmo Nov 27, 2024

Choose a reason for hiding this comment

Uh oh!

tigarmo Nov 27, 2024

Choose a reason for hiding this comment

Uh oh!

soumyaDghosh commented Dec 9, 2024

Uh oh!

mr-cal commented Jul 17, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

20 participants

codecov bot commented Nov 22, 2024 •

edited

Loading

mr-cal left a comment •

edited

Loading