New: Don't treat 400 responses from Notifiarr as errors

(cherry picked from commit 5eb420bbe12f59d0a5392abf3d351be28ca210e6)

azure-pipelines.yml

@@ -9,7 +9,7 @@ variables:
   testsFolder: './_tests'
   yarnCacheFolder: $(Pipeline.Workspace)/.yarn
   nugetCacheFolder: $(Pipeline.Workspace)/.nuget/packages
-  majorVersion: '1.9.0'
+  majorVersion: '1.9.3'
   minorVersion: $[counter('minorVersion', 1)]
   prowlarrVersion: '$(majorVersion).$(minorVersion)'
   buildName: '$(Build.SourceBranchName).$(prowlarrVersion)'

src/NzbDrone.Common/Extensions/PathExtensions.cs

@@ -160,7 +160,7 @@ namespace NzbDrone.Common.Extensions
         {
             if (text.IsNullOrWhiteSpace())
             {
-                throw new ArgumentNullException("text");
+                throw new ArgumentNullException(nameof(text));
             }
 
             return text.IndexOfAny(Path.GetInvalidPathChars()) >= 0;

src/NzbDrone.Common/Http/Dispatchers/ManagedHttpDispatcher.cs

@@ -119,7 +119,7 @@ namespace NzbDrone.Common.Http.Dispatchers
                     }
                     else
                     {
-                        data = responseMessage.Content.ReadAsByteArrayAsync(cts.Token).GetAwaiter().GetResult();
+                        data = await responseMessage.Content.ReadAsByteArrayAsync(cts.Token);
                     }
                 }
                 catch (Exception ex)

src/NzbDrone.Common/Serializer/System.Text.Json/BooleanConverter.cs

@@ -0,0 +1,29 @@
+using System;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+namespace NzbDrone.Common.Serializer;
+
+public class BooleanConverter : JsonConverter<bool>
+{
+    public override bool Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+    {
+        return reader.TokenType switch
+        {
+            JsonTokenType.True => true,
+            JsonTokenType.False => false,
+            JsonTokenType.Number => reader.GetInt64() switch
+            {
+                1 => true,
+                0 => false,
+                _ => throw new JsonException()
+            },
+            _ => throw new JsonException()
+        };
+    }
+
+    public override void Write(Utf8JsonWriter writer, bool value, JsonSerializerOptions options)
+    {
+        writer.WriteBooleanValue(value);
+    }
+}

src/NzbDrone.Common/Serializer/System.Text.Json/STJson.cs

@@ -36,6 +36,7 @@ namespace NzbDrone.Common.Serializer
             serializerSettings.Converters.Add(new STJTimeSpanConverter());
             serializerSettings.Converters.Add(new STJUtcConverter());
             serializerSettings.Converters.Add(new DictionaryStringObjectConverter());
+            serializerSettings.Converters.Add(new BooleanConverter());
         }
 
         public static T Deserialize<T>(string json)

src/NzbDrone.Core.Test/IndexerTests/PTPTests/PTPFixture.cs

@@ -6,9 +6,8 @@ using FluentAssertions;
 using Moq;
 using NUnit.Framework;
 using NzbDrone.Common.Http;
-using NzbDrone.Common.Serializer;
 using NzbDrone.Core.Indexers;
-using NzbDrone.Core.Indexers.PassThePopcorn;
+using NzbDrone.Core.Indexers.Definitions.PassThePopcorn;
 using NzbDrone.Core.IndexerSearch.Definitions;
 using NzbDrone.Core.Parser.Model;
 using NzbDrone.Core.Test.Framework;
@@ -21,26 +20,22 @@ namespace NzbDrone.Core.Test.IndexerTests.PTPTests
         [SetUp]
         public void Setup()
         {
-            Subject.Definition = new IndexerDefinition()
+            Subject.Definition = new IndexerDefinition
             {
                 Name = "PTP",
-                Settings = new PassThePopcornSettings() { APIUser = "asdf", APIKey = "sad" }
+                Settings = new PassThePopcornSettings
+                {
+                    APIUser = "asdf",
+                    APIKey = "sad"
+                }
             };
         }
 
         [TestCase("Files/Indexers/PTP/imdbsearch.json")]
         public async Task should_parse_feed_from_PTP(string fileName)
         {
-            var authResponse = new PassThePopcornAuthResponse { Result = "Ok" };
-
-            var authStream = new System.IO.StringWriter();
-            Json.Serialize(authResponse, authStream);
             var responseJson = ReadAllText(fileName);
 
-            Mocker.GetMock<IIndexerHttpClient>()
-                  .Setup(o => o.ExecuteProxiedAsync(It.Is<HttpRequest>(v => v.Method == HttpMethod.Post), Subject.Definition))
-                  .Returns<HttpRequest, IndexerDefinition>((r, d) => Task.FromResult(new HttpResponse(r, new HttpHeader(), new CookieCollection(), authStream.ToString())));
-
             Mocker.GetMock<IIndexerHttpClient>()
                 .Setup(o => o.ExecuteProxiedAsync(It.Is<HttpRequest>(v => v.Method == HttpMethod.Get), Subject.Definition))
                   .Returns<HttpRequest, IndexerDefinition>((r, d) => Task.FromResult(new HttpResponse(r, new HttpHeader { ContentType = HttpAccept.Json.Value }, new CookieCollection(), responseJson)));

src/NzbDrone.Core/Datastore/Migration/Framework/MigrationController.cs

@@ -52,7 +52,7 @@ namespace NzbDrone.Core.Datastore.Migration.Framework
                 .Configure<ProcessorOptions>(opt =>
                 {
                     opt.PreviewOnly = false;
-                    opt.Timeout = TimeSpan.FromSeconds(60);
+                    opt.Timeout = TimeSpan.FromMinutes(10);
                 })
                 .Configure<SelectingProcessorAccessorOptions>(cfg =>
                 {

src/NzbDrone.Core/IndexerSearch/NewznabResults.cs

@@ -108,6 +108,7 @@ namespace NzbDrone.Core.IndexerSearch
                             GetNabElement("files", r.Files, protocol),
                             GetNabElement("grabs", r.Grabs, protocol),
                             GetNabElement("peers", t.Peers, protocol),
+                            r.Year == 0 ? null : GetNabElement("year", r.Year, protocol),
                             GetNabElement("author", RemoveInvalidXMLChars(r.Author), protocol),
                             GetNabElement("booktitle", RemoveInvalidXMLChars(r.BookTitle), protocol),
                             GetNabElement("artist", RemoveInvalidXMLChars(r.Artist), protocol),

src/NzbDrone.Core/IndexerSearch/ReleaseSearchService.cs

@@ -67,7 +67,9 @@ namespace NzbDrone.Core.IndexerSearch
             searchSpec.Year = request.year;
             searchSpec.Genre = request.genre;
 
-            return new NewznabResults { Releases = await Dispatch(indexer => indexer.Fetch(searchSpec), searchSpec) };
+            var releases = await Dispatch(indexer => indexer.Fetch(searchSpec), searchSpec);
+
+            return new NewznabResults { Releases = DeDupeReleases(releases) };
         }
 
         private async Task<NewznabResults> MusicSearch(NewznabRequest request, List<int> indexerIds, bool interactiveSearch)
@@ -81,7 +83,9 @@ namespace NzbDrone.Core.IndexerSearch
             searchSpec.Track = request.track;
             searchSpec.Year = request.year;
 
-            return new NewznabResults { Releases = await Dispatch(indexer => indexer.Fetch(searchSpec), searchSpec) };
+            var releases = await Dispatch(indexer => indexer.Fetch(searchSpec), searchSpec);
+
+            return new NewznabResults { Releases = DeDupeReleases(releases) };
         }
 
         private async Task<NewznabResults> TvSearch(NewznabRequest request, List<int> indexerIds, bool interactiveSearch)
@@ -102,7 +106,9 @@ namespace NzbDrone.Core.IndexerSearch
             searchSpec.Year = request.year;
             searchSpec.Genre = request.genre;
 
-            return new NewznabResults { Releases = await Dispatch(indexer => indexer.Fetch(searchSpec), searchSpec) };
+            var releases = await Dispatch(indexer => indexer.Fetch(searchSpec), searchSpec);
+
+            return new NewznabResults { Releases = DeDupeReleases(releases) };
         }
 
         private async Task<NewznabResults> BookSearch(NewznabRequest request, List<int> indexerIds, bool interactiveSearch)
@@ -115,14 +121,18 @@ namespace NzbDrone.Core.IndexerSearch
             searchSpec.Year = request.year;
             searchSpec.Genre = request.genre;
 
-            return new NewznabResults { Releases = await Dispatch(indexer => indexer.Fetch(searchSpec), searchSpec) };
+            var releases = await Dispatch(indexer => indexer.Fetch(searchSpec), searchSpec);
+
+            return new NewznabResults { Releases = DeDupeReleases(releases) };
         }
 
         private async Task<NewznabResults> BasicSearch(NewznabRequest request, List<int> indexerIds, bool interactiveSearch)
         {
             var searchSpec = Get<BasicSearchCriteria>(request, indexerIds, interactiveSearch);
 
-            return new NewznabResults { Releases = await Dispatch(indexer => indexer.Fetch(searchSpec), searchSpec) };
+            var releases = await Dispatch(indexer => indexer.Fetch(searchSpec), searchSpec);
+
+            return new NewznabResults { Releases = DeDupeReleases(releases) };
         }
 
         private TSpec Get<TSpec>(NewznabRequest query, List<int> indexerIds, bool interactiveSearch)
@@ -265,5 +275,13 @@ namespace NzbDrone.Core.IndexerSearch
 
             return Array.Empty<ReleaseInfo>();
         }
+
+        private List<ReleaseInfo> DeDupeReleases(IList<ReleaseInfo> releases)
+        {
+            // De-dupe reports by guid so duplicate results aren't returned. Pick the one with the higher indexer priority.
+            return releases.GroupBy(r => r.Guid)
+                .Select(r => r.OrderBy(v => v.IndexerPriority).First())
+                .ToList();
+        }
     }
 }

src/NzbDrone.Core/Indexers/Definitions/AlphaRatio.cs

@@ -1,3 +1,4 @@
+using System;
 using System.Collections.Generic;
 using System.Collections.Specialized;
 using NLog;
@@ -5,6 +6,7 @@ using NzbDrone.Common.Http;
 using NzbDrone.Core.Annotations;
 using NzbDrone.Core.Configuration;
 using NzbDrone.Core.Indexers.Definitions.Gazelle;
+using NzbDrone.Core.IndexerSearch.Definitions;
 using NzbDrone.Core.Messaging.Events;
 
 namespace NzbDrone.Core.Indexers.Definitions;
@@ -15,6 +17,9 @@ public class AlphaRatio : GazelleBase<AlphaRatioSettings>
     public override string[] IndexerUrls => new[] { "https://alpharatio.cc/" };
     public override string Description => "AlphaRatio(AR) is a Private Torrent Tracker for 0DAY / GENERAL";
     public override IndexerPrivacy Privacy => IndexerPrivacy.Private;
+    public override bool SupportsPagination => true;
+    public override int PageSize => 50;
+    public override TimeSpan RateLimit => TimeSpan.FromSeconds(3);
 
     public AlphaRatio(IIndexerHttpClient httpClient,
                       IEventAggregator eventAggregator,
@@ -39,6 +44,8 @@ public class AlphaRatio : GazelleBase<AlphaRatioSettings>
     {
         var caps = new IndexerCapabilities
         {
+            LimitsDefault = PageSize,
+            LimitsMax = PageSize,
             TvSearchParams = new List<TvSearchParam>
             {
                 TvSearchParam.Q, TvSearchParam.Season, TvSearchParam.Ep
@@ -98,9 +105,9 @@ public class AlphaRatioRequestGenerator : GazelleRequestGenerator
         _settings = settings;
     }
 
-    protected override NameValueCollection GetBasicSearchParameters(string term, int[] categories)
+    protected override NameValueCollection GetBasicSearchParameters(SearchCriteriaBase searchCriteria, string term)
     {
-        var parameters = base.GetBasicSearchParameters(term, categories);
+        var parameters = base.GetBasicSearchParameters(searchCriteria, term);
 
         if (_settings.FreeleechOnly)
         {
@@ -112,6 +119,12 @@ public class AlphaRatioRequestGenerator : GazelleRequestGenerator
             parameters.Set("scene", "0");
         }
 
+        if (searchCriteria.Limit is > 0 && searchCriteria.Offset is > 0)
+        {
+            var page = (int)(searchCriteria.Offset / searchCriteria.Limit) + 1;
+            parameters.Set("page", page.ToString());
+        }
+
         return parameters;
     }
 }

src/NzbDrone.Core/Indexers/Definitions/Anidex.cs

@@ -200,7 +200,7 @@ namespace NzbDrone.Core.Indexers.Definitions
             var releaseInfos = new List<ReleaseInfo>();
 
             var parser = new HtmlParser();
-            var dom = parser.ParseDocument(indexerResponse.Content);
+            using var dom = parser.ParseDocument(indexerResponse.Content);
 
             var rows = dom.QuerySelectorAll("div#content table > tbody > tr");
             foreach (var row in rows)

src/NzbDrone.Core/Indexers/Definitions/Anidub.cs

@@ -77,7 +77,7 @@ namespace NzbDrone.Core.Indexers.Definitions
             else
             {
                 var parser = new HtmlParser();
-                var document = await parser.ParseDocumentAsync(response.Content);
+                using var document = await parser.ParseDocumentAsync(response.Content);
                 var errorMessage = document.QuerySelector("#content .berror .berror_c")?.TextContent.Trim();
 
                 throw new IndexerAuthException(errorMessage ?? "Unknown error message, please report.");
@@ -433,7 +433,7 @@ namespace NzbDrone.Core.Indexers.Definitions
         {
             var torrentInfos = new List<TorrentInfo>();
             var parser = new HtmlParser();
-            var dom = parser.ParseDocument(indexerResponse.Content);
+            using var dom = parser.ParseDocument(indexerResponse.Content);
 
             foreach (var t in dom.QuerySelectorAll("#tabs .torrent_c > div"))
             {
@@ -465,7 +465,7 @@ namespace NzbDrone.Core.Indexers.Definitions
             var torrentInfos = new List<ReleaseInfo>();
 
             var parser = new HtmlParser();
-            var dom = parser.ParseDocument(indexerResponse.Content);
+            using var dom = parser.ParseDocument(indexerResponse.Content);
 
             var links = dom.QuerySelectorAll(".searchitem > h3 > a[href], #dle-content > .story > .story_h > .lcol > h2 > a[href]");
             foreach (var link in links)

src/NzbDrone.Core/Indexers/Definitions/AnimeBytes.cs

@@ -571,8 +571,6 @@ namespace NzbDrone.Core.Indexers.Definitions
                             };
 
                             releaseInfos.Add(release);
-
-                            continue;
                         }
                     }
 
@@ -699,7 +697,7 @@ namespace NzbDrone.Core.Indexers.Definitions
         [FieldDefinition(8, Label = "Enable Sonarr Compatibility", Type = FieldType.Checkbox, HelpText = "Makes Prowlarr try to add Season information into Release names, without this Sonarr can't match any Seasons, but it has a lot of false positives as well")]
         public bool EnableSonarrCompatibility { get; set; }
 
-        [FieldDefinition(9, Label = "Use Filenames for Single Episodes", Type = FieldType.Checkbox, HelpText = "Makes Prowlarr replace AnimeBytes release names with the actual filename, this currently only works for single episode releases")]
+        [FieldDefinition(9, Label = "Use Filenames for Single Episodes", Type = FieldType.Checkbox, HelpText = "Add a release using the actual filename, this currently only works for single episode releases")]
         public bool UseFilenameForSingleEpisodes { get; set; }
 
         [FieldDefinition(10, Label = "Add Japanese title as a synonym", Type = FieldType.Checkbox, HelpText = "Makes Prowlarr add Japanese titles as synonyms, i.e kanji/hiragana/katakana.")]

src/NzbDrone.Core/Indexers/Definitions/AnimeTorrents.cs

@@ -275,7 +275,7 @@ namespace NzbDrone.Core.Indexers.Definitions
             var releaseInfos = new List<ReleaseInfo>();
 
             var parser = new HtmlParser();
-            var dom = parser.ParseDocument(indexerResponse.Content);
+            using var dom = parser.ParseDocument(indexerResponse.Content);
 
             var rows = dom.QuerySelectorAll("table tr");
             foreach (var (row, index) in rows.Skip(1).Select((v, i) => (v, i)))

src/NzbDrone.Core/Indexers/Definitions/Animedia.cs

@@ -253,7 +253,7 @@ namespace NzbDrone.Core.Indexers.Definitions
         {
             var torrentInfos = new List<TorrentInfo>();
             var parser = new HtmlParser();
-            var dom = parser.ParseDocument(indexerResponse.Content);
+            using var dom = parser.ParseDocument(indexerResponse.Content);
 
             foreach (var t in dom.QuerySelectorAll("ul.media__tabs__nav > li > a"))
             {
@@ -291,7 +291,7 @@ namespace NzbDrone.Core.Indexers.Definitions
             var torrentInfos = new List<ReleaseInfo>();
 
             var parser = new HtmlParser();
-            var dom = parser.ParseDocument(indexerResponse.Content);
+            using var dom = parser.ParseDocument(indexerResponse.Content);
 
             var links = dom.QuerySelectorAll("a.ads-list__item__title");
             foreach (var link in links)

src/NzbDrone.Core/Indexers/Definitions/Anthelion.cs

@@ -72,7 +72,7 @@ namespace NzbDrone.Core.Indexers.Definitions
             if (CheckIfLoginNeeded(response))
             {
                 var parser = new HtmlParser();
-                var dom = parser.ParseDocument(response.Content);
+                using var dom = parser.ParseDocument(response.Content);
                 var errorMessage = dom.QuerySelector("form#loginform")?.TextContent.Trim();
 
                 throw new IndexerAuthException(errorMessage ?? "Unknown error message, please report.");
@@ -206,7 +206,7 @@ namespace NzbDrone.Core.Indexers.Definitions
             var torrentInfos = new List<ReleaseInfo>();
 
             var parser = new HtmlParser();
-            var doc = parser.ParseDocument(indexerResponse.Content);
+            using var doc = parser.ParseDocument(indexerResponse.Content);
             var rows = doc.QuerySelectorAll("table.torrent_table > tbody > tr.torrent");
             foreach (var row in rows)
             {

src/NzbDrone.Core/Indexers/Definitions/AroLol.cs

@@ -37,7 +37,7 @@ public class AroLol : GazelleBase<AroLolSettings>
         if (response.Content.Contains("loginform"))
         {
             var parser = new HtmlParser();
-            var dom = parser.ParseDocument(response.Content);
+            using var dom = parser.ParseDocument(response.Content);
             var errorMessage = dom.QuerySelector("#loginform > .warning")?.TextContent.Trim();
 
             throw new IndexerAuthException(errorMessage ?? "Unknown error message, please report.");

src/NzbDrone.Core/Indexers/Definitions/AudioBookBay.cs

@@ -88,7 +88,7 @@ public class AudioBookBay : TorrentIndexerBase<NoAuthTorrentBaseSettings>
         var response = await _httpClient.ExecuteProxiedAsync(request, Definition);
 
         var parser = new HtmlParser();
-        var dom = parser.ParseDocument(response.Content);
+        using var dom = parser.ParseDocument(response.Content);
 
         var hash = dom.QuerySelector("td:contains(\"Info Hash:\") ~ td")?.TextContent.Trim();
         if (hash == null)
@@ -269,7 +269,7 @@ public class AudioBookBayParser : IParseIndexerResponse
     {
         var releaseInfos = new List<ReleaseInfo>();
 
-        var doc = ParseHtmlDocument(indexerResponse.Content);
+        using var doc = ParseHtmlDocument(indexerResponse.Content);
 
         var rows = doc.QuerySelectorAll("div.post:has(div[class=\"postTitle\"])");
         foreach (var row in rows)

src/NzbDrone.Core/Indexers/Definitions/Avistaz/AvistazApi.cs

@@ -1,5 +1,5 @@
 using System.Collections.Generic;
-using Newtonsoft.Json;
+using System.Text.Json.Serialization;
 
 namespace NzbDrone.Core.Indexers.Definitions.Avistaz
 {
@@ -9,34 +9,34 @@ namespace NzbDrone.Core.Indexers.Definitions.Avistaz
         public string Download { get; set; }
         public Dictionary<string, string> Category { get; set; }
 
-        [JsonProperty(PropertyName = "movie_tv")]
+        [JsonPropertyName("movie_tv")]
         public AvistazIdInfo MovieTvinfo { get; set; }
 
-        [JsonProperty(PropertyName = "created_at")]
+        [JsonPropertyName("created_at")]
         public string CreatedAt { get; set; }
 
-        [JsonProperty(PropertyName = "file_name")]
+        [JsonPropertyName("file_name")]
         public string FileName { get; set; }
 
-        [JsonProperty(PropertyName = "info_hash")]
+        [JsonPropertyName("info_hash")]
         public string InfoHash { get; set; }
         public int? Leech { get; set; }
         public int? Completed { get; set; }
         public int? Seed { get; set; }
 
-        [JsonProperty(PropertyName = "file_size")]
+        [JsonPropertyName("file_size")]
         public long? FileSize { get; set; }
 
-        [JsonProperty(PropertyName = "file_count")]
+        [JsonPropertyName("file_count")]
         public int? FileCount { get; set; }
 
-        [JsonProperty(PropertyName = "download_multiply")]
+        [JsonPropertyName("download_multiply")]
         public double? DownloadMultiply { get; set; }
 
-        [JsonProperty(PropertyName = "upload_multiply")]
+        [JsonPropertyName("upload_multiply")]
         public double? UploadMultiply { get; set; }
 
-        [JsonProperty(PropertyName = "video_quality")]
+        [JsonPropertyName("video_quality")]
         public string VideoQuality { get; set; }
         public string Type { get; set; }
         public List<AvistazLanguage> Audio { get; set; }
@@ -64,21 +64,10 @@ namespace NzbDrone.Core.Indexers.Definitions.Avistaz
         public string Tmdb { get; set; }
         public string Tvdb { get; set; }
         public string Imdb { get; set; }
-        public string Title { get; set; }
-
-        [JsonProperty(PropertyName = "tv_episode")]
-        public string TvEpisode { get; set; }
-
-        [JsonProperty(PropertyName = "tv_season")]
-        public string TVSeason { get; set; }
-
-        [JsonProperty(PropertyName = "tv_full_season")]
-        public bool TVFullSeason { get; set; }
     }
 
     public class AvistazAuthResponse
     {
         public string Token { get; set; }
-        public string Expiry { get; set; }
     }
 }

src/NzbDrone.Core/Indexers/Definitions/Avistaz/AvistazBase.cs

@@ -5,6 +5,7 @@ using System.Threading.Tasks;
 using FluentValidation.Results;
 using NLog;
 using NzbDrone.Common.Http;
+using NzbDrone.Common.Serializer;
 using NzbDrone.Core.Configuration;
 using NzbDrone.Core.Messaging.Events;
 
@@ -122,10 +123,11 @@ namespace NzbDrone.Core.Indexers.Definitions.Avistaz
                 .Accept(HttpAccept.Json)
                 .Build();
 
-            var response = await _httpClient.PostAsync<AvistazAuthResponse>(authLoginRequest);
-            var token = response.Resource.Token;
+            var response = await ExecuteAuth(authLoginRequest);
 
-            return token;
+            var authResponse = STJson.Deserialize<AvistazAuthResponse>(response.Content);
+
+            return authResponse.Token;
         }
     }
 }

src/NzbDrone.Core/Indexers/Definitions/Avistaz/AvistazParserBase.cs

@@ -5,6 +5,7 @@ using System.Linq;
 using System.Net;
 using NzbDrone.Common.Extensions;
 using NzbDrone.Common.Http;
+using NzbDrone.Common.Serializer;
 using NzbDrone.Core.Indexers.Exceptions;
 using NzbDrone.Core.Parser;
 using NzbDrone.Core.Parser.Model;
@@ -42,9 +43,9 @@ namespace NzbDrone.Core.Indexers.Definitions.Avistaz
                 throw new IndexerException(indexerResponse, $"Unexpected response header {indexerResponse.HttpResponse.Headers.ContentType} from indexer request, expected {HttpAccept.Json.Value}");
             }
 
-            var jsonResponse = new HttpResponse<AvistazResponse>(indexerResponse.HttpResponse);
+            var jsonResponse = STJson.Deserialize<AvistazResponse>(indexerResponse.HttpResponse.Content);
 
-            foreach (var row in jsonResponse.Resource.Data)
+            foreach (var row in jsonResponse.Data)
             {
                 var details = row.Url;
                 var link = row.Download;

src/NzbDrone.Core/Indexers/Definitions/BB.cs

@@ -72,7 +72,7 @@ namespace NzbDrone.Core.Indexers.Definitions
             if (CheckIfLoginNeeded(response))
             {
                 var parser = new HtmlParser();
-                var dom = parser.ParseDocument(response.Content);
+                using var dom = parser.ParseDocument(response.Content);
                 var messageEl = dom.QuerySelectorAll("#loginform");
                 var messages = new List<string>();
                 for (var i = 0; i < 13; i++)
@@ -242,7 +242,7 @@ namespace NzbDrone.Core.Indexers.Definitions
             var torrentInfos = new List<ReleaseInfo>();
 
             var parser = new HtmlParser();
-            var dom = parser.ParseDocument(indexerResponse.Content);
+            using var dom = parser.ParseDocument(indexerResponse.Content);
             var rows = dom.QuerySelectorAll("#torrent_table > tbody > tr.torrent");
 
             foreach (var row in rows)

src/NzbDrone.Core/Indexers/Definitions/BakaBT.cs

@@ -55,7 +55,7 @@ namespace NzbDrone.Core.Indexers.Definitions
             var response = await _httpClient.ExecuteProxiedAsync(request, Definition);
 
             var parser = new HtmlParser();
-            var dom = parser.ParseDocument(response.Content);
+            using var dom = parser.ParseDocument(response.Content);
             var downloadLink = dom.QuerySelector(".download_link")?.GetAttribute("href");
 
             if (downloadLink.IsNullOrWhiteSpace())
@@ -82,7 +82,7 @@ namespace NzbDrone.Core.Indexers.Definitions
             var loginPage = await ExecuteAuth(new HttpRequest(loginUrl));
 
             var parser = new HtmlParser();
-            var dom = await parser.ParseDocumentAsync(loginPage.Content);
+            using var dom = await parser.ParseDocumentAsync(loginPage.Content);
             var loginKey = dom.QuerySelector("input[name=\"loginKey\"]");
             if (loginKey != null)
             {
@@ -102,7 +102,7 @@ namespace NzbDrone.Core.Indexers.Definitions
             if (CheckIfLoginNeeded(response))
             {
                 var htmlParser = new HtmlParser();
-                var document = await htmlParser.ParseDocumentAsync(response.Content);
+                using var document = await htmlParser.ParseDocumentAsync(response.Content);
                 var errorMessage = document.QuerySelector("#loginError, .error")?.TextContent.Trim();
 
                 throw new IndexerAuthException(errorMessage ?? "Unknown error message, please report.");
@@ -247,7 +247,7 @@ namespace NzbDrone.Core.Indexers.Definitions
             var releaseInfos = new List<ReleaseInfo>();
 
             var parser = new HtmlParser();
-            var dom = parser.ParseDocument(indexerResponse.Content);
+            using var dom = parser.ParseDocument(indexerResponse.Content);
             var rows = dom.QuerySelectorAll(".torrents tr.torrent, .torrents tr.torrent_alt");
             var currentCategories = new List<IndexerCategory> { NewznabStandardCategory.TVAnime };
 

src/NzbDrone.Core/Indexers/Definitions/BeyondHD.cs

@@ -4,8 +4,8 @@ using System.Globalization;
 using System.Linq;
 using System.Net;
 using System.Net.Http;
+using System.Text.Json.Serialization;
 using FluentValidation;
-using Newtonsoft.Json;
 using NLog;
 using NzbDrone.Common.Extensions;
 using NzbDrone.Common.Http;
@@ -19,6 +19,7 @@ using NzbDrone.Core.Messaging.Events;
 using NzbDrone.Core.Parser;
 using NzbDrone.Core.Parser.Model;
 using NzbDrone.Core.Validation;
+using static Newtonsoft.Json.Formatting;
 
 namespace NzbDrone.Core.Indexers.Definitions
 {
@@ -163,7 +164,7 @@ namespace NzbDrone.Core.Indexers.Definitions
                 Method = HttpMethod.Post
             };
             request.SetContent(body.ToJson());
-            request.ContentSummary = body.ToJson(Formatting.None);
+            request.ContentSummary = body.ToJson(None);
 
             yield return new IndexerRequest(request);
         }
@@ -245,16 +246,16 @@ namespace NzbDrone.Core.Indexers.Definitions
                 throw new IndexerAuthException("API Key invalid or not authorized");
             }
 
-            var jsonResponse = new HttpResponse<BeyondHDResponse>(indexerHttpResponse);
+            var jsonResponse = STJson.Deserialize<BeyondHDResponse>(indexerResponse.Content);
 
-            if (jsonResponse.Resource.StatusCode == 0)
+            if (jsonResponse.StatusCode == 0)
             {
-                throw new IndexerException(indexerResponse, $"Indexer Error: {jsonResponse.Resource.StatusMessage}");
+                throw new IndexerException(indexerResponse, $"Indexer Error: {jsonResponse.StatusMessage}");
             }
 
             var releaseInfos = new List<ReleaseInfo>();
 
-            foreach (var row in jsonResponse.Resource.Results)
+            foreach (var row in jsonResponse.Results)
             {
                 var details = row.InfoUrl;
                 var link = row.DownloadLink;
@@ -412,10 +413,10 @@ namespace NzbDrone.Core.Indexers.Definitions
 
     public class BeyondHDResponse
     {
-        [JsonProperty(PropertyName = "status_code")]
+        [JsonPropertyName("status_code")]
         public int StatusCode { get; set; }
 
-        [JsonProperty(PropertyName = "status_message")]
+        [JsonPropertyName("status_message")]
         public string StatusMessage { get; set; }
         public List<BeyondHDTorrent> Results { get; set; }
     }
@@ -424,36 +425,42 @@ namespace NzbDrone.Core.Indexers.Definitions
     {
         public string Name { get; set; }
 
-        [JsonProperty(PropertyName = "info_hash")]
+        [JsonPropertyName("info_hash")]
         public string InfoHash { get; set; }
         public string Category { get; set; }
         public string Type { get; set; }
         public long Size { get; set; }
 
-        [JsonProperty(PropertyName = "times_completed")]
+        [JsonPropertyName("times_completed")]
         public int Grabs { get; set; }
         public int Seeders { get; set; }
         public int Leechers { get; set; }
 
-        [JsonProperty(PropertyName = "created_at")]
+        [JsonPropertyName("created_at")]
         public string CreatedAt { get; set; }
 
-        [JsonProperty(PropertyName = "download_url")]
+        [JsonPropertyName("download_url")]
         public string DownloadLink { get; set; }
 
-        [JsonProperty(PropertyName = "url")]
+        [JsonPropertyName("url")]
         public string InfoUrl { get; set; }
 
-        [JsonProperty(PropertyName = "imdb_id")]
+        [JsonPropertyName("imdb_id")]
         public string ImdbId { get; set; }
 
-        [JsonProperty(PropertyName = "tmdb_id")]
+        [JsonPropertyName("tmdb_id")]
         public string TmdbId { get; set; }
+
         public bool Freeleech { get; set; }
+
         public bool Promo25 { get; set; }
+
         public bool Promo50 { get; set; }
+
         public bool Promo75 { get; set; }
+
         public bool Limited { get; set; }
+
         public bool Internal { get; set; }
     }
 }

src/NzbDrone.Core/Indexers/Definitions/BinSearch.cs

@@ -161,7 +161,7 @@ namespace NzbDrone.Core.Indexers.Definitions
             var releaseInfos = new List<ReleaseInfo>();
 
             var parser = new HtmlParser();
-            var doc = parser.ParseDocument(indexerResponse.Content);
+            using var doc = parser.ParseDocument(indexerResponse.Content);
             var rows = doc.QuerySelectorAll("table.xMenuT > tbody > tr").Skip(1);
             foreach (var row in rows)
             {

src/NzbDrone.Core/Indexers/Definitions/BitHDTV.cs

@@ -185,7 +185,7 @@ namespace NzbDrone.Core.Indexers.Definitions
             var torrentInfos = new List<ReleaseInfo>();
 
             var parser = new HtmlParser();
-            var dom = parser.ParseDocument(indexerResponse.Content);
+            using var dom = parser.ParseDocument(indexerResponse.Content);
             foreach (var child in dom.QuerySelectorAll("#needseed"))
             {
                 child.Remove();

src/NzbDrone.Core/Indexers/Definitions/Cardigann/CardigannBase.cs

@@ -374,7 +374,7 @@ namespace NzbDrone.Core.Indexers.Definitions.Cardigann
                 var newvalue = reReplaceRegexMatches.Groups[3].Value;
 
                 var replaceRegex = new Regex(regexp);
-                var input = (string)variables[variable];
+                var input = (string)variables[variable] ?? string.Empty;
                 var expanded = replaceRegex.Replace(input, newvalue);
 
                 if (modifier != null)

src/NzbDrone.Core/Indexers/Definitions/Cardigann/CardigannRequestGenerator.cs

@@ -598,7 +598,7 @@ namespace NzbDrone.Core.Indexers.Definitions.Cardigann
             }
 
             var resultParser = new HtmlParser();
-            var resultDocument = resultParser.ParseDocument(loginResult.Content);
+            using var resultDocument = resultParser.ParseDocument(loginResult.Content);
             foreach (var error in errorBlocks)
             {
                 var selection = resultDocument.QuerySelector(error.Selector);
@@ -984,7 +984,7 @@ namespace NzbDrone.Core.Indexers.Definitions.Cardigann
             var selectorText = ApplyGoTemplateText(selector.Selector, variables);
             var parser = new HtmlParser();
 
-            var resultDocument = parser.ParseDocument(response.Content);
+            using var resultDocument = parser.ParseDocument(response.Content);
 
             var element = resultDocument.QuerySelector(selectorText);
             if (element == null)
@@ -1045,7 +1045,7 @@ namespace NzbDrone.Core.Indexers.Definitions.Cardigann
             if (_definition.Login.Test?.Selector != null && (response.Headers.ContentType?.Contains("text/html") ?? true))
             {
                 var parser = new HtmlParser();
-                var document = parser.ParseDocument(response.Content);
+                using var document = parser.ParseDocument(response.Content);
 
                 var selection = document.QuerySelectorAll(_definition.Login.Test.Selector);
                 if (selection.Length == 0)

src/NzbDrone.Core/Indexers/Definitions/FileList/FileListApi.cs

@@ -1,28 +1,40 @@
-using Newtonsoft.Json;
+using System.Text.Json.Serialization;
 
 namespace NzbDrone.Core.Indexers.Definitions.FileList;
 
 public class FileListTorrent
 {
-    public string Id { get; set; }
+    public uint Id { get; set; }
+
     public string Name { get; set; }
+
     public long Size { get; set; }
+
     public int Leechers { get; set; }
+
     public int Seeders { get; set; }
-    [JsonProperty(PropertyName = "times_completed")]
+
+    [JsonPropertyName("times_completed")]
     public uint TimesCompleted { get; set; }
-    public uint Comments { get; set; }
+
     public uint Files { get; set; }
-    [JsonProperty(PropertyName = "imdb")]
+
+    [JsonPropertyName("imdb")]
     public string ImdbId { get; set; }
+
     public bool Internal { get; set; }
-    [JsonProperty(PropertyName = "freeleech")]
+
+    [JsonPropertyName("freeleech")]
     public bool FreeLeech { get; set; }
-    [JsonProperty(PropertyName = "doubleup")]
+
+    [JsonPropertyName("doubleup")]
     public bool DoubleUp { get; set; }
-    [JsonProperty(PropertyName = "upload_date")]
+
+    [JsonPropertyName("upload_date")]
     public string UploadDate { get; set; }
+
     public string Category { get; set; }
-    [JsonProperty(PropertyName = "small_description")]
+
+    [JsonPropertyName("small_description")]
     public string SmallDescription { get; set; }
 }

src/NzbDrone.Core/Indexers/Definitions/FileList/FileListParser.cs

@@ -3,8 +3,8 @@ using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
 using System.Net;
-using Newtonsoft.Json;
 using NzbDrone.Common.Http;
+using NzbDrone.Common.Serializer;
 using NzbDrone.Core.Indexers.Exceptions;
 using NzbDrone.Core.Parser.Model;
 
@@ -35,7 +35,7 @@ public class FileListParser : IParseIndexerResponse
 
         var releaseInfos = new List<ReleaseInfo>();
 
-        var results = JsonConvert.DeserializeObject<List<FileListTorrent>>(indexerResponse.Content);
+        var results = STJson.Deserialize<List<FileListTorrent>>(indexerResponse.Content);
 
         foreach (var row in results)
         {
@@ -54,7 +54,7 @@ public class FileListParser : IParseIndexerResponse
             }
 
             var imdbId = 0;
-            if (row.ImdbId != null && row.ImdbId.Length > 2)
+            if (row.ImdbId is { Length: > 2 })
             {
                 imdbId = int.Parse(row.ImdbId.Substring(2));
             }
@@ -64,7 +64,7 @@ public class FileListParser : IParseIndexerResponse
 
             releaseInfos.Add(new TorrentInfo
             {
-                Guid = string.Format("FileList-{0}", id),
+                Guid = $"FileList-{id}",
                 Title = row.Name,
                 Size = row.Size,
                 Categories = _categories.MapTrackerCatDescToNewznab(row.Category),
@@ -91,21 +91,21 @@ public class FileListParser : IParseIndexerResponse
 
     public Action<IDictionary<string, string>, DateTime?> CookiesUpdater { get; set; }
 
-    private string GetDownloadUrl(string torrentId)
+    private string GetDownloadUrl(uint torrentId)
     {
         var url = new HttpUri(_settings.BaseUrl)
             .CombinePath("/download.php")
-            .AddQueryParam("id", torrentId)
+            .AddQueryParam("id", torrentId.ToString())
             .AddQueryParam("passkey", _settings.Passkey);
 
         return url.FullUri;
     }
 
-    private string GetInfoUrl(string torrentId)
+    private string GetInfoUrl(uint torrentId)
     {
         var url = new HttpUri(_settings.BaseUrl)
             .CombinePath("/details.php")
-            .AddQueryParam("id", torrentId);
+            .AddQueryParam("id", torrentId.ToString());
 
         return url.FullUri;
     }

src/NzbDrone.Core/Indexers/Definitions/FunFile.cs

@@ -70,7 +70,7 @@ public class FunFile : TorrentIndexerBase<UserPassTorrentBaseSettings>
         if (CheckIfLoginNeeded(response))
         {
             var parser = new HtmlParser();
-            var dom = parser.ParseDocument(response.Content);
+            using var dom = await parser.ParseDocumentAsync(response.Content);
             var errorMessage = dom.QuerySelector("td.mf_content")?.TextContent.Trim();
 
             throw new IndexerAuthException(errorMessage ?? "Unknown error message, please report.");
@@ -276,7 +276,7 @@ public class FunFileParser : IParseIndexerResponse
         var releaseInfos = new List<TorrentInfo>();
 
         var parser = new HtmlParser();
-        var dom = parser.ParseDocument(indexerResponse.Content);
+        using var dom = parser.ParseDocument(indexerResponse.Content);
 
         var rows = dom.QuerySelectorAll("table.mainframe table[cellpadding=\"2\"] > tbody > tr:has(td.row3)");
         foreach (var row in rows)

src/NzbDrone.Core/Indexers/Definitions/Gazelle/GazelleRequestGenerator.cs

@@ -46,7 +46,7 @@ public class GazelleRequestGenerator : IIndexerRequestGenerator
     {
         var pageableRequests = new IndexerPageableRequestChain();
 
-        var parameters = GetBasicSearchParameters(searchCriteria.SanitizedSearchTerm, searchCriteria.Categories);
+        var parameters = GetBasicSearchParameters(searchCriteria, searchCriteria.SanitizedSearchTerm);
 
         if (searchCriteria.ImdbId != null)
         {
@@ -62,7 +62,7 @@ public class GazelleRequestGenerator : IIndexerRequestGenerator
     {
         var pageableRequests = new IndexerPageableRequestChain();
 
-        var parameters = GetBasicSearchParameters(searchCriteria.SanitizedSearchTerm, searchCriteria.Categories);
+        var parameters = GetBasicSearchParameters(searchCriteria, searchCriteria.SanitizedSearchTerm);
 
         if (searchCriteria.Artist.IsNotNullOrWhiteSpace() && searchCriteria.Artist != "VA")
         {
@@ -88,7 +88,7 @@ public class GazelleRequestGenerator : IIndexerRequestGenerator
     {
         var pageableRequests = new IndexerPageableRequestChain();
 
-        var parameters = GetBasicSearchParameters(searchCriteria.SanitizedTvSearchString, searchCriteria.Categories);
+        var parameters = GetBasicSearchParameters(searchCriteria, searchCriteria.SanitizedTvSearchString);
 
         if (searchCriteria.ImdbId != null)
         {
@@ -104,7 +104,7 @@ public class GazelleRequestGenerator : IIndexerRequestGenerator
     {
         var pageableRequests = new IndexerPageableRequestChain();
 
-        var parameters = GetBasicSearchParameters(searchCriteria.SanitizedSearchTerm, searchCriteria.Categories);
+        var parameters = GetBasicSearchParameters(searchCriteria, searchCriteria.SanitizedSearchTerm);
         pageableRequests.Add(GetRequest(parameters));
 
         return pageableRequests;
@@ -114,7 +114,7 @@ public class GazelleRequestGenerator : IIndexerRequestGenerator
     {
         var pageableRequests = new IndexerPageableRequestChain();
 
-        var parameters = GetBasicSearchParameters(searchCriteria.SanitizedSearchTerm, searchCriteria.Categories);
+        var parameters = GetBasicSearchParameters(searchCriteria, searchCriteria.SanitizedSearchTerm);
         pageableRequests.Add(GetRequest(parameters));
 
         return pageableRequests;
@@ -123,7 +123,7 @@ public class GazelleRequestGenerator : IIndexerRequestGenerator
     // hook to adjust the search term
     protected virtual string GetSearchTerm(string term) => term;
 
-    protected virtual NameValueCollection GetBasicSearchParameters(string term, int[] categories)
+    protected virtual NameValueCollection GetBasicSearchParameters(SearchCriteriaBase searchCriteria, string term)
     {
         var parameters = new NameValueCollection
         {
@@ -139,9 +139,10 @@ public class GazelleRequestGenerator : IIndexerRequestGenerator
             parameters.Set("searchstr", searchTerm.Replace(".", " "));
         }
 
-        if (categories != null)
+        if (searchCriteria.Categories != null && searchCriteria.Categories.Any())
         {
-            var queryCats = Capabilities.Categories.MapTorznabCapsToTrackers(categories);
+            var queryCats = Capabilities.Categories.MapTorznabCapsToTrackers(searchCriteria.Categories);
+
             if (queryCats.Any())
             {
                 queryCats.ForEach(cat => parameters.Set($"filter_cat[{cat}]", "1"));

src/NzbDrone.Core/Indexers/Definitions/GreatPosterWall.cs

@@ -89,7 +89,7 @@ public class GreatPosterWallRequestGenerator : GazelleRequestGenerator
 
     public override IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchCriteria)
     {
-        var parameters = GetBasicSearchParameters(searchCriteria.SearchTerm, searchCriteria.Categories);
+        var parameters = GetBasicSearchParameters(searchCriteria, searchCriteria.SearchTerm);
 
         if (searchCriteria.ImdbId != null)
         {
@@ -101,9 +101,9 @@ public class GreatPosterWallRequestGenerator : GazelleRequestGenerator
         return pageableRequests;
     }
 
-    protected override NameValueCollection GetBasicSearchParameters(string term, int[] categories)
+    protected override NameValueCollection GetBasicSearchParameters(SearchCriteriaBase searchCriteria, string term)
     {
-        var parameters = base.GetBasicSearchParameters(term, categories);
+        var parameters = base.GetBasicSearchParameters(searchCriteria, term);
 
         if (_settings.FreeleechOnly)
         {

src/NzbDrone.Core/Indexers/Definitions/HDSpace.cs

@@ -73,7 +73,7 @@ namespace NzbDrone.Core.Indexers.Definitions
             if (CheckIfLoginNeeded(response))
             {
                 var parser = new HtmlParser();
-                var dom = parser.ParseDocument(response.Content);
+                using var dom = parser.ParseDocument(response.Content);
                 var errorMessages = dom
                     .QuerySelectorAll("table.lista td.lista span[style*=\"#FF0000\"], table.lista td.header:contains(\"login attempts\")")
                     .Select(r => r.TextContent.Trim())

src/NzbDrone.Core/Indexers/Definitions/HDTorrents.cs

@@ -74,7 +74,7 @@ namespace NzbDrone.Core.Indexers.Definitions
             if (response.Content != null && !response.Content.ContainsIgnoreCase("If your browser doesn't have javascript enabled"))
             {
                 var parser = new HtmlParser();
-                var dom = parser.ParseDocument(response.Content);
+                using var dom = await parser.ParseDocumentAsync(response.Content);
 
                 var errorMessage = dom.QuerySelector("div > font[color=\"#FF0000\"]")?.TextContent.Trim();
 
@@ -256,7 +256,7 @@ namespace NzbDrone.Core.Indexers.Definitions
             var releaseInfos = new List<ReleaseInfo>();
 
             var parser = new HtmlParser();
-            var dom = parser.ParseDocument(indexerResponse.Content);
+            using var dom = parser.ParseDocument(indexerResponse.Content);
 
             var userInfo = dom.QuerySelector("table.navus tr");
             var userRank = userInfo?.Children[1].TextContent.Replace("Rank:", string.Empty).Trim();

src/NzbDrone.Core/Indexers/Definitions/IPTorrents.cs

@@ -291,7 +291,7 @@ namespace NzbDrone.Core.Indexers.Definitions
             var torrentInfos = new List<ReleaseInfo>();
 
             var parser = new HtmlParser();
-            var doc = parser.ParseDocument(indexerResponse.Content);
+            using var doc = parser.ParseDocument(indexerResponse.Content);
 
             var rows = doc.QuerySelectorAll("table[id=\"torrents\"] > tbody > tr");
             foreach (var row in rows)

src/NzbDrone.Core/Indexers/Definitions/ImmortalSeed.cs

@@ -266,7 +266,7 @@ namespace NzbDrone.Core.Indexers.Definitions
             var releaseInfos = new List<ReleaseInfo>();
 
             var parser = new HtmlParser();
-            var dom = parser.ParseDocument(indexerResponse.Content);
+            using var dom = parser.ParseDocument(indexerResponse.Content);
 
             var rows = dom.QuerySelectorAll("table#sortabletable > tbody > tr:has(a[href*=\"details.php?id=\"])");
             foreach (var row in rows)

src/NzbDrone.Core/Indexers/Definitions/Libble.cs

@@ -77,7 +77,7 @@ public class Libble : TorrentIndexerBase<LibbleSettings>
         if (CheckIfLoginNeeded(response))
         {
             var parser = new HtmlParser();
-            var dom = parser.ParseDocument(response.Content);
+            using var dom = parser.ParseDocument(response.Content);
             var errorMessage = dom.QuerySelector("#loginform > .warning")?.TextContent.Trim();
 
             throw new IndexerAuthException(errorMessage ?? "Unknown error message, please report.");
@@ -238,7 +238,7 @@ public class LibbleParser : IParseIndexerResponse
         var releaseInfos = new List<ReleaseInfo>();
 
         var parser = new HtmlParser();
-        var doc = parser.ParseDocument(indexerResponse.Content);
+        using var doc = parser.ParseDocument(indexerResponse.Content);
 
         var groups = doc.QuerySelectorAll("table#torrent_table > tbody > tr.group:has(strong > a[href*=\"torrents.php?id=\"])");
         foreach (var group in groups)

src/NzbDrone.Core/Indexers/Definitions/MoreThanTV.cs

@@ -177,7 +177,7 @@ public class MoreThanTVParser : IParseIndexerResponse
         try
         {
             var parser = new HtmlParser();
-            var document = parser.ParseDocument(indexerResponse.Content);
+            using var document = parser.ParseDocument(indexerResponse.Content);
             var torrents = document.QuerySelectorAll("#torrent_table > tbody > tr.torrent");
             var movies = new[] { "movie" };
             var tv = new[] { "season", "episode" };

src/NzbDrone.Core/Indexers/Definitions/Nebulance.cs

@@ -1,14 +1,17 @@
 using System;
 using System.Collections.Generic;
 using System.Globalization;
+using System.Linq;
 using System.Net;
 using System.Text;
+using System.Text.Json.Serialization;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using Newtonsoft.Json;
 using NLog;
 using NzbDrone.Common.Extensions;
 using NzbDrone.Common.Http;
+using NzbDrone.Common.Serializer;
 using NzbDrone.Core.Annotations;
 using NzbDrone.Core.Configuration;
 using NzbDrone.Core.Indexers.Exceptions;
@@ -65,6 +68,26 @@ namespace NzbDrone.Core.Indexers.Definitions
             return Task.FromResult(request);
         }
 
+        protected override IList<ReleaseInfo> CleanupReleases(IEnumerable<ReleaseInfo> releases, SearchCriteriaBase searchCriteria)
+        {
+            var cleanReleases = base.CleanupReleases(releases, searchCriteria);
+
+            return FilterReleasesByQuery(cleanReleases, searchCriteria).ToList();
+        }
+
+        protected override IEnumerable<ReleaseInfo> FilterReleasesByQuery(IEnumerable<ReleaseInfo> releases, SearchCriteriaBase searchCriteria)
+        {
+            if (!searchCriteria.IsRssSearch &&
+                searchCriteria.IsIdSearch &&
+                searchCriteria is TvSearchCriteria tvSearchCriteria &&
+                tvSearchCriteria.EpisodeSearchString.IsNotNullOrWhiteSpace())
+            {
+                releases = releases.Where(r => r.Title.IsNotNullOrWhiteSpace() && r.Title.ContainsIgnoreCase(tvSearchCriteria.EpisodeSearchString)).ToList();
+            }
+
+            return releases;
+        }
+
         private IndexerCapabilities SetCapabilities()
         {
             var caps = new IndexerCapabilities
@@ -208,7 +231,7 @@ namespace NzbDrone.Core.Indexers.Definitions
                 throw new IndexerException(indexerResponse, $"Unexpected response status {indexerResponse.HttpResponse.StatusCode} code from indexer request");
             }
 
-            var jsonResponse = new HttpResponse<JsonRpcResponse<NebulanceTorrents>>(indexerResponse.HttpResponse).Resource;
+            var jsonResponse = STJson.Deserialize<JsonRpcResponse<NebulanceTorrents>>(indexerResponse.HttpResponse.Content);
 
             if (jsonResponse.Error != null || jsonResponse.Result == null)
             {
@@ -226,9 +249,11 @@ namespace NzbDrone.Core.Indexers.Definitions
             {
                 var details = _settings.BaseUrl + "torrents.php?id=" + row.TorrentId;
 
+                var title = row.ReleaseTitle.IsNotNullOrWhiteSpace() ? row.ReleaseTitle : row.GroupName;
+
                 var release = new TorrentInfo
                 {
-                    Title = row.ReleaseTitle,
+                    Title = title,
                     Guid = details,
                     InfoUrl = details,
                     PosterUrl = row.Banner,
@@ -297,23 +322,24 @@ namespace NzbDrone.Core.Indexers.Definitions
 
     public class NebulanceTorrent
     {
-        [JsonProperty(PropertyName = "rls_name")]
+        [JsonPropertyName("rls_name")]
         public string ReleaseTitle { get; set; }
-        public string Title { get; set; }
-        [JsonProperty(PropertyName = "cat")]
+        [JsonPropertyName("cat")]
         public string Category { get; set; }
         public string Size { get; set; }
         public string Seed { get; set; }
         public string Leech { get; set; }
         public string Snatch { get; set; }
         public string Download { get; set; }
-        [JsonProperty(PropertyName = "file_list")]
+        [JsonPropertyName("file_list")]
         public string[] FileList { get; set; }
-        [JsonProperty(PropertyName = "series_banner")]
+        [JsonPropertyName("group_name")]
+        public string GroupName { get; set; }
+        [JsonPropertyName("series_banner")]
         public string Banner { get; set; }
-        [JsonProperty(PropertyName = "group_id")]
+        [JsonPropertyName("group_id")]
         public string TorrentId { get; set; }
-        [JsonProperty(PropertyName = "rls_utc")]
+        [JsonPropertyName("rls_utc")]
         public string PublishDateUtc { get; set; }
     }
 

src/NzbDrone.Core/Indexers/Definitions/NorBits.cs

@@ -263,7 +263,7 @@ public class NorBitsParser : IParseIndexerResponse
         var releaseInfos = new List<ReleaseInfo>();
 
         var parser = new HtmlParser();
-        var dom = parser.ParseDocument(indexerResponse.Content);
+        using var dom = parser.ParseDocument(indexerResponse.Content);
 
         var rows = dom.QuerySelectorAll("#torrentTable > tbody > tr").Skip(1).ToCollection();
 

src/NzbDrone.Core/Indexers/Definitions/PassThePopcorn/PassThePopcorn.cs

@@ -3,7 +3,7 @@ using NLog;
 using NzbDrone.Core.Configuration;
 using NzbDrone.Core.Messaging.Events;
 
-namespace NzbDrone.Core.Indexers.PassThePopcorn
+namespace NzbDrone.Core.Indexers.Definitions.PassThePopcorn
 {
     public class PassThePopcorn : TorrentIndexerBase<PassThePopcornSettings>
     {
@@ -29,22 +29,20 @@ namespace NzbDrone.Core.Indexers.PassThePopcorn
 
         public override IIndexerRequestGenerator GetRequestGenerator()
         {
-            return new PassThePopcornRequestGenerator
-            {
-                Settings = Settings,
-                HttpClient = _httpClient,
-                Logger = _logger
-            };
+            return new PassThePopcornRequestGenerator(Settings);
+        }
+
+        public override IParseIndexerResponse GetParser()
+        {
+            return new PassThePopcornParser(Settings, _logger);
         }
 
         private IndexerCapabilities SetCapabilities()
         {
             var caps = new IndexerCapabilities
             {
-                SearchParams = new List<SearchParam>
-                {
-                    SearchParam.Q
-                },
+                LimitsDefault = PageSize,
+                LimitsMax = PageSize,
                 MovieSearchParams = new List<MovieSearchParam>
                 {
                     MovieSearchParam.Q, MovieSearchParam.ImdbId
@@ -73,16 +71,11 @@ namespace NzbDrone.Core.Indexers.PassThePopcorn
 
             return caps;
         }
-
-        public override IParseIndexerResponse GetParser()
-        {
-            return new PassThePopcornParser(Settings, Capabilities, _logger);
-        }
     }
 
     public class PassThePopcornFlag : IndexerFlag
     {
-        public static IndexerFlag Golden => new IndexerFlag("golden", "Release follows Golden Popcorn quality rules");
-        public static IndexerFlag Approved => new IndexerFlag("approved", "Release approved by PTP");
+        public static IndexerFlag Golden => new ("golden", "Release follows Golden Popcorn quality rules");
+        public static IndexerFlag Approved => new ("approved", "Release approved by PTP");
     }
 }

src/NzbDrone.Core/Indexers/Definitions/PassThePopcorn/PassThePopcornApi.cs

@@ -1,15 +1,28 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 
-namespace NzbDrone.Core.Indexers.PassThePopcorn
+namespace NzbDrone.Core.Indexers.Definitions.PassThePopcorn
 {
-    public class Director
+    public class PassThePopcornResponse
     {
-        public string Name { get; set; }
-        public string Id { get; set; }
+        public string TotalResults { get; set; }
+        public List<PassThePopcornMovie> Movies { get; set; }
+        public string Page { get; set; }
+        public string AuthKey { get; set; }
+        public string PassKey { get; set; }
     }
 
-    public class Torrent
+    public class PassThePopcornMovie
+    {
+        public string GroupId { get; set; }
+        public string Title { get; set; }
+        public string Year { get; set; }
+        public string Cover { get; set; }
+        public List<string> Tags { get; set; }
+        public string ImdbId { get; set; }
+        public List<PassThePopcornTorrent> Torrents { get; set; }
+    }
+
+    public class PassThePopcornTorrent
     {
         public int Id { get; set; }
         public string Quality { get; set; }
@@ -19,7 +32,7 @@ namespace NzbDrone.Core.Indexers.PassThePopcorn
         public string Resolution { get; set; }
         public bool Scene { get; set; }
         public string Size { get; set; }
-        public DateTime UploadTime { get; set; }
+        public string UploadTime { get; set; }
         public string RemasterTitle { get; set; }
         public string Snatched { get; set; }
         public string Seeders { get; set; }
@@ -29,32 +42,4 @@ namespace NzbDrone.Core.Indexers.PassThePopcorn
         public bool GoldenPopcorn { get; set; }
         public string FreeleechType { get; set; }
     }
-
-    public class Movie
-    {
-        public string GroupId { get; set; }
-        public string Title { get; set; }
-        public string Year { get; set; }
-        public string Cover { get; set; }
-        public List<string> Tags { get; set; }
-        public List<Director> Directors { get; set; }
-        public string ImdbId { get; set; }
-        public List<Torrent> Torrents { get; set; }
-    }
-
-    public class PassThePopcornResponse
-    {
-        public string TotalResults { get; set; }
-        public List<Movie> Movies { get; set; }
-        public string Page { get; set; }
-        public string AuthKey { get; set; }
-        public string PassKey { get; set; }
-    }
-
-    public class PassThePopcornAuthResponse
-    {
-        public string Result { get; set; }
-        public string Popcron { get; set; }
-        public string AntiCsrfToken { get; set; }
-    }
 }

src/NzbDrone.Core/Indexers/Definitions/PassThePopcorn/PassThePopcornParser.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Globalization;
 using System.Net;
 using NLog;
 using NzbDrone.Common.Extensions;
@@ -8,36 +9,28 @@ using NzbDrone.Common.Serializer;
 using NzbDrone.Core.Indexers.Exceptions;
 using NzbDrone.Core.Parser.Model;
 
-namespace NzbDrone.Core.Indexers.PassThePopcorn
+namespace NzbDrone.Core.Indexers.Definitions.PassThePopcorn
 {
     public class PassThePopcornParser : IParseIndexerResponse
     {
-        private readonly IndexerCapabilities _capabilities;
         private readonly PassThePopcornSettings _settings;
         private readonly Logger _logger;
-        public PassThePopcornParser(PassThePopcornSettings settings, IndexerCapabilities capabilities, Logger logger)
+
+        public PassThePopcornParser(PassThePopcornSettings settings, Logger logger)
         {
             _settings = settings;
-            _capabilities = capabilities;
             _logger = logger;
         }
 
         public IList<ReleaseInfo> ParseResponse(IndexerResponse indexerResponse)
         {
             var torrentInfos = new List<ReleaseInfo>();
-            var indexerHttpResponse = indexerResponse.HttpResponse;
 
-            if (indexerHttpResponse.StatusCode != HttpStatusCode.OK)
+            var httpResponse = indexerResponse.HttpResponse;
+
+            if (httpResponse.StatusCode != HttpStatusCode.OK)
             {
-                // Remove cookie cache
-                if (indexerHttpResponse.HasHttpRedirect && indexerHttpResponse.RedirectUrl
-                        .ContainsIgnoreCase("login.php"))
-                {
-                    CookiesUpdater(null, null);
-                    throw new IndexerAuthException("We are being redirected to the PTP login page. Most likely your session expired or was killed. Recheck your cookie or credentials and try testing the indexer.");
-                }
-
-                if (indexerHttpResponse.StatusCode == HttpStatusCode.Forbidden)
+                if (httpResponse.StatusCode == HttpStatusCode.Forbidden)
                 {
                     throw new RequestLimitReachedException(indexerResponse, "PTP Query Limit Reached. Please try again later.");
                 }
@@ -45,19 +38,13 @@ namespace NzbDrone.Core.Indexers.PassThePopcorn
                 throw new IndexerException(indexerResponse, $"Unexpected response status {indexerResponse.HttpResponse.StatusCode} code from indexer request");
             }
 
-            if (indexerHttpResponse.Headers.ContentType != HttpAccept.Json.Value)
+            if (httpResponse.Headers.ContentType != HttpAccept.Json.Value)
             {
-                if (indexerHttpResponse.Request.Url.Path.ContainsIgnoreCase("login.php"))
-                {
-                    CookiesUpdater(null, null);
-                    throw new IndexerAuthException("We are currently on the login page. Most likely your session expired or was killed. Try testing the indexer in the settings.");
-                }
-
-                // Remove cookie cache
                 throw new IndexerException(indexerResponse, $"Unexpected response header {indexerResponse.HttpResponse.Headers.ContentType} from indexer request, expected {HttpAccept.Json.Value}");
             }
 
             var jsonResponse = STJson.Deserialize<PassThePopcornResponse>(indexerResponse.Content);
+
             if (jsonResponse.TotalResults == "0" ||
                 jsonResponse.TotalResults.IsNullOrWhiteSpace() ||
                 jsonResponse.Movies == null)
@@ -70,7 +57,6 @@ namespace NzbDrone.Core.Indexers.PassThePopcorn
                 foreach (var torrent in result.Torrents)
                 {
                     var id = torrent.Id;
-                    var title = torrent.ReleaseName;
 
                     var flags = new HashSet<IndexerFlag>();
 
@@ -81,51 +67,32 @@ namespace NzbDrone.Core.Indexers.PassThePopcorn
 
                     if (torrent.Checked)
                     {
-                        flags.Add(PassThePopcornFlag.Approved); //title = $"{title} ✔";
+                        flags.Add(PassThePopcornFlag.Approved);
                     }
 
-                    if (torrent.Scene)
+                    torrentInfos.Add(new TorrentInfo
                     {
-                        flags.Add(IndexerFlag.Scene);
-                    }
-
-                    var free = !(torrent.FreeleechType is null);
-
-                    // Only add approved torrents
-                    try
-                    {
-                        torrentInfos.Add(new TorrentInfo
-                        {
-                            Guid = string.Format("PassThePopcorn-{0}", id),
-                            Title = title,
-                            Size = long.Parse(torrent.Size),
-                            DownloadUrl = GetDownloadUrl(id, jsonResponse.AuthKey, jsonResponse.PassKey),
-                            InfoUrl = GetInfoUrl(result.GroupId, id),
-                            Grabs = int.Parse(torrent.Snatched),
-                            Seeders = int.Parse(torrent.Seeders),
-                            Peers = int.Parse(torrent.Leechers) + int.Parse(torrent.Seeders),
-                            PublishDate = torrent.UploadTime.ToUniversalTime(),
-                            ImdbId = result.ImdbId.IsNotNullOrWhiteSpace() ? int.Parse(result.ImdbId) : 0,
-                            IndexerFlags = flags,
-                            MinimumRatio = 1,
-                            MinimumSeedTime = 345600,
-                            DownloadVolumeFactor = free ? 0 : 1,
-                            UploadVolumeFactor = 1,
-                            Categories = new List<IndexerCategory> { NewznabStandardCategory.Movies }
-                        });
-                    }
-                    catch (Exception e)
-                    {
-                        _logger.Error(e, "Encountered exception parsing PTP torrent: {" +
-                                         $"Size: {torrent.Size}" +
-                                         $"UploadTime: {torrent.UploadTime}" +
-                                         $"Seeders: {torrent.Seeders}" +
-                                         $"Leechers: {torrent.Leechers}" +
-                                         $"ReleaseName: {torrent.ReleaseName}" +
-                                         $"ID: {torrent.Id}" +
-                                         "}. Please immediately report this info on https://github.com/Prowlarr/Prowlarr/issues/1584.");
-                        throw;
-                    }
+                        Guid = $"PassThePopcorn-{id}",
+                        Title = torrent.ReleaseName,
+                        Year = int.Parse(result.Year),
+                        InfoUrl = GetInfoUrl(result.GroupId, id),
+                        DownloadUrl = GetDownloadUrl(id, jsonResponse.AuthKey, jsonResponse.PassKey),
+                        Categories = new List<IndexerCategory> { NewznabStandardCategory.Movies },
+                        Size = long.Parse(torrent.Size),
+                        Grabs = int.Parse(torrent.Snatched),
+                        Seeders = int.Parse(torrent.Seeders),
+                        Peers = int.Parse(torrent.Leechers) + int.Parse(torrent.Seeders),
+                        PublishDate = DateTime.Parse(torrent.UploadTime + " +0000", CultureInfo.InvariantCulture, DateTimeStyles.AdjustToUniversal),
+                        ImdbId = result.ImdbId.IsNotNullOrWhiteSpace() ? int.Parse(result.ImdbId) : 0,
+                        Scene = torrent.Scene,
+                        IndexerFlags = flags,
+                        DownloadVolumeFactor = torrent.FreeleechType is "Freeleech" ? 0 : 1,
+                        UploadVolumeFactor = 1,
+                        MinimumRatio = 1,
+                        MinimumSeedTime = 345600,
+                        Genres = result.Tags ?? new List<string>(),
+                        PosterUrl = GetPosterUrl(result.Cover)
+                    });
                 }
             }
 
@@ -155,5 +122,17 @@ namespace NzbDrone.Core.Indexers.PassThePopcorn
 
             return url.FullUri;
         }
+
+        private static string GetPosterUrl(string cover)
+        {
+            if (cover.IsNotNullOrWhiteSpace() &&
+                Uri.TryCreate(cover, UriKind.Absolute, out var posterUri) &&
+                (posterUri.Scheme == Uri.UriSchemeHttp || posterUri.Scheme == Uri.UriSchemeHttps))
+            {
+                return posterUri.AbsoluteUri;
+            }
+
+            return null;
+        }
     }
 }

src/NzbDrone.Core/Indexers/Definitions/PassThePopcorn/PassThePopcornRequestGenerator.cs

@@ -1,22 +1,21 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.Specialized;
-using NLog;
 using NzbDrone.Common.Extensions;
 using NzbDrone.Common.Http;
 using NzbDrone.Core.IndexerSearch.Definitions;
 using NzbDrone.Core.Parser;
 
-namespace NzbDrone.Core.Indexers.PassThePopcorn
+namespace NzbDrone.Core.Indexers.Definitions.PassThePopcorn
 {
     public class PassThePopcornRequestGenerator : IIndexerRequestGenerator
     {
-        public PassThePopcornSettings Settings { get; set; }
+        private readonly PassThePopcornSettings _settings;
 
-        public IDictionary<string, string> Cookies { get; set; }
-
-        public IIndexerHttpClient HttpClient { get; set; }
-        public Logger Logger { get; set; }
+        public PassThePopcornRequestGenerator(PassThePopcornSettings settings)
+        {
+            _settings = settings;
+        }
 
         public IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchCriteria)
         {
@@ -34,51 +33,6 @@ namespace NzbDrone.Core.Indexers.PassThePopcorn
             return pageableRequests;
         }
 
-        public Func<IDictionary<string, string>> GetCookies { get; set; }
-        public Action<IDictionary<string, string>, DateTime?> CookiesUpdater { get; set; }
-
-        private IEnumerable<IndexerRequest> GetRequest(string searchParameters, SearchCriteriaBase searchCriteria)
-        {
-            var queryParams = new NameValueCollection
-            {
-                { "action", "advanced" },
-                { "json", "noredirect" },
-                { "grouping", "0" },
-                { "searchstr", searchParameters }
-            };
-
-            if (searchCriteria.Limit is > 0 && searchCriteria.Offset is > 0)
-            {
-                var page = (int)(searchCriteria.Offset / searchCriteria.Limit) + 1;
-                queryParams.Set("page", page.ToString());
-            }
-
-            if (Settings.FreeleechOnly)
-            {
-                queryParams.Set("freetorrent", "1");
-            }
-
-            var request =
-                new IndexerRequest(
-                    $"{Settings.BaseUrl.Trim().TrimEnd('/')}/torrents.php?{queryParams.GetQueryString()}",
-                    HttpAccept.Json);
-
-            request.HttpRequest.Headers["ApiUser"] = Settings.APIUser;
-            request.HttpRequest.Headers["ApiKey"] = Settings.APIKey;
-
-            if (Settings.APIKey.IsNullOrWhiteSpace())
-            {
-                foreach (var cookie in Cookies)
-                {
-                    request.HttpRequest.Cookies[cookie.Key] = cookie.Value;
-                }
-
-                CookiesUpdater(Cookies, DateTime.Now.AddDays(30));
-            }
-
-            yield return request;
-        }
-
         public IndexerPageableRequestChain GetSearchRequests(MusicSearchCriteria searchCriteria)
         {
             return new IndexerPageableRequestChain();
@@ -102,5 +56,38 @@ namespace NzbDrone.Core.Indexers.PassThePopcorn
 
             return pageableRequests;
         }
+
+        private IEnumerable<IndexerRequest> GetRequest(string searchParameters, SearchCriteriaBase searchCriteria)
+        {
+            var parameters = new NameValueCollection
+            {
+                { "action", "advanced" },
+                { "json", "noredirect" },
+                { "grouping", "0" },
+                { "searchstr", searchParameters }
+            };
+
+            if (searchCriteria.Limit is > 0 && searchCriteria.Offset is > 0)
+            {
+                var page = (int)(searchCriteria.Offset / searchCriteria.Limit) + 1;
+                parameters.Set("page", page.ToString());
+            }
+
+            if (_settings.FreeleechOnly)
+            {
+                parameters.Set("freetorrent", "1");
+            }
+
+            var searchUrl = $"{_settings.BaseUrl.Trim().TrimEnd('/')}/torrents.php?{parameters.GetQueryString()}";
+
+            var request = new IndexerRequest(searchUrl, HttpAccept.Json);
+            request.HttpRequest.Headers.Add("ApiUser", _settings.APIUser);
+            request.HttpRequest.Headers.Add("ApiKey", _settings.APIKey);
+
+            yield return request;
+        }
+
+        public Func<IDictionary<string, string>> GetCookies { get; set; }
+        public Action<IDictionary<string, string>, DateTime?> CookiesUpdater { get; set; }
     }
 }

src/NzbDrone.Core/Indexers/Definitions/PassThePopcorn/PassThePopcornSettings.cs

@@ -3,7 +3,7 @@ using NzbDrone.Core.Annotations;
 using NzbDrone.Core.Indexers.Settings;
 using NzbDrone.Core.Validation;
 
-namespace NzbDrone.Core.Indexers.PassThePopcorn
+namespace NzbDrone.Core.Indexers.Definitions.PassThePopcorn
 {
     public class PassThePopcornSettingsValidator : NoAuthSettingsValidator<PassThePopcornSettings>
     {

src/NzbDrone.Core/Indexers/Definitions/PirateTheNet.cs

@@ -234,7 +234,7 @@ public class PirateTheNetParser : IParseIndexerResponse
         var releaseInfos = new List<ReleaseInfo>();
 
         var parser = new HtmlParser();
-        var dom = parser.ParseDocument(indexerResponse.Content);
+        using var dom = parser.ParseDocument(indexerResponse.Content);
 
         var rows = dom.QuerySelectorAll("table.main > tbody > tr");
         foreach (var row in rows.Skip(1))

src/NzbDrone.Core/Indexers/Definitions/PixelHD.cs

@@ -171,7 +171,7 @@ public class PixelHDParser : IParseIndexerResponse
         var releaseInfos = new List<ReleaseInfo>();
 
         var parser = new HtmlParser();
-        var dom = parser.ParseDocument(indexerResponse.Content);
+        using var dom = parser.ParseDocument(indexerResponse.Content);
 
         var groups = dom.QuerySelectorAll("div.browsePoster");
         foreach (var group in groups)

src/NzbDrone.Core/Indexers/Definitions/PreToMe.cs

@@ -85,7 +85,7 @@ public class PreToMe : TorrentIndexerBase<PreToMeSettings>
         if (CheckIfLoginNeeded(response))
         {
             var parser = new HtmlParser();
-            var dom = parser.ParseDocument(response.Content);
+            using var dom = parser.ParseDocument(response.Content);
             var errorMessage = dom.QuerySelector("table.body_table font[color~=\"red\"]")?.TextContent.Trim();
 
             throw new IndexerAuthException(errorMessage ?? "Unknown error message, please report.");
@@ -340,7 +340,7 @@ public class PreToMeParser : IParseIndexerResponse
         var releaseInfos = new List<ReleaseInfo>();
 
         var parser = new HtmlParser();
-        var dom = parser.ParseDocument(indexerResponse.Content);
+        using var dom = parser.ParseDocument(indexerResponse.Content);
 
         var rows = dom.QuerySelectorAll("table > tbody > tr.browse");
         foreach (var row in rows)

src/NzbDrone.Core/Indexers/Definitions/RevolutionTT.cs

@@ -249,7 +249,7 @@ namespace NzbDrone.Core.Indexers.Definitions
             var torrentInfos = new List<TorrentInfo>();
 
             var parser = new HtmlParser();
-            var dom = parser.ParseDocument(indexerResponse.Content);
+            using var dom = parser.ParseDocument(indexerResponse.Content);
             var rows = dom.QuerySelectorAll("#torrents-table > tbody > tr");
 
             foreach (var row in rows.Skip(1))

src/NzbDrone.Core/Indexers/Definitions/RuTracker.cs

@@ -63,7 +63,7 @@ namespace NzbDrone.Core.Indexers.Definitions
                 var response = await _httpClient.ExecuteProxiedAsync(request, Definition);
 
                 var parser = new HtmlParser();
-                var dom = parser.ParseDocument(response.Content);
+                using var dom = parser.ParseDocument(response.Content);
                 var magnetLink = dom.QuerySelector("table.attach a.magnet-link[href^=\"magnet:?\"]")?.GetAttribute("href");
 
                 if (magnetLink == null)
@@ -104,7 +104,7 @@ namespace NzbDrone.Core.Indexers.Definitions
             if (!response.Content.Contains("id=\"logged-in-username\""))
             {
                 var parser = new HtmlParser();
-                var document = await parser.ParseDocumentAsync(response.Content);
+                using var document = await parser.ParseDocumentAsync(response.Content);
                 var errorMessage = document.QuerySelector("h4.warnColor1.tCenter.mrg_16, div.msg-main")?.TextContent.Trim();
 
                 throw new IndexerAuthException(errorMessage ?? "RuTracker Auth Failed");
@@ -1580,7 +1580,7 @@ namespace NzbDrone.Core.Indexers.Definitions
             var releaseInfos = new List<ReleaseInfo>();
 
             var parser = new HtmlParser();
-            var doc = parser.ParseDocument(indexerResponse.Content);
+            using var doc = parser.ParseDocument(indexerResponse.Content);
             var rows = doc.QuerySelectorAll("table#tor-tbl > tbody > tr");
 
             foreach (var row in rows)

src/NzbDrone.Core/Indexers/Definitions/SceneTime.cs

@@ -225,7 +225,7 @@ namespace NzbDrone.Core.Indexers.Definitions
             var releaseInfos = new List<ReleaseInfo>();
 
             var parser = new HtmlParser();
-            var dom = parser.ParseDocument(indexerResponse.Content);
+            using var dom = parser.ParseDocument(indexerResponse.Content);
 
             var table = dom.QuerySelector("table.movehere");
             if (table == null)

src/NzbDrone.Core/Indexers/Definitions/Shazbat.cs

@@ -78,7 +78,7 @@ public class Shazbat : TorrentIndexerBase<ShazbatSettings>
         if (CheckIfLoginNeeded(response))
         {
             var parser = new HtmlParser();
-            var dom = parser.ParseDocument(response.Content);
+            using var dom = await parser.ParseDocumentAsync(response.Content);
             var errorMessage = dom.QuerySelector("div#fail .modal-body")?.TextContent.Trim();
 
             throw new IndexerAuthException(errorMessage ?? "Unknown error message, please report.");
@@ -223,7 +223,7 @@ public class ShazbatParser : IParseIndexerResponse
         var releaseInfos = new List<ReleaseInfo>();
 
         var parser = new HtmlParser();
-        var dom = parser.ParseDocument(indexerResponse.Content);
+        using var dom = parser.ParseDocument(indexerResponse.Content);
 
         var hasGlobalFreeleech = dom.QuerySelector("span:contains(\"Freeleech until:\"):has(span.datetime)") != null;
 
@@ -303,7 +303,7 @@ public class ShazbatParser : IParseIndexerResponse
         var releaseInfos = new List<ReleaseInfo>();
 
         var parser = new HtmlParser();
-        var dom = parser.ParseDocument(indexerResponse.Content);
+        using var dom = parser.ParseDocument(indexerResponse.Content);
 
         if (!hasGlobalFreeleech)
         {

src/NzbDrone.Core/Indexers/Definitions/Shizaproject.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.Specialized;
+using System.Linq;
 using System.Text;
 using System.Text.RegularExpressions;
 using Newtonsoft.Json;
@@ -16,12 +17,11 @@ using NzbDrone.Core.Parser.Model;
 
 namespace NzbDrone.Core.Indexers.Definitions
 {
-    [Obsolete("Site unavailable")]
     public class Shizaproject : TorrentIndexerBase<NoAuthTorrentBaseSettings>
     {
         public override string Name => "ShizaProject";
-        public override string[] IndexerUrls => new string[] { "https://shiza-project.com/" };
-        public override string Description => "Shizaproject is russian anime voiceover group and eponymous anime tracker.";
+        public override string[] IndexerUrls => new[] { "https://shiza-project.com/" };
+        public override string Description => "ShizaProject Tracker is a Public RUSSIAN tracker and release group for ANIME";
         public override string Language => "ru-RU";
         public override Encoding Encoding => Encoding.UTF8;
         public override IndexerPrivacy Privacy => IndexerPrivacy.Public;
@@ -34,7 +34,7 @@ namespace NzbDrone.Core.Indexers.Definitions
 
         public override IIndexerRequestGenerator GetRequestGenerator()
         {
-            return new ShizaprojectRequestGenerator() { Settings = Settings, Capabilities = Capabilities };
+            return new ShizaprojectRequestGenerator { Settings = Settings, Capabilities = Capabilities };
         }
 
         public override IParseIndexerResponse GetParser()
@@ -47,20 +47,22 @@ namespace NzbDrone.Core.Indexers.Definitions
             var caps = new IndexerCapabilities
             {
                 TvSearchParams = new List<TvSearchParam>
-                                   {
-                                       TvSearchParam.Q, TvSearchParam.Season, TvSearchParam.Ep
-                                   },
+                {
+                    TvSearchParam.Q, TvSearchParam.Season, TvSearchParam.Ep
+                },
                 MovieSearchParams = new List<MovieSearchParam>
-                                   {
-                                       MovieSearchParam.Q
-                                   }
+                {
+                    MovieSearchParam.Q
+                }
             };
+
             caps.Categories.AddCategoryMapping(1, NewznabStandardCategory.TVAnime, "TV");
             caps.Categories.AddCategoryMapping(2, NewznabStandardCategory.TVAnime, "TV_SPECIAL");
             caps.Categories.AddCategoryMapping(3, NewznabStandardCategory.TVAnime, "ONA");
             caps.Categories.AddCategoryMapping(4, NewznabStandardCategory.TVAnime, "OVA");
             caps.Categories.AddCategoryMapping(5, NewznabStandardCategory.Movies, "MOVIE");
             caps.Categories.AddCategoryMapping(6, NewznabStandardCategory.Movies, "SHORT_MOVIE");
+
             return caps;
         }
     }
@@ -93,6 +95,7 @@ namespace NzbDrone.Core.Indexers.Definitions
                             publishedAt
                             slug
                             torrents {
+                                synopsis
                                 downloaded
                                 seeders
                                 leechers
@@ -112,7 +115,7 @@ namespace NzbDrone.Core.Indexers.Definitions
             var queryCollection = new NameValueCollection
             {
                 { "query", query.Replace('\n', ' ').Trim() },
-                { "variables", Newtonsoft.Json.JsonConvert.SerializeObject(variables) }
+                { "variables", JsonConvert.SerializeObject(variables) }
             };
 
             var requestUrl = string.Format("{0}/graphql?", Settings.BaseUrl.TrimEnd('/')) + queryCollection.GetQueryString();
@@ -175,25 +178,26 @@ namespace NzbDrone.Core.Indexers.Definitions
             _categories = categories;
         }
 
-        private string composeTitle(ShizaprojectNode n, ShizaprojectTorrent tr)
+        private string ComposeTitle(ShizaprojectNode n, ShizaprojectTorrent tr)
         {
-            var title = string.Format("{0} / {1}", n.Name, n.OriginalName);
-            foreach (var tl in n.AlternativeNames)
+            var allNames = new HashSet<string>(StringComparer.OrdinalIgnoreCase)
             {
-                title += " / " + tl;
+                n.Name,
+                n.OriginalName
+            };
+            allNames.UnionWith(n.AlternativeNames.ToHashSet());
+
+            var title = $"{string.Join(" / ", allNames)} {tr.Synopsis}";
+
+            if (tr.VideoQualities.Length > 0)
+            {
+                title += $" [{string.Join(" ", tr.VideoQualities)}]";
             }
 
-            title += " [";
-            foreach (var q in tr.VideoQualities)
-            {
-                title += " " + q;
-            }
-
-            title += " ]";
             return title;
         }
 
-        private DateTime getActualPublishDate(ShizaprojectNode n, ShizaprojectTorrent t)
+        private DateTime GetActualPublishDate(ShizaprojectNode n, ShizaprojectTorrent t)
         {
             if (n.PublishedAt == null)
             {
@@ -205,7 +209,7 @@ namespace NzbDrone.Core.Indexers.Definitions
             }
         }
 
-        private string getResolution(string[] qualities)
+        private string GetResolution(string[] qualities)
         {
             var resPrefix = "RESOLUTION_";
             var res = Array.Find(qualities, s => s.StartsWith(resPrefix));
@@ -234,7 +238,7 @@ namespace NzbDrone.Core.Indexers.Definitions
                 {
                     var torrentInfo = new TorrentInfo
                     {
-                        Title = composeTitle(e.Node, tr),
+                        Title = ComposeTitle(e.Node, tr),
                         InfoUrl = string.Format("{0}/releases/{1}/", _settings.BaseUrl.TrimEnd('/'), e.Node.Slug),
                         DownloadVolumeFactor = 0,
                         UploadVolumeFactor = 1,
@@ -242,12 +246,12 @@ namespace NzbDrone.Core.Indexers.Definitions
                         Peers = tr.Leechers + tr.Seeders,
                         Grabs = tr.Downloaded,
                         Categories = _categories.MapTrackerCatDescToNewznab(e.Node.Type),
-                        PublishDate = getActualPublishDate(e.Node, tr),
+                        PublishDate = GetActualPublishDate(e.Node, tr),
                         Guid = tr.File.Url,
                         DownloadUrl = tr.File.Url,
                         MagnetUrl = tr.MagnetUri,
                         Size = tr.Size,
-                        Resolution = getResolution(tr.VideoQualities)
+                        Resolution = GetResolution(tr.VideoQualities)
                     };
 
                     torrentInfos.Add(torrentInfo);
@@ -310,6 +314,7 @@ namespace NzbDrone.Core.Indexers.Definitions
 
     public class ShizaprojectTorrent
     {
+        public string Synopsis { get; set; }
         public int Downloaded { get; set; }
         public int Seeders { get; set; }
         public int Leechers { get; set; }

src/NzbDrone.Core/Indexers/Definitions/SpeedCD.cs

@@ -96,7 +96,7 @@ public class SpeedCD : TorrentIndexerBase<SpeedCDSettings>
         if (CheckIfLoginNeeded(response))
         {
             var parser = new HtmlParser();
-            var dom = parser.ParseDocument(response.Content);
+            using var dom = parser.ParseDocument(response.Content);
             var errorMessage = dom.QuerySelector("h5")?.TextContent.Trim();
 
             if (response.Content.Contains("Wrong Captcha!"))
@@ -323,7 +323,7 @@ public class SpeedCDParser : IParseIndexerResponse
         var releaseInfos = new List<ReleaseInfo>();
 
         var parser = new HtmlParser();
-        var dom = parser.ParseDocument(indexerResponse.Content);
+        using var dom = parser.ParseDocument(indexerResponse.Content);
 
         var rows = dom.QuerySelectorAll("div.boxContent > table > tbody > tr");
         foreach (var row in rows)

src/NzbDrone.Core/Indexers/Definitions/TVVault.cs

@@ -75,7 +75,7 @@ namespace NzbDrone.Core.Indexers.Definitions
             if (CheckIfLoginNeeded(response))
             {
                 var parser = new HtmlParser();
-                var dom = parser.ParseDocument(response.Content);
+                using var dom = parser.ParseDocument(response.Content);
                 var errorMessage = dom.QuerySelector("form#loginform")?.TextContent.Trim();
 
                 throw new IndexerAuthException(errorMessage ?? "Unknown error message, please report.");
@@ -224,7 +224,7 @@ namespace NzbDrone.Core.Indexers.Definitions
             var torrentInfos = new List<ReleaseInfo>();
 
             var parser = new HtmlParser();
-            var doc = parser.ParseDocument(indexerResponse.Content);
+            using var doc = parser.ParseDocument(indexerResponse.Content);
 
             // get params to build download link (user could be banned without those params)
             var rssFeedUri = new Uri(_settings.BaseUrl + doc.QuerySelector("link[href^=\"/feeds.php?feed=\"]")

src/NzbDrone.Core/Indexers/Definitions/Toloka.cs

@@ -74,7 +74,7 @@ namespace NzbDrone.Core.Indexers.Definitions
             if (CheckIfLoginNeeded(response))
             {
                 var parser = new HtmlParser();
-                var dom = parser.ParseDocument(response.Content);
+                using var dom = await parser.ParseDocumentAsync(response.Content);
                 var errorMessage = dom.QuerySelector("table.forumline table span.gen")?.FirstChild?.TextContent;
 
                 throw new IndexerAuthException(errorMessage ?? "Unknown error message, please report.");
@@ -367,7 +367,7 @@ namespace NzbDrone.Core.Indexers.Definitions
             var releaseInfos = new List<ReleaseInfo>();
 
             var parser = new HtmlParser();
-            var dom = parser.ParseDocument(indexerResponse.Content);
+            using var dom = parser.ParseDocument(indexerResponse.Content);
 
             var rows = dom.QuerySelectorAll("table.forumline > tbody > tr[class*=prow]");
             foreach (var row in rows)

src/NzbDrone.Core/Indexers/Definitions/TorrentBytes.cs

@@ -71,7 +71,7 @@ namespace NzbDrone.Core.Indexers.Definitions
             if (CheckIfLoginNeeded(response))
             {
                 var parser = new HtmlParser();
-                var dom = parser.ParseDocument(response.Content);
+                using var dom = parser.ParseDocument(response.Content);
                 var errorMessage = dom.QuerySelector("td.embedded")?.TextContent.Trim();
 
                 throw new IndexerAuthException(errorMessage ?? "Unknown error message, please report.");
@@ -245,7 +245,7 @@ namespace NzbDrone.Core.Indexers.Definitions
             var torrentInfos = new List<ReleaseInfo>();
 
             var parser = new HtmlParser();
-            var doc = parser.ParseDocument(indexerResponse.Content);
+            using var doc = parser.ParseDocument(indexerResponse.Content);
             var rows = doc.QuerySelectorAll("table > tbody:has(tr > td.colhead) > tr:not(:has(td.colhead))");
             foreach (var row in rows)
             {

src/NzbDrone.Core/Indexers/Definitions/TorrentDay.cs

@@ -77,14 +77,6 @@ namespace NzbDrone.Core.Indexers.Definitions
                 }
             };
 
-            caps.Categories.AddCategoryMapping(29, NewznabStandardCategory.TVAnime, "Anime");
-            caps.Categories.AddCategoryMapping(28, NewznabStandardCategory.PC, "Appz/Packs");
-            caps.Categories.AddCategoryMapping(42, NewznabStandardCategory.AudioAudiobook, "Audio Books");
-            caps.Categories.AddCategoryMapping(20, NewznabStandardCategory.Books, "Books");
-            caps.Categories.AddCategoryMapping(30, NewznabStandardCategory.TVDocumentary, "Documentary");
-            caps.Categories.AddCategoryMapping(47, NewznabStandardCategory.Other, "Fonts");
-            caps.Categories.AddCategoryMapping(43, NewznabStandardCategory.PCMac, "Mac");
-
             caps.Categories.AddCategoryMapping(96, NewznabStandardCategory.MoviesUHD, "Movie/4K");
             caps.Categories.AddCategoryMapping(25, NewznabStandardCategory.MoviesSD, "Movies/480p");
             caps.Categories.AddCategoryMapping(11, NewznabStandardCategory.MoviesBluRay, "Movies/Bluray");
@@ -97,31 +89,43 @@ namespace NzbDrone.Core.Indexers.Definitions
             caps.Categories.AddCategoryMapping(48, NewznabStandardCategory.Movies, "Movies/x265");
             caps.Categories.AddCategoryMapping(1, NewznabStandardCategory.MoviesSD, "Movies/XviD");
 
-            caps.Categories.AddCategoryMapping(17, NewznabStandardCategory.AudioMP3, "Music/Audio");
-            caps.Categories.AddCategoryMapping(23, NewznabStandardCategory.AudioForeign, "Music/Non-English");
-            caps.Categories.AddCategoryMapping(41, NewznabStandardCategory.Audio, "Music/Packs");
-            caps.Categories.AddCategoryMapping(16, NewznabStandardCategory.AudioVideo, "Music/Video");
-            caps.Categories.AddCategoryMapping(27, NewznabStandardCategory.Audio, "Music/Flac");
-
-            caps.Categories.AddCategoryMapping(45, NewznabStandardCategory.AudioOther, "Podcast");
-
-            caps.Categories.AddCategoryMapping(4, NewznabStandardCategory.PCGames, "PC/Games");
-            caps.Categories.AddCategoryMapping(18, NewznabStandardCategory.ConsolePS3, "PS3");
-            caps.Categories.AddCategoryMapping(8, NewznabStandardCategory.ConsolePSP, "PSP");
-            caps.Categories.AddCategoryMapping(10, NewznabStandardCategory.ConsoleWii, "Wii");
-            caps.Categories.AddCategoryMapping(9, NewznabStandardCategory.ConsoleXBox360, "Xbox-360");
-
             caps.Categories.AddCategoryMapping(24, NewznabStandardCategory.TVSD, "TV/480p");
             caps.Categories.AddCategoryMapping(32, NewznabStandardCategory.TVHD, "TV/Bluray");
             caps.Categories.AddCategoryMapping(31, NewznabStandardCategory.TVSD, "TV/DVD-R");
             caps.Categories.AddCategoryMapping(33, NewznabStandardCategory.TVSD, "TV/DVD-Rip");
             caps.Categories.AddCategoryMapping(46, NewznabStandardCategory.TVSD, "TV/Mobile");
+            caps.Categories.AddCategoryMapping(82, NewznabStandardCategory.TVForeign, "TV/Non-English");
             caps.Categories.AddCategoryMapping(14, NewznabStandardCategory.TV, "TV/Packs");
             caps.Categories.AddCategoryMapping(26, NewznabStandardCategory.TVSD, "TV/SD/x264");
             caps.Categories.AddCategoryMapping(7, NewznabStandardCategory.TVHD, "TV/x264");
             caps.Categories.AddCategoryMapping(34, NewznabStandardCategory.TVUHD, "TV/x265");
             caps.Categories.AddCategoryMapping(2, NewznabStandardCategory.TVSD, "TV/XviD");
 
+            caps.Categories.AddCategoryMapping(4, NewznabStandardCategory.PCGames, "PC/Games");
+            caps.Categories.AddCategoryMapping(18, NewznabStandardCategory.ConsolePS3, "PS");
+            caps.Categories.AddCategoryMapping(8, NewznabStandardCategory.ConsolePSP, "PSP");
+            caps.Categories.AddCategoryMapping(10, NewznabStandardCategory.ConsoleNDS, "Nintendo");
+            caps.Categories.AddCategoryMapping(9, NewznabStandardCategory.ConsoleXBox, "Xbox");
+
+            caps.Categories.AddCategoryMapping(17, NewznabStandardCategory.AudioMP3, "Music/Audio");
+            caps.Categories.AddCategoryMapping(27, NewznabStandardCategory.Audio, "Music/Flac");
+            caps.Categories.AddCategoryMapping(23, NewznabStandardCategory.AudioForeign, "Music/Non-English");
+            caps.Categories.AddCategoryMapping(41, NewznabStandardCategory.Audio, "Music/Packs");
+            caps.Categories.AddCategoryMapping(16, NewznabStandardCategory.AudioVideo, "Music/Video");
+
+            caps.Categories.AddCategoryMapping(29, NewznabStandardCategory.TVAnime, "Anime");
+            caps.Categories.AddCategoryMapping(42, NewznabStandardCategory.AudioAudiobook, "Audio Books");
+            caps.Categories.AddCategoryMapping(20, NewznabStandardCategory.Books, "Books");
+            caps.Categories.AddCategoryMapping(102, NewznabStandardCategory.BooksForeign, "Books/Non-English");
+            caps.Categories.AddCategoryMapping(30, NewznabStandardCategory.TVDocumentary, "Documentary");
+            caps.Categories.AddCategoryMapping(95, NewznabStandardCategory.TVDocumentary, "Educational");
+            caps.Categories.AddCategoryMapping(47, NewznabStandardCategory.Other, "Fonts");
+            caps.Categories.AddCategoryMapping(43, NewznabStandardCategory.PCMac, "Mac");
+            caps.Categories.AddCategoryMapping(45, NewznabStandardCategory.AudioOther, "Podcast");
+            caps.Categories.AddCategoryMapping(28, NewznabStandardCategory.PC, "Softwa/Packs");
+            caps.Categories.AddCategoryMapping(12, NewznabStandardCategory.PC, "Software");
+
+            caps.Categories.AddCategoryMapping(19, NewznabStandardCategory.XXX, "XXX/0Day");
             caps.Categories.AddCategoryMapping(6, NewznabStandardCategory.XXX, "XXX/Movies");
             caps.Categories.AddCategoryMapping(15, NewznabStandardCategory.XXXPack, "XXX/Packs");
 

src/NzbDrone.Core/Indexers/Definitions/TorrentPotato/TorrentPotatoParser.cs

@@ -40,7 +40,7 @@ namespace NzbDrone.Core.Indexers.Definitions.TorrentPotato
                 var torrentInfo = new TorrentInfo
                 {
                     Guid = GetGuid(torrent),
-                    Title = torrent.release_name,
+                    Title = WebUtility.HtmlDecode(torrent.release_name),
                     Categories = new List<IndexerCategory> { NewznabStandardCategory.Movies },
                     Size = torrent.size * 1000 * 1000,
                     DownloadUrl = torrent.download_url,

src/NzbDrone.Core/Indexers/Definitions/TorrentPotato/TorrentPotatoRequestGenerator.cs

@@ -19,7 +19,7 @@ namespace NzbDrone.Core.Indexers.Definitions.TorrentPotato
         {
             var pageableRequests = new IndexerPageableRequestChain();
 
-            pageableRequests.Add(BuildRequest(searchCriteria.SearchTerm, searchCriteria.ImdbId));
+            pageableRequests.Add(BuildRequest(searchCriteria.SearchTerm, searchCriteria.FullImdbId));
 
             return pageableRequests;
         }

src/NzbDrone.Core/Indexers/Definitions/TorrentPotato/TorrentPotatoSettings.cs

@@ -17,7 +17,7 @@ namespace NzbDrone.Core.Indexers.Definitions.TorrentPotato
         }
     }
 
-    public class TorrentPotatoSettings : IIndexerSettings
+    public class TorrentPotatoSettings : ITorrentIndexerSettings
     {
         private static readonly TorrentPotatoSettingsValidator Validator = new ();
 

src/NzbDrone.Core/Indexers/Definitions/Uniotaku.cs

@@ -65,7 +65,7 @@ public class Uniotaku : TorrentIndexerBase<UniotakuSettings>
         if (CheckIfLoginNeeded(response))
         {
             var parser = new HtmlParser();
-            var dom = parser.ParseDocument(response.Content);
+            using var dom = await parser.ParseDocumentAsync(response.Content);
             var errorMessage = dom.QuerySelector(".login-content span.text-red")?.TextContent.Trim();
 
             throw new IndexerAuthException(errorMessage ?? "Unknown error message, please report.");
@@ -92,7 +92,7 @@ public class Uniotaku : TorrentIndexerBase<UniotakuSettings>
         var response = await _httpClient.ExecuteProxiedAsync(request, Definition);
 
         var parser = new HtmlParser();
-        var dom = parser.ParseDocument(response.Content);
+        using var dom = parser.ParseDocument(response.Content);
         var downloadLink = dom.QuerySelector("a[href^=\"download.php?id=\"]")?.GetAttribute("href")?.Trim();
 
         if (downloadLink == null)
@@ -250,9 +250,9 @@ public class UniotakuParser : IParseIndexerResponse
         var publishDate = DateTime.Now;
         foreach (var item in jsonContent.Value<JArray>("data"))
         {
-            var detailsDom = parser.ParseDocument(item.SelectToken("[0]").Value<string>());
-            var categoryDom = parser.ParseDocument(item.SelectToken("[1]").Value<string>());
-            var groupDom = parser.ParseDocument(item.SelectToken("[7]").Value<string>());
+            using var detailsDom = parser.ParseDocument(item.SelectToken("[0]").Value<string>());
+            using var categoryDom = parser.ParseDocument(item.SelectToken("[1]").Value<string>());
+            using var groupDom = parser.ParseDocument(item.SelectToken("[7]").Value<string>());
 
             var qTitleLink = detailsDom.QuerySelector("a[href^=\"torrents-details.php?id=\"]");
             var title = qTitleLink?.TextContent.Trim();

src/NzbDrone.Core/Indexers/Definitions/XSpeeds.cs

@@ -72,7 +72,7 @@ public class XSpeeds : TorrentIndexerBase<UserPassTorrentBaseSettings>
         if (CheckIfLoginNeeded(response))
         {
             var parser = new HtmlParser();
-            var dom = parser.ParseDocument(response.Content);
+            using var dom = await parser.ParseDocumentAsync(response.Content);
             var errorMessage = dom.QuerySelector(".left_side table:nth-of-type(1) tr:nth-of-type(2)")?.TextContent.Trim().Replace("\n\t", " ");
             if (errorMessage.IsNullOrWhiteSpace())
             {
@@ -289,7 +289,7 @@ public class XSpeedsParser : IParseIndexerResponse
         var releaseInfos = new List<ReleaseInfo>();
 
         var parser = new HtmlParser();
-        var dom = parser.ParseDocument(indexerResponse.Content);
+        using var dom = parser.ParseDocument(indexerResponse.Content);
 
         var rows = dom.QuerySelectorAll("table#sortabletable > tbody > tr:has(a[href*=\"details.php?id=\"])");
         foreach (var row in rows)

src/NzbDrone.Core/Indexers/Definitions/ZonaQ.cs

@@ -59,7 +59,7 @@ namespace NzbDrone.Core.Indexers.Definitions
             // The first page set the cookies and the session_id
             var loginPage = await ExecuteAuth(new HttpRequest(Login1Url));
             var parser = new HtmlParser();
-            var dom = parser.ParseDocument(loginPage.Content);
+            using var dom = parser.ParseDocument(loginPage.Content);
             var sessionId = dom.QuerySelector("input#session_id")?.GetAttribute("value");
             if (string.IsNullOrWhiteSpace(sessionId))
             {
@@ -315,7 +315,7 @@ namespace NzbDrone.Core.Indexers.Definitions
             var torrentInfos = new List<ReleaseInfo>();
 
             var parser = new HtmlParser();
-            var doc = parser.ParseDocument(indexerResponse.Content);
+            using var doc = parser.ParseDocument(indexerResponse.Content);
 
             var rows = doc.QuerySelectorAll("table.torrent_list > tbody > tr");
 

src/NzbDrone.Core/Indexers/HttpIndexerBase.cs

@@ -363,7 +363,7 @@ namespace NzbDrone.Core.Indexers
                             }
                         }
 
-                        releases.AddRange(pagedReleases);
+                        releases.AddRange(pagedReleases.Where(IsValidRelease));
                     }
 
                     if (releases.Any())
@@ -469,6 +469,18 @@ namespace NzbDrone.Core.Indexers
             return Capabilities ?? ((IndexerDefinition)Definition).Capabilities;
         }
 
+        protected virtual bool IsValidRelease(ReleaseInfo release)
+        {
+            if (release.Title.IsNullOrWhiteSpace())
+            {
+                _logger.Error("Invalid Release: '{0}' from indexer: {1}. No title provided.", release.InfoUrl, Definition.Name);
+
+                return false;
+            }
+
+            return true;
+        }
+
         protected virtual bool IsFullPage(IList<ReleaseInfo> page, int pageSize)
         {
             return pageSize != 0 && page.Count >= pageSize;

src/NzbDrone.Core/Indexers/IndexerBase.cs

@@ -149,7 +149,7 @@ namespace NzbDrone.Core.Indexers
             return result.DistinctBy(v => v.Guid).ToList();
         }
 
-        protected IEnumerable<ReleaseInfo> FilterReleasesByQuery(IEnumerable<ReleaseInfo> releases, SearchCriteriaBase searchCriteria)
+        protected virtual IEnumerable<ReleaseInfo> FilterReleasesByQuery(IEnumerable<ReleaseInfo> releases, SearchCriteriaBase searchCriteria)
         {
             var commonWords = new[] { "and", "the", "an", "of" };
 

src/NzbDrone.Core/Indexers/RssParser.cs

@@ -161,6 +161,7 @@ namespace NzbDrone.Core.Indexers
         {
             releaseInfo.Guid = GetGuid(item);
             releaseInfo.Title = GetTitle(item);
+            releaseInfo.Description = GetDescription(item);
             releaseInfo.PublishDate = GetPublishDate(item);
             releaseInfo.DownloadUrl = GetDownloadUrl(item);
             releaseInfo.InfoUrl = GetInfoUrl(item);
@@ -195,6 +196,11 @@ namespace NzbDrone.Core.Indexers
             return item.TryGetValue("title", "Unknown");
         }
 
+        protected virtual string GetDescription(XElement item)
+        {
+            return item.TryGetValue("description", null);
+        }
+
         protected virtual ICollection<IndexerCategory> GetCategory(XElement item)
         {
             return new List<IndexerCategory> { NewznabStandardCategory.Other };

src/NzbDrone.Core/Localization/Core/es.json

@@ -391,7 +391,7 @@
     "UpdateAvailable": "La nueva actualización está disponible",
     "Genre": "Géneros",
     "Publisher": "Editor",
-    "AuthenticationRequired": "Autenticación Requerida",
+    "AuthenticationRequired": "Autenticación requerida",
     "ApplyChanges": "Aplicar Cambios",
     "CountIndexersSelected": "{0} indexador(es) seleccionado(s)",
     "CountDownloadClientsSelected": "{0} cliente(s) de descarga seleccionado(s)",
@@ -424,12 +424,19 @@
     "None": "Ninguna",
     "ResetAPIKeyMessageText": "¿Está seguro de que desea restablecer su clave API?",
     "EditIndexerProxyImplementation": "Agregar Condición - { implementationName}",
-    "AppUpdated": "{appName} Actualizado",
+    "AppUpdated": "{appName} Actualizada",
     "AppUpdatedVersion": "{appName} ha sido actualizado a la versión `{version}`, para obtener los cambios más recientes, necesitaras recargar {appName}",
     "AddApplicationImplementation": "Agregar Condición - { implementationName}",
-    "AddConnectionImplementation": "Agregar Condición - { implementationName}",
+    "AddConnectionImplementation": "Añadir Conexión - {implementationName}",
     "AddIndexerImplementation": "Agregar Condición - { implementationName}",
     "AddIndexerProxyImplementation": "Agregar Condición - { implementationName}",
     "EditApplicationImplementation": "Agregar Condición - { implementationName}",
-    "EditConnectionImplementation": "Agregar Condición - { implementationName}"
+    "EditConnectionImplementation": "Agregar Condición - { implementationName}",
+    "AddDownloadClientImplementation": "Añadir Cliente de Descarga - {implementationName}",
+    "AuthenticationMethod": "Método de autenticación",
+    "AuthenticationMethodHelpTextWarning": "Por favor selecciona un método válido de autenticación",
+    "AuthenticationRequiredHelpText": "Cambiar para que las solicitudes requieran autenticación. No lo cambie a menos que entienda los riesgos.",
+    "AuthenticationRequiredPasswordHelpTextWarning": "Introduzca una nueva contraseña",
+    "AuthenticationRequiredUsernameHelpTextWarning": "Introduzca un nuevo nombre de usuario",
+    "AuthenticationRequiredWarning": "Para evitar el acceso remoto sin autenticación, {appName} ahora requiere que la autenticación esté habilitada. Opcionalmente puede desactivar la autenticación desde una dirección local."
 }

src/NzbDrone.Core/Localization/Core/fi.json

@@ -12,7 +12,7 @@
     "Indexers": "Tietolähteet",
     "MovieIndexScrollBottom": "Elokuvakirjasto: vieritä alas",
     "SSLCertPassword": "SSL-varmenteen salasana",
-    "Style": "Tyyli",
+    "Style": "Ulkoasu",
     "Tags": "Tunnisteet",
     "Today": "Tänään",
     "About": "Tietoja",
@@ -22,7 +22,7 @@
     "ApplicationStatusCheckSingleClientMessage": "Sovellukset eivät ole käytettävissä virheiden vuoksi: {0}",
     "Date": "Päiväys",
     "Dates": "Päiväykset",
-    "SettingsTimeFormat": "Ajan esitystapa",
+    "SettingsTimeFormat": "Kellonajan esitys",
     "Message": "Viesti",
     "Seeders": "Jakajat",
     "TestAll": "Testaa kaikki",
@@ -48,15 +48,15 @@
     "RestartRequiredHelpTextWarning": "Käyttöönotto vaatii uudelleenkäynnistyksen.",
     "Result": "Tulos",
     "Settings": "Asetukset",
-    "SettingsLongDateFormat": "Päiväyksen pitkä esitystapa",
-    "SettingsShortDateFormat": "Päiväyksen lyhyt esitystapa",
+    "SettingsLongDateFormat": "Pitkän päiväyksen esitys",
+    "SettingsShortDateFormat": "Lyhyen päiväyksen esitys",
     "UnselectAll": "Poista kaikkien valinta",
     "UpdateCheckStartupTranslocationMessage": "Päivitystä ei voi asentaa, koska käynnistyskansio '{0}' sijaitsee 'App Translocation' -kansiossa.",
     "UpdateCheckUINotWritableMessage": "Päivitystä ei voi asentaa, koska käyttäjällä '{1}' ei ole kirjoitusoikeutta käyttöliittymäkansioon '{0}'.",
     "UpdateMechanismHelpText": "Käytä Prowlarrin sisäänrakennettua päivitystoimintoa tai omaa komentosarjaasi.",
     "Enable": "Käytä",
     "UI": "Käyttöliittymä",
-    "UrlBaseHelpText": "Käänteisen välityspalvelimen tuki (esim. 'http://[host]:[port]/[urlBase]'). Käytä oletusta jättämällä tyhjäksi.",
+    "UrlBaseHelpText": "Käänteisen välityspalvelimen tuki (esim. \"http://[host]:[port]/[urlBase]\"). Käytä oletusta jättämällä tyhjäksi.",
     "Usenet": "Usenet",
     "BackupNow": "Varmuuskopioi nyt",
     "NoBackupsAreAvailable": "Varmuuskopioita ei ole saatavilla",
@@ -71,8 +71,8 @@
     "NoTagsHaveBeenAddedYet": "Tunnisteita ei ole vielä lisätty.",
     "ApplyTags": "Tunnistetoimenpide",
     "Authentication": "Todennus",
-    "AuthenticationMethodHelpText": "Vaadi käyttäjätunnus ja salasana.",
-    "BindAddressHelpText": "Toimiva IP-osoite, localhost tai '*' (tähti) kaikille yhteyksille.",
+    "AuthenticationMethodHelpText": "Vaadi käyttäjätunnus ja salasana {appName}in käyttöön.",
+    "BindAddressHelpText": "Toimiva IP-osoite, \"localhost\" tai \"*\" (tähti) kaikille verkkoliitännöille.",
     "Close": "Sulje",
     "DeleteNotification": "Poista kytkentä",
     "Docker": "Docker",
@@ -96,7 +96,7 @@
     "Protocol": "Protokolla",
     "ProxyCheckBadRequestMessage": "Välityspalvelintesti epäonnistui. Tilakoodi: {0}",
     "ProxyCheckFailedToTestMessage": "Välityspalvelintesti epäonnistui: {0}",
-    "ProxyCheckResolveIpMessage": "Määritetyn välityspalvelimen '{0}' IP-osoitteen selvitys epäonnistui.",
+    "ProxyCheckResolveIpMessage": "Määritetyn välityspalvelimen \"{0}\" IP-osoitteen selvitys epäonnistui.",
     "ProxyPasswordHelpText": "Käyttäjätunnus ja salasana tulee syöttää vain tarvittaessa. Muussa tapauksessa jätä kentät tyhjiksi.",
     "ProxyType": "Välityspalvelimen tyyppi",
     "ProxyUsernameHelpText": "Käyttäjätunnus ja salasana tulee syöttää vain tarvittaessa. Muussa tapauksessa jätä kentät tyhjiksi.",
@@ -145,7 +145,7 @@
     "All": "Kaikki",
     "AllIndexersHiddenDueToFilter": "Aktiivinen suodatin on piilottanut kaikki tietolähteet.",
     "Analytics": "Analytiikka",
-    "AnalyticsEnabledHelpText": "Lähetä nimettömiä käyttö- ja virhetietoja sovelluksen palvelimille. Tämä sisältää tietoja selaimestasi, verkkokäyttöliittymän sivujen käytöstä, virheraportoinnista sekä käyttöjärjestelmästäsi ja versiosta. Käytämme näitä tietoja ominaisuuksien ja virhekorjauksien painotukseen.",
+    "AnalyticsEnabledHelpText": "Lähetä nimettömiä käyttö- ja virhetietoja palvelimillemme. Tämä sisältää tietoja selaimestasi, käyttöliittymän sivujen käytöstä, virheraportoinnista, käyttöjärjestelmästä ja suoritusalustasta. Käytämme näitä tietoja ominaisuuksien ja vikakorjausten painotukseen.",
     "ApiKey": "API-avain",
     "AppDataDirectory": "AppData-kansio",
     "DBMigration": "Tietokannan siirto",
@@ -181,7 +181,7 @@
     "Discord": "Discord",
     "Donations": "Lahjoitukset",
     "Edit": "Muokkaa",
-    "EnableAutomaticSearchHelpText": "Profiilia käytetään automaattihaun yhteydessä, kun haku suoritetaan käyttöliittymästä tai Prowlarrin toimesta.",
+    "EnableAutomaticSearchHelpText": "Profiilia käytetään automaattihauille, jotka suoritetaan käyttöliittymästä tai Prowlarrin toimesta.",
     "Enabled": "Käytössä",
     "EventType": "Tapahtumatyyppi",
     "Exception": "Poikkeus",
@@ -199,9 +199,9 @@
     "SaveChanges": "Tallenna muutokset",
     "SaveSettings": "Tallenna asetukset",
     "Scheduled": "Ajoitettu",
-    "SettingsEnableColorImpairedModeHelpText": "Muokattu tyyli käyttäjille, joiden värinäkö on heikentynyt. Auttaa erottamaan värikoodatun tiedon.",
-    "SettingsShowRelativeDates": "Näytä suhteutetut päiväykset",
-    "SettingsShowRelativeDatesHelpText": "Näytä suhteutetut (tänään/eilen/yms.) tai absoluuttiset päiväykset.",
+    "SettingsEnableColorImpairedModeHelpText": "Vaihtoehtoinen tyyli, joka auttaa erottamaan värikoodatut tiedot paremmin",
+    "SettingsShowRelativeDates": "Suhteellisten päiväysten esitys",
+    "SettingsShowRelativeDatesHelpText": "Näytä suhteutetut (tänään/eilen/yms.) absoluuttisten sijaan",
     "ShowSearch": "Näytä haku",
     "Source": "Lähde",
     "SSLPort": "SSL-portti",
@@ -435,7 +435,7 @@
     "EditSyncProfile": "Muokkaa synkronointiprofiilia",
     "InstanceName": "Instanssin nimi",
     "InstanceNameHelpText": "Instanssin nimi välilehdellä ja järjestelmälokissa",
-    "ThemeHelpText": "Vaihda sovelluksen käyttöliittymän ulkoasua. \"Automaattinen\" vaihtaa vaalean ja tumman tilan käyttöjärjestelmäsi teemaa vastaavaksi. Innoittanut {0}.",
+    "ThemeHelpText": "Vaihda sovelluksen käyttöliittymän ulkoasu. \"Automaattinen\" vaihtaa vaalean ja tumman tilan välillä järjestelmän teeman mukaan. Innoittanut Theme.Park.",
     "Duration": "Kesto",
     "ElapsedTime": "Kulunut aika",
     "EnabledRedirected": "Kulunut, uudelleenohjattu",
@@ -485,11 +485,11 @@
     "Episode": "Jakso",
     "Label": "Tunniste",
     "Theme": "Teema",
-    "ConnectionLostReconnect": "Radarr pyrkii muodostamaan yhteyden automaattisesti tai voit painaa alta \"Lataa uudelleen\".",
+    "ConnectionLostReconnect": "{appName} pyrkii ajoittain muodostamaan yhteyden automaattisesti tai sitä voidaan yrittää manuaalisesti painamalla alta \"Lataa uudelleen\".",
     "DeleteAppProfileMessageText": "Haluatko varmasti poistaa laatuprofiilin '{0}'?",
     "RecentChanges": "Viimeaikaiset muutokset",
     "WhatsNew": "Mikä on uutta?",
-    "ConnectionLostToBackend": "Radarr on menettänyt yhteyden taustajärjestelmään ja sivu on päivitettävä toiminnallisuuden palauttamiseksi.",
+    "ConnectionLostToBackend": "{appName} kadotti yhteyden taustajärjestelmään ja käytettävyyden palauttamiseksi se on ladattava uudelleen.",
     "minutes": "Minuuttia",
     "AddConnection": "Lisää yhteys",
     "NotificationStatusAllClientHealthCheckMessage": "Sovellukset eivät ole käytettävissä virheiden vuoksi",
@@ -498,5 +498,11 @@
     "AuthForm": "Lomake (kirjautumissivu)",
     "DisabledForLocalAddresses": "Ei käytetä paikallisille osoittelle",
     "None": "Ei mitään",
-    "ResetAPIKeyMessageText": "Haluatko varmasti uudistaa API-avaimesi?"
+    "ResetAPIKeyMessageText": "Haluatko varmasti uudistaa API-avaimesi?",
+    "TotalIndexerSuccessfulGrabs": "Onnistuneiden tietolähdesieppausten kokonaismäärä",
+    "AppUpdated": "{appName} on päivitetty",
+    "AppUpdatedVersion": "{appName} on päivitetty versioon {version} ja muutosten käyttöönottamiseksi se on ladattava uudelleen.",
+    "IndexerDownloadClientHelpText": "Määritä tämän tietolähteen kanssa käytettävä lataustyökalu",
+    "AuthenticationRequiredWarning": "Etäkäytön estämiseksi ilman tunnistautumista {appName} vaatii nyt todennuksen käyttöönoton. Todennus voidaan poistaa käytöstä paikallisille osoitteille.",
+    "TotalGrabs": "Sieppausten kokonaismäärä"
 }

src/NzbDrone.Core/Localization/Core/fr.json

@@ -3,16 +3,16 @@
     "Indexers": "Indexeurs",
     "Host": "Hôte",
     "History": "Historique",
-    "HideAdvanced": "Masquer avancé",
+    "HideAdvanced": "Masquer param. av.",
     "Health": "Santé",
     "General": "Général",
     "Folder": "Dossier",
-    "Filter": "Filtre",
+    "Filter": "Filtrer",
     "Files": "Fichiers",
     "Events": "Événements",
-    "Edit": "Éditer",
+    "Edit": "Modifier",
     "DownloadClientStatusCheckAllClientMessage": "Aucun client de téléchargement n'est disponible en raison d'échecs",
-    "DownloadClients": "Clients télécharg.",
+    "DownloadClients": "Clients de télécharg.",
     "Dates": "Dates",
     "Date": "Date",
     "Delete": "Supprimer",
@@ -28,19 +28,19 @@
     "About": "À propos",
     "IndexerStatusCheckSingleClientMessage": "Indexeurs indisponibles en raison d'échecs : {0}",
     "DownloadClientStatusCheckSingleClientMessage": "Clients de Téléchargement indisponibles en raison d'échecs : {0}",
-    "SetTags": "Définir Tags",
+    "SetTags": "Définir les étiquettes",
     "ReleaseStatus": "Statut de la version",
     "UpdateCheckUINotWritableMessage": "Impossible d'installer la mise à jour car le dossier d'interface utilisateur '{0}' n'est pas accessible en écriture par l'utilisateur '{1}'.",
     "UpdateCheckStartupTranslocationMessage": "Impossible d'installer la mise à jour car le dossier de démarrage '{0}' se trouve dans un dossier App Translocation.",
     "UpdateCheckStartupNotWritableMessage": "Impossible d'installer la mise à jour car le dossier de démarrage '{0}' n'est pas accessible en écriture par l'utilisateur '{1}'.",
-    "UnselectAll": "Tout déselectionner",
+    "UnselectAll": "Tout désélectionner",
     "UISettingsSummary": "Date, langue, et perceptions des couleurs",
-    "TagsSettingsSummary": "Voir tous les tags et leur utilisation. Les tags inutilisés peuvent être supprimés",
+    "TagsSettingsSummary": "Voir toutes les étiquettes et leur utilisation. Les étiquettes inutilisées peuvent être supprimées",
     "Style": "Style",
-    "Status": "Statut",
+    "Status": "État",
     "Sort": "Trier",
     "Size": "Taille",
-    "ShowAdvanced": "Afficher avancés",
+    "ShowAdvanced": "Afficher param. av.",
     "Settings": "Paramètres",
     "SelectAll": "Tout sélectionner",
     "Security": "Sécurité",
@@ -53,15 +53,15 @@
     "Queue": "File d'attente",
     "ProxyCheckResolveIpMessage": "Impossible de résoudre l'adresse IP de l'hôte proxy configuré {0}",
     "ProxyCheckFailedToTestMessage": "Échec du test du proxy : {0}",
-    "ProxyCheckBadRequestMessage": "Échec du test du proxy. StatusCode : {0}",
+    "ProxyCheckBadRequestMessage": "Échec du test du proxy. Code d'état : {0}",
     "Proxy": "Proxy",
     "Protocol": "Protocole",
     "Options": "Options",
-    "NoChanges": "Aucun changement",
+    "NoChanges": "Aucune modification",
     "NoChange": "Pas de changement",
     "MoreInfo": "Plus d'informations",
     "Grabbed": "Récupéré",
-    "DownloadClientsSettingsSummary": "Clients de Téléchargement configuration pour l'intégration dans la recherche de l'interface utilisateur Prowlarr",
+    "DownloadClientsSettingsSummary": "Configuration des clients de téléchargement pour intégration dans la recherche de l'interface utilisateur de Prowlarr",
     "DownloadClient": "Client de Téléchargement",
     "Logging": "Enregistrement",
     "LogFiles": "Fichiers Log",
@@ -69,7 +69,7 @@
     "Updates": "Mises à jour",
     "UI": "UI",
     "Tasks": "Tâches",
-    "Tags": "Tags",
+    "Tags": "Étiquettes",
     "System": "Système",
     "LastWriteTime": "Heure de la dernière écriture",
     "Language": "Langue",
@@ -116,18 +116,18 @@
     "HealthNoIssues": "Aucun problème avec votre configuration",
     "SystemTimeCheckMessage": "L'heure du système est décalée de plus d'un jour. Les tâches planifiées peuvent ne pas s'exécuter correctement tant que l'heure ne sera pas corrigée",
     "SettingsShowRelativeDates": "Afficher les dates relatives",
-    "UnsavedChanges": "Changement non sauvegardés",
-    "ShowSearchHelpText": "Afficher le bouton de recherche au survol de la souris",
+    "UnsavedChanges": "Modifications non sauvegardées",
+    "ShowSearchHelpText": "Affiche le bouton de recherche au survol du curseur",
     "ShowSearch": "Afficher la recherche",
     "SettingsTimeFormat": "Format de l'heure",
-    "SettingsShowRelativeDatesHelpText": "Afficher les dates relatives (Aujourd'hui/ Hier/ etc) ou absolues",
+    "SettingsShowRelativeDatesHelpText": "Afficher les dates relatives (aujourd'hui, hier, etc.) ou absolues",
     "SettingsShortDateFormat": "Format de date court",
     "SettingsLongDateFormat": "Format de date long",
     "SettingsEnableColorImpairedModeHelpText": "Style altéré pour aider les personnes daltoniennes à distinguer les informations en couleurs",
     "SettingsEnableColorImpairedMode": "Activer le mode daltonien",
-    "PendingChangesStayReview": "Rester et vérifier les changements",
-    "PendingChangesMessage": "Vous avez effectué des changements non sauvegardés, souhaitez vous quitter cette page ?",
-    "PendingChangesDiscardChanges": "Abandonner les changements et quitter",
+    "PendingChangesStayReview": "Rester et vérifier les modifications",
+    "PendingChangesMessage": "Vous avez des modifications non sauvegardées, voulez-vous vraiment quitter cette page ?",
+    "PendingChangesDiscardChanges": "Abandonner les modifications et quitter",
     "CloneProfile": "Dupliqué le profil",
     "ClientPriority": "Priorité du client",
     "ChangeHasNotBeenSavedYet": "Les changements n'ont pas encore été sauvegardés",
@@ -135,15 +135,15 @@
     "CertificateValidation": "Validation du certificat",
     "BypassProxyForLocalAddresses": "Contourner le proxy pour les adresses locales",
     "Branch": "Branche",
-    "BindAddressHelpText": "Adresse IP valide, localhost ou '*' pour toutes les interfaces",
+    "BindAddressHelpText": "Adresse IP valide, localhost ou « * » pour toutes les interfaces",
     "BindAddress": "Adresse d'attache",
     "Backups": "Sauvegardes",
     "BackupRetentionHelpText": "Les sauvegardes automatiques plus anciennes que la période de conservation seront automatiquement effacées",
     "BackupIntervalHelpText": "Intervalle entre les sauvegardes automatiques",
     "Automatic": "Automatique",
-    "AuthenticationMethodHelpText": "Exiger un identifiant et un mot de passe pour accéder à Prowlarr",
+    "AuthenticationMethodHelpText": "Exiger un nom d'utilisateur et un mot de passe pour accéder à {appName}",
     "Authentication": "Authentification",
-    "ApplyTags": "Appliquer les tags",
+    "ApplyTags": "Appliquer les étiquettes",
     "AppDataDirectory": "Dossier AppData",
     "ApiKey": "Clé API",
     "AnalyticsEnabledHelpText": "Envoyer des informations anonymes sur l'utilisation et les erreurs vers les serveurs de Prowlarr. Cela inclut des informations sur votre navigateur, quelle page Prowlarr WebUI vous utilisez, les rapports d'erreurs, ainsi que le système d'exploitation et sa version. Nous utiliserons ces informations pour prioriser les nouvelles fonctionnalités et les corrections de bugs.",
@@ -170,8 +170,8 @@
     "BranchUpdateMechanism": "Branche utilisée par le mécanisme de mise à jour extérieur",
     "BranchUpdate": "Branche à utiliser pour mettre Prowlarr à jour",
     "BeforeUpdate": "Avant la mise à jour",
-    "DeleteDownloadClientMessageText": "Êtes-vous sûr de vouloir supprimer le client de téléchargement '{0}' ?",
-    "DeleteBackupMessageText": "Êtes-vous sûr de vouloir supprimer la sauvegarde '{0}' ?",
+    "DeleteDownloadClientMessageText": "Voulez-vous supprimer le client de téléchargement « {name} » ?",
+    "DeleteBackupMessageText": "Voulez-vous supprimer la sauvegarde « {name} » ?",
     "ErrorLoadingContents": "Erreur lors du chargement du contenu",
     "EnableInteractiveSearchHelpText": "Sera utilisé lorsque la recherche interactive est utilisée",
     "EnableAutomaticSearchHelpText": "Sera utilisé lorsque les recherches automatiques sont effectuées via l'interface utilisateur ou par Prowlarr",
@@ -180,7 +180,7 @@
     "Exception": "Exception",
     "EditIndexer": "Modifier l'indexeur",
     "Disabled": "Désactivé",
-    "DeleteNotificationMessageText": "Êtes-vous sûr de vouloir supprimer la notification '{0}' ?",
+    "DeleteNotificationMessageText": "Voulez-vous supprimer la notification « {name} » ?",
     "AutomaticSearch": "Recherche automatique",
     "AddIndexer": "Ajouter un indexeur",
     "Interval": "Intervalle",
@@ -203,14 +203,14 @@
     "LogLevelTraceHelpTextWarning": "La journalisation des traces ne doit être activée que temporairement",
     "LogLevel": "Niveau du journal",
     "IncludeHealthWarningsHelpText": "Inclure avertissements santé",
-    "FocusSearchBox": "Zone de recherche de focus",
+    "FocusSearchBox": "Placer le curseur sur la barre de recherche",
     "ProxyBypassFilterHelpText": "Utiliser ',' comme séparateur et '*.' comme caractère générique pour les sous-domaines",
     "Uptime": "Durée de fonctionnent",
     "UpdateScriptPathHelpText": "Chemin vers un script personnalisé qui prend un package de mise à jour extraite et gère le reste du processus de mise à jour",
     "UpdateMechanismHelpText": "Utiliser le programme de mise à jour intégré de Prowlarr ou un script",
     "UpdateAutomaticallyHelpText": "Télécharger et installer automatiquement les mises à jour. Vous pourrez toujours installer à partir de System : Updates",
     "UnableToLoadUISettings": "Impossible de charger les paramètres de l'interface utilisateur",
-    "UnableToLoadTags": "Impossible de charger les balises",
+    "UnableToLoadTags": "Impossible de charger les étiquettes",
     "UnableToLoadHistory": "Impossible de charger l'historique",
     "UnableToLoadGeneralSettings": "Impossible de charger les paramètres généraux",
     "UnableToLoadDownloadClients": "Impossible de charger les clients de téléchargement",
@@ -218,16 +218,16 @@
     "UnableToAddANewNotificationPleaseTryAgain": "Impossible d'ajouter une nouvelle notification, veuillez réessayer.",
     "UnableToAddANewIndexerPleaseTryAgain": "Impossible d'ajouter un nouvel indexeur, veuillez réessayer.",
     "UnableToAddANewDownloadClientPleaseTryAgain": "Impossible d'ajouter un nouveau client de téléchargement, veuillez réessayer.",
-    "TagIsNotUsedAndCanBeDeleted": "La balise n'est pas utilisée et peut être supprimée",
-    "TagsHelpText": "S'applique aux films avec au moins une balise correspondante",
-    "StartTypingOrSelectAPathBelow": "Commencer à taper ou sélectionner un chemin ci-dessous",
-    "NoTagsHaveBeenAddedYet": "Aucune identification n'a été ajoutée pour l'instant",
+    "TagIsNotUsedAndCanBeDeleted": "L'étiquette n'est pas utilisée et peut être supprimée",
+    "TagsHelpText": "S'applique aux indexeurs avec au moins une étiquette correspondante",
+    "StartTypingOrSelectAPathBelow": "Commencer à écrire ou sélectionner un chemin ci-dessous",
+    "NoTagsHaveBeenAddedYet": "Aucune étiquette n'a encore été ajoutée",
     "IndexerFlags": "Indicateurs d'indexeur",
-    "DeleteTagMessageText": "Voulez-vous vraiment supprimer la balise '{0}' ?",
+    "DeleteTagMessageText": "Voulez-vous vraiment supprimer l'étiquette « {label} » ?",
     "UISettings": "Paramètres UI",
     "UILanguageHelpTextWarning": "Rechargement du navigateur requis",
     "UILanguageHelpText": "Langue que Prowlarr utilisera pour l'interface utilisateur",
-    "UILanguage": "UI Langue",
+    "UILanguage": "Langue de l'IU",
     "Torrents": "Torrents",
     "TestAllClients": "Tester tous les clients",
     "TagCannotBeDeletedWhileInUse": "Ne peut pas être supprimé pendant l'utilisation",
@@ -254,7 +254,7 @@
     "ExistingTag": "Tag existant",
     "RemoveFilter": "Supprimer le filtre",
     "RemovedFromTaskQueue": "Supprimé de la file d'attente des tâches",
-    "RefreshMovie": "Actualiser film",
+    "RefreshMovie": "Actualiser le film",
     "ReadTheWikiForMoreInformation": "Consultez le Wiki pour plus d'informations",
     "ProwlarrSupportsAnyIndexer": "Prowlarr prend en charge de nombreux indexeurs en plus de tout indexeur qui utilise la norme Newznab/Torznab en utilisant « Generic Newznab » (pour usenet) ou « Generic Torznab » (pour les torrents). Recherchez et sélectionnez votre indexeur ci-dessous.",
     "ProwlarrSupportsAnyDownloadClient": "Prowlarr prend en charge tout client de téléchargement qui utilise le standard Newznab, ainsi que d'autres clients de téléchargement répertoriés ci-dessous.",
@@ -276,14 +276,14 @@
     "New": "Nouveau",
     "NetCore": ".NET Core",
     "MovieIndexScrollTop": "Index des films : faire défiler vers le haut",
-    "MovieIndexScrollBottom": "Index des Films : faire défiler vers le bas",
+    "MovieIndexScrollBottom": "Index des films : faire défiler vers le bas",
     "MIA": "MIA",
     "LaunchBrowserHelpText": " Ouvrer un navigateur Web et accéder à la page d'accueil de Prowlarr au démarrage de l'application.",
-    "CloseCurrentModal": "Fermer le modal actuel",
-    "AddingTag": "Ajouter un tag",
+    "CloseCurrentModal": "Fermer cette fenêtre modale",
+    "AddingTag": "Ajout d'une étiquette",
     "OnHealthIssueHelpText": "Sur un problème de santé",
     "AcceptConfirmationModal": "Accepter les modalités d'utilisations",
-    "OpenThisModal": "Ouvrer ce modal",
+    "OpenThisModal": "Ouvrir cette fenêtre modale",
     "IndexerLongTermStatusCheckSingleClientMessage": "Indexeurs indisponibles en raison de pannes pendant plus de 6 heures : {0}",
     "IndexerLongTermStatusCheckAllClientMessage": "Tous les indexeurs sont indisponibles en raison d'échecs de plus de 6 heures",
     "Yesterday": "Hier",
@@ -311,9 +311,9 @@
     "EnableRss": "Activer RSS",
     "EnableIndexer": "Activer l'indexeur",
     "DevelopmentSettings": "Paramètres de développement",
-    "DeleteApplicationMessageText": "Etes-vous sûr de vouloir supprimer l'application '{0}' ?",
+    "DeleteApplicationMessageText": "Voulez-vous supprimer l'application « {name} » ?",
     "DeleteApplication": "Supprimer l'application",
-    "ClearHistoryMessageText": "Vous êtes sûr de vouloir effacer tout l'historique de Prowlarr ?",
+    "ClearHistoryMessageText": "Voulez-vous vraiment effacer tout l'historique de Prowlarr ?",
     "ClearHistory": "Effacer l'historique",
     "ApplicationStatusCheckSingleClientMessage": "Applications indisponibles en raison de dysfonctionnements : {0}",
     "ApplicationStatusCheckAllClientMessage": "Toutes les applications sont indisponibles en raison de dysfonctionnements",
@@ -347,7 +347,7 @@
     "Grabs": "Complétés",
     "Id": "Id",
     "Presets": "Préconfigurations",
-    "Privacy": "Vie privée",
+    "Privacy": "Visibilité",
     "Query": "Requête",
     "Stats": "Stats",
     "Torrent": "Torrent",
@@ -363,14 +363,14 @@
     "AddDownloadClientToProwlarr": "L'ajout d'un client de téléchargement permet à Prowlarr d'envoyer des fichers directement depuis l'interface utilisateur tout en effectuant une recherche manuelle.",
     "NoSearchResultsFound": "Aucun résultat de recherche trouvé, essayez d'effectuer une nouvelle recherche ci-dessous.",
     "DeleteIndexerProxy": "Supprimer le proxy indexeur",
-    "DeleteIndexerProxyMessageText": "Êtes-vous sur de vouloir supprimer le proxy '{0}'  ?",
+    "DeleteIndexerProxyMessageText": "Voulez-vous supprimer le proxy d'indexeur « {name} » ?",
     "AddIndexerProxy": "Ajouter proxy indexeur",
     "AppSettingsSummary": "Applications et paramètres pour configurer comment Prowlarr interagit avec vos programmes PVR",
-    "IndexerTagsHelpText": "Utilisez des balises pour spécifier les proxys d'indexation ou les applications avec lesquelles l'indexeur est synchronisé. Les applications sans 1 ou plusieurs balises d'indexation correspondantes ne seront pas synchronisées.",
+    "IndexerTagsHelpText": "Utilisez des étiquettes pour spécifier les proxies d'indexation ou les applications avec lesquelles l'indexeur est synchronisé.",
     "Notifications": "Notifications",
     "IndexerVipCheckExpiredClientMessage": "Les avantages VIP de l'indexeur ont expiré : {0}",
     "IndexerProxy": "Proxy d'indexation",
-    "IndexerSettingsSummary": "Configuration de divers paramètres globaux de l'indexeur, y compris les proxys.",
+    "IndexerSettingsSummary": "Configuration de divers paramètres globaux de l'indexeur, y compris les proxies.",
     "IndexerProxies": "Proxys d'indexation",
     "IndexerProxyStatusCheckAllClientMessage": "Tous les proxys sont indisponibles en raison d'échecs",
     "IndexerProxyStatusCheckSingleClientMessage": "Proxys indisponibles en raison d'échecs : {0}",
@@ -440,7 +440,7 @@
     "Started": "Démarré",
     "EditSyncProfile": "Modifier le profil de synchronisation",
     "AddSyncProfile": "Ajouter un profil de synchronisation",
-    "ThemeHelpText": "Changez le thème de l'interface de l'application. Le thème \"Auto\" utilisera celui de votre système d'exploitation pour définir le mode clair ou foncé. Inspiré par {0}",
+    "ThemeHelpText": "Changez le thème de l'interface de l'application. Le thème « Auto » utilisera celui de votre système d'exploitation pour déterminer entre le mode clair ou foncé. Inspiré par {inspiredBy}.",
     "SyncProfile": "Profil de synchronisation",
     "SyncProfiles": "Profils de synchronisation",
     "MinimumSeeders": "Nombre minimum de seeders",
@@ -449,18 +449,18 @@
     "ElapsedTime": "Temps écoulé",
     "Parameters": "Paramètres",
     "AuthenticationRequired": "Authentification requise",
-    "AuthenticationRequiredHelpText": "Modifier les demandes pour lesquelles l'authentification est requise. Ne changez rien si vous ne comprenez pas les risques.",
+    "AuthenticationRequiredHelpText": "Modifier les demandes pour lesquelles l'authentification est requise. Ne rien modifier si vous n'en comprenez pas les risques.",
     "DeleteClientCategory": "Supprimer la catégorie du client de téléchargement",
     "DownloadClientCategory": "Catégorie du client de téléchargement",
     "MappedCategories": "Catégories mappées",
     "EnabledRedirected": "Activé, Redirigé",
     "GrabTitle": "Récupérer le titre",
-    "AuthenticationRequiredWarning": "Pour empêcher l'accès à distance sans authentification, Prowlarr exige désormais que l'authentification soit activée. Configurez votre méthode d'authentification et vos informations d'identification. Vous pouvez éventuellement désactiver l'authentification à partir des adresses locales. Reportez-vous à la FAQ pour plus d'informations.",
+    "AuthenticationRequiredWarning": "Pour empêcher l'accès à distance sans authentification, {appName} exige désormais que l'authentification soit activée. Vous pouvez éventuellement désactiver l'authentification pour les adresses locales.",
     "Remove": "Retirer",
     "Replace": "Remplacer",
-    "TheLatestVersionIsAlreadyInstalled": "La dernière version de Prowlarr est déjà installée",
+    "TheLatestVersionIsAlreadyInstalled": "La dernière version de {appName} est déjà installée",
     "AddCustomFilter": "Ajouter filtre personnalisé",
-    "AddApplication": "Ajouter application",
+    "AddApplication": "Ajouter une application",
     "IncludeManualGrabsHelpText": "Inclure les saisies manuelles effectuées dans Prowlarr",
     "OnGrabHelpText": "Récupéré à la sortie",
     "RssFeed": "Flux RSS",
@@ -480,7 +480,7 @@
     "Book": "Livre",
     "Artist": "Artiste",
     "Author": "Auteur",
-    "AverageResponseTimesMs": "Temps de réponse moyen (Ms)",
+    "AverageResponseTimesMs": "Temps de réponse moyen des indexeurs (ms)",
     "IndexerFailureRate": "Taux d'échec de l'indexeur",
     "Label": "Label",
     "More": "Plus",
@@ -494,57 +494,104 @@
     "Year": "Année",
     "ApplicationURL": "URL de l'application",
     "ApiKeyValidationHealthCheckMessage": "Veuillez mettre à jour votre clé API pour qu'elle contienne au moins {0} caractères. Vous pouvez le faire via les paramètres ou le fichier de configuration",
-    "ApplicationUrlHelpText": "URL externe de cette application, y compris http(s)://, le port ainsi que la base de URL",
+    "ApplicationUrlHelpText": "L'URL externe de cette application, y compris http(s)://, le port ainsi que la base de URL",
     "ApplyChanges": "Appliquer les modifications",
-    "ApplyTagsHelpTextAdd": "Ajouter : Ajouter les tags à la liste de tags existantes",
-    "ApplyTagsHelpTextHowToApplyApplications": "Comment appliquer des tags à l'auteur sélectionné",
-    "CountIndexersSelected": "{0} indexeur(s) sélectionné(s)",
-    "DeleteSelectedApplicationsMessageText": "Voulez-vous vraiment supprimer l'indexeur '{0}' ?",
-    "DeleteSelectedIndexersMessageText": "Voulez-vous vraiment supprimer l'indexeur '{0}' ?",
+    "ApplyTagsHelpTextAdd": "Ajouter : ajoute les étiquettes à la liste de étiquettes existantes",
+    "ApplyTagsHelpTextHowToApplyApplications": "Comment appliquer les étiquettes aux applications sélectionnées",
+    "CountIndexersSelected": "{count} indexeur(s) sélectionné(s)",
+    "DeleteSelectedApplicationsMessageText": "Voulez-vous vraiment supprimer {count} application(s) sélectionnée(s) ?",
+    "DeleteSelectedIndexersMessageText": "Voulez-vous vraiment supprimer les {count} indexeur(s) sélectionné(s) ?",
     "DownloadClientPriorityHelpText": "Donnez la priorité à plusieurs clients de téléchargement. Le Round-Robin est utilisé pour les clients ayant la même priorité.",
-    "SelectIndexers": "Recherche indexeurs",
-    "ApplyTagsHelpTextHowToApplyIndexers": "Comment appliquer des tags aux indexeurs sélectionnés",
-    "ApplyTagsHelpTextRemove": "Suprimer : Suprime les étiquettes renseignées",
-    "ApplyTagsHelpTextReplace": "Remplacer : Remplace les tags par les tags renseignés (ne pas renseigner de tags pour effacer tous les tags)",
+    "SelectIndexers": "Sélectionner les indexeurs",
+    "ApplyTagsHelpTextHowToApplyIndexers": "Comment appliquer des étiquettes aux indexeurs sélectionnés",
+    "ApplyTagsHelpTextRemove": "Supprimer : supprime les étiquettes renseignées",
+    "ApplyTagsHelpTextReplace": "Remplacer : remplace les étiquettes par les étiquettes renseignées (ne pas renseigner d'étiquette pour toutes les effacer)",
     "DeleteSelectedDownloadClients": "Supprimer le client de téléchargement",
-    "DeleteSelectedDownloadClientsMessageText": "Voulez-vous vraiment supprimer l'indexeur '{0}' ?",
-    "StopSelecting": "Arrêtez la sélection",
+    "DeleteSelectedDownloadClientsMessageText": "Voulez-vous vraiment supprimer {count} client(s) de téléchargement sélectionné(s) ?",
+    "StopSelecting": "Effacer la sélection",
     "UpdateAvailable": "Une nouvelle mise à jour est disponible",
     "AdvancedSettingsHiddenClickToShow": "Paramètres avancés masqués, cliquez pour afficher",
     "AdvancedSettingsShownClickToHide": "Paramètres avancés affichés, cliquez pour masquer",
     "AppsMinimumSeeders": "Apps avec le nombre minimum de seeders disponibles",
     "AppsMinimumSeedersHelpText": "Minimum de seeders requis par les applications pour que l’indexeur les récupère, laisser vide utilise la valeur par défaut du profil Sync",
     "BasicSearch": "Recherche de base",
-    "CountIndexersAvailable": "{0} indexeur(s) disponible(s)",
+    "CountIndexersAvailable": "{count} indexeur(s) disponible(s)",
     "DeleteSelectedApplications": "Supprimer les applications sélectionnées",
     "DeleteSelectedIndexer": "Supprimer les indexeurs sélectionnés",
     "DeleteSelectedIndexers": "Supprimer les indexeurs sélectionnés",
     "EditSelectedDownloadClients": "Modifier les clients de téléchargement sélectionnés",
     "EditSelectedIndexers": "Modifier les indexeurs sélectionnés",
-    "AreYouSureYouWantToDeleteIndexer": "Êtes-vous sûr de vouloir supprimer “{0}” de Prowlarr ?",
+    "AreYouSureYouWantToDeleteIndexer": "Voulez-vous supprimer « {name} » de Prowlarr ?",
     "AuthQueries": "Requêtes d’authentification",
-    "CountApplicationsSelected": "{0} application(s) sélectionnée(s)",
-    "CountDownloadClientsSelected": "{0} client(s) de téléchargement sélectionné(s)",
-    "ConnectionLostReconnect": "Radarr essaiera de se connecter automatiquement, ou vous pouvez cliquer sur \"Recharger\" en bas.",
-    "ConnectionLostToBackend": "Radarr a perdu sa connexion au backend et devra être rechargé pour fonctionner à nouveau.",
+    "CountApplicationsSelected": "{count} application(s) sélectionnée(s)",
+    "CountDownloadClientsSelected": "{count} client(s) de téléchargement sélectionné(s)",
+    "ConnectionLostReconnect": "{appName} essaiera de se connecter automatiquement, ou vous pouvez cliquer sur « Recharger » en bas.",
+    "ConnectionLostToBackend": "{appName} a perdu sa connexion au backend et devra être rechargé pour fonctionner à nouveau.",
     "RecentChanges": "Changements récents",
     "WhatsNew": "Quoi de neuf ?",
-    "minutes": "Minutes",
-    "DeleteAppProfileMessageText": "Voulez-vous vraiment supprimer le profil de qualité {0} ?",
+    "minutes": "minutes",
+    "DeleteAppProfileMessageText": "Voulez-vous vraiment supprimer le profil d'application « {name} » ?",
     "AddConnection": "Ajouter une connexion",
     "AddConnectionImplementation": "Ajouter une connexion - {implementationName}",
-    "AddApplicationImplementation": "Ajouter une condition - {implementationName}",
-    "AddIndexerImplementation": "Ajouter une condition - {implementationName}",
+    "AddApplicationImplementation": "Ajouter une application - {implementationName}",
+    "AddIndexerImplementation": "Ajouter un indexeur - {implementationName}",
     "EditConnectionImplementation": "Ajouter une connexion - {implementationName}",
-    "NotificationStatusAllClientHealthCheckMessage": "Toutes les applications sont indisponibles en raison de dysfonctionnements",
-    "NotificationStatusSingleClientHealthCheckMessage": "Applications indisponibles en raison de dysfonctionnements : {0}",
+    "NotificationStatusAllClientHealthCheckMessage": "Toutes les notifications sont indisponibles en raison de dysfonctionnements",
+    "NotificationStatusSingleClientHealthCheckMessage": "Notifications indisponibles en raison de dysfonctionnements : {0}",
     "EditApplicationImplementation": "Ajouter une condition - {implementationName}",
     "EditIndexerImplementation": "Ajouter une condition - {implementationName}",
-    "EditIndexerProxyImplementation": "Ajouter une condition - {implementationName}",
-    "AuthBasic": "Authentification de base (Basic) (popup dans le navigateur)",
-    "AuthForm": "Authentification par un formulaire (page de connexion)",
-    "DisabledForLocalAddresses": "Désactivé pour les adresses IP locales",
+    "EditIndexerProxyImplementation": "Modifier un proxy d'indexeur - {implementationName}",
+    "AuthBasic": "Basique (fenêtre surgissante du navigateur)",
+    "AuthForm": "Formulaire (page de connexion)",
+    "DisabledForLocalAddresses": "Désactivée pour les adresses IP locales",
     "None": "Aucun",
-    "ResetAPIKeyMessageText": "Êtes vous sûr de vouloir réinitialiser votre Clé d'API ?",
-    "AddIndexerProxyImplementation": "Ajouter une condition - {implementationName}"
+    "ResetAPIKeyMessageText": "Voulez-vous réinitialiser votre clé d'API ?",
+    "AddIndexerProxyImplementation": "Ajouter un proxy d'indexeur - {implementationName}",
+    "IndexerStatus": "État de l'indexeur",
+    "ManageApplications": "Gérer les applications",
+    "NoIndexersFound": "Aucun indexeur n'a été trouvé",
+    "NoHistoryFound": "Aucun historique n'a été trouvé",
+    "QueryType": "Type de requête",
+    "SeedTimeHelpText": "Le temps qu'un torrent doit rester en seed avant de s'arrêter, la valeur vide est la valeur par défaut de l'application",
+    "GoToApplication": "Aller sur l'application",
+    "IndexerCategories": "Catégories d'indexeur",
+    "NoDownloadClientsFound": "Aucun client de téléchargement n'a été trouvé",
+    "AppUpdated": "{appName} mis à jour",
+    "AppUpdatedVersion": "{appName} a été mis à jour vers la version `{version}`, pour profiter des derniers changements, vous devrez relancer {appName}",
+    "IndexerDownloadClientHelpText": "Préciser quel client de téléchargement est utilisé pour les saisies créées au sein de Prowlarr provenant de cet indexeur",
+    "Implementation": "Implémentation",
+    "SearchCountIndexers": "Rechercher {count} indexeur(s)",
+    "SearchAllIndexers": "Rechercher tous les indexeurs",
+    "NewznabUrl": "URL Newznab",
+    "RssQueries": "Requêtes RSS",
+    "SeedTime": "Temps de seed",
+    "SearchQueries": "Requêtes de recherche",
+    "days": "jours",
+    "ApplicationTagsHelpTextWarning": "Les étiquettes doivent être utilisées avec prudence, elles peuvent avoir des effets indésirables. Une application avec une étiquette va uniquement synchroniser les indexeurs ayant la même étiquette.",
+    "DefaultNameCopiedProfile": "{name} - Copier",
+    "EditCategory": "Modifier la catégorie",
+    "EditDownloadClientImplementation": "Modifier le client de téléchargement - {implementationName}",
+    "External": "Externe",
+    "FoundCountReleases": "{itemCount} release(s) trouvée(s)",
+    "IndexerHistoryLoadError": "Erreur lors du chargement de l'historique de l'indexeur",
+    "IndexerTagsHelpTextWarning": "Les étiquettes doivent être utilisées avec prudence, elles peuvent avoir des effets indésirables. Un indexeur avec une étiquette va uniquement synchroniser les applications ayant la même étiquette.",
+    "NoIndexerHistory": "Aucun historique n'a été trouvé pour cet indexeur",
+    "PackSeedTimeHelpText": "Le temps qu'un pack (saison ou discographie) doit être seedé avant de s'arrêter, la valeur vide est la valeur par défaut de l'application",
+    "SeedRatioHelpText": "Le ratio qu'un torrent doit atteindre avant de s'arrêter, une valeur vide est la valeur par défaut de l'application",
+    "TorznabUrl": "URL Torznab",
+    "TotalGrabs": "Récupéré au total",
+    "TotalQueries": "Requêtes totales",
+    "SeedRatio": "Ratio de seed",
+    "SelectedCountOfCountReleases": "{selectedCount} sur {itemCount} releases sélectionnées",
+    "AddCategory": "Ajouter une catégorie",
+    "AddDownloadClientImplementation": "Ajouter un client de téléchargement - {implementationName}",
+    "ManageDownloadClients": "Gérer les clients de téléchargement",
+    "AuthenticationRequiredPasswordHelpTextWarning": "Saisir un nouveau mot de passe",
+    "IndexerDownloadClientHealthCheckMessage": "Indexeurs avec des clients de téléchargement invalides : {0].",
+    "AuthenticationMethod": "Méthode d'authentification",
+    "AuthenticationMethodHelpTextWarning": "Veuillez choisir une méthode d'authentification valide",
+    "ActiveIndexers": "Indexeurs actifs",
+    "ActiveApps": "Applications actives",
+    "AuthenticationRequiredUsernameHelpTextWarning": "Saisir un nouveau nom d'utilisateur",
+    "Clone": "Cloner"
 }

src/NzbDrone.Core/Localization/Core/nl.json

@@ -450,11 +450,14 @@
     "minutes": "Minuten",
     "DeleteAppProfileMessageText": "Bent u zeker dat u het kwaliteitsprofiel {0} wilt verwijderen",
     "NotificationStatusSingleClientHealthCheckMessage": "Applicaties onbeschikbaar door fouten",
-    "AddConnection": "Bewerk collectie",
+    "AddConnection": "Voeg connectie toe",
     "NotificationStatusAllClientHealthCheckMessage": "Alle applicaties onbeschikbaar door fouten",
     "AuthBasic": "Basis (Browser Pop-up)",
     "AuthForm": "Formulier (Login Pagina)",
     "DisabledForLocalAddresses": "Uitgeschakeld voor lokale adressen",
     "None": "Geen",
-    "ResetAPIKeyMessageText": "Bent u zeker dat u uw API-sleutel wilt resetten?"
+    "ResetAPIKeyMessageText": "Bent u zeker dat u uw API-sleutel wilt resetten?",
+    "AddConnectionImplementation": "Voeg connectie toe - {implementationName}",
+    "AddDownloadClientImplementation": "Voeg Downloadclient toe - {implementationName}",
+    "AddIndexerImplementation": "Indexeerder toevoegen - {implementationName}"
 }

src/NzbDrone.Core/Localization/Core/ru.json

@@ -17,7 +17,7 @@
     "AddIndexer": "Добавить индексер",
     "Added": "Добавлено",
     "Actions": "Действия",
-    "About": "Подробности",
+    "About": "Об",
     "DeleteBackupMessageText": "Вы уверены, что хотите удалить резервную копию '{name}'?",
     "DeleteBackup": "Удалить резервную копию",
     "Delete": "Удалить",
@@ -396,8 +396,8 @@
     "IndexerDownloadClientHealthCheckMessage": "Индексаторы с недопустимыми клиентами загрузки: {0}.",
     "StopSelecting": "Прекратить выбор",
     "AddDownloadClientImplementation": "Добавить клиент загрузки - {implementationName}",
-    "AddConnection": "Добавить соединение",
-    "AddConnectionImplementation": "Добавить соединение - {implementationName}",
+    "AddConnection": "Добавить подключение",
+    "AddConnectionImplementation": "Добавить подключение - {implementationName}",
     "ManageDownloadClients": "Менеджер клиентов загрузки",
     "NotificationStatusAllClientHealthCheckMessage": "Все уведомления недоступны из-за сбоев",
     "NotificationStatusSingleClientHealthCheckMessage": "Уведомления недоступны из-за сбоев: {0}",
@@ -414,5 +414,6 @@
     "None": "Ничто",
     "ResetAPIKeyMessageText": "Вы уверены, что хотите сбросить Ваш API ключ?",
     "Categories": "Категории",
-    "Album": "альбом"
+    "Album": "альбом",
+    "AddCustomFilter": "Добавить специальный фильтр"
 }

src/NzbDrone.Core/Localization/Core/zh_CN.json

@@ -21,7 +21,7 @@
     "AllIndexersHiddenDueToFilter": "由于应用了筛选器，所有索引器都被隐藏。",
     "Analytics": "分析",
     "AnalyticsEnabledHelpText": "将匿名使用情况和错误信息发送到Prowlarr的服务器。这包括有关您的浏览器的信息、您使用的Prowlarr WebUI页面、错误报告以及操作系统和运行时版本。我们将使用此信息来确定功能和错误修复的优先级。",
-    "ApiKey": "API 密钥",
+    "ApiKey": "API Key",
     "ApiKeyValidationHealthCheckMessage": "请将API密钥更新为至少{0}个字符长。您可以通过设置或配置文件执行此操作",
     "AppDataDirectory": "AppData目录",
     "AppDataLocationHealthCheckMessage": "正在更新期间的 AppData 不会被更新删除",
@@ -118,7 +118,7 @@
     "DisabledUntil": "禁用Until",
     "Discord": "冲突",
     "Docker": "Docker",
-    "Donations": "捐赠",
+    "Donations": "赞助",
     "DownloadClient": "下载客户端",
     "DownloadClientCategory": "下载客户端分类",
     "DownloadClientSettings": "下载客户端设置",
@@ -395,7 +395,7 @@
     "Shutdown": "关机",
     "Size": "大小",
     "Sort": "排序",
-    "Source": "源",
+    "Source": "来源",
     "StartTypingOrSelectAPathBelow": "输入路径或者从下面选择",
     "Started": "已开始",
     "StartupDirectory": "启动目录",

src/NzbDrone.Core/Notifications/Notifiarr/NotifiarrProxy.cs

@@ -1,4 +1,5 @@
 using System.Net.Http;
+using NLog;
 using NzbDrone.Common.Http;
 using NzbDrone.Common.Serializer;
 using NzbDrone.Core.Notifications.Webhook;
@@ -14,10 +15,12 @@ namespace NzbDrone.Core.Notifications.Notifiarr
     {
         private const string URL = "https://notifiarr.com";
         private readonly IHttpClient _httpClient;
+        private readonly Logger _logger;
 
-        public NotifiarrProxy(IHttpClient httpClient)
+        public NotifiarrProxy(IHttpClient httpClient, Logger logger)
         {
             _httpClient = httpClient;
+            _logger = logger;
         }
 
         public void SendNotification(WebhookPayload payload, NotifiarrSettings settings)
@@ -47,12 +50,17 @@ namespace NzbDrone.Core.Notifications.Notifiarr
                 switch ((int)responseCode)
                 {
                     case 401:
+                        _logger.Warn("HTTP 401 - API key is invalid");
                         throw new NotifiarrException("API key is invalid");
                     case 400:
-                        throw new NotifiarrException("Unable to send notification. Ensure Prowlarr Integration is enabled & assigned a channel on Notifiarr");
+                        // 400 responses shouldn't be treated as an actual error because it's a misconfiguration
+                        // between Prowlarr and Notifiarr for a specific event, but shouldn't stop all events.
+                        _logger.Warn("HTTP 400 - Unable to send notification. Ensure Prowlarr Integration is enabled & assigned a channel on Notifiarr");
+                        break;
                     case 502:
                     case 503:
                     case 504:
+                        _logger.Warn("Unable to send notification. Service Unavailable");
                         throw new NotifiarrException("Unable to send notification. Service Unavailable", ex);
                     case 520:
                     case 521:
@@ -61,6 +69,7 @@ namespace NzbDrone.Core.Notifications.Notifiarr
                     case 524:
                         throw new NotifiarrException("Cloudflare Related HTTP Error - Unable to send notification", ex);
                     default:
+                        _logger.Error(ex, "Unknown HTTP Error - Unable to send notification");
                         throw new NotifiarrException("Unknown HTTP Error - Unable to send notification", ex);
                 }
             }

src/Prowlarr.Http/Frontend/Mappers/IMapHttpRequestsToDisk.cs

@@ -1,3 +1,4 @@
+using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
 
 namespace Prowlarr.Http.Frontend.Mappers
@@ -6,6 +7,6 @@ namespace Prowlarr.Http.Frontend.Mappers
     {
         string Map(string resourceUrl);
         bool CanHandle(string resourceUrl);
-        FileStreamResult GetResponse(string resourceUrl);
+        Task<FileStreamResult> GetResponse(string resourceUrl);
     }
 }

src/Prowlarr.Http/Frontend/Mappers/StaticResourceMapperBase.cs

@@ -1,6 +1,7 @@
 using System;
 using System.IO;
 using System.Text;
+using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.StaticFiles;
 using Microsoft.Net.Http.Headers;
@@ -30,7 +31,7 @@ namespace Prowlarr.Http.Frontend.Mappers
 
         public abstract bool CanHandle(string resourceUrl);
 
-        public FileStreamResult GetResponse(string resourceUrl)
+        public Task<FileStreamResult> GetResponse(string resourceUrl)
         {
             var filePath = Map(resourceUrl);
 
@@ -41,15 +42,15 @@ namespace Prowlarr.Http.Frontend.Mappers
                     contentType = "application/octet-stream";
                 }
 
-                return new FileStreamResult(GetContentStream(filePath), new MediaTypeHeaderValue(contentType)
+                return Task.FromResult(new FileStreamResult(GetContentStream(filePath), new MediaTypeHeaderValue(contentType)
                 {
                     Encoding = contentType == "text/plain" ? Encoding.UTF8 : null
-                });
+                }));
             }
 
             _logger.Warn("File {0} not found", filePath);
 
-            return null;
+            return Task.FromResult<FileStreamResult>(null);
         }
 
         protected virtual Stream GetContentStream(string filePath)

src/Prowlarr.Http/Frontend/StaticResourceController.cs

@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading.Tasks;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Cors;
 using Microsoft.AspNetCore.Mvc;
@@ -25,27 +26,27 @@ namespace Prowlarr.Http.Frontend
 
         [AllowAnonymous]
         [HttpGet("login")]
-        public IActionResult LoginPage()
+        public async Task<IActionResult> LoginPage()
         {
-            return MapResource("login");
+            return await MapResource("login");
         }
 
         [EnableCors("AllowGet")]
         [AllowAnonymous]
         [HttpGet("/content/{**path:regex(^(?!api/).*)}")]
-        public IActionResult IndexContent([FromRoute] string path)
+        public async Task<IActionResult> IndexContent([FromRoute] string path)
         {
-            return MapResource("Content/" + path);
+            return await MapResource("Content/" + path);
         }
 
         [HttpGet("")]
         [HttpGet("/{**path:regex(^(?!api/).*)}")]
-        public IActionResult Index([FromRoute] string path)
+        public async Task<IActionResult> Index([FromRoute] string path)
         {
-            return MapResource(path);
+            return await MapResource(path);
         }
 
-        private IActionResult MapResource(string path)
+        private async Task<IActionResult> MapResource(string path)
         {
             path = "/" + (path ?? "");
 
@@ -53,7 +54,7 @@ namespace Prowlarr.Http.Frontend
 
             if (mapper != null)
             {
-                var result = mapper.GetResponse(path);
+                var result = await mapper.GetResponse(path);
 
                 if (result != null)
                 {