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

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
4 changed files with 85 additions and 59 deletions

View File

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

View File

@ -7,16 +7,28 @@ const is = require("electron-is");
const ytpl = require("ytpl");
const { setOptions } = require("../../config/plugins");
const getSongInfo = require("../../providers/song-info");
const { sendError } = require("./back");
const { defaultMenuDownloadLabel, getFolder } = require("./utils");
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,
click: async () => {
const currentURL = win.webContents.getURL();
const currentURL = metadataURL || win.webContents.getURL();
const playlistID = new URL(currentURL).searchParams.get("list");
if (!playlistID) {
sendError(win, new Error("No playlist ID found"));
@ -74,4 +86,5 @@ module.exports = (win, options, refreshMenu) => [
} // else = user pressed cancel
},
},
];
];
};

View File

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

View File

@ -36,13 +36,13 @@ const songInfo = {
uploadDate: "",
imageSrc: "",
image: null,
isPaused: true,
isPaused: undefined,
songDuration: 0,
elapsedSeconds: 0,
url: "",
};
const handleData = async (_event, responseText) => {
const handleData = async (responseText, win) => {
let data = JSON.parse(responseText);
songInfo.title = data?.videoDetails?.title;
songInfo.artist = data?.videoDetails?.author;
@ -52,6 +52,8 @@ const handleData = async (_event, responseText) => {
songInfo.image = await getImage(songInfo.imageSrc);
songInfo.uploadDate = data?.microformat?.microformatDataRenderer?.uploadDate;
songInfo.url = data?.microformat?.microformatDataRenderer?.urlCanonical;
win.webContents.send("update-song-info", JSON.stringify(songInfo));
};
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
ipcMain.on("song-info-request", handleData);
ipcMain.on("song-info-request", async (_, responseText) => {
await handleData(responseText, win);
callbacks.forEach((c) => {
c(songInfo);
});
});
return registerCallback;
};