diff --git a/app/js/animeHandler.js b/app/js/animeHandler.js index 52b5b5c..207fbd0 100644 --- a/app/js/animeHandler.js +++ b/app/js/animeHandler.js @@ -400,7 +400,7 @@ function detailsCreator(entry) { }) } } -function cardCreator(media, regexParse) { +function cardCreator(media, name, episode) { let template = document.createElement("div") template.classList.add("card", "m-0", "p-0") if (media) { @@ -412,7 +412,7 @@ function cardCreator(media, regexParse) {
-
${media.title.userPreferred}${regexParse ? " - " + regexParse[4] : ""}
+
${media.title.userPreferred}${episode ? " - " + episode : ""}

${(media.format ? (media.format == "TV" ? "" + media.format + " Show" : "" + media.format.toLowerCase().replace(/_/g, " ")) : "") + ""} ${media.episodes ? "" + media.episodes + " Episodes" : media.duration ? "" + media.duration + " Minutes" : ""} @@ -436,7 +436,7 @@ function cardCreator(media, regexParse) {

-
${regexParse ? regexParse[2] + " - " + regexParse[4] : ""}
+
${name ? name + " - " + episode : ""}
@@ -477,7 +477,7 @@ async function nyaaRss(media, episode) { let frag = document.createDocumentFragment(), ep = (media.status == "FINISHED" && settings.torrent9) ? `"01-${media.episodes}"|"01~${media.episodes}"|"batch"|"Batch"|"complete"|"Complete"|"+01+"|"+01v"` : `"+${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(`"${[...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 { @@ -548,11 +548,19 @@ async function releasesRss() { let items = doc.querySelectorAll("item") for (let item of items) { let i = item.querySelector.bind(item), - regexParse = nameParseRegex.simple.exec(i("title").textContent) + regexParse = nameParseRegex.simple.exec(i("title").textContent), + episode + if (!regexParse[2]) { + regexParse = nameParseRegex.fallback.exec(i("title").textContent) + episode = regexParse[3] + } else { + episode = regexParse[4] + } + let media = await resolveName(regexParse[2], "SearchReleasesSingle"), - template = cardCreator(media, regexParse) + template = cardCreator(media, regexParse[2], episode) template.onclick = () => { - addTorrent(i('link').textContent, media, regexParse[4]) + addTorrent(i('link').textContent, media, episode) } frag.appendChild(template) }