Merge pull request #103 from electron/local-versions

feat: Add support for local Electron builds (with versions)

Author: felixrieseberg

src/interfaces.ts

@@ -1,11 +1,20 @@
-export type ElectronVersionState = 'downloading' | 'ready' | 'unknown';
-
 export type WindowNames = 'main';
 
 export type Files = Map<string, string>;
 
 export type FileTransform = (files: Files) => Promise<Files>;
 
+export enum ElectronVersionState {
+  ready = 'ready',
+  downloading = 'downloading',
+  unknown = 'unknown'
+}
+
+export enum ElectronVersionSource {
+  remote = 'remote',
+  local = 'local'
+}
+
 export interface GitHubVersion {
   url: string;
   assets_url: string;
@@ -28,6 +37,7 @@ export interface EditorValues {
 
 export interface ElectronVersion extends GitHubVersion {
   state: ElectronVersionState;
+  source: ElectronVersionSource;
 }
 
 export interface OutputEntry {

src/less/core/button.less

@@ -1,7 +1,8 @@
 button,
 input[type='button'],
 input[type='reset'],
-input[type='submit'] {
+input[type='submit'],
+.force-button {
 	background-color: @foreground-2;
 	border: @border;
 	border-radius: .4rem;
@@ -17,6 +18,7 @@ input[type='submit'] {
 	text-decoration: none;
 	text-transform: uppercase;
 	white-space: nowrap;
+	line-height: 2.95rem;
 
 	&:hover {
 		box-shadow: inset 0 0 100px 100px rgba(255, 255, 255, 0.15);

src/less/core/form.less

@@ -17,7 +17,8 @@ select {
 	box-shadow: none;
 	box-sizing: inherit; // Forced to replace inherit values of the normalize.css
 	height: 3.8rem;
-	width: 100%;
+	width: ~"calc(100% - 1rem)";
+	padding-left: 1rem;
 
 	&:focus {
 		border-color: @foreground-2;

src/less/dialogs.less

@@ -161,7 +161,6 @@
   }
 
   input {
-    width: 100%;
     color: rgba(159, 234, 249, 0.5);
     height: 28px;
     margin-top: 10px;
@@ -207,6 +206,17 @@
   opacity: 0.5;
 }
 
+.add-version-dialog {
+  label {
+    white-space: normal;
+    height: unset;
+  }
+
+  input[type="file"] {
+    display: none;
+  }
+}
+
 select {
   font-size: 12px;
   height: 28px;

src/less/settings.less

@@ -35,6 +35,24 @@
     width: 250px;
   }
 
+  .electron-versions-table {
+    button {
+      margin: 0;
+      min-width: 250px;
+    }
+
+    .action {
+      text-align: center;
+      width: 250px;
+    }
+  }
+
+  .settings-appearance {
+    button {
+      margin-left: 0.5rem;
+    }
+  }
+
   .settings-content {
     height: 100%;
     width: 100%;
@@ -45,8 +63,27 @@
   }
 
   .settings-electron {
+    .advanced-options-buttons {
+      display: flex;
+      flex-flow: row wrap;
+
+      > div {
+        margin-right: 1rem;
+
+        button {
+          width: 100%;
+        }
+      }
+
+      > div:last-of-type {
+        margin-right: 0;
+      }
+    }
+
     .versions-to-show {
       margin-bottom: 2rem;
+      border-bottom: 1px solid @border-color-1;
+      padding-bottom: 1.5rem;
 
       p {
         margin-bottom: 1rem;
@@ -59,18 +96,6 @@
     }
   }
 
-  .electron-versions-table {
-    button {
-      margin: 0;
-      min-width: 250px;
-    }
-
-    .action {
-      text-align: center;
-      width: 250px;
-    }
-  }
-
   .settings-section {
     margin-bottom: 20px;
 
@@ -163,10 +188,4 @@
       }
     }
   }
-
-  .settings-appearance {
-    button {
-      margin-left: 0.5rem;
-    }
-  }
 }

src/renderer/binary.ts

@@ -79,8 +79,15 @@ export class BinaryManager {
     const zipPath = await eDownload({ version });
     const extractPath = this.getDownloadPath(version);
     console.log(`BinaryManager: Electron ${version} downloaded, now unpacking`);
-    const electronFiles = await this.unzip(zipPath, extractPath);
-    console.log(electronFiles);
+
+    try {
+      const electronFiles = await this.unzip(zipPath, extractPath);
+      console.log(`Unzipped ${version}`, electronFiles);
+    } catch (error) {
+      console.warn(`Failure while unzipping ${version}`, error);
+
+      // Todo: Handle this case
+    }
 
     this.state[version] = 'ready';
   }
@@ -89,11 +96,13 @@ export class BinaryManager {
    * Gets the expected path for the binary of a given Electron version
    *
    * @param {string} version
+   * @param {string} dir
    * @returns {string}
    */
-  public getElectronBinaryPath(version: string): string {
-    const dir = this.getDownloadPath(version);
-
+  public getElectronBinaryPath(
+    version: string,
+    dir: string = this.getDownloadPath(version),
+  ): string {
     switch (process.platform) {
       case 'darwin':
         return path.join(dir, 'Electron.app/Contents/MacOS/Electron');
@@ -138,10 +147,11 @@ export class BinaryManager {
    * Did we already download a given version?
    *
    * @param {string} version
+   * @param {string} dir
    * @returns {boolean}
    */
-  public async getIsDownloaded(version: string): Promise<boolean> {
-    const expectedPath = this.getElectronBinaryPath(version);
+  public async getIsDownloaded(version: string, dir?: string): Promise<boolean> {
+    const expectedPath = this.getElectronBinaryPath(version, dir);
     const fs = await fancyImport<typeof fsType>('fs-extra');
     return fs.existsSync(expectedPath);
   }