checkHash renamed to preprocessHash

Author: niklr

README.md

@@ -132,14 +132,14 @@ document.dispatchEvent(event);
 * `paginationRppOptions` The pagination options containing the numbers defining how many results should be shown per page. (Default: `[5, 10, 25]`)
 * `simultaneousDownloads` Number of simultaneous downloads. (Default: `2`)
 * `downloadMethod` HTTP method to use when downloading from the server (`GET`, `POST`, `PUT`, `PATCH`). (Default: `GET`)
-* `checkHashModule` Indicates if the built-in hash check module should be added. (Default: `'false'`)
-* `checkHashEnabled` Indicates if the built-in hash check should be enabled. (Default: `'true'`)
-* `checkHashTarget` The target URL for the GET request to the server for each file to see if it already exists based on the in-browser calculated hash. This can be a `string` or a `function` that allows you you to construct and return a value, based on supplied `params`. (Default: `https://httpbin.org`)
-* `checkHashMethod` HTTP method to use when sending file hash check requests. (Default: `'GET'`)
-* `checkHashParameterName` The name of the check hash request parameter. (Default: `'hash'`)
-* `checkHashFunctionName` The name of the hash function to be used in the built-in hash check. (`sha1`, `md5`) (Default: `'sha1'`)
-* `checkHashEncodingName` The name of the encoding scheme to be used in the built-in hash check. (`latin1`, `hex`, `base64`, `utf8`) (Default: `'hex'`)
-* `checkHashInputEncodingName` The name of the input encoding scheme to be used in the built-in hash check. (`latin1`, `hex`, `base64`, `utf8`) (Default: `'latin1'`)
+* `preprocessHashModule` Indicates if the built-in preprocess hash module should be added. (Default: `'false'`)
+* `preprocessHashEnabled` Indicates if the built-in preprocess hash should be enabled. (Default: `'true'`)
+* `preprocessHashTarget` The target URL for the GET request to the server for each file to see if it already exists based on the in-browser calculated hash. This can be a `string` or a `function` that allows you you to construct and return a value, based on supplied `params`. (Default: `https://httpbin.org`)
+* `preprocessHashMethod` HTTP method to use when sending file preprocess hash requests. (Default: `'GET'`)
+* `preprocessHashParameterName` The name of the preprocess hash request parameter. (Default: `'hash'`)
+* `preprocessHashFunctionName` The name of the hash function to be used in the built-in preprocess hash module. (`sha1`, `md5`) (Default: `'sha1'`)
+* `preprocessHashEncodingName` The name of the encoding scheme to be used in the built-in preprocess hash module. (`latin1`, `hex`, `base64`, `utf8`) (Default: `'hex'`)
+* `preprocessHashInputEncodingName` The name of the input encoding scheme to be used in the built-in preprocess hash module. (`latin1`, `hex`, `base64`, `utf8`) (Default: `'latin1'`)
 
 ### Resumablejs configuration
 * `target` The target URL for the multipart POST request. This can be a `string` or a `function` that allows you you to construct and return a value, based on supplied `params`. (Default: `https://httpbin.org`)

src/app/app.component.html

@@ -25,7 +25,7 @@
         Export
         <mat-icon>expand_more</mat-icon>
       </button>
-      <mat-checkbox *ngIf="datatransferFacade.showPreprocessingCheckbox()" [(ngModel)]="config.core.checkHashEnabled" style="margin-left: 10px;">
+      <mat-checkbox *ngIf="datatransferFacade.showPreprocessingCheckbox()" [(ngModel)]="config.core.preprocessHashEnabled" style="margin-left: 10px;">
         Preprocessing
       </mat-checkbox>
     </div>

src/app/facades/datatransfer.facade.ts

@@ -291,7 +291,7 @@ export class DatatransferFacade {
     }
 
     public showPreprocessingCheckbox(): boolean {
-        return this.store.count > 0 && this.config.core.checkHashModule;
+        return this.store.count > 0 && this.config.core.preprocessHashModule;
     }
 
     public showSpinner(item: IDatatransferItem): boolean {

src/app/io/datatransfer.io.ts

@@ -28,9 +28,9 @@ export abstract class BaseDatatransfer implements IDatatransfer {
 
     constructor(protected logger: LoggerService, protected config: IAppConfig,
         protected guidUtil: GuidUtil, protected cryptoService: CryptoService) {
-        this.hashType = HashType.toEnum(HashTypeImplementation.Internal, config.core.checkHashFunctionName);
-        this.encodingType = EncodingType.toEnum(EncodingTypeImplementation.Internal, config.core.checkHashEncodingName);
-        this.inputEncodingType = EncodingType.toEnum(EncodingTypeImplementation.Internal, config.core.checkHashInputEncodingName);
+        this.hashType = HashType.toEnum(HashTypeImplementation.Internal, config.core.preprocessHashFunctionName);
+        this.encodingType = EncodingType.toEnum(EncodingTypeImplementation.Internal, config.core.preprocessHashEncodingName);
+        this.inputEncodingType = EncodingType.toEnum(EncodingTypeImplementation.Internal, config.core.preprocessHashInputEncodingName);
     }
 
     public on(event: string, callback: Function): void {
@@ -92,7 +92,7 @@ export abstract class BaseDatatransfer implements IDatatransfer {
         return this.guidUtil.createGuid();
     }
 
-    protected checkHash(item: IDatatransferItem, file: File, continueCallback: Function, cancelCallback: Function): void {
+    protected preprocessHash(item: IDatatransferItem, file: File, continueCallback: Function, cancelCallback: Function): void {
         let successCallback = function (container: IStreamHashContainer) {
             let that = this as BaseDatatransfer;
             if (container.hashString) {
@@ -119,7 +119,7 @@ export abstract class BaseDatatransfer implements IDatatransfer {
                 let params = [];
                 params = params.concat(
                     [
-                        [that.config.core.checkHashParameterName, container.hashString]
+                        [that.config.core.preprocessHashParameterName, container.hashString]
                     ]
                     .map(function (pair) {
                         return [
@@ -128,7 +128,7 @@ export abstract class BaseDatatransfer implements IDatatransfer {
                     })
                 );
 
-                xhr.open(that.config.core.checkHashMethod, that.config.core.getTarget('checkHash', params));
+                xhr.open(that.config.core.preprocessHashMethod, that.config.core.getTarget('preprocessHash', params));
                 xhr.send(null);
 
             } else {

src/app/io/uploaders/resumablejs.uploader.ts

@@ -43,7 +43,7 @@ export class ResumableJsUploader extends BaseUploader {
                 that.changeItemStatus(resumableFile.internalItem, TransferStatus.Preprocessing);
                 that.preprocessFileFn(resumableFile);
             } else {
-                if (that.config.core.checkHashModule && that.config.core.checkHashEnabled) {
+                if (that.config.core.preprocessHashModule && that.config.core.preprocessHashEnabled) {
                     that.changeItemStatus(resumableFile.internalItem, TransferStatus.Preprocessing);
                     let continueCallback = function() {
                         resumableFile.preprocessFinished();
@@ -53,7 +53,7 @@ export class ResumableJsUploader extends BaseUploader {
                         that.changeItemStatus(resumableFile.internalItem, TransferStatus.Finished, resumableFile.internalItem.message);
                         that.r.uploadNextChunk();
                     };
-                    that.checkHash(resumableFile.internalItem, resumableFile.file, continueCallback, cancelCallback);
+                    that.preprocessHash(resumableFile.internalItem, resumableFile.file, continueCallback, cancelCallback);
                 } else {
                     resumableFile.preprocessFinished();
                 }

src/app/models/app-config.model.ts

@@ -15,19 +15,19 @@ export class CoreAppConfig {
     paginationRppOptions = [5, 10, 25];
     simultaneousDownloads = 2;
     downloadMethod = 'GET';
-    checkHashModule = false;
-    checkHashEnabled = true;
-    checkHashTarget = 'https://httpbin.org';
-    checkHashMethod = 'GET';
-    checkHashParameterName = 'hash';
-    checkHashFunctionName = 'sha1';
-    checkHashEncodingName = 'hex';
-    checkHashInputEncodingName = 'latin1';
+    preprocessHashModule = false;
+    preprocessHashEnabled = true;
+    preprocessHashTarget = 'https://httpbin.org';
+    preprocessHashMethod = 'GET';
+    preprocessHashParameterName = 'hash';
+    preprocessHashFunctionName = 'sha1';
+    preprocessHashEncodingName = 'hex';
+    preprocessHashInputEncodingName = 'latin1';
     getTarget = function (request, params) {
         let target;
 
-        if (request === 'checkHash' && this.checkHashEnabled) {
-            target = this.checkHashTarget;
+        if (request === 'preprocessHash' && this.preprocessHashEnabled) {
+            target = this.preprocessHashTarget;
         }
 
         if (typeof target === 'function') {