From 7eca8c839e0113ae807f9a14d059e87ecd30ec77 Mon Sep 17 00:00:00 2001 From: ThaUnknown Date: Mon, 24 Aug 2020 23:18:44 +0200 Subject: [PATCH] boredoom cleanup --- app/app.html | 2 +- app/js.js | 17 +++++----- app/playerHandler.js | 75 ++++++++++++++++++-------------------------- 3 files changed, 40 insertions(+), 54 deletions(-) diff --git a/app/app.html b/app/app.html index 738a83d..b92e3da 100644 --- a/app/app.html +++ b/app/app.html @@ -20,7 +20,7 @@
- + diff --git a/app/js.js b/app/js.js index 3253c35..5dc9d2d 100644 --- a/app/js.js +++ b/app/js.js @@ -174,8 +174,8 @@ function hideAnime() { document.querySelector(".view").setAttribute("hidden", "") } -function viewAnime(a) { - let media = request.data.Page.media[a] +function viewAnime(index) { + let media = request.data.Page.media[index] let details = ["title.english", "title.romaji", "status", "season", "seasonYear", "episodes", "duration", "format", "averageScore"] document.querySelector(".view").removeAttribute("hidden") document.querySelector(".view .banner img").src = media.bannerImage @@ -183,18 +183,19 @@ function viewAnime(a) { document.querySelector(".view .contain-img").src = media.coverImage.large document.querySelector(".view .title").textContent = !!media.title.english ? media.title.english : media.title.romaji document.querySelector(".view .desc").innerHTML = !!media.description ? media.description : "" - tsearch(a, 1) + tsearch(index, 1) } const DOMPARSER = new DOMParser().parseFromString.bind(new DOMParser()) -function tsearch(a, b) { - let name = request.data.Page.media[a].title.romaji, +function tsearch(index, episode) { + let name = request.data.Page.media[index].title.romaji, table = document.querySelector("tbody.tsearch") - if (b < 10) { - b = `0${b}` + if (episode < 10) { + episode = `0${episode}` } - let url = new URL(`https://nyaa.si/?page=rss&c=1_2&f=2&s=seeders&o=desc&q=${name}" ${b} "`) + let url = new URL(`https://nyaa.si/?page=rss&c=1_2&f=2&s=seeders&o=desc&q=${name}" ${episode} "`) + console.log(name) let frag = document.createDocumentFragment(), hasBegun = true fetch(url).then((res) => { diff --git a/app/playerHandler.js b/app/playerHandler.js index d7302ec..2a56ab4 100644 --- a/app/playerHandler.js +++ b/app/playerHandler.js @@ -1,5 +1,3 @@ -//create event listeners after page load - const controls = document.getElementsByClassName('ctrl'), video = document.querySelector('#video'), player = document.querySelector('#player'), @@ -8,7 +6,12 @@ const controls = document.getElementsByClassName('ctrl'), peers = document.querySelector('#peers'), downSpeed = document.querySelector('#down'), upSpeed = document.querySelector('#up'), - playPause = document.querySelector('#ptoggle') + playPause = document.querySelector('#ptoggle'), + btnpp = document.querySelector('#bpp'), + btnm = document.querySelector("#bmute"), + btnfull = document.querySelector('#bfull'), + elapsed = document.querySelector("#elapsed"), + remaining = document.querySelector("#remaining") volume.addEventListener("input", function () { updatevolume() @@ -57,21 +60,25 @@ function setprogress() { updateDisplay(); } +let progresspercent, + bufferpercent, + remainingTime + function updateDisplay() { - let progresspercent = (video.currentTime / duration * 100).toFixed(4), - bufferpercent = (video.buffered.end(video.buffered.length - 1) / duration * 100).toFixed(4), - remaining = duration - video.currentTime + progresspercent = (video.currentTime / duration * 100).toFixed(4) + bufferpercent = (video.buffered.end(video.buffered.length - 1) / duration * 100).toFixed(4) + remainingTime = duration - video.currentTime document.documentElement.style.setProperty("--progress", progresspercent + "%"); document.documentElement.style.setProperty("--buffer", bufferpercent + "%"); - document.querySelector("#elapsed").innerHTML = toTS(video.currentTime); - document.querySelector("#remaining").innerHTML = toTS(remaining); + elapsed.innerHTML = toTS(video.currentTime); + remaining.innerHTML = toTS(remainingTime); progress.value = Math.floor(progresspercent * 10) } function toTS(sec) { - var hours = Math.floor(sec / 3600); - var minutes = Math.floor((sec - (hours * 3600)) / 60); - var seconds = Math.floor(sec - (hours * 3600) - (minutes * 60)); + let hours = Math.floor(sec / 3600), + minutes = Math.floor((sec - (hours * 3600)) / 60), + seconds = Math.floor(sec - (hours * 3600) - (minutes * 60)); if (minutes < 10) { minutes = `0${minutes}`; } @@ -99,15 +106,14 @@ function playcheck() { } //play/pause button -const btnpp = document.querySelector('#bpp') async function playVideo() { try { - await video.play(); - btnpp.innerHTML = "pause"; - } catch(err) { + await video.play(); + btnpp.innerHTML = "pause"; + } catch (err) { btnpp.innerHTML = "play_arrow"; } - } +} function bpp() { if (video.paused) { playVideo(); @@ -136,8 +142,7 @@ function bmute() { } function updatevolume(a) { - let btnm = document.querySelector("#bmute"), - level; + let level; if (a == null) { level = volume.value; } else { @@ -156,10 +161,9 @@ function bpip() { if (!document.pictureInPictureElement) { video.requestPictureInPicture(); - } else { - if (document.pictureInPictureElement) { - document.exitPictureInPicture(); - } + } else if (document.pictureInPictureElement) { + document.exitPictureInPicture(); + } } @@ -172,15 +176,13 @@ function btheatre() { //fullscreen function bfull() { - let btnfull = document.querySelector('#bfull') if (!document.fullscreenElement) { player.requestFullscreen(); btnfull.innerHTML = "fullscreen_exit" - } else { - if (document.exitFullscreen) { - document.exitFullscreen(); - btnfull.innerHTML = "fullscreen" - } + } else if (document.exitFullscreen) { + document.exitFullscreen(); + btnfull.innerHTML = "fullscreen" + } } @@ -189,23 +191,6 @@ function seek(a) { updateDisplay() } -//bar related shit - -function getPositionP(e) { - let element = e.target.getBoundingClientRect(); - let x = (e.offsetX / element.width).toFixed(5); - return { - x - }; -} - -function printPosition(e) { - let positionP = getPositionP(e); - e.onmousemove = function () { - document.querySelector('#vol').innerHTML = positionP.x - } -} - //keybinds document.onkeydown = function (a) {