flatpak nonsense

Author: captn3m0

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "shared-modules"]
+	path = shared-modules
+	url = https://github.com/flathub/shared-modules.git

HACKING.md

@@ -0,0 +1,58 @@
+# Hacking on HackerTray
+
+## Development Setup
+
+```bash
+git clone --recurse-submodules https://github.com/captn3m0/hackertray.git
+cd hackertray
+uv run --with pytest python -m pytest
+```
+
+## Flatpak
+
+### Build
+
+```bash
+flatpak install flathub org.gnome.Platform//49 org.gnome.Sdk//49
+flatpak-builder --install-deps-from=flathub --force-clean build-dir in.captnemo.hackertray.yml
+```
+
+### Install locally
+
+```bash
+flatpak-builder --user --install --force-clean build-dir in.captnemo.hackertray.yml
+flatpak run in.captnemo.hackertray
+```
+
+### Install from remote flatpakref (once published)
+
+A single-file flatpakref is hosted on GitHub Pages:
+
+```bash
+flatpak install https://captnemo.in/hackertray/hackertray.flatpakref
+```
+
+### Publish
+
+**WIP**: Not published anywhere yet.
+
+The Flatpak is built as a single-file bundle and attached to GitHub Releases. To generate a bundle locally:
+
+```bash
+flatpak-builder --repo=repo --force-clean build-dir in.captnemo.hackertray.yml
+flatpak build-bundle repo hackertray.flatpak in.captnemo.hackertray
+```
+
+Install from the bundle:
+
+```bash
+flatpak install hackertray.flatpak
+```
+
+## Release
+
+1. Update version in `pyproject.toml`
+2. Update `CHANGELOG.md`
+3. Commit and tag: `git tag x.y.z && git push --tags`
+4. PyPI publish happens automatically via GitHub Actions (trusted publishing)
+5. Build and attach Flatpak bundle to the GitHub Release

hackertray/__init__.py

@@ -42,55 +42,83 @@ def __init__(self, args):
                 self.db = set()
 
         # create an indicator applet
-        self.ind = AppIndicator.Indicator.new("Hacker Tray", "hacker-tray", AppIndicator.IndicatorCategory.APPLICATION_STATUS )
+        self.ind = AppIndicator.Indicator.new("Hacker Tray", "hacker-tray", AppIndicator.IndicatorCategory.APPLICATION_STATUS)
         self.ind.set_status(AppIndicator.IndicatorStatus.ACTIVE)
-        self.ind.set_icon(self.get_icon_filename("hacker-tray.png"))
+        self.ind.set_icon_theme_path(self._icon_theme_path())
+        icon_name = "hacker-tray-light" if self._is_light_theme() else "hacker-tray"
+        self.ind.set_icon(icon_name)
 
         # create a menu
         self.menu = Gtk.Menu()
 
-        # The default state is false, and it toggles when you click on it
         self.commentState = args.comments
         self.reverse = args.reverse
+        self.chrome_data_directory = args.chrome
 
-        # create items for the menu - refresh, quit and a separator
+        # Resolve firefox: None = not requested, "auto" = detect, else = specific path
+        self.firefox_explicit = args.firefox is not None and args.firefox != "auto"
+        if args.firefox == "auto":
+            self.firefox_data_directory = Firefox.default_firefox_profile_path()
+        else:
+            self.firefox_data_directory = args.firefox
+
+        # create items for the menu - separator, settings, about, refresh, quit
         menuSeparator = Gtk.SeparatorMenuItem()
         menuSeparator.show()
         self.add(menuSeparator)
 
-        btnComments = Gtk.CheckMenuItem.new_with_label("Show Comments")
+        # Settings submenu
+        settingsItem = Gtk.MenuItem.new_with_label("Settings")
+        settingsMenu = Gtk.Menu()
+        settingsItem.set_submenu(settingsMenu)
+
+        btnComments = Gtk.CheckMenuItem.new_with_label("Open Comments")
+        btnComments.set_active(args.comments)
         btnComments.connect("toggled", self.toggleComments)
-        self.add(btnComments)
+        settingsMenu.append(btnComments)
         btnComments.show()
-        btnComments.set_active(args.comments)
 
-        btnAbout = Gtk.MenuItem("About")
+        btnReverse = Gtk.CheckMenuItem.new_with_label("Reverse Ordering")
+        btnReverse.set_active(args.reverse)
+        btnReverse.connect("toggled", self.toggleReverse)
+        settingsMenu.append(btnReverse)
+        btnReverse.show()
+
+        # Only show Firefox toggle if --firefox was unset or "auto"
+        if not self.firefox_explicit:
+            btnFirefox = Gtk.CheckMenuItem.new_with_label("Detect Firefox read items")
+            btnFirefox.set_active(self.firefox_data_directory is not None)
+            btnFirefox.connect("toggled", self.toggleFirefox)
+            settingsMenu.append(btnFirefox)
+            btnFirefox.show()
+
+        self.add(settingsItem)
+        settingsItem.show()
+
+        btnAbout = Gtk.MenuItem.new_with_label("About")
         btnAbout.show()
         btnAbout.connect("activate", self.showAbout)
         self.add(btnAbout)
 
-        btnRefresh = Gtk.MenuItem("Refresh")
+        btnRefresh = Gtk.MenuItem.new_with_label("Refresh")
         btnRefresh.show()
-        # the last parameter is for not running the timer
-        btnRefresh.connect("activate", self.refresh, True, args.chrome)
+        btnRefresh.connect("activate", self.refresh, True)
         self.add(btnRefresh)
 
         if Version.new_available():
-            btnUpdate = Gtk.MenuItem("New Update Available")
+            btnUpdate = Gtk.MenuItem.new_with_label("New Update Available")
             btnUpdate.show()
             btnUpdate.connect('activate', self.showUpdate)
             self.add(btnUpdate)
 
-        btnQuit = Gtk.MenuItem("Quit")
+        btnQuit = Gtk.MenuItem.new_with_label("Quit")
         btnQuit.show()
         btnQuit.connect("activate", self.quit)
         self.add(btnQuit)
         self.menu.show()
         self.ind.set_menu(self.menu)
 
-        if args.firefox == "auto":
-            args.firefox = Firefox.default_firefox_profile_path()
-        self.refresh(chrome_data_directory=args.chrome, firefox_data_directory=args.firefox)
+        self.refresh()
 
     def add(self, item):
         if self.reverse:
@@ -102,6 +130,20 @@ def toggleComments(self, widget):
         """Whether comments page is opened or not"""
         self.commentState = widget.get_active()
 
+    def toggleReverse(self, widget):
+        self.reverse = widget.get_active()
+
+    def toggleFirefox(self, widget):
+        if widget.get_active():
+            try:
+                self.firefox_data_directory = Firefox.default_firefox_profile_path()
+            except RuntimeError:
+                print("[+] Could not find Firefox profile")
+                widget.set_active(False)
+                return
+        else:
+            self.firefox_data_directory = None
+
     def showUpdate(self, widget):
         """Handle the update button"""
         webbrowser.open(HackerNewsApp.UPDATE_URL)
@@ -115,10 +157,9 @@ def showAbout(self, widget):
     # ToDo: Handle keyboard interrupt properly
     def quit(self, widget, data=None):
         """ Handler for the quit button"""
-        l = list(self.db)
+        l = list(self.db)[-200:]
         home = expanduser("~")
 
-        # truncate the file
         with open(home + '/.hackertray.json', 'w+') as file:
             file.write(json.dumps(l))
 
@@ -165,28 +206,28 @@ def addItem(self, item):
         i.url = item['url']
         tooltip = "{url}\nPosted by {user} {timeago}".format(url=item['url'], user=item['user'], timeago=item['time_ago'])
         i.set_tooltip_text(tooltip)
-        i.signal_id = i.connect('activate', self.open)
         i.hn_id = item['id']
         i.item_id = item['id']
+        i.set_active(visited)
+        i.signal_id = i.connect('activate', self.open)
         if self.reverse:
             self.menu.append(i)
         else:
             self.menu.prepend(i)
         i.show()
-        i.set_active(visited)
 
-    def refresh(self, widget=None, no_timer=False, chrome_data_directory=None, firefox_data_directory=None):
+    def refresh(self, widget=None, no_timer=False):
         """Refreshes the menu """
         try:
             # Create an array of 20 false to denote matches in History
             searchResults = [False]*20
             data = list(reversed(HackerNews.getHomePage()[0:20]))
             urls = [item['url'] for item in data]
-            if(chrome_data_directory):
-                searchResults = self.mergeBoolArray(searchResults, Chrome.search(urls, chrome_data_directory))
+            if self.chrome_data_directory:
+                searchResults = self.mergeBoolArray(searchResults, Chrome.search(urls, self.chrome_data_directory))
 
-            if(firefox_data_directory):
-                searchResults = self.mergeBoolArray(searchResults, Firefox.search(urls, firefox_data_directory))
+            if self.firefox_data_directory:
+                searchResults = self.mergeBoolArray(searchResults, Firefox.search(urls, self.firefox_data_directory))
 
             # Remove all the current stories
             for i in self.menu.get_children():
@@ -206,18 +247,35 @@ def refresh(self, widget=None, no_timer=False, chrome_data_directory=None, firef
         finally:
             # Call every 10 minutes
             if not no_timer:
-                GLib.timeout_add(10 * 30 * 1000, self.refresh, widget, no_timer, chrome_data_directory)
+                GLib.timeout_add(10 * 30 * 1000, self.refresh)
 
     # Merges two boolean arrays, using OR operation against each pair
     def mergeBoolArray(self, original, patch):
         for index, var in enumerate(original):
             original[index] = original[index] or patch[index]
         return original
 
-    def get_icon_filename(self, icon_name):
-        ref = importlib.resources.files('hackertray.data') / 'hacker-tray.png'
-        with importlib.resources.as_file(ref) as path:
-            return str(path)
+    @staticmethod
+    def _icon_theme_path():
+        """Return the icon data dir as a host-accessible path.
+
+        AppIndicator sends this path over D-Bus to the tray host, which runs
+        outside the Flatpak sandbox. Inside a Flatpak, /app/ paths are not
+        accessible from the host, so we translate via /.flatpak-info."""
+        data_dir = str(importlib.resources.files('hackertray.data'))
+        if os.path.exists("/.flatpak-info"):
+            import configparser
+            info = configparser.ConfigParser()
+            info.read("/.flatpak-info")
+            app_path = info.get("Instance", "app-path")
+            data_dir = app_path + data_dir.removeprefix("/app")
+        return data_dir
+
+    @staticmethod
+    def _is_light_theme():
+        settings = Gtk.Settings.get_default()
+        if settings and settings.get_property("gtk-application-prefer-dark-theme"):
+            return False
 
 
 def main():

hackertray/data/hacker-tray-light.png

@@ -12,13 +12,22 @@ class Firefox:
     @staticmethod
     def default_firefox_profile_path():
         config_home = os.environ.get("XDG_CONFIG_HOME", str(Path.home() / ".config"))
-        firefox_dir = Path(config_home) / "mozilla" / "firefox"
-        profile_file_path = firefox_dir / "profiles.ini"
-        if not profile_file_path.exists():
+        candidates = [
+            Path(config_home) / "mozilla" / "firefox",
+            Path.home() / ".config" / "mozilla" / "firefox",
+            Path.home() / ".mozilla" / "firefox",
+            Path.home() / ".var" / "app" / "org.mozilla.firefox" / ".mozilla" / "firefox",
+        ]
+        firefox_dir = None
+        for candidate in candidates:
+            if (candidate / "profiles.ini").exists():
+                firefox_dir = candidate
+                break
+        if firefox_dir is None:
             raise RuntimeError("Couldn't find Firefox profiles.ini")
 
         parser = configparser.ConfigParser()
-        parser.read(profile_file_path)
+        parser.read(firefox_dir / "profiles.ini")
 
         # Prefer the active install's locked profile (modern Firefox)
         for section in parser.sections():
@@ -58,14 +67,9 @@ def search(urls, config_folder_path):
             os.unlink(tmp_path)
         db = conn.cursor()
 
-        total = db.execute('SELECT COUNT(*) FROM moz_places').fetchone()[0]
-        print(f"[firefox] loaded {total} rows from moz_places")
-
         result = []
         for url in urls:
             db.execute('SELECT url from moz_places WHERE url=:url', {"url": url})
-            found = db.fetchone() is not None
-            print(f"[firefox] {'HIT ' if found else 'MISS'} {url}")
-            result.append(found)
+            result.append(db.fetchone() is not None)
         conn.close()
         return result

hackertray/firefox.py

@@ -0,0 +1,31 @@
+app-id: in.captnemo.hackertray
+runtime: org.gnome.Platform
+runtime-version: "49"
+sdk: org.gnome.Sdk
+command: hackertray
+
+finish-args:
+  - --share=ipc
+  - --share=network
+  - --socket=x11
+  - --socket=wayland
+  - --talk-name=org.kde.StatusNotifierWatcher
+  - --talk-name=com.canonical.indicator.application
+  - --talk-name=org.ayatana.indicator.application
+  - --filesystem=~/.mozilla/firefox:ro
+  - --filesystem=~/.config/mozilla/firefox:ro
+  - --filesystem=~/.var/app/org.mozilla.firefox/.mozilla/firefox:ro
+  - --filesystem=~/.config/google-chrome:ro
+
+modules:
+  - shared-modules/libappindicator/libappindicator-gtk3-introspection-12.10.json
+
+  - name: hackertray
+    buildsystem: simple
+    build-commands:
+      - pip3 install --no-deps --no-build-isolation --prefix=/app .
+      - install -Dm644 hackertray/data/hacker-tray.png /app/share/icons/hicolor/24x24/apps/hacker-tray.png
+      - install -Dm644 hackertray/data/hacker-tray-light.png /app/share/icons/hicolor/24x24/apps/hacker-tray-light.png
+    sources:
+      - type: dir
+        path: .

in.captnemo.hackertray.yml

@@ -21,9 +21,12 @@ Homepage = "https://captnemo.in/hackertray"
 [project.scripts]
 hackertray = "hackertray:main"
 
+[tool.pytest.ini_options]
+testpaths = ["test"]
+
 [tool.setuptools.packages.find]
 where = ["."]
 exclude = ["test*"]
 
 [tool.setuptools.package-data]
-"hackertray.data" = ["hacker-tray.png"]
+"hackertray.data" = ["hacker-tray.png", "hacker-tray-light.png"]