proof of concept for icon support

Author: pvsr

default.nix

@@ -11,7 +11,7 @@ with pythonPackages;
     doCheck = true;
     format = "pyproject";
     nativeBuildInputs = [pkgs.scdoc setuptools];
-    propagatedBuildInputs = [pyxdg click];
+    propagatedBuildInputs = [pyxdg click requests favicon pillow];
     checkInputs = [pytest];
     postInstall = ''
       mkdir -p $out/share/fish/vendor_completions.d

flake.nix

@@ -21,10 +21,15 @@
             // {
               buildInputs = with pkgs; [
                 ruff
+                xdg-utils.out
                 (python3.withPackages (ps:
                   with ps; [
                     pyxdg
+                    favicon
+                    pillow
+                    requests
                     click
+
                     pytest
                     mypy
                     black

qbpm/main.py

@@ -154,6 +154,18 @@ def list_(profile_dir: Path) -> None:
         print(profile.name)
 
 
+@main.command()
+@click.argument("profile_name")
+@click.pass_obj
+def icon(profile_dir: Path, profile_name: str) -> None:
+    """Edit a profile's config.py."""
+    profile = Profile(profile_name, profile_dir)
+    if not profile.exists():
+        error(f"profile {profile.name} not found at {profile.root}")
+        exit(1)
+    profile.root / "config" / "config.py"
+
+
 def then_launch(
     operation: Callable[..., bool],
     profile: Profile,

qbpm/operations.py

@@ -83,14 +83,17 @@ def choose(
     if not command:
         return False
 
-    selection_cmd = subprocess.Popen(
-        command,
+    selection_cmd = subprocess.run(
+        command[1],
+        input=command[0],
+        text=True,
         shell=True,
         stdout=subprocess.PIPE,
         stderr=None,
+        check=False,
     )
     out = selection_cmd.stdout
-    selection = out and out.read().decode(errors="ignore").rstrip("\n")
+    selection = out and out.rstrip("\n")
 
     if selection:
         profile = Profile(selection, profile_dir)
@@ -102,13 +105,16 @@ def choose(
 
 def menu_command(
     menu: str, profiles: list[str], qb_args: tuple[str, ...]
-) -> Optional[str]:
+) -> Optional[tuple[str | None, str]]:
     arg_string = " ".join(qb_args)
     if menu == "applescript":
         profile_list = '", "'.join(profiles)
-        return f"""osascript -e \'set profiles to {{"{profile_list}"}}
+        return (
+            None,
+            f"""osascript -e \'set profiles to {{"{profile_list}"}}
 set profile to choose from list profiles with prompt "qutebrowser: {arg_string}" default items {{item 1 of profiles}}
-item 1 of profile\'"""
+item 1 of profile\'""",
+        )
 
     prompt = "-p qutebrowser"
     command = menu
@@ -124,9 +130,11 @@ def menu_command(
             command = f"{menu} --prompt 'qutebrowser '"
         elif program == "fuzzel":
             command = f"{menu} -d"
+            profiles = [f"{p}\0icon\x1fqbpm-{p}\n" for p in profiles]
+            print(f"{profiles=}")
     exe = command.split(" ")[0]
     if not shutil.which(exe):
         error(f"command '{exe}' not found")
         return None
-    profile_list = "\n".join(profiles)
-    return f'echo "{profile_list}" | {command}'
+    profile_list = "".join(profiles)
+    return (profile_list, command)

qbpm/profiles.py

@@ -1,8 +1,13 @@
+import subprocess
 from functools import partial
 from pathlib import Path
 from sys import platform
+from tempfile import TemporaryDirectory
 from typing import Optional
 
+import favicon
+import requests
+from PIL import Image
 from xdg import BaseDirectory
 from xdg.DesktopEntry import DesktopEntry
 
@@ -82,18 +87,48 @@ def create_config(
 application_dir = Path(BaseDirectory.xdg_data_home) / "applications" / "qbpm"
 
 
-def create_desktop_file(profile: Profile) -> None:
+def create_desktop_file(profile: Profile, icon: str | None) -> None:
     desktop = DesktopEntry(str(application_dir / f"{profile.name}.desktop"))
     desktop.set("Name", f"{profile.name} (qutebrowser profile)")
     # TODO allow passing in an icon value
-    desktop.set("Icon", "qutebrowser")
+    desktop.set("Icon", icon or "qutebrowser")
     desktop.set("Exec", " ".join(profile.cmdline()) + " %u")
     desktop.set("Categories", ["Network"])
     desktop.set("Terminal", False)
     desktop.set("StartupNotify", True)
     desktop.write()
 
 
+def download_icon(profile: Profile, home_page: str) -> str | None:
+    icons = favicon.get(home_page)
+    wanted = None
+    print(icons)
+    for icon in icons:
+        if ".ico" in icon.url:
+            wanted = icon
+            print(f"chose {icon}")
+
+    tmp_dir = TemporaryDirectory()
+    work_dir = Path(tmp_dir.name)
+    fav = work_dir / "favicon.ico"
+    if wanted:
+        resp = requests.get(icon.url, timeout=10)
+        with open(fav, "wb") as im:
+            for chunk in resp.iter_content(1024):
+                im.write(chunk)
+
+    name = f"qbpm-{profile.name}"
+    image = Image.open(fav)
+    png = work_dir / "icon.png"
+    image.save(png)
+    subprocess.run(
+        f"xdg-icon-resource install --context apps {png} --size {image.size[0]} {name}",
+        shell=True,
+    )
+    # image.save(Path(BaseDirectory.save_data_path("icons")) / "hicolor" / f"{image.size[0]}x{image.size[0]}" / "apps" / f"{name}.png")
+    return name
+
+
 def ensure_profile_exists(profile: Profile, create: bool = True) -> bool:
     if profile.root.exists() and not profile.root.is_dir():
         error(f"{profile.root} is not a directory")
@@ -114,7 +149,9 @@ def new_profile(
 ) -> bool:
     if create_profile(profile, overwrite):
         create_config(profile, home_page, overwrite)
+        if home_page:
+            icon = download_icon(profile, home_page)
         if desktop_file:
-            create_desktop_file(profile)
+            create_desktop_file(profile, icon)
         return True
     return False