desktop: stop renaming desktop file #5150
Conversation
soumyaDghosh
force-pushed
the
stop-rename-desktop-file
branch
from
dffe5e6 to
af19add
Compare
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. |
|
I think I'll need to fix the spread tests too. |
soumyaDghosh
force-pushed
the
stop-rename-desktop-file
branch
from
af19add to
32dea06
Compare
Codecov ReportAll modified and coverable lines are covered by tests ✅
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. 🚨 Try these New Features:
|
soumyaDghosh
force-pushed
the
stop-rename-desktop-file
branch
2 times, most recently
from
7b7c0d5 to
2883282
Compare
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
2883282 to
99f4e85
Compare
There was a problem hiding this comment.
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.
| 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, |
There was a problem hiding this comment.
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
| # 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")): |
There was a problem hiding this comment.
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')
|
|
||
| prime_dir = Path(f"{new_dir}/meta/gui") | ||
|
|
||
| yield prime_dir |
There was a problem hiding this comment.
| yield prime_dir | |
| return prime_dir |
|
This PR has a blocker
|
With snapd 2.66, it supports custom desktop file names. This patch allows it to happen from snapcraft side.
tox run -m lint?tox run -e test-py310? (supported versions:py39,py310,py311,py312)