Added mac icon, fixed bug and updated setting path for *nix

dmf444 · May 30, 2020 · be031b2 · be031b2
1 parent 125356c
commit be031b2
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 10 deletions.
diff --git a/notes/archivesManagerLogo.icns b/notes/archivesManagerLogo.icns
diff --git a/package.json b/package.json
@@ -9,7 +9,7 @@
     "prod": "rimraf dist && cross-env NODE_ENV=production webpack --progress --colors",
     "test": "mocha -r ts-node/register -r tsconfig-paths/register \"test/**/*.ts\"",
     "build:win": "electron-builder build --win --x64",
-    "build:mac": "electron-builder build --mac --x64"
+    "build:mac": "electron-builder build --mac --x64 -c.mac.identity=null"
   },
   "build": {
     "appId": "com.dmf444.archivesmanager",
@@ -20,7 +20,8 @@
       "output": "./out/"
     },
     "mac": {
-      "target": "pkg"
+      "target": "pkg",
+      "icon": "./notes/archivesManagerLogo.icns"
     },
     "win": {
       "target": "nsis",

diff --git a/src/main/settings/FileSaveSettings.ts b/src/main/settings/FileSaveSettings.ts
@@ -1,4 +1,5 @@
 const { app } = require('electron');
+const path = require('path');
 
 export class FileSaveSettings implements ISettings{
     get stagingPath(): string {
@@ -16,8 +17,8 @@ export class FileSaveSettings implements ISettings{
     constructor() {
         this.categoryName = "save";
         this.localizedName = "Save Settings";
-        this._stagingPath = app.getPath('temp') + "\\";
-        this._processingPath = app.getPath('documents') + "\\smcs_archiver\\";
+        this._stagingPath = app.getPath('temp') + path.sep;
+        this._processingPath = app.getPath('documents') + path.sep + "archiver" + path.sep;
     }
 
     public getSettingsJson(): {} {

diff --git a/src/renderer/components/files/FileInfoMetadataForm.tsx b/src/renderer/components/files/FileInfoMetadataForm.tsx
@@ -137,12 +137,15 @@ export class FileInfoMetadataForm extends React.Component<FileInfoMetadataFormPr
         let tagOps = [];
         let ignoredTags = ["root", "temp", "documents", "other", "music"];
 
-        for(let i = 0; i < this.state.tagOptions.length; i++) {
-            let tagName: string = this.state.tagOptions[i];
-            if(isNaN(Number(tagName)) && isNaN(Number(tagName.substring(0, tagName.length - 1))) && !ignoredTags.includes(tagName)){
-                tagOps.push(<Option value={tagName} key={"tagopt" + i}>{tagName}</Option>);
+        if(this.state.tagOptions != null) {
+            for(let i = 0; i < this.state.tagOptions.length; i++) {
+                let tagName: string = this.state.tagOptions[i];
+                if(isNaN(Number(tagName)) && isNaN(Number(tagName.substring(0, tagName.length - 1))) && !ignoredTags.includes(tagName)){
+                    tagOps.push(<Option value={tagName} key={"tagopt" + i}>{tagName}</Option>);
+                }
             }
         }
+
         return tagOps;
     }
 
@@ -227,4 +230,4 @@ export class FileInfoMetadataForm extends React.Component<FileInfoMetadataFormPr
             </Form>
         );
     }
-}
+}
diff --git a/webpack.config.js b/webpack.config.js
@@ -26,7 +26,7 @@ const commonConfig = {
       '@utils': srcPaths('src/utils'),
     },
     extensions: ['.js', '.json', '.ts', '.tsx'],
-    mainFields: ["main"]
+    mainFields: ['main'],
   },
   module: {
     rules: [