Creepso/miru
1
0
Fork 0
mirror of https://github.com/ThaUnknown/miru.git synced 2026-04-11 23:20:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

regex episode parse improvements, BLIND patches [might break shit], undefined fixes

Browse source
This commit is contained in:
ThaUnknown 2020-10-06 15:40:12 +02:00
parent 669ccb3a84
commit 1ed728af1c
2 changed files with 15 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
app/js/animeHandler.js
View file

@ -21,7 +21,7 @@ var options = {
const searchRx = /(magnet:)?([A-F\d]{8,40})?(.*\.torrent)?/i;
function searchBox() {
let regexParse = searchRx.exec(search.value)
if (regexParse[1] || regexParse[2] || regexParse[3]) {
if (regexParse[1] || regexParse[2] || regexParse[4]) {
addTorrent(search.value)
} else {
searchAnime(search.value)
@ -218,7 +218,7 @@ function cardCreator(media, regexParse) {
</div>
<div class="col-8 h-full card-grid">
<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>
<h5 class="m-0 text-capitalize font-weight-bold">${media.title.english || media.title.romaji}${regexParse ? " - " + regexParse[4] : ""}</h5>
<p class="text-muted m-0 text-capitalize details">
${(media.format ? (media.format == "TV" ? "<span>" + media.format + " Show" : "<span>" + media.format.toLowerCase().replace(/_/g, " ")) : "") + "</span>"}
${media.episodes ? "<span>" + media.episodes + " Episodes</span>" : media.duration ? "<span>" + media.duration + " Minutes</span>" : ""}
@ -242,7 +242,7 @@ function cardCreator(media, regexParse) {
</div>
<div class="col-8 h-full card-grid skeloader">
<div class="px-15 py-10">
<h5 class="m-0 text-capitalize font-weight-bold">${regexParse ? regexParse[2] + " - " + regexParse[3] : ""}</h5>
<h5 class="m-0 text-capitalize font-weight-bold">${regexParse ? regexParse[2] + " - " + regexParse[4] : ""}</h5>
</div>
</div>
</div>
@ -321,7 +321,8 @@ async function nyaaRss(url) {
}
const regex = /((?:\[[^\]]*\])*)?\s*((?:[^\d\[\.](?!S\d))*)?\s*((?:S\d+[^\w\[]*E?)?[\d\-]*)\s*(.*)?/i;
const regex = /((?:\[[^\]]*\])*)?\s*((?:[^\d\[\.](?!S\d))*)?\s*((?:S\d+[^\w\[]*E?)?[\d\-]*)\s*(.*)?/i,
eregex = /(\[.*\]\ ?)?(.+?(?=\ \–\ \d))?(\ \–\ )?(\d+)?/i
let store = {};
async function hsRss(url) {
@ -337,12 +338,7 @@ async function hsRss(url) {
let items = doc.querySelectorAll("item")
for (let item of items) {
let i = item.querySelector.bind(item),
regexParse = regex.exec(i("title").textContent)
if (regexParse[2]) {
if (regexParse[2].endsWith(" - ")) {
regexParse[2] = regexParse[2].slice(0, -3)
}
}
regexParse = eregex.exec(i("title").textContent)
if (!store[regexParse[2]] && !alResponse.data.Page.media.some(media => (Object.values(media.title).concat(media.synonyms).filter(name => name != null).includes(regexParse[2]) && ((store[regexParse[2]] = media) && true)))) {
//shit not found, lookup
let res = await alRequest(regexParse[2], 1)
@ -351,7 +347,7 @@ async function hsRss(url) {
let media = store[regexParse[2]],
template = cardCreator(media, regexParse)
template.onclick = function () {
selected = [store[regexParse[2]], regexParse[3]]
selected = [regexParse[2], regexParse[4]]
addTorrent(i('link').textContent)
}
frag.appendChild(template)

16
app/js/playerHandler.js
View file

@ -120,17 +120,17 @@ function finishThumbnails(file) {
file.getBlobURL((err, url) => {
thumbVid.src = url
})
thumbVid.addEventListener('loadeddata', function () {
thumbVid.addEventListener('loadeddata', () => {
loadTime();
}, false)
})
thumbVid.addEventListener('seeked', function () {
thumbVid.addEventListener('seeked', () => {
createThumbnail(thumbVid);
loadTime();
}, false)
})
function loadTime() {
if (thumbVid.ended == false) {
if (thumbVid.currentTime != thumbVid.duration) {
thumbVid.currentTime = thumbVid.currentTime + 5;
} else {
thumbVid.remove()
@ -185,7 +185,7 @@ function resetTimer() {
let islooped;
function toTS(sec) {
if (Number.isNaN(sec)) {
if (Number.isNaN(sec) || sec < 0) {
return "00:00";
}
@ -388,12 +388,12 @@ function selPlaying(sel) {
nowPlaying = sel
if ('mediaSession' in navigator) {
navigator.mediaSession.metadata = new MediaMetadata({
title: nowPlaying[0].title.english || nowPlaying[0].title.romaji,
title: store[nowPlaying[0]] ? store[nowPlaying[0]].title.english || store[nowPlaying[0]].title.romaji : nowPlaying[0],
artist: "Episode " + nowPlaying[1],
album: "Miru",
artwork: [
{
src: nowPlaying[0].coverImage.medium,
src: store[nowPlaying[0]] ? store[nowPlaying[0]].coverImage.medium : "",
sizes: '128x128',
type: 'image/png'
}