Karl/homepage
1
0
Fork 0
mirror of https://github.com/karl0ss/homepage.git synced 2025-05-03 14:03:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'benphelps:main' into main

Browse Source
This commit is contained in:
Karl0ss 2023-06-08 08:42:46 +01:00 committed by GitHub
commit a09283ca60
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/utils/config/service-helpers.js
View File

@ -63,10 +63,10 @@ export async function servicesFromDocker() {
const serviceServers = await Promise.all( const serviceServers = await Promise.all(
Object.keys(servers).map(async (serverName) => { Object.keys(servers).map(async (serverName) => {
try { try {
const isSwarm = !!servers[serverName].swarm;
const docker = new Docker(getDockerArguments(serverName).conn); const docker = new Docker(getDockerArguments(serverName).conn);
const containers = await docker.listContainers({ const listProperties = { all: true };
all: true, const containers = await ((isSwarm) ? docker.listServices(listProperties) : docker.listContainers(listProperties));
});
// bad docker connections can result in a <Buffer ...> object? // bad docker connections can result in a <Buffer ...> object?
// in any case, this ensures the result is the expected array // in any case, this ensures the result is the expected array
@ -76,17 +76,19 @@ export async function servicesFromDocker() {
const discovered = containers.map((container) => { const discovered = containers.map((container) => {
let constructedService = null; let constructedService = null;
const containerLabels = isSwarm ? shvl.get(container, 'Spec.Labels') : container.Labels;
const containerName = isSwarm ? shvl.get(container, 'Spec.Name') : container.Names[0];
Object.keys(container.Labels).forEach((label) => { Object.keys(containerLabels).forEach((label) => {
if (label.startsWith("homepage.")) { if (label.startsWith("homepage.")) {
if (!constructedService) { if (!constructedService) {
constructedService = { constructedService = {
container: container.Names[0].replace(/^\//, ""), container: containerName.replace(/^\//, ""),
server: serverName, server: serverName,
type: 'service' type: 'service'
}; };
} }
shvl.set(constructedService, label.replace("homepage.", ""), substituteEnvironmentVars(container.Labels[label])); shvl.set(constructedService, label.replace("homepage.", ""), substituteEnvironmentVars(containerLabels[label]));
} }
}); });

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) { if (options && options[1]?.refreshInterval) {
config.refreshInterval = 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 // make the data error the top-level error
return { data, error: data?.error ?? error, mutate } 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 { 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: wantedData, error: wantedError } = useWidgetAPI(widget, "wanted/missing");
const { data: queueData, error: queueError } = useWidgetAPI(widget, "queue/status"); const { data: queueData, error: queueError } = useWidgetAPI(widget, "queue/status");
@ -18,7 +20,7 @@ export default function Component({ service }) {
return <Container service={service} error={finalError} />; return <Container service={service} error={finalError} />;
} }
if (!albumsData || !wantedData || !queueData) { if ((showAlbums && !albumsData) || !wantedData || !queueData) {
return ( return (
<Container service={service}> <Container service={service}>
<Block label="lidarr.wanted" /> <Block label="lidarr.wanted" />
@ -32,7 +34,7 @@ export default function Component({ service }) {
<Container service={service}> <Container service={service}>
<Block label="lidarr.wanted" value={t("common.number", { value: wantedData.totalRecords })} /> <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.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> </Container>
); );
} }