From eb0be349247b4ca34f5b3df66202499ee9c8f393 Mon Sep 17 00:00:00 2001 From: Austin Best Date: Wed, 22 Jul 2020 00:26:53 -0400 Subject: [PATCH] Remove presets from nyaa since it changes so often --- .../Files/Indexers/Nyaa/Nyaa.xml | 20 +++++++++---------- .../IndexerTests/NyaaTests/NyaaFixture.cs | 4 ++-- .../Indexers/Nyaa/NyaaRequestGenerator.cs | 4 +--- .../Indexers/Nyaa/NyaaSettings.cs | 4 ++-- 4 files changed, 15 insertions(+), 17 deletions(-) diff --git a/src/NzbDrone.Core.Test/Files/Indexers/Nyaa/Nyaa.xml b/src/NzbDrone.Core.Test/Files/Indexers/Nyaa/Nyaa.xml index f13a4347c2..2c69ad7c6e 100644 --- a/src/NzbDrone.Core.Test/Files/Indexers/Nyaa/Nyaa.xml +++ b/src/NzbDrone.Core.Test/Files/Indexers/Nyaa/Nyaa.xml @@ -1,38 +1,38 @@ NyaaTorrents - http://www.nyaa.se/ - + http://www.nyaa.si/ + [TSRaws] Futsuu no Joshikousei ga [Locodol] Yattemita. #07 (TBS).ts Raw Anime - http://www.nyaa.se/?page=download&tid=587750 - http://www.nyaa.se/?page=view&tid=587750 + http://www.nyaa.si/?page=download&tid=587750 + http://www.nyaa.si/?page=view&tid=587750 Thu, 14 Aug 2014 18:10:36 +0000 [JIGGYSUB] KOI KOI 7 EP07 [R2DVD 420P H264 AC3] English-translated Anime - http://www.nyaa.se/?page=download&tid=587749 - http://www.nyaa.se/?page=view&tid=587749 + http://www.nyaa.si/?page=download&tid=587749 + http://www.nyaa.si/?page=view&tid=587749 Thu, 14 Aug 2014 18:05:22 +0000 [Ohys-Raws] RAIL WARS! - 07 (TBS 1280x720 x264 AAC).mp4 Raw Anime - http://www.nyaa.se/?page=download&tid=587748 - http://www.nyaa.se/?page=view&tid=587748 + http://www.nyaa.si/?page=download&tid=587748 + http://www.nyaa.si/?page=view&tid=587748 Thu, 14 Aug 2014 18:02:57 +0000 [Arabasma.com] Naruto Shippuuden - 372 [Arabic Sub] [MQ].mp4 Non-English-translated Anime - http://www.nyaa.se/?page=download&tid=587747 - http://www.nyaa.se/?page=view&tid=587747 + http://www.nyaa.si/?page=download&tid=587747 + http://www.nyaa.si/?page=view&tid=587747 Thu, 14 Aug 2014 18:01:36 +0000 diff --git a/src/NzbDrone.Core.Test/IndexerTests/NyaaTests/NyaaFixture.cs b/src/NzbDrone.Core.Test/IndexerTests/NyaaTests/NyaaFixture.cs index 0ca24bc759..494e21780a 100644 --- a/src/NzbDrone.Core.Test/IndexerTests/NyaaTests/NyaaFixture.cs +++ b/src/NzbDrone.Core.Test/IndexerTests/NyaaTests/NyaaFixture.cs @@ -42,8 +42,8 @@ public void should_parse_recent_feed_from_Nyaa() torrentInfo.Title.Should().Be("[TSRaws] Futsuu no Joshikousei ga [Locodol] Yattemita. #07 (TBS).ts"); torrentInfo.DownloadProtocol.Should().Be(DownloadProtocol.Torrent); - torrentInfo.DownloadUrl.Should().Be("http://www.nyaa.se/?page=download&tid=587750"); - torrentInfo.InfoUrl.Should().Be("http://www.nyaa.se/?page=view&tid=587750"); + torrentInfo.DownloadUrl.Should().Be("http://www.nyaa.si/?page=download&tid=587750"); + torrentInfo.InfoUrl.Should().Be("http://www.nyaa.si/?page=view&tid=587750"); torrentInfo.CommentUrl.Should().BeNullOrEmpty(); torrentInfo.Indexer.Should().Be(Subject.Definition.Name); torrentInfo.PublishDate.Should().Be(DateTime.Parse("2014/08/14 18:10:36")); diff --git a/src/NzbDrone.Core/Indexers/Nyaa/NyaaRequestGenerator.cs b/src/NzbDrone.Core/Indexers/Nyaa/NyaaRequestGenerator.cs index 014315d031..103e872b49 100644 --- a/src/NzbDrone.Core/Indexers/Nyaa/NyaaRequestGenerator.cs +++ b/src/NzbDrone.Core/Indexers/Nyaa/NyaaRequestGenerator.cs @@ -62,9 +62,7 @@ public IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchC foreach (var queryTitle in searchCriteria.QueryTitles) { - pageableRequests.Add(GetPagedRequests(MaxPages, - string.Format("&term={0}", - PrepareQuery(string.Format("{0} {1}", queryTitle, searchCriteria.Movie.Year))))); + pageableRequests.Add(GetPagedRequests(MaxPages, PrepareQuery(string.Format("{0} {1}", queryTitle, searchCriteria.Movie.Year)))); } return pageableRequests; diff --git a/src/NzbDrone.Core/Indexers/Nyaa/NyaaSettings.cs b/src/NzbDrone.Core/Indexers/Nyaa/NyaaSettings.cs index 2a0263bd52..38bbb38d8c 100644 --- a/src/NzbDrone.Core/Indexers/Nyaa/NyaaSettings.cs +++ b/src/NzbDrone.Core/Indexers/Nyaa/NyaaSettings.cs @@ -25,8 +25,8 @@ public class NyaaSettings : ITorrentIndexerSettings public NyaaSettings() { - BaseUrl = "http://www.nyaa.se"; - AdditionalParameters = "&cats=1_37&filter=1"; + BaseUrl = ""; + AdditionalParameters = ""; MinimumSeeders = IndexerDefaults.MINIMUM_SEEDERS; MultiLanguages = new List(); RequiredFlags = new List();