doesnm/quickshare
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(uploader): don't need to refresh files list after uploading status changing

Browse source
This commit is contained in:
hexxa 2022-03-11 15:25:21 +08:00 • committed by Hexxa
parent 8c508c517f
commit 73f3cb2da6
2 changed files with 11 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/client/web/src/components/panel_files.tsx
View file

@ -138,8 +138,7 @@ export class FilesPanel extends React.Component<Props, State, {}> {
};
updateProgress = async (
infos: Map<string, UploadEntry>,
refresh: boolean
infos: Map<string, UploadEntry>
) => {
updater().setUploads(infos);
let errCount = 0;
@ -157,16 +156,6 @@ export class FilesPanel extends React.Component<Props, State, {}> {
this.props.update(updater().updateLogin);
this.props.update(updater().updateUploadingsInfo);
}
if (refresh) {
const status = await updater().setItems(this.props.filesInfo.dirPath);
if (status !== "") {
alertMsg(getErrMsg(this.props.msg.pkg, "op.fail", status));
return;
}
}
this.props.update(updater().updateFilesInfo);
this.props.update(updater().updateUploadingsInfo);
};
addUploads = (event: React.ChangeEvent<HTMLInputElement>) => {

21
src/client/web/src/worker/upload_mgr.ts
View file

@ -26,9 +26,8 @@ export class UploadMgr {
private worker: IWorker;
private infos = OrderedMap<string, UploadEntry>();
private statusCb = (
infos: Map<string, UploadEntry>,
refresh: boolean
): void => {};
infos: Map<string, UploadEntry>
): void => { };
constructor(worker: IWorker) {
this.worker = worker;
@ -104,7 +103,7 @@ export class UploadMgr {
// TODO: change it to observer pattern
// so that it can be observed by multiple components
setStatusCb = (
cb: (infos: Map<string, UploadEntry>, refresh: boolean) => void
cb: (infos: Map<string, UploadEntry>) => void
) => {
this.statusCb = cb;
};
@ -156,7 +155,7 @@ export class UploadMgr {
}
}
this.statusCb(this.infos.toMap(), false);
this.statusCb(this.infos.toMap());
return status;
};
@ -173,7 +172,7 @@ export class UploadMgr {
status = errUploadMgr;
}
this.statusCb(this.infos.toMap(), false);
this.statusCb(this.infos.toMap());
return status;
};
@ -184,7 +183,7 @@ export class UploadMgr {
}
this.infos = this.infos.delete(filePath);
this.statusCb(this.infos.toMap(), false);
this.statusCb(this.infos.toMap());
return "";
};
@ -213,7 +212,7 @@ export class UploadMgr {
ErrorLogger().error(`respHandler: entry not found ${errResp.err}`);
}
this.statusCb(this.infos.toMap(), false);
this.statusCb(this.infos.toMap());
break;
case uploadInfoKind:
const infoResp = resp as UploadInfoResp;
@ -222,12 +221,12 @@ export class UploadMgr {
if (entry != null) {
if (infoResp.uploaded === entry.size) {
this.infos = this.infos.delete(infoResp.filePath);
this.statusCb(this.infos.toMap(), true);
this.statusCb(this.infos.toMap());
} else {
// this avoids overwriting Stopped/Error state
const state =
entry.state === UploadState.Stopped ||
entry.state === UploadState.Error
entry.state === UploadState.Error
? entry.state
: infoResp.state;
this.infos = this.infos.set(infoResp.filePath, {
@ -235,7 +234,7 @@ export class UploadMgr {
uploaded: infoResp.uploaded,
state: state,
});
this.statusCb(this.infos.toMap(), false);
this.statusCb(this.infos.toMap());
}
} else {
ErrorLogger().error(