Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix-MediaMetadata #678

Merged
merged 1 commit into from Nov 14, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 2 additions & 14 deletions electron_src/main.js
Expand Up @@ -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');
Expand Down
2 changes: 1 addition & 1 deletion electron_src/package.json
Expand Up @@ -91,7 +91,7 @@
}
},
"devDependencies": {
"electron": "14.2.0",
"electron": "14.2.1",
"electron-builder": "^22.13.1",
"electron-reloader": "^1.2.1"
},
Expand Down
3 changes: 1 addition & 2 deletions 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));
};
Expand Down
16 changes: 16 additions & 0 deletions 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;
8 changes: 4 additions & 4 deletions electron_src/yarn.lock
Expand Up @@ -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"
Expand Down