mirror of
https://github.com/th-ch/youtube-music.git
synced 2026-01-11 18:41:47 +00:00
Compare commits
58 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| fc48b920a8 | |||
| 9bc81da6f2 | |||
| 2b3363f5dc | |||
| bcff6e5134 | |||
| 1dcf76b006 | |||
| 7bdc0f42a2 | |||
| 023f5b6bc3 | |||
| 3e97e9307c | |||
| 4299ba7865 | |||
| 855d8007a7 | |||
| f239ec3232 | |||
| 5f0dcbb3fc | |||
| 97dce5ad41 | |||
| 1b3e4df1b2 | |||
| 8d74a0a9b5 | |||
| fbce109554 | |||
| f4641acdbb | |||
| 02ae9f8187 | |||
| 9f428415bb | |||
| c7d3741b97 | |||
| 6404ec0919 | |||
| 4cd2d10cad | |||
| 57f5d302d5 | |||
| 168524ba50 | |||
| 149362f2a7 | |||
| 6c330046b7 | |||
| 884a2cc226 | |||
| 3882118121 | |||
| 0fd2e7f51c | |||
| 408aa9bb59 | |||
| eec6993b95 | |||
| eb8e0a37d6 | |||
| 2a915f4fae | |||
| 26994000d7 | |||
| 78f143ea10 | |||
| 684a369fed | |||
| b19470ad0b | |||
| 6691cbf8c0 | |||
| 7ac98cf024 | |||
| 3d835fbeaa | |||
| d0824f52ea | |||
| 8c945100e2 | |||
| 68801c8e2b | |||
| a06eece4a0 | |||
| 873e093ff0 | |||
| 9c343d58ef | |||
| fed7a1df17 | |||
| 89d8907bc6 | |||
| 08d145b6fc | |||
| 57d3545701 | |||
| 08710558f5 | |||
| b80007bbd5 | |||
| ab0c93d443 | |||
| e84f045201 | |||
| 692b6b22aa | |||
| 954a58bcf5 | |||
| bce5b7d8eb | |||
| 736a706801 |
@ -9,6 +9,8 @@ jobs:
|
|||||||
osx_image: xcode11.3
|
osx_image: xcode11.3
|
||||||
- os: linux
|
- os: linux
|
||||||
dist: xenial
|
dist: xenial
|
||||||
|
services:
|
||||||
|
- xvfb
|
||||||
|
|
||||||
cache:
|
cache:
|
||||||
yarn: false
|
yarn: false
|
||||||
@ -18,6 +20,7 @@ cache:
|
|||||||
|
|
||||||
script:
|
script:
|
||||||
- |
|
- |
|
||||||
|
yarn test
|
||||||
if [ "$TRAVIS_OS_NAME" == "linux" ]; then
|
if [ "$TRAVIS_OS_NAME" == "linux" ]; then
|
||||||
yarn run release:linux
|
yarn run release:linux
|
||||||
else
|
else
|
||||||
|
|||||||
@ -21,6 +21,11 @@ install:
|
|||||||
# # https://www.appveyor.com/docs/how-to/rdp-to-build-worker/
|
# # https://www.appveyor.com/docs/how-to/rdp-to-build-worker/
|
||||||
# - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
|
# - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
|
||||||
|
|
||||||
|
# @FIXME: tests disabled because app fails to launch on AppVeyor/Windows
|
||||||
|
# os: unstable # https://github.com/electron-userland/spectron#on-appveyor
|
||||||
|
# test_script:
|
||||||
|
# - yarn test
|
||||||
|
|
||||||
build_script:
|
build_script:
|
||||||
- yarn run release:win
|
- yarn run release:win
|
||||||
|
|
||||||
|
|||||||
120
index.js
120
index.js
@ -12,11 +12,14 @@ const {
|
|||||||
isAppVisible,
|
isAppVisible,
|
||||||
isTrayEnabled,
|
isTrayEnabled,
|
||||||
store,
|
store,
|
||||||
|
startAtLogin,
|
||||||
} = require("./store");
|
} = require("./store");
|
||||||
const { fileExists, injectCSS } = require("./plugins/utils");
|
const { fileExists, injectCSS } = require("./plugins/utils");
|
||||||
|
const { isTesting } = require("./utils/testing");
|
||||||
const { setUpTray } = require("./tray");
|
const { setUpTray } = require("./tray");
|
||||||
|
|
||||||
const app = electron.app;
|
const app = electron.app;
|
||||||
|
app.allowRendererProcessReuse = true; // https://github.com/electron/electron/issues/18397
|
||||||
|
|
||||||
// Adds debug features like hotkeys for triggering dev tools and reload
|
// Adds debug features like hotkeys for triggering dev tools and reload
|
||||||
require("electron-debug")();
|
require("electron-debug")();
|
||||||
@ -38,32 +41,7 @@ function onClosed() {
|
|||||||
mainWindow = null;
|
mainWindow = null;
|
||||||
}
|
}
|
||||||
|
|
||||||
function createMainWindow() {
|
function loadPlugins(win) {
|
||||||
const windowSize = store.get("window-size");
|
|
||||||
const windowMaximized = store.get("window-maximized");
|
|
||||||
|
|
||||||
const win = new electron.BrowserWindow({
|
|
||||||
icon: icon,
|
|
||||||
width: windowSize.width,
|
|
||||||
height: windowSize.height,
|
|
||||||
backgroundColor: "#000",
|
|
||||||
show: false,
|
|
||||||
webPreferences: {
|
|
||||||
nodeIntegration: false,
|
|
||||||
preload: path.join(__dirname, "preload.js"),
|
|
||||||
nativeWindowOpen: true, // window.open return Window object(like in regular browsers), not BrowserWindowProxy
|
|
||||||
affinity: "main-window", // main window, and addition windows should work in one process
|
|
||||||
},
|
|
||||||
frame: !is.macOS(),
|
|
||||||
titleBarStyle: is.macOS() ? "hiddenInset" : "default",
|
|
||||||
});
|
|
||||||
if (windowMaximized) {
|
|
||||||
win.maximize();
|
|
||||||
}
|
|
||||||
|
|
||||||
win.webContents.loadURL(store.get("url"));
|
|
||||||
win.on("closed", onClosed);
|
|
||||||
|
|
||||||
injectCSS(win.webContents, path.join(__dirname, "youtube-music.css"));
|
injectCSS(win.webContents, path.join(__dirname, "youtube-music.css"));
|
||||||
win.webContents.on("did-finish-load", () => {
|
win.webContents.on("did-finish-load", () => {
|
||||||
if (is.dev()) {
|
if (is.dev()) {
|
||||||
@ -80,6 +58,61 @@ function createMainWindow() {
|
|||||||
handle(win);
|
handle(win);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
function createMainWindow() {
|
||||||
|
const windowSize = store.get("window-size");
|
||||||
|
const windowMaximized = store.get("window-maximized");
|
||||||
|
|
||||||
|
const win = new electron.BrowserWindow({
|
||||||
|
icon: icon,
|
||||||
|
width: windowSize.width,
|
||||||
|
height: windowSize.height,
|
||||||
|
backgroundColor: "#000",
|
||||||
|
show: false,
|
||||||
|
webPreferences: {
|
||||||
|
nodeIntegration: isTesting(), // Only necessary when testing with Spectron
|
||||||
|
preload: path.join(__dirname, "preload.js"),
|
||||||
|
nodeIntegrationInSubFrames: true,
|
||||||
|
nativeWindowOpen: true, // window.open return Window object(like in regular browsers), not BrowserWindowProxy
|
||||||
|
enableRemoteModule: true,
|
||||||
|
affinity: "main-window", // main window, and addition windows should work in one process
|
||||||
|
},
|
||||||
|
frame: !is.macOS(),
|
||||||
|
titleBarStyle: is.macOS() ? "hiddenInset" : "default",
|
||||||
|
});
|
||||||
|
if (windowMaximized) {
|
||||||
|
win.maximize();
|
||||||
|
}
|
||||||
|
|
||||||
|
win.webContents.loadURL(store.get("url"));
|
||||||
|
win.on("closed", onClosed);
|
||||||
|
|
||||||
|
win.on("move", () => {
|
||||||
|
let position = win.getPosition();
|
||||||
|
store.set("window-position", { x: position[0], y: position[1] });
|
||||||
|
});
|
||||||
|
|
||||||
|
win.on("resize", () => {
|
||||||
|
const windowSize = win.getSize();
|
||||||
|
|
||||||
|
store.set("window-maximized", win.isMaximized());
|
||||||
|
if (!win.isMaximized()) {
|
||||||
|
store.set("window-size", { width: windowSize[0], height: windowSize[1] });
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
win.once("ready-to-show", () => {
|
||||||
|
if (isAppVisible()) {
|
||||||
|
win.show();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
return win;
|
||||||
|
}
|
||||||
|
|
||||||
|
app.on("browser-window-created", (event, win) => {
|
||||||
|
loadPlugins(win);
|
||||||
|
|
||||||
win.webContents.on("did-fail-load", () => {
|
win.webContents.on("did-fail-load", () => {
|
||||||
if (is.dev()) {
|
if (is.dev()) {
|
||||||
@ -88,6 +121,10 @@ function createMainWindow() {
|
|||||||
win.webContents.loadFile(path.join(__dirname, "error.html"));
|
win.webContents.loadFile(path.join(__dirname, "error.html"));
|
||||||
});
|
});
|
||||||
|
|
||||||
|
win.webContents.on("will-prevent-unload", (event) => {
|
||||||
|
event.preventDefault();
|
||||||
|
});
|
||||||
|
|
||||||
win.webContents.on("did-navigate-in-page", () => {
|
win.webContents.on("did-navigate-in-page", () => {
|
||||||
const url = win.webContents.getURL();
|
const url = win.webContents.getURL();
|
||||||
if (url.startsWith("https://music.youtube.com")) {
|
if (url.startsWith("https://music.youtube.com")) {
|
||||||
@ -120,29 +157,7 @@ function createMainWindow() {
|
|||||||
options.webPreferences.affinity = "main-window";
|
options.webPreferences.affinity = "main-window";
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
});
|
||||||
win.on("move", () => {
|
|
||||||
let position = win.getPosition();
|
|
||||||
store.set("window-position", { x: position[0], y: position[1] });
|
|
||||||
});
|
|
||||||
|
|
||||||
win.on("resize", () => {
|
|
||||||
const windowSize = win.getSize();
|
|
||||||
|
|
||||||
store.set("window-maximized", win.isMaximized());
|
|
||||||
if (!win.isMaximized()) {
|
|
||||||
store.set("window-size", { width: windowSize[0], height: windowSize[1] });
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
win.once("ready-to-show", () => {
|
|
||||||
if (isAppVisible()) {
|
|
||||||
win.show();
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
return win;
|
|
||||||
}
|
|
||||||
|
|
||||||
app.on("window-all-closed", () => {
|
app.on("window-all-closed", () => {
|
||||||
if (process.platform !== "darwin") {
|
if (process.platform !== "darwin") {
|
||||||
@ -164,10 +179,15 @@ app.on("activate", () => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
app.on("ready", () => {
|
app.on("ready", () => {
|
||||||
setApplicationMenu();
|
|
||||||
mainWindow = createMainWindow();
|
mainWindow = createMainWindow();
|
||||||
|
setApplicationMenu(mainWindow);
|
||||||
setUpTray(app, mainWindow);
|
setUpTray(app, mainWindow);
|
||||||
|
|
||||||
|
// Autostart at login
|
||||||
|
app.setLoginItemSettings({
|
||||||
|
openAtLogin: startAtLogin(),
|
||||||
|
});
|
||||||
|
|
||||||
if (!is.dev() && autoUpdate()) {
|
if (!is.dev() && autoUpdate()) {
|
||||||
autoUpdater.checkForUpdatesAndNotify();
|
autoUpdater.checkForUpdatesAndNotify();
|
||||||
autoUpdater.on("update-available", () => {
|
autoUpdater.on("update-available", () => {
|
||||||
|
|||||||
7
jest.config.js
Normal file
7
jest.config.js
Normal file
@ -0,0 +1,7 @@
|
|||||||
|
module.exports = {
|
||||||
|
globals: {
|
||||||
|
__APP__: undefined, // A different app will be launched in each test environment
|
||||||
|
},
|
||||||
|
testEnvironment: "./tests/environment",
|
||||||
|
testTimeout: 30000, // 30s
|
||||||
|
};
|
||||||
37
menu.js
37
menu.js
@ -1,4 +1,5 @@
|
|||||||
const { app, Menu } = require("electron");
|
const { app, Menu } = require("electron");
|
||||||
|
const is = require("electron-is");
|
||||||
|
|
||||||
const { getAllPlugins } = require("./plugins/utils");
|
const { getAllPlugins } = require("./plugins/utils");
|
||||||
const {
|
const {
|
||||||
@ -9,9 +10,10 @@ const {
|
|||||||
isAppVisible,
|
isAppVisible,
|
||||||
isTrayEnabled,
|
isTrayEnabled,
|
||||||
setOptions,
|
setOptions,
|
||||||
|
startAtLogin,
|
||||||
} = require("./store");
|
} = require("./store");
|
||||||
|
|
||||||
const mainMenuTemplate = [
|
const mainMenuTemplate = (win) => [
|
||||||
{
|
{
|
||||||
label: "Plugins",
|
label: "Plugins",
|
||||||
submenu: getAllPlugins().map((plugin) => {
|
submenu: getAllPlugins().map((plugin) => {
|
||||||
@ -40,6 +42,20 @@ const mainMenuTemplate = [
|
|||||||
setOptions({ autoUpdates: item.checked });
|
setOptions({ autoUpdates: item.checked });
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
...(is.windows() || is.macOS()
|
||||||
|
? // Only works on Win/Mac
|
||||||
|
// https://www.electronjs.org/docs/api/app#appsetloginitemsettingssettings-macos-windows
|
||||||
|
[
|
||||||
|
{
|
||||||
|
label: "Start at login",
|
||||||
|
type: "checkbox",
|
||||||
|
checked: startAtLogin(),
|
||||||
|
click: (item) => {
|
||||||
|
setOptions({ startAtLogin: item.checked });
|
||||||
|
},
|
||||||
|
},
|
||||||
|
]
|
||||||
|
: []),
|
||||||
{
|
{
|
||||||
label: "Tray",
|
label: "Tray",
|
||||||
submenu: [
|
submenu: [
|
||||||
@ -63,15 +79,28 @@ const mainMenuTemplate = [
|
|||||||
},
|
},
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
label: "Toggle DevTools",
|
||||||
|
// Cannot use "toggleDevTools" role in MacOS
|
||||||
|
click: () => {
|
||||||
|
const { webContents } = win;
|
||||||
|
if (webContents.isDevToolsOpened()) {
|
||||||
|
webContents.closeDevTools();
|
||||||
|
} else {
|
||||||
|
const devToolsOptions = {};
|
||||||
|
webContents.openDevTools(devToolsOptions);
|
||||||
|
}
|
||||||
|
},
|
||||||
|
},
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
];
|
];
|
||||||
|
|
||||||
module.exports.mainMenuTemplate = mainMenuTemplate;
|
module.exports.mainMenuTemplate = mainMenuTemplate;
|
||||||
module.exports.setApplicationMenu = () => {
|
module.exports.setApplicationMenu = (win) => {
|
||||||
const menuTemplate = [...mainMenuTemplate];
|
const menuTemplate = [...mainMenuTemplate(win)];
|
||||||
if (process.platform === "darwin") {
|
if (process.platform === "darwin") {
|
||||||
const name = app.getName();
|
const name = app.name;
|
||||||
menuTemplate.unshift({
|
menuTemplate.unshift({
|
||||||
label: name,
|
label: name,
|
||||||
submenu: [
|
submenu: [
|
||||||
|
|||||||
33
package.json
33
package.json
@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "youtube-music",
|
"name": "youtube-music",
|
||||||
"productName": "YouTube Music",
|
"productName": "YouTube Music",
|
||||||
"version": "1.3.3",
|
"version": "1.6.0",
|
||||||
"description": "YouTube Music Desktop App - including custom plugins",
|
"description": "YouTube Music Desktop App - including custom plugins",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"repository": "th-ch/youtube-music",
|
"repository": "th-ch/youtube-music",
|
||||||
@ -26,7 +26,7 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"test": "xo",
|
"test": "jest",
|
||||||
"start": "electron .",
|
"start": "electron .",
|
||||||
"icon": "rimraf assets/generated && electron-icon-maker --input=assets/youtube-music.png --output=assets/generated",
|
"icon": "rimraf assets/generated && electron-icon-maker --input=assets/youtube-music.png --output=assets/generated",
|
||||||
"generate:package": "node utils/generate-package-json.js",
|
"generate:package": "node utils/generate-package-json.js",
|
||||||
@ -46,23 +46,28 @@
|
|||||||
"npm": "Please use yarn and not npm"
|
"npm": "Please use yarn and not npm"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@cliqz/adblocker-electron": "^1.14.1",
|
"@cliqz/adblocker-electron": "^1.18.3",
|
||||||
"YoutubeNonStop": "git://github.com/lawfx/YoutubeNonStop.git#v0.7.1",
|
"YoutubeNonStop": "git://github.com/lawfx/YoutubeNonStop.git#v0.8.0",
|
||||||
"electron-debug": "^3.0.1",
|
"electron-debug": "^3.1.0",
|
||||||
"electron-is": "^3.0.0",
|
"electron-is": "^3.0.0",
|
||||||
"electron-localshortcut": "^3.2.1",
|
"electron-localshortcut": "^3.2.1",
|
||||||
"electron-store": "^5.1.1",
|
"electron-store": "^6.0.1",
|
||||||
"electron-updater": "^4.3.0",
|
"electron-updater": "^4.3.5",
|
||||||
"node-fetch": "^2.6.0"
|
"node-fetch": "^2.6.1"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"devtron": "^1.4.0",
|
"electron": "^10.1.3",
|
||||||
"electron": "^8.2.1",
|
"electron-builder": "^22.8.1",
|
||||||
"electron-builder": "^22.4.1",
|
"electron-devtools-installer": "^3.1.1",
|
||||||
"electron-devtools-installer": "^3.0.0",
|
"electron-icon-maker": "0.0.5",
|
||||||
"electron-icon-maker": "0.0.4",
|
"get-port": "^5.1.1",
|
||||||
|
"jest": "^26.4.2",
|
||||||
"rimraf": "^3.0.2",
|
"rimraf": "^3.0.2",
|
||||||
"xo": "^0.29.0"
|
"spectron": "^12.0.0",
|
||||||
|
"xo": "^0.33.1"
|
||||||
|
},
|
||||||
|
"resolutions": {
|
||||||
|
"yargs-parser": "18.1.3"
|
||||||
},
|
},
|
||||||
"xo": {
|
"xo": {
|
||||||
"envs": [
|
"envs": [
|
||||||
|
|||||||
6
plugins/hide-video-player/back.js
Normal file
6
plugins/hide-video-player/back.js
Normal file
@ -0,0 +1,6 @@
|
|||||||
|
const { injectCSS } = require("../utils");
|
||||||
|
const path = require("path");
|
||||||
|
|
||||||
|
module.exports = win => {
|
||||||
|
injectCSS(win.webContents, path.join(__dirname, "style.css"));
|
||||||
|
};
|
||||||
11
plugins/hide-video-player/style.css
Normal file
11
plugins/hide-video-player/style.css
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
/* Hide the video player */
|
||||||
|
#main-panel {
|
||||||
|
display: none !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Make the side-panel full width */
|
||||||
|
.side-panel.ytmusic-player-page {
|
||||||
|
max-width: 100% !important;
|
||||||
|
width: 100% !important;
|
||||||
|
margin: 0 !important;
|
||||||
|
}
|
||||||
@ -1,17 +1,17 @@
|
|||||||
.navigation-item {
|
.navigation-item {
|
||||||
font-family : Roboto, Noto Naskh Arabic UI, Arial, sans-serif;
|
font-family: Roboto, Noto Naskh Arabic UI, Arial, sans-serif;
|
||||||
font-size : 20px;
|
font-size: 20px;
|
||||||
line-height : var(--ytmusic-title-1_-_line-height);
|
line-height: var(--ytmusic-title-1_-_line-height);
|
||||||
font-weight : 500;
|
font-weight: 500;
|
||||||
color : #fff;
|
color: #fff;
|
||||||
--yt-endpoint-color : #fff;
|
--yt-endpoint-color: #fff;
|
||||||
--yt-endpoint-hover-color : #fff;
|
--yt-endpoint-hover-color: #fff;
|
||||||
--yt-endpoint-visited-color: #fff;
|
--yt-endpoint-visited-color: #fff;
|
||||||
display : inline-flex;
|
display: inline-flex;
|
||||||
align-items : center;
|
align-items: center;
|
||||||
color : rgba(255, 255, 255, 0.5);
|
color: rgba(255, 255, 255, 0.5);
|
||||||
cursor : pointer;
|
cursor: pointer;
|
||||||
margin : 0 var(--ytmusic-pivot-bar-tab-margin);
|
margin: 0 var(--ytmusic-pivot-bar-tab-margin);
|
||||||
}
|
}
|
||||||
|
|
||||||
.navigation-item:hover {
|
.navigation-item:hover {
|
||||||
@ -19,18 +19,18 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
.navigation-icon {
|
.navigation-icon {
|
||||||
display : inline-flex;
|
display: inline-flex;
|
||||||
-ms-flex-align : center;
|
-ms-flex-align: center;
|
||||||
-webkit-align-items : center;
|
-webkit-align-items: center;
|
||||||
align-items : center;
|
align-items: center;
|
||||||
-ms-flex-pack : center;
|
-ms-flex-pack: center;
|
||||||
-webkit-justify-content: center;
|
-webkit-justify-content: center;
|
||||||
justify-content : center;
|
justify-content: center;
|
||||||
position : relative;
|
position: relative;
|
||||||
vertical-align : middle;
|
vertical-align: middle;
|
||||||
fill : var(--iron-icon-fill-color, currentcolor);
|
fill: var(--iron-icon-fill-color, currentcolor);
|
||||||
stroke : none;
|
stroke: none;
|
||||||
width : var(--iron-icon-width, 24px);
|
width: var(--iron-icon-width, 24px);
|
||||||
height : var(--iron-icon-height, 24px);
|
height: var(--iron-icon-height, 24px);
|
||||||
animation : var(--iron-icon_-_animation);
|
animation: var(--iron-icon_-_animation);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -4,26 +4,6 @@
|
|||||||
role="tab"
|
role="tab"
|
||||||
onclick="goToPreviousPage()"
|
onclick="goToPreviousPage()"
|
||||||
>
|
>
|
||||||
<div
|
|
||||||
class="tab-icon style-scope ytmusic-pivot-bar-item-renderer yt-icon-container"
|
|
||||||
>
|
|
||||||
<svg
|
|
||||||
viewBox="0 0 24 24"
|
|
||||||
preserveAspectRatio="xMidYMid meet"
|
|
||||||
focusable="false"
|
|
||||||
class="style-scope yt-icon"
|
|
||||||
style="pointer-events: none; display: block; width: 100%; height: 100%;"
|
|
||||||
>
|
|
||||||
<g class="style-scope yt-icon">
|
|
||||||
<path
|
|
||||||
class="st0"
|
|
||||||
d="M109.3 265.2l218.9 218.9c5.1 5.1 11.8 7.9 19 7.9s14-2.8 19-7.9l16.1-16.1c10.5-10.5 10.5-27.6 0-38.1L198.6 246.1 382.7 62c5.1-5.1 7.9-11.8 7.9-19 0-7.2-2.8-14-7.9-19L366.5 7.9c-5.1-5.1-11.8-7.9-19-7.9-7.2 0-14 2.8-19 7.9L109.3 227c-5.1 5.1-7.9 11.9-7.8 19.1 0 7.2 2.8 14 7.8 19.1z"
|
|
||||||
class="style-scope yt-icon"
|
|
||||||
></path>
|
|
||||||
</g>
|
|
||||||
</svg>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div
|
<div
|
||||||
class="search-icon style-scope ytmusic-search-box"
|
class="search-icon style-scope ytmusic-search-box"
|
||||||
role="button"
|
role="button"
|
||||||
@ -31,7 +11,10 @@
|
|||||||
aria-disabled="false"
|
aria-disabled="false"
|
||||||
title="Go to previous page"
|
title="Go to previous page"
|
||||||
>
|
>
|
||||||
<div id="icon" class="style-scope paper-icon-button navigation-icon">
|
<div
|
||||||
|
id="icon"
|
||||||
|
class="tab-icon style-scope paper-icon-button navigation-icon"
|
||||||
|
>
|
||||||
<svg
|
<svg
|
||||||
viewBox="0 0 492 492"
|
viewBox="0 0 492 492"
|
||||||
preserveAspectRatio="xMidYMid meet"
|
preserveAspectRatio="xMidYMid meet"
|
||||||
@ -41,7 +24,6 @@
|
|||||||
>
|
>
|
||||||
<g class="style-scope iron-icon">
|
<g class="style-scope iron-icon">
|
||||||
<path
|
<path
|
||||||
class="st0"
|
|
||||||
d="M109.3 265.2l218.9 218.9c5.1 5.1 11.8 7.9 19 7.9s14-2.8 19-7.9l16.1-16.1c10.5-10.5 10.5-27.6 0-38.1L198.6 246.1 382.7 62c5.1-5.1 7.9-11.8 7.9-19 0-7.2-2.8-14-7.9-19L366.5 7.9c-5.1-5.1-11.8-7.9-19-7.9-7.2 0-14 2.8-19 7.9L109.3 227c-5.1 5.1-7.9 11.9-7.8 19.1 0 7.2 2.8 14 7.8 19.1z"
|
d="M109.3 265.2l218.9 218.9c5.1 5.1 11.8 7.9 19 7.9s14-2.8 19-7.9l16.1-16.1c10.5-10.5 10.5-27.6 0-38.1L198.6 246.1 382.7 62c5.1-5.1 7.9-11.8 7.9-19 0-7.2-2.8-14-7.9-19L366.5 7.9c-5.1-5.1-11.8-7.9-19-7.9-7.2 0-14 2.8-19 7.9L109.3 227c-5.1 5.1-7.9 11.9-7.8 19.1 0 7.2 2.8 14 7.8 19.1z"
|
||||||
></path>
|
></path>
|
||||||
</g>
|
</g>
|
||||||
|
|||||||
@ -4,26 +4,6 @@
|
|||||||
role="tab"
|
role="tab"
|
||||||
onclick="goToNextPage()"
|
onclick="goToNextPage()"
|
||||||
>
|
>
|
||||||
<div class="tab-icon style-scope ytmusic-pivot-bar-item-renderer">
|
|
||||||
<svg
|
|
||||||
viewBox="0 0 24 24"
|
|
||||||
preserveAspectRatio="xMidYMid meet"
|
|
||||||
focusable="false"
|
|
||||||
class="style-scope yt-icon"
|
|
||||||
style="pointer-events: none; display: block; width: 100%; height: 100%;"
|
|
||||||
>
|
|
||||||
<g class="style-scope yt-icon">
|
|
||||||
<path
|
|
||||||
d="M382.678,226.804L163.73,7.86C158.666,2.792,151.906,0,144.698,0s-13.968,2.792-19.032,7.86l-16.124,16.12
|
|
||||||
c-10.492,10.504-10.492,27.576,0,38.064L293.398,245.9l-184.06,184.06c-5.064,5.068-7.86,11.824-7.86,19.028
|
|
||||||
c0,7.212,2.796,13.968,7.86,19.04l16.124,16.116c5.068,5.068,11.824,7.86,19.032,7.86s13.968-2.792,19.032-7.86L382.678,265
|
|
||||||
c5.076-5.084,7.864-11.872,7.848-19.088C390.542,238.668,387.754,231.884,382.678,226.804z"
|
|
||||||
class="style-scope yt-icon"
|
|
||||||
></path>
|
|
||||||
</g>
|
|
||||||
</svg>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div
|
<div
|
||||||
class="search-icon style-scope ytmusic-search-box"
|
class="search-icon style-scope ytmusic-search-box"
|
||||||
role="button"
|
role="button"
|
||||||
@ -31,7 +11,10 @@
|
|||||||
aria-disabled="false"
|
aria-disabled="false"
|
||||||
title="Go to next page"
|
title="Go to next page"
|
||||||
>
|
>
|
||||||
<div id="icon" class="style-scope paper-icon-button navigation-icon">
|
<div
|
||||||
|
id="icon"
|
||||||
|
class="tab-icon style-scope paper-icon-button navigation-icon"
|
||||||
|
>
|
||||||
<svg
|
<svg
|
||||||
viewBox="0 0 492 492"
|
viewBox="0 0 492 492"
|
||||||
preserveAspectRatio="xMidYMid meet"
|
preserveAspectRatio="xMidYMid meet"
|
||||||
@ -41,7 +24,6 @@
|
|||||||
>
|
>
|
||||||
<g class="style-scope iron-icon">
|
<g class="style-scope iron-icon">
|
||||||
<path
|
<path
|
||||||
class="st0"
|
|
||||||
d="M382.7,226.8L163.7,7.9c-5.1-5.1-11.8-7.9-19-7.9s-14,2.8-19,7.9L109.5,24c-10.5,10.5-10.5,27.6,0,38.1
|
d="M382.7,226.8L163.7,7.9c-5.1-5.1-11.8-7.9-19-7.9s-14,2.8-19,7.9L109.5,24c-10.5,10.5-10.5,27.6,0,38.1
|
||||||
l183.9,183.9L109.3,430c-5.1,5.1-7.9,11.8-7.9,19c0,7.2,2.8,14,7.9,19l16.1,16.1c5.1,5.1,11.8,7.9,19,7.9s14-2.8,19-7.9L382.7,265
|
l183.9,183.9L109.3,430c-5.1,5.1-7.9,11.8-7.9,19c0,7.2,2.8,14,7.9,19l16.1,16.1c5.1,5.1,11.8,7.9,19,7.9s14-2.8,19-7.9L382.7,265
|
||||||
c5.1-5.1,7.9-11.9,7.8-19.1C390.5,238.7,387.8,231.9,382.7,226.8z"
|
c5.1-5.1,7.9-11.9,7.8-19.1C390.5,238.7,387.8,231.9,382.7,226.8z"
|
||||||
|
|||||||
18
plugins/notifications/actions.js
Normal file
18
plugins/notifications/actions.js
Normal file
@ -0,0 +1,18 @@
|
|||||||
|
const { triggerAction } = require("../utils");
|
||||||
|
|
||||||
|
const CHANNEL = "notification";
|
||||||
|
const ACTIONS = {
|
||||||
|
NOTIFICATION: "notification",
|
||||||
|
};
|
||||||
|
|
||||||
|
function notify(info) {
|
||||||
|
triggerAction(CHANNEL, ACTIONS.NOTIFICATION, info);
|
||||||
|
}
|
||||||
|
|
||||||
|
module.exports = {
|
||||||
|
CHANNEL,
|
||||||
|
ACTIONS,
|
||||||
|
global: {
|
||||||
|
notify,
|
||||||
|
},
|
||||||
|
};
|
||||||
33
plugins/notifications/back.js
Normal file
33
plugins/notifications/back.js
Normal file
@ -0,0 +1,33 @@
|
|||||||
|
const { nativeImage, Notification } = require("electron");
|
||||||
|
|
||||||
|
const { listenAction } = require("../utils");
|
||||||
|
const { ACTIONS, CHANNEL } = require("./actions.js");
|
||||||
|
|
||||||
|
function notify(info) {
|
||||||
|
let notificationImage = "assets/youtube-music.png";
|
||||||
|
if (info.image) {
|
||||||
|
notificationImage = nativeImage.createFromDataURL(info.image);
|
||||||
|
}
|
||||||
|
|
||||||
|
const notification = {
|
||||||
|
title: info.title || "Playing",
|
||||||
|
body: info.artist,
|
||||||
|
icon: notificationImage,
|
||||||
|
silent: true,
|
||||||
|
};
|
||||||
|
new Notification(notification).show();
|
||||||
|
}
|
||||||
|
|
||||||
|
function listenAndNotify() {
|
||||||
|
listenAction(CHANNEL, (event, action, imageSrc) => {
|
||||||
|
switch (action) {
|
||||||
|
case ACTIONS.NOTIFICATION:
|
||||||
|
notify(imageSrc);
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
console.log("Unknown action: " + action);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
module.exports = listenAndNotify;
|
||||||
86
plugins/notifications/front.js
Normal file
86
plugins/notifications/front.js
Normal file
@ -0,0 +1,86 @@
|
|||||||
|
let videoElement = null;
|
||||||
|
let image = null;
|
||||||
|
|
||||||
|
const observer = new MutationObserver((mutations, observer) => {
|
||||||
|
if (!videoElement) {
|
||||||
|
videoElement = document.querySelector("video");
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!image) {
|
||||||
|
image = document.querySelector(".ytmusic-player-bar.image");
|
||||||
|
}
|
||||||
|
|
||||||
|
if (videoElement !== null && image !== null) {
|
||||||
|
observer.disconnect();
|
||||||
|
let notificationImage = null;
|
||||||
|
|
||||||
|
videoElement.addEventListener("play", () => {
|
||||||
|
notify({
|
||||||
|
title: getTitle(),
|
||||||
|
artist: getArtist(),
|
||||||
|
image: notificationImage,
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
image.addEventListener("load", () => {
|
||||||
|
notificationImage = null;
|
||||||
|
const imageInBase64 = convertImageToBase64(image);
|
||||||
|
if (image && image.complete && image.naturalHeight !== 0) {
|
||||||
|
notificationImage = imageInBase64;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
// Convert an image (DOM element) to base64 string
|
||||||
|
const convertImageToBase64 = (image, size = 256) => {
|
||||||
|
image.setAttribute("crossorigin", "anonymous");
|
||||||
|
|
||||||
|
const c = document.createElement("canvas");
|
||||||
|
c.height = size;
|
||||||
|
c.width = size;
|
||||||
|
|
||||||
|
const ctx = c.getContext("2d");
|
||||||
|
ctx.drawImage(
|
||||||
|
image,
|
||||||
|
0,
|
||||||
|
0,
|
||||||
|
image.naturalWidth,
|
||||||
|
image.naturalHeight,
|
||||||
|
0,
|
||||||
|
0,
|
||||||
|
c.width,
|
||||||
|
c.height
|
||||||
|
);
|
||||||
|
|
||||||
|
const imageInBase64 = c.toDataURL();
|
||||||
|
return imageInBase64;
|
||||||
|
};
|
||||||
|
|
||||||
|
const getTitle = () => {
|
||||||
|
const title = document.querySelector(".title.ytmusic-player-bar").textContent;
|
||||||
|
return title;
|
||||||
|
};
|
||||||
|
|
||||||
|
const getArtist = () => {
|
||||||
|
const bar = document.querySelectorAll(".subtitle.ytmusic-player-bar")[0];
|
||||||
|
let artist;
|
||||||
|
|
||||||
|
if (bar.querySelectorAll(".yt-simple-endpoint.yt-formatted-string")[0]) {
|
||||||
|
artist = bar.querySelectorAll(".yt-simple-endpoint.yt-formatted-string")[0]
|
||||||
|
.textContent;
|
||||||
|
} else if (bar.querySelectorAll(".byline.ytmusic-player-bar")[0]) {
|
||||||
|
artist = bar.querySelectorAll(".byline.ytmusic-player-bar")[0].textContent;
|
||||||
|
}
|
||||||
|
|
||||||
|
return artist;
|
||||||
|
};
|
||||||
|
|
||||||
|
const observeVideoAndThumbnail = () => {
|
||||||
|
observer.observe(document, {
|
||||||
|
childList: true,
|
||||||
|
subtree: true,
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
module.exports = observeVideoAndThumbnail;
|
||||||
@ -20,8 +20,8 @@ module.exports.templatePath = (pluginPath, name) => {
|
|||||||
return path.join(pluginPath, "templates", name);
|
return path.join(pluginPath, "templates", name);
|
||||||
};
|
};
|
||||||
|
|
||||||
module.exports.triggerAction = (channel, action) => {
|
module.exports.triggerAction = (channel, action, ...args) => {
|
||||||
return ipcRenderer.send(channel, action);
|
return ipcRenderer.send(channel, action, ...args);
|
||||||
};
|
};
|
||||||
|
|
||||||
module.exports.listenAction = (channel, callback) => {
|
module.exports.listenAction = (channel, callback) => {
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
const path = require("path");
|
const path = require("path");
|
||||||
|
|
||||||
const { getCurrentWindow } = require("electron").remote;
|
const { remote } = require("electron");
|
||||||
|
|
||||||
const { getEnabledPlugins, store } = require("./store");
|
const { getEnabledPlugins, store } = require("./store");
|
||||||
const { fileExists } = require("./plugins/utils");
|
const { fileExists } = require("./plugins/utils");
|
||||||
@ -28,5 +28,5 @@ document.addEventListener("DOMContentLoaded", () => {
|
|||||||
|
|
||||||
// Add action for reloading
|
// Add action for reloading
|
||||||
global.reload = () =>
|
global.reload = () =>
|
||||||
getCurrentWindow().webContents.loadURL(store.get("url"));
|
remote.getCurrentWindow().webContents.loadURL(store.get("url"));
|
||||||
});
|
});
|
||||||
|
|||||||
10
readme.md
10
readme.md
@ -93,11 +93,19 @@ module.exports = () => {
|
|||||||
## Build
|
## Build
|
||||||
|
|
||||||
```sh
|
```sh
|
||||||
yarn run build
|
yarn build
|
||||||
```
|
```
|
||||||
|
|
||||||
Builds the app for macOS, Linux, and Windows, using [electron-builder](https://github.com/electron-userland/electron-builder).
|
Builds the app for macOS, Linux, and Windows, using [electron-builder](https://github.com/electron-userland/electron-builder).
|
||||||
|
|
||||||
|
## Tests
|
||||||
|
|
||||||
|
```sh
|
||||||
|
yarn test
|
||||||
|
```
|
||||||
|
|
||||||
|
Uses [Spectron](https://www.electronjs.org/spectron) to test the app.
|
||||||
|
|
||||||
## License
|
## License
|
||||||
|
|
||||||
MIT © [th-ch](https://github.com/th-ch/youtube-music)
|
MIT © [th-ch](https://github.com/th-ch/youtube-music)
|
||||||
|
|||||||
@ -5,16 +5,17 @@ const store = new Store({
|
|||||||
defaults: {
|
defaults: {
|
||||||
"window-size": {
|
"window-size": {
|
||||||
width: 1100,
|
width: 1100,
|
||||||
height: 550
|
height: 550,
|
||||||
},
|
},
|
||||||
url: "https://music.youtube.com",
|
url: "https://music.youtube.com",
|
||||||
plugins: ["navigation", "shortcuts", "adblocker"],
|
plugins: ["navigation", "shortcuts", "adblocker"],
|
||||||
options: {
|
options: {
|
||||||
tray: false,
|
tray: false,
|
||||||
appVisible: true,
|
appVisible: true,
|
||||||
autoUpdates: true
|
autoUpdates: true,
|
||||||
}
|
startAtLogin: false,
|
||||||
}
|
},
|
||||||
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
module.exports = {
|
module.exports = {
|
||||||
@ -29,5 +30,6 @@ module.exports = {
|
|||||||
store.set("options", { ...store.get("options"), ...options }),
|
store.set("options", { ...store.get("options"), ...options }),
|
||||||
isTrayEnabled: () => store.get("options.tray"),
|
isTrayEnabled: () => store.get("options.tray"),
|
||||||
isAppVisible: () => store.get("options.appVisible"),
|
isAppVisible: () => store.get("options.appVisible"),
|
||||||
autoUpdate: () => store.get("options.autoUpdates")
|
autoUpdate: () => store.get("options.autoUpdates"),
|
||||||
|
startAtLogin: () => store.get("options.startAtLogin"),
|
||||||
};
|
};
|
||||||
|
|||||||
41
tests/environment.js
Normal file
41
tests/environment.js
Normal file
@ -0,0 +1,41 @@
|
|||||||
|
const path = require("path");
|
||||||
|
|
||||||
|
const getPort = require("get-port");
|
||||||
|
const NodeEnvironment = require("jest-environment-node");
|
||||||
|
const electronPath = require("electron");
|
||||||
|
const { Application } = require("spectron");
|
||||||
|
|
||||||
|
class TestEnvironment extends NodeEnvironment {
|
||||||
|
constructor(config) {
|
||||||
|
super(config);
|
||||||
|
}
|
||||||
|
|
||||||
|
async setup() {
|
||||||
|
await super.setup();
|
||||||
|
|
||||||
|
const appPath = path.resolve(__dirname, "..");
|
||||||
|
const port = await getPort();
|
||||||
|
|
||||||
|
this.global.__APP__ = new Application({
|
||||||
|
path: electronPath,
|
||||||
|
args: [appPath],
|
||||||
|
port,
|
||||||
|
});
|
||||||
|
await this.global.__APP__.start();
|
||||||
|
const { client } = this.global.__APP__;
|
||||||
|
await client.waitUntilWindowLoaded();
|
||||||
|
}
|
||||||
|
|
||||||
|
async teardown() {
|
||||||
|
if (this.global.__APP__.isRunning()) {
|
||||||
|
await this.global.__APP__.stop();
|
||||||
|
}
|
||||||
|
await super.teardown();
|
||||||
|
}
|
||||||
|
|
||||||
|
runScript(script) {
|
||||||
|
return super.runScript(script);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
module.exports = TestEnvironment;
|
||||||
20
tests/index.test.js
Normal file
20
tests/index.test.js
Normal file
@ -0,0 +1,20 @@
|
|||||||
|
describe("YouTube Music App", () => {
|
||||||
|
const app = global.__APP__;
|
||||||
|
|
||||||
|
test("With default settings, app is launched and visible", async () => {
|
||||||
|
expect(app.isRunning()).toBe(true);
|
||||||
|
|
||||||
|
const win = app.browserWindow;
|
||||||
|
|
||||||
|
const isVisible = await win.isVisible();
|
||||||
|
expect(isVisible).toBe(true);
|
||||||
|
|
||||||
|
const { width, height } = await win.getBounds();
|
||||||
|
expect(width).toBeGreaterThan(0);
|
||||||
|
expect(height).toBeGreaterThan(0);
|
||||||
|
|
||||||
|
const { client } = app;
|
||||||
|
const title = await client.getTitle();
|
||||||
|
expect(title).toEqual("YouTube Music");
|
||||||
|
});
|
||||||
|
});
|
||||||
2
tray.js
2
tray.js
@ -61,7 +61,7 @@ module.exports.setUpTray = (app, win) => {
|
|||||||
win.show();
|
win.show();
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
...mainMenuTemplate,
|
...mainMenuTemplate(win),
|
||||||
{
|
{
|
||||||
label: "Quit",
|
label: "Quit",
|
||||||
click: () => {
|
click: () => {
|
||||||
|
|||||||
3
utils/testing.js
Normal file
3
utils/testing.js
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
const isTesting = () => process.env.NODE_ENV === "test";
|
||||||
|
|
||||||
|
module.exports = { isTesting };
|
||||||
Reference in New Issue
Block a user