Поправки FileDownloader
This commit is contained in:
@@ -9,11 +9,12 @@ class FileDownloader {
|
||||
this.limitDownloadSize = limitDownloadSize;
|
||||
}
|
||||
|
||||
async load(url, callback, abort) {
|
||||
async load(url, opts, callback, abort) {
|
||||
let errMes = '';
|
||||
|
||||
const options = {
|
||||
let options = {
|
||||
headers: {
|
||||
'accept-encoding': 'gzip, compress, deflate',
|
||||
'user-agent': userAgent,
|
||||
timeout: 300*1000,
|
||||
},
|
||||
@@ -22,6 +23,8 @@ class FileDownloader {
|
||||
}),
|
||||
responseType: 'stream',
|
||||
};
|
||||
if (opts)
|
||||
options = Object.assign({}, opts, options);
|
||||
|
||||
try {
|
||||
const res = await axios.get(url, options);
|
||||
|
||||
@@ -109,7 +109,7 @@ class ReaderWorker {
|
||||
let downloadSize = -1;
|
||||
//download or use uploaded
|
||||
if (url.indexOf('disk://') != 0) {//download
|
||||
const downdata = await this.down.load(url, (progress) => {
|
||||
const downdata = await this.down.load(url, {}, (progress) => {
|
||||
wState.set({progress});
|
||||
}, q.abort);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user