smueller/youtube-music
1
0
Fork 0
mirror of https://github.com/th-ch/youtube-music.git synced 2026-01-16 20:52:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

downloader lint&refactor

Browse Source
This commit is contained in:
Araxeus
2022-01-12 09:49:27 +02:00
parent c7e793b66e
commit 74f61a532d
2 changed files with 19 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/downloader/front.js
View File

@ -45,7 +45,7 @@ global.download = () => {
let metadata; let metadata;
let videoUrl = getSongMenu() let videoUrl = getSongMenu()
// selector of first button which is always "Start Radio" // selector of first button which is always "Start Radio"
?.querySelector('ytmusic-menu-navigation-item-renderer.iron-selected[tabindex="0"] #navigation-endpoint') ?.querySelector('ytmusic-menu-navigation-item-renderer[tabindex="0"] #navigation-endpoint')
?.getAttribute("href"); ?.getAttribute("href");
if (videoUrl) { if (videoUrl) {
if (videoUrl.startsWith('watch?')) { if (videoUrl.startsWith('watch?')) {

31
plugins/downloader/menu.js
View File

@ -11,15 +11,24 @@ const { sendError } = require("./back");
const { defaultMenuDownloadLabel, getFolder, presets } = require("./utils"); const { defaultMenuDownloadLabel, getFolder, presets } = require("./utils");
let downloadLabel = defaultMenuDownloadLabel; let downloadLabel = defaultMenuDownloadLabel;
let playingPlaylistId = undefined; let playingUrl = undefined;
let callbackIsRegistered = false; let callbackIsRegistered = false;
const INVALID_PLAYLIST_MODIFIER = 'RDAMPLPL'; // Playlist radio modifier needs to be cut from playlist ID
const INVALID_PLAYLIST_MODIFIER = 'RDAMPL';
const getPlaylistID = aURL => {
const result = aURL?.searchParams.get("list") || aURL?.searchParams.get("playlist");
if (result?.startsWith(INVALID_PLAYLIST_MODIFIER)) {
return result.slice(6)
}
return result;
};
module.exports = (win, options) => { module.exports = (win, options) => {
if (!callbackIsRegistered) { if (!callbackIsRegistered) {
ipcMain.on("video-src-changed", async (_, data) => { ipcMain.on("video-src-changed", async (_, data) => {
playingPlaylistId = JSON.parse(data)?.videoDetails?.playlistId; playingUrl = JSON.parse(data)?.microformat?.microformatDataRenderer?.urlCanonical;
}); });
ipcMain.on("download-playlist-request", async (_event, url) => downloadPlaylist(url, win, options)); ipcMain.on("download-playlist-request", async (_event, url) => downloadPlaylist(url, win, options));
callbackIsRegistered = true; callbackIsRegistered = true;
@ -58,21 +67,17 @@ module.exports = (win, options) => {
]; ];
}; };
async function downloadPlaylist(url, win, options) { async function downloadPlaylist(givenUrl, win, options) {
const getPlaylistID = aURL => { if (givenUrl) {
const result = aURL?.searchParams.get("list") || aURL?.searchParams.get("playlist");
return (!result || result.startsWith(INVALID_PLAYLIST_MODIFIER)) ? undefined : result;
};
if (url) {
try { try {
url = new URL(url); givenUrl = new URL(givenUrl);
} catch { } catch {
url = undefined; givenUrl = undefined;
}; };
} }
const playlistId = getPlaylistID(url) const playlistId = getPlaylistID(givenUrl)
|| getPlaylistID(new URL(win.webContents.getURL())) || getPlaylistID(new URL(win.webContents.getURL()))
|| playingPlaylistId; || getPlaylistID(new URL(playingUrl));
if (!playlistId) { if (!playlistId) {
sendError(win, new Error("No playlist ID found")); sendError(win, new Error("No playlist ID found"));