mirror of
https://github.com/DI0IK/homepage-plus.git
synced 2025-07-10 15:28:47 +00:00
Unify uptime formatting (#2483)
This commit is contained in:
parent
24e25e8953
commit
e768b1c83a
5 changed files with 36 additions and 62 deletions
|
@ -6,30 +6,6 @@ import useWidgetAPI from "utils/proxy/use-widget-api";
|
|||
|
||||
export const fritzboxDefaultFields = ["connectionStatus", "uptime", "maxDown", "maxUp"];
|
||||
|
||||
const formatUptime = (uptimeInSeconds) => {
|
||||
const days = Math.floor(uptimeInSeconds / (3600 * 24));
|
||||
const hours = Math.floor((uptimeInSeconds % (3600 * 24)) / 3600);
|
||||
const minutes = Math.floor((uptimeInSeconds % 3600) / 60);
|
||||
const seconds = Math.floor(uptimeInSeconds) % 60;
|
||||
const format = (num) => String(num).padStart(2, "0");
|
||||
|
||||
let uptimeStr = "";
|
||||
if (days) {
|
||||
uptimeStr += `${days}d`;
|
||||
}
|
||||
if (uptimeInSeconds >= 3600) {
|
||||
uptimeStr += `${format(hours)}h`;
|
||||
}
|
||||
if (uptimeInSeconds >= 60) {
|
||||
uptimeStr += `${format(minutes)}m`;
|
||||
}
|
||||
if (!days) {
|
||||
uptimeStr += `${format(seconds)}s `;
|
||||
}
|
||||
|
||||
return uptimeStr;
|
||||
};
|
||||
|
||||
export default function Component({ service }) {
|
||||
const { t } = useTranslation();
|
||||
const { widget } = service;
|
||||
|
@ -68,7 +44,7 @@ export default function Component({ service }) {
|
|||
return (
|
||||
<Container service={service}>
|
||||
<Block label="fritzbox.connectionStatus" value={t(`fritzbox.connectionStatus${fritzboxData.connectionStatus}`)} />
|
||||
<Block label="fritzbox.uptime" value={formatUptime(fritzboxData.uptime)} />
|
||||
<Block label="fritzbox.uptime" value={t("common.uptime", { value: fritzboxData.uptime })} />
|
||||
<Block label="fritzbox.maxDown" value={t("common.byterate", { value: fritzboxData.maxDown / 8, decimals: 1 })} />
|
||||
<Block label="fritzbox.maxUp" value={t("common.byterate", { value: fritzboxData.maxUp / 8, decimals: 1 })} />
|
||||
<Block label="fritzbox.down" value={t("common.byterate", { value: fritzboxData.down, decimals: 1 })} />
|
||||
|
|
|
@ -4,24 +4,6 @@ import Container from "components/services/widget/container";
|
|||
import Block from "components/services/widget/block";
|
||||
import useWidgetAPI from "utils/proxy/use-widget-api";
|
||||
|
||||
function secondsToDhms(seconds) {
|
||||
const d = Math.floor(seconds / (3600 * 24));
|
||||
const h = Math.floor((seconds % (3600 * 24)) / 3600);
|
||||
const m = Math.floor((seconds % 3600) / 60);
|
||||
const s = Math.floor(seconds % 60);
|
||||
|
||||
const dDisplay = d > 0 ? d + (d === 1 ? " day, " : " days, ") : "";
|
||||
const hDisplay = h > 0 ? h + (h === 1 ? " hr, " : " hrs, ") : "";
|
||||
let mDisplay = m > 0 && d === 0 ? m + (m === 1 ? " min" : " mins") : "";
|
||||
let sDisplay = "";
|
||||
|
||||
if (d === 0 && h === 0) {
|
||||
mDisplay = m > 0 ? m + (m === 1 ? " min, " : " mins, ") : "";
|
||||
sDisplay = s > 0 ? s + (s === 1 ? " sec" : " secs") : "";
|
||||
}
|
||||
return (dDisplay + hDisplay + mDisplay + sDisplay).replace(/,\s*$/, "");
|
||||
}
|
||||
|
||||
export default function Component({ service }) {
|
||||
const { widget } = service;
|
||||
const { t } = useTranslation();
|
||||
|
@ -68,7 +50,7 @@ export default function Component({ service }) {
|
|||
break;
|
||||
case 2:
|
||||
status = t("uptimerobot.up");
|
||||
uptime = secondsToDhms(monitor.logs[0].duration);
|
||||
uptime = t("common.uptime", { value: monitor.logs[0].duration });
|
||||
logIndex = 1;
|
||||
break;
|
||||
case 8:
|
||||
|
@ -83,7 +65,7 @@ export default function Component({ service }) {
|
|||
}
|
||||
|
||||
const lastDown = new Date(monitor.logs[logIndex].datetime * 1000).toLocaleString();
|
||||
const downDuration = secondsToDhms(monitor.logs[logIndex].duration);
|
||||
const downDuration = t("common.uptime", { value: monitor.logs[logIndex].duration });
|
||||
const hideDown = logIndex === 1 && monitor.logs[logIndex].type !== 1;
|
||||
|
||||
return (
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue