cleanup, fixes

This commit is contained in:
ThaUnknown 2020-09-25 22:31:41 +02:00
parent a5be27b45a
commit 85cd8f5539
6 changed files with 33 additions and 55 deletions

View file

@ -118,7 +118,7 @@
</span>
Browse
</a>
<a href="#settings" class="sidebar-link sidebar-link-with-icon mt-auto">
<a href="#settingsTab" class="sidebar-link sidebar-link-with-icon mt-auto">
<span class="sidebar-icon bg-transparent justify-content-start mr-0">
<i class="material-icons" aria-hidden="true">settings</i>
</span>
@ -201,7 +201,7 @@
<section id="browse" class="flex-column">
<div class="text-center pt-20">
<div class="container">
<form class="input-group mb-15" action="javascript:search()">
<form class="input-group mb-15" action="javascript:searchBox()">
<div class="input-group-prepend">
<button class="btn btn-primary material-icons px-10" type="submit">search</button>
</div>
@ -222,7 +222,7 @@
<div class="gallery releases h-full overflow-y-scroll">
</div>
</section>
<section id="settings" class="overflow-y-scroll">
<section id="settingsTab" class="overflow-y-scroll">
<div class="content">
<h1 class="content-title font-size-22">
Player Settings

View file

@ -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) {
<div class="px-15 py-10">
<h5 class="m-0 text-capitalize font-weight-bold">${media.title.english || media.title.romaji}${regexParse ? " - " + regexParse[3] : ""}</h5>
<p class="text-muted m-0 text-capitalize details">
${(!!media.format ? (media.format == "TV" ? "<span>" + media.format + " Show" : "<span>" + media.format) : "") + "</span>"}
${!!media.episodes ? "<span>" + media.episodes + " Episodes</span>" : (!!media.duration ? "<span>" + media.duration + " Minutes</span>" : "")}
${!!media.status ? "<span>" + media.status.toLowerCase() + "</span>" : ""}
${"<span>" + (!!media.season ? media.season.toLowerCase() + " " : "") + (media.seasonYear || "") + "</span>"}
${(media.format ? (media.format == "TV" ? "<span>" + media.format + " Show" : "<span>" + media.format) : "") + "</span>"}
${media.episodes ? "<span>" + media.episodes + " Episodes</span>" : media.duration ? "<span>" + media.duration + " Minutes</span>" : ""}
${media.status ? "<span>" + media.status.toLowerCase().replace(/_/g, " ") + "</span>" : ""}
${media.season || media.seasonYear ? "<span>" + (!!media.season ? media.season.toLowerCase() + " " : "") + (media.seasonYear || "") + "</span>" : ""}
</p>
</div>
<div class="overflow-y-scroll px-15 py-10 bg-very-dark card-desc">
@ -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(() => {

View file

@ -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++) {

View file

@ -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)
setRes.addEventListener("click", restoreDefaults)
settingsTab.addEventListener("click", applySettings)

View file

@ -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'
}

View file

@ -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;
}
}