ChoChoX/suwayomi-material-you-webui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix library update progress rendering (#210)

Browse Source 
* Fix library update progress rendering

The websocket sends a list with mangas for each category (completed, running, pending) instead of a number.
This resulted in the progress to always be 0

* Prevent TypeError

The "UpdateStatus" can have a "statusMap" that contains not data.

Co-authored-by: schroda <github@dasch.simplelogin.com>
This commit is contained in:
Daniel
2023-01-01 17:58:23 +01:00
committed by GitHub
parent 2e3f57677e
commit 34bafee3aa
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/components/library/UpdateChecker.tsx
View File

@@ -46,10 +46,12 @@ function UpdateChecker() {
const wsc = new WebSocket(`${baseWebsocketUrl}/api/v1/update`); const wsc = new WebSocket(`${baseWebsocketUrl}/api/v1/update`);
wsc.onmessage = (e) => { wsc.onmessage = (e) => {
const data = JSON.parse(e.data) as IUpdateStatus; const data = JSON.parse(e.data) as IUpdateStatus;
const { COMPLETE, RUNNING, PENDING } = data.statusMap; const { COMPLETE = [], RUNNING = [], PENDING = [] } = data.statusMap;
setLoading(data.running); setLoading(data.running);
const currentProgress = 100 * (COMPLETE / (COMPLETE + RUNNING + PENDING)); const currentProgress = 100 * (
COMPLETE.length / (COMPLETE.length + RUNNING.length + PENDING.length)
);
setProgress(Number.isNaN(currentProgress) ? 0 : currentProgress); setProgress(Number.isNaN(currentProgress) ? 0 : currentProgress);
}; };

6
src/typings.d.ts vendored
View File

@@ -197,9 +197,9 @@ interface IQueue {
interface IUpdateStatus { interface IUpdateStatus {
running: boolean running: boolean
statusMap: { statusMap: {
COMPLETE: number, COMPLETE?: IManga[],
RUNNING: number, RUNNING?: IManga[],
PENDING: number PENDING?: IManga[]
} }
} }