Fixed flatpak-spawn

Author: co-stig

res/CHANGELOG.txt

@@ -8,6 +8,7 @@ TODO: A bug with going back in the import wizard
 TODO: GitHub import needs pagination
 TODO: Test GitHub import on a large public project
 - Flowkeeper window now hides automatically on auto-start (#102).
+- Flowkeeper now supports Flatpak (#63).
 
 ### v0.9.1 (15 January 2025)
 

res/CREDITS.txt

@@ -1,4 +1,8 @@
-Constantine Kulak <https://github.com/co-stig>: Author and maintaner.
+Constantine Kulak <https://github.com/co-stig>: Flowkeeper author.
+
+Marco Sarti <[email protected]>: AUR package maintainer.
+
+faveoled <https://github.com/faveoled>: Flatpak package maintainer.
 
 Flowkeeper is built using Qt Community Edition by The Qt Company <https://www.qt.io/licensing>.
 

src/fk/core/abstract_settings.py

@@ -299,7 +299,11 @@ def __init__(self,
                                                              '$ espeak "Deleted work item {workitem.get_name()}"\n'
                                                              '$ echo "Received {event}. Available variables: {dir()}"\n'
                                                              'WARNING: Placeholders are substituted as-is, without any sanitization or escaping.', [], _always_show),
-                ('Integration.flatpak_spawn', 'bool', 'Execute commands via flatpak-spawn', 'True', [], _show_for_flatpak),
+                ('Integration.flatpak_spawn', 'bool', 'Prefix commands with flatpak-spawn --host', 'True', [], _show_for_flatpak),
+                ('Integration.flatpak_spawn_label', 'label', '', 'IMPORTANT: To run commands on the host (outside of Flatpak sandbox) you have to '
+                                                                 'check the above checkbox and then grant Flowkeeper access to dbus. This has a major impact '
+                                                                 'on the sandbox security, so do this only when strictly necessary:\n'
+                                                                 '$ flatpak override --user --talk-name=org.freedesktop.Flatpak org.flowkeeper.Flowkeeper', [], _show_for_flatpak),
                 ('Integration.callbacks', 'keyvalue', '', '{}', get_all_events(), _always_show),
             ],
         }

src/fk/core/integration_executor.py

@@ -84,6 +84,7 @@ def on_event(self, full_event, **kwargs):
             args = shlex.split(formatted)
             if get_sandbox_type() == 'Flatpak' and self._settings.get('Integration.flatpak_spawn') == 'True':
                 # Use flatpak-spawn to execute commands outside the sandbox
+                args.insert(0, '--host')
                 args.insert(0, 'flatpak-spawn')
             if logger.isEnabledFor(logging.DEBUG):
                 logger.debug(f'Received event {full_event}. Executing: {args}')

src/fk/desktop/application.py

@@ -406,7 +406,7 @@ def on_exception(self, exc_type, exc_value, exc_trace):
                 'title': f'Unhandled {exc_type.__name__}',
                 'body': f'**Please explain here what you were doing**\n\n'
                         f'Versions:\n'
-                        f'{self._get_versions()}\n'
+                        f'{self._get_versions().replace('#', '# ')}\n'
                         f'Stack trace:\n'
                         f'```\n{to_log}```'
             })