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

Merge pull request #213 from th-ch/song-info-front

Browse Source 
Pass metadata to front + use metadata URL in downloader
This commit is contained in:
th-ch
2021-04-02 22:59:57 +02:00
committed by GitHub
parent d67d697847 640f146373
commit 2254cac15b
4 changed files with 85 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/downloader/front.js
View File

@ -35,7 +35,7 @@ const reinit = () => {
// contextBridge.exposeInMainWorld("downloader", { // contextBridge.exposeInMainWorld("downloader", {
// download: () => { // download: () => {
global.download = () => { global.download = () => {
const videoUrl = window.location.href; const videoUrl = global.songInfo.url || window.location.href;
downloadVideoToMP3( downloadVideoToMP3(
videoUrl, videoUrl,

17
plugins/downloader/menu.js
View File

@ -7,16 +7,28 @@ const is = require("electron-is");
const ytpl = require("ytpl"); const ytpl = require("ytpl");
const { setOptions } = require("../../config/plugins"); const { setOptions } = require("../../config/plugins");
const getSongInfo = require("../../providers/song-info");
const { sendError } = require("./back"); const { sendError } = require("./back");
const { defaultMenuDownloadLabel, getFolder } = require("./utils"); const { defaultMenuDownloadLabel, getFolder } = require("./utils");
let downloadLabel = defaultMenuDownloadLabel; let downloadLabel = defaultMenuDownloadLabel;
let metadataURL = undefined;
let callbackIsRegistered = false;
module.exports = (win, options, refreshMenu) => [ module.exports = (win, options, refreshMenu) => {
if (!callbackIsRegistered) {
const registerCallback = getSongInfo(win);
registerCallback((info) => {
metadataURL = info.url;
});
callbackIsRegistered = true;
}
return [
{ {
label: downloadLabel, label: downloadLabel,
click: async () => { click: async () => {
const currentURL = win.webContents.getURL(); const currentURL = metadataURL || win.webContents.getURL();
const playlistID = new URL(currentURL).searchParams.get("list"); const playlistID = new URL(currentURL).searchParams.get("list");
if (!playlistID) { if (!playlistID) {
sendError(win, new Error("No playlist ID found")); sendError(win, new Error("No playlist ID found"));
@ -75,3 +87,4 @@ module.exports = (win, options, refreshMenu) => [
}, },
}, },
]; ];
};

6
providers/song-info-front.js
View File

@ -1,5 +1,11 @@
const { ipcRenderer } = require("electron"); const { ipcRenderer } = require("electron");
global.songInfo = {};
ipcRenderer.on("update-song-info", (_, extractedSongInfo) => {
global.songInfo = JSON.parse(extractedSongInfo);
});
const injectListener = () => { const injectListener = () => {
var oldXHR = window.XMLHttpRequest; var oldXHR = window.XMLHttpRequest;
function newXHR() { function newXHR() {

13
providers/song-info.js
View File

@ -36,13 +36,13 @@ const songInfo = {
uploadDate: "", uploadDate: "",
imageSrc: "", imageSrc: "",
image: null, image: null,
isPaused: true, isPaused: undefined,
songDuration: 0, songDuration: 0,
elapsedSeconds: 0, elapsedSeconds: 0,
url: "", url: "",
}; };
const handleData = async (_event, responseText) => { const handleData = async (responseText, win) => {
let data = JSON.parse(responseText); let data = JSON.parse(responseText);
songInfo.title = data?.videoDetails?.title; songInfo.title = data?.videoDetails?.title;
songInfo.artist = data?.videoDetails?.author; songInfo.artist = data?.videoDetails?.author;
@ -52,6 +52,8 @@ const handleData = async (_event, responseText) => {
songInfo.image = await getImage(songInfo.imageSrc); songInfo.image = await getImage(songInfo.imageSrc);
songInfo.uploadDate = data?.microformat?.microformatDataRenderer?.uploadDate; songInfo.uploadDate = data?.microformat?.microformatDataRenderer?.uploadDate;
songInfo.url = data?.microformat?.microformatDataRenderer?.urlCanonical; songInfo.url = data?.microformat?.microformatDataRenderer?.urlCanonical;
win.webContents.send("update-song-info", JSON.stringify(songInfo));
}; };
const registerProvider = (win) => { const registerProvider = (win) => {
@ -77,7 +79,12 @@ const registerProvider = (win) => {
}); });
// This will be called when the song-info-front finds a new request with song data // This will be called when the song-info-front finds a new request with song data
ipcMain.on("song-info-request", handleData); ipcMain.on("song-info-request", async (_, responseText) => {
await handleData(responseText, win);
callbacks.forEach((c) => {
c(songInfo);
});
});
return registerCallback; return registerCallback;
}; };