0ct0pu5/homepage
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
undefined
This commit is contained in:
Karl0ss 2023-06-16 07:40:10 +01:00 • committed by GitHub
parent af00e44550
commit 8df11acbe8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 22 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
public/locales/en/common.json
View file

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

6
src/widgets/jdownloader/component.jsx
View file

@ -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>
);

23
src/widgets/jdownloader/proxy.js
View file

@ -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
};