Add private IPv6 networks

(cherry picked from commit 52972e7efcce800560cbbaa64f5f76aaef6cbe77)

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -4,11 +4,18 @@ labels: ['Type: Bug', 'Status: Needs Triage']
 body:
 - type: checkboxes
   attributes:
-    label: Is there an existing issue for this?
+    label: I attest that there is not an existing issue for this?
     description: Please search to see if an open or closed issue already exists for the bug you encountered. If a bug exists and is closed note that it may only be fixed in an unstable branch.
     options:
     - label: I have searched the existing open and closed issues
       required: true
+- type: checkboxes
+  attributes:
+    label: I attest this is not related to a Cardigann YML Indexer.
+    description: Please search to see if this is for a tracker [that is yml-based (Cardigann)](https://github.com/Prowlarr/indexers) these are synced to Prowlarr/Indexers from Jackett/Jackett.
+    options:
+    - label: I confirm this is not related to a Cardigann YML Indexer
+      required: true
 - type: textarea
   attributes:
     label: Current Behavior
@@ -73,8 +80,8 @@ body:
     required: true
 - type: checkboxes
   attributes:
-    label: Trace Logs have been provided as applicable. Reports may be closed if the required logs are not provided.
+    label: I attest that Trace Logs have been provided as applicable. Reports will be closed if the required logs are not provided.
     description: Trace logs are generally required for all bug reports and contain `trace`. Info logs are invalid for bug reports and do not contain `debug` nor `trace`
     options:
-    - label: I have read and followed the steps in the wiki link above and provided the required trace logs - the logs contain `trace` - that are relevant and show this issue.
+    - label: I attest that I have read and followed the steps in the wiki link above and provided the required trace logs - the logs contain `trace` - that are relevant and show this issue.
       required: true

azure-pipelines.yml

@@ -9,7 +9,7 @@ variables:
   testsFolder: './_tests'
   yarnCacheFolder: $(Pipeline.Workspace)/.yarn
   nugetCacheFolder: $(Pipeline.Workspace)/.nuget/packages
-  majorVersion: '2.0.5'
+  majorVersion: '2.3.0'
   minorVersion: $[counter('minorVersion', 1)]
   prowlarrVersion: '$(majorVersion).$(minorVersion)'
   buildName: '$(Build.SourceBranchName).$(prowlarrVersion)'
@@ -1158,7 +1158,7 @@ stages:
           extraProperties: |
             sonar.exclusions=**/obj/**,**/*.dll,**/NzbDrone.Core.Test/Files/**/*,./frontend/**,**/ExternalModules/**,./src/Libraries/**
             sonar.coverage.exclusions=**/Prowlarr.Api.V1/**/*
-            sonar.cs.opencover.reportsPaths=$(Build.SourcesDirectory)/CoverageResults/**/coverage.opencover.xml
+            sonar.cs.cobertura.reportsPaths=$(Build.SourcesDirectory)/CoverageResults/**/coverage.cobertura.xml
             sonar.cs.nunit.reportsPaths=$(Build.SourcesDirectory)/TestResult.xml
       - bash: |
           ./build.sh --backend -f net8.0 -r win-x64
@@ -1170,10 +1170,11 @@ stages:
       - task: reportgenerator@5
         displayName: Generate Coverage Report
         inputs:
-          reports: '$(Build.SourcesDirectory)/CoverageResults/**/coverage.opencover.xml'
+          reports: '$(Build.SourcesDirectory)/CoverageResults/**/coverage.cobertura.xml'
           targetdir: '$(Build.SourcesDirectory)/CoverageResults/combined'
           reporttypes: 'HtmlInline_AzurePipelines;Cobertura;Badges'
           publishCodeCoverageResults: true
+          sourcedirs: src
 
   - stage: Report_Out
     dependsOn:

frontend/src/Components/Modal/Modal.css

@@ -19,6 +19,7 @@
 .modal {
   position: relative;
   display: flex;
+  max-width: 90%;
   max-height: 90%;
   border-radius: 6px;
   opacity: 1;

frontend/src/Helpers/Hooks/useTheme.ts

@@ -0,0 +1,56 @@
+import { useEffect, useState } from 'react';
+import { useSelector } from 'react-redux';
+import { createSelector } from 'reselect';
+import AppState from 'App/State/AppState';
+import themes from 'Styles/Themes';
+
+function createThemeSelector() {
+  return createSelector(
+    (state: AppState) => state.settings.ui.item.theme || window.Prowlarr.theme,
+    (theme) => theme
+  );
+}
+
+const useTheme = () => {
+  const selectedTheme = useSelector(createThemeSelector());
+  const [resolvedTheme, setResolvedTheme] = useState(selectedTheme);
+
+  useEffect(() => {
+    if (selectedTheme !== 'auto') {
+      setResolvedTheme(selectedTheme);
+      return;
+    }
+
+    const applySystemTheme = () => {
+      setResolvedTheme(
+        window.matchMedia('(prefers-color-scheme: dark)').matches
+          ? 'dark'
+          : 'light'
+      );
+    };
+
+    applySystemTheme();
+
+    window
+      .matchMedia('(prefers-color-scheme: dark)')
+      .addEventListener('change', applySystemTheme);
+
+    return () => {
+      window
+        .matchMedia('(prefers-color-scheme: dark)')
+        .removeEventListener('change', applySystemTheme);
+    };
+  }, [selectedTheme]);
+
+  return resolvedTheme;
+};
+
+export default useTheme;
+
+export const useThemeColor = (color: string) => {
+  const theme = useTheme();
+  const themeVariables = themes[theme];
+
+  // @ts-expect-error - themeVariables is a string indexable type
+  return themeVariables[color];
+};

frontend/src/Indexer/Add/AddIndexerModalContent.css

@@ -76,10 +76,6 @@
   background-color: var(--hoverBackgroundColor);
 }
 
-.filterRowCollapsed {
-  display: none !important;
-}
-
 @media only screen and (max-width: $breakpointSmall) {
   .filterInput {
     margin-bottom: 8px;
@@ -102,6 +98,10 @@
     background-color: var(--cardBackgroundColor);
   }
 
+  .filterRowCollapsed {
+    display: none !important;
+  }
+
   .filterContainer {
     margin-right: 0;
     margin-bottom: 8px;

frontend/src/Indexer/Add/AddIndexerModalContent.tsx

@@ -27,7 +27,6 @@ import {
 } from 'Store/Actions/indexerActions';
 import createAllIndexersSelector from 'Store/Selectors/createAllIndexersSelector';
 import createClientSideCollectionSelector from 'Store/Selectors/createClientSideCollectionSelector';
-import createDimensionsSelector from 'Store/Selectors/createDimensionsSelector';
 import { SortCallback } from 'typings/callbacks';
 import sortByProp from 'Utilities/Array/sortByProp';
 import getErrorMessage from 'Utilities/Object/getErrorMessage';
@@ -114,8 +113,7 @@ function createAddIndexersSelector() {
   return createSelector(
     createClientSideCollectionSelector('indexers.schema'),
     createAllIndexersSelector(),
-    createDimensionsSelector(),
-    (indexers: IndexerAppState, allIndexers, dimensions) => {
+    (indexers: IndexerAppState, allIndexers) => {
       const { isFetching, isPopulated, error, items, sortDirection, sortKey } =
         indexers;
 
@@ -134,7 +132,6 @@ function createAddIndexersSelector() {
         indexers: indexerList,
         sortKey,
         sortDirection,
-        isSmallScreen: dimensions.isSmallScreen,
       };
     }
   );
@@ -148,15 +145,8 @@ interface AddIndexerModalContentProps {
 function AddIndexerModalContent(props: AddIndexerModalContentProps) {
   const { onSelectIndexer, onModalClose } = props;
 
-  const {
-    isFetching,
-    isPopulated,
-    error,
-    indexers,
-    sortKey,
-    sortDirection,
-    isSmallScreen,
-  } = useSelector(createAddIndexersSelector());
+  const { isFetching, isPopulated, error, indexers, sortKey, sortDirection } =
+    useSelector(createAddIndexersSelector());
   const dispatch = useDispatch();
 
   const [filter, setFilter] = useState('');
@@ -164,7 +154,7 @@ function AddIndexerModalContent(props: AddIndexerModalContentProps) {
   const [filterLanguages, setFilterLanguages] = useState<string[]>([]);
   const [filterPrivacyLevels, setFilterPrivacyLevels] = useState<string[]>([]);
   const [filterCategories, setFilterCategories] = useState<number[]>([]);
-  const [isFiltersCollapsed, setIsFiltersCollapsed] = useState(isSmallScreen);
+  const [isFiltersCollapsed, setIsFiltersCollapsed] = useState(true);
 
   useEffect(
     () => {

src/Directory.Build.props

@@ -84,7 +84,7 @@
 
     <Deterministic Condition="$(AssemblyVersion.EndsWith('*'))">False</Deterministic>
 
-    <PathMap>$(MSBuildProjectDirectory)=./$(MSBuildProjectName)/</PathMap>
+    <PathMap>$(MSBuildThisFileDirectory)=./</PathMap>
   </PropertyGroup>
 
   <!-- Set the AssemblyConfiguration attribute for projects -->
@@ -123,14 +123,11 @@
 
   <!-- Standard testing packages -->
   <ItemGroup Condition="'$(TestProject)'=='true'">
+    <PackageReference Include="coverlet.collector" Version="6.0.4" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
     <PackageReference Include="NUnit" Version="3.14.0" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
-    <PackageReference Include="NunitXml.TestLogger" Version="3.0.131" />
-  </ItemGroup>
-
-  <ItemGroup Condition="'$(TestProject)'=='true' and '$(TargetFramework)'=='net8.0'">
-    <PackageReference Include="coverlet.collector" Version="3.0.4-preview.27.ge7cb7c3b40" />
+    <PackageReference Include="NUnit3TestAdapter" Version="5.1.0" />
+    <PackageReference Include="NunitXml.TestLogger" Version="3.1.20" />
   </ItemGroup>
 
   <PropertyGroup Condition="'$(ProwlarrProject)'=='true' and '$(EnableAnalyzers)'=='false'">

src/NuGet.config

@@ -5,8 +5,6 @@
     <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
     <add key="dotnet-bsd-crossbuild" value="https://pkgs.dev.azure.com/Servarr/Servarr/_packaging/dotnet-bsd-crossbuild/nuget/v3/index.json" />
     <add key="Mono.Posix.NETStandard" value="https://pkgs.dev.azure.com/Servarr/Servarr/_packaging/Mono.Posix.NETStandard/nuget/v3/index.json" />
-    <add key="SQLite" value="https://pkgs.dev.azure.com/Servarr/Servarr/_packaging/SQLite/nuget/v3/index.json" />
-    <add key="coverlet-nightly" value="https://pkgs.dev.azure.com/Servarr/coverlet/_packaging/coverlet-nightly/nuget/v3/index.json" />
     <add key="FluentMigrator" value="https://pkgs.dev.azure.com/Servarr/Servarr/_packaging/FluentMigrator/nuget/v3/index.json" />
   </packageSources>
 </configuration>

src/NzbDrone.Common/Prowlarr.Common.csproj

@@ -8,7 +8,7 @@
     <PackageReference Include="IPAddressRange" Version="6.2.0" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
     <PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="8.0.1" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
     <PackageReference Include="NLog" Version="5.4.0" />
     <PackageReference Include="NLog.Layouts.ClefJsonLayout" Version="1.0.3" />
     <PackageReference Include="NLog.Extensions.Logging" Version="5.4.0" />
@@ -16,9 +16,11 @@
     <PackageReference Include="Sentry" Version="4.0.2" />
     <PackageReference Include="NLog.Targets.Syslog" Version="7.0.0" />
     <PackageReference Include="SharpZipLib" Version="1.4.2" />
-    <PackageReference Include="System.Text.Json" Version="8.0.5" />
+    <PackageReference Include="SourceGear.sqlite3" Version="3.50.4.2" />
+    <PackageReference Include="System.Data.SQLite" Version="2.0.2" />
+    <PackageReference Include="System.Private.Uri" Version="4.3.2" />
+    <PackageReference Include="System.Text.Json" Version="8.0.6" />
     <PackageReference Include="System.ValueTuple" Version="4.6.1" />
-    <PackageReference Include="System.Data.SQLite.Core.Servarr" Version="1.0.115.5-18" />
     <PackageReference Include="System.Configuration.ConfigurationManager" Version="8.0.1" />
     <PackageReference Include="System.IO.FileSystem.AccessControl" Version="5.0.0" />
     <PackageReference Include="System.Runtime.Loader" Version="4.3.0" />

src/NzbDrone.Core.Test/Http/HttpProxySettingsProviderFixture.cs

@@ -15,24 +15,24 @@ namespace NzbDrone.Core.Test.Http
             return new HttpProxySettings(ProxyType.Socks5, "localhost", 8080, "*.httpbin.org,google.com,172.16.0.0/12", true, null, null);
         }
 
-        [Test]
-        public void should_bypass_proxy()
+        [TestCase("http://eu.httpbin.org/get")]
+        [TestCase("http://google.com/get")]
+        [TestCase("http://localhost:8654/get")]
+        [TestCase("http://172.21.0.1:8989/api/v3/indexer/schema")]
+        public void should_bypass_proxy(string url)
         {
             var settings = GetProxySettings();
 
-            Subject.ShouldProxyBeBypassed(settings, new HttpUri("http://eu.httpbin.org/get")).Should().BeTrue();
-            Subject.ShouldProxyBeBypassed(settings, new HttpUri("http://google.com/get")).Should().BeTrue();
-            Subject.ShouldProxyBeBypassed(settings, new HttpUri("http://localhost:8654/get")).Should().BeTrue();
-            Subject.ShouldProxyBeBypassed(settings, new HttpUri("http://172.21.0.1:8989/api/v3/indexer/schema")).Should().BeTrue();
+            Subject.ShouldProxyBeBypassed(settings, new HttpUri(url)).Should().BeTrue();
         }
 
-        [Test]
-        public void should_not_bypass_proxy()
+        [TestCase("http://bing.com/get")]
+        [TestCase("http://172.3.0.1:8989/api/v3/indexer/schema")]
+        public void should_not_bypass_proxy(string url)
         {
             var settings = GetProxySettings();
 
-            Subject.ShouldProxyBeBypassed(settings, new HttpUri("http://bing.com/get")).Should().BeFalse();
-            Subject.ShouldProxyBeBypassed(settings, new HttpUri("http://172.3.0.1:8989/api/v3/indexer/schema")).Should().BeFalse();
+            Subject.ShouldProxyBeBypassed(settings, new HttpUri(url)).Should().BeFalse();
         }
     }
 }

src/NzbDrone.Core.Test/IndexerTests/BroadcastheNetTests/BroadcastheNetRequestGeneratorFixture.cs

@@ -140,7 +140,7 @@ namespace NzbDrone.Core.Test.IndexerTests.BroadcastheNetTests
             query.Tvrage.Should().BeNull();
             query.Search.Should().BeNull();
             query.Category.Should().Be("Episode");
-            query.Name.Should().Be("2023.01.03");
+            query.Name.Should().Be("2023.01.03%");
         }
 
         [Test]
@@ -275,7 +275,7 @@ namespace NzbDrone.Core.Test.IndexerTests.BroadcastheNetTests
             query.Tvrage.Should().BeNull();
             query.Search.Should().Be("The%Late%Show%with%Stephen%Colbert");
             query.Category.Should().Be("Episode");
-            query.Name.Should().Be("2023.01.03");
+            query.Name.Should().Be("2023.01.03%");
         }
 
         private static BroadcastheNetTorrentQuery ParseTorrentQueryFromRequest(HttpRequest httpRequest)

src/NzbDrone.Core.Test/Prowlarr.Core.Test.csproj

@@ -5,7 +5,6 @@
   <ItemGroup>
     <PackageReference Include="Dapper" Version="2.1.66" />
     <PackageReference Include="NBuilder" Version="6.1.0" />
-    <PackageReference Include="System.Data.SQLite.Core.Servarr" Version="1.0.115.5-18" />
     <PackageReference Include="YamlDotNet" Version="16.3.0" />
   </ItemGroup>
   <ItemGroup>

src/NzbDrone.Core/Datastore/BasicRepository.cs

@@ -1,13 +1,18 @@
 using System;
 using System.Collections.Generic;
 using System.Data;
+using System.Data.SQLite;
 using System.Linq;
 using System.Linq.Expressions;
 using System.Reflection;
 using System.Text;
 using Dapper;
+using NLog;
+using NzbDrone.Common.Instrumentation;
 using NzbDrone.Core.Datastore.Events;
 using NzbDrone.Core.Messaging.Events;
+using Polly;
+using Polly.Retry;
 
 namespace NzbDrone.Core.Datastore
 {
@@ -40,12 +45,31 @@ namespace NzbDrone.Core.Datastore
     public class BasicRepository<TModel> : IBasicRepository<TModel>
         where TModel : ModelBase, new()
     {
+        private static readonly ILogger Logger = NzbDroneLogger.GetLogger(typeof(BasicRepository<TModel>));
+
         private readonly IEventAggregator _eventAggregator;
         private readonly PropertyInfo _keyProperty;
         private readonly List<PropertyInfo> _properties;
         private readonly string _updateSql;
         private readonly string _insertSql;
 
+        private static ResiliencePipeline RetryStrategy => new ResiliencePipelineBuilder()
+            .AddRetry(new RetryStrategyOptions
+            {
+                ShouldHandle = new PredicateBuilder().Handle<SQLiteException>(ex => ex.ResultCode == SQLiteErrorCode.Busy),
+                Delay = TimeSpan.FromMilliseconds(100),
+                MaxRetryAttempts = 3,
+                BackoffType = DelayBackoffType.Exponential,
+                UseJitter = true,
+                OnRetry = args =>
+                {
+                    Logger.Warn(args.Outcome.Exception, "Failed writing to database. Retry #{0}", args.AttemptNumber);
+
+                    return default;
+                }
+            })
+            .Build();
+
         protected readonly IDatabase _database;
         protected readonly string _table;
 
@@ -186,7 +210,9 @@ namespace NzbDrone.Core.Datastore
         private TModel Insert(IDbConnection connection, IDbTransaction transaction, TModel model)
         {
             SqlBuilderExtensions.LogQuery(_insertSql, model);
-            var multi = connection.QueryMultiple(_insertSql, model, transaction);
+
+            var multi = RetryStrategy.Execute(static (state, _) => state.connection.QueryMultiple(state._insertSql, state.model, state.transaction), (connection, _insertSql, model, transaction));
+
             var multiRead = multi.Read();
             var id = (int)(multiRead.First().id ?? multiRead.First().Id);
             _keyProperty.SetValue(model, id);
@@ -383,7 +409,7 @@ namespace NzbDrone.Core.Datastore
 
             SqlBuilderExtensions.LogQuery(sql, model);
 
-            connection.Execute(sql, model, transaction: transaction);
+            RetryStrategy.Execute(static (state, _) => state.connection.Execute(state.sql, state.model, transaction: state.transaction), (connection, sql, model, transaction));
         }
 
         private void UpdateFields(IDbConnection connection, IDbTransaction transaction, IList<TModel> models, List<PropertyInfo> propertiesToUpdate)
@@ -395,7 +421,7 @@ namespace NzbDrone.Core.Datastore
                 SqlBuilderExtensions.LogQuery(sql, model);
             }
 
-            connection.Execute(sql, models, transaction: transaction);
+            RetryStrategy.Execute(static (state, _) => state.connection.Execute(state.sql, state.models, transaction: state.transaction), (connection, sql, models, transaction));
         }
 
         protected virtual SqlBuilder PagedBuilder() => Builder();

src/NzbDrone.Core/Download/Clients/QBittorrent/QBittorrentProxyV2.cs

@@ -424,8 +424,8 @@ namespace NzbDrone.Core.Download.Clients.QBittorrent
                 }
                 catch (HttpException ex)
                 {
-                    _logger.Debug("qbitTorrent authentication failed.");
-                    if (ex.Response.StatusCode == HttpStatusCode.Forbidden)
+                    _logger.Debug(ex, "qbitTorrent authentication failed.");
+                    if (ex.Response.StatusCode is HttpStatusCode.Unauthorized or HttpStatusCode.Forbidden)
                     {
                         throw new DownloadClientAuthenticationException("Failed to authenticate with qBittorrent.", ex);
                     }
@@ -437,9 +437,9 @@ namespace NzbDrone.Core.Download.Clients.QBittorrent
                     throw new DownloadClientUnavailableException("Failed to connect to qBittorrent, please check your settings.", ex);
                 }
 
-                if (response.Content != "Ok.")
+                // returns "Fails." on bad login
+                if (response.Content.IsNotNullOrWhiteSpace() && response.Content != "Ok.")
                 {
-                    // returns "Fails." on bad login
                     _logger.Debug("qbitTorrent authentication failed.");
                     throw new DownloadClientAuthenticationException("Failed to authenticate with qBittorrent.");
                 }

src/NzbDrone.Core/Indexers/Definitions/BroadcastheNet/BroadcastheNetRequestGenerator.cs

@@ -74,7 +74,7 @@ namespace NzbDrone.Core.Indexers.BroadcastheNet
             else if (DateTime.TryParseExact($"{searchCriteria.Season} {searchCriteria.Episode}", "yyyy MM/dd", CultureInfo.InvariantCulture, DateTimeStyles.None, out var showDate))
             {
                 // Daily Episode
-                parameters.Name = showDate.ToString("yyyy.MM.dd", CultureInfo.InvariantCulture);
+                parameters.Name = showDate.ToString("yyyy.MM.dd", CultureInfo.InvariantCulture) + "%";
                 parameters.Category = "Episode";
                 pageableRequests.Add(GetPagedRequests(parameters, btnResults, btnOffset));
             }

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

@@ -1,3 +1,4 @@
+using System;
 using NLog;
 using NzbDrone.Core.Configuration;
 using NzbDrone.Core.Indexers.Definitions.Gazelle;
@@ -5,6 +6,7 @@ using NzbDrone.Core.Messaging.Events;
 
 namespace NzbDrone.Core.Indexers.Definitions;
 
+[Obsolete("Moved to YML for Cardigann")]
 public class CGPeers : GazelleBase<GazelleSettings>
 {
     public override string Name => "CGPeers";

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

@@ -426,6 +426,12 @@ namespace NzbDrone.Core.Indexers.Definitions.Cardigann
                 {
                     ((TorrentInfo)c).InfoHash = MagnetLinkBuilder.GetInfoHashFromMagnet(((TorrentInfo)c).MagnetUrl);
                 }
+
+                // Add Internal flag if description starts with Internal
+                if (c.Description.IsNotNullOrWhiteSpace() && c.Description.StartsWith("Internal"))
+                {
+                    c.IndexerFlags.Add(IndexerFlag.Internal);
+                }
             });
 
             _logger.Trace("Cardigann ({0}): Got {1} releases", _definition.Id, releases.Count);

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

@@ -11,10 +11,17 @@ namespace NzbDrone.Core.Indexers.Definitions.FileList;
 public class FileList : TorrentIndexerBase<FileListSettings>
 {
     public override string Name => "FileList.io";
-    public override string[] IndexerUrls => new[] { "https://filelist.io/" };
+    public override string[] IndexerUrls => new[]
+    {
+        "https://filelist.io/",
+        "https://thefl.org/",
+    };
     public override string[] LegacyUrls => new[]
     {
         "https://filelist.io",
+        "https://filelist.ro/",
+        "http://filelist.ro/",
+        "http://flro.org/",
         "https://flro.org/"
     };
     public override string Description => "FileList (FL) is a ROMANIAN Private Torrent Tracker for 0DAY / GENERAL";
@@ -105,6 +112,7 @@ public class FileList : TorrentIndexerBase<FileListSettings>
         caps.Categories.AddCategoryMapping(27, NewznabStandardCategory.TVUHD, "Seriale 4K");
         caps.Categories.AddCategoryMapping(28, NewznabStandardCategory.MoviesForeign, "RO Dubbed");
         caps.Categories.AddCategoryMapping(28, NewznabStandardCategory.TVForeign, "RO Dubbed");
+        caps.Categories.AddCategoryMapping(31, NewznabStandardCategory.TVForeign, "K-Drama");
 
         return caps;
     }

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

@@ -100,7 +100,7 @@ namespace NzbDrone.Core.Indexers.Newznab
                 yield return GetDefinition("Miatrix", GetSettings("https://www.miatrix.com"), categories: new[] { 1000, 2000, 3000, 4000, 5000, 6000, 7000, 8000 });
                 yield return GetDefinition("Newz69", GetSettings("https://newz69.keagaming.com"), categories: new[] { 1000, 2000, 3000, 4000, 5000, 6000, 7000, 8000 });
                 yield return GetDefinition("NinjaCentral", GetSettings("https://ninjacentral.co.za"), categories: new[] { 1000, 2000, 3000, 4000, 5000, 6000, 7000, 8000 });
-                yield return GetDefinition("Nzb.su", GetSettings("https://api.nzb.su"), categories: new[] { 1000, 2000, 3000, 4000, 5000, 6000, 7000, 8000 });
+                yield return GetDefinition("Nzb.life", GetSettings("https://api.nzb.life"), categories: new[] { 1000, 2000, 3000, 4000, 5000, 6000, 7000, 8000 });
                 yield return GetDefinition("NZBCat", GetSettings("https://nzb.cat"), categories: new[] { 1000, 2000, 3000, 4000, 5000, 6000, 7000 });
                 yield return GetDefinition("NZBFinder", GetSettings("https://nzbfinder.ws"), categories: new[] { 2000, 3000, 5000, 6000, 7000 });
                 yield return GetDefinition("NZBgeek", GetSettings("https://api.nzbgeek.info"), categories: new[] { 1000, 2000, 3000, 4000, 5000, 6000, 7000, 8000 });

src/NzbDrone.Core/Indexers/Definitions/Newznab/NewznabSettings.cs

@@ -9,10 +9,10 @@ namespace NzbDrone.Core.Indexers.Newznab
 {
     public class NewznabSettingsValidator : AbstractValidator<NewznabSettings>
     {
-        private static readonly string[] ApiKeyWhiteList =
+        private static readonly string[] ApiKeyAllowList =
         {
             "nzbs.org",
-            "nzb.su",
+            "nzb.life",
             "dognzb.cr",
             "nzbplanet.net",
             "nzbid.org",
@@ -22,7 +22,7 @@ namespace NzbDrone.Core.Indexers.Newznab
 
         private static bool ShouldHaveApiKey(NewznabSettings settings)
         {
-            return settings.BaseUrl != null && ApiKeyWhiteList.Any(c => settings.BaseUrl.ToLowerInvariant().Contains(c));
+            return settings.BaseUrl != null && ApiKeyAllowList.Any(c => settings.BaseUrl.ToLowerInvariant().Contains(c));
         }
 
         private static readonly Regex AdditionalParametersRegex = new Regex(@"(&.+?\=.+?)+", RegexOptions.Compiled);

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

@@ -35,6 +35,16 @@ namespace NzbDrone.Core.Indexers.Definitions.PassThePopcorn
                     throw new RequestLimitReachedException(indexerResponse, "PTP Query Limit Reached. Please try again later.");
                 }
 
+                if (httpResponse.StatusCode == HttpStatusCode.TooManyRequests && indexerResponse.Content.Contains("We are not a TV indexer"))
+                {
+                    throw new IndexerException(indexerResponse, "Invalid indexer request: We are not a TV indexer", HttpStatusCode.BadRequest);
+                }
+
+                if (httpResponse.StatusCode == HttpStatusCode.TooManyRequests)
+                {
+                    throw new RequestLimitReachedException(indexerResponse, "PTP Request Limit Reached. Please try again later.");
+                }
+
                 throw new IndexerException(indexerResponse, $"Unexpected response status {indexerResponse.HttpResponse.StatusCode} code from indexer request");
             }
 

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

@@ -2,6 +2,7 @@ using System;
 using System.Collections.Generic;
 using System.Collections.Specialized;
 using System.Linq;
+using System.Net;
 using NzbDrone.Common.Extensions;
 using NzbDrone.Common.Http;
 using NzbDrone.Core.IndexerSearch.Definitions;
@@ -115,6 +116,7 @@ namespace NzbDrone.Core.Indexers.Definitions.PassThePopcorn
             var request = new IndexerRequest(searchUrl, HttpAccept.Json);
             request.HttpRequest.Headers.Add("ApiUser", _settings.APIUser);
             request.HttpRequest.Headers.Add("ApiKey", _settings.APIKey);
+            request.HttpRequest.SuppressHttpErrorStatusCodes = new[] { HttpStatusCode.TooManyRequests };
 
             yield return request;
         }

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

@@ -23,7 +23,8 @@ namespace NzbDrone.Core.Indexers.Definitions
     {
         public override string Name => "RevolutionTT";
 
-        public override string[] IndexerUrls => new[] { "https://revolutiontt.me/" };
+        public override string[] IndexerUrls => new[] { "https://revott.me/" };
+        public override string[] LegacyUrls => new[] { "https://revolutiontt.me/" };
         public override string Description => "The Revolution has begun";
         private string LoginUrl => Settings.BaseUrl + "takelogin.php";
         public override IndexerPrivacy Privacy => IndexerPrivacy.Private;

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

@@ -1541,7 +1541,7 @@ namespace NzbDrone.Core.Indexers.Definitions
 
                 if (season != 0)
                 {
-                    searchString += " Сезон: " + season;
+                    searchString += " ТВ | Сезон: " + season;
                 }
 
                 parameters.Set("nm", searchString);
@@ -1712,6 +1712,8 @@ namespace NzbDrone.Core.Indexers.Definitions
         private readonly Regex _tvTitleRusSeasonRegex = new(@"Сезон\s*[:]*\s+(\d+(?:-\d+)?)", RegexOptions.Compiled | RegexOptions.IgnoreCase);
         private readonly Regex _tvTitleRusEpisodeOfRegex = new(@"(?:Серии|Эпизод|Выпуски)+\s*[:]*\s+(\d+(?:-\d+)?)\s*из\s*([\w?])", RegexOptions.Compiled | RegexOptions.IgnoreCase);
         private readonly Regex _tvTitleRusEpisodeRegex = new(@"(?:Серии|Эпизод|Выпуски)+\s*[:]*\s+(\d+(?:-\d+)?)", RegexOptions.Compiled | RegexOptions.IgnoreCase);
+        private readonly Regex _tvTitleRusSeasonAnimeRegex = new(@"ТВ[-]*(?:(\d+))", RegexOptions.Compiled | RegexOptions.IgnoreCase);
+        private readonly Regex _tvTitleRusEpisodeAnimeOfRegex = new(@"\[(\d+(\+\d+)?)\s+из\s+(\d+(\+\d+)?)\]", RegexOptions.Compiled | RegexOptions.IgnoreCase);
 
         public string Parse(string title,
                             ICollection<IndexerCategory> categories,
@@ -1736,6 +1738,8 @@ namespace NzbDrone.Core.Indexers.Definitions
                 title = _tvTitleRusSeasonRegex.Replace(title, "S$1");
                 title = _tvTitleRusEpisodeOfRegex.Replace(title, "E$1 of $2");
                 title = _tvTitleRusEpisodeRegex.Replace(title, "E$1");
+                title = _tvTitleRusSeasonAnimeRegex.Replace(title, "S$1");
+                title = _tvTitleRusEpisodeAnimeOfRegex.Replace(title, "E$1 of $3");
             }
             else if (IsAnyMovieCategory(categories))
             {

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

@@ -27,7 +27,8 @@ namespace NzbDrone.Core.Indexers.Definitions;
 public class Shazbat : TorrentIndexerBase<ShazbatSettings>
 {
     public override string Name => "Shazbat";
-    public override string[] IndexerUrls => new[] { "https://www.shazbat.tv/" };
+    public override string[] IndexerUrls => new[] { "https://www.shazbat.tube/" };
+    public override string[] LegacyUrls => new[] { "https://www.shazbat.tv/" };
     public override string Description => "Shazbat is a PRIVATE Torrent Tracker with highly curated TV content";
     public override string Language => "en-US";
     public override Encoding Encoding => Encoding.UTF8;

src/NzbDrone.Core/Indexers/Definitions/Torznab/TorznabSettings.cs

@@ -11,11 +11,11 @@ namespace NzbDrone.Core.Indexers.Torznab
 {
     public class TorznabSettingsValidator : AbstractValidator<TorznabSettings>
     {
-        private static readonly string[] ApiKeyWhiteList = Array.Empty<string>();
+        private static readonly string[] ApiKeyAllowList = Array.Empty<string>();
 
         private static bool ShouldHaveApiKey(TorznabSettings settings)
         {
-            return settings.BaseUrl != null && ApiKeyWhiteList.Any(c => settings.BaseUrl.ToLowerInvariant().Contains(c));
+            return settings.BaseUrl != null && ApiKeyAllowList.Any(c => settings.BaseUrl.ToLowerInvariant().Contains(c));
         }
 
         private static readonly Regex AdditionalParametersRegex = new Regex(@"(&.+?\=.+?)+", RegexOptions.Compiled);

src/NzbDrone.Core/Localization/Core/cs.json

@@ -491,7 +491,7 @@
     "EnableRssHelpText": "Povolit kanál RSS pro indexer",
     "DeleteApplication": "Odstranit aplikaci",
     "DeleteSelectedApplications": "Odstranit vybrané aplikace",
-    "DeleteSelectedIndexers": "Odstranit vybrané indexery",
+    "DeleteSelectedIndexers": "Smazat vybrané indexery",
     "DevelopmentSettings": "Nastavení pro vývoj",
     "DisabledUntil": "Zakázáno do",
     "DownloadClientCategory": "Kategorie klienta pro stahování",
@@ -639,5 +639,10 @@
     "DownloadClientUTorrentProviderMessage": "uTorrent má historii zahrnování kryptoměnových těžařů, malwaru a reklam, důrazně vám doporučujeme zvolit jiného klienta.",
     "IndexerSettingsBaseUrlHelpText": "Vyberte, jakou základní URL bude {appName} používat pro požadavky na web",
     "IndexerSettingsPackSeedTimeIndexerHelpText": "Doba, po kterou by měl být balíček (sezóna nebo diskografie) torrentu seedován před zastavením, prázdné pole znamená výchozí nastavení aplikace",
-    "PackSeedTimeHelpText": "Doba, po kterou by měl být balíček (sezóna nebo diskografie) torrentu seedován před zastavením, prázdné pole znamená výchozí nastavení aplikace"
+    "PackSeedTimeHelpText": "Doba, po kterou by měl být balíček (sezóna nebo diskografie) torrentu seedován před zastavením, prázdné pole znamená výchozí nastavení aplikace",
+    "OnApplicationUpdateHelpText": "Při aktualizaci aplikace",
+    "SeedTime": "Doba sdílení",
+    "OnHealthRestoredHelpText": "Při obnovení zdraví",
+    "SeedRatio": "Poměr sdílení",
+    "ThemeHelpText": "Změnit motiv UI, možnost „Auto“ kopíruje nastavení OS pro výběr tmavého nebo světlého režimu. Inspirováno {inspiredBy}."
 }

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

@@ -149,7 +149,7 @@
     "FullSync": "Volledige synchronisatie",
     "General": "Algemeen",
     "GeneralSettings": "Algemene Instellingen",
-    "GeneralSettingsSummary": "Poort, SSL, gebruikersnaam/wachtwoord, proxy, statistieken en updates",
+    "GeneralSettingsSummary": "Poort, SSL, gebruikersnaam/wachtwoord, proxy, analytics en updates",
     "GrabReleases": "Uitgave Ophalen",
     "Grabbed": "Opgehaalde",
     "Grabs": "Gegrepen",
@@ -662,5 +662,13 @@
     "DownloadClientFloodSettingsTagsHelpText": "Initiële tags van een download. Om herkend te worden, moet een download alle initiële tags hebben. Dit voorkomt conflicten met niet-gerelateerde downloads.",
     "IndexerNewznabSettingsVipExpirationHelpText": "Voer de datum in (jjjj-mm-dd) voor VIP-vervaldatum of laat leeg. {appName} zal 1 week voor het verstrijken van de VIP-periode een melding geven",
     "DownloadClientSettingsDefaultCategorySubFolderHelpText": "Standaard fallback-categorie als er geen gekoppelde categorie bestaat voor een release. Het toevoegen van een categorie specifiek voor {appName} voorkomt conflicten met niet-gerelateerde downloads die niet van {appName} zijn. Het gebruik van een categorie is optioneel, maar wordt sterk aanbevolen. Er wordt een [categorie]-submap aangemaakt in de uitvoermap.",
-    "IndexerPassThePopcornSettingsApiUserHelpText": "Deze instellingen vind je in je PassThePopcorn beveiligingsinstellingen (Profiel bewerken > Beveiliging)."
+    "IndexerPassThePopcornSettingsApiUserHelpText": "Deze instellingen vind je in je PassThePopcorn beveiligingsinstellingen (Profiel bewerken > Beveiliging).",
+    "IndexerGazelleGamesSettingsFreeleechOnlyHelpText": "Doorzoek alleen freeleech releases",
+    "UsenetBlackholeNzbFolder": "Nzb map",
+    "IndexerSettingsAppsMinimumSeedersHelpText": "Minimum aantal vereiste seeders door de applicaties voordat de indexer iets ophaalt. Leeg laten gebruikt de standaardwaarde van het synchronisatieprofiel",
+    "IndexerBeyondHDSettingsFreeleechOnlyHelpText": "Doorzoek alleen freeleech releases",
+    "IndexerTorrentSyndikatSettingsApiKeyHelpText": "Site API-sleutel",
+    "SearchTypes": "Zoek types",
+    "IndexerAlphaRatioSettingsFreeleechOnlyHelpText": "Doorzoek alleen freeleech releases",
+    "IndexerAvistazSettingsFreeleechOnlyHelpText": "Doorzoek alleen freeleech releases"
 }

src/NzbDrone.Core/Localization/Core/pl.json

@@ -146,7 +146,7 @@
     "FocusSearchBox": "Zaznacz pole wyszukiwania",
     "Folder": "Teczka",
     "ForMoreInformationOnTheIndividualDownloadClients": "Aby uzyskać więcej informacji na temat poszczególnych klientów pobierania, kliknij przyciski informacyjne.",
-    "General": "Generał",
+    "General": "Ogólne",
     "GeneralSettings": "Ustawienia główne",
     "GeneralSettingsSummary": "Port, SSL, nazwa użytkownika / hasło, proxy, analizy i aktualizacje",
     "Grabbed": "Złapał",
@@ -279,7 +279,7 @@
     "DeleteTagMessageText": "Czy na pewno chcesz usunąć tag '{label}'?",
     "Details": "Szczegóły",
     "Donations": "Darowizny",
-    "DownloadClients": "Pobierz klientów",
+    "DownloadClients": "Klienci pobierania",
     "DownloadClientSettings": "Pobierz ustawienia klienta",
     "IncludeHealthWarningsHelpText": "Uwzględnij ostrzeżenia zdrowotne",
     "Indexer": "Indeksator",

src/NzbDrone.Core/Localization/Core/zh_TW.json

@@ -48,7 +48,7 @@
     "Album": "專輯",
     "Authentication": "認證",
     "AutomaticSearch": "自動搜尋",
-    "BackupFolderHelpText": "相對路徑將位於Radarr的AppData目錄下",
+    "BackupFolderHelpText": "相對路徑將位於 {appName} 的 AppData 目錄下",
     "BackupNow": "馬上備份",
     "BackupRetentionHelpText": "超過保留期的自動備份將被自動清理",
     "BindAddress": "綁定地址（Bind Address）",
@@ -75,7 +75,7 @@
     "Theme": "主題",
     "ApiKeyValidationHealthCheckMessage": "請將您的API金鑰更新為至少{length}個字元長。您可以通過設定或配置文件進行此操作。",
     "AppDataLocationHealthCheckMessage": "為了避免在更新過程中刪除AppData，將無法進行更新。",
-    "AuthenticationMethodHelpText": "需要使用者名稱和密碼來存取Radarr",
+    "AuthenticationMethodHelpText": "需要使用者名稱和密碼才能存取 {appName}",
     "Backup": "備份",
     "Enable": "啟用",
     "Grabs": "抓取",
@@ -99,7 +99,7 @@
     "Seeders": "種子",
     "Settings": "設定",
     "DownloadClients": "下載用戶端",
-    "AnalyticsEnabledHelpText": "將使用和錯誤資訊匿名傳送至Radarr的伺服器。這些資訊包括您的瀏覽器資訊、使用的Radarr WebUI頁面、錯誤報告，以及作業系統和執行時版本。我們將使用這些資訊來優先處理功能和錯誤修復。",
+    "AnalyticsEnabledHelpText": "傳送匿名使用和錯誤資訊到 {appName} 的伺服器。這包括您的瀏覽器資訊、您使用的 {appName} WebUI 頁面、錯誤報告以及作業系統和執行階段版本。我們將使用這些資訊來優先處理功能和錯誤修正。",
     "ApiKey": "API 金鑰",
     "AppDataDirectory": "AppData 路徑",
     "Applications": "應用程式",
@@ -135,7 +135,7 @@
     "IndexerHDBitsSettingsCodecs": "編解碼器",
     "Directory": "目錄",
     "BuiltIn": "內建的",
-    "AllSearchResultsHiddenByFilter": "根據所使用的篩選器已將所有結果隱藏",
+    "AllSearchResultsHiddenByFilter": "根據所使用的篩選器已將所有結果隱藏。",
     "AptUpdater": "使用apt安裝更新",
     "Discord": "Discord",
     "Any": "任何",

src/NzbDrone.Core/Prowlarr.Core.csproj

@@ -6,23 +6,23 @@
     <PackageReference Include="AngleSharp.Xml" Version="1.0.0" />
     <PackageReference Include="Dapper" Version="2.1.66" />
     <PackageReference Include="Diacritical.Net" Version="1.0.4" />
-    <PackageReference Include="MailKit" Version="4.12.1" />
+    <PackageReference Include="MailKit" Version="4.14.0" />
     <PackageReference Include="Microsoft.AspNetCore.Cryptography.KeyDerivation" Version="8.0.16" />
     <PackageReference Include="Microsoft.AspNetCore.WebUtilities" Version="8.0.16" />
-    <PackageReference Include="Microsoft.Data.SqlClient" Version="6.0.2" />
+    <PackageReference Include="Microsoft.Data.SqlClient" Version="6.1.1" />
     <PackageReference Include="NLog.Targets.Syslog" Version="7.0.0" />
     <PackageReference Include="Npgsql" Version="9.0.3" />
-    <PackageReference Include="Polly" Version="8.6.0" />
+    <PackageReference Include="Polly" Version="8.6.4" />
     <PackageReference Include="Servarr.FluentMigrator.Runner" Version="3.3.2.9" />
     <PackageReference Include="Servarr.FluentMigrator.Runner.Postgres" Version="3.3.2.9" />
     <PackageReference Include="Servarr.FluentMigrator.Runner.SQLite" Version="3.3.2.9" />
+    <PackageReference Include="System.Drawing.Common" Version="8.0.19" />
     <PackageReference Include="System.Memory" Version="4.6.3" />
     <PackageReference Include="System.ServiceModel.Syndication" Version="8.0.0" />
     <PackageReference Include="FluentValidation" Version="9.5.4" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
     <PackageReference Include="NLog" Version="5.4.0" />
-    <PackageReference Include="System.Data.SQLite.Core.Servarr" Version="1.0.115.5-18" />
-    <PackageReference Include="System.Text.Json" Version="8.0.5" />
+    <PackageReference Include="System.Text.Json" Version="8.0.6" />
     <PackageReference Include="MonoTorrent" Version="2.0.7" />
     <PackageReference Include="YamlDotNet" Version="16.3.0" />
     <PackageReference Include="AngleSharp" Version="1.3.0" />

src/NzbDrone.Host/Startup.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Net;
 using DryIoc;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Builder;
@@ -31,6 +32,7 @@ using Prowlarr.Http.ClientSchema;
 using Prowlarr.Http.ErrorManagement;
 using Prowlarr.Http.Frontend;
 using Prowlarr.Http.Middleware;
+using IPNetwork = Microsoft.AspNetCore.HttpOverrides.IPNetwork;
 using LogLevel = Microsoft.Extensions.Logging.LogLevel;
 
 namespace NzbDrone.Host
@@ -59,8 +61,11 @@ namespace NzbDrone.Host
             services.Configure<ForwardedHeadersOptions>(options =>
             {
                 options.ForwardedHeaders = ForwardedHeaders.XForwardedFor | ForwardedHeaders.XForwardedProto | ForwardedHeaders.XForwardedHost;
-                options.KnownNetworks.Clear();
-                options.KnownProxies.Clear();
+                options.KnownNetworks.Add(new IPNetwork(IPAddress.Parse("10.0.0.0"), 8));
+                options.KnownNetworks.Add(new IPNetwork(IPAddress.Parse("172.16.0.0"), 12));
+                options.KnownNetworks.Add(new IPNetwork(IPAddress.Parse("192.168.0.0"), 16));
+                options.KnownNetworks.Add(new IPNetwork(IPAddress.Parse("fc00::"), 7));
+                options.KnownNetworks.Add(new IPNetwork(IPAddress.Parse("fe80::"), 10));
             });
 
             services.AddRouting(options => options.LowercaseUrls = true);

src/coverlet.runsettings

@@ -4,7 +4,7 @@
     <DataCollectors>
       <DataCollector friendlyName="XPlat code coverage">
         <Configuration>
-          <Format>opencover</Format>
+          <Format>cobertura</Format>
           <Exclude>[Prowlarr.*.Test]*,[Prowlarr.Test.*]*,[Prowlarr.Api*]*</Exclude>
         </Configuration>
       </DataCollector>