JDownloader Widget - Add Total Queue and Remaining In Queue (#1612)

undefined

public/locales/en/common.json

@@ -655,8 +655,9 @@
         "updates": "Updates"
     },
     "jdownloader": {
-        "downloadCount": "Queue Count",
+        "downloadCount": "Queue",
-        "downloadQueueSize": "Queue Size",
+        "downloadBytesRemaining": "Remaining",
-        "downloadSpeed": "Download Speed"
+        "downloadTotalBytes": "Size",
+        "downloadSpeed": "Speed"
     }
 }

src/widgets/jdownloader/component.jsx

@@ -21,7 +21,8 @@ export default function Component({ service }) {
         return (
             <Container service={service}>
                 <Block label="jdownloader.downloadCount" />
-                <Block label="jdownloader.downloadQueueSize" />
+                <Block label="jdownloader.downloadTotalBytes" />
+                <Block label="jdownloader.downloadBytesRemaining" />
                 <Block label="jdownloader.downloadSpeed" />
             </Container>
         );
@@ -30,7 +31,8 @@ export default function Component({ service }) {
     return (
         <Container service={service}>
             <Block label="jdownloader.downloadCount" value={t("common.number", { value: jdownloaderData.downloadCount })} />
-            <Block label="jdownloader.downloadQueueSize" value={t("common.bytes", { value: jdownloaderData.totalBytes })} />
+            <Block label="jdownloader.downloadTotalBytes" value={t("common.bytes", { value: jdownloaderData.totalBytes })} />
+            <Block label="jdownloader.downloadBytesRemaining" value={t("common.bytes", { value: jdownloaderData.bytesRemaining })} />
             <Block label="jdownloader.downloadSpeed" value={t("common.byterate", { value: jdownloaderData.totalSpeed })} />
         </Container>
     );

src/widgets/jdownloader/proxy.js

@@ -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.finished !== true) {
+            bytesRemaining += file.bytesTotal;
             if (file.speed) {
                 totalSpeed += file.speed;
             }
+        }
     });
 
     const data = {
         downloadCount: packageStatus.length,
+        bytesRemaining,
         totalBytes,
         totalSpeed
     };