mirror of
https://github.com/th-ch/youtube-music.git
synced 2026-01-11 10:31:47 +00:00
Compare commits
68 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 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 |
34
.travis.yml
34
.travis.yml
@ -1,42 +1,34 @@
|
||||
matrix:
|
||||
include:
|
||||
- os: osx
|
||||
osx_image: xcode9.4
|
||||
language: node_js
|
||||
node_js: "10"
|
||||
env:
|
||||
- ELECTRON_CACHE=$HOME/.cache/electron
|
||||
- ELECTRON_BUILDER_CACHE=$HOME/.cache/electron-builder
|
||||
- ELECTRON_CACHE=$HOME/.cache/electron ELECTRON_BUILDER_CACHE=$HOME/.cache/electron-builder
|
||||
|
||||
jobs:
|
||||
include:
|
||||
- os: osx
|
||||
osx_image: xcode11.3
|
||||
- os: linux
|
||||
services: docker
|
||||
language: generic
|
||||
dist: xenial
|
||||
|
||||
cache:
|
||||
yarn: false
|
||||
directories:
|
||||
- node_modules
|
||||
- $HOME/.cache/electron
|
||||
- $HOME/.cache/electron-builder
|
||||
|
||||
script:
|
||||
- |
|
||||
if [ "$TRAVIS_OS_NAME" == "linux" ]; then
|
||||
docker run --rm \
|
||||
$(env | \
|
||||
grep -Eo '^[^\s=]*(DEBUG|NODE_|ELECTRON_|YARN_|NPM_|CI|CIRCLE|TRAVIS|APPVEYOR_|CSC_|_TOKEN|_KEY|AWS_|STRIP|BUILD_)[^\s=]*' | \
|
||||
sed '/^$/d;s/^/-e /' | \
|
||||
paste -sd ' ' \
|
||||
) \
|
||||
-v ${PWD}:/project \
|
||||
-v ~/.cache/electron:/root/.cache/electron \
|
||||
-v ~/.cache/electron-builder:/root/.cache/electron-builder \
|
||||
electronuserland/builder \
|
||||
/bin/bash -c "npm install && npm run release:linux"
|
||||
yarn run release:linux
|
||||
else
|
||||
npm run release:mac
|
||||
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:
|
||||
|
||||
15
appveyor.yml
15
appveyor.yml
@ -1,4 +1,4 @@
|
||||
image: Visual Studio 2017
|
||||
image: Visual Studio 2019
|
||||
|
||||
platform:
|
||||
- x64
|
||||
@ -11,10 +11,17 @@ init:
|
||||
- git config --global core.autocrlf input
|
||||
|
||||
install:
|
||||
- ps: Install-Product node 8 x64
|
||||
- npm 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:
|
||||
- npm run release:win
|
||||
- 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 |
53
index.js
53
index.js
@ -6,8 +6,15 @@ const is = require("electron-is");
|
||||
const { autoUpdater } = require("electron-updater");
|
||||
|
||||
const { setApplicationMenu } = require("./menu");
|
||||
const { getEnabledPlugins, store } = require("./store");
|
||||
const {
|
||||
autoUpdate,
|
||||
getEnabledPlugins,
|
||||
isAppVisible,
|
||||
isTrayEnabled,
|
||||
store,
|
||||
} = require("./store");
|
||||
const { fileExists, injectCSS } = require("./plugins/utils");
|
||||
const { setUpTray } = require("./tray");
|
||||
|
||||
const app = electron.app;
|
||||
|
||||
@ -45,10 +52,10 @@ function createMainWindow() {
|
||||
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
|
||||
affinity: "main-window", // main window, and addition windows should work in one process
|
||||
},
|
||||
frame: !is.macOS(),
|
||||
titleBarStyle: is.macOS() ? "hiddenInset": "default"
|
||||
titleBarStyle: is.macOS() ? "hiddenInset" : "default",
|
||||
});
|
||||
if (windowMaximized) {
|
||||
win.maximize();
|
||||
@ -65,7 +72,7 @@ function createMainWindow() {
|
||||
}
|
||||
});
|
||||
|
||||
getEnabledPlugins().forEach(plugin => {
|
||||
getEnabledPlugins().forEach((plugin) => {
|
||||
console.log("Loaded plugin - " + plugin);
|
||||
const pluginPath = path.join(__dirname, "plugins", plugin, "back.js");
|
||||
fileExists(pluginPath, () => {
|
||||
@ -88,6 +95,21 @@ 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) => {
|
||||
@ -114,7 +136,9 @@ function createMainWindow() {
|
||||
});
|
||||
|
||||
win.once("ready-to-show", () => {
|
||||
if (isAppVisible()) {
|
||||
win.show();
|
||||
}
|
||||
});
|
||||
|
||||
return win;
|
||||
@ -142,7 +166,12 @@ app.on("activate", () => {
|
||||
app.on("ready", () => {
|
||||
setApplicationMenu();
|
||||
mainWindow = createMainWindow();
|
||||
if (!is.dev()) {
|
||||
const tray = setUpTray(app, mainWindow);
|
||||
tray.on("click", () => {
|
||||
mainWindow.isVisible() ? mainWindow.hide() : mainWindow.show();
|
||||
});
|
||||
|
||||
if (!is.dev() && autoUpdate()) {
|
||||
autoUpdater.checkForUpdatesAndNotify();
|
||||
autoUpdater.on("update-available", () => {
|
||||
const dialogOpts = {
|
||||
@ -151,19 +180,27 @@ app.on("ready", () => {
|
||||
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"
|
||||
"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
|
||||
if (process.platform === "darwin") {
|
||||
if (is.macOS()) {
|
||||
if (!isAppVisible()) {
|
||||
app.dock.hide();
|
||||
}
|
||||
}
|
||||
|
||||
var forceQuit = false;
|
||||
app.on("before-quit", () => {
|
||||
forceQuit = true;
|
||||
});
|
||||
mainWindow.on("close", event => {
|
||||
|
||||
if (is.macOS() || isTrayEnabled()) {
|
||||
mainWindow.on("close", (event) => {
|
||||
// Hide the window instead of quitting (quit is available in tray options)
|
||||
if (!forceQuit) {
|
||||
event.preventDefault();
|
||||
mainWindow.hide();
|
||||
|
||||
68
menu.js
68
menu.js
@ -1,29 +1,75 @@
|
||||
const { app, Menu } = require("electron");
|
||||
|
||||
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 menuTemplate = [
|
||||
const mainMenuTemplate = [
|
||||
{
|
||||
label: "Plugins",
|
||||
submenu: getAllPlugins().map(plugin => {
|
||||
submenu: getAllPlugins().map((plugin) => {
|
||||
return {
|
||||
label: plugin,
|
||||
type: "checkbox",
|
||||
checked: isPluginEnabled(plugin),
|
||||
click : item => {
|
||||
click: (item) => {
|
||||
if (item.checked) {
|
||||
enablePlugin(plugin);
|
||||
} else {
|
||||
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") {
|
||||
const name = app.getName();
|
||||
menuTemplate.unshift({
|
||||
@ -38,7 +84,7 @@ module.exports.setApplicationMenu = () => {
|
||||
{
|
||||
label: "Select All",
|
||||
accelerator: "CmdOrCtrl+A",
|
||||
selector : "selectAll:"
|
||||
selector: "selectAll:",
|
||||
},
|
||||
{ label: "Cut", accelerator: "CmdOrCtrl+X", selector: "cut:" },
|
||||
{ label: "Copy", accelerator: "CmdOrCtrl+C", selector: "copy:" },
|
||||
@ -46,8 +92,8 @@ module.exports.setApplicationMenu = () => {
|
||||
{ type: "separator" },
|
||||
{ role: "minimize" },
|
||||
{ role: "close" },
|
||||
{ role: "quit" }
|
||||
]
|
||||
{ role: "quit" },
|
||||
],
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
7301
package-lock.json
generated
7301
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
46
package.json
46
package.json
@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "youtube-music",
|
||||
"productName": "YouTube Music",
|
||||
"version": "1.1.6",
|
||||
"version": "1.3.2",
|
||||
"description": "YouTube Music Desktop App - including custom plugins",
|
||||
"license": "MIT",
|
||||
"repository": "th-ch/youtube-music",
|
||||
@ -29,32 +29,40 @@
|
||||
"test": "xo",
|
||||
"start": "electron .",
|
||||
"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",
|
||||
"postinstall": "yarn run icon && yarn run plugins",
|
||||
"clean": "rimraf dist",
|
||||
"build": "npm run clean && build --win --mac --linux",
|
||||
"build:mac": "npm run clean && build --mac",
|
||||
"build:win": "npm run clean && build --win",
|
||||
"release:linux": "npm run clean && build --linux -p always",
|
||||
"release:mac": "npm run clean && build --mac -p always",
|
||||
"release:win": "npm run clean && build --win -p always"
|
||||
"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": {
|
||||
"ad-block": "^4.1.3",
|
||||
"electron-debug": "^2.0.0",
|
||||
"@cliqz/adblocker-electron": "^1.14.1",
|
||||
"YoutubeNonStop": "git://github.com/lawfx/YoutubeNonStop.git#v0.7.1",
|
||||
"electron-debug": "^3.0.1",
|
||||
"electron-is": "^3.0.0",
|
||||
"electron-localshortcut": "^3.1.0",
|
||||
"electron-store": "^2.0.0",
|
||||
"electron-updater": "^4.0.6"
|
||||
"electron-localshortcut": "^3.2.1",
|
||||
"electron-store": "^5.1.1",
|
||||
"electron-updater": "^4.3.0",
|
||||
"node-fetch": "^2.6.0"
|
||||
},
|
||||
"devDependencies": {
|
||||
"devtron": "^1.4.0",
|
||||
"electron": "^4.0.8",
|
||||
"electron-builder": "^20.40.2",
|
||||
"electron-devtools-installer": "^2.2.4",
|
||||
"electron": "^8.2.1",
|
||||
"electron-builder": "^22.4.1",
|
||||
"electron-devtools-installer": "^3.0.0",
|
||||
"electron-icon-maker": "0.0.4",
|
||||
"electron-rebuild": "^1.8.4",
|
||||
"rimraf": "^2.6.3",
|
||||
"xo": "^0.24.0"
|
||||
"rimraf": "^3.0.2",
|
||||
"xo": "^0.29.0"
|
||||
},
|
||||
"xo": {
|
||||
"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");
|
||||
|
||||
module.exports = win => blockWindowAds(win.webContents);
|
||||
const { loadAdBlockerEngine } = require("./blocker");
|
||||
module.exports = (win) => loadAdBlockerEngine(win.webContents.session);
|
||||
|
||||
@ -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 => {
|
||||
initialize();
|
||||
webContents.session.webRequest.onBeforeRequest(
|
||||
["*://*./*"],
|
||||
(details, cb) => {
|
||||
const shouldBeBlocked = containsAds(details.url);
|
||||
cb({ cancel: shouldBeBlocked });
|
||||
const { ElectronBlocker } = require("@cliqz/adblocker-electron");
|
||||
const fetch = require("node-fetch");
|
||||
|
||||
const SOURCES = [
|
||||
"https://raw.githubusercontent.com/kbinani/adblock-youtube-ads/master/signed.txt",
|
||||
];
|
||||
|
||||
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");
|
||||
};
|
||||
12
readme.md
12
readme.md
@ -1,9 +1,12 @@
|
||||
# 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)
|
||||

|
||||
|
||||

|
||||
|
||||
@ -22,14 +25,15 @@ You can check out the [latest release](https://github.com/th-ch/youtube-music/re
|
||||
- **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
|
||||
- **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
|
||||
|
||||
```sh
|
||||
git clone https://github.com/th-ch/youtube-music
|
||||
cd youtube-music
|
||||
npm install
|
||||
npm start
|
||||
yarn
|
||||
yarn start
|
||||
```
|
||||
|
||||
## Build your own plugins
|
||||
@ -80,7 +84,7 @@ module.exports = win => {
|
||||
// front.js
|
||||
module.exports = () => {
|
||||
// Remove the login button
|
||||
document.querySelector('.sign-in-link.ytmusic-nav-bar').remove();
|
||||
document.querySelector(".sign-in-link.ytmusic-nav-bar").remove();
|
||||
};
|
||||
```
|
||||
|
||||
@ -89,7 +93,7 @@ module.exports = () => {
|
||||
## Build
|
||||
|
||||
```sh
|
||||
npm run build
|
||||
yarn run build
|
||||
```
|
||||
|
||||
Builds the app for macOS, Linux, and Windows, using [electron-builder](https://github.com/electron-userland/electron-builder).
|
||||
|
||||
@ -8,14 +8,26 @@ const store = new Store({
|
||||
height: 550
|
||||
},
|
||||
url: "https://music.youtube.com",
|
||||
plugins: ["navigation", "shortcuts", "adblocker"]
|
||||
plugins: ["navigation", "shortcuts", "adblocker"],
|
||||
options: {
|
||||
tray: false,
|
||||
appVisible: true,
|
||||
autoUpdates: true
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
module.exports = {
|
||||
store: store,
|
||||
// Plugins
|
||||
isPluginEnabled: plugin => plugins.isEnabled(store, plugin),
|
||||
getEnabledPlugins: () => plugins.getEnabledPlugins(store),
|
||||
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")
|
||||
};
|
||||
|
||||
72
tray.js
Normal file
72
tray.js
Normal file
@ -0,0 +1,72 @@
|
||||
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);
|
||||
|
||||
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);
|
||||
|
||||
return tray;
|
||||
};
|
||||
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 {
|
||||
margin-top: 12px;
|
||||
}
|
||||
|
||||
/* Blocking annoying elements */
|
||||
ytmusic-mealbar-promo-renderer {
|
||||
display: none !important;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user