move options to their service instances

add icons config option

Author: Aylur

src/app.ts

@@ -9,20 +9,43 @@ import Utils from './utils.js';
 import { timeout, readFileAsync } from './utils.js';
 import { loadInterfaceXML } from './utils.js';
 
+function deprecated(config: Config) {
+    const warning = (from: string, to: string) => console.warn(
+        `${from} config option has been removed: use ${to} instead`);
+
+    if (config.notificationPopupTimeout !== undefined)
+        warning('notificationPopupTimeout', 'Notifications.popupTimeout');
+
+    if (config.notificationForceTimeout !== undefined)
+        warning('notificationForceTimeout', 'Notifications.forceTimeout');
+
+    if (config.cacheNotificationActions !== undefined)
+        warning('cacheNotificationActions', 'Notifications.cacheActions');
+
+    if (config.cacheCoverArt !== undefined)
+        warning('cacheCoverArt', 'Mpris.cacheCoverArt');
+
+    if (config.maxStreamVolume !== undefined)
+        warning('cacheCoverArt', 'Audio.maxStreamVolume');
+}
+
 const AgsIFace = (bus: string) =>
     loadInterfaceXML('com.github.Aylur.ags')?.replace('@BUS@', bus);
 
 export interface Config<W extends Gtk.Window = Gtk.Window> {
     windows?: W[]
     style?: string
+    icons?: string
+    onWindowToggled?: (windowName: string, visible: boolean) => void
+    onConfigParsed?: (app: App) => void
+    closeWindowDelay: { [key: string]: number }
+
+    // FIXME: deprecated
     notificationPopupTimeout: number
     notificationForceTimeout: boolean
     cacheNotificationActions: boolean
     cacheCoverArt: boolean
-    closeWindowDelay: { [key: string]: number }
     maxStreamVolume: number
-    onWindowToggled?: (windowName: string, visible: boolean) => void,
-    onConfigParsed?: (app: App) => void,
 }
 
 export class App extends Gtk.Application {
@@ -34,19 +57,16 @@ export class App extends Gtk.Application {
     }
 
     private _dbus!: Gio.DBusExportedObject;
-    private _closeDelay!: { [key: string]: number };
+    private _closeDelay!: Config['closeWindowDelay'];
     private _cssProviders: Gtk.CssProvider[] = [];
     private _objectPath!: string;
-
     private _windows: Map<string, Gtk.Window> = new Map();
     private _configPath!: string;
     private _configDir!: string;
-    private _config!: Config;
 
-    get windows() { return this._windows; }
+    get windows() { return [...this._windows.values()]; }
     get configPath() { return this._configPath; }
     get configDir() { return this._configDir; }
-    get config() { return this._config; }
 
     resetCss() {
         const screen = Gdk.Screen.get_default();
@@ -190,36 +210,26 @@ export class App extends Gtk.Application {
 
     private async _load() {
         try {
-            const mod = await import(`file://${this.configPath}`);
-            const config = mod.default as Config;
-            config.closeWindowDelay ??= {};
-            config.notificationPopupTimeout ??= 3000;
-            config.notificationForceTimeout ??= false;
-            config.maxStreamVolume ??= 1.5;
-            config.cacheNotificationActions ??= false;
-            config.cacheCoverArt ??= true;
-            this._config = config;
-
+            const entry = await import(`file://${this.configPath}`);
+            const config = entry.default as Config;
             if (!config) {
                 console.error('Missing default export');
-                this.emit('config-parsed');
-                return;
+                return this.emit('config-parsed');
             }
 
-            this._closeDelay = config.closeWindowDelay;
+            // FIXME:
+            deprecated(config);
+
+            this._closeDelay = config?.closeWindowDelay || {};
 
             if (config.style) {
                 this.applyCss(config.style.startsWith('.')
                     ? `${this.configDir}${config.style.slice(1)}`
                     : config.style);
             }
 
-            if (config.windows && !Array.isArray(config.windows)) {
-                console.error('windows attribute has to be an array, ' +
-                    `but it is a ${typeof config.windows}`);
-                this.emit('config-parsed');
-                return;
-            }
+            if (config.icons)
+                Gtk.IconTheme.get_default().append_search_path(config.icons);
 
             if (typeof config.onWindowToggled === 'function')
                 this.connect('window-toggled', (_, n, v) => config.onWindowToggled!(n, v));

src/service/audio.ts

@@ -1,7 +1,6 @@
 import Service from '../service.js';
 import GObject from 'gi://GObject';
 import Gvc from 'gi://Gvc';
-import App from '../app.js';
 import { bulkConnect, bulkDisconnect } from '../utils.js';
 
 const _MIXER_CONTROL_STATE = {
@@ -89,8 +88,8 @@ export class Stream extends Service {
     }
 
     set volume(value) { // 0..100
-        if (value > (App.config.maxStreamVolume))
-            value = (App.config.maxStreamVolume);
+        if (value > (audio.maxStreamVolume))
+            value = (audio.maxStreamVolume);
 
         if (value < 0)
             value = 0;
@@ -123,6 +122,8 @@ export class Audio extends Service {
         });
     }
 
+    maxStreamVolume = 1.5;
+
     private _control: Gvc.MixerControl;
     private _streams: Map<number, Stream>;
     private _streamBindings: Map<number, number>;

src/service/mpris.ts

@@ -1,6 +1,5 @@
 import GLib from 'gi://GLib';
 import Gio from 'gi://Gio';
-import App from '../app.js';
 import Service from '../service.js';
 import { ensureDirectory, idle } from '../utils.js';
 import { CACHE_DIR } from '../utils.js';
@@ -178,7 +177,7 @@ export class MprisPlayer extends Service {
     }
 
     private _cacheCoverArt() {
-        if (!App.config.cacheCoverArt || this._trackCoverUrl === '')
+        if (!mpris.cacheCoverArt || this._trackCoverUrl === '')
             return;
 
         this._coverPath = MEDIA_CACHE_PATH + '/' +
@@ -276,6 +275,8 @@ export class Mpris extends Service {
         });
     }
 
+    cacheCoverArt = true;
+
     private _proxy: DBusProxy;
     private _players: Map<string, MprisPlayer> = new Map;
 

src/service/notifications.ts

@@ -2,7 +2,6 @@ import Gio from 'gi://Gio';
 import GdkPixbuf from 'gi://GdkPixbuf';
 import GLib from 'gi://GLib';
 import Service from '../service.js';
-import App from '../app.js';
 import {
     CACHE_DIR, ensureDirectory,
     loadInterfaceXML, readFileAsync,
@@ -209,7 +208,7 @@ export class Notification extends Service {
             this.close();
     }
 
-    toJson(cacheActions = App.config.cacheNotificationActions): NotifcationJson {
+    toJson(cacheActions = notifications.cacheActions): NotifcationJson {
         return {
             actionIcons: this._actionIcons,
             actions: cacheActions ? this._actions : [],
@@ -294,6 +293,10 @@ export class Notifications extends Service {
         });
     }
 
+    popupTimeout = 3000;
+    forceTimeout = false;
+    cacheActions = false;
+
     private _dbus!: Gio.DBusExportedObject;
     private _notifications: Map<number, Notification>;
     private _dnd = false;
@@ -348,9 +351,9 @@ export class Notifications extends Service {
         const id = replacesId || this._idCount++;
         const n = new Notification(appName, id, appIcon, summary, body, acts, hints, !this.dnd);
 
-        if (App.config.notificationForceTimeout || expiration === -1) {
-            n.timeout = App.config.notificationPopupTimeout;
-            timeout(App.config.notificationPopupTimeout, () => this.DismissNotification(id));
+        if (this.forceTimeout || expiration === -1) {
+            n.timeout = this.popupTimeout;
+            timeout(this.popupTimeout, () => this.DismissNotification(id));
         } else {
             n.timeout = expiration;
             if (expiration > 0)

src/utils/init.ts

@@ -120,7 +120,8 @@ export async function init(configDir: string, entry: string) {
                 conf.compilerOptions.typeRoots = [...list, './types'];
 
             await writeFile(JSON.stringify(conf, null, 2), tsconfig);
-        } finally {
+        } catch (err) {
+            logError(err);
             console.warn(tsconfigWarning);
         }
     }