Improved video format details

pull/164/head
Andrew 3 years ago
parent 51f0b88f74
commit 68f88e9bf4

@ -1,3 +1,9 @@
@font-face {
font-family: 'JetBrains';
src: url('../fonts/JetBrainsMono-Regular.ttf') format('truetype');
}
:root[theme="light"] { :root[theme="light"] {
--background: #fff; --background: #fff;
--text: rgb(45, 45, 45); --text: rgb(45, 45, 45);
@ -48,12 +54,12 @@
--blueBtn-bottom: rgb(44, 78, 180); --blueBtn-bottom: rgb(44, 78, 180);
} }
:root[theme="onedark"] { :root[theme="onedark"] {
--background: #282C34 ; --background: #282c34;
--text: #d2d6df; --text: #d2d6df;
--box-main: #4D515D; --box-main: #4d515d;
--box-toggle: #2F333D; --box-toggle: #2f333d;
--box-toggleOn: #13a3b7; --box-toggleOn: #13a3b7;
--item-bg: #4D515D; --item-bg: #4d515d;
--select: #57b6c2; --select: #57b6c2;
--greenBtn: #85cf50; --greenBtn: #85cf50;
--greenBtn-bottom: #406923; --greenBtn-bottom: #406923;
@ -63,13 +69,13 @@
--blueBtn-bottom: rgb(44, 78, 180); --blueBtn-bottom: rgb(44, 78, 180);
} }
:root[theme="matrix"] { :root[theme="matrix"] {
--background: #0D0208; --background: #0d0208;
--text: #00FF41; --text: #00ff41;
--box-main: #0c2216; --box-main: #0c2216;
--box-toggle: #214338; --box-toggle: #214338;
--box-toggleOn: #24782e; --box-toggleOn: #24782e;
--item-bg: #214338; --item-bg: #214338;
--select: #00FF41; --select: #00ff41;
--greenBtn: #19b42b; --greenBtn: #19b42b;
--greenBtn-bottom: #10701c; --greenBtn-bottom: #10701c;
--redBtn: #19b42b; --redBtn: #19b42b;
@ -79,23 +85,23 @@
} }
:root[theme="github"] { :root[theme="github"] {
--background: #F6F8FA; --background: #f6f8fa;
--text: #292D31; --text: #292d31;
--box-main: #FFFFFF; --box-main: #ffffff;
--box-toggle: #F3f3f3; --box-toggle: #f3f3f3;
--box-toggleOn: #cce5ff; --box-toggleOn: #cce5ff;
--item-bg: #3A66D150; --item-bg: #3a66d150;
--select: #cce5ff; --select: #cce5ff;
--greenBtn: #0a9431; --greenBtn: #0a9431;
--greenBtn-bottom: #0c6826; --greenBtn-bottom: #0c6826;
--redBtn: #d73a49; --redBtn: #d73a49;
--redBtn-bottom: #9b2733; --redBtn-bottom: #9b2733;
--blueBtn: #005CC5; --blueBtn: #005cc5;
--blueBtn-bottom: #00428e; --blueBtn-bottom: #00428e;
} }
:root[theme="latte"] { :root[theme="latte"] {
--background: #dce0e8 ; --background: #dce0e8;
--text: #4c4f69; --text: #4c4f69;
--box-main: #eff1f5; --box-main: #eff1f5;
--box-toggle: #e6e9ef; --box-toggle: #e6e9ef;
@ -111,10 +117,10 @@
} }
:root[theme="solarized-dark"] { :root[theme="solarized-dark"] {
--background: #002B36; --background: #002b36;
--text: #a4b1b3; --text: #a4b1b3;
--box-main: #003745; --box-main: #003745;
--box-toggle: #2E4C52; --box-toggle: #2e4c52;
--box-toggleOn: #005a6f; --box-toggleOn: #005a6f;
--item-bg: #003745; --item-bg: #003745;
--select: #2aa198; --select: #2aa198;
@ -123,7 +129,7 @@
--redBtn: #dc322f; --redBtn: #dc322f;
--redBtn-bottom: #af2523; --redBtn-bottom: #af2523;
--blueBtn: #268bd2; --blueBtn: #268bd2;
--blueBtn-bottom:#2074b1; --blueBtn-bottom: #2074b1;
} }
body { body {
@ -206,11 +212,11 @@ body {
backdrop-filter: blur(16px) saturate(160%); backdrop-filter: blur(16px) saturate(160%);
-webkit-backdrop-filter: blur(16px) saturate(160%); -webkit-backdrop-filter: blur(16px) saturate(160%);
background-color: rgb(17, 25, 40); background-color: rgb(17, 25, 40);
color:white; color: white;
padding:10px; padding: 10px;
border-radius: 5px; border-radius: 5px;
outline: none; outline: none;
border:none; border: none;
font-size: large; font-size: large;
} }
.menuItem { .menuItem {
@ -352,7 +358,7 @@ body {
#options { #options {
display: none; display: none;
position: absolute; position: absolute;
overflow:hidden; overflow: hidden;
z-index: 1; z-index: 1;
left: 0; left: 0;
right: 0; right: 0;
@ -396,6 +402,11 @@ body {
outline: none; outline: none;
} }
#videoFormatSelect {
font-family: JetBrains, monospace;
font-size:medium;
}
label { label {
position: relative; position: relative;
top: 3px; top: 3px;

@ -47,6 +47,7 @@ let rangeOption = "--download-sections";
let cookieArg = ""; let cookieArg = "";
let browser = ""; let browser = "";
let maxActiveDownloads = 5; let maxActiveDownloads = 5;
let showVcodec = false
function checkMaxDownloads() { function checkMaxDownloads() {
if (localStorage.getItem("maxActiveDownloads")) { if (localStorage.getItem("maxActiveDownloads")) {
const number = Number(localStorage.getItem("maxActiveDownloads")); const number = Number(localStorage.getItem("maxActiveDownloads"));
@ -220,7 +221,7 @@ function defaultVideoToggle() {
function pasteUrl() { function pasteUrl() {
defaultVideoToggle(); defaultVideoToggle();
hideHidden() hideHidden();
getId("loadingWrapper").style.display = "flex"; getId("loadingWrapper").style.display = "flex";
getId("incorrectMsg").textContent = ""; getId("incorrectMsg").textContent = "";
const url = clipboard.readText(); const url = clipboard.readText();
@ -229,14 +230,14 @@ function pasteUrl() {
function pasteFromTray(url) { function pasteFromTray(url) {
defaultVideoToggle(); defaultVideoToggle();
hideHidden() hideHidden();
getId("loadingWrapper").style.display = "flex"; getId("loadingWrapper").style.display = "flex";
getId("incorrectMsg").textContent = ""; getId("incorrectMsg").textContent = "";
getInfo(url); getInfo(url);
} }
getId("closeHidden").addEventListener("click", () => { getId("closeHidden").addEventListener("click", () => {
hideHidden() hideHidden();
getId("loadingWrapper").style.display = "none"; getId("loadingWrapper").style.display = "none";
}); });
@ -344,7 +345,7 @@ async function getInfo(url) {
getId("loadingWrapper").style.display = "none"; getId("loadingWrapper").style.display = "none";
getId("hidden").style.display = "inline-block"; getId("hidden").style.display = "inline-block";
getId("hidden").classList.add("scaleUp") getId("hidden").classList.add("scaleUp");
getId("title").innerHTML = getId("title").innerHTML =
`<b>${i18n.__("Title ")}</b>: ` + `<b>${i18n.__("Title ")}</b>: ` +
@ -416,24 +417,33 @@ async function getInfo(url) {
"|" + "|" +
(format.height || "NO"); (format.height || "NO");
// Video codec
const vcodec = format.vcodec && showVcodec? format.vcodec.split(".")[0] + "| " : ""
const spaceAfterVcodec = showVcodec ? "&#160".repeat(5 - vcodec.length) : ""
// Quality
const quality = format.height ? format.height + "p" + (format.fps == 60 ? "60" : "")
: "" ||format.resolution || i18n.__(format.format_note) || format.format_id ||"Unknown quality";
const spaceAfterQuality = "&#160".repeat(8 - quality.length)
// Extension
const extension = format.ext
const spaceAfterExtension = "&#160".repeat(5 - extension.length)
// Format and Quality Options
const element = const element =
"<option value='" + "<option value='" +
format_id + format_id +
"'" + "'" +
selectedText + selectedText +
">" + ">" +
(format.height quality +
? format.height + spaceAfterQuality +
"p" + "| " +
(format.fps == 60 ? "60" : "") extension + spaceAfterExtension +
: "" || "| " +
format.resolution || vcodec +
i18n.__(format.format_note) || spaceAfterVcodec+
format.format_id ||
"Unknown quality") +
" | " +
format.ext +
" | " +
size + size +
"</option>"; "</option>";
getId("videoFormatSelect").innerHTML += element; getId("videoFormatSelect").innerHTML += element;
@ -515,7 +525,7 @@ async function getInfo(url) {
// Video download event // Video download event
getId("videoDownload").addEventListener("click", (event) => { getId("videoDownload").addEventListener("click", (event) => {
checkMaxDownloads(); checkMaxDownloads();
hideHidden() hideHidden();
console.log(`Current:${currentDownloads} Max:${maxActiveDownloads}`); console.log(`Current:${currentDownloads} Max:${maxActiveDownloads}`);
if (currentDownloads < maxActiveDownloads) { if (currentDownloads < maxActiveDownloads) {
@ -572,7 +582,7 @@ getId("videoDownload").addEventListener("click", (event) => {
// Audio download event // Audio download event
getId("audioDownload").addEventListener("click", (event) => { getId("audioDownload").addEventListener("click", (event) => {
checkMaxDownloads(); checkMaxDownloads();
hideHidden() hideHidden();
console.log(`Current:${currentDownloads} Max:${maxActiveDownloads}`); console.log(`Current:${currentDownloads} Max:${maxActiveDownloads}`);
if (currentDownloads < maxActiveDownloads) { if (currentDownloads < maxActiveDownloads) {
@ -628,7 +638,7 @@ getId("audioDownload").addEventListener("click", (event) => {
getId("extractBtn").addEventListener("click", () => { getId("extractBtn").addEventListener("click", () => {
checkMaxDownloads(); checkMaxDownloads();
hideHidden() hideHidden();
console.log(`Current:${currentDownloads} Max:${maxActiveDownloads}`); console.log(`Current:${currentDownloads} Max:${maxActiveDownloads}`);
@ -1094,8 +1104,8 @@ function closeMenu() {
}, 50); }, 50);
} }
function hideHidden(){ function hideHidden() {
getId("hidden").classList.remove("scaleUp") getId("hidden").classList.remove("scaleUp");
getId("hidden").classList.add("scale"); getId("hidden").classList.add("scale");
setTimeout(() => { setTimeout(() => {
getId("hidden").style.display = "none"; getId("hidden").style.display = "none";

Loading…
Cancel
Save