Skip to content

allow to specify number of parallel uploads #1059

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: development
Choose a base branch
from
Open

allow to specify number of parallel uploads #1059

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 12 additions & 10 deletions src/file-upload/file-uploader.class.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,19 +39,23 @@ export interface FileUploaderOptions {
parametersBeforeFiles?: boolean;
formatDataFunction?: Function;
formatDataFunctionIsAsync?: boolean;
parallelUploads?: number;
}

export class FileUploader {

public authToken: string;
public isUploading: boolean = false;
public queue: FileItem[] = [];
public progress: number = 0;
public _nextIndex: number = 0;
public autoUpload: any;
public authTokenHeader: string;
public response: EventEmitter<any>;

public get isUploading(): boolean {
return this.queue.some((item: FileItem) => item.isUploading);
}

public options: FileUploaderOptions = {
autoUpload: false,
isHTML5: true,
Expand Down Expand Up @@ -89,8 +93,8 @@ export class FileUploader {
this.options.filters.unshift({ name: 'mimeType', fn: this._mimeTypeFilter });
}

for (let i = 0; i < this.queue.length; i++) {
this.queue[ i ].url = this.options.url;
for (let item of this.queue) {
item.url = this.options.url;
}
}

Expand Down Expand Up @@ -150,10 +154,6 @@ export class FileUploader {
let item = this.queue[ index ];
let transport = this.options.isHTML5 ? '_xhrTransport' : '_iframeTransport';
item._prepareToUploading();
if (this.isUploading) {
return;
}
this.isUploading = true;
(this as any)[ transport ](item);
}

Expand All @@ -172,7 +172,10 @@ export class FileUploader {
return;
}
items.map((item: FileItem) => item._prepareToUploading());
items[ 0 ].upload();
let numberUploadsToStart = Math.min(items.length, this.options.parallelUploads || 1);
for (let i = 0; i < numberUploadsToStart; ++i) {
items[ i ].upload();
}
}

public cancelAll(): void {
Expand Down Expand Up @@ -276,7 +279,6 @@ export class FileUploader {
item._onComplete(response, status, headers);
this.onCompleteItem(item, response, status, headers);
let nextItem = this.getReadyItems()[ 0 ];
this.isUploading = false;
if (nextItem) {
nextItem.upload();
return;
Expand Down Expand Up @@ -373,7 +375,7 @@ export class FileUploader {
}
xhr.onreadystatechange = function () {
if (xhr.readyState == XMLHttpRequest.DONE) {
that.response.emit(xhr.responseText)
that.response.emit(xhr.responseText);
}
}
if (this.options.formatDataFunctionIsAsync) {
Expand Down