nosignal/nosignal-shell
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

schemes: fix updating taking ages

Browse source 
Cause it was being called for every file change
So instead of updating all, just update changed
Also async update all
This commit is contained in:
2 * r + 2 * t 2025-03-23 20:00:27 +11:00
parent d9c618701c
commit 431918b752
2 changed files with 37 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/services/schemes.ts
View file

@ -1,6 +1,6 @@
import { basename } from "@/utils/strings";
import { monitorDirectory } from "@/utils/system";
import { execAsync, GLib, GObject, property, readFileAsync, register } from "astal";
import { execAsync, Gio, GLib, GObject, property, readFileAsync, register } from "astal";
import type { IPalette } from "./palette";
export interface Colours {
@ -80,10 +80,25 @@ export default class Schemes extends GObject.Object {
async update() {
const schemes = await execAsync(`find ${this.#schemeDir}/ -mindepth 1 -maxdepth 1 -type d`);
for (const scheme of schemes.split("\n")) {
const name = basename(scheme);
this.#map[name] = await this.parseScheme(name);
}
(await Promise.all(schemes.split("\n").map(s => this.parseScheme(basename(s))))).forEach(
s => (this.#map[s.name] = s)
);
this.notify("map");
}
async updateFile(file: Gio.File) {
if (file.get_basename() !== "light.txt" && file.get_basename() !== "dark.txt") return;
const mode = file.get_basename()!.slice(0, -4) as "light" | "dark";
const parent = file.get_parent()!;
const parentParent = parent.get_parent()!;
if (parentParent.get_basename() === "schemes")
this.#map[parent.get_basename()!].colours![mode] = await this.parseMode(file.get_path()!);
else
this.#map[parentParent.get_basename()!].flavours![parent.get_basename()!].colours![mode] =
await this.parseMode(file.get_path()!);
this.notify("map");
}
@ -91,6 +106,8 @@ export default class Schemes extends GObject.Object {
super();
this.update().catch(console.error);
this.#monitor = monitorDirectory(this.#schemeDir, () => this.update().catch(console.error), true);
this.#monitor = monitorDirectory(this.#schemeDir, (_m, file, _f, type) => {
if (type !== Gio.FileMonitorEvent.DELETED) this.updateFile(file).catch(console.error);
});
}
}

17
src/utils/system.ts
View file

@ -76,10 +76,21 @@ export const bindCurrentTime = (
return bind(time);
};
export const monitorDirectory = (path: string, callback: (path: string) => void, recursive?: boolean) => {
export const monitorDirectory = (
path: string,
callback: (
source: Gio.FileMonitor,
file: Gio.File,
other_file: Gio.File | null,
type: Gio.FileMonitorEvent
) => void,
recursive: boolean = true
) => {
const file = Gio.file_new_for_path(path.replace("~", HOME));
const monitor = file.monitor_directory(Gio.FileMonitorFlags.WATCH_MOUNTS | Gio.FileMonitorFlags.WATCH_MOVES, null);
monitor.connect("changed", callback);
const monitor = file.monitor_directory(null, null);
monitor.connect("changed", (m, f1, f2, t) => {
if (t === Gio.FileMonitorEvent.CHANGES_DONE_HINT || t === Gio.FileMonitorEvent.DELETED) callback(m, f1, f2, t);
});
if (recursive) {
const enumerator = file.enumerate_children("standard::*", null, null);