Include open with

d-baranowski · Oct 4, 2018 · fc71a02 · fc71a02
1 parent 9de9e5e
commit fc71a02
Show file tree

Hide file tree

Showing 5 changed files with 81 additions and 39 deletions.
diff --git a/app/FileManager.js b/app/FileManager.js
@@ -0,0 +1,54 @@
+import fs from 'fs';
+import { dialog } from 'electron';
+
+class FileManager {
+  savePath = undefined;
+  mainWindow;
+
+  constructor(mainWindow) {
+    this.mainWindow = mainWindow;
+  }
+
+  openFile(path) {
+    if (path && path[0]) {
+      this.savePath = path[0];
+      fs.readFile(path[0], 'utf8', (err, data) => {
+        if (err) throw err;
+
+        this.mainWindow.webContents.executeJavaScript(`document.store.dispatch({type: "LOAD_CHARACTER", payload: '${data}'})`);
+      });
+    }
+  }
+
+  saveFile() {
+    this.mainWindow.webContents.executeJavaScript(`JSON.stringify(document.store.getState())`, (state) => {
+      if (this.savePath) {
+        fs.writeFile(this.savePath, state, (err) => {
+          // ToDo handle error
+        });
+      } else {
+        dialog.showSaveDialog({filters: [{name: "Character", extensions: ["dnd"]}]}, (fileName) => {
+          if (fileName === undefined) return;
+          this.savePath = fileName;
+          fs.writeFile(fileName, state, (err) => {
+            // ToDo handle error
+          });
+        });
+      }
+    });
+  }
+
+  saveAs() {
+    this.mainWindow.webContents.executeJavaScript(`JSON.stringify(document.store.getState())`, (state) => {
+      dialog.showSaveDialog({filters: [{name: "Character", extensions: ["dnd"]}]}, (fileName) => {
+        if (fileName === undefined) return;
+        this.savePath = fileName;
+        fs.writeFile(fileName, state, (err) => {
+          // ToDo handle error
+        });
+      });
+    });
+  }
+}
+
+export default FileManager;
diff --git a/app/appEventsHandler.js b/app/appEventsHandler.js
@@ -0,0 +1,7 @@
+export default (fileManager, process) => {
+    const path = process.argv;
+    this.mainWindow.webContents.executeJavaScript(`document.store.dispatch({type: "SELECT_ALIGNMENT", payload: '${path}'})`);
+
+    fileManager.openFile(path);
+}
+
diff --git a/app/main.dev.js b/app/main.dev.js
@@ -12,6 +12,9 @@
  */
 import { app, BrowserWindow } from 'electron';
 import MenuBuilder from './menu';
+import FileManager from './FileManager';
+import appEventsHandler from './appEventsHandler';
+const path = require('path');
 
 let mainWindow = null;
 
@@ -84,6 +87,13 @@ app.on('ready', async () => {
     mainWindow = null;
   });
 
-  const menuBuilder = new MenuBuilder(mainWindow);
+  const fileManager = new FileManager(mainWindow);
+  const menuBuilder = new MenuBuilder(mainWindow, fileManager);
+
+  if (path.parse(process.argv[1])) {
+    const filePath = path.parse(process.argv[1]);
+    fileManager.openFile([path.join(filePath.dir, filePath.base)]);
+  }
+
   menuBuilder.buildMenu();
 });
diff --git a/app/menu.js b/app/menu.js
@@ -1,12 +1,15 @@
 // @flow
 import fs from 'fs';
 import { app, Menu, BrowserWindow, dialog } from 'electron';
+const path = require('path');
 
 export default class MenuBuilder {
   mainWindow: BrowserWindow;
+  fileManager;
 
-  constructor(mainWindow: BrowserWindow) {
+  constructor(mainWindow: BrowserWindow, fileManager) {
     this.mainWindow = mainWindow;
+    this.fileManager = fileManager;
   }
 
   buildMenu() {
@@ -139,8 +142,6 @@ export default class MenuBuilder {
     return [subMenuAbout, subMenuEdit, subMenuView, subMenuWindow];
   }
 
-  savePath = undefined;
-
   buildDefaultTemplate() {
     const templateDefault = [
       {
@@ -151,50 +152,20 @@ export default class MenuBuilder {
             accelerator: 'Ctrl+O',
             click: () => {
               const path = dialog.showOpenDialog({properties: ['openFile'], filters: [{name: "Character", extensions: ["dnd"]}]});
-              if (path && path[0]) {
-                this.savePath = path[0];
-                fs.readFile(path[0], 'utf8', (err, data) => {
-                  if (err) throw err;
-
-                  this.mainWindow.webContents.executeJavaScript(`document.store.dispatch({type: "LOAD_CHARACTER", payload: '${data}'})`);
-                });
-              }
+              this.fileManager.openFile(path);
             }
           },
           {
             label: '&Save',
             accelerator: 'Ctrl+S',
             click: () => {
-              this.mainWindow.webContents.executeJavaScript(`JSON.stringify(document.store.getState())`, (state) => {
-
-                if (this.savePath) {
-                  fs.writeFile(this.savePath, state, (err) => {
-                    // ToDo handle error
-                  });
-                } else {
-                  dialog.showSaveDialog({filters: [{name: "Character", extensions: ["dnd"]}]}, (fileName) => {
-                    if (fileName === undefined) return;
-                    this.savePath = fileName;
-                    fs.writeFile(fileName, state, (err) => {
-                      // ToDo handle error
-                    });
-                  });
-                }
-              });
+              this.fileManager.saveFile();
             }
           },
           {
             label: '&Save As',
             click: () => {
-              this.mainWindow.webContents.executeJavaScript(`JSON.stringify(document.store.getState())`, (state) => {
-                  dialog.showSaveDialog({filters: [{name: "Character", extensions: ["dnd"]}]}, (fileName) => {
-                    if (fileName === undefined) return;
-                    this.savePath = fileName;
-                    fs.writeFile(fileName, state, (err) => {
-                      // ToDo handle error
-                    });
-                  });
-              });
+              this.fileManager.saveAs();
             }
           },
           {
@@ -203,7 +174,7 @@ export default class MenuBuilder {
             click: () => {
               this.mainWindow.close();
             }
-          }
+          },
         ]
       },
       {

diff --git a/app/routes/routes.js b/app/routes/routes.js
@@ -12,7 +12,7 @@ export default () => (
     <Switch>
       <Route exact path="/" component={PageOne} />
       <Route exact path="/equipment" component={Inventory} />
-      <Route exact path="/test" component={() => "test"} />
+      <Route exact path="/test" component={() => process.argv[2].toString()} />
     </Switch>
 
   </App>