inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2025-07-31 17:38:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix uploader multiple file

Browse Source
This commit is contained in:
Eugenio Romano
2016-07-13 01:08:38 +01:00
parent 0ad32d945d
commit 334dffb9b1
1 changed files with 31 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
ng2-components/ng2-alfresco-upload/src/services/upload.service.ts
View File

@@ -18,11 +18,9 @@ import { EventEmitter, Injectable } from '@angular/core';
import { Response } from '@angular/http'; import { Response } from '@angular/http';
import { Observable } from 'rxjs/Observable'; import { Observable } from 'rxjs/Observable';
import { Observer } from 'rxjs/Observer'; import { Observer } from 'rxjs/Observer';
import { AlfrescoSettingsService, AlfrescoAuthenticationService} from 'ng2-alfresco-core'; import { AlfrescoAuthenticationService} from 'ng2-alfresco-core';
import { FileModel } from '../models/file.model'; import { FileModel } from '../models/file.model';
declare let AlfrescoApi: any;
/** /**
* *
* UploadService keep the queue of the file to upload and uploads them. * UploadService keep the queue of the file to upload and uploads them.
@@ -31,23 +29,21 @@ declare let AlfrescoApi: any;
*/ */
@Injectable() @Injectable()
export class UploadService { export class UploadService {
private _formFields: Object = {};
private _queue: FileModel[] = []; private formFields: Object = {};
private queue: FileModel[] = [];
filesUpload$: Observable<FileModel[]>; private filesUploadObserverProgressBar: Observer<FileModel[]>;
totalCompleted$: Observable<any>; private totalCompletedObserver: Observer<number>;
private _filesUploadObserver: Observer<FileModel[]>;
private _totalCompletedObserver: Observer<number>;
private _alfrescoClient: any;
public totalCompleted: number = 0; public totalCompleted: number = 0;
constructor(private settings: AlfrescoSettingsService, private authService: AlfrescoAuthenticationService) { filesUpload$: Observable<FileModel[]>;
this.filesUpload$ = new Observable<FileModel[]>(observer => this._filesUploadObserver = observer).share(); totalCompleted$: Observable<any>;
this.totalCompleted$ = new Observable<number>(observer => this._totalCompletedObserver = observer).share();
this._alfrescoClient = this.authService.alfrescoApi; constructor(private authService: AlfrescoAuthenticationService) {
this.filesUpload$ = new Observable<FileModel[]>(observer => this.filesUploadObserverProgressBar = observer).share();
this.totalCompleted$ = new Observable<number>(observer => this.totalCompletedObserver = observer).share();
} }
/** /**
@@ -57,7 +53,7 @@ export class UploadService {
* *
*/ */
public setOptions(options: any): void { public setOptions(options: any): void {
this._formFields = options.formFields != null ? options.formFields : this._formFields; this.formFields = options.formFields != null ? options.formFields : this.formFields;
} }
@@ -66,7 +62,7 @@ export class UploadService {
* @returns {Object} * @returns {Object}
*/ */
public getFormFields(): Object { public getFormFields(): Object {
return this._formFields; return this.formFields;
} }
/** /**
@@ -80,12 +76,12 @@ export class UploadService {
let latestFilesAdded: FileModel[] = []; let latestFilesAdded: FileModel[] = [];
for (let file of files) { for (let file of files) {
if (this._isFile(file)) { if (this.isFile(file)) {
let uploadingFileModel = new FileModel(file); let uploadingFileModel = new FileModel(file);
latestFilesAdded.push(uploadingFileModel); latestFilesAdded.push(uploadingFileModel);
this._queue.push(uploadingFileModel); this.queue.push(uploadingFileModel);
if (this._filesUploadObserver) { if (this.filesUploadObserverProgressBar) {
this._filesUploadObserver.next(this._queue); this.filesUploadObserverProgressBar.next(this.queue);
} }
} }
} }
@@ -96,15 +92,23 @@ export class UploadService {
* Pick all the files in the queue that are not been uploaded yet and upload it into the directory folder. * Pick all the files in the queue that are not been uploaded yet and upload it into the directory folder.
*/ */
public uploadFilesInTheQueue(directory: string, elementEmit: EventEmitter<any>): void { public uploadFilesInTheQueue(directory: string, elementEmit: EventEmitter<any>): void {
let filesToUpload = this._queue.filter((uploadingFileModel) => { let filesToUpload = this.queue.filter((uploadingFileModel) => {
return !uploadingFileModel.uploading && !uploadingFileModel.done && !uploadingFileModel.abort && !uploadingFileModel.error; return !uploadingFileModel.uploading && !uploadingFileModel.done && !uploadingFileModel.abort && !uploadingFileModel.error;
}); });
filesToUpload.forEach((uploadingFileModel) => { filesToUpload.forEach((uploadingFileModel) => {
uploadingFileModel.setUploading(); uploadingFileModel.setUploading();
let _filesUploadObserverProgressBar = this.filesUploadObserverProgressBar;
let _queue = this.queue;
this.authService.getAlfrescoApi(). this.authService.getAlfrescoApi().
upload.uploadFile(uploadingFileModel.file, directory) upload.uploadFile(uploadingFileModel.file, directory)
.on('progress', (progress: any) => { .on('progress', (progress: any) => {
uploadingFileModel.setProgres(progress); uploadingFileModel.setProgres(progress);
if (_filesUploadObserverProgressBar) {
_filesUploadObserverProgressBar.next(_queue);
}
}) })
.on('abort', () => { .on('abort', () => {
uploadingFileModel.setAbort(); uploadingFileModel.setAbort();
@@ -122,10 +126,10 @@ export class UploadService {
data.response data.response
); );
this._filesUploadObserver.next(this._queue); _filesUploadObserverProgressBar.next(_queue);
if (!uploadingFileModel.abort && !uploadingFileModel.error) { if (!uploadingFileModel.abort && !uploadingFileModel.error) {
if (this._totalCompletedObserver) { if (this.totalCompletedObserver) {
this._totalCompletedObserver.next(++this.totalCompleted); this.totalCompletedObserver.next(++this.totalCompleted);
} }
} }
}); });
@@ -138,7 +142,7 @@ export class UploadService {
* @return {FileModel[]} - files in the upload queue. * @return {FileModel[]} - files in the upload queue.
*/ */
getQueue(): FileModel[] { getQueue(): FileModel[] {
return this._queue; return this.queue;
} }
/** /**
@@ -146,7 +150,7 @@ export class UploadService {
* *
* @return {boolean} * @return {boolean}
*/ */
private _isFile(file: any): boolean { private isFile(file: any): boolean {
return file !== null && (file instanceof Blob || (file.name && file.size)); return file !== null && (file instanceof Blob || (file.name && file.size));
} }