diff --git a/app/index.html b/app/index.html index 084dbf6..1e8e657 100644 --- a/app/index.html +++ b/app/index.html @@ -118,7 +118,7 @@ Browse - + @@ -201,7 +201,7 @@
-
+
@@ -222,7 +222,7 @@
-
+

Player Settings diff --git a/app/js/animeHandler.js b/app/js/animeHandler.js index 3a6a26d..eca2db7 100644 --- a/app/js/animeHandler.js +++ b/app/js/animeHandler.js @@ -19,12 +19,12 @@ var options = { }) } const searchRx = /(magnet:)?([A-F\d]{8,40})?(.*\.torrent)?/i; -function search() { - let regexParse = searchRx.exec(document.querySelector("#search").value) +function searchBox() { + let regexParse = searchRx.exec(search.value) if (regexParse[1] || regexParse[2] || regexParse[3]) { - addTorrent(document.querySelector("#search").value) + addTorrent(search.value) } else { - searchAnime(document.querySelector("#search").value) + searchAnime(search.value) } } async function alRequest(a, b) { @@ -220,10 +220,10 @@ function cardCreator(media, regexParse) {
${media.title.english || media.title.romaji}${regexParse ? " - " + regexParse[3] : ""}

- ${(!!media.format ? (media.format == "TV" ? "" + media.format + " Show" : "" + media.format) : "") + ""} - ${!!media.episodes ? "" + media.episodes + " Episodes" : (!!media.duration ? "" + media.duration + " Minutes" : "")} - ${!!media.status ? "" + media.status.toLowerCase() + "" : ""} - ${"" + (!!media.season ? media.season.toLowerCase() + " " : "") + (media.seasonYear || "") + ""} + ${(media.format ? (media.format == "TV" ? "" + media.format + " Show" : "" + media.format) : "") + ""} + ${media.episodes ? "" + media.episodes + " Episodes" : media.duration ? "" + media.duration + " Minutes" : ""} + ${media.status ? "" + media.status.toLowerCase().replace(/_/g, " ") + "" : ""} + ${media.season || media.seasonYear ? "" + (!!media.season ? media.season.toLowerCase() + " " : "") + (media.seasonYear || "") + "" : ""}

@@ -254,8 +254,6 @@ let skeletonCard = cardCreator() const DOMPARSER = new DOMParser().parseFromString.bind(new DOMParser()) -const searchTitle = document.querySelector("#title") -const searchEpisode = document.querySelector("#ep") var selected; @@ -362,7 +360,7 @@ async function hsRss(url) { } }) } -document.querySelector("#refRel").onclick = function () { +refRel.onclick = function () { hsRss(`https://miru.kirdow.com/request/?url=http://www.horriblesubs.info/rss.php?res=${settings.torrent1}`) } setInterval(() => { diff --git a/app/js/playerHandler.js b/app/js/playerHandler.js index bfbebb5..0b06b8d 100644 --- a/app/js/playerHandler.js +++ b/app/js/playerHandler.js @@ -360,8 +360,8 @@ function btncap() { frag.appendChild(template) } - document.querySelector("#subMenu").textContent = ''; - document.querySelector("#subMenu").appendChild(frag) + subMenu.textContent = ''; + subMenu.appendChild(frag) } function selectLang(lang) { for (let i = 0; i < video.textTracks.length; i++) { diff --git a/app/js/settingsHandler.js b/app/js/settingsHandler.js index 7aeecea..e338f6e 100644 --- a/app/js/settingsHandler.js +++ b/app/js/settingsHandler.js @@ -1,15 +1,15 @@ const settingsElements = { - player1: document.querySelector("#player1"), - player2: document.querySelector("#player2"), - player3: document.querySelector("#player3"), - player4: document.querySelector("#player4"), - player5: document.querySelector("#player5"), - player6: document.querySelector("#player6"), - player7: document.querySelector("#player7"), - subtitle1: document.querySelector("#subtitle1"), - torrent1: document.querySelector("#torrent1"), - torrent2: document.querySelector("#torrent2"), - torrent3: document.querySelector("#torrent3") + player1: player1, + player2: player2, + player3: player3, + player4: player4, + player5: player5, + player6: player6, + player7: player7, + subtitle1: subtitle1, + torrent1: torrent1, + torrent2: torrent2, + torrent3: torrent3 } let settings function restoreDefaults() { @@ -60,5 +60,5 @@ if (!localStorage.getItem("settings")) { } settings = JSON.parse(localStorage.getItem("settings")) renderSettings() -document.querySelector("#setRes").addEventListener("click", restoreDefaults) -document.querySelector("#settings").addEventListener("click", applySettings) \ No newline at end of file +setRes.addEventListener("click", restoreDefaults) +settingsTab.addEventListener("click", applySettings) \ No newline at end of file diff --git a/app/js/torrentHandler.js b/app/js/torrentHandler.js index 420fe42..a472a75 100644 --- a/app/js/torrentHandler.js +++ b/app/js/torrentHandler.js @@ -101,7 +101,7 @@ function serveFile(file, req) { const res = { status: 200, headers: { - 'Content-Type': file._getMimeType(), + 'Content-Type': file._getMimeType() ? file._getMimeType() : 'video/webm', // Support range-requests 'Accept-Ranges': 'bytes' } diff --git a/request/index.php b/request/index.php index 3b7a439..21ad8a2 100644 --- a/request/index.php +++ b/request/index.php @@ -4,46 +4,26 @@ $query = explode("?", $url) [1]; if (strpos($query, '/') === false) { $cache_file = './cache/' . $query; - // echo $url.'\n'; - // echo $cache_file.'\n'; if (substr($url, 0, 25) === "https://nyaa.si/?page=rss") { - if (file_exists($cache_file) && (filemtime($cache_file) > (time() - 60 * 1))) - { - // Cache file is less than five minutes old. - // Don't bother refreshing, just use the file as-is. + if (file_exists($cache_file) && (filemtime($cache_file) > (time() - 60 * 1))) { $file = file_get_contents($cache_file); header('Content-Type: text/xml'); - //echo 'case fucking 1'; echo $file; - } - else - { - // Our cache is out-of-date, so load the data from our remote server, - // and also save it over our cache for next time. + } else { $file = file_get_contents(str_replace(" ", "+", $url)); file_put_contents($cache_file, $file, LOCK_EX); header('Content-Type: text/xml'); - // echo 'case fucking 2'; echo $file; } - }elseif(substr($url, 0, 41) === "http://www.horriblesubs.info/rss.php?res="){ - if (file_exists($cache_file) && (filemtime($cache_file) > (time() - 60 * 0.5))) - { - // Cache file is less than five minutes old. - // Don't bother refreshing, just use the file as-is. + } elseif (substr($url, 0, 41) === "http://www.horriblesubs.info/rss.php?res="){ + if (file_exists($cache_file) && (filemtime($cache_file) > (time() - 60 * 0.5))) { $file = file_get_contents($cache_file); header('Content-Type: text/xml'); - //echo 'case fucking 1'; echo $file; - } - else - { - // Our cache is out-of-date, so load the data from our remote server, - // and also save it over our cache for next time. + } else { $file = file_get_contents(str_replace(" ", "+", $url)); file_put_contents($cache_file, $file, LOCK_EX); header('Content-Type: text/xml'); - // echo 'case fucking 2'; echo $file; } }