Simplify Linux flatpak flow

Author: ZoltePudeleczko

README.md

@@ -6,7 +6,7 @@
 
 A simple and effective Kodi addon for launching the NVIDIA GeForce NOW app.
 
-Updated and fully compatible with Kodi 21.2 (Omega).
+Supports both Windows and Linux (via unofficial app - [gfn_electron][gfn_electron]). Updated for and fully compatible with Kodi 21.2 (Omega).
 
 ## Which version should I get?
 
@@ -18,23 +18,29 @@ changes with some Kodi updates.
 | Kodi 21.x (Omega)    | [Latest Release][latest]  |
 | Kodi 20.x (Nexus)    | [Latest Release][latest]  |
 | Kodi 19.x (Matrix)   | [Latest Release][latest]  |
-| Older Kodi Versions  | [v1.2 Release][v1_2]      |
+| Older Kodi Versions  | [v1.2 Release][v1_2] (supports Windows only)|
 
 [latest]: https://github.com/ZoltePudeleczko/Kodi-GeForceNOW/releases/latest
 [v1_2]: https://github.com/ZoltePudeleczko/Kodi-GeForceNOW/releases/tag/v1.2
 
-## Keep in mind
+## Requirements
 
-- Supports Windows and Linux (via unofficial Electron app)
-- You must have the NVIDIA GeForce NOW app installed
-  - For Windows you can download it from the official Nvidia website:
-    [nvidia.com GeForce NOW download][nvidia_download]
-  - For Linux, as there is no official app yet, you need to install the
-    unofficial app developed by [@hmlendea][hmlendea] ([gfn-electron][gfn_electron])
-- You can override the launcher by enabling `Use custom executable` in the addon
-  settings
+### Windows
+
+- Install official NVIDIA GeForce NOW app from NVIDIA website: [nvidia.com GeForce NOW download][nvidia_download]
+
+Addon automatically detects app installed in the default directory. If it differs for you you can override the launcher in the addon settings.
+
+### Linux
+
+- Make sure you have Flatpak installed - [flatpak.org][flatpak_download]
+- Install unofficial Electron NVIDIA GeForce NOW app by [@hmlendea][hmlendea] - [gfn-electron][gfn_electron]
+- You can verify that everything is setup correctly by running `flatpak run io.github.hmlendea.geforcenow-electron` command in the terminal
+
+In the addon settings you can provide a custom executable - other app / script that you use for launching GeForce NOW.
 
 [nvidia_download]: https://www.nvidia.com/en-us/geforce-now/download
+[flatpak_download]: https://flatpak.org/setup/
 [hmlendea]: https://github.com/hmlendea
 [gfn_electron]: https://github.com/hmlendea/gfn-electron
 

script.geforcenow/addon.py

@@ -3,17 +3,19 @@
 import xbmcgui
 
 import platform
+import os
 import os.path
 import subprocess
 import shutil
 from typing import Optional
 from typing import List
+from typing import Callable
 
 ADDON: xbmcaddon.Addon = xbmcaddon.Addon("script.geforcenow")
 ADDON_ID: str = ADDON.getAddonInfo("id")
 ADDON_NAME: str = ADDON.getAddonInfo("name")
 ADDON_VERSION: str = ADDON.getAddonInfo("version")
-MSG = ADDON.getLocalizedString
+MSG: Callable[[int], str] = ADDON.getLocalizedString
 
 useCustomExecutable: bool = ADDON.getSetting("useCustomExecutable") == "true"
 stopMedia: bool = ADDON.getSetting("stopMedia") == "true"
@@ -45,15 +47,6 @@ def showUnsupportedPlatformDetected() -> None:
     message: str = MSG(32008)
     xbmcgui.Dialog().ok(title, message)
 
-
-def showCustomExecutableNotFoundDialog() -> None:
-    """Show dialog when custom executable is not found and offer to open settings."""
-    title: str = MSG(32009)
-    message: str = MSG(32010)
-    xbmcgui.Dialog().ok(title, message)
-    showOpenSettingsDialog()
-
-
 def stopMediaPlayback() -> None:
     """Stop any currently playing media in Kodi."""
     player: xbmc.Player = xbmc.Player()
@@ -75,28 +68,42 @@ def showGeForceNowFlatpakNotInstalledDialog() -> None:
     xbmcgui.Dialog().ok(title, message)
     showOpenSettingsDialog()
 
+def showFlatpakPermissionRequiredDialog() -> None:
+    """Show dialog when Kodi Flatpak lacks permission to control host Flatpak."""
+    title: str = MSG(32025)
+    message: str = MSG(32026)
+    xbmcgui.Dialog().ok(title, message)
+    showOpenSettingsDialog()
 
-def is_flatpak_available() -> bool:
-    return shutil.which("flatpak") is not None
-
-
-def is_flatpak_app_installed(app_id: str) -> bool:
-    """Check whether a Flatpak app is installed by calling `flatpak info`."""
-    try:
-        result = subprocess.run(
-            ["flatpak", "info", app_id],
-            check=False,
-            stdout=subprocess.DEVNULL,
-            stderr=subprocess.DEVNULL,
-        )
-        return result.returncode == 0
-    except Exception as e:
-        log(f"Error while checking flatpak app installation: {e}", xbmc.LOGERROR)
-        return False
+def _resolve_flatpak_path() -> Optional[str]:
+    """
+    Resolve an absolute path to `flatpak` on the current filesystem.
+    """
+    found: Optional[str] = shutil.which("flatpak")
+    if found:
+        return found
+    for candidate in ("/usr/bin/flatpak", "/bin/flatpak", "/usr/local/bin/flatpak"):
+        if os.path.isfile(candidate):
+            return candidate
+    return None
 
+def _flatpak_base_command() -> Optional[List[str]]:
+    """
+    Return the argv prefix to invoke host flatpak.
+    - If Kodi runs as Flatpak, use `flatpak-spawn --host flatpak`
+    - Otherwise use `flatpak`
+    """
+    if os.path.exists("/.flatpak-info"):
+        # Avoid hardcoding /usr/bin/flatpak on the host; let the host PATH resolve it.
+        return ["flatpak-spawn", "--host", "flatpak"]
+    else:
+        flatpak_path = _resolve_flatpak_path()
+        if flatpak_path is None:
+            return None
+        return [flatpak_path]
 
 def resolve_launch_command() -> Optional[List[str]]:
-    """Resolve the command to launch GeForce NOW based on platform and settings."""
+    """Resolve the command to launch GeForce NOW."""
     system: str = platform.system()
 
     if useCustomExecutable:
@@ -107,7 +114,7 @@ def resolve_launch_command() -> Optional[List[str]]:
             "Executable not found on the custom location provided by user",
             xbmc.LOGERROR,
         )
-        showCustomExecutableNotFoundDialog()
+        showExecutableNotFoundDialog()
         return None
 
     if system == "Windows":
@@ -121,41 +128,47 @@ def resolve_launch_command() -> Optional[List[str]]:
         return None
 
     if system == "Linux":
-        app_id: str = "io.github.hmlendea.geforcenow-electron"
-        if not is_flatpak_available():
-            log("Flatpak not found in PATH", xbmc.LOGERROR)
+        base_cmd: Optional[List[str]] = _flatpak_base_command()
+        if base_cmd is None:
+            log(
+                f"Flatpak not found/available (PATH={os.environ.get('PATH', '')})",
+                xbmc.LOGERROR,
+            )
             showFlatpakNotFoundDialog()
             return None
-        if not is_flatpak_app_installed(app_id):
-            log(f"Required Flatpak app not installed: {app_id}", xbmc.LOGERROR)
-            showGeForceNowFlatpakNotInstalledDialog()
-            return None
-        return ["flatpak", "run", app_id]
+
+        app_id: str = "io.github.hmlendea.geforcenow-electron"
+        return base_cmd + ["run", app_id]
 
     log(f"Unsupported platform detected: {system}", xbmc.LOGERROR)
     showUnsupportedPlatformDetected()
     return None
 
-
-def execute(command: List[str]) -> None:
+def execute(argv: List[str]) -> None:
     """Execute the GeForce NOW application.
     
     Args:
-        command: Command (argv list) to execute.
+        argv: Command argv to execute (e.g. ["flatpak", "run", "io.github.hmlendea.geforcenow-electron"]).
     """
-    log(f"Calling command: {command}")
+    log(f"Calling command: {' '.join(argv)}")
 
     if stopMedia:
         stopMediaPlayback()
 
     try:
-        subprocess.run(command, check=True)
+        subprocess.run(argv, check=True)
+    except FileNotFoundError as e:
+        log(f"Executable not found while executing command ({e})", xbmc.LOGERROR)
+        # Most common on Linux is missing flatpak/flatpak-spawn inside the runtime.
+        showFlatpakNotFoundDialog()
     except subprocess.CalledProcessError as e:
-        log(f"Error executing command {command}: {e}", xbmc.LOGERROR)
+        log(f"Error executing command {' '.join(argv)}: {e}", xbmc.LOGERROR)
 
 
 log("Starting GeForceNOW launcher addon")
 
-command: Optional[List[str]] = resolve_launch_command()
-if command:
-    execute(command)
+argv: Optional[List[str]] = resolve_launch_command()
+if argv:
+    execute(argv)
+else:
+    log("Failed to resolve launch command", xbmc.LOGERROR)

script.geforcenow/resources/language/resource.language.de_de/strings.po

@@ -48,14 +48,6 @@ msgctxt "#32008"
 msgid "This Add-on currently works only on Windows and Linux platforms."
 msgstr "Dieses Add-on funktioniert derzeit nur auf Windows- und Linux-Plattformen."
 
-msgctxt "#32009"
-msgid "Custom executable not found"
-msgstr "Benutzerdefiniertes Programm nicht gefunden"
-
-msgctxt "#32010"
-msgid "The custom executable was not found. Please select a new location for it on the Addon Settings."
-msgstr "Das benutzerdefinierte Programm wurde nicht gefunden. Bitte wählen Sie in den Addon-Einstellungen einen neuen Speicherort."
-
 msgctxt "#32011"
 msgid "Stop all media playback on start"
 msgstr "Alle Medienwiedergaben beim Start stoppen"
@@ -75,3 +67,11 @@ msgstr "GeForce NOW-Flatpak nicht installiert"
 msgctxt "#32015"
 msgid "The Flatpak 'io.github.hmlendea.geforcenow-electron' is not installed. Install it or configure a custom executable in the Addon Settings."
 msgstr "Das Flatpak „io.github.hmlendea.geforcenow-electron“ ist nicht installiert. Installieren Sie es oder konfigurieren Sie ein benutzerdefiniertes Programm in den Addon-Einstellungen."
+
+msgctxt "#32025"
+msgid "Flatpak permission required"
+msgstr "Flatpak-Berechtigung erforderlich"
+
+msgctxt "#32026"
+msgid "Kodi is running as Flatpak so it cannot start GeForce NOW.\n\nRecommended fix: install Kodi natively (not via Flatpak).\n\nAdvanced: you can try allowing Kodi to talk to Flatpak and restart Kodi:\nflatpak override --user --talk-name=org.freedesktop.Flatpak tv.kodi.Kodi\n\nAlternatively, configure a custom executable in the Addon Settings."
+msgstr "Kodi wird als Flatpak ausgeführt und kann GeForce NOW daher nicht starten.\n\nEmpfohlene Lösung: Kodi nativ installieren (nicht via Flatpak).\n\nErweitert: Sie können versuchen, Kodi die Kommunikation mit Flatpak zu erlauben und Kodi neu zu starten:\nflatpak override --user --talk-name=org.freedesktop.Flatpak tv.kodi.Kodi\n\nAlternativ können Sie ein benutzerdefiniertes Programm in den Addon-Einstellungen konfigurieren."

script.geforcenow/resources/language/resource.language.en_gb/strings.po

@@ -48,14 +48,6 @@ msgctxt "#32008"
 msgid "This Add-on currently works only on Windows and Linux platforms."
 msgstr ""
 
-msgctxt "#32009"
-msgid "Custom executable not found"
-msgstr ""
-
-msgctxt "#32010"
-msgid "The custom executable was not found. Please select a new location for it on the Addon Settings."
-msgstr ""
-
 msgctxt "#32011"
 msgid "Stop all media playback on start"
 msgstr ""
@@ -74,4 +66,12 @@ msgstr ""
 
 msgctxt "#32015"
 msgid "The Flatpak 'io.github.hmlendea.geforcenow-electron' is not installed. Install it or configure a custom executable in the Addon Settings."
+msgstr ""
+
+msgctxt "#32025"
+msgid "Flatpak permission required"
+msgstr ""
+
+msgctxt "#32026"
+msgid "Kodi is running as Flatpak so it cannot start GeForce NOW.\n\nRecommended fix: install Kodi natively (not via Flatpak).\n\nAdvanced: you can try allowing Kodi to talk to Flatpak and restart Kodi:\nflatpak override --user --talk-name=org.freedesktop.Flatpak tv.kodi.Kodi\n\nAlternatively, configure a custom executable in the Addon Settings."
 msgstr ""

script.geforcenow/resources/language/resource.language.es_es/strings.po

@@ -48,14 +48,6 @@ msgctxt "#32008"
 msgid "This Add-on currently works only on Windows and Linux platforms."
 msgstr "Este complemento actualmente solo funciona en plataformas Windows y Linux."
 
-msgctxt "#32009"
-msgid "Custom executable not found"
-msgstr "Ejecutable personalizado no encontrado"
-
-msgctxt "#32010"
-msgid "The custom executable was not found. Please select a new location for it on the Addon Settings."
-msgstr "No se encontró el ejecutable personalizado. Por favor, seleccione una nueva ubicación para él en la configuración del complemento."
-
 msgctxt "#32011"
 msgid "Stop all media playback on start"
 msgstr "Detener toda la reproducción de medios al iniciar"
@@ -74,4 +66,12 @@ msgstr "Flatpak de GeForce NOW no instalado"
 
 msgctxt "#32015"
 msgid "The Flatpak 'io.github.hmlendea.geforcenow-electron' is not installed. Install it or configure a custom executable in the Addon Settings."
-msgstr "El Flatpak 'io.github.hmlendea.geforcenow-electron' no está instalado. Instálelo o configure un ejecutable personalizado en la configuración del complemento."
+msgstr "El Flatpak 'io.github.hmlendea.geforcenow-electron' no está instalado. Instálelo o configure un ejecutable personalizado en la configuración del complemento."
+
+msgctxt "#32025"
+msgid "Flatpak permission required"
+msgstr "Permiso de Flatpak requerido"
+
+msgctxt "#32026"
+msgid "Kodi is running as Flatpak so it cannot start GeForce NOW.\n\nRecommended fix: install Kodi natively (not via Flatpak).\n\nAdvanced: you can try allowing Kodi to talk to Flatpak and restart Kodi:\nflatpak override --user --talk-name=org.freedesktop.Flatpak tv.kodi.Kodi\n\nAlternatively, configure a custom executable in the Addon Settings."
+msgstr "Kodi se está ejecutando como Flatpak, por lo que no puede iniciar GeForce NOW.\n\nSolución recomendada: instalar Kodi de forma nativa (no vía Flatpak).\n\nAvanzado: puede intentar permitir que Kodi hable con Flatpak y reiniciar Kodi:\nflatpak override --user --talk-name=org.freedesktop.Flatpak tv.kodi.Kodi\n\nAlternativamente, configure un ejecutable personalizado en la configuración del complemento."

script.geforcenow/resources/language/resource.language.fr_fr/strings.po

@@ -48,14 +48,6 @@ msgctxt "#32008"
 msgid "This Add-on currently works only on Windows and Linux platforms."
 msgstr "Cette extension fonctionne actuellement uniquement sur les plateformes Windows et Linux."
 
-msgctxt "#32009"
-msgid "Custom executable not found"
-msgstr "Exécutable personnalisé introuvable"
-
-msgctxt "#32010"
-msgid "The custom executable was not found. Please select a new location for it on the Addon Settings."
-msgstr "L'exécutable personnalisé est introuvable. Veuillez sélectionner un nouvel emplacement dans les paramètres de l'extension."
-
 msgctxt "#32011"
 msgid "Stop all media playback on start"
 msgstr "Arrêter toute lecture multimédia au démarrage"
@@ -75,3 +67,11 @@ msgstr "Flatpak GeForce NOW non installé"
 msgctxt "#32015"
 msgid "The Flatpak 'io.github.hmlendea.geforcenow-electron' is not installed. Install it or configure a custom executable in the Addon Settings."
 msgstr "Le Flatpak 'io.github.hmlendea.geforcenow-electron' n'est pas installé. Installez-le ou configurez un exécutable personnalisé dans les paramètres de l'extension."
+
+msgctxt "#32025"
+msgid "Flatpak permission required"
+msgstr "Autorisation Flatpak requise"
+
+msgctxt "#32026"
+msgid "Kodi is running as Flatpak so it cannot start GeForce NOW.\n\nRecommended fix: install Kodi natively (not via Flatpak).\n\nAdvanced: you can try allowing Kodi to talk to Flatpak and restart Kodi:\nflatpak override --user --talk-name=org.freedesktop.Flatpak tv.kodi.Kodi\n\nAlternatively, configure a custom executable in the Addon Settings."
+msgstr "Kodi s'exécute en tant que Flatpak, il ne peut donc pas démarrer GeForce NOW.\n\nCorrectif recommandé : installer Kodi nativement (pas via Flatpak).\n\nAvancé : vous pouvez essayer d'autoriser Kodi à communiquer avec Flatpak puis redémarrer Kodi :\nflatpak override --user --talk-name=org.freedesktop.Flatpak tv.kodi.Kodi\n\nSinon, configurez un exécutable personnalisé dans les paramètres de l'extension."

script.geforcenow/resources/language/resource.language.it_it/strings.po

@@ -48,14 +48,6 @@ msgctxt "#32008"
 msgid "This Add-on currently works only on Windows and Linux platforms."
 msgstr "Questo add-on attualmente funziona solo su piattaforme Windows e Linux."
 
-msgctxt "#32009"
-msgid "Custom executable not found"
-msgstr "Eseguibile personalizzato non trovato"
-
-msgctxt "#32010"
-msgid "The custom executable was not found. Please select a new location for it on the Addon Settings."
-msgstr "L'eseguibile personalizzato non è stato trovato. Seleziona una nuova posizione nelle impostazioni dell'add-on."
-
 msgctxt "#32011"
 msgid "Stop all media playback on start"
 msgstr "Interrompi la riproduzione dei contenuti multimediali all'avvio"
@@ -75,3 +67,11 @@ msgstr "Flatpak di GeForce NOW non installato"
 msgctxt "#32015"
 msgid "The Flatpak 'io.github.hmlendea.geforcenow-electron' is not installed. Install it or configure a custom executable in the Addon Settings."
 msgstr "Il Flatpak 'io.github.hmlendea.geforcenow-electron' non è installato. Installalo o configura un eseguibile personalizzato nelle impostazioni dell'add-on."
+
+msgctxt "#32025"
+msgid "Flatpak permission required"
+msgstr "Permesso Flatpak richiesto"
+
+msgctxt "#32026"
+msgid "Kodi is running as Flatpak so it cannot start GeForce NOW.\n\nRecommended fix: install Kodi natively (not via Flatpak).\n\nAdvanced: you can try allowing Kodi to talk to Flatpak and restart Kodi:\nflatpak override --user --talk-name=org.freedesktop.Flatpak tv.kodi.Kodi\n\nAlternatively, configure a custom executable in the Addon Settings."
+msgstr "Kodi è in esecuzione come Flatpak, quindi non può avviare GeForce NOW.\n\nCorrezione consigliata: installare Kodi in modo nativo (non tramite Flatpak).\n\nAvanzato: puoi provare a consentire a Kodi di comunicare con Flatpak e riavviare Kodi:\nflatpak override --user --talk-name=org.freedesktop.Flatpak tv.kodi.Kodi\n\nIn alternativa, configura un eseguibile personalizzato nelle impostazioni dell'add-on."

script.geforcenow/resources/language/resource.language.pl_pl/strings.po

@@ -48,14 +48,6 @@ msgctxt "#32008"
 msgid "This Add-on currently works only on Windows and Linux platforms."
 msgstr "Ta wtyczka działa obecnie tylko na platformach Windows i Linux."
 
-msgctxt "#32009"
-msgid "Custom executable not found"
-msgstr "Nie znaleziono podanego pliku .exe"
-
-msgctxt "#32010"
-msgid "The custom executable was not found. Please select a new location for it on the Addon Settings."
-msgstr "Nie znaleziono podanego pliku .exe. Proszę wybrać nową lokalizację w ustawieniach wtyczki."
-
 msgctxt "#32011"
 msgid "Stop all media playback on start"
 msgstr "Zatrzymaj wszystkie odtwarzane media przy starcie"
@@ -74,4 +66,12 @@ msgstr "Flatpak GeForce NOW nie jest zainstalowany"
 
 msgctxt "#32015"
 msgid "The Flatpak 'io.github.hmlendea.geforcenow-electron' is not installed. Install it or configure a custom executable in the Addon Settings."
-msgstr "Flatpak 'io.github.hmlendea.geforcenow-electron' nie jest zainstalowany. Zainstaluj go lub skonfiguruj własny plik wykonywalny w ustawieniach wtyczki."
+msgstr "Flatpak 'io.github.hmlendea.geforcenow-electron' nie jest zainstalowany. Zainstaluj go lub skonfiguruj własny plik wykonywalny w ustawieniach wtyczki."
+
+msgctxt "#32025"
+msgid "Flatpak permission required"
+msgstr "Wymagane uprawnienia Flatpak"
+
+msgctxt "#32026"
+msgid "Kodi is running as Flatpak so it cannot start GeForce NOW.\n\nRecommended fix: install Kodi natively (not via Flatpak).\n\nAdvanced: you can try allowing Kodi to talk to Flatpak and restart Kodi:\nflatpak override --user --talk-name=org.freedesktop.Flatpak tv.kodi.Kodi\n\nAlternatively, configure a custom executable in the Addon Settings."
+msgstr "Kodi działa jako Flatpak, więc nie może uruchomić GeForce NOW.\n\nZalecane rozwiązanie: zainstaluj Kodi natywnie (nie przez Flatpaka).\n\nZaawansowane: możesz spróbować zezwolić Kodi na komunikację z Flatpakiem i zrestartować Kodi:\nflatpak override --user --talk-name=org.freedesktop.Flatpak tv.kodi.Kodi\n\nAlternatywnie skonfiguruj własny plik wykonywalny w ustawieniach wtyczki."