0ct0pu5/homepage
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #1583 from benphelps/fix/issue-1577

Browse source 
Fix: potentially avoid `album` api call in lidarr widget, allow useWidgetAPI to not actually send a request
This commit is contained in:
shamoon 2023-06-07 14:23:49 -07:00 • committed by GitHub
commit 3383b553d5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/utils/proxy/use-widget-api.js
View file

@ -7,7 +7,11 @@ export default function useWidgetAPI(widget, ...options) {
if (options && options[1]?.refreshInterval) {
config.refreshInterval = options[1].refreshInterval;
}
const { data, error, mutate } = useSWR(formatProxyUrl(widget, ...options), config);
let url = formatProxyUrl(widget, ...options)
if (options[0] === "") {
url = null
}
const { data, error, mutate } = useSWR(url, config);
// make the data error the top-level error
return { data, error: data?.error ?? error, mutate }
}

8
src/widgets/lidarr/component.jsx
View file

@ -9,7 +9,9 @@ export default function Component({ service }) {
const { widget } = service;
const { data: albumsData, error: albumsError } = useWidgetAPI(widget, "album");
// album API endpoint can get massive, so we prevent calling if not included in fields see https://github.com/benphelps/homepage/discussions/1577
const showAlbums = widget.fields?.includes('albums') || !widget.fields;
const { data: albumsData, error: albumsError } = useWidgetAPI(widget, showAlbums ? "album" : "");
const { data: wantedData, error: wantedError } = useWidgetAPI(widget, "wanted/missing");
const { data: queueData, error: queueError } = useWidgetAPI(widget, "queue/status");
@ -18,7 +20,7 @@ export default function Component({ service }) {
return <Container service={service} error={finalError} />;
}
if (!albumsData || !wantedData || !queueData) {
if ((showAlbums && !albumsData) || !wantedData || !queueData) {
return (
<Container service={service}>
<Block label="lidarr.wanted" />
@ -32,7 +34,7 @@ export default function Component({ service }) {
<Container service={service}>
<Block label="lidarr.wanted" value={t("common.number", { value: wantedData.totalRecords })} />
<Block label="lidarr.queued" value={t("common.number", { value: queueData.totalCount })} />
<Block label="lidarr.albums" value={t("common.number", { value: albumsData.have })} />
{showAlbums && <Block label="lidarr.albums" value={t("common.number", { value: albumsData?.have })} />}
</Container>
);
}