migrate from remote to ipc

This commit is contained in:
Araxeus
2022-02-13 23:45:53 +02:00
parent ea35da52c3
commit 5bd97685b9
8 changed files with 83 additions and 61 deletions

View File

@ -1,22 +1,24 @@
const { ipcRenderer } = require("electron");
const { globalShortcut } = require('@electron/remote');
const { setOptions, setMenuOptions, isEnabled } = require("../../config/plugins");
function $(selector) { return document.querySelector(selector); }
let api;
module.exports = (options) => {
let api, options;
module.exports = (_options) => {
options = _options;
document.addEventListener('apiLoaded', e => {
api = e.detail;
firstRun(options);
ipcRenderer.on('changeVolume', (_, toIncrease) => changeVolume(toIncrease));
firstRun();
}, { once: true, passive: true })
};
module.exports.moveVolumeHud = moveVolumeHud;
/** Restore saved volume and setup tooltip */
function firstRun(options) {
function firstRun() {
if (typeof options.savedVolume === "number") {
// Set saved volume as tooltip
setTooltip(options.savedVolume);
@ -26,16 +28,16 @@ function firstRun(options) {
}
}
setupPlaybar(options);
setupPlaybar();
setupLocalArrowShortcuts(options);
setupLocalArrowShortcuts();
setupGlobalShortcuts(options);
setupGlobalShortcuts();
const noVid = $("#main-panel")?.computedStyleMap().get("display").value === "none";
injectVolumeHud(noVid);
if (!noVid) {
setupVideoPlayerOnwheel(options);
setupVideoPlayerOnwheel();
if (!isEnabled('video-toggle')) {
//video-toggle handles hud positioning on its own
const videoMode = () => api.getPlayerResponse().videoDetails?.musicVideoType !== 'MUSIC_VIDEO_TYPE_ATV';
@ -98,22 +100,22 @@ function showVolumeHud(volume) {
}
/** Add onwheel event to video player */
function setupVideoPlayerOnwheel(options) {
function setupVideoPlayerOnwheel() {
$("#main-panel").addEventListener("wheel", event => {
event.preventDefault();
// Event.deltaY < 0 means wheel-up
changeVolume(event.deltaY < 0, options);
changeVolume(event.deltaY < 0);
});
}
function saveVolume(volume, options) {
function saveVolume(volume) {
options.savedVolume = volume;
writeOptions(options);
writeOptions();
}
//without this function it would rewrite config 20 time when volume change by 20
let writeTimeout;
function writeOptions(options) {
function writeOptions() {
if (writeTimeout) clearTimeout(writeTimeout);
writeTimeout = setTimeout(() => {
@ -123,13 +125,13 @@ function writeOptions(options) {
}
/** Add onwheel event to play bar and also track if play bar is hovered*/
function setupPlaybar(options) {
function setupPlaybar() {
const playerbar = $("ytmusic-player-bar");
playerbar.addEventListener("wheel", event => {
event.preventDefault();
// Event.deltaY < 0 means wheel-up
changeVolume(event.deltaY < 0, options);
changeVolume(event.deltaY < 0);
});
// Keep track of mouse position for showVolumeSlider()
@ -141,11 +143,11 @@ function setupPlaybar(options) {
playerbar.classList.remove("on-hover");
});
setupSliderObserver(options);
setupSliderObserver();
}
/** Save volume + Update the volume tooltip when volume-slider is manually changed */
function setupSliderObserver(options) {
function setupSliderObserver() {
const sliderObserver = new MutationObserver(mutations => {
for (const mutation of mutations) {
// This checks that volume-slider was manually set
@ -153,7 +155,7 @@ function setupSliderObserver(options) {
(typeof options.savedVolume !== "number" || Math.abs(options.savedVolume - mutation.target.value) > 4)) {
// Diff>4 means it was manually set
setTooltip(mutation.target.value);
saveVolume(mutation.target.value, options);
saveVolume(mutation.target.value);
}
}
});
@ -166,7 +168,7 @@ function setupSliderObserver(options) {
}
/** if (toIncrease = false) then volume decrease */
function changeVolume(toIncrease, options) {
function changeVolume(toIncrease) {
// Apply volume change if valid
const steps = Number(options.steps || 1);
api.setVolume(toIncrease ?
@ -174,10 +176,10 @@ function changeVolume(toIncrease, options) {
Math.max(api.getVolume() - steps, 0));
// Save the new volume
saveVolume(api.getVolume(), options);
saveVolume(api.getVolume());
// change slider position (important)
updateVolumeSlider(options);
updateVolumeSlider();
// Change tooltips to new value
setTooltip(options.savedVolume);
@ -187,7 +189,7 @@ function changeVolume(toIncrease, options) {
showVolumeHud(options.savedVolume);
}
function updateVolumeSlider(options) {
function updateVolumeSlider() {
// Slider value automatically rounds to multiples of 5
$("#volume-slider").value = options.savedVolume > 0 && options.savedVolume < 5 ?
5 : options.savedVolume;
@ -226,26 +228,17 @@ function setTooltip(volume) {
}
}
function setupGlobalShortcuts(options) {
if (options.globalShortcuts.volumeUp) {
globalShortcut.register((options.globalShortcuts.volumeUp), () => changeVolume(true, options));
}
if (options.globalShortcuts.volumeDown) {
globalShortcut.register((options.globalShortcuts.volumeDown), () => changeVolume(false, options));
}
}
function setupLocalArrowShortcuts(options) {
function setupLocalArrowShortcuts() {
if (options.arrowsShortcut) {
window.addEventListener('keydown', (event) => {
switch (event.code) {
case "ArrowUp":
event.preventDefault();
changeVolume(true, options);
changeVolume(true);
break;
case "ArrowDown":
event.preventDefault();
changeVolume(false, options);
changeVolume(false);
break;
}
});