From 1cc7e12a57e207517334f3526757382dd7978b9d Mon Sep 17 00:00:00 2001 From: 2 * r + 2 * t <61896496+soramanew@users.noreply.github.com> Date: Wed, 9 Apr 2025 15:27:05 +1000 Subject: feat: load news and calendars from cache on startup Also check calendars for cache before trying to load --- src/services/calendar.ts | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) (limited to 'src/services/calendar.ts') diff --git a/src/services/calendar.ts b/src/services/calendar.ts index a2cdd30..d5e0329 100644 --- a/src/services/calendar.ts +++ b/src/services/calendar.ts @@ -134,7 +134,8 @@ export default class Calendar extends GObject.Object { icalStr = cal.value; } else { console.error(`Failed to get calendar from ${config.webcals.get()[i]}:\n${cal.reason}`); - icalStr = await readFileAsync(`${this.#cacheDir}/${webcal}`); + if (GLib.file_test(`${this.#cacheDir}/${webcal}`, GLib.FileTest.EXISTS)) + icalStr = await readFileAsync(`${this.#cacheDir}/${webcal}`); } if (icalStr) { @@ -202,6 +203,23 @@ export default class Calendar extends GObject.Object { GLib.mkdir_with_parents(this.#cacheDir, 0o755); + const cals = config.webcals.get().map(async c => { + const webcal = pathToFileName(c); + + if (GLib.file_test(`${this.#cacheDir}/${webcal}`, GLib.FileTest.EXISTS)) { + const data = await readFileAsync(`${this.#cacheDir}/${webcal}`); + const comp = new ical.Component(ical.parse(data)); + const name = (comp.getFirstPropertyValue("x-wr-calname") ?? `Calendar ${this.#calCount++}`) as string; + this.#calendars[name] = comp; + } + }); + Promise.allSettled(cals).then(() => { + this.#cachedEvents = {}; + this.#cachedMonths.clear(); + this.notify("calendars"); + this.updateUpcoming(); + }); + this.updateCalendars().catch(console.error); config.webcals.subscribe(() => this.updateCalendars().catch(console.error)); config.upcomingDays.subscribe(() => this.updateUpcoming()); -- cgit v1.2.3-freya