diff --git a/app/js/animeHandler.js b/app/js/animeHandler.js index 362cc90..ab7feeb 100644 --- a/app/js/animeHandler.js +++ b/app/js/animeHandler.js @@ -537,7 +537,7 @@ async function nyaaRss(media, episode) { ep = (media.status == "FINISHED" && settings.torrent9) ? `"01-${media.episodes}"|"01~${media.episodes}"|"batch"|"Batch"|"complete"|"Complete"|"+${episode}+"|"+${episode}v"` : `"+${episode}+"|"+${episode}v"`, url = new URL(`https://miru.kirdow.com/request/?url=https://nyaa.si/?page=rss$c=1_2$f=${settings.torrent3 == true ? 2 : 0}$s=seeders$o=desc$q=(${[...new Set(Object.values(media.title).concat(media.synonyms).filter(name => name != null))].join(")|(")})${ep}"${settings.torrent1}"`) // console.log(`"${[...new Set(Object.values(media.title).concat(media.synonyms).filter(name => name != null))].join("\"|\"")}"${ep}"${settings.torrent1}"`) - console.log(`https://miru.kirdow.com/request/?url=https://nyaa.si/?page=rss$c=1_2$f=${settings.torrent3 == true ? 2 : 0}$s=seeders$o=desc$q=(${[...new Set(Object.values(media.title).concat(media.synonyms).filter(name => name != null))].join(")|(")})${ep}"${settings.torrent1}"`) + // console.log(`https://miru.kirdow.com/request/?url=https://nyaa.si/?page=rss$c=1_2$f=${settings.torrent3 == true ? 2 : 0}$s=seeders$o=desc$q=(${[...new Set(Object.values(media.title).concat(media.synonyms).filter(name => name != null))].join(")|(")})${ep}"${settings.torrent1}"`) res = await fetch(url) await res.text().then((xmlTxt) => { try { diff --git a/app/js/playerHandler.js b/app/js/playerHandler.js index 04676b1..c7afe27 100644 --- a/app/js/playerHandler.js +++ b/app/js/playerHandler.js @@ -92,7 +92,10 @@ async function buildVideo(file, nowPlaying) { //creates a new video element and if (video.audioTracks && video.audioTracks.length > 1) baudio.removeAttribute("disabled") } - video.addEventListener("ended", autoNext); + video.onended = () => { + updateBar(video.currentTime / video.duration * 100) + if (settings.player6 && !parseInt(playerData.nowPlaying[1]) >= playerData.nowPlaying[0].episodes) btnnext() + } video.addEventListener("waiting", isBuffering); video.addEventListener("timeupdate", updateDisplay); if ('setPositionState' in navigator.mediaSession) @@ -413,10 +416,6 @@ function btnnext() { } }, 200) } -function autoNext() { - updateBar(video.currentTime / video.duration * 100) - if (settings.player6) btnnext() -} // volume shit let oldlevel;