diff --git a/.angular-cli.json b/.angular-cli.json
index eb6771f..5329e72 100644
--- a/.angular-cli.json
+++ b/.angular-cli.json
@@ -1,24 +1,20 @@
{
"project": {
- "name": "ng2-file-upload"
+ "name": "ng2-chunk-file-upload"
},
"apps": [
{
"root": "demo/src",
"outDir": "demo/dist",
- "assets": [
- "assets"
- ],
+ "assets": ["assets"],
"index": "index.html",
"main": "main.ts",
"test": "../../scripts/test.ts",
"tsconfig": "tsconfig.json",
"prefix": "",
"mobile": false,
- "styles": [
- ],
- "scripts": [
- ],
+ "styles": [],
+ "scripts": [],
"environmentSource": "environments/environment.ts",
"environments": {
"dev": "environments/environment.ts",
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a0820da..1aa262d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,108 +1,108 @@
= [
+let tabDesc: Array = [
{
heading: 'Simple',
- ts: require('!!raw-loader?lang=typescript!./file-upload/simple-demo.ts'),
- html: require('!!raw-loader?lang=markup!./file-upload/simple-demo.html'),
- js: require('!!raw-loader?lang=javascript!./file-upload/file-catcher.js')
- }
+ ts: require("!!raw-loader?lang=typescript!./file-upload/simple-demo.ts"),
+ html: require("!!raw-loader?lang=markup!./file-upload/simple-demo.html"),
+ js: require("!!raw-loader?lang=javascript!./file-upload/file-catcher.js")
+ },
];
@Component({
- selector: 'file-upload-section',
- templateUrl: './file-upload-section.html'
+ selector: "file-upload-section",
+ templateUrl: "./file-upload-section.html",
})
export class FileUploadSectionComponent {
- public name:string = 'File Upload';
- public currentHeading:string = 'Simple';
- public doc:string = doc;
- public tabs:any = tabDesc;
+ public name: string = 'File Upload';
+ public currentHeading: string = 'Simple';
+ public doc: string = doc;
+ public tabs: any = tabDesc;
- public select(e:any):void {
+ public select(e: any): void {
if (e.heading) {
this.currentHeading = e.heading;
}
diff --git a/demo/src/app/components/file-upload/simple-demo.ts b/demo/src/app/components/file-upload/simple-demo.ts
index 4a26a21..4979cc1 100644
--- a/demo/src/app/components/file-upload/simple-demo.ts
+++ b/demo/src/app/components/file-upload/simple-demo.ts
@@ -1,5 +1,5 @@
import { Component } from '@angular/core';
-import { FileUploader } from 'ng2-file-upload';
+import { FileUploader } from 'ng2-chunk-file-upload';
// const URL = '/api/';
const URL = 'https://evening-anchorage-3159.herokuapp.com/api/';
diff --git a/demo/src/doc.md b/demo/src/doc.md
index 0466b13..c9b4cb1 100644
--- a/demo/src/doc.md
+++ b/demo/src/doc.md
@@ -1,6 +1,6 @@
### Usage
```typescript
-import { FileSelectDirective, FileDropDirective, FileUploader } from 'ng2-file-upload/ng2-file-upload';
+import { FileSelectDirective, FileDropDirective, FileUploader } from 'ng2-chunk-file-upload/ng2-chunk-file-upload';
```
### Annotations
@@ -18,7 +18,7 @@ import { FileSelectDirective, FileDropDirective, FileUploader } from 'ng2-file-u
### Properties
- - `uploader` - (`FileUploader`) - uploader object. See using in [demo](https://github.com/valor-software/ng2-file-upload/blob/master/demo/components/file-upload/simple-demo.ts)
+ - `uploader` - (`FileUploader`) - uploader object. See using in [demo](https://github.com/valor-software/ng2-chunk-file-upload/blob/master/demo/components/file-upload/simple-demo.ts)
Parameters supported by this object:
@@ -37,11 +37,11 @@ import { FileSelectDirective, FileDropDirective, FileUploader } from 'ng2-file-u
### Properties
- - `uploader` - (`FileUploader`) - uploader object. See using in [demo](https://github.com/valor-software/ng2-file-upload/blob/master/demo/components/file-upload/simple-demo.ts)
+ - `uploader` - (`FileUploader`) - uploader object. See using in [demo](https://github.com/valor-software/ng2-chunk-file-upload/blob/master/demo/components/file-upload/simple-demo.ts)
### Events
- `fileOver` - it fires during 'over' and 'out' events for Drop Area; returns `boolean`: `true` if file is over Drop Area, `false` in case of out.
- See using in [ts demo](https://github.com/valor-software/ng2-file-upload/blob/master/demo/components/file-upload/simple-demo.ts) and
- [html demo](https://github.com/valor-software/ng2-file-upload/blob/master/demo/components/file-upload/simple-demo.html)
+ See using in [ts demo](https://github.com/valor-software/ng2-chunk-file-upload/blob/master/demo/components/file-upload/simple-demo.ts) and
+ [html demo](https://github.com/valor-software/ng2-chunk-file-upload/blob/master/demo/components/file-upload/simple-demo.html)
- `onFileDrop` - it fires after a file has been dropped on a Drop Area; you can pass in `$event` to get the list of files that were dropped. i.e. `(onFileDrop)="dropped($event)"`
diff --git a/demo/src/getting-started.md b/demo/src/getting-started.md
index 5803f9b..bf8b5d9 100644
--- a/demo/src/getting-started.md
+++ b/demo/src/getting-started.md
@@ -6,5 +6,5 @@
Install the components
```
-npm install ng2-file-upload --save
+npm install ng2-chunk-file-upload --save
```
diff --git a/demo/src/index.html b/demo/src/index.html
index f733a32..2cd59ca 100644
--- a/demo/src/index.html
+++ b/demo/src/index.html
@@ -9,7 +9,7 @@
",
+ "author": "Paulo Peres Jr ",
"license": "MIT",
"repository": {
"type": "git",
- "url": "git+ssh://git@github.com/valor-software/ng2-file-upload.git"
+ "url": "git+ssh://git@github.com/PauloPeres/ng2-chunk-file-upload.git"
},
"bugs": {
- "url": "https://github.com/valor-software/ng2-file-upload/issues"
+ "url": "https://github.com/PauloPeres/ng2-chunk-file-upload/issues"
},
- "homepage": "https://github.com/valor-software/ng2-file-upload#readme",
+ "homepage": "https://github.com/PauloPeres/ng2-chunk-file-upload#readme",
"dependencies": {},
"peerDependencies": {
"@angular/common": "^2.3.1 || >=4.0.0",
@@ -135,6 +137,11 @@
"name": "Oleksandr Telnov",
"email": "otelnov@gmail.com",
"url": "https://github.com/otelnov"
+ },
+ {
+ "name": "Paulo Peres Jr",
+ "email": "paulo@myog.io",
+ "url": "https://github.com/PauloPeres/"
}
]
}
diff --git a/src/file-upload/file-chunk.class.ts b/src/file-upload/file-chunk.class.ts
index afca897..34214f9 100644
--- a/src/file-upload/file-chunk.class.ts
+++ b/src/file-upload/file-chunk.class.ts
@@ -1,238 +1,238 @@
export class FileChunk {
public stepSize: number = 1024 * 1024 * 3;
- public rawFile: any = null;
- public uploadProgress: number = null;
- public uploading: boolean = null;
- public uploadComplete: boolean = null;
- public byteStepSize: number = null;
- public totalSize: number = null;
- public startByte: number = null;
- public endByte: number = null;
- public currentChunk: number = 0;
- public totalChunks: number = null;
- public uniqueIdentifier: string = null;
- public totalSent: number = null;
- public extraData: any = {};
-
- constructor(rawFile: any, options: any = {}) {
- this.setByteStepSize(this.stepSize);
- if (typeof options !== 'undefined') {
- if (typeof options.byteStepSize !== 'undefined') {
- this.setByteStepSize(options.byteStepSize);
- }
- }
- this.setRawFile(rawFile);
-
- this.setRawFile(rawFile);
- this.setUploadProgress(0);
- this.setUploading(false);
- this.setUploadComplete(false);
- this.setTotalSize(this.getRawFile().size);
- this.setStartByte(0);
- this.setEndByte(this.getByteStepSize());
- this.setCurrentChunk(0);
- if (!this.getBrowserSliceMethod()) {
- this.setTotalChunks(1);
- } else {
- this.setTotalChunks(Math.ceil(this.totalSize / this.byteStepSize));
- }
- this.setUniqueIdenfier(this.generateUniqueIdentifier());
- this.setTotalSent(0);
- }
-
- public setExtraData(index: any, value: any) {
- this.extraData[index] = value;
- }
-
- public getExtraData(index: any) {
- return this.extraData[index];
- }
-
- //getters and setters
- public setProgress(v: any) {
- this.uploadProgress = v;
- }
-
- public getProgress() {
- return this.uploadProgress;
- }
-
- public setUploading(v: boolean) {
- this.uploading = v;
- }
-
- public getUploading() {
- return this.uploading;
- }
-
- public getUploadComplete() {
- return this.uploadComplete;
- }
-
- public setUploadComplete(v: boolean) {
- this.uploadComplete = v;
- }
-
- public setUploadProgress(v: number) {
- this.uploadProgress = v;
- }
-
- public getUploadProgress() {
- return this.uploadProgress;
- }
-
- public getStartByte() {
- return this.startByte;
- }
-
- public setStartByte(v: number) {
- this.startByte = v;
- }
-
- public getEndByte() {
- return this.endByte;
- }
-
- public setEndByte(v: number) {
- this.endByte = v;
- }
-
- public getByteStepSize() {
- return this.byteStepSize;
- }
-
- public setByteStepSize(v: number) {
- this.byteStepSize = v;
- }
-
- public setTotalSize(v: number) {
- this.totalSize = v;
- }
-
- public getTotalSize() {
- return this.totalSize;
- }
-
- public getRawFile() {
- return this.rawFile;
- }
-
- public setRawFile(v: File) {
- this.rawFile = v;
- }
-
- public getCurrentChunk() {
- return this.currentChunk;
- }
-
- public setCurrentChunk(v: number) {
- this.currentChunk = v;
- }
-
- public getTotalChunks() {
- return this.totalChunks;
- }
-
- public setTotalChunks(v: number) {
- this.totalChunks = v;
- }
-
- public setUniqueIdenfier(v: string) {
- this.uniqueIdentifier = v;
- }
-
- public getUniqueIdenfier() {
- return this.uniqueIdentifier;
- }
-
- public getRawFileExtension() {
- const extension = this.getRawFileName().split('.');
- return extension[extension.length - 1];
- }
-
- public getRawFileName() {
- return this.getRawFile().name;
- }
-
- public getContentType() {
- return this.getRawFile().type;
- }
-
- public getTotalSent() {
- return this.totalSent;
- }
-
- public setTotalSent(v: number) {
- this.totalSent = v;
- }
-
- public getCurrentRawFileChunk() {
- if (!this.getBrowserSliceMethod()) {
- return this.getRawFile();
- }
- else {
- return this.getRawFile()[this.getBrowserSliceMethod()](this.getStartByte(), this.getEndByte());
- }
- }
-
- public retrocedeChunk() {
- if (!this.getBrowserSliceMethod()) {
- return false;
- }
-
- this.setEndByte(this.getStartByte());
- this.setStartByte(this.getStartByte() - this.getByteStepSize());
- this.setCurrentChunk(this.getCurrentChunk() - 1);
-
- if (this.getTotalSent() != 0) {
- this.setTotalSent(this.getTotalSent() - this.getByteStepSize());
- }
- }
-
- public prepareNextChunk() {
- if (!this.getBrowserSliceMethod()) {
- return false;
- }
- if (this.getEndByte() > this.getTotalSize() && this.getCurrentChunk() < this.getTotalChunks()) { // finished
- return false;
- }
- this.setStartByte(this.getEndByte());
- this.setEndByte(this.getEndByte() + this.getByteStepSize());
- this.setCurrentChunk(this.getCurrentChunk() + 1);
- if (this.getEndByte() > this.getTotalSize() && this.getCurrentChunk() === this.getTotalChunks()) {
- // something went wrong with the calculations
- this.setEndByte(this.getTotalSize());
- }
- return true;
- }
-
- public getBrowserSliceMethod(): string {
- if (this.rawFile && typeof this.rawFile !== 'undefined') {
- if (this.rawFile.slice && typeof this.rawFile.slice === 'function') {
- return 'slice';
- }
- else if (this.rawFile.mozSlice && typeof this.rawFile.mozSlice === 'function') {
- return 'mozSlice';
- }
- else if (this.rawFile.webkitSlice && typeof this.rawFile.webkitSlice === 'function') {
- return 'webkitSlice';
- }
- }
- else {
- return null;
- }
- }//getBrowserSliceMethod() ends here
-
- public generateUniqueIdentifier(): string{
- let d = new Date().getTime();
- if (typeof performance !== 'undefined' && typeof performance.now === 'function'){
- d += performance.now(); // use high-precision timer if available
- }
- return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
- const r = (d + Math.random() * 16) % 16 | 0;
- d = Math.floor(d / 16);
- return (c === 'x' ? r : (r & 0x3 | 0x8)).toString(16);
- });
+ public rawFile: any = null;
+ public uploadProgress: number = null;
+ public uploading: boolean = null;
+ public uploadComplete: boolean = null;
+ public byteStepSize: number = null;
+ public totalSize: number = null;
+ public startByte: number = null;
+ public endByte: number = null;
+ public currentChunk: number = 0;
+ public totalChunks: number = null;
+ public uniqueIdentifier: string = null;
+ public totalSent: number = null;
+ public extraData: any = {};
+
+ constructor(rawFile: any, options: any = {}) {
+ this.setByteStepSize(this.stepSize);
+ if (typeof options !== 'undefined') {
+ if (typeof options.byteStepSize !== 'undefined') {
+ this.setByteStepSize(options.byteStepSize);
+ }
+ }
+ this.setRawFile(rawFile);
+
+ this.setRawFile(rawFile);
+ this.setUploadProgress(0);
+ this.setUploading(false);
+ this.setUploadComplete(false);
+ this.setTotalSize(this.getRawFile().size);
+ this.setStartByte(0);
+ this.setEndByte(this.getByteStepSize());
+ this.setCurrentChunk(0);
+ if (!this.getBrowserSliceMethod()) {
+ this.setTotalChunks(1);
+ } else {
+ this.setTotalChunks(Math.ceil(this.totalSize / this.byteStepSize));
+ }
+ this.setUniqueIdenfier(this.generateUniqueIdentifier());
+ this.setTotalSent(0);
+ }
+
+ public setExtraData(index: any, value: any) {
+ this.extraData[index] = value;
+ }
+
+ public getExtraData(index: any) {
+ return this.extraData[index];
+ }
+
+ //getters and setters
+ public setProgress(v: number) {
+ this.uploadProgress = v;
+ }
+
+ public getProgress():number {
+ return this.uploadProgress;
+ }
+
+ public setUploading(v: boolean) {
+ this.uploading = v;
+ }
+
+ public getUploading():boolean {
+ return this.uploading;
+ }
+
+ public getUploadComplete():boolean {
+ return this.uploadComplete;
+ }
+
+ public setUploadComplete(v: boolean) {
+ this.uploadComplete = v;
+ }
+
+ public setUploadProgress(v: number) {
+ this.uploadProgress = v;
+ }
+
+ public getUploadProgress():number {
+ return this.uploadProgress;
+ }
+
+ public getStartByte():number {
+ return this.startByte;
+ }
+
+ public setStartByte(v: number) {
+ this.startByte = v;
+ }
+
+ public getEndByte():number {
+ return this.endByte;
+ }
+
+ public setEndByte(v: number) {
+ this.endByte = v;
+ }
+
+ public getByteStepSize():number {
+ return this.byteStepSize;
+ }
+
+ public setByteStepSize(v: number) {
+ this.byteStepSize = v;
+ }
+
+ public setTotalSize(v: number) {
+ this.totalSize = v;
+ }
+
+ public getTotalSize():number {
+ return this.totalSize;
+ }
+
+ public getRawFile():any {
+ return this.rawFile;
+ }
+
+ public setRawFile(v: File) {
+ this.rawFile = v;
+ }
+
+ public getCurrentChunk():number {
+ return this.currentChunk;
+ }
+
+ public setCurrentChunk(v: number) {
+ this.currentChunk = v;
+ }
+
+ public getTotalChunks():number {
+ return this.totalChunks;
+ }
+
+ public setTotalChunks(v: number) {
+ this.totalChunks = v;
+ }
+
+ public setUniqueIdenfier(v: string) {
+ this.uniqueIdentifier = v;
+ }
+
+ public getUniqueIdenfier():string {
+ return this.uniqueIdentifier;
+ }
+
+ public getRawFileExtension() {
+ const extension = this.getRawFileName().split('.');
+ return extension[extension.length - 1];
+ }
+
+ public getRawFileName() {
+ return this.getRawFile().name;
+ }
+
+ public getContentType() {
+ return this.getRawFile().type;
+ }
+
+ public getTotalSent() {
+ return this.totalSent;
+ }
+
+ public setTotalSent(v: number) {
+ this.totalSent = v;
+ }
+
+ public getCurrentRawFileChunk() {
+ if (!this.getBrowserSliceMethod()) {
+ return this.getRawFile();
+ }
+ else {
+ return this.getRawFile()[this.getBrowserSliceMethod()](this.getStartByte(), this.getEndByte());
+ }
+ }
+
+ public retrocedeChunk() {
+ if (!this.getBrowserSliceMethod()) {
+ return false;
+ }
+
+ this.setEndByte(this.getStartByte());
+ this.setStartByte(this.getStartByte() - this.getByteStepSize());
+ this.setCurrentChunk(this.getCurrentChunk() - 1);
+
+ if (this.getTotalSent() != 0) {
+ this.setTotalSent(this.getTotalSent() - this.getByteStepSize());
+ }
+ }
+
+ public prepareNextChunk() {
+ if (!this.getBrowserSliceMethod()) {
+ return false;
+ }
+ if (this.getEndByte() > this.getTotalSize() && this.getCurrentChunk() < this.getTotalChunks()) { // finished
+ return false;
+ }
+ this.setStartByte(this.getEndByte());
+ this.setEndByte(this.getEndByte() + this.getByteStepSize());
+ this.setCurrentChunk(this.getCurrentChunk() + 1);
+ if (this.getEndByte() > this.getTotalSize() && this.getCurrentChunk() === this.getTotalChunks()) {
+ // something went wrong with the calculations
+ this.setEndByte(this.getTotalSize());
+ }
+ return true;
+ }
+
+ public getBrowserSliceMethod(): string {
+ if (this.rawFile && typeof this.rawFile !== 'undefined') {
+ if (this.rawFile.slice && typeof this.rawFile.slice === 'function') {
+ return 'slice';
+ }
+ else if (this.rawFile.mozSlice && typeof this.rawFile.mozSlice === 'function') {
+ return 'mozSlice';
+ }
+ else if (this.rawFile.webkitSlice && typeof this.rawFile.webkitSlice === 'function') {
+ return 'webkitSlice';
+ }
+ }
+ else {
+ return null;
+ }
+ }//getBrowserSliceMethod() ends here
+
+ public generateUniqueIdentifier(): string {
+ let d = new Date().getTime();
+ if (typeof performance !== 'undefined' && typeof performance.now === 'function') {
+ d += performance.now(); // use high-precision timer if available
+ }
+ return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
+ const r = (d + Math.random() * 16) % 16 | 0;
+ d = Math.floor(d / 16);
+ return (c === 'x' ? r : (r & 0x3 | 0x8)).toString(16);
+ });
}
}
diff --git a/src/file-upload/file-drop.directive.ts b/src/file-upload/file-drop.directive.ts
index b04ae51..bbf4f42 100644
--- a/src/file-upload/file-drop.directive.ts
+++ b/src/file-upload/file-drop.directive.ts
@@ -4,83 +4,83 @@ import { FileUploader, FileUploaderOptions } from './file-uploader.class';
@Directive({ selector: '[ng2FileDrop]' })
export class FileDropDirective {
- @Input() public uploader: FileUploader;
- @Output() public fileOver: EventEmitter = new EventEmitter();
- @Output() public onFileDrop: EventEmitter = new EventEmitter();
+ @Input() public uploader: FileUploader;
+ @Output() public fileOver: EventEmitter = new EventEmitter();
+ @Output() public onFileDrop: EventEmitter = new EventEmitter();
- protected element: ElementRef;
+ protected element: ElementRef;
- public constructor(element: ElementRef) {
- this.element = element;
- }
+ public constructor(element: ElementRef) {
+ this.element = element;
+ }
- public getOptions(): FileUploaderOptions {
- return this.uploader.options;
- }
+ public getOptions(): FileUploaderOptions {
+ return this.uploader.options;
+ }
- public getFilters(): any {
- return {};
- }
+ public getFilters(): any {
+ return {};
+ }
- @HostListener('drop', [ '$event' ])
- public onDrop(event: any): void {
- let transfer = this._getTransfer(event);
- if (!transfer) {
- return;
- }
+ @HostListener('drop', ['$event'])
+ public onDrop(event: any): void {
+ let transfer = this._getTransfer(event);
+ if (!transfer) {
+ return;
+ }
- let options = this.getOptions();
- let filters = this.getFilters();
- this._preventAndStop(event);
- this.uploader.addToQueue(transfer.files, options, filters);
- this.fileOver.emit(false);
- this.onFileDrop.emit(transfer.files);
- }
+ let options = this.getOptions();
+ let filters = this.getFilters();
+ this._preventAndStop(event);
+ this.uploader.addToQueue(transfer.files, options, filters);
+ this.fileOver.emit(false);
+ this.onFileDrop.emit(transfer.files);
+ }
- @HostListener('dragover', [ '$event' ])
- public onDragOver(event: any): void {
- let transfer = this._getTransfer(event);
- if (!this._haveFiles(transfer.types)) {
- return;
- }
+ @HostListener('dragover', ['$event'])
+ public onDragOver(event: any): void {
+ let transfer = this._getTransfer(event);
+ if (!this._haveFiles(transfer.types)) {
+ return;
+ }
- transfer.dropEffect = 'copy';
- this._preventAndStop(event);
- this.fileOver.emit(true);
- }
+ transfer.dropEffect = 'copy';
+ this._preventAndStop(event);
+ this.fileOver.emit(true);
+ }
- @HostListener('dragleave', [ '$event' ])
- public onDragLeave(event: any): any {
- if ((this as any).element) {
- if (event.currentTarget === (this as any).element[ 0 ]) {
- return;
- }
- }
+ @HostListener('dragleave', ['$event'])
+ public onDragLeave(event: any): any {
+ if ((this as any).element) {
+ if (event.currentTarget === (this as any).element[0]) {
+ return;
+ }
+ }
- this._preventAndStop(event);
- this.fileOver.emit(false);
- }
+ this._preventAndStop(event);
+ this.fileOver.emit(false);
+ }
- protected _getTransfer(event: any): any {
- return event.dataTransfer ? event.dataTransfer : event.originalEvent.dataTransfer; // jQuery fix;
- }
+ protected _getTransfer(event: any): any {
+ return event.dataTransfer ? event.dataTransfer : event.originalEvent.dataTransfer; // jQuery fix;
+ }
- protected _preventAndStop(event: any): any {
- event.preventDefault();
- event.stopPropagation();
- }
+ protected _preventAndStop(event: any): any {
+ event.preventDefault();
+ event.stopPropagation();
+ }
- protected _haveFiles(types: any): any {
- if (!types) {
- return false;
- }
+ protected _haveFiles(types: any): any {
+ if (!types) {
+ return false;
+ }
- if (types.indexOf) {
- return types.indexOf('Files') !== -1;
- } else if (types.contains) {
- return types.contains('Files');
- } else {
- return false;
- }
- }
+ if (types.indexOf) {
+ return types.indexOf('Files') !== -1;
+ } else if (types.contains) {
+ return types.contains('Files');
+ } else {
+ return false;
+ }
+ }
}
diff --git a/src/file-upload/file-item.class.ts b/src/file-upload/file-item.class.ts
index c4e14c4..501d3c1 100644
--- a/src/file-upload/file-item.class.ts
+++ b/src/file-upload/file-item.class.ts
@@ -1,217 +1,210 @@
+import { HttpHeaders } from '@angular/common/http';
import { FileLikeObject } from './file-like-object.class';
-import { FileUploader, ParsedResponseHeaders, FileUploaderOptions } from './file-uploader.class';
+import { FileUploader, FileUploaderOptions } from './file-uploader.class';
import { FileChunk } from './file-chunk.class'
export class FileItem {
- public file: FileLikeObject;
- public _file: File;
- public id: any;
- public alias: string;
- public url: string = '/';
- public method: string;
- public headers: any = [];
- public withCredentials: boolean = true;
- public formData: any = [];
- public isReady: boolean = false;
- public isUploading: boolean = false;
- public isUploaded: boolean = false;
- public isSuccess: boolean = false;
- public isCancel: boolean = false;
- public isError: boolean = false;
- public progress: number = 0;
- public index: number = void 0;
- public _xhr: XMLHttpRequest;
- public _form: any;
- public _chunkUploaders: any = [];
- public _fileChunks: FileChunk;
- public _currentChunk: number = 0;
- public _totalChunks: number = 0;
+ public file: FileLikeObject;
+ public _file: File;
+ public id: any;
+ public alias: string;
+ public url: string = '/';
+ public method: string;
+ public headers: any = [];
+ public withCredentials: boolean = true;
+ public formData: any = [];
+ public isReady: boolean = false;
+ public isUploading: boolean = false;
+ public isUploaded: boolean = false;
+ public isSuccess: boolean = false;
+ public isCancel: boolean = false;
+ public isError: boolean = false;
+ public isRemoving: boolean = false;
+ public progress: number = 0;
+ public index: number = void 0;
+ public downloadUrl?: string = null;
+ public _form: any;
+ public _fileChunks: FileChunk;
+
+ protected chunkTotalRetries = 10;
+ protected chunkRetries = 0;
+ protected uploader: FileUploader;
+ protected some: File;
+ protected options: FileUploaderOptions;
- protected chunkTotalRetries = 10;
- protected chunkRetries = 0;
- protected uploader: FileUploader;
- protected some: File;
- protected options: FileUploaderOptions;
+ public constructor(uploader: FileUploader, some: File, options: FileUploaderOptions) {
+ this.uploader = uploader;
+ this.some = some;
+ this.options = options;
+ this.file = new FileLikeObject(some);
+ this._file = some;
- public constructor(uploader: FileUploader, some: File, options: FileUploaderOptions) {
- this.uploader = uploader;
- this.some = some;
- this.options = options;
- this.file = new FileLikeObject(some);
- this._file = some;
+ if (uploader.options) {
+ this.method = uploader.options.method || 'POST';
+ this.alias = uploader.options.itemAlias || 'file';
+ }
+ this.url = uploader.options.url;
+ }
+ public upload(): void {
+ try {
+ this.uploader.uploadItem(this);
+ } catch (e) {
+ this.uploader._onCompleteItem(this, '', 0, new HttpHeaders());
+ this.uploader._onErrorItem(this, '', 0, new HttpHeaders());
+ }
+ }
+ public createFileChunk(chunkSize: number): void {
+ this.fileChunks = new FileChunk(this._file, { byteStepSize: chunkSize });
+ }
+ public getCurrentChunkFile(): any {
+ return this.fileChunks.getCurrentRawFileChunk();
+ }
+ public prepareNextChunk(): void {
+ this.fileChunks.prepareNextChunk();
+ }
+ public getCurrentChunk(): number {
+ return this.fileChunks.getCurrentChunk()
+ }
+ public getTotalChunks(): number {
+ return this.fileChunks.getTotalChunks()
+ }
+ public setIsUploading(val: boolean) {
+ this.isUploading = val;
+ if (this.fileChunks) {
+ this.fileChunks.setUploading(val)
+ }
+ }
+ public set fileChunks(val: FileChunk) {
+ this._fileChunks = val;
+ }
+ public get fileChunks(): FileChunk {
+ return this._fileChunks;
+ }
+ public getId(): any {
+ return this.id;
+ }
+ public setId(id: any) {
+ this.id = id;
+ }
+ public cancel(): void {
+ this.uploader.cancelItem(this);
+ }
+ public remove(): void {
+ this.uploader.removeFromQueue(this);
+ }
+ public removeOnline(): void {
+ this.isRemoving = true;
+ this.uploader.uploaderService.deleteEntry(this,{},true).subscribe(
+ (result:any) => {
+ this.isRemoving = false;
+ this.remove();
+ },
+ (error:any) => {
+ this.isRemoving = false;
+ }
+ );
+ }
+ public onBeforeUpload(): void {
+ return void 0;
+ }
+ public onBuildForm(form: any): any {
+ return { form };
+ }
+ public onProgress(progress: number): any {
+ return { progress };
+ }
+ public onSuccess(response: string, status: number, headers: HttpHeaders): any {
+ return { response, status, headers };
+ }
+ public onError(response: string, status: number, headers: HttpHeaders): any {
+ return { response, status, headers };
+ }
+ public onCancel(): any {
+ return {};
+ }
+ public onComplete(response: string, status: number, headers: HttpHeaders): any {
+ return { response, status, headers };
+ }
+ public onCompleteChunk(response: string, status: number, headers: HttpHeaders): any {
+ return { response, status, headers };
+ }
+ public _onBeforeUpload(): void {
+ this.isReady = true;
+ this.isUploading = true;
+ this.isUploaded = false;
+ this.isSuccess = false;
+ this.isCancel = false;
+ this.isError = false;
+ this.progress = 0;
+ this.onBeforeUpload();
+ }
+ public _onBuildForm(form: any): void {
+ this.onBuildForm(form);
+ }
+ public _onProgress(progress: number): void {
+ this.progress = progress;
+ this.onProgress(progress);
+ }
+ public _onSuccess(response: string, status: number, headers: HttpHeaders): void {
+ this.isReady = false;
+ this.isUploading = false;
+ this.isUploaded = true;
+ this.isSuccess = true;
+ this.isCancel = false;
+ this.isError = false;
+ this.progress = 100;
+ this.index = void 0;
+ this.onSuccess(response, status, headers);
+ }
+ public _onError(response: string, status: number, headers: HttpHeaders): void {
+ this.isReady = false;
+ this.isUploading = false;
+ this.isUploaded = true;
+ this.isSuccess = false;
+ this.isCancel = false;
+ this.isError = true;
+ this.progress = 0;
+ this.index = void 0;
+ this.onError(response, status, headers);
+ }
+ public _onCancel(): void {
+ this.isReady = false;
+ this.isUploading = false;
+ this.isUploaded = false;
+ this.isSuccess = false;
+ this.isCancel = true;
+ this.isError = false;
+ this.progress = 0;
+ this.index = void 0;
+ this.onCancel();
+ }
+ public _onComplete(response: string, status: number, headers: HttpHeaders): void {
+ this.onComplete(response, status, headers);
- if (uploader.options) {
- this.method = uploader.options.method || 'POST';
- this.alias = uploader.options.itemAlias || 'file';
- }
- this.url = uploader.options.url;
- }
-
- public upload(): void {
- try {
- this.uploader.uploadItem(this);
- } catch (e) {
- this.uploader._onCompleteItem(this, '', 0, {});
- this.uploader._onErrorItem(this, '', 0, {});
- }
- }
- public createFileChunk(chunkSize: number): void{
- this.fileChunks = new FileChunk(this._file,{byteStepSize:chunkSize});
- this._currentChunk = this.fileChunks.currentChunk;
- this._totalChunks = this.fileChunks.totalChunks;
- }
- public getCurrentChunkFile():any{
- return this.fileChunks.getCurrentRawFileChunk();
- }
- public prepareNextChunk():void{
- this.fileChunks.prepareNextChunk();
- }
- public getCurrentChunk():any{
- return this.fileChunks.getCurrentChunk()
- }
- public getTotalChunks():any{
- return this.fileChunks.getTotalChunks()
- }
- public setIsUploading(val:boolean){
- this.isUploading = val;
- if(this.fileChunks){
- this.fileChunks.setUploading(val)
- }
- }
-
- public set fileChunks(val: FileChunk){
- this._fileChunks = val;
- }
- public get fileChunks(): FileChunk{
- return this._fileChunks;
- }
- public getId(): any {
- return this.id;
- }
- public setId(id: any) {
- this.id = id;
- }
- public cancel(): void {
- this.uploader.cancelItem(this);
- }
-
- public remove(): void {
- this.uploader.removeFromQueue(this);
- }
-
- public onBeforeUpload(): void {
- return void 0;
- }
-
- public onBuildForm(form: any): any {
- return { form };
- }
-
- public onProgress(progress: number): any {
- return { progress };
- }
-
- public onSuccess(response: string, status: number, headers: ParsedResponseHeaders): any {
- return { response, status, headers };
- }
-
- public onError(response: string, status: number, headers: ParsedResponseHeaders): any {
- return { response, status, headers };
- }
-
- public onCancel(response: string, status: number, headers: ParsedResponseHeaders): any {
- return { response, status, headers };
- }
-
- public onComplete(response: string, status: number, headers: ParsedResponseHeaders): any {
- return { response, status, headers };
- }
- public onCompleteChunk(response: string, status: number, headers: ParsedResponseHeaders): any {
- return { response, status, headers };
- }
-
- public _onBeforeUpload(): void {
- this.isReady = true;
- this.isUploading = true;
- this.isUploaded = false;
- this.isSuccess = false;
- this.isCancel = false;
- this.isError = false;
- this.progress = 0;
- this.onBeforeUpload();
- }
-
- public _onBuildForm(form: any): void {
- this.onBuildForm(form);
- }
-
- public _onProgress(progress: number): void {
- this.progress = progress;
- this.onProgress(progress);
- }
-
- public _onSuccess(response: string, status: number, headers: ParsedResponseHeaders): void {
- this.isReady = false;
- this.isUploading = false;
- this.isUploaded = true;
- this.isSuccess = true;
- this.isCancel = false;
- this.isError = false;
- this.progress = 100;
- this.index = void 0;
- this.onSuccess(response, status, headers);
- }
-
- public _onError(response: string, status: number, headers: ParsedResponseHeaders): void {
- this.isReady = false;
- this.isUploading = false;
- this.isUploaded = true;
- this.isSuccess = false;
- this.isCancel = false;
- this.isError = true;
- this.progress = 0;
- this.index = void 0;
- this.onError(response, status, headers);
- }
-
- public _onCancel(response: string, status: number, headers: ParsedResponseHeaders): void {
- this.isReady = false;
- this.isUploading = false;
- this.isUploaded = false;
- this.isSuccess = false;
- this.isCancel = true;
- this.isError = false;
- this.progress = 0;
- this.index = void 0;
- this.onCancel(response, status, headers);
- }
-
- public _onComplete(response: string, status: number, headers: ParsedResponseHeaders): void {
- this.onComplete(response, status, headers);
-
- if (this.uploader.options.removeAfterUpload) {
- this.remove();
- }
- }
- public _onCompleteChunk(response: string, status: number, headers: ParsedResponseHeaders): void {
- this.chunkRetries = 0;
- this._onCompleteChunkCallNext();
- this.onCompleteChunk(response, status, headers);
- }
- public _onCompleteChunkCallNext(): void{
- //Let's Retry to send this chunk 4 times;
- }
- public _onErrorChunk(response: string, status: number, headers: ParsedResponseHeaders): void {
- if (this.chunkRetries > this.chunkTotalRetries) {
- this.uploader.onErrorItem(this, response, status, headers);
- this.uploader.onCompleteItem(this, response, status, headers);
- } else {
- this.chunkRetries ++;
- this.fileChunks.retrocedeChunk();
- this._onCompleteChunkCallNext();
- }
- }
- public _prepareToUploading(): void {
- this.index = this.index || ++this.uploader._nextIndex;
- this.isReady = true;
- }
+ if (this.uploader.options.removeAfterUpload) {
+ this.remove();
+ }
+ }
+ public _onCompleteChunk(response: string, status: number, headers: HttpHeaders): void {
+ this.chunkRetries = 0;
+ this._onCompleteChunkCallNext();
+ this.onCompleteChunk(response, status, headers);
+ }
+ public _onCompleteChunkCallNext(): void {
+ this.uploader.uploaderService.uploadFile(this,this.uploader.options);
+ this.prepareNextChunk()
+ }
+ public _onErrorChunk(response: string, status: number, headers: HttpHeaders): void {
+ if (this.chunkRetries > this.chunkTotalRetries) {
+ this.uploader.onErrorItem(this, response, status, headers);
+ this.uploader.onCompleteItem(this, response, status, headers);
+ } else {
+ this.chunkRetries++;
+ this.fileChunks.retrocedeChunk();
+ this._onCompleteChunkCallNext();
+ }
+ }
+ public _prepareToUploading(): void {
+ this.index = this.index || ++this.uploader._nextIndex;
+ this.isReady = true;
+ }
}
diff --git a/src/file-upload/file-like-object.class.ts b/src/file-upload/file-like-object.class.ts
index 746dbdd..175f634 100644
--- a/src/file-upload/file-like-object.class.ts
+++ b/src/file-upload/file-like-object.class.ts
@@ -1,33 +1,33 @@
function isElement(node: any): boolean {
- return !!(node && (node.nodeName || node.prop && node.attr && node.find));
+ return !!(node && (node.nodeName || node.prop && node.attr && node.find));
}
export class FileLikeObject {
- public lastModifiedDate: any;
- public size: any;
- public type: string;
- public name: string;
- public rawFile: string;
+ public lastModifiedDate: any;
+ public size: any;
+ public type: string;
+ public name: string;
+ public rawFile: string;
- public constructor(fileOrInput: any) {
- this.rawFile = fileOrInput;
- let isInput = isElement(fileOrInput);
- let fakePathOrObject = isInput ? fileOrInput.value : fileOrInput;
- let postfix = typeof fakePathOrObject === 'string' ? 'FakePath' : 'Object';
- let method = '_createFrom' + postfix;
- (this as any)[ method ](fakePathOrObject);
- }
+ public constructor(fileOrInput: any) {
+ this.rawFile = fileOrInput;
+ let isInput = isElement(fileOrInput);
+ let fakePathOrObject = isInput ? fileOrInput.value : fileOrInput;
+ let postfix = typeof fakePathOrObject === 'string' ? 'FakePath' : 'Object';
+ let method = '_createFrom' + postfix;
+ (this as any)[method](fakePathOrObject);
+ }
- public _createFromFakePath(path: string): void {
- this.lastModifiedDate = void 0;
- this.size = void 0;
- this.type = 'like/' + path.slice(path.lastIndexOf('.') + 1).toLowerCase();
- this.name = path.slice(path.lastIndexOf('/') + path.lastIndexOf('\\') + 2);
- }
+ public _createFromFakePath(path: string): void {
+ this.lastModifiedDate = void 0;
+ this.size = void 0;
+ this.type = 'like/' + path.slice(path.lastIndexOf('.') + 1).toLowerCase();
+ this.name = path.slice(path.lastIndexOf('/') + path.lastIndexOf('\\') + 2);
+ }
- public _createFromObject(object: { size: number, type: string, name: string }): void {
- this.size = object.size;
- this.type = object.type;
- this.name = object.name;
- }
+ public _createFromObject(object: { size: number, type: string, name: string }): void {
+ this.size = object.size;
+ this.type = object.type;
+ this.name = object.name;
+ }
}
diff --git a/src/file-upload/file-select.directive.ts b/src/file-upload/file-select.directive.ts
index a942dcb..b3f9f7b 100644
--- a/src/file-upload/file-select.directive.ts
+++ b/src/file-upload/file-select.directive.ts
@@ -4,38 +4,38 @@ import { FileUploader } from './file-uploader.class';
@Directive({ selector: '[ng2FileSelect]' })
export class FileSelectDirective {
- @Input() public uploader: FileUploader;
- @Output() public onFileSelected: EventEmitter = new EventEmitter();
+ @Input() public uploader: FileUploader;
+ @Output() public onFileSelected: EventEmitter = new EventEmitter();
- protected element: ElementRef;
+ protected element: ElementRef;
- public constructor(element: ElementRef) {
- this.element = element;
- }
+ public constructor(element: ElementRef) {
+ this.element = element;
+ }
- public getOptions(): any {
- return this.uploader.options;
- }
+ public getOptions(): any {
+ return this.uploader.options;
+ }
- public getFilters(): any {
- return {};
- }
+ public getFilters(): any {
+ return {};
+ }
- public isEmptyAfterSelection(): boolean {
- return !!this.element.nativeElement.attributes.multiple;
- }
+ public isEmptyAfterSelection(): boolean {
+ return !!this.element.nativeElement.attributes.multiple;
+ }
- @HostListener('change')
- public onChange(): any {
- let files = this.element.nativeElement.files;
- let options = this.getOptions();
- let filters = this.getFilters();
+ @HostListener('change')
+ public onChange(): any {
+ let files = this.element.nativeElement.files;
+ let options = this.getOptions();
+ let filters = this.getFilters();
- this.uploader.addToQueue(files, options, filters);
- this.onFileSelected.emit(files);
+ this.uploader.addToQueue(files, options, filters);
+ this.onFileSelected.emit(files);
- if (this.isEmptyAfterSelection()) {
- this.element.nativeElement.value = '';
- }
- }
+ if (this.isEmptyAfterSelection()) {
+ this.element.nativeElement.value = '';
+ }
+ }
}
diff --git a/src/file-upload/file-type.class.ts b/src/file-upload/file-type.class.ts
index 2dee97b..b90d7aa 100644
--- a/src/file-upload/file-type.class.ts
+++ b/src/file-upload/file-type.class.ts
@@ -1,164 +1,164 @@
-import { FileLikeObject } from "../ng2-file-upload";
+import { FileLikeObject } from "../ng2-chunk-file-upload";
export class FileType {
- /* MS office */
- public static mime_doc: string[] = [
- 'application/msword',
- 'application/msword',
- 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
- 'application/vnd.openxmlformats-officedocument.wordprocessingml.template',
- 'application/vnd.ms-word.document.macroEnabled.12',
- 'application/vnd.ms-word.template.macroEnabled.12'
- ];
- public static mime_xsl: string[] = [
- 'application/vnd.ms-excel',
- 'application/vnd.ms-excel',
- 'application/vnd.ms-excel',
- 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
- 'application/vnd.openxmlformats-officedocument.spreadsheetml.template',
- 'application/vnd.ms-excel.sheet.macroEnabled.12',
- 'application/vnd.ms-excel.template.macroEnabled.12',
- 'application/vnd.ms-excel.addin.macroEnabled.12',
- 'application/vnd.ms-excel.sheet.binary.macroEnabled.12'
- ];
- public static mime_ppt: string[] = [
- 'application/vnd.ms-powerpoint',
- 'application/vnd.ms-powerpoint',
- 'application/vnd.ms-powerpoint',
- 'application/vnd.ms-powerpoint',
- 'application/vnd.openxmlformats-officedocument.presentationml.presentation',
- 'application/vnd.openxmlformats-officedocument.presentationml.template',
- 'application/vnd.openxmlformats-officedocument.presentationml.slideshow',
- 'application/vnd.ms-powerpoint.addin.macroEnabled.12',
- 'application/vnd.ms-powerpoint.presentation.macroEnabled.12',
- 'application/vnd.ms-powerpoint.presentation.macroEnabled.12',
- 'application/vnd.ms-powerpoint.slideshow.macroEnabled.12'
- ];
+ /* MS office */
+ public static mime_doc: string[] = [
+ 'application/msword',
+ 'application/msword',
+ 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
+ 'application/vnd.openxmlformats-officedocument.wordprocessingml.template',
+ 'application/vnd.ms-word.document.macroEnabled.12',
+ 'application/vnd.ms-word.template.macroEnabled.12'
+ ];
+ public static mime_xsl: string[] = [
+ 'application/vnd.ms-excel',
+ 'application/vnd.ms-excel',
+ 'application/vnd.ms-excel',
+ 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
+ 'application/vnd.openxmlformats-officedocument.spreadsheetml.template',
+ 'application/vnd.ms-excel.sheet.macroEnabled.12',
+ 'application/vnd.ms-excel.template.macroEnabled.12',
+ 'application/vnd.ms-excel.addin.macroEnabled.12',
+ 'application/vnd.ms-excel.sheet.binary.macroEnabled.12'
+ ];
+ public static mime_ppt: string[] = [
+ 'application/vnd.ms-powerpoint',
+ 'application/vnd.ms-powerpoint',
+ 'application/vnd.ms-powerpoint',
+ 'application/vnd.ms-powerpoint',
+ 'application/vnd.openxmlformats-officedocument.presentationml.presentation',
+ 'application/vnd.openxmlformats-officedocument.presentationml.template',
+ 'application/vnd.openxmlformats-officedocument.presentationml.slideshow',
+ 'application/vnd.ms-powerpoint.addin.macroEnabled.12',
+ 'application/vnd.ms-powerpoint.presentation.macroEnabled.12',
+ 'application/vnd.ms-powerpoint.presentation.macroEnabled.12',
+ 'application/vnd.ms-powerpoint.slideshow.macroEnabled.12'
+ ];
- /* PSD */
- public static mime_psd: string[] = [
- 'image/photoshop',
- 'image/x-photoshop',
- 'image/psd',
- 'application/photoshop',
- 'application/psd',
- 'zz-application/zz-winassoc-psd'
- ];
+ /* PSD */
+ public static mime_psd: string[] = [
+ 'image/photoshop',
+ 'image/x-photoshop',
+ 'image/psd',
+ 'application/photoshop',
+ 'application/psd',
+ 'zz-application/zz-winassoc-psd'
+ ];
- /* Compressed files */
- public static mime_compress: string[] = [
- 'application/x-gtar',
- 'application/x-gcompress',
- 'application/compress',
- 'application/x-tar',
- 'application/x-rar-compressed',
- 'application/octet-stream',
- 'application/x-zip-compressed',
- 'application/zip-compressed',
- 'application/x-7z-compressed',
- 'application/gzip',
- 'application/x-bzip2'
- ];
+ /* Compressed files */
+ public static mime_compress: string[] = [
+ 'application/x-gtar',
+ 'application/x-gcompress',
+ 'application/compress',
+ 'application/x-tar',
+ 'application/x-rar-compressed',
+ 'application/octet-stream',
+ 'application/x-zip-compressed',
+ 'application/zip-compressed',
+ 'application/x-7z-compressed',
+ 'application/gzip',
+ 'application/x-bzip2'
+ ];
- public static getMimeClass(file: FileLikeObject): string {
- let mimeClass = 'application';
- if (this.mime_psd.indexOf(file.type) !== -1) {
- mimeClass = 'image';
- } else if (file.type.match('image.*')) {
- mimeClass = 'image';
- } else if (file.type.match('video.*')) {
- mimeClass = 'video';
- } else if (file.type.match('audio.*')) {
- mimeClass = 'audio';
- } else if (file.type === 'application/pdf') {
- mimeClass = 'pdf';
- } else if (this.mime_compress.indexOf(file.type) !== -1) {
- mimeClass = 'compress';
- } else if (this.mime_doc.indexOf(file.type) !== -1) {
- mimeClass = 'doc';
- } else if (this.mime_xsl.indexOf(file.type) !== -1) {
- mimeClass = 'xls';
- } else if (this.mime_ppt.indexOf(file.type) !== -1) {
- mimeClass = 'ppt';
- }
- if (mimeClass === 'application') {
- mimeClass = this.fileTypeDetection(file.name);
- }
+ public static getMimeClass(file: FileLikeObject): string {
+ let mimeClass = 'application';
+ if (this.mime_psd.indexOf(file.type) !== -1) {
+ mimeClass = 'image';
+ } else if (file.type.match('image.*')) {
+ mimeClass = 'image';
+ } else if (file.type.match('video.*')) {
+ mimeClass = 'video';
+ } else if (file.type.match('audio.*')) {
+ mimeClass = 'audio';
+ } else if (file.type === 'application/pdf') {
+ mimeClass = 'pdf';
+ } else if (this.mime_compress.indexOf(file.type) !== -1) {
+ mimeClass = 'compress';
+ } else if (this.mime_doc.indexOf(file.type) !== -1) {
+ mimeClass = 'doc';
+ } else if (this.mime_xsl.indexOf(file.type) !== -1) {
+ mimeClass = 'xls';
+ } else if (this.mime_ppt.indexOf(file.type) !== -1) {
+ mimeClass = 'ppt';
+ }
+ if (mimeClass === 'application') {
+ mimeClass = this.fileTypeDetection(file.name);
+ }
- return mimeClass;
- }
+ return mimeClass;
+ }
- public static fileTypeDetection(inputFilename: string): string {
- let types: { [ key: string ]: string } = {
- 'jpg': 'image',
- 'jpeg': 'image',
- 'tif': 'image',
- 'psd': 'image',
- 'bmp': 'image',
- 'png': 'image',
- 'nef': 'image',
- 'tiff': 'image',
- 'cr2': 'image',
- 'dwg': 'image',
- 'cdr': 'image',
- 'ai': 'image',
- 'indd': 'image',
- 'pin': 'image',
- 'cdp': 'image',
- 'skp': 'image',
- 'stp': 'image',
- '3dm': 'image',
- 'mp3': 'audio',
- 'wav': 'audio',
- 'wma': 'audio',
- 'mod': 'audio',
- 'm4a': 'audio',
- 'compress': 'compress',
- 'zip': 'compress',
- 'rar': 'compress',
- '7z': 'compress',
- 'lz': 'compress',
- 'z01': 'compress',
- 'bz2': 'compress',
- 'gz': 'compress',
- 'pdf': 'pdf',
- 'xls': 'xls',
- 'xlsx': 'xls',
- 'ods': 'xls',
- 'mp4': 'video',
- 'avi': 'video',
- 'wmv': 'video',
- 'mpg': 'video',
- 'mts': 'video',
- 'flv': 'video',
- '3gp': 'video',
- 'vob': 'video',
- 'm4v': 'video',
- 'mpeg': 'video',
- 'm2ts': 'video',
- 'mov': 'video',
- 'doc': 'doc',
- 'docx': 'doc',
- 'eps': 'doc',
- 'txt': 'doc',
- 'odt': 'doc',
- 'rtf': 'doc',
- 'ppt': 'ppt',
- 'pptx': 'ppt',
- 'pps': 'ppt',
- 'ppsx': 'ppt',
- 'odp': 'ppt'
- };
+ public static fileTypeDetection(inputFilename: string): string {
+ let types: { [key: string]: string } = {
+ 'jpg': 'image',
+ 'jpeg': 'image',
+ 'tif': 'image',
+ 'psd': 'image',
+ 'bmp': 'image',
+ 'png': 'image',
+ 'nef': 'image',
+ 'tiff': 'image',
+ 'cr2': 'image',
+ 'dwg': 'image',
+ 'cdr': 'image',
+ 'ai': 'image',
+ 'indd': 'image',
+ 'pin': 'image',
+ 'cdp': 'image',
+ 'skp': 'image',
+ 'stp': 'image',
+ '3dm': 'image',
+ 'mp3': 'audio',
+ 'wav': 'audio',
+ 'wma': 'audio',
+ 'mod': 'audio',
+ 'm4a': 'audio',
+ 'compress': 'compress',
+ 'zip': 'compress',
+ 'rar': 'compress',
+ '7z': 'compress',
+ 'lz': 'compress',
+ 'z01': 'compress',
+ 'bz2': 'compress',
+ 'gz': 'compress',
+ 'pdf': 'pdf',
+ 'xls': 'xls',
+ 'xlsx': 'xls',
+ 'ods': 'xls',
+ 'mp4': 'video',
+ 'avi': 'video',
+ 'wmv': 'video',
+ 'mpg': 'video',
+ 'mts': 'video',
+ 'flv': 'video',
+ '3gp': 'video',
+ 'vob': 'video',
+ 'm4v': 'video',
+ 'mpeg': 'video',
+ 'm2ts': 'video',
+ 'mov': 'video',
+ 'doc': 'doc',
+ 'docx': 'doc',
+ 'eps': 'doc',
+ 'txt': 'doc',
+ 'odt': 'doc',
+ 'rtf': 'doc',
+ 'ppt': 'ppt',
+ 'pptx': 'ppt',
+ 'pps': 'ppt',
+ 'ppsx': 'ppt',
+ 'odp': 'ppt'
+ };
- let chunks = inputFilename.split('.');
- if (chunks.length < 2) {
- return 'application';
- }
- let extension = chunks[ chunks.length - 1 ].toLowerCase();
- if (types[ extension ] === undefined) {
- return 'application';
- } else {
- return types[ extension ];
- }
- }
+ let chunks = inputFilename.split('.');
+ if (chunks.length < 2) {
+ return 'application';
+ }
+ let extension = chunks[chunks.length - 1].toLowerCase();
+ if (types[extension] === undefined) {
+ return 'application';
+ } else {
+ return types[extension];
+ }
+ }
}
diff --git a/src/file-upload/file-upload.module.ts b/src/file-upload/file-upload.module.ts
index 62fdb14..cad8518 100644
--- a/src/file-upload/file-upload.module.ts
+++ b/src/file-upload/file-upload.module.ts
@@ -5,9 +5,9 @@ import { FileDropDirective } from './file-drop.directive';
import { FileSelectDirective } from './file-select.directive';
@NgModule({
- imports: [ CommonModule ],
- declarations: [ FileDropDirective, FileSelectDirective ],
- exports: [ FileDropDirective, FileSelectDirective ]
+ imports: [CommonModule],
+ declarations: [FileDropDirective, FileSelectDirective],
+ exports: [FileDropDirective, FileSelectDirective]
})
export class FileUploadModule {
}
diff --git a/src/file-upload/file-uploader.class.ts b/src/file-upload/file-uploader.class.ts
index 7835e47..f5ccee0 100644
--- a/src/file-upload/file-uploader.class.ts
+++ b/src/file-upload/file-uploader.class.ts
@@ -1,610 +1,484 @@
+import { Headers } from './file-uploader.class';
import { EventEmitter } from '@angular/core';
import { FileLikeObject } from './file-like-object.class';
import { FileItem } from './file-item.class';
import { FileType } from './file-type.class';
+import { HttpEvent, HttpResponse, HttpHeaders } from '@angular/common/http';
+import { HttpUploadProgressEvent, HttpProgressEvent, HttpSentEvent, HttpErrorResponse } from '@angular/common/http/src/response';
function isFile(value: any): boolean {
- return (File && value instanceof File);
+ return (File && value instanceof File);
}
export interface Headers {
- name: string;
- value: string;
+ name: string;
+ value: string;
}
-export type ParsedResponseHeaders = { [ headerFieldName: string ]: string };
export type FilterFunction = {
- name: string,
- fn: (item?: FileLikeObject, options?: FileUploaderOptions) => boolean
+ name: string,
+ fn: (item?: FileLikeObject, options?: FileUploaderOptions) => boolean
};
export interface FileUploaderOptions {
- allowedMimeType?: string[];
- allowedFileType?: string[];
- autoUpload?: boolean;
- isHTML5?: boolean;
- filters?: FilterFunction[];
- headers?: Headers[];
- method?: string;
- authToken?: string;
- maxFileSize?: number;
- queueLimit?: number;
- removeAfterUpload?: boolean;
- url?: string;
- disableMultipart?: boolean;
- itemAlias?: string;
- authTokenHeader?: string;
- additionalParameter?: { [ key: string ]: any };
- parametersBeforeFiles?: boolean;
- formatDataFunction?: Function;
- formatDataFunctionIsAsync?: boolean;
- chunkSize?: number;
- currentChunkParam?: string;
- totalChunkParam?: string;
- chunkMethod?: string;
-
+ uploaderService: any;
+ allowedMimeType?: string[];
+ allowedFileType?: string[];
+ autoUpload?: boolean;
+ isHTML5?: boolean;
+ filters?: FilterFunction[];
+ headers?: Headers[];
+ method?: string;
+ authToken?: string;
+ maxFileSize?: number;
+ queueLimit?: number;
+ removeAfterUpload?: boolean;
+ url?: string;
+ disableMultipart?: boolean;
+ itemAlias?: string;
+ authTokenHeader?: string;
+ additionalParameter?: { [key: string]: any };
+ parametersBeforeFiles?: boolean;
+ formatDataFunction?: Function;
+ formatDataFunctionIsAsync?: boolean;
}
export class FileUploader {
+ public uploaderService: any;
+ 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;
+ public chunkSize: number = null;
+ public options: FileUploaderOptions = {
+ uploaderService: null,
+ autoUpload: false,
+ isHTML5: true,
+ filters: [],
+ removeAfterUpload: false,
+ disableMultipart: false,
+ formatDataFunction: (item: FileItem) => item._file,
+ formatDataFunctionIsAsync: false
+ };
- 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;
- public chunkSize: number = null;
- public currentChunkParam: string = "current_chunk";
- public totalChunkParam: string = "total_chunks";
- public chunkMethod: string = "PUT";
- public options: FileUploaderOptions = {
- autoUpload: false,
- isHTML5: true,
- filters: [],
- chunkSize: null,
- currentChunkParam: "current_chunk",
- totalChunkParam: "total_chunks",
- chunkMethod: "PUT",
- removeAfterUpload: false,
- disableMultipart: false,
- formatDataFunction: (item: FileItem) => item._file,
- formatDataFunctionIsAsync: false
- };
+ protected _failFilterIndex: number;
- protected _failFilterIndex: number;
+ public constructor(options: FileUploaderOptions) {
+ this.setOptions(options);
+ this.response = new EventEmitter();
+ }
+ public setOptions(options: FileUploaderOptions): void {
+ this.options = Object.assign(this.options, options);
+ this.uploaderService = this.options.uploaderService;
+ this.uploaderService.uploader = this;
+ this.authToken = this.options.authToken;
+ this.authTokenHeader = this.options.authTokenHeader || 'Authorization';
+ this.autoUpload = this.options.autoUpload;
+ this.options.filters.unshift({ name: 'queueLimit', fn: this._queueLimitFilter });
- public constructor(options: FileUploaderOptions) {
- this.setOptions(options);
- this.response = new EventEmitter();
- }
- public setOptions(options: FileUploaderOptions): void {
- this.options = Object.assign(this.options, options);
+ if (this.options.maxFileSize) {
+ this.options.filters.unshift({ name: 'fileSize', fn: this._fileSizeFilter });
+ }
- this.authToken = this.options.authToken;
- this.authTokenHeader = this.options.authTokenHeader || 'Authorization';
- this.autoUpload = this.options.autoUpload;
- this.chunkSize = this.options.chunkSize;
- this.currentChunkParam = this.options.currentChunkParam;
- this.totalChunkParam = this.options.totalChunkParam;
- this.chunkMethod = this.options.chunkMethod;
- this.options.filters.unshift({ name: 'queueLimit', fn: this._queueLimitFilter });
+ if (this.options.allowedFileType) {
+ this.options.filters.unshift({ name: 'fileType', fn: this._fileTypeFilter });
+ }
- if (this.options.maxFileSize) {
- this.options.filters.unshift({ name: 'fileSize', fn: this._fileSizeFilter });
- }
+ if (this.options.allowedMimeType) {
+ this.options.filters.unshift({ name: 'mimeType', fn: this._mimeTypeFilter });
+ }
- if (this.options.allowedFileType) {
- this.options.filters.unshift({ name: 'fileType', fn: this._fileTypeFilter });
- }
+ for (let i = 0; i < this.queue.length; i++) {
+ this.queue[i].url = this.options.url;
+ }
+ }
- if (this.options.allowedMimeType) {
- this.options.filters.unshift({ name: 'mimeType', fn: this._mimeTypeFilter });
- }
+ public addToQueue(files: File[], options?: FileUploaderOptions, filters?: FilterFunction[] | string): void {
+ let list: File[] = [];
+ for (let file of files) {
+ list.push(file);
+ }
+ let arrayOfFilters = this._getFilters(filters);
+ let count = this.queue.length;
+ let addedFileItems: FileItem[] = [];
+ list.map((some: File) => {
+ if (!options) {
+ options = this.options;
+ }
- for (let i = 0; i < this.queue.length; i++) {
- this.queue[ i ].url = this.options.url;
- }
- }
+ let temp = new FileLikeObject(some);
+ if (this._isValidFile(temp, arrayOfFilters, options)) {
+ let fileItem = new FileItem(this, some, options);
+ addedFileItems.push(fileItem);
+ this.queue.push(fileItem);
+ this._onAfterAddingFile(fileItem);
+ } else {
+ let filter = arrayOfFilters[this._failFilterIndex];
+ this._onWhenAddingFileFailed(temp, filter, options);
+ }
+ });
+ if (this.queue.length !== count) {
+ this._onAfterAddingAll(addedFileItems);
+ this.progress = this._getTotalProgress();
+ }
+ this._render();
+ if (this.options.autoUpload) {
+ this.uploadAll();
+ }
+ }
- public addToQueue(files: File[], options?: FileUploaderOptions, filters?: FilterFunction[] | string): void {
- let list: File[] = [];
- for (let file of files) {
- list.push(file);
- }
- let arrayOfFilters = this._getFilters(filters);
- let count = this.queue.length;
- let addedFileItems: FileItem[] = [];
- list.map((some: File) => {
- if (!options) {
- options = this.options;
- }
+ public removeFromQueue(value: FileItem): void {
+ let index = this.getIndexOfItem(value);
+ let item = this.queue[index];
+ if (item.isUploading) {
+ item.cancel();
+ }
+ this.queue.splice(index, 1);
+ this.progress = this._getTotalProgress();
+ this.onRemoveItem(item);
+ }
- let temp = new FileLikeObject(some);
- if (this._isValidFile(temp, arrayOfFilters, options)) {
- let fileItem = new FileItem(this, some, options);
- addedFileItems.push(fileItem);
- this.queue.push(fileItem);
- this._onAfterAddingFile(fileItem);
- } else {
- let filter = arrayOfFilters[ this._failFilterIndex ];
- this._onWhenAddingFileFailed(temp, filter, options);
- }
- });
- if (this.queue.length !== count) {
- this._onAfterAddingAll(addedFileItems);
- this.progress = this._getTotalProgress();
- }
- this._render();
- if (this.options.autoUpload) {
- this.uploadAll();
- }
- }
+ public clearQueue(): void {
+ while (this.queue.length) {
+ this.queue[0].remove();
+ }
+ this.progress = 0;
+ }
- public removeFromQueue(value: FileItem): void {
- let index = this.getIndexOfItem(value);
- let item = this.queue[ index ];
- if (item.isUploading) {
- item.cancel();
- }
- this.onRemoveItem(item);
- this.queue.splice(index, 1);
- this.progress = this._getTotalProgress();
- }
+ public uploadItem(value: FileItem): void {
+ let index = this.getIndexOfItem(value);
+ let item = this.queue[index];
+ item._prepareToUploading();
+ if (this.isUploading) {
+ return;
+ }
+ this.isUploading = true;
+ this._uploadFile(item);
+ }
- public clearQueue(): void {
- while (this.queue.length) {
- this.queue[ 0 ].remove();
- }
- this.progress = 0;
- }
+ public cancelItem(value: FileItem): void {
+ const index = this.getIndexOfItem(value);
+ const item = this.queue[index];
+ if (item && item.isUploading) {
+ this.uploaderService.stopUpload()
+ }
+ }
- public uploadItem(value: FileItem): void {
- let index = this.getIndexOfItem(value);
- 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);
- }
+ public uploadAll(): void {
+ const items = this.getNotUploadedItems().filter((item: FileItem) => !item.isUploading);
+ if (!items.length) {
+ return;
+ }
+ items.map((item: FileItem) => item._prepareToUploading());
+ items[0].upload();
+ }
- public cancelItem(value: FileItem): void {
- const index = this.getIndexOfItem(value);
- const item = this.queue[ index ];
- const prop = this.options.isHTML5 ? item._xhr : item._form;
- if (item && item.isUploading) {
- prop.abort();
- }
- }
+ public cancelAll(): void {
+ const items = this.getNotUploadedItems();
+ items.map((item: FileItem) => item.cancel());
+ }
- public uploadAll(): void {
- const items = this.getNotUploadedItems().filter((item: FileItem) => !item.isUploading);
- if (!items.length) {
- return;
- }
- items.map((item: FileItem) => item._prepareToUploading());
- items[ 0 ].upload();
- }
+ public isFile(value: any): boolean {
+ return isFile(value);
+ }
- public cancelAll(): void {
- const items = this.getNotUploadedItems();
- items.map((item: FileItem) => item.cancel());
- }
+ public isFileLikeObject(value: any): boolean {
+ return value instanceof FileLikeObject;
+ }
- public isFile(value: any): boolean {
- return isFile(value);
- }
+ public getIndexOfItem(value: any): number {
+ return typeof value === 'number' ? value : this.queue.indexOf(value);
+ }
- public isFileLikeObject(value: any): boolean {
- return value instanceof FileLikeObject;
- }
+ public getIsErrorItems(): any[] {
+ return this.queue.filter((item: FileItem) => item.isError);
+ }
- public getIndexOfItem(value: any): number {
- return typeof value === 'number' ? value : this.queue.indexOf(value);
- }
-
- public getIsErrorItems(): any[] {
- return this.queue.filter((item: FileItem) => item.isError);
- }
-
- public getIsCancelItems(): any[] {
- return this.queue.filter((item: FileItem) => item.isCancel);
- }
-
- public getIsSuccessItems(): any[] {
- return this.queue.filter((item: FileItem) => item.isSuccess );
- }
-
- public getAllItems(): any[] {
- return this.queue;
- }
-
-
- public getNotUploadedItems(): any[] {
- return this.queue.filter((item: FileItem) => !item.isUploaded);
- }
+ public getIsCancelItems(): any[] {
+ return this.queue.filter((item: FileItem) => item.isCancel);
+ }
- public getReadyItems(): any[] {
- return this.queue
- .filter((item: FileItem) => (item.isReady && !item.isUploading))
- .sort((item1: any, item2: any) => item1.index - item2.index);
- }
+ public getIsSuccessItems(): any[] {
+ return this.queue.filter((item: FileItem) => item.isSuccess);
+ }
- public destroy(): void {
- return void 0;
- }
+ public getAllItems(): any[] {
+ return this.queue;
+ }
- public onAfterAddingAll(fileItems: any): any {
- return { fileItems };
- }
- public onBuildItemForm(fileItem: FileItem, form: any): any {
- return { fileItem, form };
- }
+ public getNotUploadedItems(): any[] {
+ return this.queue.filter((item: FileItem) => !item.isUploaded);
+ }
- public onAfterAddingFile(fileItem: FileItem): any {
- return { fileItem };
- }
+ public getReadyItems(): any[] {
+ return this.queue
+ .filter((item: FileItem) => (item.isReady && !item.isUploading))
+ .sort((item1: any, item2: any) => item1.index - item2.index);
+ }
- public onWhenAddingFileFailed(item: FileLikeObject, filter: any, options: any): any {
- return { item, filter, options };
- }
+ public destroy(): void {
+ return void 0;
+ }
- public onBeforeUploadItem(fileItem: FileItem): any {
- return { fileItem };
- }
+ public onAfterAddingAll(fileItems: any): any {
+ return { fileItems };
+ }
- public onProgressItem(fileItem: FileItem, progress: any): any {
- return { fileItem, progress };
- }
+ public onBuildItemForm(fileItem: FileItem, form: any): any {
+ return { fileItem, form };
+ }
- public onProgressAll(progress: any): any {
- return { progress };
- }
+ public onAfterAddingFile(fileItem: FileItem): any {
+ return { fileItem };
+ }
- public onSuccessItem(item: FileItem, response: string, status: number, headers: ParsedResponseHeaders): any {
- return { item, response, status, headers };
- }
+ public onWhenAddingFileFailed(item: FileLikeObject, filter: any, options: any): any {
+ return { item, filter, options };
+ }
- public onErrorItem(item: FileItem, response: string, status: number, headers: ParsedResponseHeaders): any {
- return { item, response, status, headers };
- }
+ public onBeforeUploadItem(fileItem: FileItem): any {
+ return { fileItem };
+ }
- public onCancelItem(item: FileItem, response: string, status: number, headers: ParsedResponseHeaders): any {
- return { item, response, status, headers };
- }
- public onRemoveItem(item: FileItem ): any {
- return { item };
- }
- public onCompleteChunk(item: FileItem, response: string, status: number, headers: ParsedResponseHeaders): any {
- return { item, response, status, headers };
- }
- public onErrorChunk(item: FileItem, response: string, status: number, headers: ParsedResponseHeaders): any {
- return { item, response, status, headers };
- }
- public onCompleteItem(item: FileItem, response: string, status: number, headers: ParsedResponseHeaders): any {
- return { item, response, status, headers };
- }
+ public onProgressItem(fileItem: FileItem, progress: any): any {
+ return { fileItem, progress };
+ }
- public onCompleteAll(): any {
- return void 0;
- }
+ public onProgressAll(progress: any): any {
+ return { progress };
+ }
- public _mimeTypeFilter(item: FileLikeObject): boolean {
- return !(this.options.allowedMimeType && this.options.allowedMimeType.indexOf(item.type) === -1);
- }
+ public onSuccessItem(item: FileItem, response: string, status: number, headers: HttpHeaders): any {
+ return { item, response, status, headers };
+ }
- public _fileSizeFilter(item: FileLikeObject): boolean {
- return !(this.options.maxFileSize && item.size > this.options.maxFileSize);
- }
+ public onErrorItem(item: FileItem, response: string, status: number, headers: HttpHeaders): any {
+ return { item, response, status, headers };
+ }
- public _fileTypeFilter(item: FileLikeObject): boolean {
- return !(this.options.allowedFileType &&
- this.options.allowedFileType.indexOf(FileType.getMimeClass(item)) === -1);
- }
+ public onCancelItem(item: FileItem): any {
+ return { item };
+ }
+ public onRemoveItem(item: FileItem): any {
+ return { item };
+ }
+ public onCompleteChunk(item: FileItem, response: string, status: number, headers: HttpHeaders): any {
+ return { item, response, status, headers };
+ }
+ public onErrorChunk(item: FileItem, response: string, status: number, headers: HttpHeaders): any {
+ return { item, response, status, headers };
+ }
+ public onCompleteItem(item: FileItem, response: string, status: number, headers: HttpHeaders): any {
+ return { item, response, status, headers };
+ }
- public _onErrorItem(item: FileItem, response: string, status: number, headers: ParsedResponseHeaders): void {
- item._onError(response, status, headers);
- this.onErrorItem(item, response, status, headers);
- }
- public _onCompleteChunk(item: FileItem, response: string, status: number, headers: ParsedResponseHeaders): void{
- this.onCompleteChunk(item,response,status,headers);
- item._onCompleteChunk(response, status, headers);
- this.progress = this._getTotalProgress();
- this._render();
- }
- public _onCompleteItem(item: FileItem, response: string, status: number, headers: ParsedResponseHeaders): void {
- item._onComplete(response, status, headers);
- this.onCompleteItem(item, response, status, headers);
- let nextItem = this.getReadyItems()[ 0 ];
- this.isUploading = false;
- if (nextItem) {
- nextItem.upload();
- return;
- }
- this.onCompleteAll();
- this.progress = this._getTotalProgress();
- this._render();
- }
- protected _headersGetter(parsedHeaders: ParsedResponseHeaders): any {
- return (name: any): any => {
- if (name) {
- return parsedHeaders[ name.toLowerCase() ] || void 0;
- }
- return parsedHeaders;
- };
- }
- protected _xhrAppendEvents(xhr: XMLHttpRequest, item: FileItem): XMLHttpRequest{
- let that = this;
- xhr.upload.onprogress = (event: any) => {
- let progress = Math.round(event.lengthComputable ? event.loaded * 100 / event.total : 0);
- if (that.options.chunkSize > 0) {
- progress = Math.round( ((item._currentChunk-1) * 100) / item._totalChunks) + Math.round(progress / item._totalChunks);
- }
- this._onProgressItem(item, progress);
- };
- xhr.onload = () => {
- const headers = this._parseHeaders(xhr.getAllResponseHeaders());
- const response = this._transformResponse(xhr.response, headers);
- const gist = this._isSuccessCode(xhr.status) ? 'Success' : 'Error';
- const method = '_on' + gist + 'Item';
- if (this.options.chunkSize > 0) {
- item._chunkUploaders.pop();
- if (item._currentChunk >= item._totalChunks) {
- (this as any)[ method ](item, response, xhr.status, headers);
- this._onCompleteItem(item, response, xhr.status, headers);
- } else {
- this._onCompleteChunk(item, response, xhr.status, headers);
- }
- } else {
- (this as any)[ method ](item, response, xhr.status, headers);
- this._onCompleteItem(item, response, xhr.status, headers);
- }
- };
- xhr.onerror = () => {
- const headers = this._parseHeaders(xhr.getAllResponseHeaders());
- const response = this._transformResponse(xhr.response, headers);
- if (this.options.chunkSize > 0) {
- this._onErrorChunk(item, response, xhr.status, headers);
- } else {
- this._onErrorItem(item, response, xhr.status, headers);
- this._onCompleteItem(item, response, xhr.status, headers);
- }
- };
- xhr.onabort = () => {
- const headers = this._parseHeaders(xhr.getAllResponseHeaders());
- const response = this._transformResponse(xhr.response, headers);
- this._onCancelItem(item, response, xhr.status, headers);
- this._onCompleteItem(item, response, xhr.status, headers);
- };
+ public onCompleteAll(): any {
+ return void 0;
+ }
- xhr.open(item.method, item.url, true);
- xhr.withCredentials = item.withCredentials;
- if (this.options.headers) {
- for (let header of this.options.headers) {
- xhr.setRequestHeader(header.name, header.value);
- }
- }
- if (item.headers.length) {
- for (let header of item.headers) {
- xhr.setRequestHeader(header.name, header.value);
- }
- }
- if (this.authToken) {
- xhr.setRequestHeader(this.authTokenHeader, this.authToken);
- }
- xhr.onreadystatechange = function () {
- if (xhr.readyState == XMLHttpRequest.DONE) {
- that.response.emit(xhr.responseText)
- }
- };
- return xhr;
- }
-
- protected _buildMultiPartSendable(item: FileItem): FormData{
- let sendable: FormData;
- sendable = new FormData();
- this._onBuildItemForm(item, sendable);
- let file: any = null;
- if(this.options.chunkSize > 0){
- file = item.getCurrentChunkFile();
- }else{
- file = item._file;
- }
- const appendFile = () => sendable.append(item.alias, file, item.file.name);
- if (!this.options.parametersBeforeFiles) {
- appendFile();
- }
+ public _mimeTypeFilter(item: FileLikeObject): boolean {
+ return !(this.options.allowedMimeType && this.options.allowedMimeType.indexOf(item.type) === -1);
+ }
- // For AWS, Additional Parameters must come BEFORE Files
- if (this.options.additionalParameter !== undefined) {
- Object.keys(this.options.additionalParameter).forEach((key: string) => {
- let paramVal = this.options.additionalParameter[ key ];
- // Allow an additional parameter to include the filename
- if (typeof paramVal === 'string' && paramVal.indexOf('{{file_name}}') >= 0) {
- paramVal = paramVal.replace('{{file_name}}', item.file.name);
- }
- sendable.append(key, paramVal);
- });
- }
- if (this.options.chunkSize > 0 && this.options.totalChunkParam){
- sendable.append(this.options.totalChunkParam,item.getTotalChunks());
- }
- if (this.options.chunkSize > 0 && this.options.currentChunkParam){
- sendable.append(this.options.currentChunkParam,item.getCurrentChunk() +1);
- }
+ public _fileSizeFilter(item: FileLikeObject): boolean {
+ return !(this.options.maxFileSize && item.size > this.options.maxFileSize);
+ }
- if (this.options.parametersBeforeFiles) {
- appendFile();
- }
+ public _fileTypeFilter(item: FileLikeObject): boolean {
+ return !(this.options.allowedFileType &&
+ this.options.allowedFileType.indexOf(FileType.getMimeClass(item)) === -1);
+ }
- return sendable;
- }
- protected _xhrTransport(item: FileItem): any {
- let that = this;
- let xhr = item._xhr = new XMLHttpRequest();
- let sendable: any;
- this._onBeforeUploadItem(item);
+ public _onErrorItem(item: FileItem, response: string, status: number, headers: HttpHeaders): void {
+ item._onError(response, status, headers);
+ this.onErrorItem(item, response, status, headers);
+ }
+ public _onCompleteChunk(item: FileItem, response: string, status: number, headers: HttpHeaders): void {
+ this.onCompleteChunk(item, response, status, headers);
+ item._onCompleteChunk(response, status, headers);
+ this.progress = this._getTotalProgress();
+ this._render();
+ }
+ public _onCompleteItem(item: FileItem, response?: string, status?: number, headers?: HttpHeaders): void {
+ item._onComplete(response, status, headers);
+ this.onCompleteItem(item, response, status, headers);
+ let nextItem = this.getReadyItems()[0];
+ this.isUploading = false;
+ if (nextItem) {
+ nextItem.upload();
+ return;
+ }
+ this.onCompleteAll();
+ this.progress = this._getTotalProgress();
+ this._render();
+ }
+
+ protected _onProgress(event: HttpProgressEvent, item: FileItem) {
+ event = event;
+ let progress = (100 * event.loaded / event.total);
+ if (this.uploaderService.options.chunkSize > 0) {
+ progress = ( 100 * item.getCurrentChunk() / item.getTotalChunks() ) + (progress / item.getTotalChunks() );
+ }
+ // TODO: Check why it's not showing upload progress per item only on complete.
+ this._onProgressItem(item, Math.round(progress) );
+ }
+ public onProgress(event: HttpProgressEvent, item: FileItem) {
+ this._onProgress(event, item);
+ }
+ protected _onStart(event: HttpSentEvent, item: FileItem) {
- if (typeof item._file.size !== 'number') {
- throw new TypeError('The file specified is no longer valid');
- }
- if (!this.options.disableMultipart) {
- /* CHUNCKED FILE UPLOAD */
- if (this.options.chunkSize > 0) {
- const chunkMethod = this.options.chunkMethod;
- item._chunkUploaders = [];
- item._currentChunk = 0;
- item._onCompleteChunkCallNext = function(): void{
- item._currentChunk ++;
- if (item._currentChunk > 1) {
- item.method = chunkMethod;
- }
- const sendable = this.uploader._buildMultiPartSendable(item);
- let xhr = new XMLHttpRequest();
- xhr = this.uploader._xhrAppendEvents(xhr, item);
- item._xhr = xhr;
- item._chunkUploaders.push(xhr);
- xhr.send(sendable);
- item.prepareNextChunk()
- };
- item.createFileChunk(this.options.chunkSize);
- item.setIsUploading(true);
- item._onCompleteChunkCallNext();
- this._render();
- return;
- } else {
- sendable = this._buildMultiPartSendable(item);
- }
- } else {
- sendable = this.options.formatDataFunction(item);
- }
- // Append Evenets
- xhr = this._xhrAppendEvents(xhr, item);
- if (this.options.formatDataFunctionIsAsync) {
- sendable.then(
- (result: any) => xhr.send(JSON.stringify(result))
- );
- } else {
- xhr.send(sendable);
- }
- this._render();
- }
+ }
+ public onStart(event: HttpSentEvent, item: FileItem) {
+ this._onStart(event, item);
+ }
+ protected _onLoad(event: HttpResponse, item: FileItem) {
+ const headers = event.headers;
+ const response = this._transformResponse(event.body, headers);
+ const gist = this._isSuccessCode(event.status) ? 'Success' : 'Error';
+ const method = '_on' + gist + 'Item';
+ if (this.uploaderService.options.chunkSize > 0) {
+ if ( (item.getCurrentChunk() +1) >= item.getTotalChunks()) {
+ (this as any)[method](item, response, event.status, headers);
+ this._onCompleteItem(item, response, event.status, headers);
+ } else {
+ this._onCompleteChunk(item, response, event.status, headers);
+ }
+ } else {
+ (this as any)[method](item, response, event.status, headers);
+ this._onCompleteItem(item, response, event.status, headers);
+ }
+
+ }
+ public onLoad(event: HttpResponse, item: FileItem) {
+ this._onLoad(event, item);
+ }
- protected _getTotalProgress(value: number = 0): number {
- if (this.options.removeAfterUpload) {
- return value;
- }
- let notUploaded = this.getNotUploadedItems().length;
- let uploaded = notUploaded ? this.queue.length - notUploaded : this.queue.length;
- let ratio = 100 / this.queue.length;
- let current = value * ratio / 100;
- return Math.round(uploaded * ratio + current);
- }
+ protected _onError(error: any, item: FileItem) {
+ const headers: HttpHeaders = error.Headers
+ const response = this._transformResponse(error.error, headers);
+ if (this.uploaderService.options.chunkSize > 0) {
+ this._onErrorChunk(item, response, error.status, headers);
+ } else {
+ this._onErrorItem(item, response, error.status, headers);
+ this._onCompleteItem(item, response, error.status, headers);
+ }
+ }
+ public onError(error: HttpErrorResponse, item: FileItem) {
+ this._onError(error,item);
+ }
+ protected _onAbort(error: HttpErrorResponse, item: FileItem) {
+ this._onCancelItem(item);
+ this._onCompleteItem(item);
+ }
- protected _getFilters(filters: FilterFunction[] | string): FilterFunction[] {
- if (!filters) {
- return this.options.filters;
- }
- if (Array.isArray(filters)) {
- return filters;
- }
- if (typeof filters === 'string') {
- let names = filters.match(/[^\s,]+/g);
- return this.options.filters
- .filter((filter: any) => names.indexOf(filter.name) !== -1);
- }
- return this.options.filters;
- }
+ public onAbort(error: HttpErrorResponse, item: FileItem) {
+ this._onAbort(error, item);
+ }
+
+ protected _uploadFile(item: FileItem): any {
+ this._onBeforeUploadItem(item);
+ if (typeof item._file.size !== 'number') {
+ throw new TypeError('The file specified is no longer valid');
+ }
+ this.uploaderService.uploadFile(item, this.options);
+ }
+
+ protected _getTotalProgress(value: number = 0): number {
+ if (this.options.removeAfterUpload) {
+ return value;
+ }
+ let notUploaded = this.getNotUploadedItems().length;
+ let uploaded = notUploaded ? this.queue.length - notUploaded : this.queue.length;
+ let ratio = 100 / this.queue.length;
+ let current = value * ratio / 100;
+ return Math.round(uploaded * ratio + current);
+ }
- protected _render(): any {
- return void 0;
- }
+ protected _getFilters(filters: FilterFunction[] | string): FilterFunction[] {
+ if (!filters) {
+ return this.options.filters;
+ }
+ if (Array.isArray(filters)) {
+ return filters;
+ }
+ if (typeof filters === 'string') {
+ let names = filters.match(/[^\s,]+/g);
+ return this.options.filters
+ .filter((filter: any) => names.indexOf(filter.name) !== -1);
+ }
+ return this.options.filters;
+ }
- protected _queueLimitFilter(): boolean {
- return this.options.queueLimit === undefined || this.queue.length < this.options.queueLimit;
- }
+ protected _render(): any {
+ return void 0;
+ }
- protected _isValidFile(file: FileLikeObject, filters: FilterFunction[], options: FileUploaderOptions): boolean {
- this._failFilterIndex = -1;
- return !filters.length ? true : filters.every((filter: FilterFunction) => {
- this._failFilterIndex++;
- return filter.fn.call(this, file, options);
- });
- }
+ protected _queueLimitFilter(): boolean {
+ return this.options.queueLimit === undefined || this.queue.length < this.options.queueLimit;
+ }
- protected _isSuccessCode(status: number): boolean {
- return (status >= 200 && status < 300) || status === 304;
- }
+ protected _isValidFile(file: FileLikeObject, filters: FilterFunction[], options: FileUploaderOptions): boolean {
+ this._failFilterIndex = -1;
+ return !filters.length ? true : filters.every((filter: FilterFunction) => {
+ this._failFilterIndex++;
+ return filter.fn.call(this, file, options);
+ });
+ }
- protected _transformResponse(response: string, headers: ParsedResponseHeaders): string {
- return response;
- }
+ protected _isSuccessCode(status: number): boolean {
+ return (status >= 200 && status < 300) || status === 304;
+ }
- protected _parseHeaders(headers: string): ParsedResponseHeaders {
- let parsed: any = {};
- let key: any;
- let val: any;
- let i: any;
- if (!headers) {
- return parsed;
- }
- headers.split('\n').map((line: any) => {
- i = line.indexOf(':');
- key = line.slice(0, i).trim().toLowerCase();
- val = line.slice(i + 1).trim();
- if (key) {
- parsed[ key ] = parsed[ key ] ? parsed[ key ] + ', ' + val : val;
- }
- });
- return parsed;
- }
+ protected _transformResponse(response: string, headers: HttpHeaders): string {
+ return response;
+ }
- protected _onWhenAddingFileFailed(item: FileLikeObject, filter: any, options: any): void {
- this.onWhenAddingFileFailed(item, filter, options);
- }
+ protected _onWhenAddingFileFailed(item: FileLikeObject, filter: any, options: any): void {
+ this.onWhenAddingFileFailed(item, filter, options);
+ }
- protected _onAfterAddingFile(item: FileItem): void {
- this.onAfterAddingFile(item);
- }
+ protected _onAfterAddingFile(item: FileItem): void {
+ this.onAfterAddingFile(item);
+ }
- protected _onAfterAddingAll(items: any): void {
- this.onAfterAddingAll(items);
- }
+ protected _onAfterAddingAll(items: any): void {
+ this.onAfterAddingAll(items);
+ }
- protected _onBeforeUploadItem(item: FileItem): void {
- item._onBeforeUpload();
- this.onBeforeUploadItem(item);
- }
+ protected _onBeforeUploadItem(item: FileItem): void {
+ item._onBeforeUpload();
+ this.onBeforeUploadItem(item);
+ }
- protected _onBuildItemForm(item: FileItem, form: any): void {
- item._onBuildForm(form);
- this.onBuildItemForm(item, form);
- }
+ public _onBuildItemForm(item: FileItem, form: any): void {
+ item._onBuildForm(form);
+ this.onBuildItemForm(item, form);
+ }
- protected _onProgressItem(item: FileItem, progress: any): void {
- const total = this._getTotalProgress(progress);
- this.progress = total;
- item._onProgress(progress);
- this.onProgressItem(item, progress);
- this.onProgressAll(total);
- this._render();
- }
- protected _onErrorChunk(item: FileItem, response: string, status: number, headers: ParsedResponseHeaders): void {
- item._onErrorChunk(response, status, headers);
- this.onErrorChunk(item, response, status, headers)
- }
- protected _onSuccessItem(item: FileItem, response: string, status: number, headers: ParsedResponseHeaders): void {
- item._onSuccess(response, status, headers);
- this.onSuccessItem(item, response, status, headers);
- }
+ protected _onProgressItem(item: FileItem, progress: any): void {
+ const total = this._getTotalProgress(progress);
+ this.progress = total;
+ item._onProgress(progress);
+ this.onProgressItem(item, progress);
+ this.onProgressAll(total);
+ this._render();
+ }
+ protected _onErrorChunk(item: FileItem, response: string, status: number, headers: HttpHeaders): void {
+ item._onErrorChunk(response, status, headers);
+ this.onErrorChunk(item, response, status, headers)
+ }
+ protected _onSuccessItem(item: FileItem, response: string, status: number, headers: HttpHeaders): void {
+ item._onSuccess(response, status, headers);
+ this.onSuccessItem(item, response, status, headers);
+ }
- protected _onCancelItem(item: FileItem, response: string, status: number, headers: ParsedResponseHeaders): void {
- item._onCancel(response, status, headers);
- this.onCancelItem(item, response, status, headers);
- }
-}
+ protected _onCancelItem(item: FileItem): void {
+ item._onCancel();
+ this.onCancelItem(item);
+ }
+}
\ No newline at end of file
diff --git a/src/file-upload/file-uploader.service.ts b/src/file-upload/file-uploader.service.ts
new file mode 100644
index 0000000..7fb007e
--- /dev/null
+++ b/src/file-upload/file-uploader.service.ts
@@ -0,0 +1,336 @@
+import { map } from 'rxjs/operators/map';
+import { Observable } from 'rxjs';
+import { FileUploaderOptions, FileUploader } from './file-uploader.class';
+import { FileItem } from './file-item.class';
+import { HttpClient, HttpRequest, HttpEventType, HttpEvent, HttpErrorResponse, HttpHeaders, HttpParams } from '@angular/common/http';
+import { Injectable } from '@angular/core';
+import { tap, last, catchError } from 'rxjs/operators';
+import { of } from 'rxjs/observable/of';
+
+export interface UploaderLinksOptions {
+ downloadEntry: string,
+ updateEntry: string,
+ createEntry: string,
+ deleteEntry: string,
+}
+
+export interface UploaderServiceOptions {
+ createMethod: string;
+ updateMethod: string;
+ authorizationHeaderName?: string;
+ tokenPattern?: string;
+ token?: string;
+ chunkSize?: number;
+ totalChunkParamName?: string;
+ currentChunkParamName?: string;
+ fileParamName?: string;
+ idAttribute?: string;
+}
+@Injectable()
+export class FileUploaderService {
+ public defaultLinks: UploaderLinksOptions = {
+ downloadEntry: '',
+ updateEntry: '',
+ createEntry: '',
+ deleteEntry: '',
+ }
+ public defaultOptions: UploaderServiceOptions = {
+ createMethod: 'POST',
+ updateMethod: 'POST',
+ authorizationHeaderName: "Authorization",
+ tokenPattern: null,
+ token: null,
+ chunkSize: 0,
+ totalChunkParamName: 'total_chunks',
+ currentChunkParamName: 'current_chunk',
+ fileParamName: 'file',
+ idAttribute: 'id',
+ }
+ public additionalHeaders = {};
+ protected cancelError = "UPLOAD CANCELED";
+ protected uploadSubscription: any = null;
+ public links:UploaderLinksOptions;
+ public options:UploaderServiceOptions;
+ private _uploader:FileUploader = null;
+ constructor(
+ protected http: HttpClient
+ ){
+ this.links = Object.assign({}, this.defaultLinks, this.links);
+ this.options = Object.assign({}, this.defaultOptions, this.options);
+ }
+ get uploader():FileUploader {
+ return this._uploader;
+ }
+ set uploader(theUploader:FileUploader) {
+ this._uploader = theUploader;
+ }
+ public onBeforeUpload(item:FileItem, options:FileUploaderOptions):Promise{
+ const promise = new Promise((resolve, reject) => {
+ resolve(true);
+ });
+ return promise;
+ }
+ public uploadFile(item:FileItem, options:FileUploaderOptions):void{
+ this.onBeforeUpload(item,options).then(
+ () => {
+ this._uploadFile(item, options);
+ }
+ )
+ }
+ public onBeforeGetDefaultHeaders(): Promise {
+ const promise = new Promise((resolve, reject) => {
+ resolve(true);
+ });
+ return promise;
+ }
+ protected _getDefaultHeaders(): Promise{
+ return new Promise((resolve,reject) => {
+ this.onBeforeGetDefaultHeaders().then(
+ (result) => {
+ const h:any = {}
+ if (this.options.tokenPattern && this.options.token) {
+ h[this.options.authorizationHeaderName] = this.options.tokenPattern.replace("#token#", this.options.token);
+ }
+ for (const key in this.additionalHeaders) {
+ if (this.additionalHeaders.hasOwnProperty(key)) {
+ h[key] = this.additionalHeaders[key];
+ }
+ }
+ resolve(h);
+ },
+ (error) => {
+ reject(error);
+ }
+ )
+ })
+ }
+ protected _getRequestHeaders(item: FileItem, options: FileUploaderOptions): Promise {
+ return new Promise((resolve,reject) => {
+ this._getDefaultHeaders().then(
+ (h) => {
+ if (options.headers) {
+ for (let header of options.headers) {
+ h[header.name] = header.value;
+ }
+ }
+ if (item.headers.length) {
+ for (let header of item.headers) {
+ h[header.name] = header.value;
+ }
+ }
+ resolve(h);
+ },
+ (error) => {
+ reject(error)
+ }
+ )
+ })
+ }
+
+ public buildPackageToSend(item:FileItem, options:FileUploaderOptions){
+ let sendable: FormData = new FormData();
+ this.uploader._onBuildItemForm(item, sendable);
+ let file: any = null;
+ if (this.options.chunkSize > 0) {
+ file = item.getCurrentChunkFile();
+ } else {
+ file = item._file;
+ }
+ const appendFile = () => sendable.append(this.options.fileParamName, file, item.file.name);
+ if (!options.parametersBeforeFiles) {
+ appendFile();
+ }
+
+ // For AWS, Additional Parameters must come BEFORE Files
+ if (options.additionalParameter !== undefined) {
+ Object.keys(options.additionalParameter).forEach((key: string) => {
+ let paramVal = options.additionalParameter[key];
+ // Allow an additional parameter to include the filename
+ if (typeof paramVal === 'string' && paramVal.indexOf('{{file_name}}') >= 0) {
+ paramVal = paramVal.replace('{{file_name}}', item.file.name);
+ }
+ sendable.append(key, paramVal);
+ });
+ }
+
+ if (this.options.chunkSize > 0 && this.options.totalChunkParamName) {
+ sendable.append(this.options.totalChunkParamName, item.getTotalChunks().toString());
+ }
+ if (this.options.chunkSize > 0 && this.options.currentChunkParamName) {
+ sendable.append(this.options.currentChunkParamName, (item.getCurrentChunk() + 1).toString() );
+ }
+
+ if (options.parametersBeforeFiles) {
+ appendFile();
+ }
+
+ return sendable;
+ }
+
+ protected _uploadFile(item:FileItem, options:FileUploaderOptions):void{
+ this._getRequestHeaders(item, options).then(
+ (headers) => {
+ let request_method = this.options.createMethod;
+ let link = this.links.createEntry;
+ item.setIsUploading(true);
+ if(this.options.chunkSize > 0){
+ try{
+ item.getCurrentChunk()
+ }catch(err){
+ item.createFileChunk(this.options.chunkSize);
+ }
+ request_method = item.getCurrentChunk() > 0 ? this.options.updateMethod : this.options.createMethod;
+ link = item.getCurrentChunk() > 0 ? this.links.updateEntry : this.links.createEntry;
+ }
+ if (item.getId()){
+ link = link.replace("#id#", item.getId());
+ }
+ const data = this.buildPackageToSend(item, options);
+ let request = new HttpRequest(request_method, link, data, {
+ headers: new HttpHeaders(headers),
+ reportProgress: true,
+ withCredentials: item.withCredentials,
+ });
+ this.uploadSubscription = this.http.request(request).subscribe(
+ (event) => {
+ this.getEventMessage(event, item);
+ },
+ (error) => {
+ if(this.cancelError === error){
+ this.uploader.onAbort(error, item);
+ }else{
+ this.uploader.onError(error, item);
+ }
+
+ },
+ )
+ },
+ (error) =>{
+
+ }
+ )
+ }
+ public stopUpload() {
+ if(this.uploadSubscription && this.uploadSubscription.unsubscribe){
+ this.uploadSubscription.error(this.cancelError)
+ }
+ }
+ private getEventMessage(event: any, item: FileItem) {
+ switch (event.type) {
+ case HttpEventType.ResponseHeader:
+ break;
+ case HttpEventType.Sent:
+ this.uploader.onStart(event, item);
+ break;
+ case HttpEventType.UploadProgress:
+ this.uploader.onProgress(event, item);
+ break;
+ case HttpEventType.Response:
+ if(this.options.chunkSize > 0){
+ if(item.getCurrentChunk() === 0) {
+ const response = event.body;
+ if(response[this.options.idAttribute]) {
+ item.setId(response[this.options.idAttribute])
+ }
+ }
+ }
+ this.uploader.onLoad(event, item);
+ break;
+ default:
+ break;
+ }
+ }
+ private handleError(item: FileItem) {
+ const userMessage = `${item.file.name} upload failed.`;
+
+ return (error: HttpErrorResponse) => {
+ this.uploader.onError(error, item);
+
+ const message = (error.error instanceof Error) ?
+ error.error.message :
+ `server returned code ${error.status} with body "${error.error}"`;
+
+ return of(userMessage);
+ };
+ }
+
+ public deleteEntry(item: FileItem, options = {}, skipConfirmation = false): Observable{
+ if(item.getId() && this.links['deleteEntry']){
+ let link = this.links['deleteEntry'].replace(/#id#/g, item.getId());
+ let confirmation = false;
+ if(skipConfirmation){
+ confirmation = true;
+ } else {
+ confirmation = confirm("Are you sure you want to delete this entry?")
+ }
+
+ if (confirmation) {
+ return this.delete(link, options).map(
+ (response: Response) => {
+ return response;
+ }
+ )
+ }
+ else{
+ return Observable.of(false);
+ }
+ }else{
+ return Observable.of(false);
+ }
+ }
+
+ protected delete(url: string, options = {}): Observable {
+ return new Observable(
+ (observe) => {
+ this._getDefaultHeaders().then(
+ function(headers){
+ return this.http.delete(url, {headers: new HttpHeaders(headers) }).subscribe(
+ (response: Response) => {
+ observe.next(response);
+ },
+ (error) => {
+ observe.error(error);
+ }
+ );
+ }.bind(this),
+ (error) => {
+ observe.error(error);
+ });
+ }
+ )
+ }
+
+ /*
+ HTTP General methos only bellow
+ */
+ protected get(url: string): Observable{
+ return new Observable(
+ (observe) => {
+ this._getDefaultHeaders().then(
+ function(headers){
+ return this.http.get(url, {headers: new HttpHeaders(headers) }).subscribe(
+ (response: Response) => {
+ observe.next(response);
+ },
+ (error) => {
+ observe.error(error);
+ }
+ );
+ }.bind(this),
+ (error) => {
+ observe.error(error);
+ });
+ }
+ )
+ }
+
+ public addHeader(name=null, value=null){
+ this.additionalHeaders[name] = value
+ }
+
+ public removeHeader(name=null){
+ if(this.additionalHeaders.hasOwnProperty(name)){
+ delete(this.additionalHeaders[name])
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/index.ts b/src/index.ts
index 659f2b5..288dc36 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -3,5 +3,6 @@ export * from './file-upload/file-drop.directive';
export * from './file-upload/file-uploader.class';
export * from './file-upload/file-item.class';
export * from './file-upload/file-like-object.class';
+export * from './file-upload/file-uploader.service';
export { FileUploadModule } from './file-upload/file-upload.module';
diff --git a/src/ng2-file-upload.ts b/src/ng2-chunk-file-upload.ts
similarity index 100%
rename from src/ng2-file-upload.ts
rename to src/ng2-chunk-file-upload.ts
diff --git a/src/package.json b/src/package.json
index b7ea575..81f22e8 100644
--- a/src/package.json
+++ b/src/package.json
@@ -1,5 +1,5 @@
{
- "name": "ng2-file-upload",
+ "name": "ng2-chunk-file-upload",
"version": "1.3.0",
"peerDependencies": {
"@angular/common": "*",
diff --git a/src/tsconfig.json b/src/tsconfig.json
index acc5393..ceefeff 100644
--- a/src/tsconfig.json
+++ b/src/tsconfig.json
@@ -28,7 +28,7 @@
],
"files": [
"../scripts/typings.d.ts",
- "./ng2-file-upload.ts",
+ "./ng2-chunk-file-upload.ts",
"./index.ts"
],
"angularCompilerOptions": {
diff --git a/tsconfig.json b/tsconfig.json
new file mode 100644
index 0000000..720ae94
--- /dev/null
+++ b/tsconfig.json
@@ -0,0 +1,24 @@
+{
+ "compileOnSave": false,
+ "compilerOptions": {
+ "outDir": "./dist/out-tsc",
+ "sourceMap": true,
+ "declaration": false,
+ "moduleResolution": "node",
+ "emitDecoratorMetadata": true,
+ "experimentalDecorators": true,
+ "target": "es5",
+ "typeRoots": [
+ "node_modules/@types"
+ ],
+ "lib": [
+ "es2017",
+ "dom"
+ ],
+ "plugins": [
+ {
+ "name": "tslint-language-service"
+ }
+ ]
+ }
+}
\ No newline at end of file
diff --git a/tslint.json b/tslint.json
index aaeff52..abf973f 100644
--- a/tslint.json
+++ b/tslint.json
@@ -1,12 +1,137 @@
{
- "extends": "tslint-config-valorsoft",
- "rulesDirectory": "./node_modules/codelyzer",
- "rules": {
- "no-forward-ref": false,
- "no-null-keyword": false,
- "only-arrow-functions": false,
- "no-access-missing-member": false,
- "directive-selector": false,
- "component-selector": false
- }
-}
+ "rulesDirectory": [
+ "node_modules/codelyzer"
+ ],
+ "rules": {
+ "trailing-comma": [
+ true,
+ {
+ "multiline": "always",
+ "singleline": "never"
+ }
+ ],
+ "arrow-return-shorthand": true,
+ "callable-types": true,
+ "class-name": true,
+ "comment-format": [
+ true,
+ "check-space"
+ ],
+ "eofline": true,
+ "forin": true,
+ "import-blacklist": [
+ true,
+ "rxjs"
+ ],
+ "import-spacing": true,
+ "indent": [
+ true,
+ "tabs",
+ 4
+ ],
+ "interface-over-type-literal": true,
+ "label-position": true,
+ "max-line-length": [
+ true,
+ 180
+ ],
+ "member-access": false,
+ "no-arg": true,
+ "no-console": [
+ true,
+ "debug",
+ "log",
+ "time",
+ "timeEnd",
+ "trace"
+ ],
+ "no-construct": true,
+ "no-debugger": true,
+ "no-duplicate-super": true,
+ "no-empty": false,
+ "no-empty-interface": true,
+ "no-eval": true,
+ "no-misused-new": true,
+ "no-non-null-assertion": true,
+ "no-shadowed-variable": true,
+ "no-string-literal": false,
+ "no-string-throw": true,
+ "no-switch-case-fall-through": true,
+ "no-trailing-whitespace": true,
+ "no-unnecessary-initializer": true,
+ "no-use-before-declare": true,
+ "no-var-keyword": true,
+ "object-literal-sort-keys": false,
+ "one-line": [
+ true,
+ "check-open-brace",
+ "check-catch",
+ "check-else",
+ "check-whitespace"
+ ],
+ "prefer-const": true,
+ "quotemark": [
+ true,
+ "single"
+ ],
+ "radix": true,
+ "semicolon": [
+ true
+ ],
+ "triple-equals": [
+ true,
+ "allow-null-check"
+ ],
+ "typedef-whitespace": [
+ true,
+ {
+ "call-signature": "nospace",
+ "index-signature": "nospace",
+ "parameter": "nospace",
+ "property-declaration": "nospace",
+ "variable-declaration": "nospace"
+ }
+ ],
+ "typeof-compare": true,
+ "unified-signatures": true,
+ "variable-name": false,
+ "whitespace": [
+ true,
+ "check-branch",
+ "check-decl",
+ "check-operator",
+ "check-separator",
+ "check-type"
+ ],
+ "directive-selector": [
+ true,
+ "attribute",
+ "ngx",
+ "camelCase"
+ ],
+ "component-selector": [
+ true,
+ "element",
+ "ngx",
+ "kebab-case"
+ ],
+ "ban": [
+ true,
+ "eval",
+ "fit",
+ "fdescribe",
+ {
+ "name": "$",
+ "message": "please don't"
+ }
+ ],
+ "use-input-property-decorator": true,
+ "use-output-property-decorator": true,
+ "no-output-rename": true,
+ "use-life-cycle-interface": true,
+ "use-pipe-transform-interface": true,
+ "component-class-suffix": true,
+ "directive-class-suffix": true,
+ "no-unused-variable": true
+ }
+}
\ No newline at end of file