Fix stacking interval - resolves: #76 (#77)

modules/menus/calendar/weather/index.ts

@@ -5,25 +5,22 @@ import { TodayTemperature } from "./temperature/index.js";
 import { Hourly } from "./hourly/index.js";
 import { Weather } from "lib/types/weather.js";
 import { DEFAULT_WEATHER } from "lib/types/defaults/weather.js";
+import GLib from "gi://GLib?version=2.0"
 
 const { key, interval, location } = options.menus.clock.weather;
 
 const theWeather = Variable<Weather>(DEFAULT_WEATHER);
 
-const WeatherWidget = () => {
+let weatherIntervalInstance: null | number = null;
-    return Widget.Box({
+
-        class_name: "calendar-menu-item-container weather",
+const weatherIntervalFn = (weatherInterval: number, loc: string, weatherKey: string) => {
-        child: Widget.Box({
+    if (weatherIntervalInstance !== null) {
-            class_name: "weather-container-box",
+        GLib.source_remove(weatherIntervalInstance);
-            setup: (self) => {
-                Utils.merge(
-                    [key.bind("value"), interval.bind("value"), location.bind("value")],
-                    (weatherKey, weatherInterval, loc) => {
-                        if (!weatherKey) {
-                            return theWeather.value = DEFAULT_WEATHER;
     }
-                        Utils.interval(weatherInterval, () => {
+
     const formattedLocation = loc.replace(" ", "%20");
+
+    weatherIntervalInstance = Utils.interval(weatherInterval, () => {
         Utils.execAsync(
             `curl "https://api.weatherapi.com/v1/forecast.json?key=${weatherKey}&q=${formattedLocation}&days=1&aqi=no&alerts=no"`,
         )
@@ -49,7 +46,22 @@ const WeatherWidget = () => {
                 console.error(`Failed to fetch weather: ${err}`);
                 theWeather.value = DEFAULT_WEATHER;
             });
-                        });
+    })
+};
+
+const WeatherWidget = () => {
+    return Widget.Box({
+        class_name: "calendar-menu-item-container weather",
+        child: Widget.Box({
+            class_name: "weather-container-box",
+            setup: (self) => {
+                Utils.merge(
+                    [key.bind("value"), interval.bind("value"), location.bind("value")],
+                    (weatherKey, weatherInterval, loc) => {
+                        if (!weatherKey) {
+                            return theWeather.value = DEFAULT_WEATHER;
+                        }
+                        weatherIntervalFn(weatherInterval, loc, weatherKey);
                     },
                 );