LESA/custum-hyprpanel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Jas Singh
2024-08-04 13:22:18 -07:00
committed by GitHub
parent b6d573ac2b
commit e51be0363f
1 changed files with 41 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
modules/menus/calendar/weather/index.ts
View File

@@ -5,11 +5,50 @@ import { TodayTemperature } from "./temperature/index.js";
import { Hourly } from "./hourly/index.js"; import { Hourly } from "./hourly/index.js";
import { Weather } from "lib/types/weather.js"; import { Weather } from "lib/types/weather.js";
import { DEFAULT_WEATHER } from "lib/types/defaults/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 { key, interval, location } = options.menus.clock.weather;
const theWeather = Variable<Weather>(DEFAULT_WEATHER); const theWeather = Variable<Weather>(DEFAULT_WEATHER);
let weatherIntervalInstance: null | number = null;
const weatherIntervalFn = (weatherInterval: number, loc: string, weatherKey: string) => {
if (weatherIntervalInstance !== null) {
GLib.source_remove(weatherIntervalInstance);
}
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"`,
)
.then((res) => {
try {
if (typeof res !== "string") {
return theWeather.value = DEFAULT_WEATHER;
}
const parsedWeather = JSON.parse(res);
if (Object.keys(parsedWeather).includes("error")) {
return theWeather.value = DEFAULT_WEATHER;
}
return theWeather.value = parsedWeather;
} catch (error) {
theWeather.value = DEFAULT_WEATHER;
console.warn(`Failed to parse weather data: ${error}`);
}
})
.catch((err) => {
console.error(`Failed to fetch weather: ${err}`);
theWeather.value = DEFAULT_WEATHER;
});
})
};
const WeatherWidget = () => { const WeatherWidget = () => {
return Widget.Box({ return Widget.Box({
class_name: "calendar-menu-item-container weather", class_name: "calendar-menu-item-container weather",
@@ -22,34 +61,7 @@ const WeatherWidget = () => {
if (!weatherKey) { if (!weatherKey) {
return theWeather.value = DEFAULT_WEATHER; return theWeather.value = DEFAULT_WEATHER;
} }
Utils.interval(weatherInterval, () => { weatherIntervalFn(weatherInterval, loc, weatherKey);
const formattedLocation = loc.replace(" ", "%20");
Utils.execAsync(
`curl "https://api.weatherapi.com/v1/forecast.json?key=${weatherKey}&q=${formattedLocation}&days=1&aqi=no&alerts=no"`,
)
.then((res) => {
try {
if (typeof res !== "string") {
return theWeather.value = DEFAULT_WEATHER;
}
const parsedWeather = JSON.parse(res);
if (Object.keys(parsedWeather).includes("error")) {
return theWeather.value = DEFAULT_WEATHER;
}
return theWeather.value = parsedWeather;
} catch (error) {
theWeather.value = DEFAULT_WEATHER;
console.warn(`Failed to parse weather data: ${error}`);
}
})
.catch((err) => {
console.error(`Failed to fetch weather: ${err}`);
theWeather.value = DEFAULT_WEATHER;
});
});
}, },
); );