refactoring to promises

static/js/services/dockerfile/dockerfile.service.impl.ts

@@ -11,7 +11,20 @@ export class DockerfileServiceImpl implements DockerfileService {
 
   public extractDockerfile(file: any): Promise<DockerfileInfoImpl | string> {
     return new Promise((resolve, reject) => {
-      // TODO: Replace callbacks with promises
+      var reader: FileReader = this.FileReaderFactory();
+      reader.onload = (event: any) => {
+        this.DataFileService.readDataArrayAsPossibleArchive(event.target.result,
+          (files: any[]) => {
+            this.processFiles1(files);
+          },
+          () => {
+            // Not an archive. Read directly as a single file.
+            this.processFile1(event.target.result);
+          });
+      };
+
+      reader.onerror = (event: any) => reject(event);
+      reader.readAsArrayBuffer(file);
     });
   }
 
@@ -48,6 +61,20 @@ export class DockerfileServiceImpl implements DockerfileService {
     });
   }
 
+  private processFile1(dataArray: any): Promise<DockerfileInfoImpl | string> {
+    return new Promise((resolve, reject) => {
+      this.DataFileService.arrayToString(dataArray, (contents: string) => {
+        var result: DockerfileInfoImpl | null = DockerfileInfoImpl.forData(contents, this.Config);
+        if (result == null) {
+          reject('File chosen is not a valid Dockerfile');
+        }
+        else {
+          resolve(result);
+        }
+      });
+    });
+  }
+
   private processFiles(files: any[],
                        success: (dockerfile: DockerfileInfoImpl) => void,
                        failure: (error: ErrorEvent | string) => void): void {
@@ -71,6 +98,30 @@ export class DockerfileServiceImpl implements DockerfileService {
       failure('No Dockerfile found in root of archive');
     }
   }
+
+  private processFiles1(files: any[]): Promise<DockerfileInfoImpl | string> {
+    return new Promise((resolve, reject) => {
+      var found: boolean = false;
+      files.forEach((file) => {
+        if (file['name'] == 'Dockerfile') {
+          this.DataFileService.blobToString(file.toBlob(), (contents: string) => {
+            var result: DockerfileInfoImpl | null = DockerfileInfoImpl.forData(contents, this.Config);
+            if (result == null) {
+              reject('Dockerfile inside archive is not a valid Dockerfile');
+            }
+            else {
+              resolve(result);
+            }
+          });
+          found = true;
+        }
+      });
+
+      if (!found) {
+        reject('No Dockerfile found in root of archive');
+      }
+    });
+  }
 }