diff --git a/public/locales/ar/common.json b/public/locales/ar/common.json index a4bf37e0..a1bf5578 100644 --- a/public/locales/ar/common.json +++ b/public/locales/ar/common.json @@ -647,7 +647,8 @@ }, "jdownloader": { "downloadCount": "Queue Count", - "downloadQueueSize": "Queue Size", - "downloadSpeed": "Download Speed" + "downloadSpeed": "Download Speed", + "downloadBytesRemaining": "Remaining", + "downloadTotalBytes": "Size" } } diff --git a/public/locales/bg/common.json b/public/locales/bg/common.json index 25757852..35dd13f4 100644 --- a/public/locales/bg/common.json +++ b/public/locales/bg/common.json @@ -647,7 +647,8 @@ }, "jdownloader": { "downloadCount": "Queue Count", - "downloadQueueSize": "Queue Size", - "downloadSpeed": "Download Speed" + "downloadSpeed": "Download Speed", + "downloadBytesRemaining": "Remaining", + "downloadTotalBytes": "Size" } } diff --git a/public/locales/ca/common.json b/public/locales/ca/common.json index aaa9f4a5..3842feec 100644 --- a/public/locales/ca/common.json +++ b/public/locales/ca/common.json @@ -647,7 +647,8 @@ }, "jdownloader": { "downloadCount": "Queue Count", - "downloadQueueSize": "Queue Size", - "downloadSpeed": "Download Speed" + "downloadSpeed": "Download Speed", + "downloadBytesRemaining": "Remaining", + "downloadTotalBytes": "Size" } } diff --git a/public/locales/cs/common.json b/public/locales/cs/common.json index 690591fb..4e16a37a 100644 --- a/public/locales/cs/common.json +++ b/public/locales/cs/common.json @@ -648,6 +648,7 @@ "jdownloader": { "downloadSpeed": "Download Speed", "downloadCount": "Queue Count", - "downloadQueueSize": "Queue Size" + "downloadBytesRemaining": "Remaining", + "downloadTotalBytes": "Size" } } diff --git a/public/locales/da/common.json b/public/locales/da/common.json index f2fa88e6..76ff86dd 100644 --- a/public/locales/da/common.json +++ b/public/locales/da/common.json @@ -648,6 +648,7 @@ "jdownloader": { "downloadSpeed": "Download Speed", "downloadCount": "Queue Count", - "downloadQueueSize": "Queue Size" + "downloadBytesRemaining": "Remaining", + "downloadTotalBytes": "Size" } } diff --git a/public/locales/de/common.json b/public/locales/de/common.json index 76ec612f..521e2cec 100644 --- a/public/locales/de/common.json +++ b/public/locales/de/common.json @@ -647,7 +647,8 @@ }, "jdownloader": { "downloadCount": "Queue Count", - "downloadQueueSize": "Queue Size", - "downloadSpeed": "Download Speed" + "downloadSpeed": "Download Speed", + "downloadBytesRemaining": "Remaining", + "downloadTotalBytes": "Size" } } diff --git a/public/locales/el/common.json b/public/locales/el/common.json index ab26247c..b36b43f6 100644 --- a/public/locales/el/common.json +++ b/public/locales/el/common.json @@ -647,7 +647,8 @@ }, "jdownloader": { "downloadCount": "Queue Count", - "downloadQueueSize": "Queue Size", - "downloadSpeed": "Download Speed" + "downloadSpeed": "Download Speed", + "downloadBytesRemaining": "Remaining", + "downloadTotalBytes": "Size" } } diff --git a/public/locales/en/common.json b/public/locales/en/common.json index a99cf322..ed713f2c 100755 --- a/public/locales/en/common.json +++ b/public/locales/en/common.json @@ -655,8 +655,9 @@ "updates": "Updates" }, "jdownloader": { - "downloadCount": "Queue Count", - "downloadQueueSize": "Queue Size", - "downloadSpeed": "Download Speed" + "downloadCount": "Queue", + "downloadBytesRemaining": "Remaining", + "downloadTotalBytes": "Size", + "downloadSpeed": "Speed" } } \ No newline at end of file diff --git a/public/locales/eo/common.json b/public/locales/eo/common.json index 596aefb3..908169cb 100644 --- a/public/locales/eo/common.json +++ b/public/locales/eo/common.json @@ -647,7 +647,8 @@ }, "jdownloader": { "downloadCount": "Queue Count", - "downloadQueueSize": "Queue Size", - "downloadSpeed": "Download Speed" + "downloadSpeed": "Download Speed", + "downloadBytesRemaining": "Remaining", + "downloadTotalBytes": "Size" } } diff --git a/public/locales/es/common.json b/public/locales/es/common.json index 63e1c4a9..91c48ce1 100644 --- a/public/locales/es/common.json +++ b/public/locales/es/common.json @@ -647,7 +647,8 @@ }, "jdownloader": { "downloadCount": "Recuento de las colas", - "downloadQueueSize": "Tamaño de la cola", - "downloadSpeed": "Velocidad de Descarga" + "downloadSpeed": "Velocidad de Descarga", + "downloadBytesRemaining": "Remaining", + "downloadTotalBytes": "Size" } } diff --git a/public/locales/fi/common.json b/public/locales/fi/common.json index cb727d6f..c3875b21 100644 --- a/public/locales/fi/common.json +++ b/public/locales/fi/common.json @@ -647,7 +647,8 @@ }, "jdownloader": { "downloadCount": "Queue Count", - "downloadQueueSize": "Queue Size", - "downloadSpeed": "Download Speed" + "downloadSpeed": "Download Speed", + "downloadBytesRemaining": "Remaining", + "downloadTotalBytes": "Size" } } diff --git a/public/locales/fr/common.json b/public/locales/fr/common.json index 6d38c3be..43b44d45 100644 --- a/public/locales/fr/common.json +++ b/public/locales/fr/common.json @@ -647,7 +647,8 @@ }, "jdownloader": { "downloadCount": "Total en attente", - "downloadQueueSize": "Volume en attente", - "downloadSpeed": "Vitesse de téléchargement" + "downloadSpeed": "Vitesse de téléchargement", + "downloadBytesRemaining": "Remaining", + "downloadTotalBytes": "Size" } } diff --git a/public/locales/he/common.json b/public/locales/he/common.json index b8392aed..41e5746b 100644 --- a/public/locales/he/common.json +++ b/public/locales/he/common.json @@ -647,7 +647,8 @@ }, "jdownloader": { "downloadCount": "Queue Count", - "downloadQueueSize": "Queue Size", - "downloadSpeed": "Download Speed" + "downloadSpeed": "Download Speed", + "downloadBytesRemaining": "Remaining", + "downloadTotalBytes": "Size" } } diff --git a/public/locales/hi/common.json b/public/locales/hi/common.json index f5bf9e2b..155235a9 100644 --- a/public/locales/hi/common.json +++ b/public/locales/hi/common.json @@ -647,7 +647,8 @@ }, "jdownloader": { "downloadCount": "Queue Count", - "downloadQueueSize": "Queue Size", - "downloadSpeed": "Download Speed" + "downloadSpeed": "Download Speed", + "downloadBytesRemaining": "Remaining", + "downloadTotalBytes": "Size" } } diff --git a/public/locales/hr/common.json b/public/locales/hr/common.json index e2f2dab6..94dfae26 100644 --- a/public/locales/hr/common.json +++ b/public/locales/hr/common.json @@ -647,7 +647,8 @@ }, "jdownloader": { "downloadCount": "Queue Count", - "downloadQueueSize": "Queue Size", - "downloadSpeed": "Download Speed" + "downloadSpeed": "Download Speed", + "downloadBytesRemaining": "Remaining", + "downloadTotalBytes": "Size" } } diff --git a/public/locales/hu/common.json b/public/locales/hu/common.json index 89d010ba..016a54d8 100644 --- a/public/locales/hu/common.json +++ b/public/locales/hu/common.json @@ -648,6 +648,7 @@ "jdownloader": { "downloadSpeed": "Download Speed", "downloadCount": "Queue Count", - "downloadQueueSize": "Queue Size" + "downloadTotalBytes": "Size", + "downloadBytesRemaining": "Remaining" } } diff --git a/public/locales/id/common.json b/public/locales/id/common.json index c0bb65d1..0be279a5 100644 --- a/public/locales/id/common.json +++ b/public/locales/id/common.json @@ -647,7 +647,8 @@ }, "jdownloader": { "downloadCount": "Queue Count", - "downloadQueueSize": "Queue Size", - "downloadSpeed": "Download Speed" + "downloadSpeed": "Download Speed", + "downloadBytesRemaining": "Remaining", + "downloadTotalBytes": "Size" } } diff --git a/public/locales/it/common.json b/public/locales/it/common.json index ed9a140b..68aaa2f5 100644 --- a/public/locales/it/common.json +++ b/public/locales/it/common.json @@ -647,7 +647,8 @@ }, "jdownloader": { "downloadCount": "Queue Count", - "downloadQueueSize": "Queue Size", - "downloadSpeed": "Download Speed" + "downloadSpeed": "Download Speed", + "downloadBytesRemaining": "Remaining", + "downloadTotalBytes": "Size" } } diff --git a/public/locales/ja/common.json b/public/locales/ja/common.json index d10e70e1..1bc37e96 100644 --- a/public/locales/ja/common.json +++ b/public/locales/ja/common.json @@ -647,7 +647,8 @@ }, "jdownloader": { "downloadCount": "Queue Count", - "downloadQueueSize": "Queue Size", - "downloadSpeed": "Download Speed" + "downloadSpeed": "Download Speed", + "downloadBytesRemaining": "Remaining", + "downloadTotalBytes": "Size" } } diff --git a/public/locales/ko/common.json b/public/locales/ko/common.json index 456953a8..f9037f52 100644 --- a/public/locales/ko/common.json +++ b/public/locales/ko/common.json @@ -647,7 +647,8 @@ }, "jdownloader": { "downloadCount": "Queue Count", - "downloadQueueSize": "Queue Size", - "downloadSpeed": "Download Speed" + "downloadSpeed": "Download Speed", + "downloadBytesRemaining": "Remaining", + "downloadTotalBytes": "Size" } } diff --git a/public/locales/lv/common.json b/public/locales/lv/common.json index 47d619dd..70361ee2 100644 --- a/public/locales/lv/common.json +++ b/public/locales/lv/common.json @@ -647,7 +647,8 @@ }, "jdownloader": { "downloadCount": "Queue Count", - "downloadQueueSize": "Queue Size", - "downloadSpeed": "Download Speed" + "downloadSpeed": "Download Speed", + "downloadBytesRemaining": "Remaining", + "downloadTotalBytes": "Size" } } diff --git a/public/locales/ms/common.json b/public/locales/ms/common.json index aaf65d0d..70fd66e3 100644 --- a/public/locales/ms/common.json +++ b/public/locales/ms/common.json @@ -647,7 +647,8 @@ }, "jdownloader": { "downloadCount": "Queue Count", - "downloadQueueSize": "Queue Size", - "downloadSpeed": "Download Speed" + "downloadSpeed": "Download Speed", + "downloadBytesRemaining": "Remaining", + "downloadTotalBytes": "Size" } } diff --git a/public/locales/nb-NO/common.json b/public/locales/nb-NO/common.json index 4bf6b86c..79124218 100644 --- a/public/locales/nb-NO/common.json +++ b/public/locales/nb-NO/common.json @@ -647,7 +647,8 @@ }, "jdownloader": { "downloadCount": "Queue Count", - "downloadQueueSize": "Queue Size", - "downloadSpeed": "Download Speed" + "downloadSpeed": "Download Speed", + "downloadBytesRemaining": "Remaining", + "downloadTotalBytes": "Size" } } diff --git a/public/locales/nl/common.json b/public/locales/nl/common.json index 087ee1c9..139e9051 100644 --- a/public/locales/nl/common.json +++ b/public/locales/nl/common.json @@ -647,7 +647,8 @@ }, "jdownloader": { "downloadCount": "Queue Count", - "downloadQueueSize": "Queue Size", - "downloadSpeed": "Download Speed" + "downloadSpeed": "Download Speed", + "downloadBytesRemaining": "Remaining", + "downloadTotalBytes": "Size" } } diff --git a/public/locales/pl/common.json b/public/locales/pl/common.json index b8f8d997..6af51828 100644 --- a/public/locales/pl/common.json +++ b/public/locales/pl/common.json @@ -647,7 +647,8 @@ }, "jdownloader": { "downloadCount": "Queue Count", - "downloadQueueSize": "Queue Size", - "downloadSpeed": "Download Speed" + "downloadSpeed": "Download Speed", + "downloadBytesRemaining": "Remaining", + "downloadTotalBytes": "Size" } } diff --git a/public/locales/pt-BR/common.json b/public/locales/pt-BR/common.json index a0955eac..d2146d2c 100644 --- a/public/locales/pt-BR/common.json +++ b/public/locales/pt-BR/common.json @@ -647,7 +647,8 @@ }, "jdownloader": { "downloadCount": "Queue Count", - "downloadQueueSize": "Queue Size", - "downloadSpeed": "Download Speed" + "downloadSpeed": "Download Speed", + "downloadBytesRemaining": "Remaining", + "downloadTotalBytes": "Size" } } diff --git a/public/locales/pt/common.json b/public/locales/pt/common.json index 84b2cc7c..5c84e6c5 100644 --- a/public/locales/pt/common.json +++ b/public/locales/pt/common.json @@ -656,7 +656,8 @@ }, "jdownloader": { "downloadCount": "Queue Count", - "downloadQueueSize": "Queue Size", - "downloadSpeed": "Download Speed" + "downloadSpeed": "Download Speed", + "downloadBytesRemaining": "Remaining", + "downloadTotalBytes": "Size" } } diff --git a/public/locales/ro/common.json b/public/locales/ro/common.json index f0529f63..e8bf9ac7 100644 --- a/public/locales/ro/common.json +++ b/public/locales/ro/common.json @@ -647,7 +647,8 @@ }, "jdownloader": { "downloadCount": "Queue Count", - "downloadQueueSize": "Queue Size", - "downloadSpeed": "Download Speed" + "downloadSpeed": "Download Speed", + "downloadBytesRemaining": "Remaining", + "downloadTotalBytes": "Size" } } diff --git a/public/locales/ru/common.json b/public/locales/ru/common.json index 8c1e2853..d3cd6d48 100644 --- a/public/locales/ru/common.json +++ b/public/locales/ru/common.json @@ -647,7 +647,8 @@ }, "jdownloader": { "downloadCount": "Queue Count", - "downloadQueueSize": "Queue Size", - "downloadSpeed": "Download Speed" + "downloadSpeed": "Download Speed", + "downloadBytesRemaining": "Remaining", + "downloadTotalBytes": "Size" } } diff --git a/public/locales/sk/common.json b/public/locales/sk/common.json index 5826ee4c..5f95889c 100644 --- a/public/locales/sk/common.json +++ b/public/locales/sk/common.json @@ -647,7 +647,8 @@ }, "jdownloader": { "downloadCount": "Queue Count", - "downloadQueueSize": "Queue Size", - "downloadSpeed": "Download Speed" + "downloadSpeed": "Download Speed", + "downloadBytesRemaining": "Remaining", + "downloadTotalBytes": "Size" } } diff --git a/public/locales/sl/common.json b/public/locales/sl/common.json index ef4e4109..24d4b8f7 100644 --- a/public/locales/sl/common.json +++ b/public/locales/sl/common.json @@ -647,7 +647,8 @@ }, "jdownloader": { "downloadCount": "Queue Count", - "downloadQueueSize": "Queue Size", - "downloadSpeed": "Download Speed" + "downloadSpeed": "Download Speed", + "downloadBytesRemaining": "Remaining", + "downloadTotalBytes": "Size" } } diff --git a/public/locales/sr/common.json b/public/locales/sr/common.json index 77ee5d8e..9ef56193 100644 --- a/public/locales/sr/common.json +++ b/public/locales/sr/common.json @@ -647,7 +647,8 @@ }, "jdownloader": { "downloadCount": "Queue Count", - "downloadQueueSize": "Queue Size", - "downloadSpeed": "Download Speed" + "downloadSpeed": "Download Speed", + "downloadBytesRemaining": "Remaining", + "downloadTotalBytes": "Size" } } diff --git a/public/locales/sv/common.json b/public/locales/sv/common.json index 4a67136b..c3325844 100644 --- a/public/locales/sv/common.json +++ b/public/locales/sv/common.json @@ -647,7 +647,8 @@ }, "jdownloader": { "downloadCount": "Queue Count", - "downloadQueueSize": "Queue Size", - "downloadSpeed": "Download Speed" + "downloadSpeed": "Download Speed", + "downloadBytesRemaining": "Remaining", + "downloadTotalBytes": "Size" } } diff --git a/public/locales/te/common.json b/public/locales/te/common.json index 357040b4..b7d11223 100644 --- a/public/locales/te/common.json +++ b/public/locales/te/common.json @@ -647,7 +647,8 @@ }, "jdownloader": { "downloadCount": "Queue Count", - "downloadQueueSize": "Queue Size", - "downloadSpeed": "Download Speed" + "downloadSpeed": "Download Speed", + "downloadBytesRemaining": "Remaining", + "downloadTotalBytes": "Size" } } diff --git a/public/locales/th/common.json b/public/locales/th/common.json index d77b8c32..2afb51f2 100644 --- a/public/locales/th/common.json +++ b/public/locales/th/common.json @@ -647,7 +647,8 @@ }, "jdownloader": { "downloadCount": "Queue Count", - "downloadQueueSize": "Queue Size", - "downloadSpeed": "Download Speed" + "downloadSpeed": "Download Speed", + "downloadBytesRemaining": "Remaining", + "downloadTotalBytes": "Size" } } diff --git a/public/locales/tr/common.json b/public/locales/tr/common.json index 654d1f74..b152e0f7 100644 --- a/public/locales/tr/common.json +++ b/public/locales/tr/common.json @@ -647,7 +647,8 @@ }, "jdownloader": { "downloadCount": "Queue Count", - "downloadQueueSize": "Queue Size", - "downloadSpeed": "Download Speed" + "downloadSpeed": "Download Speed", + "downloadBytesRemaining": "Remaining", + "downloadTotalBytes": "Size" } } diff --git a/public/locales/uk/common.json b/public/locales/uk/common.json index 9a204231..1abd398d 100644 --- a/public/locales/uk/common.json +++ b/public/locales/uk/common.json @@ -647,7 +647,8 @@ }, "jdownloader": { "downloadCount": "Всього в черзі", - "downloadQueueSize": "Розмір черги", - "downloadSpeed": "Швидкість завантаження" + "downloadSpeed": "Швидкість завантаження", + "downloadBytesRemaining": "Remaining", + "downloadTotalBytes": "Size" } } diff --git a/public/locales/vi/common.json b/public/locales/vi/common.json index 71310254..069eaff2 100644 --- a/public/locales/vi/common.json +++ b/public/locales/vi/common.json @@ -647,7 +647,8 @@ }, "jdownloader": { "downloadCount": "Queue Count", - "downloadQueueSize": "Queue Size", - "downloadSpeed": "Download Speed" + "downloadSpeed": "Download Speed", + "downloadBytesRemaining": "Remaining", + "downloadTotalBytes": "Size" } } diff --git a/public/locales/yue/common.json b/public/locales/yue/common.json index c3090694..4e360b26 100644 --- a/public/locales/yue/common.json +++ b/public/locales/yue/common.json @@ -647,7 +647,8 @@ }, "jdownloader": { "downloadCount": "Queue Count", - "downloadQueueSize": "Queue Size", - "downloadSpeed": "Download Speed" + "downloadSpeed": "Download Speed", + "downloadBytesRemaining": "Remaining", + "downloadTotalBytes": "Size" } } diff --git a/public/locales/zh-CN/common.json b/public/locales/zh-CN/common.json index beac59df..a1f0dfda 100644 --- a/public/locales/zh-CN/common.json +++ b/public/locales/zh-CN/common.json @@ -647,7 +647,8 @@ }, "jdownloader": { "downloadCount": "Queue Count", - "downloadQueueSize": "Queue Size", - "downloadSpeed": "Download Speed" + "downloadSpeed": "Download Speed", + "downloadBytesRemaining": "Remaining", + "downloadTotalBytes": "Size" } } diff --git a/public/locales/zh-Hant/common.json b/public/locales/zh-Hant/common.json index c208f0bc..7c0cb9fe 100644 --- a/public/locales/zh-Hant/common.json +++ b/public/locales/zh-Hant/common.json @@ -647,7 +647,8 @@ }, "jdownloader": { "downloadCount": "Queue Count", - "downloadQueueSize": "Queue Size", - "downloadSpeed": "Download Speed" + "downloadSpeed": "Download Speed", + "downloadBytesRemaining": "Remaining", + "downloadTotalBytes": "Size" } } diff --git a/src/widgets/jdownloader/component.jsx b/src/widgets/jdownloader/component.jsx index d8fea9ca..8f271935 100644 --- a/src/widgets/jdownloader/component.jsx +++ b/src/widgets/jdownloader/component.jsx @@ -21,7 +21,8 @@ export default function Component({ service }) { return ( - + + ); @@ -30,7 +31,8 @@ export default function Component({ service }) { return ( - + + ); diff --git a/src/widgets/jdownloader/proxy.js b/src/widgets/jdownloader/proxy.js index 44eadcad..116a7a32 100644 --- a/src/widgets/jdownloader/proxy.js +++ b/src/widgets/jdownloader/proxy.js @@ -28,8 +28,8 @@ async function getWidget(req) { async function login(loginSecret, deviceSecret, params) { const rid = uniqueRid(); - const path = `/my/connect?${querystring.stringify({...params, rid})}`; - + const path = `/my/connect?${querystring.stringify({ ...params, rid })}`; + const signature = crypto .createHmac('sha256', loginSecret) .update(path) @@ -64,7 +64,7 @@ async function login(loginSecret, deviceSecret, params) { async function getDevice(serverEncryptionToken, deviceName, params) { const rid = uniqueRid(); - const path = `/my/listdevices?${querystring.stringify({...params, rid})}`; + const path = `/my/listdevices?${querystring.stringify({ ...params, rid })}`; const signature = crypto .createHmac('sha256', serverEncryptionToken) .update(path) @@ -100,7 +100,7 @@ function createBody(rid, query, params) { rid, url: query }; - return params ? {...baseBody, params: [JSON.stringify(params)] } : baseBody; + return params ? { ...baseBody, params: [JSON.stringify(params)] } : baseBody; } async function queryPackages(deviceEncryptionToken, deviceId, sessionToken, params) { @@ -135,9 +135,9 @@ export default async function jdownloaderProxyHandler(req, res) { return res.status(400).json({ error: "Invalid proxy service type" }); } logger.debug("Getting data from JDRss API"); - const {username} = widget - const {password} = widget - + const { username } = widget + const { password } = widget + const appKey = "homepage" const loginSecret = sha256(`${username}${password}server`) const deviceSecret = sha256(`${username}${password}device`) @@ -171,17 +171,22 @@ export default async function jdownloaderProxyHandler(req, res) { } ) + let bytesRemaining = 0; let totalBytes = 0; let totalSpeed = 0; packageStatus.forEach(file => { totalBytes += file.bytesTotal; - if (file.speed) { - totalSpeed += file.speed; + if (file.finished !== true) { + bytesRemaining += file.bytesTotal; + if (file.speed) { + totalSpeed += file.speed; + } } }); const data = { downloadCount: packageStatus.length, + bytesRemaining, totalBytes, totalSpeed };