Make systray applet also searching in XDG_DATA_HOME & XDG_DATA_DIRS when looking for the .desktop file

[Antiz96]

This PR makes the systray applet searching for the .desktop file in the following path (in that specific order):

• $XDG_DATA_HOME/applications/arch-update.desktop
• $HOME/.local/share/applications/arch-update.desktop
• $XDG_DATA_DIRS/applications/arch-update.desktop
• /usr/local/share/applications/arch-update.desktop
• /usr/share/applications/arch-update.desktop

That would allow users to be able to provide a customized .desktop file for the systray applet to execute if needed (e.g. force Arch-Update to launch in a specific terminal emulator that is not supported by gio/glib2).

Fixes #151

[Antiz96]

@trigg Can you give this a look?

I used the same logic currently used to determine where the state file is, except I added some if not os.path.isfile statement between each of the possible paths. While the state file creation/location is fully automated, we could imagine that a user could put a custom .desktop file under $HOME/.local/share/applications/arch-update.desktop despite having $XDG_DATA_HOME set to somewhere else for instance.

Hopefully the syntax and indentation is okay 😅
I'll run some tests later today.

By the way, I know you asked me to assign you to the linked issue, but I wanted to give this a try myself to get familiar with the systray applet codebase. I hope you don't mind 😶

[trigg]

I hope you don't mind

Not at all! I apologise, my work has kept me busy lately.

My concern with this code is that it makes several references to DESKTOP_FILE before it is defined.

I think we need to start off setting it to None and check

if not DESKTOP_FILE or not os.path.isfile(DESKTOP_FILE):

which will more cleanly catch both option (file wasn't already set or file is not valid for our use)

[trigg]

Simulating a system where XDG_DATA_HOME is unset...
env -u XDG_DATA_HOME ./src/script/arch-update-tray.py

Traceback (most recent call last):
  File "/home/triggerhapp/dev/arch-update5/./src/script/arch-update-tray.py", line 68, in update
    arch_update()
  File "/home/triggerhapp/dev/arch-update5/./src/script/arch-update-tray.py", line 31, in arch_update
    if not os.path.isfile(DESKTOP_FILE):
                          ^^^^^^^^^^^^
UnboundLocalError: cannot access local variable 'DESKTOP_FILE' where it is not associated with a value

[trigg]

I've made a PR to your PR 😁

[Antiz96]

Not at all! I apologise, my work has kept me busy lately.

Oh don't worry, no problem! Take all the time you need ;)

My concern with this code is that it makes several references to DESKTOP_FILE before it is defined.
I think we need to start off setting it to None and check

if not DESKTOP_FILE or not os.path.isfile(DESKTOP_FILE):

which will more cleanly catch both option (file wasn't already set or file is not valid for our use)

Oh yeah you're right, thanks!

I've made a PR to your PR 😁

Can you make "suggestions" I can commit to this one directly instead (so we keep everything in the same PR)?

[trigg]

The PR I made is pointing at this branch, not master. But by all means just recreate what I did in the changes here

https://github.com/Antiz96/arch-update/pull/157/files

[Antiz96]

The PR I made is pointing at this branch, not master.

Oh sorry, I missed that! Thanks :)

[Antiz96]

I'll adapt the documentation in that PR so the fact that the systray is now looking for those different paths is documented and then we should be good to merge it :)

I'll probably cut a v2.0.1 release right after because I already had one feedback from someone that would like this improvement to be shipped for their own need :)

[Antiz96]

✔️