diff --git a/docs/widgets/services/aria2.md b/docs/widgets/services/aria2.md index 054cda2a..68d9a22b 100644 --- a/docs/widgets/services/aria2.md +++ b/docs/widgets/services/aria2.md @@ -5,14 +5,14 @@ description: Aria2 Widget Configuration Learn more about [Aria2](https://github.com/aria2/aria2). -Find your API key in aria2c configuration file `aria2c.conf`: `rpc-secret`. +Find your API key in aria2 configuration file `aria2c.conf`: `rpc-secret`. To make it work, JSON RPC in Aria2 should be enabled. Optionally, `jsonrpc` endpoint path could be adjusted via `endpoint` widget config. ```yaml widget: - type: aria2c - url: http://aria2c.host.or.ip + type: aria2 + url: http://aria2.host.or.ip key: apikey ``` diff --git a/public/locales/en/common.json b/public/locales/en/common.json index 8684cd0b..1712a18a 100644 --- a/public/locales/en/common.json +++ b/public/locales/en/common.json @@ -1008,10 +1008,10 @@ "merges": "Merge Requests", "projects": "Projects" }, - "aria2c": { + "aria2": { "active": "Active", "waiting": "Waiting", - "download": "↓", - "upload": "↑" + "download": "Download", + "upload": "Upload" } } diff --git a/src/widgets/aria2/component.jsx b/src/widgets/aria2/component.jsx new file mode 100644 index 00000000..33dc39ac --- /dev/null +++ b/src/widgets/aria2/component.jsx @@ -0,0 +1,37 @@ +import { useTranslation } from "next-i18next"; + +import Container from "components/services/widget/container"; +import Block from "components/services/widget/block"; +import useWidgetAPI from "utils/proxy/use-widget-api"; + +export default function Component({ service }) { + const { t } = useTranslation(); + + const { widget } = service; + + const { data: aria2Data, error: aria2Error } = useWidgetAPI(widget); + + if (aria2Error) { + return ; + } + + if (!aria2Data) { + return ( + + + + + + + ); + } + + return ( + + + + + + + ); +} diff --git a/src/widgets/aria2c/proxy.js b/src/widgets/aria2/proxy.js similarity index 96% rename from src/widgets/aria2c/proxy.js rename to src/widgets/aria2/proxy.js index cba9e0bb..a2e24853 100644 --- a/src/widgets/aria2c/proxy.js +++ b/src/widgets/aria2/proxy.js @@ -56,7 +56,7 @@ export default async function ariaProxyHandler(req, res) { return res.status(200).send(rawData.result); } catch (e) { - return res.status(500).json({ error: { message: e?.toString() ?? "Error parsing aria2c rpc data", url, data } }); + return res.status(500).json({ error: { message: e?.toString() ?? "Error parsing aria2 rpc data", url, data } }); } } } diff --git a/src/widgets/aria2c/widget.js b/src/widgets/aria2/widget.js similarity index 100% rename from src/widgets/aria2c/widget.js rename to src/widgets/aria2/widget.js diff --git a/src/widgets/aria2c/component.jsx b/src/widgets/aria2c/component.jsx deleted file mode 100644 index 1539ea4f..00000000 --- a/src/widgets/aria2c/component.jsx +++ /dev/null @@ -1,37 +0,0 @@ -import { useTranslation } from "next-i18next"; - -import Container from "components/services/widget/container"; -import Block from "components/services/widget/block"; -import useWidgetAPI from "utils/proxy/use-widget-api"; - -export default function Component({ service }) { - const { t } = useTranslation(); - - const { widget } = service; - - const { data: aria2cData, error: aria2cError } = useWidgetAPI(widget); - - if (aria2cError) { - return ; - } - - if (!aria2cData) { - return ( - - - - - - - ); - } - - return ( - - - - - - - ); -} diff --git a/src/widgets/components.js b/src/widgets/components.js index 9acae848..6c981d10 100644 --- a/src/widgets/components.js +++ b/src/widgets/components.js @@ -3,7 +3,7 @@ import dynamic from "next/dynamic"; const components = { adguard: dynamic(() => import("./adguard/component")), argocd: dynamic(() => import("./argocd/component")), - aria2c: dynamic(() => import("./aria2c/component")), + aria2: dynamic(() => import("./aria2/component")), atsumeru: dynamic(() => import("./atsumeru/component")), audiobookshelf: dynamic(() => import("./audiobookshelf/component")), authentik: dynamic(() => import("./authentik/component")), diff --git a/src/widgets/widgets.js b/src/widgets/widgets.js index 6b0769be..fce9c4ed 100644 --- a/src/widgets/widgets.js +++ b/src/widgets/widgets.js @@ -1,6 +1,6 @@ import adguard from "./adguard/widget"; import argocd from "./argocd/widget"; -import aria2c from "./aria2c/widget"; +import aria2 from "./aria2/widget"; import atsumeru from "./atsumeru/widget"; import audiobookshelf from "./audiobookshelf/widget"; import authentik from "./authentik/widget"; @@ -135,7 +135,7 @@ import zabbix from "./zabbix/widget"; const widgets = { adguard, argocd, - aria2c, + aria2, atsumeru, audiobookshelf, authentik,