From 5f044564d294fe863a463c18a0cb26de4d92fb8a Mon Sep 17 00:00:00 2001 From: ThaUnknown <6506529+ThaUnknown@users.noreply.github.com> Date: Thu, 9 Jun 2022 22:02:26 +0200 Subject: [PATCH] fix: #189 looking for double digit episodes finds tripple digit episodes --- package.json | 2 +- src/renderer/src/lib/RSSView.svelte | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 33fe43e..57d7160 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "Miru", - "version": "2.5.0", + "version": "2.5.1", "author": "ThaUnknown_ ", "main": "src/index.js", "homepage": "https://github.com/ThaUnknown/miru#readme", diff --git a/src/renderer/src/lib/RSSView.svelte b/src/renderer/src/lib/RSSView.svelte index 0edcd17..aa9447e 100644 --- a/src/renderer/src/lib/RSSView.svelte +++ b/src/renderer/src/lib/RSSView.svelte @@ -58,6 +58,7 @@ 'Erai-raws [Multi-Sub]': 'https://nyaa.si/?page=rss&c=0_0&f=0&u=Erai-raws&q=', NanDesuKa: 'https://nyaa.si/?page=rss&c=0_0&f=0&u=NanDesuKa&q=' } + const epstring = ep => `"E${pl(ep)}+"|"E${pl(ep)}v"|"+${pl(ep)}+"|"+${pl(ep)}v"` export function getReleasesRSSurl () { const rss = rssmap[settings.rssFeed] || settings.rssFeed return new URL(`${rss}${settings.rssQuality ? `"${settings.rssQuality}"` : ''}`) @@ -89,7 +90,7 @@ if (isBatch) { ep = `"01-${pl(media.episodes)}"|"01~${pl(media.episodes)}"|"Batch"|"Complete"|"${pl(episode)}+"|"${pl(episode)}v"|"S01"` } else { - ep = `(${episodes.map(episode => `"E${pl(episode)}+"|"${pl(episode)}+"|"${pl(episode)}v"`).join('|')})` + ep = `(${episodes.map(epstring).join('|')})` } } @@ -108,10 +109,8 @@ // we want the dates of the target media as the S1 title might be used for SX releases const titles = createTitle(absolute.media).join(')|(') - const ep = `"E${pl(absoluteep)}+"|"${pl(absoluteep)}+"|"${pl(absoluteep)}v"` - const url = new URL( - `https://nyaa.si/?page=rss&c=1_2&f=${trusted}&s=seeders&o=desc&q=(${titles})${ep}${quality}-(${excl})` + `https://nyaa.si/?page=rss&c=1_2&f=${trusted}&s=seeders&o=desc&q=(${titles})${epstring(absoluteep)}${quality}-(${excl})` ) nodes = [...nodes, ...(await getRSSContent(url)).querySelectorAll('item')] }