@domicile-desktop/system-apps 0.0.0-alpha-0bb6b376cd01 → 0.0.0-alpha-8d9d380ea456

package/README.md

@@ -29,13 +29,13 @@ const editors = findApps(apps, "edit", 50);
 | `./installed` | Every desktop entry under them; an earlier directory hides a later one's ID. |
 | `./desktop-entry` | One entry parsed: name, comment, argv, icon and `X-Domicile-Preview`. |
 | `./find-apps`, `./bookmark` | The launcher's matching and ranking; bookmarks and their Zod schema. |
-| `./describe-apps` | Application IDs named and drawn by their entries, for a shell to say who asks. |
+| `./describe-apps` | Application IDs named and drawn by their entries, in the config's icon theme, for a shell to say who asks. |
 | `./mime-apps` | A content type's default applications from every `mimeapps.list`, the desktop's own (`domicile-mimeapps.list`) first. |
 | `./openers` | The applications that open a file, its default first, and the argv each opens it with. The type comes from shared-mime-info's `mime/globs2`, by name. |
 | `./omit` | Desktop file IDs left out, as globs. |
 | `./app-icons` | Icon names resolved to `data:` URLs (PNG, SVG, 128 KiB at most) by the icon theme spec: a theme, its `Inherits`, `hicolor`, then `pixmaps`, at the size asked for, in `apps` or the contexts given. `themedIcons` falls back to `<name>-symbolic` and says which icons are symbolic. Pass the theme `readIconTheme` reads. |
 | `./favicon`, `./curl`, `./favicons` | A bookmark's icon: picked from the page, fetched with `curl`, kept and retried. |
-| `./fake-system` | A `System` over an in-memory tree, for tests. |
+| `./fake-system` | A `System` over an in-memory tree, for tests. Its Settings portal serves the icon theme it is given. |
 
 - Calls resolve `Result`s with the SDK's `SystemError`; a missing or
   unreadable file or directory is skipped, as the specs say.

package/package.json

@@ -1,7 +1,7 @@
 {
   "dependencies": {
     "@cprussin/option-result": "^2.0.1",
-    "@domicile-desktop/sdk": "0.0.0-alpha-0bb6b376cd01",
+    "@domicile-desktop/sdk": "0.0.0-alpha-8d9d380ea456",
     "zod": "^4.5.4"
   },
   "description": "Installed applications and bookmarks for a Domicile shell's launcher, read through @domicile-desktop/sdk/system.",
@@ -48,5 +48,5 @@
     "test:unit": "bun test"
   },
   "type": "module",
-  "version": "0.0.0-alpha-0bb6b376cd01"
+  "version": "0.0.0-alpha-8d9d380ea456"
 }

package/src/describe-apps.ts

@@ -3,6 +3,7 @@
 
 import type { Option } from "@cprussin/option-result";
 import { None, Ok, Result } from "@cprussin/option-result";
+import { readIconTheme } from "@domicile-desktop/sdk/icon-theme";
 import type { System, SystemError } from "@domicile-desktop/sdk/system";
 
 import type { IconLookup } from "./app-icons";
@@ -21,24 +22,45 @@ export type DescribedApp = {
   icon: string | undefined;
 };
 
-/** Each of `ids`, in order, described by its installed desktop entry. */
+/**
+ * Each of `ids`, in order, described by its installed desktop entry, with its
+ * icon from the config's icon theme.
+ */
 export const describeApps = async (
   system: System,
   ids: readonly string[],
+): Promise<Result<DescribedApp[], SystemError>> => {
+  const [dirs, theme] = await Promise.all([
+    dataDirs(system),
+    readIconTheme(system),
+  ]);
+  return dirs.andThenAsync((found) =>
+    theme.andThenAsync((named) =>
+      describedIn(
+        system,
+        found,
+        appIcons(system, found, ["apps"], {
+          theme: named.match({ None: () => undefined, Some: (name) => name }),
+        }),
+        ids,
+      ),
+    ),
+  );
+};
+
+/** Each of `ids` described by its entry under `dirs`, drawn by `icons`. */
+const describedIn = async (
+  system: System,
+  dirs: readonly string[],
+  icons: IconLookup,
+  ids: readonly string[],
 ): Promise<Result<DescribedApp[], SystemError>> =>
-  (await dataDirs(system)).andThenAsync(async (dirs) => {
-    const icons = appIcons(system, dirs);
-    return (await installedApps(system, dirs)).andThenAsync(
-      async (installed) => {
-        const entries = new Map(
-          installed.map((entry) => [entry.id.replace(/\.desktop$/, ""), entry]),
-        );
-        return Result.collect(
-          await Promise.all(
-            ids.map((id) => described(icons, id, entries.get(id))),
-          ),
-        );
-      },
+  (await installedApps(system, dirs)).andThenAsync(async (installed) => {
+    const entries = new Map(
+      installed.map((entry) => [entry.id.replace(/\.desktop$/, ""), entry]),
+    );
+    return Result.collect(
+      await Promise.all(ids.map((id) => described(icons, id, entries.get(id)))),
     );
   });
 

package/src/fake-system.ts

@@ -3,6 +3,7 @@
 import type { Result } from "@cprussin/option-result";
 import { Err, Ok } from "@cprussin/option-result";
 import type {
+  DbusBody,
   DirEntry,
   Ran,
   Stat,
@@ -36,13 +37,18 @@ export type FakeSystem = System & {
 
 type Tree = Readonly<Record<string, Node>>;
 
+/** The Settings portal interface `readIconTheme` reads. */
+const SETTINGS = "org.freedesktop.impl.portal.Settings";
+
 /**
  * A system whose files are `tree`, keyed by path, with the directories
- * between them implied. `spawned` answers `spawn` and `run`.
+ * between them implied. `spawned` answers `spawn` and `run`. Its Settings
+ * portal serves `iconTheme`, or no icon theme when `undefined`.
  */
 export const fakeSystem = (
   tree: Tree,
   spawned: (argv: readonly string[]) => Spawned = unexpected,
+  iconTheme: string | undefined = undefined,
 ): FakeSystem => {
   const touched: string[] = [];
   const at = (path: string): Result<Found, SystemError> => {
@@ -56,7 +62,10 @@ export const fakeSystem = (
         : Err({ kind: SystemErrorKind.IsADirectory, message: path }),
     );
   return {
-    dbusCall: unexpected,
+    dbusCall: (call) =>
+      call.interface === SETTINGS && call.member === "ReadAll"
+        ? Promise.resolve(Ok(settings(iconTheme)))
+        : unexpected(),
     dbusMatch: unexpected,
     readDir: (path) =>
       Promise.resolve(
@@ -107,6 +116,20 @@ export const fakeSystem = (
   };
 };
 
+/** `ReadAll`'s answer for `org.gnome.desktop.interface`. */
+const settings = (iconTheme: string | undefined): DbusBody => ({
+  body: [
+    iconTheme === undefined
+      ? {}
+      : {
+          "org.gnome.desktop.interface": {
+            "icon-theme": { signature: "s", value: iconTheme },
+          },
+        },
+  ],
+  signature: "a{sa{sv}}",
+});
+
 /** A file's contents, or the directory a path resolved to. */
 type Found = string | Uint8Array | { directory: string };