mirror of
https://github.com/th-ch/youtube-music.git
synced 2026-01-11 18:41:47 +00:00
Compare commits
111 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 37cac19d9c | |||
| 4824dda5d5 | |||
| 3fa3c3ab9e | |||
| 058371ace8 | |||
| 430687f4d6 | |||
| 45f4b3bc28 | |||
| 7c12344d05 | |||
| 98213005d0 | |||
| db61589735 | |||
| 26dd7c5f71 | |||
| 3bbab525c6 | |||
| d42b7bc559 | |||
| 69f88ed840 | |||
| eb10bf2b34 | |||
| e051c4a9a2 | |||
| 477202bf24 | |||
| 876e52bb01 | |||
| edfd5be6a2 | |||
| baa4f17276 | |||
| 1de6f3e2ed | |||
| 1c56e7fea6 | |||
| 4c46bceb7d | |||
| 7098cd7602 | |||
| 210418e5d3 | |||
| 297de08278 | |||
| 050bdd3c02 | |||
| 3edc6e9b37 | |||
| 2e721c942f | |||
| 8d375070ac | |||
| 387a6d9f16 | |||
| 3999b991fa | |||
| 3d9e59dc90 | |||
| f25eb48f79 | |||
| 6e45e7b2cb | |||
| 59bba8e590 | |||
| 422c3fc28d | |||
| 6fb251f00f | |||
| 1cb876da55 | |||
| c5021d5ca2 | |||
| 359360b058 | |||
| 80da3feb01 | |||
| ff074c10a6 | |||
| 098776e31a | |||
| d702321969 | |||
| 4748cf92bb | |||
| 5e3b7c0db7 | |||
| 4648854a04 | |||
| 0dc28064db | |||
| a3d5c038ea | |||
| 91f7a0d1a5 | |||
| d5a6e50017 | |||
| 6d8204f60a | |||
| f25bb59065 | |||
| 39c7d56791 | |||
| 1a0369b69d | |||
| e5b4e01a96 | |||
| 0a6587942b | |||
| 7050dfca5c | |||
| 4a7a94240a | |||
| 479013f9c9 | |||
| 164c3141ca | |||
| 234954a86c | |||
| 8c19757dfc | |||
| 790185893d | |||
| 7a816fa4f3 | |||
| d4b5c53dc3 | |||
| e1b83f07a8 | |||
| b855726973 | |||
| 9371a4827e | |||
| 81ce939451 | |||
| 6fd10ea4a0 | |||
| 746b5f13bb | |||
| 474bfd19a2 | |||
| 71222649a0 | |||
| 1a72129108 | |||
| 3108e16018 | |||
| fae19f4533 | |||
| 348f1b8189 | |||
| ffdc7f66b9 | |||
| 07c4a429c1 | |||
| b10a1bb32d | |||
| 0420f2e49e | |||
| 9714994501 | |||
| b1c4cc9c45 | |||
| a85325f33d | |||
| 147ac48de6 | |||
| e86d63da8c | |||
| 09a39daeda | |||
| d9247dad33 | |||
| ec58b5cbed | |||
| eac2c5cf14 | |||
| 5a1d7fbf23 | |||
| 15275236b0 | |||
| 639ae28122 | |||
| d3453a600b | |||
| caf76e7588 | |||
| 2d3f77d962 | |||
| 5279a45f35 | |||
| e52e522d22 | |||
| aa3e4b32eb | |||
| eb63917b5d | |||
| 6e037483c7 | |||
| 941477bb0c | |||
| abc2bb8a4f | |||
| 253e82a2d7 | |||
| 708ba3167e | |||
| b3c24a5212 | |||
| 9d343bf779 | |||
| cd78db4e84 | |||
| 5648a3020b | |||
| 828e8d472c |
3
.gitignore
vendored
3
.gitignore
vendored
@ -1,3 +1,4 @@
|
|||||||
node_modules
|
node_modules
|
||||||
/dist
|
/dist
|
||||||
/assets/generated
|
/assets/generated
|
||||||
|
electron-builder.yml
|
||||||
|
|||||||
35
.travis.yml
Normal file
35
.travis.yml
Normal file
@ -0,0 +1,35 @@
|
|||||||
|
language: node_js
|
||||||
|
node_js: "10"
|
||||||
|
env:
|
||||||
|
- ELECTRON_CACHE=$HOME/.cache/electron ELECTRON_BUILDER_CACHE=$HOME/.cache/electron-builder
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
include:
|
||||||
|
- os: osx
|
||||||
|
osx_image: xcode11.3
|
||||||
|
- os: linux
|
||||||
|
dist: xenial
|
||||||
|
|
||||||
|
cache:
|
||||||
|
yarn: false
|
||||||
|
directories:
|
||||||
|
- $HOME/.cache/electron
|
||||||
|
- $HOME/.cache/electron-builder
|
||||||
|
|
||||||
|
script:
|
||||||
|
- |
|
||||||
|
if [ "$TRAVIS_OS_NAME" == "linux" ]; then
|
||||||
|
yarn run release:linux
|
||||||
|
else
|
||||||
|
yarn run release:mac
|
||||||
|
fi
|
||||||
|
before_cache:
|
||||||
|
- rm -rf $HOME/.cache/electron-builder
|
||||||
|
before_install:
|
||||||
|
- rm -rf node_modules
|
||||||
|
# Install dependencies
|
||||||
|
- travis_wait 30 yarn --frozen-lockfile
|
||||||
|
|
||||||
|
branches:
|
||||||
|
except:
|
||||||
|
- "/^v\\d+\\.\\d+\\.\\d+$/"
|
||||||
27
appveyor.yml
Normal file
27
appveyor.yml
Normal file
@ -0,0 +1,27 @@
|
|||||||
|
image: Visual Studio 2019
|
||||||
|
|
||||||
|
platform:
|
||||||
|
- x64
|
||||||
|
|
||||||
|
cache:
|
||||||
|
- node_modules
|
||||||
|
- '%USERPROFILE%\.electron'
|
||||||
|
|
||||||
|
init:
|
||||||
|
- git config --global core.autocrlf input
|
||||||
|
|
||||||
|
install:
|
||||||
|
# Install node
|
||||||
|
- ps: Install-Product node 10 x64
|
||||||
|
# Install dependencies
|
||||||
|
- yarn --frozen-lockfile
|
||||||
|
|
||||||
|
# on_finish:
|
||||||
|
# # Enable RDP to the build worker (using APPVEYOR_RDP_PASSWORD env var)
|
||||||
|
# # 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'))
|
||||||
|
|
||||||
|
build_script:
|
||||||
|
- yarn run release:win
|
||||||
|
|
||||||
|
test: off
|
||||||
BIN
assets/youtube-music-tray.png
Normal file
BIN
assets/youtube-music-tray.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 3.3 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 49 KiB After Width: | Height: | Size: 40 KiB |
50
error.html
Normal file
50
error.html
Normal file
@ -0,0 +1,50 @@
|
|||||||
|
<!DOCTYPE html>
|
||||||
|
<html>
|
||||||
|
<head>
|
||||||
|
<meta charset="utf-8" />
|
||||||
|
<title>Cannot load YouTube Music</title>
|
||||||
|
<style>
|
||||||
|
body {
|
||||||
|
background: #000;
|
||||||
|
}
|
||||||
|
|
||||||
|
.container {
|
||||||
|
margin: 0;
|
||||||
|
font-family: Roboto, Arial, sans-serif;
|
||||||
|
font-size: 20px;
|
||||||
|
font-weight: 500;
|
||||||
|
color: rgba(255, 255, 255, 0.5);
|
||||||
|
position: absolute;
|
||||||
|
top: 50%;
|
||||||
|
left: 50%;
|
||||||
|
margin-right: -50%;
|
||||||
|
transform: translate(-50%, -50%);
|
||||||
|
text-align: center;
|
||||||
|
}
|
||||||
|
|
||||||
|
.button {
|
||||||
|
background: #065fd4;
|
||||||
|
overflow: hidden;
|
||||||
|
text-overflow: ellipsis;
|
||||||
|
white-space: nowrap;
|
||||||
|
color: white;
|
||||||
|
font: inherit;
|
||||||
|
text-transform: uppercase;
|
||||||
|
text-decoration: none;
|
||||||
|
border-radius: 2px;
|
||||||
|
font-size: 16px;
|
||||||
|
font-weight: normal;
|
||||||
|
text-align: center;
|
||||||
|
padding: 8px 22px;
|
||||||
|
display: inline-block;
|
||||||
|
}
|
||||||
|
</style>
|
||||||
|
</head>
|
||||||
|
|
||||||
|
<body>
|
||||||
|
<div class="container">
|
||||||
|
<p>Cannot load YouTube Music… Internet disconnected?</p>
|
||||||
|
<a href="#" class="button" onclick="reload()">Retry</a>
|
||||||
|
</div>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
114
index.js
114
index.js
@ -2,11 +2,19 @@
|
|||||||
const path = require("path");
|
const path = require("path");
|
||||||
|
|
||||||
const electron = require("electron");
|
const electron = require("electron");
|
||||||
const isDev = require("electron-is-dev");
|
const is = require("electron-is");
|
||||||
|
const { autoUpdater } = require("electron-updater");
|
||||||
|
|
||||||
const { setApplicationMenu } = require("./menu");
|
const { setApplicationMenu } = require("./menu");
|
||||||
const { getEnabledPlugins, store } = require("./store");
|
const {
|
||||||
const { fileExists, injectCSS } = require("./plugins/utils");
|
autoUpdate,
|
||||||
|
getEnabledPlugins,
|
||||||
|
isAppVisible,
|
||||||
|
isTrayEnabled,
|
||||||
|
store,
|
||||||
|
} = require("./store");
|
||||||
|
const { fileExists, injectCSS } = require("./plugins/utils");
|
||||||
|
const { setUpTray } = require("./tray");
|
||||||
|
|
||||||
const app = electron.app;
|
const app = electron.app;
|
||||||
|
|
||||||
@ -15,6 +23,7 @@ require("electron-debug")();
|
|||||||
|
|
||||||
// Prevent window being garbage collected
|
// Prevent window being garbage collected
|
||||||
let mainWindow;
|
let mainWindow;
|
||||||
|
autoUpdater.autoDownload = false;
|
||||||
|
|
||||||
let icon = "assets/youtube-music.png";
|
let icon = "assets/youtube-music.png";
|
||||||
if (process.platform == "win32") {
|
if (process.platform == "win32") {
|
||||||
@ -30,21 +39,23 @@ function onClosed() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function createMainWindow() {
|
function createMainWindow() {
|
||||||
const windowSize = store.get("window-size");
|
const windowSize = store.get("window-size");
|
||||||
const windowMaximized = store.get("window-maximized");
|
const windowMaximized = store.get("window-maximized");
|
||||||
|
|
||||||
const win = new electron.BrowserWindow({
|
const win = new electron.BrowserWindow({
|
||||||
icon : icon,
|
icon: icon,
|
||||||
width : windowSize.width,
|
width: windowSize.width,
|
||||||
height : windowSize.height,
|
height: windowSize.height,
|
||||||
backgroundColor: "#000",
|
backgroundColor: "#000",
|
||||||
show : false,
|
show: false,
|
||||||
webPreferences : {
|
webPreferences: {
|
||||||
nodeIntegration: false,
|
nodeIntegration: false,
|
||||||
preload : path.join(__dirname, "preload.js")
|
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 : false,
|
frame: !is.macOS(),
|
||||||
titleBarStyle: "hiddenInset"
|
titleBarStyle: is.macOS() ? "hiddenInset" : "default",
|
||||||
});
|
});
|
||||||
if (windowMaximized) {
|
if (windowMaximized) {
|
||||||
win.maximize();
|
win.maximize();
|
||||||
@ -55,13 +66,13 @@ function createMainWindow() {
|
|||||||
|
|
||||||
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 (isDev) {
|
if (is.dev()) {
|
||||||
console.log("did finish load");
|
console.log("did finish load");
|
||||||
win.webContents.openDevTools();
|
win.webContents.openDevTools();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
getEnabledPlugins().forEach(plugin => {
|
getEnabledPlugins().forEach((plugin) => {
|
||||||
console.log("Loaded plugin - " + plugin);
|
console.log("Loaded plugin - " + plugin);
|
||||||
const pluginPath = path.join(__dirname, "plugins", plugin, "back.js");
|
const pluginPath = path.join(__dirname, "plugins", plugin, "back.js");
|
||||||
fileExists(pluginPath, () => {
|
fileExists(pluginPath, () => {
|
||||||
@ -70,6 +81,13 @@ function createMainWindow() {
|
|||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
win.webContents.on("did-fail-load", () => {
|
||||||
|
if (is.dev()) {
|
||||||
|
console.log("did fail load");
|
||||||
|
}
|
||||||
|
win.webContents.loadFile(path.join(__dirname, "error.html"));
|
||||||
|
});
|
||||||
|
|
||||||
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")) {
|
||||||
@ -77,6 +95,32 @@ function createMainWindow() {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
win.webContents.on("will-navigate", (_, url) => {
|
||||||
|
if (url.startsWith("https://accounts.google.com")) {
|
||||||
|
// Force user-agent "Firefox Windows" for Google OAuth to work
|
||||||
|
// From https://github.com/firebase/firebase-js-sdk/issues/2478#issuecomment-571356751
|
||||||
|
// Only set on accounts.google.com, otherwise querySelectors in preload scripts fail (?)
|
||||||
|
const userAgent =
|
||||||
|
"Mozilla/5.0 (Macintosh; Intel Mac OS X 10.14; rv:70.0) Gecko/20100101 Firefox/70.0";
|
||||||
|
|
||||||
|
win.webContents.session.webRequest.onBeforeSendHeaders((details, cb) => {
|
||||||
|
details.requestHeaders["User-Agent"] = userAgent;
|
||||||
|
cb({ requestHeaders: details.requestHeaders });
|
||||||
|
});
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
win.webContents.on(
|
||||||
|
"new-window",
|
||||||
|
(e, url, frameName, disposition, options) => {
|
||||||
|
// hook on new opened window
|
||||||
|
|
||||||
|
// at now new window in mainWindow renderer process.
|
||||||
|
// Also, this will automatically get an option `nodeIntegration=false`(not override to true, like in iframe's) - like in regular browsers
|
||||||
|
options.webPreferences.affinity = "main-window";
|
||||||
|
}
|
||||||
|
);
|
||||||
|
|
||||||
win.on("move", () => {
|
win.on("move", () => {
|
||||||
let position = win.getPosition();
|
let position = win.getPosition();
|
||||||
store.set("window-position", { x: position[0], y: position[1] });
|
store.set("window-position", { x: position[0], y: position[1] });
|
||||||
@ -92,7 +136,9 @@ function createMainWindow() {
|
|||||||
});
|
});
|
||||||
|
|
||||||
win.once("ready-to-show", () => {
|
win.once("ready-to-show", () => {
|
||||||
win.show();
|
if (isAppVisible()) {
|
||||||
|
win.show();
|
||||||
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
return win;
|
return win;
|
||||||
@ -120,14 +166,38 @@ app.on("activate", () => {
|
|||||||
app.on("ready", () => {
|
app.on("ready", () => {
|
||||||
setApplicationMenu();
|
setApplicationMenu();
|
||||||
mainWindow = createMainWindow();
|
mainWindow = createMainWindow();
|
||||||
|
setUpTray(app, mainWindow);
|
||||||
|
|
||||||
|
if (!is.dev() && autoUpdate()) {
|
||||||
|
autoUpdater.checkForUpdatesAndNotify();
|
||||||
|
autoUpdater.on("update-available", () => {
|
||||||
|
const dialogOpts = {
|
||||||
|
type: "info",
|
||||||
|
buttons: ["OK"],
|
||||||
|
title: "Application Update",
|
||||||
|
message: "A new version is available",
|
||||||
|
detail:
|
||||||
|
"A new version is available and can be downloaded at https://github.com/th-ch/youtube-music/releases/latest",
|
||||||
|
};
|
||||||
|
electron.dialog.showMessageBox(dialogOpts);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
// Optimized for Mac OS X
|
// Optimized for Mac OS X
|
||||||
if (process.platform === "darwin") {
|
if (is.macOS()) {
|
||||||
var forceQuit = false;
|
if (!isAppVisible()) {
|
||||||
app.on("before-quit", () => {
|
app.dock.hide();
|
||||||
forceQuit = true;
|
}
|
||||||
});
|
}
|
||||||
mainWindow.on("close", event => {
|
|
||||||
|
var forceQuit = false;
|
||||||
|
app.on("before-quit", () => {
|
||||||
|
forceQuit = true;
|
||||||
|
});
|
||||||
|
|
||||||
|
if (is.macOS() || isTrayEnabled()) {
|
||||||
|
mainWindow.on("close", (event) => {
|
||||||
|
// Hide the window instead of quitting (quit is available in tray options)
|
||||||
if (!forceQuit) {
|
if (!forceQuit) {
|
||||||
event.preventDefault();
|
event.preventDefault();
|
||||||
mainWindow.hide();
|
mainWindow.hide();
|
||||||
|
|||||||
98
menu.js
98
menu.js
@ -1,33 +1,79 @@
|
|||||||
const { app, Menu } = require("electron");
|
const { app, Menu } = require("electron");
|
||||||
|
|
||||||
const { getAllPlugins } = require("./plugins/utils");
|
const { getAllPlugins } = require("./plugins/utils");
|
||||||
const { isPluginEnabled, enablePlugin, disablePlugin } = require("./store");
|
const {
|
||||||
|
isPluginEnabled,
|
||||||
|
enablePlugin,
|
||||||
|
disablePlugin,
|
||||||
|
autoUpdate,
|
||||||
|
isAppVisible,
|
||||||
|
isTrayEnabled,
|
||||||
|
setOptions,
|
||||||
|
} = require("./store");
|
||||||
|
|
||||||
module.exports.setApplicationMenu = () => {
|
const mainMenuTemplate = [
|
||||||
const menuTemplate = [
|
{
|
||||||
{
|
label: "Plugins",
|
||||||
label : "Plugins",
|
submenu: getAllPlugins().map((plugin) => {
|
||||||
submenu: getAllPlugins().map(plugin => {
|
return {
|
||||||
return {
|
label: plugin,
|
||||||
label : plugin,
|
type: "checkbox",
|
||||||
type : "checkbox",
|
checked: isPluginEnabled(plugin),
|
||||||
checked: isPluginEnabled(plugin),
|
click: (item) => {
|
||||||
click : item => {
|
if (item.checked) {
|
||||||
if (item.checked) {
|
enablePlugin(plugin);
|
||||||
enablePlugin(plugin);
|
} else {
|
||||||
} else {
|
disablePlugin(plugin);
|
||||||
disablePlugin(plugin);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
};
|
},
|
||||||
})
|
};
|
||||||
}
|
}),
|
||||||
];
|
},
|
||||||
|
{
|
||||||
|
label: "Options",
|
||||||
|
submenu: [
|
||||||
|
{
|
||||||
|
label: "Auto-update",
|
||||||
|
type: "checkbox",
|
||||||
|
checked: autoUpdate(),
|
||||||
|
click: (item) => {
|
||||||
|
setOptions({ autoUpdates: item.checked });
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
label: "Tray",
|
||||||
|
submenu: [
|
||||||
|
{
|
||||||
|
label: "Disabled",
|
||||||
|
type: "radio",
|
||||||
|
checked: !isTrayEnabled(),
|
||||||
|
click: () => setOptions({ tray: false, appVisible: true }),
|
||||||
|
},
|
||||||
|
{
|
||||||
|
label: "Enabled + app visible",
|
||||||
|
type: "radio",
|
||||||
|
checked: isTrayEnabled() && isAppVisible(),
|
||||||
|
click: () => setOptions({ tray: true, appVisible: true }),
|
||||||
|
},
|
||||||
|
{
|
||||||
|
label: "Enabled + app hidden",
|
||||||
|
type: "radio",
|
||||||
|
checked: isTrayEnabled() && !isAppVisible(),
|
||||||
|
click: () => setOptions({ tray: true, appVisible: false }),
|
||||||
|
},
|
||||||
|
],
|
||||||
|
},
|
||||||
|
],
|
||||||
|
},
|
||||||
|
];
|
||||||
|
|
||||||
|
module.exports.mainMenuTemplate = mainMenuTemplate;
|
||||||
|
module.exports.setApplicationMenu = () => {
|
||||||
|
const menuTemplate = [...mainMenuTemplate];
|
||||||
if (process.platform === "darwin") {
|
if (process.platform === "darwin") {
|
||||||
const name = app.getName();
|
const name = app.getName();
|
||||||
menuTemplate.unshift({
|
menuTemplate.unshift({
|
||||||
label : name,
|
label: name,
|
||||||
submenu: [
|
submenu: [
|
||||||
{ role: "about" },
|
{ role: "about" },
|
||||||
{ type: "separator" },
|
{ type: "separator" },
|
||||||
@ -36,9 +82,9 @@ module.exports.setApplicationMenu = () => {
|
|||||||
{ role: "unhide" },
|
{ role: "unhide" },
|
||||||
{ type: "separator" },
|
{ type: "separator" },
|
||||||
{
|
{
|
||||||
label : "Select All",
|
label: "Select All",
|
||||||
accelerator: "CmdOrCtrl+A",
|
accelerator: "CmdOrCtrl+A",
|
||||||
selector : "selectAll:"
|
selector: "selectAll:",
|
||||||
},
|
},
|
||||||
{ label: "Cut", accelerator: "CmdOrCtrl+X", selector: "cut:" },
|
{ label: "Cut", accelerator: "CmdOrCtrl+X", selector: "cut:" },
|
||||||
{ label: "Copy", accelerator: "CmdOrCtrl+C", selector: "copy:" },
|
{ label: "Copy", accelerator: "CmdOrCtrl+C", selector: "copy:" },
|
||||||
@ -46,8 +92,8 @@ module.exports.setApplicationMenu = () => {
|
|||||||
{ type: "separator" },
|
{ type: "separator" },
|
||||||
{ role: "minimize" },
|
{ role: "minimize" },
|
||||||
{ role: "close" },
|
{ role: "close" },
|
||||||
{ role: "quit" }
|
{ role: "quit" },
|
||||||
]
|
],
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
7065
package-lock.json
generated
7065
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
82
package.json
82
package.json
@ -1,38 +1,68 @@
|
|||||||
{
|
{
|
||||||
"name" : "youtube-music",
|
"name": "youtube-music",
|
||||||
"productName": "YouTube Music",
|
"productName": "YouTube Music",
|
||||||
"version" : "1.0.0",
|
"version": "1.3.3",
|
||||||
"description": "",
|
"description": "YouTube Music Desktop App - including custom plugins",
|
||||||
"license" : "MIT",
|
"license": "MIT",
|
||||||
"repository" : "th-ch/youtube-music",
|
"repository": "th-ch/youtube-music",
|
||||||
"author" : {
|
"author": {
|
||||||
"name" : "th-ch",
|
"name": "th-ch",
|
||||||
"email": "th-ch@users.noreply.github.com",
|
"email": "th-ch@users.noreply.github.com",
|
||||||
"url" : "https://github.com/th-ch/youtube-music"
|
"url": "https://github.com/th-ch/youtube-music"
|
||||||
|
},
|
||||||
|
"build": {
|
||||||
|
"appId": "com.github.th-ch.youtube-music",
|
||||||
|
"productName": "YouTube Music",
|
||||||
|
"mac": {
|
||||||
|
"identity": null,
|
||||||
|
"icon": "assets/generated/icons/mac/icon.icns"
|
||||||
|
},
|
||||||
|
"win": {
|
||||||
|
"icon": "assets/generated/icons/win/icon.ico"
|
||||||
|
},
|
||||||
|
"linux": {
|
||||||
|
"icon": "assets/generated/icons/png",
|
||||||
|
"category": "AudioVideo"
|
||||||
|
}
|
||||||
},
|
},
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"test" : "xo",
|
"test": "xo",
|
||||||
"start" : "electron .",
|
"start": "electron .",
|
||||||
"icon" : "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",
|
||||||
"postinstall": "npm run icon && npm rebuild && node plugins/adblocker/generator.js && electron-rebuild",
|
"generate:package": "node utils/generate-package-json.js",
|
||||||
"build" : "electron-packager . --out=dist --asar --overwrite --all --icon=assets/generated/icons/mac/icon.icns --prune=true",
|
"postinstall": "yarn run icon && yarn run plugins",
|
||||||
"build:macos": "electron-packager . --platform=darwin --arch=x64 --out=dist --asar --overwrite --icon=assets/generated/icons/mac/icon.icns --prune=true"
|
"clean": "rimraf dist",
|
||||||
|
"build": "yarn run clean && electron-builder --win --mac --linux",
|
||||||
|
"build:mac": "yarn run clean && electron-builder --mac",
|
||||||
|
"build:win": "yarn run clean && electron-builder --win",
|
||||||
|
"plugins": "yarn run plugin:adblocker && yarn run plugin:autoconfirm",
|
||||||
|
"plugin:adblocker": "rimraf plugins/adblocker/ad-blocker-engine.bin && node plugins/adblocker/blocker.js",
|
||||||
|
"plugin:autoconfirm": "yarn run generate:package YoutubeNonStop",
|
||||||
|
"release:linux": "yarn run clean && electron-builder --linux -p always -c.snap.publish=github",
|
||||||
|
"release:mac": "yarn run clean && electron-builder --mac -p always",
|
||||||
|
"release:win": "yarn run clean && electron-builder --win -p always"
|
||||||
|
},
|
||||||
|
"engines": {
|
||||||
|
"npm": "Please use yarn and not npm"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"ad-block" : "^4.1.3",
|
"@cliqz/adblocker-electron": "^1.14.1",
|
||||||
"electron-debug" : "^2.0.0",
|
"YoutubeNonStop": "git://github.com/lawfx/YoutubeNonStop.git#v0.7.1",
|
||||||
"electron-is-dev" : "^1.0.1",
|
"electron-debug": "^3.0.1",
|
||||||
"electron-localshortcut": "^3.1.0",
|
"electron-is": "^3.0.0",
|
||||||
"electron-store" : "^2.0.0"
|
"electron-localshortcut": "^3.2.1",
|
||||||
|
"electron-store": "^5.1.1",
|
||||||
|
"electron-updater": "^4.3.0",
|
||||||
|
"node-fetch": "^2.6.0"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"devtron" : "^1.4.0",
|
"devtron": "^1.4.0",
|
||||||
"electron" : "^4.0.8",
|
"electron": "^8.2.1",
|
||||||
"electron-devtools-installer": "^2.2.4",
|
"electron-builder": "^22.4.1",
|
||||||
"electron-icon-maker" : "0.0.4",
|
"electron-devtools-installer": "^3.0.0",
|
||||||
"electron-packager" : "^13.1.1",
|
"electron-icon-maker": "0.0.4",
|
||||||
"electron-rebuild" : "^1.8.4",
|
"rimraf": "^3.0.2",
|
||||||
"xo" : "^0.24.0"
|
"xo": "^0.29.0"
|
||||||
},
|
},
|
||||||
"xo": {
|
"xo": {
|
||||||
"envs": [
|
"envs": [
|
||||||
|
|||||||
2
plugins/adblocker/.gitignore
vendored
2
plugins/adblocker/.gitignore
vendored
@ -1 +1 @@
|
|||||||
detector.buffer
|
/ad-blocker-engine.bin
|
||||||
|
|||||||
@ -1,3 +1,2 @@
|
|||||||
const { blockWindowAds } = require("./blocker");
|
const { loadAdBlockerEngine } = require("./blocker");
|
||||||
|
module.exports = (win) => loadAdBlockerEngine(win.webContents.session);
|
||||||
module.exports = win => blockWindowAds(win.webContents);
|
|
||||||
|
|||||||
@ -1,12 +1,34 @@
|
|||||||
const { initialize, containsAds } = require("./contains-ads");
|
const { promises } = require("fs"); // used for caching
|
||||||
|
const path = require("path");
|
||||||
|
|
||||||
module.exports.blockWindowAds = webContents => {
|
const { ElectronBlocker } = require("@cliqz/adblocker-electron");
|
||||||
initialize();
|
const fetch = require("node-fetch");
|
||||||
webContents.session.webRequest.onBeforeRequest(
|
|
||||||
["*://*./*"],
|
const SOURCES = [
|
||||||
(details, cb) => {
|
"https://raw.githubusercontent.com/kbinani/adblock-youtube-ads/master/signed.txt",
|
||||||
const shouldBeBlocked = containsAds(details.url);
|
];
|
||||||
cb({ cancel: shouldBeBlocked });
|
|
||||||
|
const loadAdBlockerEngine = (session = undefined) =>
|
||||||
|
ElectronBlocker.fromLists(
|
||||||
|
fetch,
|
||||||
|
SOURCES,
|
||||||
|
{},
|
||||||
|
{
|
||||||
|
path: path.resolve(__dirname, "ad-blocker-engine.bin"),
|
||||||
|
read: promises.readFile,
|
||||||
|
write: promises.writeFile,
|
||||||
}
|
}
|
||||||
);
|
)
|
||||||
};
|
.then((blocker) => {
|
||||||
|
if (session) {
|
||||||
|
blocker.enableBlockingInSession(session);
|
||||||
|
} else {
|
||||||
|
console.log("Successfully generated adBlocker engine.");
|
||||||
|
}
|
||||||
|
})
|
||||||
|
.catch((err) => console.log("Error loading adBlocker engine", err));
|
||||||
|
|
||||||
|
module.exports = { loadAdBlockerEngine };
|
||||||
|
if (require.main === module) {
|
||||||
|
loadAdBlockerEngine(); // Generate the engine without enabling it
|
||||||
|
}
|
||||||
|
|||||||
@ -1,24 +0,0 @@
|
|||||||
const fs = require("fs");
|
|
||||||
const path = require("path");
|
|
||||||
const Blocker = require("ad-block");
|
|
||||||
|
|
||||||
const client = new Blocker.AdBlockClient();
|
|
||||||
const file = path.resolve(__dirname, "detector.buffer");
|
|
||||||
|
|
||||||
module.exports.client = client;
|
|
||||||
module.exports.initialize = () =>
|
|
||||||
new Promise((resolve, reject) => {
|
|
||||||
fs.readFile(file, (err, buffer) => {
|
|
||||||
if (err) {
|
|
||||||
return reject(err);
|
|
||||||
}
|
|
||||||
client.deserialize(buffer);
|
|
||||||
return resolve();
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
const none = Blocker.FilterOptions.noFilterOption;
|
|
||||||
const isAd = (req, base) => client.matches(req, none, base);
|
|
||||||
|
|
||||||
module.exports.containsAds = (req, base) => isAd(req, base);
|
|
||||||
module.exports.isAd = isAd;
|
|
||||||
@ -1,67 +0,0 @@
|
|||||||
// This file generates the detector buffer
|
|
||||||
const fs = require("fs");
|
|
||||||
const path = require("path");
|
|
||||||
const Blocker = require("ad-block");
|
|
||||||
const https = require("https");
|
|
||||||
|
|
||||||
const SOURCES = [
|
|
||||||
"https://raw.githubusercontent.com/kbinani/adblock-youtube-ads/master/signed.txt"
|
|
||||||
];
|
|
||||||
|
|
||||||
function parseAdblockList(client, adblockList) {
|
|
||||||
const urls = adblockList.split("\n");
|
|
||||||
const totalSize = urls.length;
|
|
||||||
console.log(
|
|
||||||
"Parsing " + totalSize + " urls (this can take a couple minutes)."
|
|
||||||
);
|
|
||||||
urls.map(line => client.parse(line));
|
|
||||||
console.log("Created buffer.");
|
|
||||||
}
|
|
||||||
|
|
||||||
function writeBuffer(client) {
|
|
||||||
const output = path.resolve(__dirname, "detector.buffer");
|
|
||||||
fs.writeFile(output, client.serialize(64), err => {
|
|
||||||
if (err) {
|
|
||||||
console.error(err);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
console.log("Wrote buffer to detector.buffer!");
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
function generateDetectorBuffer() {
|
|
||||||
const client = new Blocker.AdBlockClient();
|
|
||||||
let nbSourcesFetched = 0;
|
|
||||||
|
|
||||||
// fetch updated versions
|
|
||||||
SOURCES.forEach(source => {
|
|
||||||
console.log("Downloading " + source);
|
|
||||||
https
|
|
||||||
.get(source, resp => {
|
|
||||||
let data = "";
|
|
||||||
|
|
||||||
// A chunk of data has been recieved.
|
|
||||||
resp.on("data", chunk => {
|
|
||||||
data += chunk;
|
|
||||||
});
|
|
||||||
|
|
||||||
// The whole response has been received. Print out the result.
|
|
||||||
resp.on("end", () => {
|
|
||||||
parseAdblockList(client, data);
|
|
||||||
nbSourcesFetched++;
|
|
||||||
|
|
||||||
if (nbSourcesFetched === SOURCES.length) {
|
|
||||||
writeBuffer(client);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
})
|
|
||||||
.on("error", err => {
|
|
||||||
console.log("Error: " + err.message);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
module.exports = generateDetectorBuffer;
|
|
||||||
if (require.main === module) {
|
|
||||||
generateDetectorBuffer();
|
|
||||||
}
|
|
||||||
12
plugins/auto-confirm-when-paused/front.js
Normal file
12
plugins/auto-confirm-when-paused/front.js
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
// Define global chrome object to be compliant with the extension code
|
||||||
|
global.chrome = {
|
||||||
|
runtime: {
|
||||||
|
getManifest: () => ({
|
||||||
|
version: 1
|
||||||
|
})
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
module.exports = () => {
|
||||||
|
require("YoutubeNonStop/autoconfirm.js");
|
||||||
|
};
|
||||||
@ -1,7 +1,10 @@
|
|||||||
const { listenAction } = require("../utils");
|
const path = require("path");
|
||||||
const { ACTIONS, CHANNEL } = require("./actions.js");
|
|
||||||
|
const { injectCSS, listenAction } = require("../utils");
|
||||||
|
const { ACTIONS, CHANNEL } = require("./actions.js");
|
||||||
|
|
||||||
function handle(win) {
|
function handle(win) {
|
||||||
|
injectCSS(win.webContents, path.join(__dirname, "style.css"));
|
||||||
listenAction(CHANNEL, (event, action) => {
|
listenAction(CHANNEL, (event, action) => {
|
||||||
switch (action) {
|
switch (action) {
|
||||||
case ACTIONS.NEXT:
|
case ACTIONS.NEXT:
|
||||||
|
|||||||
@ -1,14 +1,15 @@
|
|||||||
const { ElementFromFile, templatePath } = require('../utils');
|
const { ElementFromFile, templatePath } = require("../utils");
|
||||||
|
|
||||||
function run() {
|
function run() {
|
||||||
const forwardButton = ElementFromFile(templatePath(__dirname, 'forward.html'));
|
const forwardButton = ElementFromFile(
|
||||||
const backButton = ElementFromFile(templatePath(__dirname, 'back.html'));
|
templatePath(__dirname, "forward.html")
|
||||||
const menu = document.querySelector("ytmusic-pivot-bar-renderer");
|
);
|
||||||
|
const backButton = ElementFromFile(templatePath(__dirname, "back.html"));
|
||||||
|
const menu = document.querySelector("ytmusic-pivot-bar-renderer");
|
||||||
|
|
||||||
if (menu) {
|
if (menu) {
|
||||||
menu.prepend(forwardButton);
|
menu.prepend(backButton, forwardButton);
|
||||||
menu.prepend(backButton);
|
}
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
module.exports = run;
|
module.exports = run;
|
||||||
|
|||||||
36
plugins/navigation/style.css
Normal file
36
plugins/navigation/style.css
Normal file
@ -0,0 +1,36 @@
|
|||||||
|
.navigation-item {
|
||||||
|
font-family : Roboto, Noto Naskh Arabic UI, Arial, sans-serif;
|
||||||
|
font-size : 20px;
|
||||||
|
line-height : var(--ytmusic-title-1_-_line-height);
|
||||||
|
font-weight : 500;
|
||||||
|
color : #fff;
|
||||||
|
--yt-endpoint-color : #fff;
|
||||||
|
--yt-endpoint-hover-color : #fff;
|
||||||
|
--yt-endpoint-visited-color: #fff;
|
||||||
|
display : inline-flex;
|
||||||
|
align-items : center;
|
||||||
|
color : rgba(255, 255, 255, 0.5);
|
||||||
|
cursor : pointer;
|
||||||
|
margin : 0 var(--ytmusic-pivot-bar-tab-margin);
|
||||||
|
}
|
||||||
|
|
||||||
|
.navigation-item:hover {
|
||||||
|
color: #fff;
|
||||||
|
}
|
||||||
|
|
||||||
|
.navigation-icon {
|
||||||
|
display : inline-flex;
|
||||||
|
-ms-flex-align : center;
|
||||||
|
-webkit-align-items : center;
|
||||||
|
align-items : center;
|
||||||
|
-ms-flex-pack : center;
|
||||||
|
-webkit-justify-content: center;
|
||||||
|
justify-content : center;
|
||||||
|
position : relative;
|
||||||
|
vertical-align : middle;
|
||||||
|
fill : var(--iron-icon-fill-color, currentcolor);
|
||||||
|
stroke : none;
|
||||||
|
width : var(--iron-icon-width, 24px);
|
||||||
|
height : var(--iron-icon-height, 24px);
|
||||||
|
animation : var(--iron-icon_-_animation);
|
||||||
|
}
|
||||||
@ -1,21 +1,51 @@
|
|||||||
<ytmusic-pivot-bar-item-renderer class="style-scope ytmusic-pivot-bar-renderer" tab-id="FEmusic_back" role="tab" onclick="goToPreviousPage()">
|
<div
|
||||||
<yt-icon class="tab-icon style-scope ytmusic-pivot-bar-item-renderer">
|
class="style-scope ytmusic-pivot-bar-renderer navigation-item"
|
||||||
<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%;">
|
tab-id="FEmusic_back"
|
||||||
<g class="style-scope yt-icon">
|
role="tab"
|
||||||
<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">
|
onclick="goToPreviousPage()"
|
||||||
</path>
|
>
|
||||||
</g>
|
<div
|
||||||
</svg>
|
class="tab-icon style-scope ytmusic-pivot-bar-item-renderer yt-icon-container"
|
||||||
</yt-icon>
|
>
|
||||||
|
<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>
|
||||||
|
|
||||||
<paper-icon-button class="search-icon style-scope ytmusic-search-box" role="button" tabindex="0" aria-disabled="false" title="Go to previous page">
|
<div
|
||||||
<iron-icon id="icon" class="style-scope paper-icon-button">
|
class="search-icon style-scope ytmusic-search-box"
|
||||||
<svg viewBox="0 0 492 492" preserveAspectRatio="xMidYMid meet" focusable="false" class="style-scope iron-icon" style="pointer-events: none; display: block; width: 100%; height: 100%;">
|
role="button"
|
||||||
<g class="style-scope iron-icon">
|
tabindex="0"
|
||||||
<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">
|
aria-disabled="false"
|
||||||
</path>
|
title="Go to previous page"
|
||||||
</g>
|
>
|
||||||
</svg>
|
<div id="icon" class="style-scope paper-icon-button navigation-icon">
|
||||||
</iron-icon>
|
<svg
|
||||||
</paper-icon-button>
|
viewBox="0 0 492 492"
|
||||||
</ytmusic-pivot-bar-item-renderer>
|
preserveAspectRatio="xMidYMid meet"
|
||||||
|
focusable="false"
|
||||||
|
class="style-scope iron-icon"
|
||||||
|
style="pointer-events: none; display: block; width: 100%; height: 100%;"
|
||||||
|
>
|
||||||
|
<g class="style-scope iron-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"
|
||||||
|
></path>
|
||||||
|
</g>
|
||||||
|
</svg>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|||||||
@ -1,26 +1,53 @@
|
|||||||
<ytmusic-pivot-bar-item-renderer class="style-scope ytmusic-pivot-bar-renderer" tab-id="FEmusic_next" role="tab" onclick="goToNextPage()">
|
<div
|
||||||
<yt-icon class="tab-icon style-scope ytmusic-pivot-bar-item-renderer">
|
class="style-scope ytmusic-pivot-bar-renderer navigation-item"
|
||||||
<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%;">
|
tab-id="FEmusic_next"
|
||||||
<g class="style-scope yt-icon">
|
role="tab"
|
||||||
<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
|
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
|
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
|
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">
|
c5.076-5.084,7.864-11.872,7.848-19.088C390.542,238.668,387.754,231.884,382.678,226.804z"
|
||||||
</path>
|
class="style-scope yt-icon"
|
||||||
</g>
|
></path>
|
||||||
</svg>
|
</g>
|
||||||
</yt-icon>
|
</svg>
|
||||||
|
</div>
|
||||||
|
|
||||||
<paper-icon-button class="search-icon style-scope ytmusic-search-box" role="button" tabindex="0" aria-disabled="false" title="Go to next page">
|
<div
|
||||||
<iron-icon id="icon" class="style-scope paper-icon-button">
|
class="search-icon style-scope ytmusic-search-box"
|
||||||
<svg viewBox="0 0 492 492" preserveAspectRatio="xMidYMid meet" focusable="false" class="style-scope iron-icon" style="pointer-events: none; display: block; width: 100%; height: 100%;">
|
role="button"
|
||||||
<g class="style-scope iron-icon">
|
tabindex="0"
|
||||||
<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
|
aria-disabled="false"
|
||||||
|
title="Go to next page"
|
||||||
|
>
|
||||||
|
<div id="icon" class="style-scope paper-icon-button navigation-icon">
|
||||||
|
<svg
|
||||||
|
viewBox="0 0 492 492"
|
||||||
|
preserveAspectRatio="xMidYMid meet"
|
||||||
|
focusable="false"
|
||||||
|
class="style-scope iron-icon"
|
||||||
|
style="pointer-events: none; display: block; width: 100%; height: 100%;"
|
||||||
|
>
|
||||||
|
<g class="style-scope iron-icon">
|
||||||
|
<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
|
||||||
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"
|
||||||
</path>
|
></path>
|
||||||
</g>
|
</g>
|
||||||
</svg>
|
</svg>
|
||||||
</iron-icon>
|
</div>
|
||||||
</paper-icon-button>
|
</div>
|
||||||
</ytmusic-pivot-bar-item-renderer>
|
</div>
|
||||||
|
|||||||
10
preload.js
10
preload.js
@ -1,7 +1,9 @@
|
|||||||
const path = require("path");
|
const path = require("path");
|
||||||
|
|
||||||
const { getEnabledPlugins } = require("./store");
|
const { getCurrentWindow } = require("electron").remote;
|
||||||
const { fileExists } = require("./plugins/utils");
|
|
||||||
|
const { getEnabledPlugins, store } = require("./store");
|
||||||
|
const { fileExists } = require("./plugins/utils");
|
||||||
|
|
||||||
const plugins = getEnabledPlugins();
|
const plugins = getEnabledPlugins();
|
||||||
|
|
||||||
@ -23,4 +25,8 @@ document.addEventListener("DOMContentLoaded", () => {
|
|||||||
run();
|
run();
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
// Add action for reloading
|
||||||
|
global.reload = () =>
|
||||||
|
getCurrentWindow().webContents.loadURL(store.get("url"));
|
||||||
});
|
});
|
||||||
|
|||||||
42
readme.md
42
readme.md
@ -1,4 +1,12 @@
|
|||||||
# YouTube Music [](https://github.com/sindresorhus/xo)
|
# YouTube Music
|
||||||
|
|
||||||
|
[](https://GitHub.com/th-ch/youtube-music/releases/)
|
||||||
|
[](https://github.com/th-ch/youtube-music/blob/master/LICENSE)
|
||||||
|
[](https://github.com/sindresorhus/xo)
|
||||||
|
[](https://ci.appveyor.com/project/th-ch/youtube-music)
|
||||||
|
[](https://travis-ci.org/th-ch/youtube-music)
|
||||||
|
[](https://snyk.io/test/github/th-ch/youtube-music)
|
||||||
|

|
||||||
|
|
||||||

|

|
||||||
|
|
||||||
@ -7,20 +15,25 @@
|
|||||||
- Native look & feel, aims at keeping the original interface
|
- Native look & feel, aims at keeping the original interface
|
||||||
- Framework for custom plugins: change YouTube Music to your needs (style, content, features), enable/disable plugins in one click
|
- Framework for custom plugins: change YouTube Music to your needs (style, content, features), enable/disable plugins in one click
|
||||||
|
|
||||||
|
## Download
|
||||||
|
|
||||||
|
You can check out the [latest release](https://github.com/th-ch/youtube-music/releases/latest) to quickly find the latest version.
|
||||||
|
|
||||||
## Available plugins:
|
## Available plugins:
|
||||||
|
|
||||||
- **Ad Blocker**: block all ads and tracking out of the box
|
- **Ad Blocker**: block all ads and tracking out of the box
|
||||||
- **No Google Login**: remove Google login buttons and links from the interface
|
- **No Google Login**: remove Google login buttons and links from the interface
|
||||||
- **Shortcuts**: use your usual shortcuts (media keys, Ctrl/CMD + F…) to control YouTube Music
|
- **Shortcuts**: use your usual shortcuts (media keys, Ctrl/CMD + F…) to control YouTube Music
|
||||||
- **Navigation**: next/back navigation arrows directly integrated in the interface, like in your favorite browser
|
- **Navigation**: next/back navigation arrows directly integrated in the interface, like in your favorite browser
|
||||||
|
- **Auto confirm when paused**: when the "Continue Watching?" modal appears, automatically click "Yes"
|
||||||
|
|
||||||
## Dev
|
## Dev
|
||||||
|
|
||||||
```
|
```sh
|
||||||
git clone https://github.com/th-ch/youtube-music
|
git clone https://github.com/th-ch/youtube-music
|
||||||
cd youtube-music
|
cd youtube-music
|
||||||
npm install
|
yarn
|
||||||
npm start
|
yarn start
|
||||||
```
|
```
|
||||||
|
|
||||||
## Build your own plugins
|
## Build your own plugins
|
||||||
@ -36,7 +49,7 @@ Create a folder in `plugins/YOUR-PLUGIN-NAME`:
|
|||||||
|
|
||||||
- if you need to manipulate the BrowserWindow, create a file `back.js` with the following template:
|
- if you need to manipulate the BrowserWindow, create a file `back.js` with the following template:
|
||||||
|
|
||||||
```
|
```node
|
||||||
module.exports = win => {
|
module.exports = win => {
|
||||||
// win is the BrowserWindow object
|
// win is the BrowserWindow object
|
||||||
};
|
};
|
||||||
@ -44,10 +57,10 @@ module.exports = win => {
|
|||||||
|
|
||||||
- if you need to change the front, create a file `front.js` with the following template:
|
- if you need to change the front, create a file `front.js` with the following template:
|
||||||
|
|
||||||
```
|
```node
|
||||||
module.exports = () => {
|
module.exports = () => {
|
||||||
// This function will be called as a preload script
|
// This function will be called as a preload script
|
||||||
// So you can use front features like `document.querySelector`
|
// So you can use front features like `document.querySelector`
|
||||||
};
|
};
|
||||||
```
|
```
|
||||||
|
|
||||||
@ -55,7 +68,10 @@ module.exports = () => {
|
|||||||
|
|
||||||
- injecting custom CSS: create a `style.css` file in the same folder then:
|
- injecting custom CSS: create a `style.css` file in the same folder then:
|
||||||
|
|
||||||
```
|
```node
|
||||||
|
const path = require("path");
|
||||||
|
const { injectCSS } = require("../utils");
|
||||||
|
|
||||||
// back.js
|
// back.js
|
||||||
module.exports = win => {
|
module.exports = win => {
|
||||||
injectCSS(win.webContents, path.join(__dirname, "style.css"));
|
injectCSS(win.webContents, path.join(__dirname, "style.css"));
|
||||||
@ -64,11 +80,11 @@ module.exports = win => {
|
|||||||
|
|
||||||
- changing the HTML:
|
- changing the HTML:
|
||||||
|
|
||||||
```
|
```node
|
||||||
// front.js
|
// front.js
|
||||||
module.exports = () => {
|
module.exports = () => {
|
||||||
// Remove the login button
|
// Remove the login button
|
||||||
document.querySelector('.sign-in-link.ytmusic-nav-bar').remove();
|
document.querySelector(".sign-in-link.ytmusic-nav-bar").remove();
|
||||||
};
|
};
|
||||||
```
|
```
|
||||||
|
|
||||||
@ -76,11 +92,11 @@ module.exports = () => {
|
|||||||
|
|
||||||
## Build
|
## Build
|
||||||
|
|
||||||
```
|
```sh
|
||||||
$ npm run build
|
yarn run build
|
||||||
```
|
```
|
||||||
|
|
||||||
Builds the app for macOS, Linux, and Windows, using [electron-packager](https://github.com/electron-userland/electron-packager).
|
Builds the app for macOS, Linux, and Windows, using [electron-builder](https://github.com/electron-userland/electron-builder).
|
||||||
|
|
||||||
## License
|
## License
|
||||||
|
|
||||||
|
|||||||
@ -4,18 +4,30 @@ const plugins = require("./plugins");
|
|||||||
const store = new Store({
|
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", "no-google-login"]
|
plugins: ["navigation", "shortcuts", "adblocker"],
|
||||||
|
options: {
|
||||||
|
tray: false,
|
||||||
|
appVisible: true,
|
||||||
|
autoUpdates: true
|
||||||
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
module.exports = {
|
module.exports = {
|
||||||
store : store,
|
store: store,
|
||||||
isPluginEnabled : plugin => plugins.isEnabled(store, plugin),
|
// Plugins
|
||||||
|
isPluginEnabled: plugin => plugins.isEnabled(store, plugin),
|
||||||
getEnabledPlugins: () => plugins.getEnabledPlugins(store),
|
getEnabledPlugins: () => plugins.getEnabledPlugins(store),
|
||||||
enableplugin : plugin => plugins.enablePlugin(store, plugin),
|
enablePlugin: plugin => plugins.enablePlugin(store, plugin),
|
||||||
disablePlugin : plugin => plugins.disablePlugin(store, plugin)
|
disablePlugin: plugin => plugins.disablePlugin(store, plugin),
|
||||||
|
// Options
|
||||||
|
setOptions: options =>
|
||||||
|
store.set("options", { ...store.get("options"), ...options }),
|
||||||
|
isTrayEnabled: () => store.get("options.tray"),
|
||||||
|
isAppVisible: () => store.get("options.appVisible"),
|
||||||
|
autoUpdate: () => store.get("options.autoUpdates")
|
||||||
};
|
};
|
||||||
|
|||||||
@ -26,6 +26,6 @@ function disablePlugin(store, plugin) {
|
|||||||
module.exports = {
|
module.exports = {
|
||||||
isEnabled : isEnabled,
|
isEnabled : isEnabled,
|
||||||
getEnabledPlugins: getEnabledPlugins,
|
getEnabledPlugins: getEnabledPlugins,
|
||||||
enableplugin : enablePlugin,
|
enablePlugin : enablePlugin,
|
||||||
disableplugin : disablePlugin
|
disablePlugin : disablePlugin
|
||||||
};
|
};
|
||||||
|
|||||||
73
tray.js
Normal file
73
tray.js
Normal file
@ -0,0 +1,73 @@
|
|||||||
|
const path = require("path");
|
||||||
|
|
||||||
|
const { Menu, nativeImage, Tray } = require("electron");
|
||||||
|
|
||||||
|
const { mainMenuTemplate } = require("./menu");
|
||||||
|
const { isTrayEnabled } = require("./store");
|
||||||
|
const { clickInYoutubeMusic } = require("./utils/youtube-music");
|
||||||
|
|
||||||
|
// Prevent tray being garbage collected
|
||||||
|
let tray;
|
||||||
|
|
||||||
|
module.exports.setUpTray = (app, win) => {
|
||||||
|
if (!isTrayEnabled()) {
|
||||||
|
tray = undefined;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const iconPath = path.join(__dirname, "assets", "youtube-music-tray.png");
|
||||||
|
let trayIcon = nativeImage.createFromPath(iconPath).resize({
|
||||||
|
width: 16,
|
||||||
|
height: 16,
|
||||||
|
});
|
||||||
|
tray = new Tray(trayIcon);
|
||||||
|
tray.setToolTip("Youtube Music");
|
||||||
|
tray.setIgnoreDoubleClickEvents(true);
|
||||||
|
tray.on("click", () => {
|
||||||
|
win.isVisible() ? win.hide() : win.show();
|
||||||
|
});
|
||||||
|
|
||||||
|
const trayMenu = Menu.buildFromTemplate([
|
||||||
|
{
|
||||||
|
label: "Play/Pause",
|
||||||
|
click: () => {
|
||||||
|
clickInYoutubeMusic(
|
||||||
|
win,
|
||||||
|
"#left-controls > div > paper-icon-button.play-pause-button.style-scope.ytmusic-player-bar"
|
||||||
|
);
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
label: "Next",
|
||||||
|
click: () => {
|
||||||
|
clickInYoutubeMusic(
|
||||||
|
win,
|
||||||
|
"#left-controls > div > paper-icon-button.next-button.style-scope.ytmusic-player-bar"
|
||||||
|
);
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
label: "Previous",
|
||||||
|
click: () => {
|
||||||
|
clickInYoutubeMusic(
|
||||||
|
win,
|
||||||
|
"#left-controls > div > paper-icon-button.previous-button.style-scope.ytmusic-player-bar"
|
||||||
|
);
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
label: "Show",
|
||||||
|
click: () => {
|
||||||
|
win.show();
|
||||||
|
},
|
||||||
|
},
|
||||||
|
...mainMenuTemplate,
|
||||||
|
{
|
||||||
|
label: "Quit",
|
||||||
|
click: () => {
|
||||||
|
app.quit();
|
||||||
|
},
|
||||||
|
},
|
||||||
|
]);
|
||||||
|
tray.setContextMenu(trayMenu);
|
||||||
|
};
|
||||||
34
utils/generate-package-json.js
Executable file
34
utils/generate-package-json.js
Executable file
@ -0,0 +1,34 @@
|
|||||||
|
#!/usr/bin/env node
|
||||||
|
|
||||||
|
const { existsSync, writeFile } = require("fs");
|
||||||
|
const { join } = require("path");
|
||||||
|
const { promisify } = require("util");
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Generates a fake package.json for given packages that don't have any.
|
||||||
|
* Allows electron-builder to resolve them
|
||||||
|
*/
|
||||||
|
|
||||||
|
const generatePackageJson = async packageName => {
|
||||||
|
var filepath = join("node_modules", packageName, "package.json");
|
||||||
|
if (!existsSync(filepath)) {
|
||||||
|
console.log(
|
||||||
|
`No package.json found for ${packageName} module, generating one…`
|
||||||
|
);
|
||||||
|
pkg = {
|
||||||
|
name: packageName,
|
||||||
|
version: "0.0.0",
|
||||||
|
description: "-",
|
||||||
|
repository: { type: "git", url: "-" },
|
||||||
|
readme: "-"
|
||||||
|
};
|
||||||
|
const writeFileAsync = promisify(writeFile);
|
||||||
|
await writeFileAsync(filepath, JSON.stringify(pkg, null, 2));
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
if (require.main === module) {
|
||||||
|
process.argv.slice(2).forEach(async packageName => {
|
||||||
|
await generatePackageJson(packageName);
|
||||||
|
});
|
||||||
|
}
|
||||||
8
utils/youtube-music.js
Normal file
8
utils/youtube-music.js
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
const clickInYoutubeMusic = (win, selector) => {
|
||||||
|
win.webContents.executeJavaScript(
|
||||||
|
`document.querySelector("${selector}").click();`,
|
||||||
|
true
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
module.exports = { clickInYoutubeMusic };
|
||||||
@ -23,3 +23,8 @@ ytmusic-app-layout {
|
|||||||
ytmusic-search-box.ytmusic-nav-bar {
|
ytmusic-search-box.ytmusic-nav-bar {
|
||||||
margin-top: 12px;
|
margin-top: 12px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Blocking annoying elements */
|
||||||
|
ytmusic-mealbar-promo-renderer {
|
||||||
|
display: none !important;
|
||||||
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user