Skip to content

Commit

Permalink
use store migration
Browse files Browse the repository at this point in the history
  • Loading branch information
Araxeus committed May 11, 2021
1 parent e43c01d commit 002081b
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 25 deletions.
22 changes: 22 additions & 0 deletions config/store.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,28 @@ const Store = require("electron-store");
const defaults = require("./defaults");

const migrations = {
/** Update shortcuts format from array to object */
">=1.12.0": (store) => {
const options = store.get("plugins.shortcuts")
let updated = false;
for (const optionType of ["global", "local"]) {
if (Array.isArray(options[optionType])) {
const updatedOptions = {};
for (const optionObject of options[optionType]) {
if (optionObject.action && optionObject.shortcut) {
updatedOptions[optionObject.action] = optionObject.shortcut;
}
}

options[optionType] = updatedOptions;
updated = true;
}
}

if (updated) {
store.set("plugins.shortcuts", options);
}
},
">=1.11.0": (store) => {
if (store.get("options.resumeOnStart") === undefined) {
store.set("options.resumeOnStart", true);
Expand Down
25 changes: 0 additions & 25 deletions plugins/shortcuts/back.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
const { globalShortcut } = require("electron");
const electronLocalshortcut = require("electron-localshortcut");
const { setOptions } = require("../../config/plugins");

const getSongControls = require("../../providers/song-controls");

Expand All @@ -20,8 +19,6 @@ function registerShortcuts(win, options) {
const songControls = getSongControls(win);
const { playPause, next, previous, search } = songControls;

updateOptions(options);

if (options.overrideMediaKeys) {
_registerGlobalShortcut(win.webContents, "MediaPlayPause", playPause);
_registerGlobalShortcut(win.webContents, "MediaNextTrack", next);
Expand Down Expand Up @@ -59,26 +56,4 @@ function registerShortcuts(win, options) {
}
}

/** Update options to new format if they are still an array (old format) */
function updateOptions(options) {
let updated = false;
for (const optionType of ["global", "local"]) {
if (Array.isArray(options[optionType])) {
const updatedOptions = {};
for (const optionObject of options[optionType]) {
if (optionObject.action && optionObject.shortcut) {
updatedOptions[optionObject.action] = optionObject.shortcut;
}
}

options[optionType] = updatedOptions;
updated = true;
}
}

if (updated) {
setOptions("shortcuts", options);
}
}

module.exports = registerShortcuts;

0 comments on commit 002081b

Please sign in to comment.