okseby/orchard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

css changes, transparency disabled will now disable acrylic on startup

Browse source
This commit is contained in:
booploops 2022-01-04 03:07:23 -08:00
parent 3d1156ade1
commit d34270b3ab
3 changed files with 69 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

93
src/main/cider-base.js
View file

@ -1,5 +1,5 @@
const {BrowserWindow, ipcMain, shell, app, screen} = require("electron") const { BrowserWindow, ipcMain, shell, app, screen } = require("electron")
const {join} = require("path") const { join } = require("path")
const getPort = require("get-port"); const getPort = require("get-port");
const express = require("express"); const express = require("express");
const path = require("path"); const path = require("path");
@ -8,22 +8,22 @@ const os = require('os');
const yt = require('youtube-search-without-api-key'); const yt = require('youtube-search-without-api-key');
const discord = require('./discordrpc'); const discord = require('./discordrpc');
const lastfm = require('./lastfm'); const lastfm = require('./lastfm');
const {writeFile} = require('fs'); const { writeFile } = require('fs');
const mpris = require('./mpris'); const mpris = require('./mpris');
const mm = require('music-metadata'); const mm = require('music-metadata');
const fetch = require('electron-fetch').default; const fetch = require('electron-fetch').default;
const {Stream} = require('stream'); const { Stream } = require('stream');
// Analytics for debugging. // Analytics for debugging.
const ElectronSentry = require("@sentry/electron"); const ElectronSentry = require("@sentry/electron");
ElectronSentry.init({dsn: "https://68c422bfaaf44dea880b86aad5a820d2@o954055.ingest.sentry.io/6112214"}); ElectronSentry.init({ dsn: "https://68c422bfaaf44dea880b86aad5a820d2@o954055.ingest.sentry.io/6112214" });
const CiderBase = { const CiderBase = {
win: null, win: null,
requests : [], requests: [],
audiostream : new Stream.PassThrough(), audiostream: new Stream.PassThrough(),
async Start() { async Start() {
this.clientPort = await getPort({port: 9000}); this.clientPort = await getPort({ port: 9000 });
this.win = this.CreateBrowserWindow() this.win = this.CreateBrowserWindow()
}, },
clientPort: 0, clientPort: 0,
@ -69,8 +69,11 @@ const CiderBase = {
if (process.platform === "darwin" || process.platform === "linux") { if (process.platform === "darwin" || process.platform === "linux") {
win = new BrowserWindow(options) win = new BrowserWindow(options)
} else { } else {
const {BrowserWindow} = require("electron-acrylic-window"); if (app.cfg.get("visual.window_transparency") !== "disabled") {
const { BrowserWindow } = require("electron-acrylic-window");
}
win = new BrowserWindow(options) win = new BrowserWindow(options)
win.setVibrancy("dark")
} }
// intercept "https://js-cdn.music.apple.com/hls.js/2.141.0/hls.js/hls.js" and redirect to local file "./apple-hls.js" instead // intercept "https://js-cdn.music.apple.com/hls.js/2.141.0/hls.js/hls.js" and redirect to local file "./apple-hls.js" instead
@ -99,7 +102,7 @@ const CiderBase = {
if (itspod != null) if (itspod != null)
details.requestHeaders['Cookie'] = `itspod=${itspod}` details.requestHeaders['Cookie'] = `itspod=${itspod}`
} }
callback({requestHeaders: details.requestHeaders}) callback({ requestHeaders: details.requestHeaders })
}) })
let location = `http://localhost:${CiderBase.clientPort}/` let location = `http://localhost:${CiderBase.clientPort}/`
@ -151,6 +154,10 @@ const CiderBase = {
app.cfg.store = store app.cfg.store = store
}) })
ipcMain.handle('setVibrancy', (event, key, value) => {
win.setVibrancy(value)
});
ipcMain.on('maximize', () => { // listen for maximize event ipcMain.on('maximize', () => { // listen for maximize event
if (win.isMaximized()) { if (win.isMaximized()) {
win.unmaximize() win.unmaximize()
@ -192,9 +199,9 @@ const CiderBase = {
} }
// Set window Handler // Set window Handler
win.webContents.setWindowOpenHandler(({url}) => { win.webContents.setWindowOpenHandler(({ url }) => {
if (url.includes("apple") || url.includes("localhost")) { if (url.includes("apple") || url.includes("localhost")) {
return {action: "allow"} return { action: "allow" }
} }
shell.openExternal(url).catch(() => { shell.openExternal(url).catch(() => {
}) })
@ -233,20 +240,20 @@ const CiderBase = {
ipcMain.on("getPreviewURL", (_event, url) => { ipcMain.on("getPreviewURL", (_event, url) => {
fetch(url) fetch(url)
.then(res => res.buffer()) .then(res => res.buffer())
.then(async (buffer) => { .then(async (buffer) => {
try { try {
const metadata = await mm.parseBuffer(buffer, 'audio/x-m4a'); const metadata = await mm.parseBuffer(buffer, 'audio/x-m4a');
SoundCheckTag = metadata.native.iTunes[1].value SoundCheckTag = metadata.native.iTunes[1].value
win.webContents.send('SoundCheckTag',SoundCheckTag) win.webContents.send('SoundCheckTag', SoundCheckTag)
} catch (error) { } catch (error) {
console.error(error.message); console.error(error.message);
} }
}) })
}); });
ipcMain.on('writeAudio', function(event,buffer){ ipcMain.on('writeAudio', function (event, buffer) {
CiderBase.audiostream.write(Buffer.from(buffer)); CiderBase.audiostream.write(Buffer.from(buffer));
}) })
return win return win
@ -260,7 +267,7 @@ const CiderBase = {
}, },
LinkHandler: (startArgs) => { LinkHandler: (startArgs) => {
if (!startArgs) return; if (!startArgs) return;
console.log("lfmtoken",String(startArgs)) console.log("lfmtoken", String(startArgs))
if (String(startArgs).includes('auth')) { if (String(startArgs).includes('auth')) {
let authURI = String(startArgs).split('/auth/')[1] let authURI = String(startArgs).split('/auth/')[1]
if (authURI.startsWith('lastfm')) { // If we wanted more auth options if (authURI.startsWith('lastfm')) { // If we wanted more auth options
@ -292,7 +299,7 @@ const CiderBase = {
webapp.use(function (req, res, next) { webapp.use(function (req, res, next) {
// if not localhost // if not localhost
if (req.url.includes("audio.webm") ||(req.headers.host.includes("localhost") && req.headers["user-agent"].includes("Cider"))) { if (req.url.includes("audio.webm") || (req.headers.host.includes("localhost") && req.headers["user-agent"].includes("Cider"))) {
next(); next();
} }
}); });
@ -302,24 +309,24 @@ const CiderBase = {
//res.sendFile(path.join(webRemotePath, 'index_old.html')); //res.sendFile(path.join(webRemotePath, 'index_old.html'));
res.render("main", CiderBase.EnvironmentVariables) res.render("main", CiderBase.EnvironmentVariables)
}); });
webapp.get('/audio.webm', function (req, res) { webapp.get('/audio.webm', function (req, res) {
try { try {
req.connection.setTimeout(Number.MAX_SAFE_INTEGER); req.connection.setTimeout(Number.MAX_SAFE_INTEGER);
// CiderBase.requests.push({req: req, res: res}); // CiderBase.requests.push({req: req, res: res});
// var pos = CiderBase.requests.length - 1; // var pos = CiderBase.requests.length - 1;
// req.on("close", () => { // req.on("close", () => {
// console.info("CLOSED", CiderBase.requests.length); // console.info("CLOSED", CiderBase.requests.length);
// requests.splice(pos, 1); // requests.splice(pos, 1);
// console.info("CLOSED", CiderBase.requests.length); // console.info("CLOSED", CiderBase.requests.length);
// }); // });
CiderBase.audiostream.on('data', (data) => { CiderBase.audiostream.on('data', (data) => {
try { try {
res.write(data); res.write(data);
} catch (ex) { } catch (ex) {
console.log(ex) console.log(ex)
} }
}) })
} catch (ex) {console.log(ex)} } catch (ex) { console.log(ex) }
}); });
webapp.listen(CiderBase.clientPort, function () { webapp.listen(CiderBase.clientPort, function () {
console.log(`Cider client port: ${CiderBase.clientPort}`); console.log(`Cider client port: ${CiderBase.clientPort}`);

3
src/renderer/index.js
View file

@ -346,9 +346,12 @@ const app = new Vue({
default: default:
document.querySelector("html").style.background = ""; document.querySelector("html").style.background = "";
document.querySelector("body").style.background = ""; document.querySelector("body").style.background = "";
document.querySelector("body").classList.remove("notransparency")
break; break;
case "disabled": case "disabled":
document.querySelector("html").style.background = "#222"; document.querySelector("html").style.background = "#222";
document.querySelector("body").classList.add("notransparency")
// document.querySelector("body").style.background = "#222"; // document.querySelector("body").style.background = "#222";
break; break;
} }

19
src/renderer/style.less
View file

@ -50,6 +50,17 @@ body[platform='linux'] {
background: #222; background: #222;
} }
body.notransparency::before {
content: "";
position: absolute;
top:0;
left:0;
right:0;
bottom:0;
opacity: 0.5;
background-image: url(data:image/png;base64,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);
}
*, *,
*:before, *:before,
*:after { *:after {
@ -348,7 +359,7 @@ input[type=range].web-slider::-webkit-slider-runnable-track {
height: 100%; height: 100%;
.bg-artwork-container .bg-artwork { .bg-artwork-container .bg-artwork {
filter: brightness(100%) blur(180px) saturate(280%) contrast(1); filter: brightness(80%) blur(180px) saturate(180%) contrast(1);
} }
} }
} }
@ -2696,7 +2707,7 @@ input[type="range"].web-slider.display--small::-webkit-slider-thumb {
font-size: 14px; font-size: 14px;
justify-content: center-between; justify-content: center-between;
align-items: center; align-items: center;
border-bottom: 1px solid rgb(200 200 200 / 10%); border-radius: var(--mediaItemRadius);
.artwork { .artwork {
height: 42px; height: 42px;
@ -2802,7 +2813,7 @@ input[type="range"].web-slider.display--small::-webkit-slider-thumb {
&:hover { &:hover {
background: rgb(200 200 200 / 10%); background: rgb(200 200 200 / 10%);
box-shadow: var(--mediaItemShadow);
.overlay-play { .overlay-play {
opacity: 1; opacity: 1;
} }
@ -2810,11 +2821,13 @@ input[type="range"].web-slider.display--small::-webkit-slider-thumb {
&.mediaitem-selected { &.mediaitem-selected {
background: var(--selected); background: var(--selected);
box-shadow: var(--mediaItemShadow);
} }
&:active { &:active {
background: var(--selected-click); background: var(--selected-click);
box-shadow: var(--mediaItemShadow);
color: #eee; color: #eee;
} }
} }