aiden
/
ytDownloader
mirror of https://github.com/aandrew-me/ytDownloader
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add support to use cookies

Browse Source
pull/47/head
aandrew-me 3 years ago
parent 1a9bbed1da
commit 810468bff0
7 changed files with 111 additions and 41 deletions
Show Stats Download Patch File Download Diff File

3
assets/css/extra.css
Unescape Escape View File

@ -94,4 +94,7 @@ select {
font-size: large;
margin: 8px;
outline: none;
}
#browserInfo{
cursor: pointer;
}

27
html/preferences.html
Unescape Escape View File

@ -47,6 +47,20 @@
<option value="tr">Türkçe</option>
</select>
<br>
<span id="browserTxt">Select browser to use cookies from</span>
<span id="browserInfo"> ℹ️</span>
<select id="browser">
<option value="">None</option>
<option value="chrome">Chrome</option>
<option value="firefox">Firefox</option>
<option value="brave">Brave</option>
<option value="opera">Opera Mini</option>
<option value="edge">Edge</option>
<option value="chromium">Chromium</option>
<option value="safari">Safari</option>
<option value="vivaldi">Vivaldi</option>
</select>
<script>
let downloadPath = localStorage.getItem("downloadPath")
@ -96,10 +110,19 @@
}
function changeLanguage() {
const language = getId("select").value
localStorage.setItem("language", language)
localStorage.setItem("language", language)
}
let browser = localStorage.getItem("browser")
if (browser) {
getId("browser").value = browser
}
getId("browser").addEventListener("change", ()=>{
browser = getId("browser").value
localStorage.setItem("browser", browser)
})
require("../src/translate_preferences")
</script>
</body>

2
package.json
Unescape Escape View File

@ -5,7 +5,7 @@
"yt-dlp-wrap-extended": "^2.3.12"
},
"name": "ytdownloader",
"version": "3.5.3",
"version": "3.6.0",
"main": "main.js",
"scripts": {
"start": "electron .",

91
src/playlist.js
Unescape Escape View File

@ -7,6 +7,8 @@ const ytDlp = localStorage.getItem("ytdlp");
const ytdlp = new YTDlpWrap(ytDlp);
const downloadDir = localStorage.getItem("downloadPath");
const i18n = new (require("../translations/i18n"))();
let cookieArg = "";
let browser = "";
function getId(id) {
return document.getElementById(id);
@ -17,7 +19,6 @@ function pasteLink() {
getId("link").textContent = " " + url;
getId("options").style.display = "block";
getId("incorrectMsg").textContent = "";
}
getId("pasteLink").addEventListener("click", () => {
@ -35,20 +36,30 @@ const playlistTxt = "Downloading playlist: ";
const videoIndex = "Downloading video ";
getId("download").addEventListener("click", () => {
// Whether to use browser cookies or not
if (localStorage.getItem("browser")) {
browser = localStorage.getItem("browser");
}
if (browser) {
cookieArg = "--cookies-from-browser";
} else {
cookieArg = "";
}
let count = 0;
let playlistName;
const date = new Date();
const today = date.getFullYear()+'-'+(date.getMonth()+1)+'-'+date.getDate();
const today =
date.getFullYear() + "-" + (date.getMonth() + 1) + "-" + date.getDate();
let playlistDirName = "Playlist_" + today;
// Opening folder
let folderLocation = path.join(downloadDir, playlistDirName)
if (platform() == "win32"){
let folderLocation = path.join(downloadDir, playlistDirName);
if (platform() == "win32") {
folderLocation = folderLocation.split(path.sep).join("\\\\");
}
getId("options").style.display = "none";
getId("pasteLink").style.display = "none";
getId("playlistName").textContent = i18n.__("Processing") + "..."
getId("playlistName").textContent = i18n.__("Processing") + "...";
const quality = getId("select").value;
const format = `"mp4[height<=${quality}]+m4a/mp4[height<=${quality}]/bv[height<=${quality}]+ba/best[height<=${quality}]/best"`;
const controller = new AbortController();
@ -64,6 +75,8 @@ getId("download").addEventListener("click", () => {
playlistDirName,
"%(playlist_index)s.%(title)s.%(ext)s"
)}"`,
cookieArg,
browser,
`"${url}"`,
],
@ -75,8 +88,9 @@ getId("download").addEventListener("click", () => {
console.log(eventData);
if (eventData.includes(playlistTxt)) {
playlistName = eventData.split(":")[1].slice(1)
getId("playlistName").textContent = i18n.__("Downloading playlist:") + " "+ playlistName;
playlistName = eventData.split(":")[1].slice(1);
getId("playlistName").textContent =
i18n.__("Downloading playlist:") + " " + playlistName;
console.log(playlistName);
}
@ -85,12 +99,16 @@ getId("download").addEventListener("click", () => {
const itemTitle = i18n.__("Video") + " " + eventData.split(" ")[3];
if (count > 1) {
getId(`p${count - 1}`).textContent = i18n.__("File saved. Click to Open")
getId(`p${count - 1}`).textContent = i18n.__(
"File saved. Click to Open"
);
}
const item = `<div class="playlistItem">
<p class="itemTitle">${itemTitle}</p>
<p class="itemProgress" onclick="openFolder('${folderLocation}')" id="p${count}">${i18n.__("Downloading...")}</p>
<p class="itemProgress" onclick="openFolder('${folderLocation}')" id="p${count}">${i18n.__(
"Downloading..."
)}</p>
</div>`;
getId("list").innerHTML += item;
}
@ -98,40 +116,41 @@ getId("download").addEventListener("click", () => {
downloadProcess.on("progress", (progress) => {
if (getId(`p${count}`)) {
getId(`p${count}`).textContent = `${i18n.__("Progress")} ${progress.percent}% | ${i18n.__("Speed")} ${progress.currentSpeed || 0}`
getId(`p${count}`).textContent = `${i18n.__("Progress")} ${
progress.percent
}% | ${i18n.__("Speed")} ${progress.currentSpeed || 0}`;
}
});
downloadProcess.on("error", (error) => {
getId("pasteLink").style.display = "inline-block"
getId("pasteLink").style.display = "inline-block";
getId("options").style.display = "block";
getId("playlistName").textContent = ""
getId("incorrectMsg").textContent = i18n.__("Some error has occured. Check your network and use correct URL");
getId("incorrectMsg").title = error
getId("playlistName").textContent = "";
getId("incorrectMsg").textContent = i18n.__(
"Some error has occured. Check your network and use correct URL"
);
getId("incorrectMsg").title = error;
});
downloadProcess.on("close", ()=>{
getId(`p${count}`).textContent = i18n.__("File saved. Click to Open")
downloadProcess.on("close", () => {
getId(`p${count}`).textContent = i18n.__("File saved. Click to Open");
getId("pasteLink").style.display = "inline-block";
const notify = new Notification("ytDownloader", {
body: i18n.__("Playlist downloaded"),
icon: "../assets/images/icon.png",
})
notify.onclick = () =>{
openFolder(folderLocation)
}
});
})
notify.onclick = () => {
openFolder(folderLocation);
};
});
});
function openFolder(location){
shell.openPath(location)
function openFolder(location) {
shell.openPath(location);
}
function closeMenu() {
getId("menuIcon").style.transform = "rotate(0deg)";
menuIsOpen = false;
@ -157,16 +176,18 @@ getId("aboutWin").addEventListener("click", () => {
closeMenu();
ipcRenderer.send("load-page", __dirname + "/about.html");
});
getId("homeWin").addEventListener("click", ()=>{
getId("homeWin").addEventListener("click", () => {
closeMenu();
ipcRenderer.send("load-win", __dirname + "/index.html");
})
});
// Translations
getId("pasteLink").textContent = i18n.__("Click to paste playlist link from clipboard [Ctrl + V]")
getId("preferenceWin").textContent = i18n.__("Preferences")
getId("aboutWin").textContent = i18n.__("About")
getId("homeWin").textContent = i18n.__("Homepage")
getId("linkTitle").textContent = i18n.__("Link:")
getId("videoFormat").textContent = i18n.__("Select Format ")
getId("download").textContent = i18n.__("Download")
getId("pasteLink").textContent = i18n.__(
"Click to paste playlist link from clipboard [Ctrl + V]"
);
getId("preferenceWin").textContent = i18n.__("Preferences");
getId("aboutWin").textContent = i18n.__("About");
getId("homeWin").textContent = i18n.__("Homepage");
getId("linkTitle").textContent = i18n.__("Link:");
getId("videoFormat").textContent = i18n.__("Select Format ");
getId("download").textContent = i18n.__("Download");

21
src/renderer.js
Unescape Escape View File

@ -31,6 +31,8 @@ let subs = "";
let subLangs;
// let autoSubs = ""
let rangeOption = "--download-sections";
let cookieArg = ""
let browser = ""
function getId(id) {
return document.getElementById(id);
@ -199,10 +201,21 @@ async function getInfo(url) {
getId("startTime").value = "";
getId("endTime").value = "";
// Whether to use browser cookies or not
if (localStorage.getItem("browser")){
browser = localStorage.getItem("browser")
}
if(browser){
cookieArg = "--cookies-from-browser"
}
else{
cookieArg = ""
}
let validInfo = true;
let info = "";
const infoProcess = cp.spawn(ytDlp, ["-j", "--no-playlist", `"${url}"`], {
const infoProcess = cp.spawn(ytDlp, ["-j", "--no-playlist", cookieArg, browser, `"${url}"`], {
shell: true,
});
@ -600,6 +613,8 @@ function download(type) {
subs,
subLangs,
"--no-playlist",
cookieArg,
browser,
`"${url}"`,
],
{ shell: true, detached: false },
@ -623,6 +638,8 @@ function download(type) {
"--ffmpeg-location",
ffmpeg,
"--no-playlist",
cookieArg,
browser,
`"${url}"`,
],
{ shell: true, detached: false },
@ -644,6 +661,8 @@ function download(type) {
subs,
subLangs,
"--no-playlist",
cookieArg,
browser,
`"${url}"`,
],
{ shell: true, detached: false },

4
src/translate_preferences.js
Unescape Escape View File

@ -15,4 +15,6 @@ getId("selectLocation").textContent = i18n.__("Select Download Location")
getId("transparentText").textContent = i18n.__("Enable transparent dark mode(only Linux, needs relaunch)")
getId("preferences").textContent = i18n.__("Preferences")
getId("selectLn").textContent = i18n.__("Select Language (Requires relaunch)")
// getId("restart").textContent = i18n.__("Restart app")
// getId("restart").textContent = i18n.__("Restart app")
getId("browserInfo").title = i18n.__("This option lets you download restricted content. You will get errors if cookies are not there")
getId("browserTxt").textContent = i18n.__("Select browser to use cookies from")

4
translations/en.json
Unescape Escape View File

@ -53,5 +53,7 @@
"Link:": "Link:",
"Downloading playlist:": "Downloading playlist:",
"Download playlist":"Download playlist",
"Playlist downloaded":"Playlist downloaded"
"Playlist downloaded":"Playlist downloaded",
"This option lets you download restricted content. You will get errors if cookies are not there":"This option lets you download restricted content. You will get errors if cookies are not there",
"Select browser to use cookies from":"Select browser to use cookies from"
}

Write Preview
Loading…
Cancel
Save