fix: media metadata error (#678)

refactor: extract store to a file
listen1 · Nov 14, 2021 · 8edbdc8 · 8edbdc8
1 parent a1e9ed5
commit 8edbdc8
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 21 deletions.
diff --git a/electron_src/main.js b/electron_src/main.js
@@ -2,25 +2,13 @@ const electron = require('electron');
 // import reloader from 'electron-reloader';
 const { fixCORS } = require('./cors');
 const isDev = require('./isDev');
-const Store = require('electron-store');
+const store = require('./store');
 const { app, BrowserWindow, ipcMain, session } = electron;
 // isDev && reloader(module);
 if (isDev) {
   require('electron-reloader')(module);
 }
-const schema = {
-  theme: { type: 'string', default: 'black' },
-  windowState: {
-    type: 'object',
-    default: {
-      width: 1000,
-      height: 670,
-      maximized: false,
-      zoomLevel: 0
-    }
-  }
-};
-const store = new Store({ schema });
+
 const theme = store.get('theme');
 /** @type {{ width: number; height: number; maximized: boolean; zoomLevel: number}} */
 const windowState = store.get('windowState');

diff --git a/electron_src/package.json b/electron_src/package.json
@@ -91,7 +91,7 @@
     }
   },
   "devDependencies": {
-    "electron": "14.2.0",
+    "electron": "14.2.1",
     "electron-builder": "^22.13.1",
     "electron-reloader": "^1.2.1"
   },

diff --git a/electron_src/preload.js b/electron_src/preload.js
@@ -1,6 +1,5 @@
 const { contextBridge, ipcRenderer, session, webFrame } = require('electron');
-const Store = require('electron-store');
-const store = new Store();
+const store = require('./store');
 const ipcOn = (channel) => (fn) => {
   ipcRenderer.on(channel, (event, ...args) => fn(...args));
 };

diff --git a/electron_src/store.js b/electron_src/store.js
@@ -0,0 +1,16 @@
+const Store = require('electron-store');
+const schema = {
+  theme: { type: 'string', default: 'black' },
+  windowState: {
+    type: 'object',
+    default: {
+      width: 1000,
+      height: 670,
+      maximized: false,
+      zoomLevel: 0
+    }
+  }
+};
+
+const store = new Store({ schema });
+module.exports = store;
diff --git a/electron_src/yarn.lock b/electron_src/yarn.lock
@@ -843,10 +843,10 @@ electron-store@^8.0.1:
     conf "^10.0.3"
     type-fest "^1.0.2"
 
-electron@14.2.0:
-  version "14.2.0"
-  resolved "https://registry.yarnpkg.com/electron/-/electron-14.2.0.tgz#374a9b5d76b8c1e5f123a464200e5db1eabbcbd9"
-  integrity sha512-6CmAv1P0xcwK3FQOSA27fHI36/wctSFVgj46VODn56srXXQWeolkK1VzeAFNE613iAuuH9jJdHvE3gz+c7XkNA==
+electron@14.2.1:
+  version "14.2.1"
+  resolved "https://registry.yarnpkg.com/electron/-/electron-14.2.1.tgz#ee8b9cfa8c04ad4d9456daa5bbac562c2c2517a1"
+  integrity sha512-20cLOVpmjIgYMgsDLpI36VQhv0bIy54sSBAP3rLFtrs/kVVHLu0educMVZkkMm5GJPd2vvU4mcK7f43JgVRcNg==
   dependencies:
     "@electron/get" "^1.0.1"
     "@types/node" "^14.6.2"