deadcxap/liberama
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Небольшое улучшение

Browse Source
This commit is contained in:
Book Pauk
2019-01-13 03:39:39 +07:00
parent 324025b1b2
commit ccfc262762
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
client/api/reader.js
View File

@@ -23,8 +23,18 @@ class Reader {
while (1) {// eslint-disable-line no-constant-condition while (1) {// eslint-disable-line no-constant-condition
if (callback) if (callback)
callback(response.data); callback(response.data);
if (response.data.state == 'finish') { if (response.data.state == 'finish') {//воркер закончил работу, можно скачивать
const book = await axios.get(response.data.path, {}); const options = {
onDownloadProgress: progress => {
if (callback)
callback(Object.assign({},
response.data,
{state: 'loading', stage: 4, progress: Math.round((progress.loaded*100)/progress.total)}
));
}
}
//загрузка
const book = await axios.get(response.data.path, options);
return Object.assign({}, response.data, {data: book.data}); return Object.assign({}, response.data, {data: book.data});
} }
if (response.data.state == 'error') { if (response.data.state == 'error') {
@@ -42,6 +52,7 @@ class Reader {
if (i > 30*1000/refreshPause) { if (i > 30*1000/refreshPause) {
throw new Error('Слишком долгое время ожидания'); throw new Error('Слишком долгое время ожидания');
} }
//проверка воркера
response = await workerApi.post('/get-state', {workerId}); response = await workerApi.post('/get-state', {workerId});
} }
} }