Fixed: (Indexers) Rate limit for download and auth

Fixed: (Rarbg) Updated app_id per site request (#1447 )
Fixed: (CardigannBase) Remedy for casting strings to booleans
2026-04-19 22:04:56 -04:00 · 2023-02-19 18:54:17 +02:00 · 2023-02-19 18:23:18 +02:00 · 2023-02-19 17:07:25 +02:00 · 2023-02-19 10:43:26 +02:00 · 2023-02-19 00:15:54 -06:00
261 changed files with 9987 additions and 5306 deletions
@@ -117,7 +117,6 @@ dotnet_diagnostic.CA1003.severity = suggestion
 dotnet_diagnostic.CA1008.severity = suggestion
 dotnet_diagnostic.CA1010.severity = suggestion
 dotnet_diagnostic.CA1012.severity = suggestion
-dotnet_diagnostic.CA1014.severity = suggestion
 dotnet_diagnostic.CA1016.severity = suggestion
 dotnet_diagnostic.CA1017.severity = suggestion
 dotnet_diagnostic.CA1018.severity = suggestion
@@ -163,6 +162,7 @@ dotnet_diagnostic.CA1309.severity = suggestion
 dotnet_diagnostic.CA1310.severity = suggestion
 dotnet_diagnostic.CA1401.severity = suggestion
 dotnet_diagnostic.CA1416.severity = suggestion
+dotnet_diagnostic.CA1419.severity = suggestion
 dotnet_diagnostic.CA1507.severity = suggestion
 dotnet_diagnostic.CA1508.severity = suggestion
 dotnet_diagnostic.CA1707.severity = suggestion
@@ -178,9 +178,6 @@ dotnet_diagnostic.CA1720.severity = suggestion
 dotnet_diagnostic.CA1721.severity = suggestion
 dotnet_diagnostic.CA1724.severity = suggestion
 dotnet_diagnostic.CA1725.severity = suggestion
-dotnet_diagnostic.CA1801.severity = suggestion
-dotnet_diagnostic.CA1802.severity = suggestion
-dotnet_diagnostic.CA1805.severity = suggestion
 dotnet_diagnostic.CA1806.severity = suggestion
 dotnet_diagnostic.CA1810.severity = suggestion
 dotnet_diagnostic.CA1812.severity = suggestion
@@ -192,13 +189,14 @@ dotnet_diagnostic.CA1819.severity = suggestion
 dotnet_diagnostic.CA1822.severity = suggestion
 dotnet_diagnostic.CA1823.severity = suggestion
 dotnet_diagnostic.CA1824.severity = suggestion
+dotnet_diagnostic.CA1835.severity = suggestion
+dotnet_diagnostic.CA1845.severity = suggestion
+dotnet_diagnostic.CA1848.severity = suggestion
+dotnet_diagnostic.CA1849.severity = suggestion
 dotnet_diagnostic.CA2000.severity = suggestion
 dotnet_diagnostic.CA2002.severity = suggestion
 dotnet_diagnostic.CA2007.severity = suggestion
 dotnet_diagnostic.CA2008.severity = suggestion
-dotnet_diagnostic.CA2009.severity = suggestion
-dotnet_diagnostic.CA2010.severity = suggestion
-dotnet_diagnostic.CA2011.severity = suggestion
 dotnet_diagnostic.CA2012.severity = suggestion
 dotnet_diagnostic.CA2013.severity = suggestion
 dotnet_diagnostic.CA2100.severity = suggestion
@@ -229,6 +227,7 @@ dotnet_diagnostic.CA2243.severity = suggestion
 dotnet_diagnostic.CA2244.severity = suggestion
 dotnet_diagnostic.CA2245.severity = suggestion
 dotnet_diagnostic.CA2246.severity = suggestion
+dotnet_diagnostic.CA2254.severity = suggestion
 dotnet_diagnostic.CA3061.severity = suggestion
 dotnet_diagnostic.CA3075.severity = suggestion
 dotnet_diagnostic.CA3076.severity = suggestion
@@ -255,6 +254,7 @@ dotnet_diagnostic.CA5385.severity = suggestion
 dotnet_diagnostic.CA5392.severity = suggestion
 dotnet_diagnostic.CA5394.severity = suggestion
 dotnet_diagnostic.CA5397.severity = suggestion
+dotnet_diagnostic.CA5401.severity = suggestion

 dotnet_diagnostic.SYSLIB0014.severity = none

@@ -1,41 +0,0 @@
-name: Sync issue to Azure DevOps work item
-
-on:
-  issues:
-    types:
-      [opened, edited, deleted, closed, reopened, labeled, unlabeled, assigned]
-
-concurrency: azuresync-${{ github.event.issue.number }}
-
-jobs:
-  alert:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: danhellem/github-actions-issue-to-work-item@master
-        if: "${{ contains(github.event.issue.labels.*.name, 'Type: Bug') == true }}"
-        env:
-          ado_token: "${{ secrets.ADO_PERSONAL_ACCESS_TOKEN }}"
-          github_token: "${{ github.token }}"
-          ado_organization: "Servarr"
-          ado_project: "Servarr"
-          ado_area_path: "Servarr\\Prowlarr"
-          ado_wit: "Bug"
-          ado_new_state: "New"
-          ado_active_state: "Active"
-          ado_close_state: "Closed"
-          ado_bypassrules: true
-          log_level: 100
-      - uses: danhellem/github-actions-issue-to-work-item@master
-        if: "${{ contains(github.event.issue.labels.*.name, 'Type: Bug') == false }}"
-        env:
-          ado_token: "${{ secrets.ADO_PERSONAL_ACCESS_TOKEN }}"
-          github_token: "${{ github.token }}"
-          ado_organization: "Servarr"
-          ado_project: "Servarr"
-          ado_area_path: "Servarr\\Prowlarr"
-          ado_wit: "User Story"
-          ado_new_state: "New"
-          ado_active_state: "Active"
-          ado_close_state: "Closed"
-          ado_bypassrules: true
-          log_level: 100
@@ -9,13 +9,13 @@ variables:
  testsFolder: './_tests'
  yarnCacheFolder: $(Pipeline.Workspace)/.yarn
  nugetCacheFolder: $(Pipeline.Workspace)/.nuget/packages
-  majorVersion: '1.0.1'
+  majorVersion: '1.2.2'
  minorVersion: $[counter('minorVersion', 1)]
  prowlarrVersion: '$(majorVersion).$(minorVersion)'
  buildName: '$(Build.SourceBranchName).$(prowlarrVersion)'
  sentryOrg: 'servarr'
  sentryUrl: 'https://sentry.servarr.com'
-  dotnetVersion: '6.0.404'
+  dotnetVersion: '6.0.405'
  innoVersion: '6.2.0'
  nodeVersion: '16.x'
  windowsImage: 'windows-2022'
@@ -142,8 +142,8 @@ module.exports = (env) => {
    module: {
      rules: [
        {
-          test: /\.js?$/,
-          exclude: /(node_modules|JsLibraries)/,
+          test: /\.jsx?$/,
+          exclude: /[\\/]node_modules[\\/](?!(@sentry\/browser|@sentry\/integrations|chart.js|filesize|normalize.css)[\\/])/,
          use: [
            {
              loader: 'babel-loader',
@@ -50,7 +50,7 @@ function CustomFiltersModalContent(props) {

        <div className={styles.addButtonContainer}>
          <Button onPress={onAddCustomFilter}>
-            Add Custom Filter
+            {translate('AddCustomFilter')}
          </Button>
        </div>
      </ModalBody>
@@ -61,15 +61,15 @@ class TagsModalContent extends Component {
    } = this.state;

    const applyTagsOptions = [
-      { key: 'add', value: 'Add' },
-      { key: 'remove', value: 'Remove' },
-      { key: 'replace', value: 'Replace' }
+      { key: 'add', value: translate('Add') },
+      { key: 'remove', value: translate('Remove') },
+      { key: 'replace', value: translate('Replace') }
    ];

    return (
      <ModalContent onModalClose={onModalClose}>
        <ModalHeader>
-          Tags
+          {translate('Tags')}
        </ModalHeader>

        <ModalBody>
@@ -26,7 +26,7 @@ function IndexerIndexSortMenu(props) {
          sortDirection={sortDirection}
          onPress={onSortSelect}
        >
-          Status
+          {translate('Status')}
        </SortMenuItem>

        <SortMenuItem
@@ -62,7 +62,7 @@ function IndexerIndexSortMenu(props) {
          sortDirection={sortDirection}
          onPress={onSortSelect}
        >
-          {'Priority'}
+          {translate('Priority')}
        </SortMenuItem>

        <SortMenuItem
@@ -71,7 +71,7 @@ function IndexerIndexSortMenu(props) {
          sortDirection={sortDirection}
          onPress={onSortSelect}
        >
-          {'Protocol'}
+          {translate('Protocol')}
        </SortMenuItem>

        <SortMenuItem
@@ -80,7 +80,7 @@ function IndexerIndexSortMenu(props) {
          sortDirection={sortDirection}
          onPress={onSortSelect}
        >
-          {'Privacy'}
+          {translate('Privacy')}
        </SortMenuItem>
      </MenuContent>
    </SortMenu>
@@ -79,6 +79,7 @@ class IndexerIndexRow extends Component {
      privacy,
      priority,
      status,
+      fields,
      appProfile,
      added,
      capabilities,
@@ -96,6 +97,8 @@ class IndexerIndexRow extends Component {
      isIndexerInfoModalOpen
    } = this.state;

+    const baseUrl = fields.find((field) => field.name === 'baseUrl')?.value ?? (Array.isArray(indexerUrls) ? indexerUrls[0] : undefined);
+
    return (
      <>
        {
@@ -245,12 +248,12 @@ class IndexerIndexRow extends Component {
                  />

                  {
-                    indexerUrls ?
+                    baseUrl ?
                      <IconButton
                        className={styles.externalLink}
                        name={icons.EXTERNAL_LINK}
                        title={translate('Website')}
-                        to={indexerUrls[0].replace('api.', '')}
+                        to={baseUrl.replace('api.', '')}
                      /> : null
                  }

@@ -299,6 +302,7 @@ IndexerIndexRow.propTypes = {
  name: PropTypes.string.isRequired,
  enable: PropTypes.bool.isRequired,
  redirect: PropTypes.bool.isRequired,
+  fields: PropTypes.arrayOf(PropTypes.object).isRequired,
  appProfile: PropTypes.object.isRequired,
  status: PropTypes.object,
  capabilities: PropTypes.object,
@@ -20,11 +20,14 @@ function IndexerInfoModalContent(props) {
    encoding,
    language,
    indexerUrls,
+    fields,
    protocol,
    capabilities,
    onModalClose
  } = props;

+  const baseUrl = fields.find((field) => field.name === 'baseUrl')?.value ?? indexerUrls[0];
+
  return (
    <ModalContent onModalClose={onModalClose}>
      <ModalHeader>
@@ -57,7 +60,7 @@ function IndexerInfoModalContent(props) {
              />
              <DescriptionListItemTitle>{translate('IndexerSite')}</DescriptionListItemTitle>
              <DescriptionListItemDescription>
-                <Link to={indexerUrls[0]}>{indexerUrls[0]}</Link>
+                <Link to={baseUrl}>{baseUrl}</Link>
              </DescriptionListItemDescription>
              <DescriptionListItemTitle>{`${protocol === 'usenet' ? 'Newznab' : 'Torznab'} Url`}</DescriptionListItemTitle>
              <DescriptionListItemDescription>
@@ -114,6 +117,7 @@ IndexerInfoModalContent.propTypes = {
  encoding: PropTypes.string.isRequired,
  language: PropTypes.string.isRequired,
  indexerUrls: PropTypes.arrayOf(PropTypes.string).isRequired,
+  fields: PropTypes.arrayOf(PropTypes.object).isRequired,
  protocol: PropTypes.string.isRequired,
  capabilities: PropTypes.object.isRequired,
  onModalClose: PropTypes.func.isRequired
@@ -28,7 +28,7 @@ class AddApplicationModalContent extends Component {
    return (
      <ModalContent onModalClose={onModalClose}>
        <ModalHeader>
-          Add Application
+          {translate('AddApplication')}
        </ModalHeader>

        <ModalBody>
@@ -71,14 +71,14 @@ class Application extends Component {
        {
          syncLevel === 'addOnly' &&
            <Label kind={kinds.WARNING}>
-              Add and Remove Only
+              {translate('AddRemoveOnly')}
            </Label>
        }

        {
          syncLevel === 'fullSync' &&
            <Label kind={kinds.SUCCESS}>
-              Full Sync
+              {translate('FullSync')}
            </Label>
        }

@@ -88,7 +88,7 @@ class Application extends Component {
              kind={kinds.DISABLED}
              outline={true}
            >
-              Disabled
+              {translate('Disabled')}
            </Label>
        }

@@ -106,7 +106,7 @@ class IndexerProxy extends Component {
              kind={kinds.DISABLED}
              outline={true}
            >
-              Disabled
+              {translate('Disabled')}
            </Label> :
            null
        }
@@ -54,7 +54,7 @@ export const defaultState = {
    },
    {
      name: 'grabTitle',
-      label: translate('Grab Title'),
+      label: translate('GrabTitle'),
      isSortable: false,
      isVisible: false
    },
@@ -78,7 +78,7 @@ export const defaultState = {
    },
    {
      name: 'elapsedTime',
-      label: translate('Elapsed Time'),
+      label: translate('ElapsedTime'),
      isSortable: false,
      isVisible: true
    },
@@ -25,7 +25,7 @@ const columns = [
  },
  {
    name: 'size',
-    label: 'Size',
+    label: translate('Size'),
    isVisible: true
  },
  {
@@ -113,7 +113,7 @@ class Updates extends Component {
                />

                <div className={styles.message}>
-                  The latest version of Prowlarr is already installed
+                  {translate('TheLatestVersionIsAlreadyInstalled', ['Prowlarr'])}
                </div>

                {
@@ -11,7 +11,8 @@
    "lint": "esprint check",
    "lint-fix": "esprint check --fix",
    "stylelint-linux": "stylelint $(find frontend -name '*.css') --config frontend/.stylelintrc",
-    "stylelint-windows": "stylelint frontend/**/*.css --config frontend/.stylelintrc"
+    "stylelint-windows": "stylelint frontend/**/*.css --config frontend/.stylelintrc",
+    "check-modules": "are-you-es5 check . -r"
  },
  "repository": "https://github.com/Prowlarr/Prowlarr",
  "author": "Team Prowlarr",
@@ -30,7 +31,7 @@
    "@fortawesome/free-regular-svg-icons": "6.2.1",
    "@fortawesome/free-solid-svg-icons": "6.2.1",
    "@fortawesome/react-fontawesome": "0.2.0",
-    "@microsoft/signalr": "6.0.11",
+    "@microsoft/signalr": "6.0.13",
    "@sentry/browser": "7.28.0",
    "@sentry/integrations": "7.28.0",
    "chart.js": "4.1.1",
@@ -93,6 +94,7 @@
    "@babel/plugin-syntax-dynamic-import": "7.8.3",
    "@babel/preset-env": "7.20.2",
    "@babel/preset-react": "7.18.6",
+    "are-you-es5": "2.1.2",
    "autoprefixer": "10.4.13",
    "babel-loader": "9.1.0",
    "babel-plugin-inline-classnames": "2.0.1",
@@ -0,0 +1,3 @@
+is_global = true
+
+dotnet_diagnostic.CA1014.severity = none
@@ -1,6 +1,7 @@
 <Project>
  <!-- Common to all Prowlarr Projects -->
  <PropertyGroup>
+    <AnalysisLevel>6.0-all</AnalysisLevel>
    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
    <ErrorOnDuplicatePublishOutputFiles>false</ErrorOnDuplicatePublishOutputFiles> 
    <PlatformTarget>AnyCPU</PlatformTarget>
@@ -53,6 +53,26 @@ namespace NzbDrone.Common.Test.Http
            newUri.FullUri.Should().Be(expected);
        }

+        [TestCase("", "./relative", "relative")]
+        [TestCase("/", "./relative", "/relative")]
+        [TestCase("/base", "./relative", "/relative")]
+        [TestCase("/base/sub", "./relative", "/base/relative")]
+        [TestCase("/base/sub/", "./relative", "/base/sub/relative")]
+        [TestCase("base/sub", "./relative", "base/relative")]
+        [TestCase("base/sub/", "./relative", "base/sub/relative")]
+        [TestCase("", "../relative", "relative")]
+        [TestCase("/", "../relative", "/relative")]
+        [TestCase("/base", "../relative", "/relative")]
+        [TestCase("/base/sub", "../relative", "/base/relative")]
+        [TestCase("/base/sub/", "../relative", "/base/sub/relative")]
+        [TestCase("base/sub", "../relative", "base/relative")]
+        [TestCase("base/sub/", "../relative", "base/sub/relative")]
+        public void should_combine_uri_with_dot_segment(string basePath, string relativePath, string expected)
+        {
+            var newUri = new HttpUri(basePath) + new HttpUri(relativePath);
+            newUri.FullUri.Should().Be(expected);
+        }
+
        [TestCase("", "", "")]
        [TestCase("/", "", "/")]
        [TestCase("base", "", "base")]
@@ -24,12 +24,16 @@ namespace NzbDrone.Common.Test.InstrumentationTests
        [TestCase(@"https://beyond-hd.me/api/torrents/2b51db35e1912ffc138825a12b9933d2")]
        [TestCase(@"Req: [POST] https://www3.yggtorrent.nz/user/login: id=mySecret&pass=mySecret&ci_csrf_token=2b51db35e1912ffc138825a12b9933d2")]
        [TestCase(@"https://torrentseeds.org/api/torrents/filter?api_token=2b51db35e1912ffc138825a12b9933d2&name=&sortField=created_at&sortDirection=desc&perPage=100&page=1")]
+        [TestCase(@"https://beyond-hd.me/torrent/download/the-next-365-days-2022-2160p-nf-web-dl-dual-ddp-51-dovi-hdr-hevc-apex.225146.2b51db35e1912ffc138825a12b9933d2")]
+        [TestCase(@"https://anthelion.me/api.php?api_key=2b51db35e1910123321025a12b9933d2&o=json&t=movie&q=&tmdb=&imdb=&cat=&limit=100&offset=0")]
+        [TestCase(@"https://avistaz.to/api/v1/jackett/auth: username=mySecret&password=mySecret&pid=mySecret")]

        // Indexer and Download Client Responses

        // avistaz response
        [TestCase(@"""download"":""https://avistaz.to/rss/download/2b51db35e1910123321025a12b9933d2/tb51db35e1910123321025a12b9933d2.torrent"",")]
        [TestCase(@",""info_hash"":""2b51db35e1910123321025a12b9933d2"",")]
+        [TestCase(@"""token"":""2b51db35e1910123321025a12b9933d2""")]

        // animebytes response
        [TestCase(@"""Link"":""https://animebytes.tv/torrent/994064/download/tb51db35e1910123321025a12b9933d2"",")]
@@ -131,7 +131,7 @@ namespace NzbDrone.Common.Extensions

        public static string WrapInQuotes(this string text)
        {
-            if (!text.Contains(" "))
+            if (!text.Contains(' '))
            {
                return text;
            }
@@ -255,7 +255,7 @@ namespace NzbDrone.Common.Extensions

        public static string ToUrlHost(this string input)
        {
-            return input.Contains(":") ? $"[{input}]" : input;
+            return input.Contains(':') ? $"[{input}]" : input;
        }
    }
 }
@@ -113,7 +113,7 @@ namespace NzbDrone.Common.Http.Dispatchers
                {
                    if (request.ResponseStream != null && responseMessage.StatusCode == HttpStatusCode.OK)
                    {
-                        responseMessage.Content.CopyTo(request.ResponseStream, null, cts.Token);
+                        await responseMessage.Content.CopyToAsync(request.ResponseStream, null, cts.Token);
                    }
                    else
                    {
@@ -76,6 +76,7 @@ namespace NzbDrone.Common.Http
            get
            {
                var newUrl = Headers["Location"];
+
                if (newUrl == null)
                {
                    newUrl = Headers["Refresh"];
@@ -166,6 +166,37 @@ namespace NzbDrone.Common.Http
                return relativePath;
            }

+            if (relativePath.StartsWith("./"))
+            {
+                relativePath = relativePath.TrimStart('.').TrimStart('/');
+
+                var lastIndex = basePath.LastIndexOf("/");
+
+                if (lastIndex > 0)
+                {
+                    basePath = basePath.Substring(0, lastIndex) + "/";
+                }
+            }
+
+            if (relativePath.StartsWith("../"))
+            {
+                relativePath = relativePath.TrimStart('.').TrimStart('/');
+
+                var lastIndex = basePath.LastIndexOf("/");
+
+                if (lastIndex > 0)
+                {
+                    basePath = basePath.Substring(0, lastIndex) + "/";
+                }
+
+                var secondLastIndex = basePath.LastIndexOf("/");
+
+                if (lastIndex > 0)
+                {
+                    basePath = basePath.Substring(0, secondLastIndex) + "/";
+                }
+            }
+
            var baseSlashIndex = basePath.LastIndexOf('/');

            if (baseSlashIndex >= 0)
@@ -11,15 +11,13 @@ namespace NzbDrone.Common.Http
        {
            if (response.Headers.ContainsKey("Retry-After"))
            {
-                var retryAfter = response.Headers["Retry-After"].ToString();
-                int seconds;
-                DateTime date;
+                var retryAfter = response.Headers["Retry-After"];

-                if (int.TryParse(retryAfter, out seconds))
+                if (int.TryParse(retryAfter, out var seconds))
                {
                    RetryAfter = TimeSpan.FromSeconds(seconds);
                }
-                else if (DateTime.TryParse(retryAfter, out date))
+                else if (DateTime.TryParse(retryAfter, out var date))
                {
                    RetryAfter = date.ToUniversalTime() - DateTime.UtcNow;
                }
@@ -1,4 +1,3 @@
-using System;
 using System.Linq;
 using System.Net;
 using System.Text.RegularExpressions;
@@ -8,10 +7,10 @@ namespace NzbDrone.Common.Instrumentation
 {
    public class CleanseLogMessage
    {
-        private static readonly Regex[] CleansingRules = new[]
+        private static readonly Regex[] CleansingRules =
        {
                // Url
-                new Regex(@"(?<=[?&: ;])(apikey|(?:(?:access|api)[-_]?)?token|pass(?:key|wd)?|auth|authkey|user|u?id|api|[a-z_]*apikey|account|pwd)=(?<secret>[^&=""]+?)(?=[ ""&=]|$)", RegexOptions.Compiled | RegexOptions.IgnoreCase),
+                new Regex(@"(?<=[?&: ;])(apikey|api_key|(?:(?:access|api)[-_]?)?token|pass(?:key|wd)?|auth|authkey|user|u?id|api|[a-z_]*apikey|account|pid|pwd)=(?<secret>[^&=""]+?)(?=[ ""&=]|$)", RegexOptions.Compiled | RegexOptions.IgnoreCase),
                new Regex(@"(?<=[?& ;])[^=]*?(_?(?<!use|get_)token|username|passwo?rd)=(?<secret>[^&=]+?)(?= |&|$|;)", RegexOptions.Compiled | RegexOptions.IgnoreCase),
                new Regex(@"rss\.torrentleech\.org/(?!rss)(?<secret>[0-9a-z]+)", RegexOptions.Compiled | RegexOptions.IgnoreCase),
                new Regex(@"rss\.torrentleech\.org/rss/download/[0-9]+/(?<secret>[0-9a-z]+)", RegexOptions.Compiled | RegexOptions.IgnoreCase),
@@ -21,6 +20,7 @@ namespace NzbDrone.Common.Instrumentation
                new Regex(@"\b(\w*)?(_?(?<!use|get_)token|username|passwo?rd)=(?<secret>[^&=]+?)(?= |&|$|;)", RegexOptions.Compiled | RegexOptions.IgnoreCase),
                new Regex(@"(?<=authkey = "")(?<secret>[^&=]+?)(?="")", RegexOptions.Compiled | RegexOptions.IgnoreCase),
                new Regex(@"(?<=beyond-hd\.[a-z]+/api/torrents/)(?<secret>[^&=][a-z0-9]+)", RegexOptions.Compiled | RegexOptions.IgnoreCase),
+                new Regex(@"(?<=beyond-hd\.[a-z]+/torrent/download/[\w\d-]+[.]\d+[.])(?<secret>[a-z0-9]+)", RegexOptions.Compiled | RegexOptions.IgnoreCase),

                // UNIT3D
                new Regex(@"(?<=[a-z0-9-]+\.[a-z]+/torrent/download/\d+\.)(?<secret>[^&=][a-z0-9]+)", RegexOptions.Compiled | RegexOptions.IgnoreCase),
@@ -58,6 +58,7 @@ namespace NzbDrone.Common.Instrumentation
                new Regex(@"(?:avistaz|exoticaz|cinemaz|privatehd)\.[a-z]{2,3}/rss/download/(?<secret>[^&=]+?)/(?<secret>[^&=]+?)\.torrent", RegexOptions.Compiled | RegexOptions.IgnoreCase),
                new Regex(@"(?:animebytes)\.[a-z]{2,3}/torrent/[0-9]+/download/(?<secret>[^&=]+?)[""]", RegexOptions.Compiled | RegexOptions.IgnoreCase),
                new Regex(@",""info_hash"":""(?<secret>[^&=]+?)"",", RegexOptions.Compiled | RegexOptions.IgnoreCase),
+                new Regex(@"""token"":""(?<secret>[^&=]+?)""", RegexOptions.Compiled | RegexOptions.IgnoreCase),
                new Regex(@",""pass[- _]?key"":""(?<secret>[^&=]+?)"",", RegexOptions.Compiled | RegexOptions.IgnoreCase),
                new Regex(@",""rss[- _]?key"":""(?<secret>[^&=]+?)"",", RegexOptions.Compiled | RegexOptions.IgnoreCase),
        };
@@ -8,6 +8,7 @@ using System.Threading;
 using NLog;
 using NLog.Common;
 using NLog.Targets;
+using Npgsql;
 using NzbDrone.Common.EnvironmentInfo;
 using NzbDrone.Common.Extensions;
 using Sentry;
@@ -34,6 +35,14 @@ namespace NzbDrone.Common.Instrumentation.Sentry
            SQLiteErrorCode.Auth
        };

+        private static readonly HashSet<string> FilteredPostgresErrorCodes = new HashSet<string>
+        {
+            PostgresErrorCodes.OutOfMemory,
+            PostgresErrorCodes.TooManyConnections,
+            PostgresErrorCodes.DiskFull,
+            PostgresErrorCodes.ProgramLimitExceeded
+        };
+
        // use string and not Type so we don't need a reference to the project
        // where these are defined
        private static readonly HashSet<string> FilteredExceptionTypeNames = new HashSet<string>
@@ -239,6 +248,19 @@ namespace NzbDrone.Common.Instrumentation.Sentry
                        return false;
                    }

+                    var pgEx = logEvent.Exception as PostgresException;
+                    if (pgEx != null && FilteredPostgresErrorCodes.Contains(pgEx.SqlState))
+                    {
+                        return false;
+                    }
+
+                    // We don't care about transient network and timeout errors
+                    var npgEx = logEvent.Exception as NpgsqlException;
+                    if (npgEx != null && npgEx.IsTransient)
+                    {
+                        return false;
+                    }
+
                    if (FilteredExceptionTypeNames.Contains(logEvent.Exception.GetType().Name))
                    {
                        return false;
@@ -226,7 +226,7 @@ namespace NzbDrone.Common.OAuth
 #if WINRT
            return CultureInfo.InvariantCulture.CompareInfo.Compare(left, right, CompareOptions.IgnoreCase) == 0;
 #else
-            return string.Compare(left, right, StringComparison.InvariantCultureIgnoreCase) == 0;
+            return string.Equals(left, right, StringComparison.InvariantCultureIgnoreCase);
 #endif
        }

@@ -4,12 +4,13 @@
    <DefineConstants Condition="'$(RuntimeIdentifier)' == 'linux-musl-x64' or '$(RuntimeIdentifier)' == 'linux-musl-arm64'">ISMUSL</DefineConstants>
  </PropertyGroup>
  <ItemGroup>
-    <PackageReference Include="DryIoc.dll" Version="5.3.1" />
+    <PackageReference Include="DryIoc.dll" Version="5.3.3" />
    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.1" />
    <PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="6.0.1" />
    <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
    <PackageReference Include="NLog" Version="5.1.0" />
    <PackageReference Include="NLog.Extensions.Logging" Version="5.2.0" />
+    <PackageReference Include="Npgsql" Version="5.0.11" />
    <PackageReference Include="Sentry" Version="3.24.1" />
    <PackageReference Include="NLog.Targets.Syslog" Version="7.0.0" />
    <PackageReference Include="SharpZipLib" Version="1.3.3" />
@@ -64,7 +64,7 @@ namespace NzbDrone.Common

            var args = $"create {serviceName} " +
                $"DisplayName= \"{serviceName}\" " +
-                $"binpath= \"{Process.GetCurrentProcess().MainModule.FileName}\" " +
+                $"binpath= \"{Environment.ProcessPath}\" " +
                "start= auto " +
                "depend= EventLog/Tcpip/http " +
                "obj= \"NT AUTHORITY\\LocalService\"";
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
@@ -19,7 +19,7 @@ namespace NzbDrone.Common.TPL
        private readonly int _maxDegreeOfParallelism;

        /// <summary>Whether the scheduler is currently processing work items.</summary>
-        private int _delegatesQueuedOrRunning = 0;
+        private int _delegatesQueuedOrRunning;

        /// <summary>
        /// Initializes an instance of the LimitedConcurrencyLevelTaskScheduler class with the
@@ -51,7 +51,7 @@ namespace NzbDrone.Core.Test.IndexerTests.AvistazTests
            torrentInfo.InfoUrl.Should().Be("https://avistaz.to/torrent/187240-japan-sinks-people-of-hope-2021-s01e05-720p-nf-web-dl-ddp20-x264-seikel");
            torrentInfo.CommentUrl.Should().BeNullOrEmpty();
            torrentInfo.Indexer.Should().Be(Subject.Definition.Name);
-            torrentInfo.PublishDate.Should().Be(DateTime.Parse("2021-11-15 04:26:21"));
+            torrentInfo.PublishDate.Should().Be(DateTime.Parse("2021-11-14 22:26:21"));
            torrentInfo.Size.Should().Be(935127615);
            torrentInfo.InfoHash.Should().Be("a879261d4e6e792402f92401141a21de70d51bf2");
            torrentInfo.MagnetUrl.Should().Be(null);
@@ -8,7 +8,7 @@ using Moq;
 using NUnit.Framework;
 using NzbDrone.Common.Http;
 using NzbDrone.Core.Indexers;
-using NzbDrone.Core.Indexers.FileList;
+using NzbDrone.Core.Indexers.Definitions.FileList;
 using NzbDrone.Core.IndexerSearch.Definitions;
 using NzbDrone.Core.Parser.Model;
 using NzbDrone.Core.Test.Framework;
@@ -21,10 +21,15 @@ namespace NzbDrone.Core.Test.IndexerTests.FileListTests
        [SetUp]
        public void Setup()
        {
-            Subject.Definition = new IndexerDefinition()
+            Subject.Definition = new IndexerDefinition
            {
                Name = "FileList",
-                Settings = new FileListSettings() { Username = "someuser", Passkey = "somepass" }
+                Settings = new FileListSettings
+                {
+                    BaseUrl = "https://filelist.io/",
+                    Username = "someuser",
+                    Passkey = "somepass"
+                }
            };
        }

@@ -35,9 +40,9 @@ namespace NzbDrone.Core.Test.IndexerTests.FileListTests

            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(), new CookieCollection(), recentFeed)));
+                .Returns<HttpRequest, IndexerDefinition>((r, d) => Task.FromResult(new HttpResponse(r, new HttpHeader { { "Content-Type", "application/json" } }, new CookieCollection(), recentFeed)));

-            var releases = (await Subject.Fetch(new MovieSearchCriteria { Categories = new int[] { 2000 } })).Releases;
+            var releases = (await Subject.Fetch(new MovieSearchCriteria { Categories = new[] { 2000 } })).Releases;

            releases.Should().HaveCount(4);
            releases.First().Should().BeOfType<TorrentInfo>();
@@ -50,12 +55,14 @@ namespace NzbDrone.Core.Test.IndexerTests.FileListTests
            torrentInfo.InfoUrl.Should().Be("https://filelist.io/details.php?id=665873");
            torrentInfo.CommentUrl.Should().BeNullOrEmpty();
            torrentInfo.Indexer.Should().Be(Subject.Definition.Name);
-            torrentInfo.PublishDate.Should().Be(DateTime.Parse("2020-01-25 22:20:19"));
+            torrentInfo.PublishDate.Should().Be(DateTime.Parse("2020-01-25 20:20:19"));
            torrentInfo.Size.Should().Be(8300512414);
            torrentInfo.InfoHash.Should().Be(null);
            torrentInfo.MagnetUrl.Should().Be(null);
            torrentInfo.Peers.Should().Be(2 + 12);
            torrentInfo.Seeders.Should().Be(12);
+
+            releases.Any(t => t.IndexerFlags.Contains(IndexerFlag.Internal)).Should().Be(true);
        }
    }
 }
@@ -3,7 +3,7 @@ using System.Linq;
 using FluentAssertions;
 using NUnit.Framework;
 using NzbDrone.Core.Indexers;
-using NzbDrone.Core.Indexers.FileList;
+using NzbDrone.Core.Indexers.Definitions.FileList;
 using NzbDrone.Core.IndexerSearch.Definitions;
 using NzbDrone.Core.Test.Framework;

@@ -16,18 +16,18 @@ namespace NzbDrone.Core.Test.IndexerTests.FileListTests
        [SetUp]
        public void Setup()
        {
-            Subject.Settings = new FileListSettings()
+            Subject.Settings = new FileListSettings
            {
+                BaseUrl = "https://filelist.io/",
                Passkey = "abcd",
-                Username = "somename",
-                BaseUrl = "https://filelist.io"
+                Username = "somename"
            };

            Subject.Capabilities = new IndexerCapabilities
            {
                TvSearchParams = new List<TvSearchParam>
                {
-                           TvSearchParam.Q, TvSearchParam.Season, TvSearchParam.Ep
+                    TvSearchParam.Q, TvSearchParam.ImdbId, TvSearchParam.Season, TvSearchParam.Ep
                },
                MovieSearchParams = new List<MovieSearchParam>
                {
@@ -43,7 +43,8 @@ namespace NzbDrone.Core.Test.IndexerTests.FileListTests
                },
                Flags = new List<IndexerFlag>
                {
-                    IndexerFlag.FreeLeech
+                    IndexerFlag.FreeLeech,
+                    IndexerFlag.Internal,
                }
            };

@@ -53,7 +54,7 @@ namespace NzbDrone.Core.Test.IndexerTests.FileListTests
            _movieSearchCriteria = new MovieSearchCriteria
            {
                SearchTerm = "Star Wars",
-                Categories = new int[] { 2000 }
+                Categories = new[] { 2000 }
            };
        }

@@ -65,13 +66,13 @@ namespace NzbDrone.Core.Test.IndexerTests.FileListTests
        [Test]
        public void should_use_categories_for_feed()
        {
-            var results = Subject.GetSearchRequests(new MovieSearchCriteria { Categories = new int[] { NewznabStandardCategory.MoviesSD.Id, NewznabStandardCategory.MoviesDVD.Id } });
+            var results = Subject.GetSearchRequests(new MovieSearchCriteria { Categories = new[] { NewznabStandardCategory.MoviesSD.Id, NewznabStandardCategory.MoviesDVD.Id } });

            results.GetAllTiers().Should().HaveCount(1);

            var page = results.GetAllTiers().First().First();

-            page.Url.Query.Should().Contain("&category=1,2&");
+            page.Url.Query.Should().Contain("&category=1%2C2");
        }

        [Test]
@@ -100,7 +101,7 @@ namespace NzbDrone.Core.Test.IndexerTests.FileListTests
            var page = results.GetAllTiers().First().First();

            page.Url.Query.Should().Contain("type=name");
-            page.Url.Query.Should().Contain("query=Star Wars");
+            page.Url.Query.Should().Contain("query=Star+Wars");
        }
    }
 }
@@ -10,7 +10,7 @@ using NUnit.Framework;
 using NzbDrone.Common.Http;
 using NzbDrone.Common.Serializer;
 using NzbDrone.Core.Indexers;
-using NzbDrone.Core.Indexers.HDBits;
+using NzbDrone.Core.Indexers.Definitions.HDBits;
 using NzbDrone.Core.IndexerSearch.Definitions;
 using NzbDrone.Core.Parser.Model;
 using NzbDrone.Core.Test.Framework;
@@ -5,7 +5,7 @@ using Newtonsoft.Json;
 using NUnit.Framework;
 using NzbDrone.Common.Http;
 using NzbDrone.Core.Indexers;
-using NzbDrone.Core.Indexers.HDBits;
+using NzbDrone.Core.Indexers.Definitions.HDBits;
 using NzbDrone.Core.IndexerSearch.Definitions;
 using NzbDrone.Core.Test.Framework;

@@ -14,11 +14,13 @@ namespace NzbDrone.Core.Test.IndexerTests.HDBitsTests
    public class HDBitsRequestGeneratorFixture : CoreTest<HDBitsRequestGenerator>
    {
        private MovieSearchCriteria _movieSearchCriteria;
+        private TvSearchCriteria _tvSearchSeasonEpisodeCriteria;
+        private TvSearchCriteria _tvSearchDailyEpisodeCriteria;

        [SetUp]
        public void Setup()
        {
-            Subject.Settings = new HDBitsSettings()
+            Subject.Settings = new HDBitsSettings
            {
                ApiKey = "abcd",
                Username = "somename"
@@ -47,9 +49,25 @@ namespace NzbDrone.Core.Test.IndexerTests.HDBitsTests

            _movieSearchCriteria = new MovieSearchCriteria
            {
-                Categories = new int[] { 2000, 2010 },
+                Categories = new[] { 2000, 2010 },
                ImdbId = "0076759"
            };
+
+            _tvSearchSeasonEpisodeCriteria = new TvSearchCriteria
+            {
+                Categories = new[] { 5000, 5010 },
+                TvdbId = 392256,
+                Season = 1,
+                Episode = "3"
+            };
+
+            _tvSearchDailyEpisodeCriteria = new TvSearchCriteria
+            {
+                Categories = new[] { 5000, 5010 },
+                TvdbId = 289574,
+                Season = 2023,
+                Episode = "01/03"
+            };
        }

        [Test]
@@ -70,5 +88,49 @@ namespace NzbDrone.Core.Test.IndexerTests.HDBitsTests
            query.Category.Should().HaveCount(1);
            query.ImdbInfo.Id.Should().Be(imdbQuery);
        }
+
+        [Test]
+        public void should_search_by_tvdbid_season_episode_if_supported()
+        {
+            var results = Subject.GetSearchRequests(_tvSearchSeasonEpisodeCriteria);
+            var tvdbQuery = _tvSearchSeasonEpisodeCriteria.TvdbId;
+
+            results.GetAllTiers().Should().HaveCount(1);
+
+            var page = results.GetAllTiers().First().First();
+
+            var encoding = HttpHeader.GetEncodingFromContentType(page.HttpRequest.Headers.ContentType);
+
+            var body = encoding.GetString(page.HttpRequest.ContentData);
+            var query = JsonConvert.DeserializeObject<TorrentQuery>(body);
+
+            query.Category.Should().HaveCount(3);
+            query.TvdbInfo.Id.Should().Be(tvdbQuery);
+            query.Search.Should().BeNullOrWhiteSpace();
+            query.TvdbInfo.Season.Should().Be(1);
+            query.TvdbInfo.Episode.Should().Be("3");
+        }
+
+        [Test]
+        public void should_search_by_tvdbid_daily_episode_if_supported()
+        {
+            var results = Subject.GetSearchRequests(_tvSearchDailyEpisodeCriteria);
+            var tvdbQuery = _tvSearchDailyEpisodeCriteria.TvdbId;
+
+            results.GetAllTiers().Should().HaveCount(1);
+
+            var page = results.GetAllTiers().First().First();
+
+            var encoding = HttpHeader.GetEncodingFromContentType(page.HttpRequest.Headers.ContentType);
+
+            var body = encoding.GetString(page.HttpRequest.ContentData);
+            var query = JsonConvert.DeserializeObject<TorrentQuery>(body);
+
+            query.Category.Should().HaveCount(3);
+            query.TvdbInfo.Id.Should().Be(tvdbQuery);
+            query.Search.Should().Be("2023-01-03");
+            query.TvdbInfo.Season.Should().BeNull();
+            query.TvdbInfo.Episode.Should().BeNull();
+        }
    }
 }
@@ -9,7 +9,7 @@ using NUnit.Framework;
 using NzbDrone.Common.Http;
 using NzbDrone.Core.Indexers;
 using NzbDrone.Core.Indexers.Definitions;
-using NzbDrone.Core.Indexers.Gazelle;
+using NzbDrone.Core.Indexers.Definitions.Gazelle;
 using NzbDrone.Core.IndexerSearch.Definitions;
 using NzbDrone.Core.Test.Framework;

@@ -24,7 +24,7 @@ namespace NzbDrone.Core.Test.IndexerTests.OrpheusTests
            Subject.Definition = new IndexerDefinition()
            {
                Name = "Orpheus",
-                Settings = new OrpheusSettings() { Apikey = "somekey" }
+                Settings = new OrpheusSettings { Apikey = "somekey" }
            };
        }

@@ -37,14 +37,14 @@ namespace NzbDrone.Core.Test.IndexerTests.OrpheusTests
                .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 { { "Content-Type", "application/json" } }, new CookieCollection(), recentFeed)));

-            var releases = (await Subject.Fetch(new BasicSearchCriteria { Categories = new int[] { 2000 } })).Releases;
+            var releases = (await Subject.Fetch(new BasicSearchCriteria { Categories = new[] { 2000 } })).Releases;

            releases.Should().HaveCount(65);
            releases.First().Should().BeOfType<GazelleInfo>();

            var torrentInfo = releases.First() as GazelleInfo;

-            torrentInfo.Title.Should().Be("The Beatles - Abbey Road (1969) [MP3 V2 (VBR)] [BD]");
+            torrentInfo.Title.Should().Be("The Beatles - Abbey Road [1969] [Album] [2.0 Mix 2019] [MP3 V2 (VBR)] [BD]");
            torrentInfo.DownloadProtocol.Should().Be(DownloadProtocol.Torrent);
            torrentInfo.DownloadUrl.Should().Be("https://orpheus.network/ajax.php?action=download&id=1902448");
            torrentInfo.InfoUrl.Should().Be("https://orpheus.network/torrents.php?id=466&torrentid=1902448");
@@ -53,7 +53,7 @@ namespace NzbDrone.Core.Test.IndexerTests.RarbgTests
            torrentInfo.Title.Should().Be("Sense8.S01E01.WEBRip.x264-FGT");
            torrentInfo.DownloadProtocol.Should().Be(DownloadProtocol.Torrent);
            torrentInfo.DownloadUrl.Should().Be("magnet:?xt=urn:btih:d8bde635f573acb390c7d7e7efc1556965fdc802&dn=Sense8.S01E01.WEBRip.x264-FGT&tr=http%3A%2F%2Ftracker.trackerfix.com%3A80%2Fannounce&tr=udp%3A%2F%2F9.rarbg.me%3A2710&tr=udp%3A%2F%2F9.rarbg.to%3A2710&tr=udp%3A%2F%2Fopen.demonii.com%3A1337%2Fannounce");
-            torrentInfo.InfoUrl.Should().Be($"https://torrentapi.org/redirect_to_info.php?token=i5cx7b9agd&p=8_6_4_4_5_6__d8bde635f5&app_id={BuildInfo.AppName}");
+            torrentInfo.InfoUrl.Should().Be($"https://torrentapi.org/redirect_to_info.php?token=i5cx7b9agd&p=8_6_4_4_5_6__d8bde635f5&app_id={BuildInfo.AppName}_{BuildInfo.Version}");
            torrentInfo.Indexer.Should().Be(Subject.Definition.Name);
            torrentInfo.PublishDate.Should().Be(DateTime.Parse("2015-06-05 16:58:11 +0000").ToUniversalTime());
            torrentInfo.Size.Should().Be(564198371);
@@ -9,7 +9,7 @@ using NUnit.Framework;
 using NzbDrone.Common.Http;
 using NzbDrone.Core.Indexers;
 using NzbDrone.Core.Indexers.Definitions;
-using NzbDrone.Core.Indexers.Gazelle;
+using NzbDrone.Core.Indexers.Definitions.Gazelle;
 using NzbDrone.Core.IndexerSearch.Definitions;
 using NzbDrone.Core.Test.Framework;

@@ -162,7 +162,7 @@ namespace NzbDrone.Core.Test.IndexerTests.TorznabTests
            releaseInfo.InfoHash.Should().Be("(removed)");
            releaseInfo.Seeders.Should().Be(3);
            releaseInfo.Peers.Should().Be(3);
-            releaseInfo.Categories.Count().Should().Be(4);
+            releaseInfo.Categories.Count.Should().Be(4);
        }

        [Test]
@@ -6,7 +6,7 @@
    <PackageReference Include="Dapper" Version="2.0.123" />
    <PackageReference Include="NBuilder" Version="6.1.0" />
    <PackageReference Include="System.Data.SQLite.Core.Servarr" Version="1.0.115.5-18" />
-    <PackageReference Include="YamlDotNet" Version="12.3.1" />
+    <PackageReference Include="YamlDotNet" Version="13.0.0" />
  </ItemGroup>
  <ItemGroup>
    <ProjectReference Include="..\NzbDrone.Test.Common\Prowlarr.Test.Common.csproj" />
@@ -147,6 +147,7 @@ namespace NzbDrone.Core.Applications.LazyLibrarian
                Categories = string.Join(",", indexer.Capabilities.Categories.SupportedCategories(Settings.SyncCategories.ToArray())),
                Enabled = indexer.Enable,
                Type = schema,
+                Priority = indexer.Priority
            };

            return lazyLibrarianIndexer;
@@ -30,6 +30,7 @@ namespace NzbDrone.Core.Applications.LazyLibrarian
        public bool Enabled { get; set; }
        public string Altername { get; set; }
        public LazyLibrarianProviderType Type { get; set; }
+        public int Priority { get; set; }

        public bool Equals(LazyLibrarianIndexer other)
        {
@@ -43,7 +44,8 @@ namespace NzbDrone.Core.Applications.LazyLibrarian
                other.Name == Name &&
                other.Categories == Categories &&
                other.Enabled == Enabled &&
-                other.Altername == Altername;
+                other.Altername == Altername &&
+                other.Priority == Priority;
        }
    }
 }
@@ -21,6 +21,8 @@ namespace NzbDrone.Core.Applications.LazyLibrarian

    public class LazyLibrarianV1Proxy : ILazyLibrarianV1Proxy
    {
+        private const int ProwlarrHighestPriority = 50;
+
        private readonly IHttpClient _httpClient;
        private readonly Logger _logger;

@@ -90,7 +92,8 @@ namespace NzbDrone.Core.Applications.LazyLibrarian
                { "host", indexer.Host },
                { "prov_apikey", indexer.Apikey },
                { "enabled", indexer.Enabled.ToString().ToLower() },
-                { "categories", indexer.Categories }
+                { "categories", indexer.Categories },
+                { "dlpriority", CalculatePriority(indexer.Priority).ToString() }
            };

            var request = BuildRequest(settings, "/api", "addProvider", HttpMethod.Get, parameters);
@@ -108,7 +111,8 @@ namespace NzbDrone.Core.Applications.LazyLibrarian
                { "prov_apikey", indexer.Apikey },
                { "enabled", indexer.Enabled.ToString().ToLower() },
                { "categories", indexer.Categories },
-                { "altername", indexer.Altername }
+                { "altername", indexer.Altername },
+                { "dlpriority", CalculatePriority(indexer.Priority).ToString() }
            };

            var request = BuildRequest(settings, "/api", "changeProvider", HttpMethod.Get, parameters);
@@ -191,5 +195,7 @@ namespace NzbDrone.Core.Applications.LazyLibrarian

            return results;
        }
+
+        private int CalculatePriority(int indexerPriority) => ProwlarrHighestPriority - indexerPriority + 1;
    }
 }
@@ -196,7 +196,7 @@ namespace NzbDrone.Core.Applications.Lidarr

            if (indexer.Protocol == DownloadProtocol.Torrent)
            {
-                lidarrIndexer.Fields.FirstOrDefault(x => x.Name == "minimumSeeders").Value = indexer.AppProfile.Value.MinimumSeeders;
+                lidarrIndexer.Fields.FirstOrDefault(x => x.Name == "minimumSeeders").Value = ((ITorrentIndexerSettings)indexer.Settings).TorrentBaseSettings.AppMinimumSeeders ?? indexer.AppProfile.Value.MinimumSeeders;
                lidarrIndexer.Fields.FirstOrDefault(x => x.Name == "seedCriteria.seedRatio").Value = ((ITorrentIndexerSettings)indexer.Settings).TorrentBaseSettings.SeedRatio;
                lidarrIndexer.Fields.FirstOrDefault(x => x.Name == "seedCriteria.seedTime").Value = ((ITorrentIndexerSettings)indexer.Settings).TorrentBaseSettings.SeedTime;

@@ -196,7 +196,7 @@ namespace NzbDrone.Core.Applications.Radarr

            if (indexer.Protocol == DownloadProtocol.Torrent)
            {
-                radarrIndexer.Fields.FirstOrDefault(x => x.Name == "minimumSeeders").Value = indexer.AppProfile.Value.MinimumSeeders;
+                radarrIndexer.Fields.FirstOrDefault(x => x.Name == "minimumSeeders").Value = ((ITorrentIndexerSettings)indexer.Settings).TorrentBaseSettings.AppMinimumSeeders ?? indexer.AppProfile.Value.MinimumSeeders;
                radarrIndexer.Fields.FirstOrDefault(x => x.Name == "seedCriteria.seedRatio").Value = ((ITorrentIndexerSettings)indexer.Settings).TorrentBaseSettings.SeedRatio;
                radarrIndexer.Fields.FirstOrDefault(x => x.Name == "seedCriteria.seedTime").Value = ((ITorrentIndexerSettings)indexer.Settings).TorrentBaseSettings.SeedTime;
            }
@@ -192,7 +192,7 @@ namespace NzbDrone.Core.Applications.Readarr

            if (indexer.Protocol == DownloadProtocol.Torrent)
            {
-                readarrIndexer.Fields.FirstOrDefault(x => x.Name == "minimumSeeders").Value = indexer.AppProfile.Value.MinimumSeeders;
+                readarrIndexer.Fields.FirstOrDefault(x => x.Name == "minimumSeeders").Value = ((ITorrentIndexerSettings)indexer.Settings).TorrentBaseSettings.AppMinimumSeeders ?? indexer.AppProfile.Value.MinimumSeeders;
                readarrIndexer.Fields.FirstOrDefault(x => x.Name == "seedCriteria.seedRatio").Value = ((ITorrentIndexerSettings)indexer.Settings).TorrentBaseSettings.SeedRatio;
                readarrIndexer.Fields.FirstOrDefault(x => x.Name == "seedCriteria.seedTime").Value = ((ITorrentIndexerSettings)indexer.Settings).TorrentBaseSettings.SeedTime;

@@ -198,7 +198,7 @@ namespace NzbDrone.Core.Applications.Sonarr

            if (indexer.Protocol == DownloadProtocol.Torrent)
            {
-                sonarrIndexer.Fields.FirstOrDefault(x => x.Name == "minimumSeeders").Value = indexer.AppProfile.Value.MinimumSeeders;
+                sonarrIndexer.Fields.FirstOrDefault(x => x.Name == "minimumSeeders").Value = ((ITorrentIndexerSettings)indexer.Settings).TorrentBaseSettings.AppMinimumSeeders ?? indexer.AppProfile.Value.MinimumSeeders;
                sonarrIndexer.Fields.FirstOrDefault(x => x.Name == "seedCriteria.seedRatio").Value = ((ITorrentIndexerSettings)indexer.Settings).TorrentBaseSettings.SeedRatio;
                sonarrIndexer.Fields.FirstOrDefault(x => x.Name == "seedCriteria.seedTime").Value = ((ITorrentIndexerSettings)indexer.Settings).TorrentBaseSettings.SeedTime;
                sonarrIndexer.Fields.FirstOrDefault(x => x.Name == "seedCriteria.seasonPackSeedTime").Value = ((ITorrentIndexerSettings)indexer.Settings).TorrentBaseSettings.PackSeedTime ?? ((ITorrentIndexerSettings)indexer.Settings).TorrentBaseSettings.SeedTime;
@@ -192,7 +192,7 @@ namespace NzbDrone.Core.Applications.Whisparr

            if (indexer.Protocol == DownloadProtocol.Torrent)
            {
-                whisparrIndexer.Fields.FirstOrDefault(x => x.Name == "minimumSeeders").Value = indexer.AppProfile.Value.MinimumSeeders;
+                whisparrIndexer.Fields.FirstOrDefault(x => x.Name == "minimumSeeders").Value = ((ITorrentIndexerSettings)indexer.Settings).TorrentBaseSettings.AppMinimumSeeders ?? indexer.AppProfile.Value.MinimumSeeders;
                whisparrIndexer.Fields.FirstOrDefault(x => x.Name == "seedCriteria.seedRatio").Value = ((ITorrentIndexerSettings)indexer.Settings).TorrentBaseSettings.SeedRatio;
                whisparrIndexer.Fields.FirstOrDefault(x => x.Name == "seedCriteria.seedTime").Value = ((ITorrentIndexerSettings)indexer.Settings).TorrentBaseSettings.SeedTime;
            }
@@ -19,14 +19,14 @@ namespace NzbDrone.Core.Authentication

    public class UserService : IUserService
    {
+        private const int ITERATIONS = 10000;
+        private const int SALT_SIZE = 128 / 8;
+        private const int NUMBER_OF_BYTES = 256 / 8;
+
        private readonly IUserRepository _repo;
        private readonly IAppFolderInfo _appFolderInfo;
        private readonly IDiskProvider _diskProvider;

-        private static readonly int ITERATIONS = 10000;
-        private static readonly int SALT_SIZE = 128 / 8;
-        private static readonly int NUMBER_OF_BYTES = 256 / 8;
-
        public UserService(IUserRepository repo, IAppFolderInfo appFolderInfo, IDiskProvider diskProvider)
        {
            _repo = repo;
@@ -0,0 +1,14 @@
+using FluentMigrator;
+using NzbDrone.Core.Datastore.Migration.Framework;
+
+namespace NzbDrone.Core.Datastore.Migration
+{
+    [Migration(025)]
+    public class speedcd_userpasssettings_to_speedcdsettings : NzbDroneMigrationBase
+    {
+        protected override void MainDbUpgrade()
+        {
+            Update.Table("Indexers").Set(new { ConfigContract = "SpeedCDSettings" }).Where(new { Implementation = "SpeedCD" });
+        }
+    }
+}
@@ -0,0 +1,14 @@
+using FluentMigrator;
+using NzbDrone.Core.Datastore.Migration.Framework;
+
+namespace NzbDrone.Core.Datastore.Migration
+{
+    [Migration(026)]
+    public class torrentday_cookiesettings_to_torrentdaysettings : NzbDroneMigrationBase
+    {
+        protected override void MainDbUpgrade()
+        {
+            Update.Table("Indexers").Set(new { ConfigContract = "TorrentDaySettings" }).Where(new { Implementation = "TorrentDay" });
+        }
+    }
+}
@@ -0,0 +1,14 @@
+using FluentMigrator;
+using NzbDrone.Core.Datastore.Migration.Framework;
+
+namespace NzbDrone.Core.Datastore.Migration;
+
+[Migration(027)]
+public class alpharatio_greatposterwall_config_contract : NzbDroneMigrationBase
+{
+    protected override void MainDbUpgrade()
+    {
+        Update.Table("Indexers").Set(new { ConfigContract = "AlphaRatioSettings" }).Where(new { Implementation = "AlphaRatio" });
+        Update.Table("Indexers").Set(new { ConfigContract = "GreatPosterWallSettings" }).Where(new { Implementation = "GreatPosterWall" });
+    }
+}
@@ -0,0 +1,14 @@
+using FluentMigrator;
+using NzbDrone.Core.Datastore.Migration.Framework;
+
+namespace NzbDrone.Core.Datastore.Migration;
+
+[Migration(028)]
+public class remove_notwhatcd : NzbDroneMigrationBase
+{
+    protected override void MainDbUpgrade()
+    {
+        // Remove, site dead
+        Delete.FromTable("Indexers").Row(new { Implementation = "NotWhatCD" });
+    }
+}
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Data;
 using System.Text;
@@ -250,7 +250,7 @@ namespace NzbDrone.Core.Datastore.Migration.Framework
                }

                Index = end + 1;
-                identifier.Append(Buffer.Substring(start, end - start));
+                identifier.Append(Buffer.AsSpan(start, end - start));

                if (Buffer[Index] != escape)
                {
@@ -15,9 +15,9 @@ namespace NzbDrone.Core.Datastore

        private const DbType EnumerableMultiParameter = (DbType)(-1);
        private readonly string _paramNamePrefix;
-        private readonly bool _requireConcreteValue = false;
-        private int _paramCount = 0;
-        private bool _gotConcreteValue = false;
+        private readonly bool _requireConcreteValue;
+        private int _paramCount;
+        private bool _gotConcreteValue;

        public WhereBuilderPostgres(Expression filter, bool requireConcreteValue, int seq)
        {
@@ -15,9 +15,9 @@ namespace NzbDrone.Core.Datastore

        private const DbType EnumerableMultiParameter = (DbType)(-1);
        private readonly string _paramNamePrefix;
-        private readonly bool _requireConcreteValue = false;
-        private int _paramCount = 0;
-        private bool _gotConcreteValue = false;
+        private readonly bool _requireConcreteValue;
+        private int _paramCount;
+        private bool _gotConcreteValue;

        public WhereBuilderSqlite(Expression filter, bool requireConcreteValue, int seq)
        {
@@ -1,7 +1,6 @@
 using System;
 using System.Threading.Tasks;
 using NLog;
-using NzbDrone.Common.EnsureThat;
 using NzbDrone.Common.Extensions;
 using NzbDrone.Common.Http;
 using NzbDrone.Common.Instrumentation.Extensions;
@@ -61,14 +60,6 @@ namespace NzbDrone.Core.Download

            // Get the seed configuration for this release.
            // remoteMovie.SeedConfiguration = _seedConfigProvider.GetSeedConfiguration(remoteMovie);
-
-            // Limit grabs to 2 per second.
-            if (release.DownloadUrl.IsNotNullOrWhiteSpace() && !release.DownloadUrl.StartsWith("magnet:"))
-            {
-                var url = new HttpUri(release.DownloadUrl);
-                _rateLimitService.WaitAndPulse(url.Host, TimeSpan.FromSeconds(2));
-            }
-
            var indexer = _indexerFactory.GetInstance(_indexerFactory.Get(release.IndexerId));

            string downloadClientId;
@@ -92,8 +83,7 @@ namespace NzbDrone.Core.Download
            }
            catch (ReleaseDownloadException ex)
            {
-                var http429 = ex.InnerException as TooManyRequestsException;
-                if (http429 != null)
+                if (ex.InnerException is TooManyRequestsException http429)
                {
                    _indexerStatusService.RecordFailure(release.IndexerId, http429.RetryAfter);
                }
@@ -141,8 +131,7 @@ namespace NzbDrone.Core.Download
            }
            catch (ReleaseDownloadException ex)
            {
-                var http429 = ex.InnerException as TooManyRequestsException;
-                if (http429 != null)
+                if (ex.InnerException is TooManyRequestsException http429)
                {
                    _indexerStatusService.RecordFailure(indexerId, http429.RetryAfter);
                }
@@ -155,7 +144,9 @@ namespace NzbDrone.Core.Download
                throw;
            }

+            _logger.Trace("Downloaded {0} bytes from {1}", downloadedBytes.Length, link);
            _eventAggregator.PublishEvent(new IndexerDownloadEvent(indexerId, success, source, host, title, url.AbsoluteUri));
+
            return downloadedBytes;
        }

@@ -34,8 +34,8 @@ namespace NzbDrone.Core.HealthCheck

        private readonly ICached<HealthCheck> _healthCheckResults;

-        private bool _hasRunHealthChecksAfterGracePeriod = false;
-        private bool _isRunningHealthChecksAfterGracePeriod = false;
+        private bool _hasRunHealthChecksAfterGracePeriod;
+        private bool _isRunningHealthChecksAfterGracePeriod;

        public HealthCheckService(IEnumerable<IProvideHealthCheck> healthChecks,
                                  IServerSideNotificationService serverSideNotificationService,
@@ -55,7 +55,7 @@ namespace NzbDrone.Core.HealthCheck
            _startupHealthChecks = _healthChecks.Where(v => v.CheckOnStartup).ToArray();
            _scheduledHealthChecks = _healthChecks.Where(v => v.CheckOnSchedule).ToArray();
            _eventDrivenHealthChecks = GetEventDrivenHealthChecks();
-            _startupGracePeriodEndTime = runtimeInfo.StartTime + TimeSpan.FromMinutes(15);
+            _startupGracePeriodEndTime = runtimeInfo.StartTime.AddMinutes(15);
        }

        public List<HealthCheck> Results()
@@ -19,6 +19,7 @@ namespace NzbDrone.Core.History
        List<History> Since(DateTime date, HistoryEventType? eventType);
        void Cleanup(int days);
        int CountSince(int indexerId, DateTime date, List<HistoryEventType> eventTypes);
+        History FindFirstForIndexerSince(int indexerId, DateTime date, List<HistoryEventType> eventTypes, int limit);
    }

    public class HistoryRepository : BasicRepository<History>, IHistoryRepository
@@ -115,5 +116,24 @@ namespace NzbDrone.Core.History
                return conn.ExecuteScalar<int>(sql.RawSql, sql.Parameters);
            }
        }
+
+        public History FindFirstForIndexerSince(int indexerId, DateTime date, List<HistoryEventType> eventTypes, int limit)
+        {
+            var intEvents = eventTypes.Select(t => (int)t).ToList();
+
+            var builder = Builder()
+                .Where<History>(x => x.IndexerId == indexerId)
+                .Where<History>(x => x.Date >= date)
+                .Where<History>(x => intEvents.Contains((int)x.EventType));
+
+            var query = Query(builder);
+
+            if (limit > 0)
+            {
+                query = query.OrderByDescending(h => h.Date).Take(limit).ToList();
+            }
+
+            return query.MinBy(h => h.Date);
+        }
    }
 }
@@ -27,6 +27,7 @@ namespace NzbDrone.Core.History
        List<History> Between(DateTime start, DateTime end);
        List<History> Since(DateTime date, HistoryEventType? eventType);
        int CountSince(int indexerId, DateTime date, List<HistoryEventType> eventTypes);
+        History FindFirstForIndexerSince(int indexerId, DateTime date, List<HistoryEventType> eventTypes, int limit);
    }

    public class HistoryService : IHistoryService,
@@ -173,7 +174,7 @@ namespace NzbDrone.Core.History
            history.Data.Add("Categories", string.Join(",", message.Query.Categories) ?? string.Empty);
            history.Data.Add("Source", message.Query.Source ?? string.Empty);
            history.Data.Add("Host", message.Query.Host ?? string.Empty);
-            history.Data.Add("QueryResults", message.QueryResult.Releases?.Count().ToString() ?? string.Empty);
+            history.Data.Add("QueryResults", message.QueryResult.Releases?.Count.ToString() ?? string.Empty);
            history.Data.Add("Url", message.QueryResult.Response?.Request.Url.FullUri ?? string.Empty);

            _historyRepository.Insert(history);
@@ -232,5 +233,10 @@ namespace NzbDrone.Core.History
        {
            return _historyRepository.CountSince(indexerId, date, eventTypes);
        }
+
+        public History FindFirstForIndexerSince(int indexerId, DateTime date, List<HistoryEventType> eventTypes, int limit)
+        {
+            return _historyRepository.FindFirstForIndexerSince(indexerId, date, eventTypes, limit);
+        }
    }
 }
@@ -1,15 +1,16 @@
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Net;
-using System.Text.RegularExpressions;
 using NLog;
+using NzbDrone.Common.Extensions;
 using NzbDrone.Common.Http;

 namespace NzbDrone.Core.Http.CloudFlare
 {
    public class CloudFlareDetectionService
    {
-        private static readonly HashSet<string> CloudflareServerNames = new HashSet<string> { "cloudflare", "cloudflare-nginx", "ddos-guard" };
+        private static readonly HashSet<string> CloudflareServerNames = new () { "cloudflare", "cloudflare-nginx", "ddos-guard" };
        private readonly Logger _logger;

        public CloudFlareDetectionService(Logger logger)
@@ -28,12 +29,20 @@ namespace NzbDrone.Core.Http.CloudFlare
            if (response.StatusCode.Equals(HttpStatusCode.ServiceUnavailable) ||
                response.StatusCode.Equals(HttpStatusCode.Forbidden))
            {
-                return true; // Defected CloudFlare and DDoS-GUARD
+                var responseHtml = response.Content;
+                if (responseHtml.Contains("<title>Just a moment...</title>") ||
+                    responseHtml.Contains("<title>Access denied</title>") ||
+                    responseHtml.Contains("<title>Attention Required! | Cloudflare</title>") ||
+                    responseHtml.Trim().Equals("error code: 1020") ||
+                    responseHtml.Contains("<title>DDOS-GUARD</title>", StringComparison.OrdinalIgnoreCase))
+                {
+                    return true;
+                }
            }

            // detect Custom CloudFlare for EbookParadijs, Film-Paleis, MuziekFabriek and Puur-Hollands
            if (response.Headers.Vary == "Accept-Encoding,User-Agent" &&
-                response.Headers.ContentEncoding == "" &&
+                response.Headers.ContentEncoding.IsNullOrWhiteSpace() &&
                response.Content.ToLower().Contains("ddos"))
            {
                return true;
@@ -170,6 +170,7 @@ namespace NzbDrone.Core.IndexerProxies.FlareSolverr
            newRequest.Headers.ContentType = "application/json";
            newRequest.Method = HttpMethod.Post;
            newRequest.LogResponseContent = true;
+            newRequest.RequestTimeout = TimeSpan.FromSeconds(Settings.RequestTimeout + 5);
            newRequest.SetContent(req.ToJson());

            _logger.Debug("Cloudflare Detected, Applying FlareSolverr Proxy {0} to request {1}", Name, request.Url);
@@ -10,17 +10,6 @@ namespace NzbDrone.Core.IndexerSearch.Definitions
        public int? Year { get; set; }
        public string Genre { get; set; }

-        public override bool RssSearch
-        {
-            get
-            {
-                if (SearchTerm.IsNullOrWhiteSpace() && Author.IsNullOrWhiteSpace() && Title.IsNullOrWhiteSpace())
-                {
-                    return true;
-                }
-
-                return false;
-            }
-        }
+        public override bool RssSearch => SearchTerm.IsNullOrWhiteSpace() && Author.IsNullOrWhiteSpace() && Title.IsNullOrWhiteSpace();
    }
 }
@@ -13,18 +13,7 @@ namespace NzbDrone.Core.IndexerSearch.Definitions
        public int? Year { get; set; }
        public string Genre { get; set; }

-        public override bool RssSearch
-        {
-            get
-            {
-                if (SearchTerm.IsNullOrWhiteSpace() && ImdbId.IsNullOrWhiteSpace() && !TmdbId.HasValue && !TraktId.HasValue)
-                {
-                    return true;
-                }
-
-                return false;
-            }
-        }
+        public override bool RssSearch => SearchTerm.IsNullOrWhiteSpace() && ImdbId.IsNullOrWhiteSpace() && !TmdbId.HasValue && !TraktId.HasValue;

        public string FullImdbId => ParseUtil.GetFullImdbId(ImdbId);

@@ -11,17 +11,6 @@ namespace NzbDrone.Core.IndexerSearch.Definitions
        public string Track { get; set; }
        public int? Year { get; set; }

-        public override bool RssSearch
-        {
-            get
-            {
-                if (SearchTerm.IsNullOrWhiteSpace() && Album.IsNullOrWhiteSpace() && Artist.IsNullOrWhiteSpace() && Label.IsNullOrWhiteSpace())
-                {
-                    return true;
-                }
-
-                return false;
-            }
-        }
+        public override bool RssSearch => SearchTerm.IsNullOrWhiteSpace() && Album.IsNullOrWhiteSpace() && Artist.IsNullOrWhiteSpace() && Label.IsNullOrWhiteSpace();
    }
 }
@@ -7,9 +7,8 @@ namespace NzbDrone.Core.IndexerSearch.Definitions
 {
    public abstract class SearchCriteriaBase
    {
-        private static readonly Regex SpecialCharacter = new Regex(@"[`'.]", RegexOptions.IgnoreCase | RegexOptions.Compiled);
-        private static readonly Regex NonWord = new Regex(@"[\W]", RegexOptions.IgnoreCase | RegexOptions.Compiled);
-        private static readonly Regex BeginningThe = new Regex(@"^the\s", RegexOptions.IgnoreCase | RegexOptions.Compiled);
+        private static readonly Regex StandardizeDashesRegex = new (@"\p{Pd}+", RegexOptions.IgnoreCase | RegexOptions.Compiled);
+        private static readonly Regex StandardizeSingleQuotesRegex = new (@"[\u0060\u00B4\u2018\u2019]", RegexOptions.IgnoreCase | RegexOptions.Compiled);

        public virtual bool InteractiveSearch { get; set; }
        public List<int> IndexerIds { get; set; }
@@ -21,58 +20,24 @@ namespace NzbDrone.Core.IndexerSearch.Definitions
        public string Source { get; set; }
        public string Host { get; set; }

-        public virtual string SearchQuery
-        {
-            get
-            {
-                return $"Term: [{SearchTerm}]";
-            }
-        }
+        public override string ToString() => $"{SearchQuery}, Offset: {Offset ?? 0}, Limit: {Limit ?? 0}, Categories: [{string.Join(", ", Categories)}]";

-        public override string ToString()
-        {
-            return $"{SearchQuery}, Offset: {Offset ?? 0}, Limit: {Limit ?? 0}, Categories: [{string.Join(", ", Categories)}]";
-        }
+        public virtual string SearchQuery => $"Term: [{SearchTerm}]";

-        public virtual bool RssSearch
-        {
-            get
-            {
-                if (SearchTerm.IsNullOrWhiteSpace())
-                {
-                    return true;
-                }
+        public virtual bool RssSearch => SearchTerm.IsNullOrWhiteSpace();

-                return false;
-            }
-        }
+        public string SanitizedSearchTerm => GetSanitizedTerm(SearchTerm);

-        public string SanitizedSearchTerm
+        private static string GetSanitizedTerm(string term)
        {
-            get
-            {
-                var term = SearchTerm;
-                if (SearchTerm == null)
-                {
-                    term = "";
-                }
+            term ??= "";
+
+            term = StandardizeDashesRegex.Replace(term, "-");
+            term = StandardizeSingleQuotesRegex.Replace(term, "'");
+
+            var safeTitle = term.Where(c => char.IsLetterOrDigit(c) || char.IsWhiteSpace(c) || c is '-' or '.' or '_' or '(' or ')' or '@' or '/' or '\'' or '[' or ']' or '+' or '%');

-                var safeTitle = term.Where(c => (char.IsLetterOrDigit(c)
-                                                 || char.IsWhiteSpace(c)
-                                                 || c == '-'
-                                                 || c == '.'
-                                                 || c == '_'
-                                                 || c == '('
-                                                 || c == ')'
-                                                 || c == '@'
-                                                 || c == '/'
-                                                 || c == '\''
-                                                 || c == '['
-                                                 || c == ']'
-                                                 || c == '+'
-                                                 || c == '%'));
            return string.Concat(safeTitle);
        }
    }
-    }
 }
@@ -21,23 +21,12 @@ namespace NzbDrone.Core.IndexerSearch.Definitions
        public int? Year { get; set; }
        public string Genre { get; set; }

-        public string SanitizedTvSearchString => (SanitizedSearchTerm + " " + EpisodeSearchString).Trim();
+        public string SanitizedTvSearchString => $"{SanitizedSearchTerm} {EpisodeSearchString}".Trim();
        public string EpisodeSearchString => GetEpisodeSearchString();

        public string FullImdbId => ParseUtil.GetFullImdbId(ImdbId);

-        public override bool RssSearch
-        {
-            get
-            {
-                if (SearchTerm.IsNullOrWhiteSpace() && ImdbId.IsNullOrWhiteSpace() && !TvdbId.HasValue && !RId.HasValue && !TraktId.HasValue && !TvMazeId.HasValue)
-                {
-                    return true;
-                }
-
-                return false;
-            }
-        }
+        public override bool RssSearch => SearchTerm.IsNullOrWhiteSpace() && ImdbId.IsNullOrWhiteSpace() && !TvdbId.HasValue && !RId.HasValue && !TraktId.HasValue && !TvMazeId.HasValue;

        public override string SearchQuery
        {
@@ -59,7 +59,7 @@ namespace NzbDrone.Core.IndexerStats
                var elapsedTimeEvents = sortedEvents.Where(h => int.TryParse(h.Data.GetValueOrDefault("elapsedTime"), out temp))
                                                                    .Select(h => temp);

-                indexerStats.AverageResponseTime = elapsedTimeEvents.Count() > 0 ? (int)elapsedTimeEvents.Average() : 0;
+                indexerStats.AverageResponseTime = elapsedTimeEvents.Any() ? (int)elapsedTimeEvents.Average() : 0;

                foreach (var historyEvent in sortedEvents)
                {
@@ -29,13 +29,14 @@ namespace NzbDrone.Core.IndexerVersions
        /* Update Service will fall back if version # does not exist for an indexer  per Ta */

        private const string DEFINITION_BRANCH = "master";
-        private const int DEFINITION_VERSION = 7;
+        private const int DEFINITION_VERSION = 8;

-        //Used when moving yml to C#
-        private readonly List<string> _defintionBlocklist = new List<string>()
+        // Used when moving yml to C#
+        private readonly List<string> _definitionBlocklist = new ()
        {
            "aither",
            "animeworld",
+            "audiobookbay",
            "beyond-hd-oneurl",
            "beyond-hd",
            "blutopia",
@@ -89,7 +90,7 @@ namespace NzbDrone.Core.IndexerVersions
                {
                    var request = new HttpRequest($"https://indexers.prowlarr.com/{DEFINITION_BRANCH}/{DEFINITION_VERSION}");
                    var response = _httpClient.Get<List<CardigannMetaDefinition>>(request);
-                    indexerList = response.Resource.Where(i => !_defintionBlocklist.Contains(i.File)).ToList();
+                    indexerList = response.Resource.Where(i => !_definitionBlocklist.Contains(i.File)).ToList();
                }
                catch
                {
@@ -125,7 +126,7 @@ namespace NzbDrone.Core.IndexerVersions

        public List<string> GetBlocklist()
        {
-            return _defintionBlocklist;
+            return _definitionBlocklist;
        }

        private List<CardigannMetaDefinition> ReadDefinitionsFromDisk(List<CardigannMetaDefinition> defs, string path, SearchOption options = SearchOption.TopDirectoryOnly)
@@ -228,8 +229,8 @@ namespace NzbDrone.Core.IndexerVersions
            {
                definition.Settings = new List<SettingsField>
                {
-                                new SettingsField { Name = "username", Label = "Username", Type = "text" },
-                                new SettingsField { Name = "password", Label = "Password", Type = "password" }
+                    new () { Name = "username", Label = "Username", Type = "text" },
+                    new () { Name = "password", Label = "Password", Type = "password" }
                };
            }

@@ -1,32 +1,32 @@
 using System.Collections.Generic;
+using System.Collections.Specialized;
 using NLog;
-using NzbDrone.Common.Http;
+using NzbDrone.Core.Annotations;
 using NzbDrone.Core.Configuration;
+using NzbDrone.Core.Indexers.Definitions.Gazelle;
 using NzbDrone.Core.Messaging.Events;

-namespace NzbDrone.Core.Indexers.Definitions
+namespace NzbDrone.Core.Indexers.Definitions;
+
+public class AlphaRatio : GazelleBase<AlphaRatioSettings>
 {
-    public class AlphaRatio : Gazelle.Gazelle
-    {
    public override string Name => "AlphaRatio";
-        public override string[] IndexerUrls => new string[] { "https://alpharatio.cc/" };
+    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 AlphaRatio(IIndexerHttpClient httpClient, IEventAggregator eventAggregator, IIndexerStatusService indexerStatusService, IConfigService configService, Logger logger)
+    public AlphaRatio(IIndexerHttpClient httpClient,
+                      IEventAggregator eventAggregator,
+                      IIndexerStatusService indexerStatusService,
+                      IConfigService configService,
+                      Logger logger)
        : base(httpClient, eventAggregator, indexerStatusService, configService, logger)
    {
    }

    public override IIndexerRequestGenerator GetRequestGenerator()
    {
-            return new AlphaRatioRequestGenerator()
-            {
-                Settings = Settings,
-                HttpClient = _httpClient,
-                Logger = _logger,
-                Capabilities = Capabilities
-            };
+        return new AlphaRatioRequestGenerator(Settings, Capabilities, _httpClient, _logger);
    }

    protected override IndexerCapabilities SetCapabilities()
@@ -76,10 +76,45 @@ namespace NzbDrone.Core.Indexers.Definitions

        return caps;
    }
+}
+
+public class AlphaRatioRequestGenerator : GazelleRequestGenerator
+{
+    protected override bool ImdbInTags => true;
+    private readonly AlphaRatioSettings _settings;
+
+    public AlphaRatioRequestGenerator(AlphaRatioSettings settings,
+                                      IndexerCapabilities capabilities,
+                                      IIndexerHttpClient httpClient,
+                                      Logger logger)
+        : base(settings, capabilities, httpClient, logger)
+    {
+        _settings = settings;
    }

-    public class AlphaRatioRequestGenerator : Gazelle.GazelleRequestGenerator
+    protected override NameValueCollection GetBasicSearchParameters(string term, int[] categories)
    {
-        protected override bool ImdbInTags => true;
+        var parameters = base.GetBasicSearchParameters(term, categories);
+
+        if (_settings.FreeleechOnly)
+        {
+            parameters.Set("freetorrent", "1");
+        }
+
+        if (_settings.ExcludeScene)
+        {
+            parameters.Set("scene", "0");
+        }
+
+        return parameters;
    }
 }
+
+public class AlphaRatioSettings : GazelleSettings
+{
+    [FieldDefinition(6, Label = "Freeleech Only", Type = FieldType.Checkbox, HelpText = "Search freeleech torrents only")]
+    public bool FreeleechOnly { get; set; }
+
+    [FieldDefinition(7, Label = "Exclude Scene", Type = FieldType.Checkbox, HelpText = "Exclude Scene torrents from results")]
+    public bool ExcludeScene { get; set; }
+}
@@ -0,0 +1,365 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.Specialized;
+using System.Globalization;
+using System.Linq;
+using System.Net;
+using System.Text;
+using AngleSharp.Html.Parser;
+using NLog;
+using NzbDrone.Common.Extensions;
+using NzbDrone.Common.Http;
+using NzbDrone.Core.Annotations;
+using NzbDrone.Core.Configuration;
+using NzbDrone.Core.Indexers.Exceptions;
+using NzbDrone.Core.Indexers.Settings;
+using NzbDrone.Core.IndexerSearch.Definitions;
+using NzbDrone.Core.Messaging.Events;
+using NzbDrone.Core.Parser;
+using NzbDrone.Core.Parser.Model;
+
+namespace NzbDrone.Core.Indexers.Definitions
+{
+    public class Anidex : TorrentIndexerBase<AnidexSettings>
+    {
+        public override string Name => "Anidex";
+        public override string[] IndexerUrls => new[] { "https://anidex.info/" };
+        public override string Description => "Anidex is a Public torrent tracker and indexer, primarily for English fansub groups of anime";
+        public override string Language => "en-US";
+        public override Encoding Encoding => Encoding.UTF8;
+        public override DownloadProtocol Protocol => DownloadProtocol.Torrent;
+        public override IndexerPrivacy Privacy => IndexerPrivacy.Public;
+        public override IndexerCapabilities Capabilities => SetCapabilities();
+
+        public Anidex(IIndexerHttpClient httpClient,
+            IEventAggregator eventAggregator,
+            IIndexerStatusService indexerStatusService,
+            IConfigService configService,
+            Logger logger)
+            : base(httpClient, eventAggregator, indexerStatusService, configService, logger)
+        {
+        }
+
+        public override IIndexerRequestGenerator GetRequestGenerator()
+        {
+            return new AnidexRequestGenerator(Settings, Capabilities);
+        }
+
+        public override IParseIndexerResponse GetParser()
+        {
+            return new AnidexParser(Settings, Capabilities.Categories);
+        }
+
+        private IndexerCapabilities SetCapabilities()
+        {
+            var caps = new IndexerCapabilities
+            {
+                TvSearchParams = new List<TvSearchParam>
+                {
+                    TvSearchParam.Q
+                },
+                MusicSearchParams = new List<MusicSearchParam>
+                {
+                    MusicSearchParam.Q,
+                },
+                BookSearchParams = new List<BookSearchParam>
+                {
+                    BookSearchParam.Q,
+                }
+            };
+
+            caps.Categories.AddCategoryMapping("1", NewznabStandardCategory.TVAnime, "Anime - Sub");
+            caps.Categories.AddCategoryMapping("2", NewznabStandardCategory.TVAnime, "Anime - Raw");
+            caps.Categories.AddCategoryMapping("3", NewznabStandardCategory.TVAnime, "Anime - Dub");
+            caps.Categories.AddCategoryMapping("4", NewznabStandardCategory.TVAnime, "LA - Sub");
+            caps.Categories.AddCategoryMapping("5", NewznabStandardCategory.TVAnime, "LA - Raw");
+            caps.Categories.AddCategoryMapping("6", NewznabStandardCategory.BooksEBook, "Light Novel");
+            caps.Categories.AddCategoryMapping("7", NewznabStandardCategory.BooksComics, "Manga - TLed");
+            caps.Categories.AddCategoryMapping("8", NewznabStandardCategory.BooksComics, "Manga - Raw");
+            caps.Categories.AddCategoryMapping("9", NewznabStandardCategory.AudioMP3, "♫ - Lossy");
+            caps.Categories.AddCategoryMapping("10", NewznabStandardCategory.AudioLossless, "♫ - Lossless");
+            caps.Categories.AddCategoryMapping("11", NewznabStandardCategory.AudioVideo, "♫ - Video");
+            caps.Categories.AddCategoryMapping("12", NewznabStandardCategory.PCGames, "Games");
+            caps.Categories.AddCategoryMapping("13", NewznabStandardCategory.PC0day, "Applications");
+            caps.Categories.AddCategoryMapping("14", NewznabStandardCategory.XXXImageSet, "Pictures");
+            caps.Categories.AddCategoryMapping("15", NewznabStandardCategory.XXX, "Adult Video");
+            caps.Categories.AddCategoryMapping("16", NewznabStandardCategory.Other, "Other");
+
+            return caps;
+        }
+    }
+
+    public class AnidexRequestGenerator : IIndexerRequestGenerator
+    {
+        private readonly AnidexSettings _settings;
+        private readonly IndexerCapabilities _capabilities;
+
+        public AnidexRequestGenerator(AnidexSettings settings, IndexerCapabilities capabilities)
+        {
+            _settings = settings;
+            _capabilities = capabilities;
+        }
+
+        public IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchCriteria)
+        {
+            return new IndexerPageableRequestChain();
+        }
+
+        public IndexerPageableRequestChain GetSearchRequests(MusicSearchCriteria searchCriteria)
+        {
+            var pageableRequests = new IndexerPageableRequestChain();
+
+            pageableRequests.Add(GetPagedRequests($"{searchCriteria.SanitizedSearchTerm}", searchCriteria.Categories));
+
+            return pageableRequests;
+        }
+
+        public IndexerPageableRequestChain GetSearchRequests(TvSearchCriteria searchCriteria)
+        {
+            var pageableRequests = new IndexerPageableRequestChain();
+
+            pageableRequests.Add(GetPagedRequests($"{searchCriteria.SanitizedSearchTerm}", searchCriteria.Categories));
+
+            return pageableRequests;
+        }
+
+        public IndexerPageableRequestChain GetSearchRequests(BookSearchCriteria searchCriteria)
+        {
+            var pageableRequests = new IndexerPageableRequestChain();
+
+            pageableRequests.Add(GetPagedRequests($"{searchCriteria.SanitizedSearchTerm}", searchCriteria.Categories));
+
+            return pageableRequests;
+        }
+
+        public IndexerPageableRequestChain GetSearchRequests(BasicSearchCriteria searchCriteria)
+        {
+            var pageableRequests = new IndexerPageableRequestChain();
+
+            pageableRequests.Add(GetPagedRequests($"{searchCriteria.SanitizedSearchTerm}", searchCriteria.Categories));
+
+            return pageableRequests;
+        }
+
+        private IEnumerable<IndexerRequest> GetPagedRequests(string term, int[] categories)
+        {
+            var parameters = new NameValueCollection
+            {
+                { "page", "search" },
+                { "s", "upload_timestamp" },
+                { "o", "desc" },
+                { "group_id", "0" }, // All groups
+                { "q", term ?? string.Empty }
+            };
+
+            if (_settings.AuthorisedOnly)
+            {
+                parameters.Add("a", "1");
+            }
+
+            var searchUrl = $"{_settings.BaseUrl}?{parameters.GetQueryString()}";
+
+            var queryCats = _capabilities.Categories.MapTorznabCapsToTrackers(categories);
+
+            if (queryCats.Any())
+            {
+                searchUrl += "&id=" + string.Join(",", queryCats);
+            }
+
+            if (_settings.LanguagesOnly.Any())
+            {
+                searchUrl += "&lang_id=" + string.Join(",", _settings.LanguagesOnly);
+            }
+
+            var request = new IndexerRequest(searchUrl, HttpAccept.Html);
+
+            yield return request;
+        }
+
+        public Func<IDictionary<string, string>> GetCookies { get; set; }
+        public Action<IDictionary<string, string>, DateTime?> CookiesUpdater { get; set; }
+    }
+
+    public class AnidexParser : IParseIndexerResponse
+    {
+        private readonly AnidexSettings _settings;
+        private readonly IndexerCapabilitiesCategories _categories;
+
+        public AnidexParser(AnidexSettings settings, IndexerCapabilitiesCategories categories)
+        {
+            _settings = settings;
+            _categories = categories;
+        }
+
+        public IList<ReleaseInfo> ParseResponse(IndexerResponse indexerResponse)
+        {
+            if (indexerResponse.HttpResponse.StatusCode != HttpStatusCode.OK)
+            {
+                throw new IndexerException(indexerResponse, $"Anidex search returned unexpected result. Expected 200 OK but got {indexerResponse.HttpResponse.StatusCode}.");
+            }
+
+            var releaseInfos = new List<ReleaseInfo>();
+
+            var parser = new HtmlParser();
+            var dom = parser.ParseDocument(indexerResponse.Content);
+
+            var rows = dom.QuerySelectorAll("div#content table > tbody > tr");
+            foreach (var row in rows)
+            {
+                var downloadUrl = _settings.BaseUrl + row.QuerySelector("a[href^=\"/dl/\"]")?.GetAttribute("href");
+                var infoUrl = _settings.BaseUrl + row.QuerySelector("td:nth-child(3) a")?.GetAttribute("href");
+
+                var title = row.QuerySelector("td:nth-child(3) span")?.GetAttribute("title")?.Trim();
+                var language = row.QuerySelector("td:nth-child(1) img")?.GetAttribute("title")?.Trim();
+
+                if (language.IsNotNullOrWhiteSpace())
+                {
+                    title += $" [{language}]";
+                }
+
+                var categoryLink = row.QuerySelector("td:nth-child(1) a").GetAttribute("href");
+                var cat = ParseUtil.GetArgumentFromQueryString(categoryLink, "id");
+                var categories = _categories.MapTrackerCatToNewznab(cat);
+
+                var seeders = ParseUtil.CoerceInt(row.QuerySelector("td:nth-child(9)")?.TextContent);
+                var peers = seeders + ParseUtil.CoerceInt(row.QuerySelector("td:nth-child(10)")?.TextContent.Trim());
+
+                var added = row.QuerySelector("td:nth-child(8)").GetAttribute("title").Trim();
+
+                var release = new TorrentInfo
+                {
+                    Guid = infoUrl,
+                    InfoUrl = infoUrl,
+                    DownloadUrl = downloadUrl,
+                    MagnetUrl = row.QuerySelector("a[href^=\"magnet:?\"]")?.GetAttribute("href"),
+                    Title = title,
+                    Categories = categories,
+                    Seeders = seeders,
+                    Peers = peers,
+                    Size =  ParseUtil.GetBytes(row.QuerySelector("td:nth-child(7)")?.TextContent.Trim()),
+                    Grabs = ParseUtil.CoerceInt(row.QuerySelector("td:nth-child(11)")?.TextContent),
+                    PublishDate = DateTime.ParseExact(added, "yyyy-MM-dd HH:mm:ss UTC", CultureInfo.InvariantCulture, DateTimeStyles.AssumeUniversal),
+                    DownloadVolumeFactor = 0,
+                    UploadVolumeFactor = 1
+                };
+
+                releaseInfos.Add(release);
+            }
+
+            return releaseInfos.ToArray();
+        }
+
+        public Action<IDictionary<string, string>, DateTime?> CookiesUpdater { get; set; }
+    }
+
+    public class AnidexSettings : NoAuthTorrentBaseSettings
+    {
+        public AnidexSettings()
+        {
+            AuthorisedOnly = false;
+            LanguagesOnly = Array.Empty<int>();
+        }
+
+        [FieldDefinition(2, Label = "Authorised Only", Type = FieldType.Checkbox, HelpText = "Search authorised torrents only")]
+        public bool AuthorisedOnly { get; set; }
+
+        [FieldDefinition(3, Label = "Languages Only", Type = FieldType.Select, SelectOptions = typeof(AnidexLanguage), HelpText = "Search selected languages only. None ticked = ALL.")]
+        public IEnumerable<int> LanguagesOnly { get; set; }
+    }
+
+    public enum AnidexLanguage
+    {
+        [FieldOption(Hint = "English")]
+        GB = 1,
+
+        [FieldOption(Hint = "Japanese")]
+        JP = 2,
+
+        [FieldOption(Hint = "Polish")]
+        PL = 3,
+
+        [FieldOption(Hint = "Serbo-Croatian")]
+        RS = 4,
+
+        [FieldOption(Hint = "Dutch")]
+        NL = 5,
+
+        [FieldOption(Hint = "Italian")]
+        IT = 6,
+
+        [FieldOption(Hint = "Russian")]
+        RU = 7,
+
+        [FieldOption(Hint = "German")]
+        DE = 8,
+
+        [FieldOption(Hint = "Hungarian")]
+        HU = 9,
+
+        [FieldOption(Hint = "French")]
+        FR = 10,
+
+        [FieldOption(Hint = "Finnish")]
+        FI = 11,
+
+        [FieldOption(Hint = "Vietnamese")]
+        VN = 12,
+
+        [FieldOption(Hint = "Greek")]
+        GR = 13,
+
+        [FieldOption(Hint = "Bulgarian")]
+        BG = 14,
+
+        [FieldOption(Hint = "Spanish (Spain)")]
+        ES = 15,
+
+        [FieldOption(Hint = "Portuguese (Brazil)")]
+        BR = 16,
+
+        [FieldOption(Hint = "Portuguese (Portugal)")]
+        PT = 17,
+
+        [FieldOption(Hint = "Swedish")]
+        SE = 18,
+
+        [FieldOption(Hint = "Arabic")]
+        SA = 19,
+
+        [FieldOption(Hint = "Danish")]
+        DK = 20,
+
+        [FieldOption(Hint = "Chinese (Simplified)")]
+        CN = 21,
+
+        [FieldOption(Hint = "Bengali")]
+        BD = 22,
+
+        [FieldOption(Hint = "Romanian")]
+        RO = 23,
+
+        [FieldOption(Hint = "Czech")]
+        CZ = 24,
+
+        [FieldOption(Hint = "Mongolian")]
+        MN = 25,
+
+        [FieldOption(Hint = "Turkish")]
+        TR = 26,
+
+        [FieldOption(Hint = "Indonesian")]
+        ID = 27,
+
+        [FieldOption(Hint = "Korean")]
+        KR = 28,
+
+        [FieldOption(Hint = "Spanish (LATAM)")]
+        MX = 29,
+
+        [FieldOption(Hint = "Persian")]
+        IR = 30,
+
+        [FieldOption(Hint = "Malaysian")]
+        MY = 31,
+    }
+}
@@ -9,10 +9,8 @@ using System.Text;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using AngleSharp.Html.Parser;
-using FluentValidation;
 using NLog;
 using NzbDrone.Common.Http;
-using NzbDrone.Core.Annotations;
 using NzbDrone.Core.Configuration;
 using NzbDrone.Core.Indexers.Exceptions;
 using NzbDrone.Core.Indexers.Settings;
@@ -20,14 +18,13 @@ using NzbDrone.Core.IndexerSearch.Definitions;
 using NzbDrone.Core.Messaging.Events;
 using NzbDrone.Core.Parser;
 using NzbDrone.Core.Parser.Model;
-using NzbDrone.Core.Validation;

 namespace NzbDrone.Core.Indexers.Definitions
 {
    public class Anidub : TorrentIndexerBase<UserPassTorrentBaseSettings>
    {
        public override string Name => "Anidub";
-        public override string[] IndexerUrls => new string[] { "https://tr.anidub.com/" };
+        public override string[] IndexerUrls => new[] { "https://tr.anidub.com/" };
        public override string Description => "Anidub is russian anime voiceover group and eponymous anime tracker.";
        public override string Language => "ru-RU";
        public override Encoding Encoding => Encoding.UTF8;
@@ -42,31 +39,29 @@ namespace NzbDrone.Core.Indexers.Definitions

        public override IIndexerRequestGenerator GetRequestGenerator()
        {
-            return new AnidubRequestGenerator() { Settings = Settings, Capabilities = Capabilities };
+            return new AnidubRequestGenerator(Settings);
        }

        public override IParseIndexerResponse GetParser()
        {
-            return new AnidubParser(Settings, Capabilities.Categories) { HttpClient = _httpClient, Logger = _logger };
+            return new AnidubParser(Settings, Capabilities.Categories, RateLimit, _httpClient, _logger);
        }

        protected override async Task DoLogin()
        {
            UpdateCookies(null, null);

+            var mainPage = await ExecuteAuth(new HttpRequest(Settings.BaseUrl));
+
            var requestBuilder = new HttpRequestBuilder(Settings.BaseUrl + "index.php")
            {
                LogResponseContent = true,
-                AllowAutoRedirect = true
+                AllowAutoRedirect = true,
+                Method = HttpMethod.Post
            };

-            var mainPage = await ExecuteAuth(new HttpRequest(Settings.BaseUrl));
-
-            requestBuilder.Method = HttpMethod.Post;
-            requestBuilder.PostProcess += r => r.RequestTimeout = TimeSpan.FromSeconds(15);
-            requestBuilder.SetCookies(mainPage.GetCookies());
-
            var authLoginRequest = requestBuilder
+                .SetCookies(mainPage.GetCookies())
                .AddFormParameter("login_name", Settings.Username)
                .AddFormParameter("login_password", Settings.Password)
                .AddFormParameter("login", "submit")
@@ -77,27 +72,22 @@ namespace NzbDrone.Core.Indexers.Definitions

            if (response.Content != null && !CheckIfLoginNeeded(response))
            {
-                UpdateCookies(response.GetCookies(), DateTime.Now + TimeSpan.FromDays(30));
+                UpdateCookies(response.GetCookies(), DateTime.Now.AddDays(30));
                _logger.Debug("Anidub authentication succeeded");
            }
            else
            {
-                const string ErrorSelector = "#content .berror .berror_c";
                var parser = new HtmlParser();
                var document = await parser.ParseDocumentAsync(response.Content);
-                var errorMessage = document.QuerySelector(ErrorSelector).TextContent.Trim();
-                throw new IndexerAuthException("Anidub authentication failed. Error: " + errorMessage);
+                var errorMessage = document.QuerySelector("#content .berror .berror_c")?.TextContent.Trim();
+
+                throw new IndexerAuthException(errorMessage ?? "Unknown error message, please report.");
            }
        }

        protected override bool CheckIfLoginNeeded(HttpResponse httpResponse)
        {
-            if (httpResponse.Content.Contains("index.php?action=logout"))
-            {
-                return false;
-            }
-
-            return true;
+            return !httpResponse.Content.Contains("index.php?action=logout");
        }

        private IndexerCapabilities SetCapabilities()
@@ -138,31 +128,32 @@ namespace NzbDrone.Core.Indexers.Definitions
            caps.Categories.AddCategoryMapping(15, NewznabStandardCategory.BooksComics, "Манга");
            caps.Categories.AddCategoryMapping(16, NewznabStandardCategory.Audio, "OST");
            caps.Categories.AddCategoryMapping(17, NewznabStandardCategory.Audio, "Подкасты");
+
            return caps;
        }
    }

    public class AnidubRequestGenerator : IIndexerRequestGenerator
    {
-        public UserPassTorrentBaseSettings Settings { get; set; }
-        public IndexerCapabilities Capabilities { get; set; }
+        private readonly UserPassTorrentBaseSettings _settings;

-        public AnidubRequestGenerator()
+        public AnidubRequestGenerator(UserPassTorrentBaseSettings settings)
        {
+            _settings = settings;
        }

-        private IEnumerable<IndexerRequest> GetPagedRequests(string term, int[] categories)
+        private IEnumerable<IndexerRequest> GetPagedRequests(string term)
        {
-            var requestUrl = string.Empty;
+            string requestUrl;
            var isSearch = !string.IsNullOrWhiteSpace(term);

            if (isSearch)
            {
-                requestUrl = string.Format("{0}/index.php?do=search", Settings.BaseUrl.TrimEnd('/'));
+                requestUrl = $"{_settings.BaseUrl.TrimEnd('/')}/index.php?do=search";
            }
            else
            {
-                requestUrl = Settings.BaseUrl;
+                requestUrl = _settings.BaseUrl;
            }

            var request = new IndexerRequest(requestUrl, HttpAccept.Html);
@@ -207,7 +198,7 @@ namespace NzbDrone.Core.Indexers.Definitions
        {
            var pageableRequests = new IndexerPageableRequestChain();

-            pageableRequests.Add(GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedSearchTerm), searchCriteria.Categories));
+            pageableRequests.Add(GetPagedRequests($"{searchCriteria.SanitizedSearchTerm}"));

            return pageableRequests;
        }
@@ -216,7 +207,7 @@ namespace NzbDrone.Core.Indexers.Definitions
        {
            var pageableRequests = new IndexerPageableRequestChain();

-            pageableRequests.Add(GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedTvSearchString), searchCriteria.Categories));
+            pageableRequests.Add(GetPagedRequests($"{searchCriteria.SanitizedTvSearchString}"));

            return pageableRequests;
        }
@@ -225,7 +216,7 @@ namespace NzbDrone.Core.Indexers.Definitions
        {
            var pageableRequests = new IndexerPageableRequestChain();

-            pageableRequests.Add(GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedSearchTerm), searchCriteria.Categories));
+            pageableRequests.Add(GetPagedRequests($"{searchCriteria.SanitizedSearchTerm}"));

            return pageableRequests;
        }
@@ -234,7 +225,7 @@ namespace NzbDrone.Core.Indexers.Definitions
        {
            var pageableRequests = new IndexerPageableRequestChain();

-            pageableRequests.Add(GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedSearchTerm), searchCriteria.Categories));
+            pageableRequests.Add(GetPagedRequests($"{searchCriteria.SanitizedSearchTerm}"));

            return pageableRequests;
        }
@@ -243,7 +234,7 @@ namespace NzbDrone.Core.Indexers.Definitions
        {
            var pageableRequests = new IndexerPageableRequestChain();

-            pageableRequests.Add(GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedSearchTerm), searchCriteria.Categories));
+            pageableRequests.Add(GetPagedRequests($"{searchCriteria.SanitizedSearchTerm}"));

            return pageableRequests;
        }
@@ -256,10 +247,11 @@ namespace NzbDrone.Core.Indexers.Definitions
    {
        private readonly UserPassTorrentBaseSettings _settings;
        private readonly IndexerCapabilitiesCategories _categories;
-        public IIndexerHttpClient HttpClient { get; set; }
-        public Logger Logger { get; set; }
+        private readonly TimeSpan _rateLimit;
+        private readonly IIndexerHttpClient _httpClient;
+        private readonly Logger _logger;

-        private static Dictionary<string, string> CategoriesMap => new Dictionary<string, string>
+        private static Dictionary<string, string> CategoriesMap => new ()
        {
            { "/anime_tv/full", "14" },
            { "/anime_tv/anime_ongoing", "10" },
@@ -279,10 +271,13 @@ namespace NzbDrone.Core.Indexers.Definitions
            { "/anons_ongoing", "12" }
        };

-        public AnidubParser(UserPassTorrentBaseSettings settings, IndexerCapabilitiesCategories categories)
+        public AnidubParser(UserPassTorrentBaseSettings settings, IndexerCapabilitiesCategories categories, TimeSpan rateLimit, IIndexerHttpClient httpClient, Logger logger)
        {
            _settings = settings;
            _categories = categories;
+            _rateLimit = rateLimit;
+            _httpClient = httpClient;
+            _logger = logger;
        }

        private static string GetTitle(AngleSharp.Html.Dom.IHtmlDocument content, AngleSharp.Dom.IElement tabNode)
@@ -327,9 +322,9 @@ namespace NzbDrone.Core.Indexers.Definitions

        private static int GetReleaseLeechers(AngleSharp.Dom.IElement tabNode)
        {
-            const string LeechersSelector = ".list.down > .li_swing_m";
+            const string leechersSelector = ".list.down > .li_swing_m";

-            var leechersStr = tabNode.QuerySelector(LeechersSelector).TextContent;
+            var leechersStr = tabNode.QuerySelector(leechersSelector).TextContent;
            int.TryParse(leechersStr, out var leechers);
            return leechers;
        }
@@ -345,18 +340,18 @@ namespace NzbDrone.Core.Indexers.Definitions

        private static int GetReleaseGrabs(AngleSharp.Dom.IElement tabNode)
        {
-            const string GrabsSelector = ".list.down > .li_download_m";
+            const string grabsSelector = ".list.down > .li_download_m";

-            var grabsStr = tabNode.QuerySelector(GrabsSelector).TextContent;
+            var grabsStr = tabNode.QuerySelector(grabsSelector).TextContent;
            int.TryParse(grabsStr, out var grabs);
            return grabs;
        }

        private static string GetDateFromDocument(AngleSharp.Html.Dom.IHtmlDocument content)
        {
-            const string DateSelector = ".story_inf > li:nth-child(2)";
+            const string dateSelector = ".story_inf > li:nth-child(2)";

-            var domDate = content.QuerySelector(DateSelector).LastChild;
+            var domDate = content.QuerySelector(dateSelector).LastChild;

            if (domDate?.NodeName != "#text")
            {
@@ -397,16 +392,16 @@ namespace NzbDrone.Core.Indexers.Definitions
                return utcDate.AddHours(-russianStandardTimeDiff);
            }

-            Logger.Warn($"[AniDub] Date time couldn't be parsed on. Date text: {dateText}");
+            _logger.Warn($"[AniDub] Date time couldn't be parsed on. Date text: {dateText}");

            return DateTime.UtcNow;
        }

        private static long GetReleaseSize(AngleSharp.Dom.IElement tabNode)
        {
-            const string SizeSelector = ".list.down > .red";
+            const string sizeSelector = ".list.down > .red";

-            var sizeStr = tabNode.QuerySelector(SizeSelector).TextContent;
+            var sizeStr = tabNode.QuerySelector(sizeSelector).TextContent;
            return ParseUtil.GetBytes(sizeStr);
        }

@@ -446,11 +441,11 @@ namespace NzbDrone.Core.Indexers.Definitions
                var release = new TorrentInfo
                {
                    Title = GetTitle(dom, t),
-                    InfoUrl = indexerResponse.Request.Url.ToString(),
+                    InfoUrl = indexerResponse.Request.Url.FullUri,
                    DownloadVolumeFactor = 0,
                    UploadVolumeFactor = 1,

-                    Guid = indexerResponse.Request.Url.ToString() + t.Id,
+                    Guid = indexerResponse.Request.Url.FullUri + t.Id,
                    Seeders = GetReleaseSeeders(t),
                    Peers = GetReleaseSeeders(t) + GetReleaseLeechers(t),
                    Grabs = GetReleaseGrabs(t),
@@ -472,36 +467,30 @@ namespace NzbDrone.Core.Indexers.Definitions

            var parser = new HtmlParser();
            var dom = parser.ParseDocument(indexerResponse.Content);
-            var domQuery = string.Empty;

-            if (indexerResponse.Request.Url.Query.Contains("do=search"))
-            {
-                domQuery = ".searchitem > h3 > a";
-            }
-            else
-            {
-                domQuery = "#dle-content > .story > .story_h > .lcol > h2 > a";
-            }
-
-            var links = dom.QuerySelectorAll(domQuery);
+            var links = dom.QuerySelectorAll(".searchitem > h3 > a[href], #dle-content > .story > .story_h > .lcol > h2 > a[href]");
            foreach (var link in links)
            {
                var url = link.GetAttribute("href");

-                var releaseRequest = new IndexerRequest(url, HttpAccept.Html);
-                var releaseResponse = new IndexerResponse(releaseRequest, HttpClient.Execute(releaseRequest.HttpRequest));
+                var releaseRequest = new HttpRequestBuilder(url)
+                    .WithRateLimit(_rateLimit.TotalSeconds)
+                    .SetHeader("Referer", _settings.BaseUrl)
+                    .Accept(HttpAccept.Html)
+                    .Build();
+
+                var releaseIndexerRequest = new IndexerRequest(releaseRequest);
+                var releaseResponse = new IndexerResponse(releaseIndexerRequest, _httpClient.Execute(releaseIndexerRequest.HttpRequest));

                // Throw common http errors here before we try to parse
                if (releaseResponse.HttpResponse.HasHttpError)
                {
                    if (releaseResponse.HttpResponse.StatusCode == HttpStatusCode.TooManyRequests)
                    {
-                        throw new TooManyRequestsException(releaseRequest.HttpRequest, releaseResponse.HttpResponse);
-                    }
-                    else
-                    {
-                        throw new IndexerException(releaseResponse, "Http error code: " + releaseResponse.HttpResponse.StatusCode);
+                        throw new TooManyRequestsException(releaseResponse.HttpRequest, releaseResponse.HttpResponse);
                    }
+
+                    throw new IndexerException(releaseResponse, $"HTTP Error - {releaseResponse.HttpResponse.StatusCode}. {url}");
                }

                torrentInfos.AddRange(ParseRelease(releaseResponse));
@@ -425,7 +425,7 @@ namespace NzbDrone.Core.Indexers.Definitions
                        }

                        var releaseGroup = releaseTags.LastOrDefault();
-                        if (releaseGroup != null && releaseGroup.Contains("(") && releaseGroup.Contains(")"))
+                        if (releaseGroup != null && releaseGroup.Contains('(') && releaseGroup.Contains(')'))
                        {
                            //// Skip raws if set
                            //if (releaseGroup.ToLowerInvariant().StartsWith("raw") && !AllowRaws)
@@ -521,7 +521,7 @@ namespace NzbDrone.Core.Indexers.Definitions
        public Action<IDictionary<string, string>, DateTime?> CookiesUpdater { get; set; }
    }

-    public class AnimeBytesSettingsValidator : AbstractValidator<AnimeBytesSettings>
+    public class AnimeBytesSettingsValidator : NoAuthSettingsValidator<AnimeBytesSettings>
    {
        public AnimeBytesSettingsValidator()
        {
@@ -535,7 +535,7 @@ namespace NzbDrone.Core.Indexers.Definitions

    public class AnimeBytesSettings : NoAuthTorrentBaseSettings
    {
-        private static readonly AnimeBytesSettingsValidator Validator = new AnimeBytesSettingsValidator();
+        private static readonly AnimeBytesSettingsValidator Validator = new ();

        public AnimeBytesSettings()
        {
@@ -7,10 +7,8 @@ using System.Net.Http;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using AngleSharp.Html.Parser;
-using FluentValidation;
 using NLog;
 using NzbDrone.Common.Http;
-using NzbDrone.Core.Annotations;
 using NzbDrone.Core.Configuration;
 using NzbDrone.Core.Indexers.Exceptions;
 using NzbDrone.Core.Indexers.Settings;
@@ -18,7 +16,6 @@ using NzbDrone.Core.IndexerSearch.Definitions;
 using NzbDrone.Core.Messaging.Events;
 using NzbDrone.Core.Parser;
 using NzbDrone.Core.Parser.Model;
-using NzbDrone.Core.Validation;

 namespace NzbDrone.Core.Indexers.Definitions
 {
@@ -26,7 +23,7 @@ namespace NzbDrone.Core.Indexers.Definitions
    {
        public override string Name => "AnimeTorrents";

-        public override string[] IndexerUrls => new string[] { "https://animetorrents.me/" };
+        public override string[] IndexerUrls => new[] { "https://animetorrents.me/" };
        public override string Description => "Definitive source for anime and manga";
        private string LoginUrl => Settings.BaseUrl + "login.php";
        public override DownloadProtocol Protocol => DownloadProtocol.Torrent;
@@ -40,7 +37,7 @@ namespace NzbDrone.Core.Indexers.Definitions

        public override IIndexerRequestGenerator GetRequestGenerator()
        {
-            return new AnimeTorrentsRequestGenerator() { Settings = Settings, Capabilities = Capabilities };
+            return new AnimeTorrentsRequestGenerator { Settings = Settings, Capabilities = Capabilities };
        }

        public override IParseIndexerResponse GetParser()
@@ -52,30 +49,29 @@ namespace NzbDrone.Core.Indexers.Definitions
        {
            UpdateCookies(null, null);

+            var loginPage = await ExecuteAuth(new HttpRequest(LoginUrl));
+
            var requestBuilder = new HttpRequestBuilder(LoginUrl)
            {
                LogResponseContent = true,
-                AllowAutoRedirect = true
+                AllowAutoRedirect = true,
+                Method = HttpMethod.Post
            };

-            var loginPage = await ExecuteAuth(new HttpRequest(LoginUrl));
-            requestBuilder.Method = HttpMethod.Post;
-            requestBuilder.PostProcess += r => r.RequestTimeout = TimeSpan.FromSeconds(15);
-            requestBuilder.SetCookies(loginPage.GetCookies());
-
            var authLoginRequest = requestBuilder
+                .SetCookies(loginPage.GetCookies())
                .AddFormParameter("username", Settings.Username)
                .AddFormParameter("password", Settings.Password)
                .AddFormParameter("form", "login")
                .AddFormParameter("rememberme[]", "1")
-                .SetHeader("Content-Type", "multipart/form-data")
+                .SetHeader("Content-Type", "application/x-www-form-urlencoded")
                .Build();

            var response = await ExecuteAuth(authLoginRequest);

            if (response.Content != null && response.Content.Contains("logout.php"))
            {
-                UpdateCookies(response.GetCookies(), DateTime.Now + TimeSpan.FromDays(30));
+                UpdateCookies(response.GetCookies(), DateTime.Now.AddDays(30));

                _logger.Debug("AnimeTorrents authentication succeeded");
            }
@@ -87,12 +83,7 @@ namespace NzbDrone.Core.Indexers.Definitions

        protected override bool CheckIfLoginNeeded(HttpResponse httpResponse)
        {
-            if (httpResponse.Content.Contains("Access Denied!") || httpResponse.Content.Contains("login.php"))
-            {
-                return true;
-            }
-
-            return false;
+            return httpResponse.Content.Contains("Access Denied!") || httpResponse.Content.Contains("login.php");
        }

        private IndexerCapabilities SetCapabilities()
@@ -138,10 +129,6 @@ namespace NzbDrone.Core.Indexers.Definitions
        public UserPassTorrentBaseSettings Settings { get; set; }
        public IndexerCapabilities Capabilities { get; set; }

-        public AnimeTorrentsRequestGenerator()
-        {
-        }
-
        private IEnumerable<IndexerRequest> GetPagedRequests(string term, int[] categories)
        {
            var searchString = term;
@@ -5,10 +5,8 @@ using System.Net;
 using System.Text;
 using System.Text.RegularExpressions;
 using AngleSharp.Html.Parser;
-using FluentValidation;
 using NLog;
 using NzbDrone.Common.Http;
-using NzbDrone.Core.Annotations;
 using NzbDrone.Core.Configuration;
 using NzbDrone.Core.Indexers.Exceptions;
 using NzbDrone.Core.Indexers.Settings;
@@ -16,14 +14,13 @@ using NzbDrone.Core.IndexerSearch.Definitions;
 using NzbDrone.Core.Messaging.Events;
 using NzbDrone.Core.Parser;
 using NzbDrone.Core.Parser.Model;
-using NzbDrone.Core.Validation;

 namespace NzbDrone.Core.Indexers.Definitions
 {
    public class Animedia : TorrentIndexerBase<NoAuthTorrentBaseSettings>
    {
        public override string Name => "Animedia";
-        public override string[] IndexerUrls => new string[] { "https://tt.animedia.tv/" };
+        public override string[] IndexerUrls => new[] { "https://tt.animedia.tv/" };
        public override string Description => "Animedia is russian anime voiceover group and eponymous anime tracker.";
        public override string Language => "ru-RU";
        public override Encoding Encoding => Encoding.UTF8;
@@ -38,12 +35,12 @@ namespace NzbDrone.Core.Indexers.Definitions

        public override IIndexerRequestGenerator GetRequestGenerator()
        {
-            return new AnimediaRequestGenerator() { Settings = Settings, Capabilities = Capabilities };
+            return new AnimediaRequestGenerator(Settings);
        }

        public override IParseIndexerResponse GetParser()
        {
-            return new AnimediaParser(Settings, Capabilities.Categories) { HttpClient = _httpClient, Logger = _logger };
+            return new AnimediaParser(Settings, Capabilities.Categories, RateLimit, _httpClient);
        }

        private IndexerCapabilities SetCapabilities()
@@ -59,30 +56,32 @@ namespace NzbDrone.Core.Indexers.Definitions
                    MovieSearchParam.Q
                }
            };
+
            caps.Categories.AddCategoryMapping(1, NewznabStandardCategory.TVAnime, "TV Anime");
            caps.Categories.AddCategoryMapping(2, NewznabStandardCategory.TVAnime, "OVA/ONA/Special");
            caps.Categories.AddCategoryMapping(3, NewznabStandardCategory.TV, "Dorama");
            caps.Categories.AddCategoryMapping(4, NewznabStandardCategory.Movies, "Movies");
+
            return caps;
        }
    }

    public class AnimediaRequestGenerator : IIndexerRequestGenerator
    {
-        public NoAuthTorrentBaseSettings Settings { get; set; }
-        public IndexerCapabilities Capabilities { get; set; }
+        private readonly NoAuthTorrentBaseSettings _settings;

-        public AnimediaRequestGenerator()
+        public AnimediaRequestGenerator(NoAuthTorrentBaseSettings settings)
        {
+            _settings = settings;
        }

-        private IEnumerable<IndexerRequest> GetPagedRequests(string term, int[] categories)
+        private IEnumerable<IndexerRequest> GetPagedRequests(string term)
        {
-            var requestUrl = string.Empty;
+            string requestUrl;

            if (string.IsNullOrWhiteSpace(term))
            {
-                requestUrl = Settings.BaseUrl;
+                requestUrl = _settings.BaseUrl;
            }
            else
            {
@@ -94,18 +93,17 @@ namespace NzbDrone.Core.Indexers.Definitions
                    { "orderby_sort", "entry_date|desc" }
                };

-                requestUrl = string.Format("{0}/ajax/search_result/P0?{1}", Settings.BaseUrl.TrimEnd('/'), queryCollection.GetQueryString());
+                requestUrl = $"{_settings.BaseUrl.TrimEnd('/')}/ajax/search_result/P0?{queryCollection.GetQueryString()}";
            }

-            var request = new IndexerRequest(requestUrl, HttpAccept.Html);
-            yield return request;
+            yield return new IndexerRequest(requestUrl, HttpAccept.Html);
        }

        public IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchCriteria)
        {
            var pageableRequests = new IndexerPageableRequestChain();

-            pageableRequests.Add(GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedSearchTerm), searchCriteria.Categories));
+            pageableRequests.Add(GetPagedRequests($"{searchCriteria.SanitizedSearchTerm}"));

            return pageableRequests;
        }
@@ -114,7 +112,7 @@ namespace NzbDrone.Core.Indexers.Definitions
        {
            var pageableRequests = new IndexerPageableRequestChain();

-            pageableRequests.Add(GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedTvSearchString), searchCriteria.Categories));
+            pageableRequests.Add(GetPagedRequests($"{searchCriteria.SanitizedTvSearchString}"));

            return pageableRequests;
        }
@@ -123,7 +121,7 @@ namespace NzbDrone.Core.Indexers.Definitions
        {
            var pageableRequests = new IndexerPageableRequestChain();

-            pageableRequests.Add(GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedSearchTerm), searchCriteria.Categories));
+            pageableRequests.Add(GetPagedRequests($"{searchCriteria.SanitizedSearchTerm}"));

            return pageableRequests;
        }
@@ -148,6 +146,9 @@ namespace NzbDrone.Core.Indexers.Definitions
    {
        private readonly NoAuthTorrentBaseSettings _settings;
        private readonly IndexerCapabilitiesCategories _categories;
+        private readonly TimeSpan _rateLimit;
+        private readonly IIndexerHttpClient _httpClient;
+
        private static readonly Regex EpisodesInfoQueryRegex = new Regex(@"сери[ия] (\d+)(?:-(\d+))? из.*", RegexOptions.Compiled | RegexOptions.IgnoreCase);
        private static readonly Regex ResolutionInfoQueryRegex = new Regex(@"качество (\d+)", RegexOptions.Compiled | RegexOptions.IgnoreCase);
        private static readonly Regex SizeInfoQueryRegex = new Regex(@"размер:(.*)\n", RegexOptions.Compiled | RegexOptions.IgnoreCase);
@@ -155,25 +156,25 @@ namespace NzbDrone.Core.Indexers.Definitions
        private static readonly Regex CategorieMovieRegex = new Regex(@"Фильм", RegexOptions.Compiled | RegexOptions.IgnoreCase);
        private static readonly Regex CategorieOVARegex = new Regex(@"ОВА|OVA|ОНА|ONA|Special", RegexOptions.Compiled | RegexOptions.IgnoreCase);
        private static readonly Regex CategorieDoramaRegex = new Regex(@"Дорама", RegexOptions.Compiled | RegexOptions.IgnoreCase);
-        public IIndexerHttpClient HttpClient { get; set; }
-        public Logger Logger { get; set; }

-        public AnimediaParser(NoAuthTorrentBaseSettings settings, IndexerCapabilitiesCategories categories)
+        public AnimediaParser(NoAuthTorrentBaseSettings settings, IndexerCapabilitiesCategories categories, TimeSpan rateLimit, IIndexerHttpClient httpClient)
        {
            _settings = settings;
            _categories = categories;
+            _rateLimit = rateLimit;
+            _httpClient = httpClient;
        }

-        private string composeTitle(AngleSharp.Html.Dom.IHtmlDocument dom, AngleSharp.Dom.IElement t, AngleSharp.Dom.IElement tr)
+        private string ComposeTitle(AngleSharp.Html.Dom.IHtmlDocument dom, AngleSharp.Dom.IElement t, AngleSharp.Dom.IElement tr)
        {
-            var name_ru = dom.QuerySelector("div.media__post__header > h1").TextContent.Trim();
-            var name_en = dom.QuerySelector("div.media__panel > div:nth-of-type(1) > div.col-l:nth-of-type(1) > div > span").TextContent.Trim();
-            var name_orig = dom.QuerySelector("div.media__panel > div:nth-of-type(1) > div.col-l:nth-of-type(2) > div > span").TextContent.Trim();
+            var nameRu = dom.QuerySelector("div.media__post__header > h1")?.TextContent.Trim() ?? string.Empty;
+            var nameEn = dom.QuerySelector("div.media__panel > div:nth-of-type(1) > div.col-l:nth-of-type(1) > div > span")?.TextContent.Trim() ?? string.Empty;
+            var nameOrig = dom.QuerySelector("div.media__panel > div:nth-of-type(1) > div.col-l:nth-of-type(2) > div > span")?.TextContent.Trim() ?? string.Empty;

-            var title = name_ru + " / " + name_en;
-            if (name_en != name_orig)
+            var title = nameRu + " / " + nameEn;
+            if (nameEn != nameOrig)
            {
-                title += " / " + name_orig;
+                title += " / " + nameOrig;
            }

            var tabName = t.TextContent;
@@ -183,7 +184,7 @@ namespace NzbDrone.Core.Indexers.Definitions
                tabName = "";
            }

-            var heading = tr.QuerySelector("h3.tracker_info_bold").TextContent;
+            var heading = tr.QuerySelector("h3.tracker_info_bold")?.TextContent.Trim() ?? string.Empty;

            // Parse episodes info from heading if episods info present
            var match = EpisodesInfoQueryRegex.Match(heading);
@@ -192,40 +193,40 @@ namespace NzbDrone.Core.Indexers.Definitions
            {
                if (string.IsNullOrEmpty(match.Groups[2].Value))
                {
-                    heading += " E" + match.Groups[1].Value;
+                    heading += $" E{match.Groups[1].Value}";
                }
                else
                {
-                    heading += string.Format(" E{0}-{1}", match.Groups[1].Value, match.Groups[2].Value);
+                    heading += $" E{match.Groups[1].Value}-{match.Groups[2].Value}";
                }
            }

-            return title + " - " + heading + " [" + getResolution(tr) + "p]";
+            return title + " - " + heading + " [" + GetResolution(tr) + "p]";
        }

-        private string getResolution(AngleSharp.Dom.IElement tr)
+        private string GetResolution(AngleSharp.Dom.IElement tr)
        {
-            var resolution = tr.QuerySelector("div.tracker_info_left").TextContent;
+            var resolution = tr.QuerySelector("div.tracker_info_left")?.TextContent.Trim() ?? string.Empty;
            return ResolutionInfoQueryRegex.Match(resolution).Groups[1].Value;
        }

-        private long getReleaseSize(AngleSharp.Dom.IElement tr)
+        private long GetReleaseSize(AngleSharp.Dom.IElement tr)
        {
-            var sizeStr = tr.QuerySelector("div.tracker_info_left").TextContent;
+            var sizeStr = tr.QuerySelector("div.tracker_info_left")?.TextContent.Trim() ?? string.Empty;
            return ParseUtil.GetBytes(SizeInfoQueryRegex.Match(sizeStr).Groups[1].Value.Trim());
        }

-        private DateTime getReleaseDate(AngleSharp.Dom.IElement tr)
+        private DateTime GetReleaseDate(AngleSharp.Dom.IElement tr)
        {
-            var sizeStr = tr.QuerySelector("div.tracker_info_left").TextContent;
+            var sizeStr = tr.QuerySelector("div.tracker_info_left")?.TextContent.Trim() ?? string.Empty;
            return DateTime.Parse(ReleaseDateInfoQueryRegex.Match(sizeStr).Groups[1].Value.Trim());
        }

        private ICollection<IndexerCategory> MapCategories(AngleSharp.Html.Dom.IHtmlDocument dom, AngleSharp.Dom.IElement t, AngleSharp.Dom.IElement tr)
        {
            var rName = t.TextContent;
-            var rDesc = tr.QuerySelector("h3.tracker_info_bold").TextContent;
-            var type = dom.QuerySelector("div.releases-date:contains('Тип:')").TextContent;
+            var rDesc = tr.QuerySelector("h3.tracker_info_bold")?.TextContent.Trim() ?? string.Empty;
+            var type = dom.QuerySelector("div.releases-date:contains('Тип:')")?.TextContent.Trim() ?? string.Empty;

            // Check OVA first cause OVA looks like anime with OVA in release name or description
            if (CategorieOVARegex.IsMatch(rName) || CategorieOVARegex.IsMatch(rDesc))
@@ -256,28 +257,28 @@ namespace NzbDrone.Core.Indexers.Definitions

            foreach (var t in dom.QuerySelectorAll("ul.media__tabs__nav > li > a"))
            {
-                var tr_id = t.Attributes["href"].Value;
-                var tr = dom.QuerySelector("div" + tr_id);
+                var trId = t.GetAttribute("href");
+                var tr = dom.QuerySelector("div" + trId);
                var seeders = int.Parse(tr.QuerySelector("div.circle_green_text_top").TextContent);
-                var url = indexerResponse.HttpRequest.Url.ToString();
+                var url = indexerResponse.HttpRequest.Url.FullUri;

                var release = new TorrentInfo
                {
-                    Title = composeTitle(dom, t, tr),
+                    Title = ComposeTitle(dom, t, tr),
                    InfoUrl = url,
                    DownloadVolumeFactor = 0,
                    UploadVolumeFactor = 1,

-                    Guid = url + tr_id,
+                    Guid = url + trId,
                    Seeders = seeders,
                    Peers = seeders + int.Parse(tr.QuerySelector("div.circle_red_text_top").TextContent),
                    Grabs = int.Parse(tr.QuerySelector("div.circle_grey_text_top").TextContent),
                    Categories = MapCategories(dom, t, tr),
-                    PublishDate = getReleaseDate(tr),
-                    DownloadUrl = tr.QuerySelector("div.download_tracker > a.btn__green").Attributes["href"].Value,
-                    MagnetUrl = tr.QuerySelector("div.download_tracker > a.btn__d-gray").Attributes["href"].Value,
-                    Size = getReleaseSize(tr),
-                    Resolution = getResolution(tr)
+                    PublishDate = GetReleaseDate(tr),
+                    DownloadUrl = tr.QuerySelector("div.download_tracker > a.btn__green").GetAttribute("href"),
+                    MagnetUrl = tr.QuerySelector("div.download_tracker > a.btn__d-gray").GetAttribute("href"),
+                    Size = GetReleaseSize(tr),
+                    Resolution = GetResolution(tr)
                };
                torrentInfos.Add(release);
            }
@@ -291,6 +292,7 @@ namespace NzbDrone.Core.Indexers.Definitions

            var parser = new HtmlParser();
            var dom = parser.ParseDocument(indexerResponse.Content);
+
            var links = dom.QuerySelectorAll("a.ads-list__item__title");
            foreach (var link in links)
            {
@@ -302,20 +304,24 @@ namespace NzbDrone.Core.Indexers.Definitions
                    url = "https:" + url;
                }

-                var releaseRequest = new IndexerRequest(url, HttpAccept.Html);
-                var releaseResponse = new IndexerResponse(releaseRequest, HttpClient.Execute(releaseRequest.HttpRequest));
+                var releaseRequest = new HttpRequestBuilder(url)
+                    .WithRateLimit(_rateLimit.TotalSeconds)
+                    .SetHeader("Referer", _settings.BaseUrl)
+                    .Accept(HttpAccept.Html)
+                    .Build();
+
+                var releaseIndexerRequest = new IndexerRequest(releaseRequest);
+                var releaseResponse = new IndexerResponse(releaseIndexerRequest, _httpClient.Execute(releaseIndexerRequest.HttpRequest));

                // Throw common http errors here before we try to parse
                if (releaseResponse.HttpResponse.HasHttpError)
                {
                    if (releaseResponse.HttpResponse.StatusCode == HttpStatusCode.TooManyRequests)
                    {
-                        throw new TooManyRequestsException(releaseRequest.HttpRequest, releaseResponse.HttpResponse);
-                    }
-                    else
-                    {
-                        throw new IndexerException(releaseResponse, "Http error code: " + releaseResponse.HttpResponse.StatusCode);
+                        throw new TooManyRequestsException(releaseResponse.HttpRequest, releaseResponse.HttpResponse);
                    }
+
+                    throw new IndexerException(releaseResponse, $"HTTP Error - {releaseResponse.HttpResponse.StatusCode}. {url}");
                }

                torrentInfos.AddRange(ParseRelease(releaseResponse));
@@ -52,55 +52,42 @@ namespace NzbDrone.Core.Indexers.Definitions
            var requestBuilder = new HttpRequestBuilder(LoginUrl)
            {
                LogResponseContent = true,
-                AllowAutoRedirect = true
+                AllowAutoRedirect = true,
+                Method = HttpMethod.Post
            };

-            requestBuilder.Method = HttpMethod.Post;
-            requestBuilder.PostProcess += r => r.RequestTimeout = TimeSpan.FromSeconds(15);
-
            var cookies = Cookies;
-
            Cookies = null;
+
            var authLoginRequest = requestBuilder
                .AddFormParameter("username", Settings.Username)
                .AddFormParameter("password", Settings.Password)
                .AddFormParameter("keeplogged", "1")
                .AddFormParameter("login", "Log+In!")
-                .SetHeader("Content-Type", "multipart/form-data")
+                .SetHeader("Content-Type", "application/x-www-form-urlencoded")
+                .SetHeader("Referer", LoginUrl)
                .Build();

-            var headers = new NameValueCollection
-            {
-                { "Referer", LoginUrl }
-            };
-
-            authLoginRequest.Headers.Add(headers);
-
            var response = await ExecuteAuth(authLoginRequest);

            if (CheckIfLoginNeeded(response))
            {
                var parser = new HtmlParser();
                var dom = parser.ParseDocument(response.Content);
-                var errorMessage = dom.QuerySelector("form#loginform").TextContent.Trim();
+                var errorMessage = dom.QuerySelector("form#loginform")?.TextContent.Trim();

-                throw new IndexerAuthException(errorMessage);
+                throw new IndexerAuthException(errorMessage ?? "Unknown error message, please report.");
            }

            cookies = response.GetCookies();
-            UpdateCookies(cookies, DateTime.Now + TimeSpan.FromDays(30));
+            UpdateCookies(cookies, DateTime.Now.AddDays(30));

            _logger.Debug("Anthelion authentication succeeded.");
        }

        protected override bool CheckIfLoginNeeded(HttpResponse httpResponse)
        {
-            if (!httpResponse.Content.Contains("logout.php"))
-            {
-                return true;
-            }
-
-            return false;
+            return !httpResponse.Content.Contains("logout.php");
        }

        private IndexerCapabilities SetCapabilities()
@@ -131,10 +118,6 @@ namespace NzbDrone.Core.Indexers.Definitions
        public UserPassTorrentBaseSettings Settings { get; set; }
        public IndexerCapabilities Capabilities { get; set; }

-        public AnthelionRequestGenerator()
-        {
-        }
-
        private IEnumerable<IndexerRequest> GetPagedRequests(string term, int[] categories, string imdbId = null)
        {
            var searchUrl = string.Format("{0}/torrents.php", Settings.BaseUrl.TrimEnd('/'));
@@ -0,0 +1,81 @@
+using System.Collections.Generic;
+using AngleSharp.Html.Parser;
+using NLog;
+using NzbDrone.Common.Http;
+using NzbDrone.Core.Annotations;
+using NzbDrone.Core.Configuration;
+using NzbDrone.Core.Indexers.Definitions.Gazelle;
+using NzbDrone.Core.Indexers.Exceptions;
+using NzbDrone.Core.Messaging.Events;
+
+namespace NzbDrone.Core.Indexers.Definitions;
+
+public class AroLol : GazelleBase<AroLolSettings>
+{
+    public override string Name => "aro.lol";
+    public override string[] IndexerUrls => new[] { "https://aro.lol/" };
+    public override string Description => "aro.lol is a SERBIAN/ENGLISH Private Torrent Tracker for ANIME";
+    public override IndexerPrivacy Privacy => IndexerPrivacy.Private;
+
+    public AroLol(IIndexerHttpClient httpClient,
+                        IEventAggregator eventAggregator,
+                        IIndexerStatusService indexerStatusService,
+                        IConfigService configService,
+                        Logger logger)
+        : base(httpClient, eventAggregator, indexerStatusService, configService, logger)
+    {
+    }
+
+    protected override HttpRequestBuilder AuthLoginRequestBuilder()
+    {
+        return base.AuthLoginRequestBuilder()
+            .AddFormParameter("twofa", Settings.TwoFactorAuthCode?.Trim() ?? "");
+    }
+
+    protected override bool CheckForLoginError(HttpResponse response)
+    {
+        if (response.Content.Contains("loginform"))
+        {
+            var parser = new HtmlParser();
+            var dom = parser.ParseDocument(response.Content);
+            var errorMessage = dom.QuerySelector("#loginform > .warning")?.TextContent.Trim();
+
+            throw new IndexerAuthException(errorMessage ?? "Unknown error message, please report.");
+        }
+
+        return true;
+    }
+
+    protected override IndexerCapabilities SetCapabilities()
+    {
+        var caps = new IndexerCapabilities
+        {
+            TvSearchParams = new List<TvSearchParam>
+            {
+                TvSearchParam.Q
+            },
+            MovieSearchParams = new List<MovieSearchParam>
+            {
+                MovieSearchParam.Q
+            },
+            BookSearchParams = new List<BookSearchParam>
+            {
+                BookSearchParam.Q
+            }
+        };
+
+        caps.Categories.AddCategoryMapping("1", NewznabStandardCategory.Movies, "Movies");
+        caps.Categories.AddCategoryMapping("2", NewznabStandardCategory.TVAnime, "Anime");
+        caps.Categories.AddCategoryMapping("3", NewznabStandardCategory.Books, "Manga");
+        caps.Categories.AddCategoryMapping("4", NewznabStandardCategory.Console, "Games");
+        caps.Categories.AddCategoryMapping("5", NewznabStandardCategory.Other, "Other");
+
+        return caps;
+    }
+}
+
+public class AroLolSettings : GazelleSettings
+{
+    [FieldDefinition(4, Label = "2FA code", Type = FieldType.Textbox, HelpText = "Only fill in the <b>2FA code</b> box if you have enabled <b>2FA</b> on the aro.lol Web Site. Otherwise just leave it empty.")]
+    public string TwoFactorAuthCode { get; set; }
+}
@@ -0,0 +1,358 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.Specialized;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Threading.Tasks;
+using AngleSharp.Html.Dom;
+using AngleSharp.Html.Parser;
+using NLog;
+using NzbDrone.Common.Extensions;
+using NzbDrone.Common.Http;
+using NzbDrone.Core.Configuration;
+using NzbDrone.Core.Indexers.Settings;
+using NzbDrone.Core.IndexerSearch.Definitions;
+using NzbDrone.Core.Messaging.Events;
+using NzbDrone.Core.Parser;
+using NzbDrone.Core.Parser.Model;
+
+namespace NzbDrone.Core.Indexers.Definitions;
+
+public class AudioBookBay : TorrentIndexerBase<NoAuthTorrentBaseSettings>
+{
+    public override string Name => "AudioBook Bay";
+    public override string[] IndexerUrls => new[]
+    {
+        "https://audiobookbay.li/",
+        "https://audiobookbay.se/"
+    };
+    public override string[] LegacyUrls => new[]
+    {
+        "https://audiobookbay.la/",
+        "http://audiobookbay.net/",
+        "https://audiobookbay.unblockit.tv/",
+        "http://audiobookbay.nl/",
+        "http://audiobookbay.ws/",
+        "https://audiobookbay.unblockit.how/",
+        "https://audiobookbay.unblockit.cam/",
+        "https://audiobookbay.unblockit.biz/",
+        "https://audiobookbay.unblockit.day/",
+        "https://audiobookbay.unblockit.llc/",
+        "https://audiobookbay.unblockit.blue/",
+        "https://audiobookbay.unblockit.name/",
+        "http://audiobookbay.fi/",
+        "http://audiobookbay.se/",
+        "http://audiobookbayabb.com/",
+        "https://audiobookbay.unblockit.ist/",
+        "https://audiobookbay.unblockit.bet/",
+        "https://audiobookbay.unblockit.cat/",
+        "https://audiobookbay.unblockit.nz/",
+        "https://audiobookbay.fi/",
+        "https://audiobookbay.unblockit.page/",
+        "https://audiobookbay.unblockit.pet/",
+        "https://audiobookbay.unblockit.ink/",
+        "https://audiobookbay.unblockit.bio/" // error 502
+    };
+    public override string Description => "AudioBook Bay (ABB) is a public Torrent Tracker for AUDIOBOOKS";
+    public override string Language => "en-US";
+    public override DownloadProtocol Protocol => DownloadProtocol.Torrent;
+    public override IndexerPrivacy Privacy => IndexerPrivacy.Public;
+    public override int PageSize => 15;
+    public override IndexerCapabilities Capabilities => SetCapabilities();
+
+    public AudioBookBay(IIndexerHttpClient httpClient, IEventAggregator eventAggregator, IIndexerStatusService indexerStatusService, IConfigService configService, Logger logger)
+        : base(httpClient, eventAggregator, indexerStatusService, configService, logger)
+    {
+    }
+
+    public override IIndexerRequestGenerator GetRequestGenerator()
+    {
+        return new AudioBookBayRequestGenerator(Settings, Capabilities);
+    }
+
+    public override IParseIndexerResponse GetParser()
+    {
+        return new AudioBookBayParser(Settings, Capabilities.Categories);
+    }
+
+    public override async Task<byte[]> Download(Uri link)
+    {
+        var request = new HttpRequestBuilder(link.ToString())
+            .SetCookies(GetCookies() ?? new Dictionary<string, string>())
+            .Accept(HttpAccept.Html)
+            .Build();
+
+        var response = await _httpClient.ExecuteProxiedAsync(request, Definition);
+
+        var parser = new HtmlParser();
+        var dom = parser.ParseDocument(response.Content);
+
+        var hash = dom.QuerySelector("td:contains(\"Info Hash:\") ~ td")?.TextContent.Trim();
+        if (hash == null)
+        {
+            throw new Exception($"Failed to fetch hash from {link}");
+        }
+
+        var title = dom.QuerySelector("div.postTitle h1")?.TextContent.Trim();
+        if (title == null)
+        {
+            throw new Exception($"Failed to fetch title from {link}");
+        }
+
+        title = StringUtil.MakeValidFileName(title, '_', false);
+
+        var magnet = MagnetLinkBuilder.BuildPublicMagnetLink(hash, title);
+
+        return await base.Download(new Uri(magnet));
+    }
+
+    private IndexerCapabilities SetCapabilities()
+    {
+        var caps = new IndexerCapabilities
+        {
+            BookSearchParams = new List<BookSearchParam>
+            {
+                BookSearchParam.Q
+            }
+        };
+
+        // Age
+        caps.Categories.AddCategoryMapping("children", NewznabStandardCategory.AudioAudiobook, "Children");
+        caps.Categories.AddCategoryMapping("teen-young-adult", NewznabStandardCategory.AudioAudiobook, "Teen & Young Adult");
+        caps.Categories.AddCategoryMapping("adults", NewznabStandardCategory.AudioAudiobook, "Adults");
+
+        // Category
+        caps.Categories.AddCategoryMapping("postapocalyptic", NewznabStandardCategory.AudioAudiobook, "(Post)apocalyptic");
+        caps.Categories.AddCategoryMapping("action", NewznabStandardCategory.AudioAudiobook, "Action");
+        caps.Categories.AddCategoryMapping("adventure", NewznabStandardCategory.AudioAudiobook, "Adventure");
+        caps.Categories.AddCategoryMapping("art", NewznabStandardCategory.AudioAudiobook, "Art");
+        caps.Categories.AddCategoryMapping("autobiography-biographies", NewznabStandardCategory.AudioAudiobook, "Autobiography & Biographies");
+        caps.Categories.AddCategoryMapping("business", NewznabStandardCategory.AudioAudiobook, "Business");
+        caps.Categories.AddCategoryMapping("computer", NewznabStandardCategory.AudioAudiobook, "Computer");
+        caps.Categories.AddCategoryMapping("contemporary", NewznabStandardCategory.AudioAudiobook, "Contemporary");
+        caps.Categories.AddCategoryMapping("crime", NewznabStandardCategory.AudioAudiobook, "Crime");
+        caps.Categories.AddCategoryMapping("detective", NewznabStandardCategory.AudioAudiobook, "Detective");
+        caps.Categories.AddCategoryMapping("doctor-who-sci-fi", NewznabStandardCategory.AudioAudiobook, "Doctor Who");
+        caps.Categories.AddCategoryMapping("education", NewznabStandardCategory.AudioAudiobook, "Education");
+        caps.Categories.AddCategoryMapping("fantasy", NewznabStandardCategory.AudioAudiobook, "Fantasy");
+        caps.Categories.AddCategoryMapping("general-fiction", NewznabStandardCategory.AudioAudiobook, "General Fiction");
+        caps.Categories.AddCategoryMapping("historical-fiction", NewznabStandardCategory.AudioAudiobook, "Historical Fiction");
+        caps.Categories.AddCategoryMapping("history", NewznabStandardCategory.AudioAudiobook, "History");
+        caps.Categories.AddCategoryMapping("horror", NewznabStandardCategory.AudioAudiobook, "Horror");
+        caps.Categories.AddCategoryMapping("humor", NewznabStandardCategory.AudioAudiobook, "Humor");
+        caps.Categories.AddCategoryMapping("lecture", NewznabStandardCategory.AudioAudiobook, "Lecture");
+        caps.Categories.AddCategoryMapping("lgbt", NewznabStandardCategory.AudioAudiobook, "LGBT");
+        caps.Categories.AddCategoryMapping("literature", NewznabStandardCategory.AudioAudiobook, "Literature");
+        caps.Categories.AddCategoryMapping("litrpg", NewznabStandardCategory.AudioAudiobook, "LitRPG");
+        caps.Categories.AddCategoryMapping("general-non-fiction", NewznabStandardCategory.AudioAudiobook, "Misc. Non-fiction");
+        caps.Categories.AddCategoryMapping("mystery", NewznabStandardCategory.AudioAudiobook, "Mystery");
+        caps.Categories.AddCategoryMapping("paranormal", NewznabStandardCategory.AudioAudiobook, "Paranormal");
+        caps.Categories.AddCategoryMapping("plays-theater", NewznabStandardCategory.AudioAudiobook, "Plays & Theater");
+        caps.Categories.AddCategoryMapping("poetry", NewznabStandardCategory.AudioAudiobook, "Poetry");
+        caps.Categories.AddCategoryMapping("political", NewznabStandardCategory.AudioAudiobook, "Political");
+        caps.Categories.AddCategoryMapping("radio-productions", NewznabStandardCategory.AudioAudiobook, "Radio Productions");
+        caps.Categories.AddCategoryMapping("romance", NewznabStandardCategory.AudioAudiobook, "Romance");
+        caps.Categories.AddCategoryMapping("sci-fi", NewznabStandardCategory.AudioAudiobook, "Sci-Fi");
+        caps.Categories.AddCategoryMapping("science", NewznabStandardCategory.AudioAudiobook, "Science");
+        caps.Categories.AddCategoryMapping("self-help", NewznabStandardCategory.AudioAudiobook, "Self-help");
+        caps.Categories.AddCategoryMapping("spiritual", NewznabStandardCategory.AudioAudiobook, "Spiritual & Religious");
+        caps.Categories.AddCategoryMapping("sports", NewznabStandardCategory.AudioAudiobook, "Sport & Recreation");
+        caps.Categories.AddCategoryMapping("suspense", NewznabStandardCategory.AudioAudiobook, "Suspense");
+        caps.Categories.AddCategoryMapping("thriller", NewznabStandardCategory.AudioAudiobook, "Thriller");
+        caps.Categories.AddCategoryMapping("true-crime", NewznabStandardCategory.AudioAudiobook, "True Crime");
+        caps.Categories.AddCategoryMapping("tutorial", NewznabStandardCategory.AudioAudiobook, "Tutorial");
+        caps.Categories.AddCategoryMapping("westerns", NewznabStandardCategory.AudioAudiobook, "Westerns");
+        caps.Categories.AddCategoryMapping("zombies", NewznabStandardCategory.AudioAudiobook, "Zombies");
+
+        // Category Modifiers
+        caps.Categories.AddCategoryMapping("anthology", NewznabStandardCategory.AudioAudiobook, "Anthology");
+        caps.Categories.AddCategoryMapping("bestsellers", NewznabStandardCategory.AudioAudiobook, "Bestsellers");
+        caps.Categories.AddCategoryMapping("classic", NewznabStandardCategory.AudioAudiobook, "Classic");
+        caps.Categories.AddCategoryMapping("documentary", NewznabStandardCategory.AudioAudiobook, "Documentary");
+        caps.Categories.AddCategoryMapping("full-cast", NewznabStandardCategory.AudioAudiobook, "Full Cast");
+        caps.Categories.AddCategoryMapping("libertarian", NewznabStandardCategory.AudioAudiobook, "Libertarian");
+        caps.Categories.AddCategoryMapping("military", NewznabStandardCategory.AudioAudiobook, "Military");
+        caps.Categories.AddCategoryMapping("novel", NewznabStandardCategory.AudioAudiobook, "Novel");
+        caps.Categories.AddCategoryMapping("short-story", NewznabStandardCategory.AudioAudiobook, "Short Story");
+
+        return caps;
+    }
+}
+
+public class AudioBookBayRequestGenerator : IIndexerRequestGenerator
+{
+    private readonly NoAuthTorrentBaseSettings _settings;
+    private readonly IndexerCapabilities _capabilities;
+
+    public AudioBookBayRequestGenerator(NoAuthTorrentBaseSettings settings, IndexerCapabilities capabilities)
+    {
+        _settings = settings;
+        _capabilities = capabilities;
+    }
+
+    public IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchCriteria)
+    {
+        return new IndexerPageableRequestChain();
+    }
+
+    public IndexerPageableRequestChain GetSearchRequests(MusicSearchCriteria searchCriteria)
+    {
+        return new IndexerPageableRequestChain();
+    }
+
+    public IndexerPageableRequestChain GetSearchRequests(TvSearchCriteria searchCriteria)
+    {
+        return new IndexerPageableRequestChain();
+    }
+
+    public IndexerPageableRequestChain GetSearchRequests(BookSearchCriteria searchCriteria)
+    {
+        var pageableRequests = new IndexerPageableRequestChain();
+
+        pageableRequests.Add(GetPagedRequests($"{searchCriteria.SanitizedSearchTerm}"));
+
+        return pageableRequests;
+    }
+
+    public IndexerPageableRequestChain GetSearchRequests(BasicSearchCriteria searchCriteria)
+    {
+        var pageableRequests = new IndexerPageableRequestChain();
+
+        pageableRequests.Add(GetPagedRequests($"{searchCriteria.SanitizedSearchTerm}"));
+
+        return pageableRequests;
+    }
+
+    private IEnumerable<IndexerRequest> GetPagedRequests(string term)
+    {
+        var searchUrl = _settings.BaseUrl;
+
+        var parameters = new NameValueCollection();
+
+        term = Regex.Replace(term, @"[\W]+", " ").Trim();
+
+        if (term.IsNotNullOrWhiteSpace())
+        {
+            parameters.Set("s", term);
+            parameters.Set("tt", "1");
+        }
+
+        if (parameters.Count > 0)
+        {
+            searchUrl += $"?{parameters.GetQueryString()}";
+        }
+
+        yield return new IndexerRequest(new UriBuilder(searchUrl) { Path = "/" }.Uri.AbsoluteUri, HttpAccept.Html);
+        yield return new IndexerRequest(new UriBuilder(searchUrl) { Path = "/page/2/" }.Uri.AbsoluteUri, HttpAccept.Html);
+        yield return new IndexerRequest(new UriBuilder(searchUrl) { Path = "/page/3/" }.Uri.AbsoluteUri, HttpAccept.Html);
+    }
+
+    public Func<IDictionary<string, string>> GetCookies { get; set; }
+    public Action<IDictionary<string, string>, DateTime?> CookiesUpdater { get; set; }
+}
+
+public class AudioBookBayParser : IParseIndexerResponse
+{
+    private readonly NoAuthTorrentBaseSettings _settings;
+    private readonly IndexerCapabilitiesCategories _categories;
+
+    public AudioBookBayParser(NoAuthTorrentBaseSettings settings, IndexerCapabilitiesCategories categories)
+    {
+        _settings = settings;
+        _categories = categories;
+    }
+
+    public IList<ReleaseInfo> ParseResponse(IndexerResponse indexerResponse)
+    {
+        var releaseInfos = new List<ReleaseInfo>();
+
+        var doc = ParseHtmlDocument(indexerResponse.Content);
+
+        var rows = doc.QuerySelectorAll("div.post:has(div[class=\"postTitle\"])");
+        foreach (var row in rows)
+        {
+            var infoUrl = _settings.BaseUrl + row.QuerySelector("div.postTitle h2 a")?.GetAttribute("href")?.Trim().TrimStart('/');
+
+            var title = row.QuerySelector("div.postTitle")?.TextContent.Trim();
+
+            var infoString = row.QuerySelector("div.postContent")?.TextContent.Trim() ?? string.Empty;
+
+            var matchFormat = Regex.Match(infoString, @"Format: (.+) \/", RegexOptions.IgnoreCase);
+            if (matchFormat.Groups[1].Success && matchFormat.Groups[1].Value.Length > 0 && matchFormat.Groups[1].Value != "?")
+            {
+                title += $" [{matchFormat.Groups[1].Value.Trim()}]";
+            }
+
+            var matchBitrate = Regex.Match(infoString, @"Bitrate: (.+)File", RegexOptions.IgnoreCase);
+            if (matchBitrate.Groups[1].Success && matchBitrate.Groups[1].Value.Length > 0 && matchBitrate.Groups[1].Value != "?")
+            {
+                title += $" [{matchBitrate.Groups[1].Value.Trim()}]";
+            }
+
+            var matchSize = Regex.Match(infoString, @"File Size: (.+?)s?$", RegexOptions.IgnoreCase);
+            var size = matchSize.Groups[1].Success ? ParseUtil.GetBytes(matchSize.Groups[1].Value) : 0;
+
+            var matchDateAdded = Regex.Match(infoString, @"Posted: (\d{1,2} \D{3} \d{4})", RegexOptions.IgnoreCase);
+            var publishDate = matchDateAdded.Groups[1].Success && DateTime.TryParseExact(matchDateAdded.Groups[1].Value, "d MMM yyyy", CultureInfo.InvariantCulture, DateTimeStyles.AssumeUniversal, out var parsedDate) ? parsedDate : DateTime.Now;
+
+            var postInfo = row.QuerySelector("div.postInfo")?.FirstChild?.TextContent.Trim().Replace("\xA0", ";") ?? string.Empty;
+            var matchCategory = Regex.Match(postInfo, @"Category: (.+)$", RegexOptions.IgnoreCase);
+            var category = matchCategory.Groups[1].Success ? matchCategory.Groups[1].Value.Split(';', StringSplitOptions.TrimEntries | StringSplitOptions.RemoveEmptyEntries).ToList() : new List<string>();
+            var categories = category.SelectMany(_categories.MapTrackerCatDescToNewznab).Distinct().ToList();
+
+            var release = new TorrentInfo
+            {
+                Guid = infoUrl,
+                InfoUrl = infoUrl,
+                DownloadUrl = infoUrl,
+                Title = CleanTitle(title),
+                Categories = categories,
+                Size = size,
+                Seeders = 1,
+                Peers = 1,
+                PublishDate = publishDate,
+                DownloadVolumeFactor = 0,
+                UploadVolumeFactor = 1
+            };
+
+            var cover = row.QuerySelector("img[src]")?.GetAttribute("src")?.Trim();
+            if (!string.IsNullOrEmpty(cover))
+            {
+                release.PosterUrl = cover.StartsWith("http") ? cover : _settings.BaseUrl + cover;
+            }
+
+            releaseInfos.Add(release);
+        }
+
+        return releaseInfos;
+    }
+
+    private static IHtmlDocument ParseHtmlDocument(string response)
+    {
+        var parser = new HtmlParser();
+        var doc = parser.ParseDocument(response);
+
+        var hidden = doc.QuerySelectorAll("div.post.re-ab");
+        foreach (var element in hidden)
+        {
+            var body = doc.CreateElement("div");
+            body.ClassList.Add("post");
+            body.InnerHtml = Encoding.UTF8.GetString(Convert.FromBase64String(element.TextContent));
+            element.Parent.ReplaceChild(body, element);
+        }
+
+        return doc;
+    }
+
+    private static string CleanTitle(string title)
+    {
+        title = Regex.Replace(title, @"[\u0000-\u0008\u000A-\u001F\u0100-\uFFFF]", string.Empty, RegexOptions.Compiled);
+        title = Regex.Replace(title, @"\s+", " ", RegexOptions.Compiled | RegexOptions.IgnoreCase);
+
+        return title.Trim();
+    }
+
+    public Action<IDictionary<string, string>, DateTime?> CookiesUpdater { get; set; }
+}
@@ -1,6 +1,5 @@
 using System.Collections.Generic;
 using NLog;
-using NzbDrone.Common.Http;
 using NzbDrone.Core.Configuration;
 using NzbDrone.Core.Indexers.Definitions.Avistaz;
 using NzbDrone.Core.Messaging.Events;
@@ -10,18 +9,23 @@ namespace NzbDrone.Core.Indexers.Definitions
    public class AvistaZ : AvistazBase
    {
        public override string Name => "AvistaZ";
-        public override string[] IndexerUrls => new string[] { "https://avistaz.to/" };
+        public override string[] IndexerUrls => new[] { "https://avistaz.to/" };
        public override string Description => "Aka AsiaTorrents";
        public override IndexerPrivacy Privacy => IndexerPrivacy.Private;

-        public AvistaZ(IIndexerRepository indexerRepository, IIndexerHttpClient httpClient, IEventAggregator eventAggregator, IIndexerStatusService indexerStatusService, IConfigService configService, Logger logger)
+        public AvistaZ(IIndexerRepository indexerRepository,
+                       IIndexerHttpClient httpClient,
+                       IEventAggregator eventAggregator,
+                       IIndexerStatusService indexerStatusService,
+                       IConfigService configService,
+                       Logger logger)
            : base(indexerRepository, httpClient, eventAggregator, indexerStatusService, configService, logger)
        {
        }

        public override IIndexerRequestGenerator GetRequestGenerator()
        {
-            return new AvistazRequestGenerator()
+            return new AvistazRequestGenerator
            {
                Settings = Settings,
                HttpClient = _httpClient,
@@ -30,6 +34,11 @@ namespace NzbDrone.Core.Indexers.Definitions
            };
        }

+        public override IParseIndexerResponse GetParser()
+        {
+            return new AvistaZParser();
+        }
+
        protected override IndexerCapabilities SetCapabilities()
        {
            var caps = new IndexerCapabilities
@@ -52,9 +61,13 @@ namespace NzbDrone.Core.Indexers.Definitions
            caps.Categories.AddCategoryMapping(2, NewznabStandardCategory.TVUHD);
            caps.Categories.AddCategoryMapping(2, NewznabStandardCategory.TVHD);
            caps.Categories.AddCategoryMapping(2, NewznabStandardCategory.TVSD);
-            caps.Categories.AddCategoryMapping(3, NewznabStandardCategory.Audio);

            return caps;
        }
    }
+
+    public class AvistaZParser : AvistazParserBase
+    {
+        protected override string TimezoneOffset => "+01:00";
+    }
 }
@@ -1,4 +1,3 @@
-using System;
 using System.Collections.Generic;
 using Newtonsoft.Json;

@@ -13,12 +13,11 @@ namespace NzbDrone.Core.Indexers.Definitions.Avistaz
    public abstract class AvistazBase : TorrentIndexerBase<AvistazSettings>
    {
        public override DownloadProtocol Protocol => DownloadProtocol.Torrent;
-        public override string[] IndexerUrls => new string[] { "" };
-        protected virtual string LoginUrl => Settings.BaseUrl + "api/v1/jackett/auth";
        public override bool SupportsRss => true;
        public override bool SupportsSearch => true;
        public override int PageSize => 50;
        public override IndexerCapabilities Capabilities => SetCapabilities();
+        protected virtual string LoginUrl => Settings.BaseUrl + "api/v1/jackett/auth";
        private IIndexerRepository _indexerRepository;

        public AvistazBase(IIndexerRepository indexerRepository,
@@ -34,7 +33,7 @@ namespace NzbDrone.Core.Indexers.Definitions.Avistaz

        public override IIndexerRequestGenerator GetRequestGenerator()
        {
-            return new AvistazRequestGenerator()
+            return new AvistazRequestGenerator
            {
                Settings = Settings,
                HttpClient = _httpClient,
@@ -45,14 +44,12 @@ namespace NzbDrone.Core.Indexers.Definitions.Avistaz

        public override IParseIndexerResponse GetParser()
        {
-            return new AvistazParser();
+            return new AvistazParserBase();
        }

        protected virtual IndexerCapabilities SetCapabilities()
        {
-            var caps = new IndexerCapabilities();
-
-            return caps;
+            return new IndexerCapabilities();
        }

        protected override async Task DoLogin()
@@ -69,12 +66,7 @@ namespace NzbDrone.Core.Indexers.Definitions.Avistaz

        protected override bool CheckIfLoginNeeded(HttpResponse response)
        {
-            if (response.StatusCode == HttpStatusCode.Unauthorized || response.StatusCode == HttpStatusCode.PreconditionFailed)
-            {
-                return true;
-            }
-
-            return false;
+            return response.StatusCode == HttpStatusCode.Unauthorized || response.StatusCode == HttpStatusCode.PreconditionFailed;
        }

        protected override void ModifyRequest(IndexerRequest request)
@@ -102,14 +94,14 @@ namespace NzbDrone.Core.Indexers.Definitions.Avistaz
                {
                    _logger.Warn(ex, "Unable to connect to indexer");

-                    return new ValidationFailure(string.Empty, "Unable to connect to indexer, check the log for more details");
+                    return new ValidationFailure(string.Empty, "Unable to connect to indexer, check the log above the ValidationFailure for more details. " + ex.Message);
                }
            }
            catch (Exception ex)
            {
                _logger.Warn(ex, "Unable to connect to indexer");

-                return new ValidationFailure(string.Empty, "Unable to connect to indexer, check the log for more details");
+                return new ValidationFailure(string.Empty, "Unable to connect to indexer, check the log above the ValidationFailure for more details");
            }

            return null;
@@ -119,12 +111,10 @@ namespace NzbDrone.Core.Indexers.Definitions.Avistaz
        {
            var requestBuilder = new HttpRequestBuilder(LoginUrl)
            {
-                LogResponseContent = true
+                LogResponseContent = true,
+                Method = HttpMethod.Post
            };

-            requestBuilder.Method = HttpMethod.Post;
-            requestBuilder.PostProcess += r => r.RequestTimeout = TimeSpan.FromSeconds(15);
-
            var authLoginRequest = requestBuilder
                .AddFormParameter("username", Settings.Username)
                .AddFormParameter("password", Settings.Password)
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Globalization;
 using System.Linq;
 using System.Net;
 using NzbDrone.Common.Extensions;
@@ -10,13 +11,10 @@ using NzbDrone.Core.Parser.Model;

 namespace NzbDrone.Core.Indexers.Definitions.Avistaz
 {
-    public class AvistazParser : IParseIndexerResponse
+    public class AvistazParserBase : IParseIndexerResponse
    {
-        private readonly HashSet<string> _hdResolutions = new HashSet<string> { "1080p", "1080i", "720p" };
-
-        public AvistazParser()
-        {
-        }
+        protected virtual string TimezoneOffset => "-05:00"; // Avistaz does not specify a timezone & returns server time
+        private readonly HashSet<string> _hdResolutions = new () { "1080p", "1080i", "720p" };

        public Action<IDictionary<string, string>, DateTime?> CookiesUpdater { get; set; }

@@ -61,7 +59,7 @@ namespace NzbDrone.Core.Indexers.Definitions.Avistaz
                    InfoUrl = details,
                    Guid = details,
                    Categories = cats,
-                    PublishDate = DateTime.Parse(row.CreatedAt + "-05:00").ToUniversalTime(), // Avistaz does not specify a timezone & returns server time
+                    PublishDate = DateTime.Parse($"{row.CreatedAt} {TimezoneOffset}", CultureInfo.InvariantCulture, DateTimeStyles.AdjustToUniversal),
                    Size = row.FileSize,
                    Files = row.FileCount,
                    Grabs = row.Completed,
@@ -12,17 +12,12 @@ namespace NzbDrone.Core.Indexers.Definitions.Avistaz
    public class AvistazRequestGenerator : IIndexerRequestGenerator
    {
        public AvistazSettings Settings { get; set; }
-
-        public IDictionary<string, string> AuthCookieCache { get; set; }
        public IIndexerHttpClient HttpClient { get; set; }
        public IndexerCapabilities Capabilities { get; set; }
        public Logger Logger { get; set; }
-
-        protected virtual string SearchUrl => Settings.BaseUrl + "api/v1/jackett/torrents";
-        protected virtual bool ImdbInTags => false;
-
        public Func<IDictionary<string, string>> GetCookies { get; set; }
        public Action<IDictionary<string, string>, DateTime?> CookiesUpdater { get; set; }
+        protected virtual string SearchUrl => Settings.BaseUrl + "api/v1/jackett/torrents";

        // hook to adjust the search category
        protected virtual List<KeyValuePair<string, string>> GetBasicSearchParameters(int[] categories, string genre)
@@ -45,7 +40,8 @@ namespace NzbDrone.Core.Indexers.Definitions.Avistaz
            }

            // resolution filter to improve the search
-            if (!categories.Contains(NewznabStandardCategory.Movies.Id) && !categories.Contains(NewznabStandardCategory.TV.Id) &&
+            if (!categories.Contains(NewznabStandardCategory.Movies.Id) &&
+                !categories.Contains(NewznabStandardCategory.TV.Id) &&
                !categories.Contains(NewznabStandardCategory.Audio.Id))
            {
                if (categories.Contains(NewznabStandardCategory.MoviesUHD.Id) || categories.Contains(NewznabStandardCategory.TVUHD.Id))
@@ -5,7 +5,7 @@ using NzbDrone.Core.Validation;

 namespace NzbDrone.Core.Indexers.Definitions.Avistaz
 {
-    public class AvistazSettingsValidator : AbstractValidator<AvistazSettings>
+    public class AvistazSettingsValidator : NoAuthSettingsValidator<AvistazSettings>
    {
        public AvistazSettingsValidator()
        {
@@ -17,7 +17,7 @@ namespace NzbDrone.Core.Indexers.Definitions.Avistaz

    public class AvistazSettings : NoAuthTorrentBaseSettings
    {
-        private static readonly AvistazSettingsValidator Validator = new AvistazSettingsValidator();
+        private static readonly AvistazSettingsValidator Validator = new ();

        public AvistazSettings()
        {
@@ -33,7 +33,7 @@ namespace NzbDrone.Core.Indexers.Definitions.Avistaz
        [FieldDefinition(3, Label = "Password", HelpText = "Site Password", Privacy = PrivacyLevel.Password, Type = FieldType.Password)]
        public string Password { get; set; }

-        [FieldDefinition(4, Label = "PID", HelpText = "PID from My Account or My Profile page")]
+        [FieldDefinition(4, Label = "PID", HelpText = "PID from My Account or My Profile page", Privacy = PrivacyLevel.Password, Type = FieldType.Password)]
        public string Pid { get; set; }

        [FieldDefinition(5, Label = "Freeleech Only", Type = FieldType.Checkbox, HelpText = "Search freeleech only")]
@@ -7,10 +7,8 @@ using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using AngleSharp.Dom;
 using AngleSharp.Html.Parser;
-using FluentValidation;
 using NLog;
 using NzbDrone.Common.Http;
-using NzbDrone.Core.Annotations;
 using NzbDrone.Core.Configuration;
 using NzbDrone.Core.Indexers.Exceptions;
 using NzbDrone.Core.Indexers.Settings;
@@ -18,14 +16,13 @@ using NzbDrone.Core.IndexerSearch.Definitions;
 using NzbDrone.Core.Messaging.Events;
 using NzbDrone.Core.Parser;
 using NzbDrone.Core.Parser.Model;
-using NzbDrone.Core.Validation;

 namespace NzbDrone.Core.Indexers.Definitions
 {
    public class BB : TorrentIndexerBase<UserPassTorrentBaseSettings>
    {
        public override string Name => "BB";
-        public override string[] IndexerUrls => new string[] { StringUtil.FromBase64("aHR0cHM6Ly9iYWNvbmJpdHMub3JnLw==") };
+        public override string[] IndexerUrls => new[] { StringUtil.FromBase64("aHR0cHM6Ly9iYWNvbmJpdHMub3JnLw==") };
        private string LoginUrl => Settings.BaseUrl + "login.php";
        public override string Description => "BB is a Private Torrent Tracker for 0DAY / GENERAL";
        public override string Language => "en-US";
@@ -41,7 +38,7 @@ namespace NzbDrone.Core.Indexers.Definitions

        public override IIndexerRequestGenerator GetRequestGenerator()
        {
-            return new BBRequestGenerator() { Settings = Settings, Capabilities = Capabilities };
+            return new BBRequestGenerator { Settings = Settings, Capabilities = Capabilities };
        }

        public override IParseIndexerResponse GetParser()
@@ -54,30 +51,22 @@ namespace NzbDrone.Core.Indexers.Definitions
            var requestBuilder = new HttpRequestBuilder(LoginUrl)
            {
                LogResponseContent = true,
-                AllowAutoRedirect = true
+                AllowAutoRedirect = true,
+                Method = HttpMethod.Post
            };

-            requestBuilder.Method = HttpMethod.Post;
-            requestBuilder.PostProcess += r => r.RequestTimeout = TimeSpan.FromSeconds(15);
-
            var cookies = Cookies;
-
            Cookies = null;
+
            var authLoginRequest = requestBuilder
                .AddFormParameter("username", Settings.Username)
                .AddFormParameter("password", Settings.Password)
                .AddFormParameter("keeplogged", "1")
                .AddFormParameter("login", "Log+In!")
-                .SetHeader("Content-Type", "multipart/form-data")
+                .SetHeader("Content-Type", "application/x-www-form-urlencoded")
+                .SetHeader("Referer", LoginUrl)
                .Build();

-            var headers = new NameValueCollection
-            {
-                { "Referer", LoginUrl }
-            };
-
-            authLoginRequest.Headers.Add(headers);
-
            var response = await ExecuteAuth(authLoginRequest);

            if (CheckIfLoginNeeded(response))
@@ -98,19 +87,14 @@ namespace NzbDrone.Core.Indexers.Definitions
            }

            cookies = response.GetCookies();
-            UpdateCookies(cookies, DateTime.Now + TimeSpan.FromDays(30));
+            UpdateCookies(cookies, DateTime.Now.AddDays(30));

            _logger.Debug("BB authentication succeeded.");
        }

        protected override bool CheckIfLoginNeeded(HttpResponse httpResponse)
        {
-            if (!httpResponse.Content.Contains("logout.php"))
-            {
-                return true;
-            }
-
-            return false;
+            return !httpResponse.Content.Contains("logout.php");
        }

        private IndexerCapabilities SetCapabilities()
@@ -163,10 +147,6 @@ namespace NzbDrone.Core.Indexers.Definitions
        public UserPassTorrentBaseSettings Settings { get; set; }
        public IndexerCapabilities Capabilities { get; set; }

-        public BBRequestGenerator()
-        {
-        }
-
        private IEnumerable<IndexerRequest> GetPagedRequests(string term, int[] categories)
        {
            var searchUrl = string.Format("{0}/torrents.php", Settings.BaseUrl.TrimEnd('/'));
@@ -8,7 +8,6 @@ using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using AngleSharp.Dom;
 using AngleSharp.Html.Parser;
-using FluentValidation;
 using NLog;
 using NzbDrone.Common.Http;
 using NzbDrone.Core.Annotations;
@@ -19,7 +18,6 @@ using NzbDrone.Core.IndexerSearch.Definitions;
 using NzbDrone.Core.Messaging.Events;
 using NzbDrone.Core.Parser;
 using NzbDrone.Core.Parser.Model;
-using NzbDrone.Core.Validation;

 namespace NzbDrone.Core.Indexers.Definitions
 {
@@ -27,7 +25,7 @@ namespace NzbDrone.Core.Indexers.Definitions
    {
        public override string Name => "BakaBT";

-        public override string[] IndexerUrls => new string[] { "https://bakabt.me/" };
+        public override string[] IndexerUrls => new[] { "https://bakabt.me/" };
        public override string Description => "Anime Community";
        private string LoginUrl => Settings.BaseUrl + "login.php";
        public override DownloadProtocol Protocol => DownloadProtocol.Torrent;
@@ -41,7 +39,7 @@ namespace NzbDrone.Core.Indexers.Definitions

        public override IIndexerRequestGenerator GetRequestGenerator()
        {
-            return new BakaBTRequestGenerator() { Settings = Settings, Capabilities = Capabilities };
+            return new BakaBTRequestGenerator { Settings = Settings, Capabilities = Capabilities };
        }

        public override IParseIndexerResponse GetParser()
@@ -59,7 +57,7 @@ namespace NzbDrone.Core.Indexers.Definitions

            var parser = new HtmlParser();
            var dom = parser.ParseDocument(response.Content);
-            var downloadLink = dom.QuerySelectorAll(".download_link").First().GetAttribute("href");
+            var downloadLink = dom.QuerySelector(".download_link")?.GetAttribute("href");

            if (string.IsNullOrWhiteSpace(downloadLink))
            {
@@ -76,19 +74,12 @@ namespace NzbDrone.Core.Indexers.Definitions
            var requestBuilder = new HttpRequestBuilder(LoginUrl)
            {
                LogResponseContent = true,
-                AllowAutoRedirect = true
+                AllowAutoRedirect = true,
+                Method = HttpMethod.Post
            };

            var loginPage = await ExecuteAuth(new HttpRequest(LoginUrl));

-            requestBuilder.Method = HttpMethod.Post;
-            requestBuilder.PostProcess += r => r.RequestTimeout = TimeSpan.FromSeconds(15);
-            requestBuilder.SetCookies(loginPage.GetCookies());
-
-            requestBuilder.AddFormParameter("username", Settings.Username);
-            requestBuilder.AddFormParameter("password", Settings.Password);
-            requestBuilder.AddFormParameter("returnto", "/index.php");
-
            var parser = new HtmlParser();
            var dom = parser.ParseDocument(loginPage.Content);
            var loginKey = dom.QuerySelector("input[name=\"loginKey\"]");
@@ -98,14 +89,18 @@ namespace NzbDrone.Core.Indexers.Definitions
            }

            var authLoginRequest = requestBuilder
-                .SetHeader("Content-Type", "multipart/form-data")
+                .SetCookies(loginPage.GetCookies())
+                .AddFormParameter("username", Settings.Username)
+                .AddFormParameter("password", Settings.Password)
+                .AddFormParameter("returnto", "/index.php")
+                .SetHeader("Content-Type", "application/x-www-form-urlencoded")
                .Build();

            var response = await ExecuteAuth(authLoginRequest);

            if (response.Content != null && response.Content.Contains("<a href=\"logout.php\">Logout</a>"))
            {
-                UpdateCookies(response.GetCookies(), DateTime.Now + TimeSpan.FromDays(30));
+                UpdateCookies(response.GetCookies(), DateTime.Now.AddDays(30));

                _logger.Debug("BakaBT authentication succeeded");
            }
@@ -117,12 +112,7 @@ namespace NzbDrone.Core.Indexers.Definitions

        protected override bool CheckIfLoginNeeded(HttpResponse httpResponse)
        {
-            if (!httpResponse.Content.Contains("<a href=\"logout.php\">Logout</a>"))
-            {
-                return true;
-            }
-
-            return false;
+            return !httpResponse.Content.Contains("<a href=\"logout.php\">Logout</a>");
        }

        private IndexerCapabilities SetCapabilities()
@@ -166,10 +156,6 @@ namespace NzbDrone.Core.Indexers.Definitions
        public BakaBTSettings Settings { get; set; }
        public IndexerCapabilities Capabilities { get; set; }

-        public BakaBTRequestGenerator()
-        {
-        }
-
        private IEnumerable<IndexerRequest> GetPagedRequests(string term)
        {
            var searchString = term;
@@ -245,7 +231,7 @@ namespace NzbDrone.Core.Indexers.Definitions
    {
        private readonly BakaBTSettings _settings;
        private readonly IndexerCapabilitiesCategories _categories;
-        private readonly List<IndexerCategory> _defaultCategories = new List<IndexerCategory> { NewznabStandardCategory.TVAnime };
+        private readonly List<IndexerCategory> _defaultCategories = new () { NewznabStandardCategory.TVAnime };

        public BakaBTParser(BakaBTSettings settings, IndexerCapabilitiesCategories categories)
        {
@@ -295,7 +281,7 @@ namespace NzbDrone.Core.Indexers.Definitions
                var stringSeparator = new[] { " | " };
                var titles = titleSeries.Split(stringSeparator, StringSplitOptions.RemoveEmptyEntries);

-                if (titles.Count() > 1 && !_settings.AddRomajiTitle)
+                if (titles.Length > 1 && !_settings.AddRomajiTitle)
                {
                    titles = titles.Skip(1).ToArray();
                }
@@ -307,7 +293,7 @@ namespace NzbDrone.Core.Indexers.Definitions
                    release.Title = (name + releaseInfo).Trim();

                    // Ensure the season is defined as this tracker only deals with full seasons
-                    if (release.Title.IndexOf("Season") == -1 && _settings.AppendSeason)
+                    if (!release.Title.Contains("Season", StringComparison.CurrentCulture) && _settings.AppendSeason)
                    {
                        // Insert before the release info
                        var aidx = release.Title.IndexOf('(');
@@ -415,10 +401,6 @@ namespace NzbDrone.Core.Indexers.Definitions

    public class BakaBTSettings : UserPassTorrentBaseSettings
    {
-        public BakaBTSettings()
-        {
-        }
-
        [FieldDefinition(4, Label = "Add Romaji Title", Type = FieldType.Checkbox, HelpText = "Add releases for Romaji Title")]
        public bool AddRomajiTitle { get; set; }

@@ -223,7 +223,7 @@ namespace NzbDrone.Core.Indexers.Definitions
                    InfoUrl = details,
                    Guid = details,
                    Categories = _categories.MapTrackerCatDescToNewznab(row.Category),
-                    PublishDate = DateTime.Parse(row.CreatedAt, CultureInfo.InvariantCulture),
+                    PublishDate = DateTime.Parse(row.CreatedAt, CultureInfo.InvariantCulture, DateTimeStyles.AssumeUniversal),
                    Size = row.Size,
                    Grabs = row.Grabs,
                    Seeders = row.Seeders,
@@ -246,7 +246,7 @@ namespace NzbDrone.Core.Indexers.Definitions
        public Action<IDictionary<string, string>, DateTime?> CookiesUpdater { get; set; }
    }

-    public class BeyondHDSettingsValidator : AbstractValidator<BeyondHDSettings>
+    public class BeyondHDSettingsValidator : NoAuthSettingsValidator<BeyondHDSettings>
    {
        public BeyondHDSettingsValidator()
        {
@@ -257,7 +257,7 @@ namespace NzbDrone.Core.Indexers.Definitions

    public class BeyondHDSettings : NoAuthTorrentBaseSettings
    {
-        private static readonly BeyondHDSettingsValidator Validator = new BeyondHDSettingsValidator();
+        private static readonly BeyondHDSettingsValidator Validator = new ();

        public BeyondHDSettings()
        {
@@ -219,7 +219,7 @@ namespace NzbDrone.Core.Indexers.Definitions
        public string BaseUrl { get; set; }

        [FieldDefinition(2)]
-        public IndexerBaseSettings BaseSettings { get; set; } = new IndexerBaseSettings();
+        public IndexerBaseSettings BaseSettings { get; set; } = new ();

        public NzbDroneValidationResult Validate()
        {
@@ -5,7 +5,7 @@ using NzbDrone.Core.Validation;

 namespace NzbDrone.Core.Indexers.BroadcastheNet
 {
-    public class BroadcastheNetSettingsValidator : AbstractValidator<BroadcastheNetSettings>
+    public class BroadcastheNetSettingsValidator : NoAuthSettingsValidator<BroadcastheNetSettings>
    {
        public BroadcastheNetSettingsValidator()
        {
@@ -15,11 +15,7 @@ namespace NzbDrone.Core.Indexers.BroadcastheNet

    public class BroadcastheNetSettings : NoAuthTorrentBaseSettings
    {
-        private static readonly BroadcastheNetSettingsValidator Validator = new BroadcastheNetSettingsValidator();
-
-        public BroadcastheNetSettings()
-        {
-        }
+        private static readonly BroadcastheNetSettingsValidator Validator = new ();

        [FieldDefinition(2, Label = "API Key", Privacy = PrivacyLevel.ApiKey)]
        public string ApiKey { get; set; }
@@ -1,27 +1,29 @@
 using NLog;
-using NzbDrone.Common.Http;
 using NzbDrone.Core.Configuration;
+using NzbDrone.Core.Indexers.Definitions.Gazelle;
 using NzbDrone.Core.Messaging.Events;

-namespace NzbDrone.Core.Indexers.Definitions
+namespace NzbDrone.Core.Indexers.Definitions;
+
+public class BrokenStones : GazelleBase<GazelleSettings>
 {
-    public class BrokenStones : Gazelle.Gazelle
-    {
    public override string Name => "BrokenStones";
-        public override string[] IndexerUrls => new string[] { "https://brokenstones.club/" };
+    public override string[] IndexerUrls => new[] { "https://brokenstones.club/" };
    public override string Description => "Broken Stones is a Private site for MacOS and iOS APPS / GAMES";
    public override IndexerPrivacy Privacy => IndexerPrivacy.Private;

-        public BrokenStones(IIndexerHttpClient httpClient, IEventAggregator eventAggregator, IIndexerStatusService indexerStatusService, IConfigService configService, Logger logger)
+    public BrokenStones(IIndexerHttpClient httpClient,
+                        IEventAggregator eventAggregator,
+                        IIndexerStatusService indexerStatusService,
+                        IConfigService configService,
+                        Logger logger)
        : base(httpClient, eventAggregator, indexerStatusService, configService, logger)
    {
    }

    protected override IndexerCapabilities SetCapabilities()
    {
-            var caps = new IndexerCapabilities
-            {
-            };
+        var caps = new IndexerCapabilities();

        caps.Categories.AddCategoryMapping(1, NewznabStandardCategory.PCMac, "MacOS Apps");
        caps.Categories.AddCategoryMapping(2, NewznabStandardCategory.PCMac, "MacOS Games");
@@ -34,5 +36,4 @@ namespace NzbDrone.Core.Indexers.Definitions

        return caps;
    }
-    }
 }
@@ -1,27 +1,29 @@
 using NLog;
-using NzbDrone.Common.Http;
 using NzbDrone.Core.Configuration;
+using NzbDrone.Core.Indexers.Definitions.Gazelle;
 using NzbDrone.Core.Messaging.Events;

-namespace NzbDrone.Core.Indexers.Definitions
+namespace NzbDrone.Core.Indexers.Definitions;
+
+public class CGPeers : GazelleBase<GazelleSettings>
 {
-    public class CGPeers : Gazelle.Gazelle
-    {
    public override string Name => "CGPeers";
-        public override string[] IndexerUrls => new string[] { "https://cgpeers.to/" };
+    public override string[] IndexerUrls => new[] { "https://cgpeers.to/" };
    public override string Description => "CGPeers is a Private Torrent Tracker for GRAPHICS SOFTWARE / TUTORIALS / ETC";
    public override IndexerPrivacy Privacy => IndexerPrivacy.Private;

-        public CGPeers(IIndexerHttpClient httpClient, IEventAggregator eventAggregator, IIndexerStatusService indexerStatusService, IConfigService configService, Logger logger)
+    public CGPeers(IIndexerHttpClient httpClient,
+                   IEventAggregator eventAggregator,
+                   IIndexerStatusService indexerStatusService,
+                   IConfigService configService,
+                   Logger logger)
        : base(httpClient, eventAggregator, indexerStatusService, configService, logger)
    {
    }

    protected override IndexerCapabilities SetCapabilities()
    {
-            var caps = new IndexerCapabilities
-            {
-            };
+        var caps = new IndexerCapabilities();

        caps.Categories.AddCategoryMapping(1, NewznabStandardCategory.PCISO, "Full Applications");
        caps.Categories.AddCategoryMapping(2, NewznabStandardCategory.PC0day, "Plugins");
@@ -33,5 +35,4 @@ namespace NzbDrone.Core.Indexers.Definitions

        return caps;
    }
-    }
 }
@@ -1,15 +1,12 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Net;
-using System.Text;
 using System.Threading.Tasks;
 using FluentValidation.Results;
 using NLog;
 using NzbDrone.Common.Cache;
 using NzbDrone.Common.Http;
 using NzbDrone.Core.Configuration;
-using NzbDrone.Core.Exceptions;
 using NzbDrone.Core.IndexerVersions;
 using NzbDrone.Core.Messaging.Events;
 using NzbDrone.Core.ThingiProvider;
@@ -30,15 +27,31 @@ namespace NzbDrone.Core.Indexers.Cardigann
        public override IndexerPrivacy Privacy => IndexerPrivacy.Private;

        // Page size is different per indexer, setting to 1 ensures we don't break out of paging logic
-        // thinking its a partial page and insteaad all search_path requests are run for each indexer
+        // thinking its a partial page and instead all search_path requests are run for each indexer
        public override int PageSize => 1;

+        public override TimeSpan RateLimit
+        {
+            get
+            {
+                var definition = _definitionService.GetCachedDefinition(Settings.DefinitionFile);
+
+                if (definition.RequestDelay.HasValue && definition.RequestDelay.Value > base.RateLimit.TotalSeconds)
+                {
+                    return TimeSpan.FromSeconds(definition.RequestDelay.Value);
+                }
+
+                return base.RateLimit;
+            }
+        }
+
        public override IIndexerRequestGenerator GetRequestGenerator()
        {
            var generator = _generatorCache.Get(Settings.DefinitionFile, () =>
                new CardigannRequestGenerator(_configService,
                    _definitionService.GetCachedDefinition(Settings.DefinitionFile),
-                    _logger)
+                    _logger,
+                    RateLimit)
                {
                    HttpClient = _httpClient,
                    Definition = Definition,
@@ -165,60 +178,15 @@ namespace NzbDrone.Core.Indexers.Cardigann
            await generator.DoLogin();
        }

-        public override async Task<byte[]> Download(Uri link)
+        protected override async Task<HttpRequest> GetDownloadRequest(Uri link)
        {
            var generator = (CardigannRequestGenerator)GetRequestGenerator();

            var request = await generator.DownloadRequest(link);

-            if (request.Url.Scheme == "magnet")
-            {
-                ValidateMagnet(request.Url.FullUri);
-                return Encoding.UTF8.GetBytes(request.Url.FullUri);
-            }
-
            request.AllowAutoRedirect = true;

-            var downloadBytes = Array.Empty<byte>();
-
-            try
-            {
-                var response = await _httpClient.ExecuteProxiedAsync(request, Definition);
-                downloadBytes = response.ResponseData;
-            }
-            catch (HttpException ex)
-            {
-                if (ex.Response.StatusCode == HttpStatusCode.NotFound)
-                {
-                    _logger.Error(ex, "Downloading torrent file for release failed since it no longer exists ({0})", request.Url.FullUri);
-                    throw new ReleaseUnavailableException("Downloading torrent failed", ex);
-                }
-
-                if (ex.Response.StatusCode == HttpStatusCode.TooManyRequests)
-                {
-                    _logger.Error("API Grab Limit reached for {0}", request.Url.FullUri);
-                }
-                else
-                {
-                    _logger.Error(ex, "Downloading torrent file for release failed ({0})", request.Url.FullUri);
-                }
-
-                throw new ReleaseDownloadException("Downloading torrent failed", ex);
-            }
-            catch (WebException ex)
-            {
-                _logger.Error(ex, "Downloading torrent file for release failed ({0})", request.Url.FullUri);
-
-                throw new ReleaseDownloadException("Downloading torrent failed", ex);
-            }
-            catch (Exception)
-            {
-                _indexerStatusService.RecordFailure(Definition.Id);
-                _logger.Error("Downloading torrent failed");
-                throw;
-            }
-
-            return downloadBytes;
+            return request;
        }

        protected override async Task Test(List<ValidationFailure> failures)
@@ -2,7 +2,7 @@ using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
-using System.Security.Cryptography;
+using System.Net;
 using System.Text;
 using System.Text.RegularExpressions;
 using AngleSharp.Dom;
@@ -300,7 +300,12 @@ namespace NzbDrone.Core.Indexers.Cardigann
                }
                else if (setting.Type == "checkbox")
                {
-                    variables[name] = ((bool)value) ? ".True" : null;
+                    if (value is string stringValue && bool.TryParse(stringValue, out var result))
+                    {
+                        value = result;
+                    }
+
+                    variables[name] = (bool)value ? ".True" : null;
                }
                else if (setting.Type == "select")
                {
@@ -328,12 +333,12 @@ namespace NzbDrone.Core.Indexers.Cardigann
                }
                else
                {
-                    throw new NotSupportedException();
+                    throw new NotSupportedException($"Type {setting.Type} is not supported.");
                }

-                if (setting.Type != "password" && setting.Name != "apikey" && setting.Name != "rsskey" && indexerLogging)
+                if (setting.Type != "password" && setting.Name != "apikey" && setting.Name != "rsskey" && indexerLogging && variables.ContainsKey(name))
                {
-                    _logger.Debug($"Setting {setting.Name} to {variables[name]}");
+                    _logger.Debug($"Setting {setting.Name} to {variables[name].ToJson()}");
                }
            }

@@ -680,6 +685,12 @@ namespace NzbDrone.Core.Indexers.Cardigann
                    case "urlencode":
                        data = data.UrlEncode(_encoding);
                        break;
+                    case "htmldecode":
+                        data = WebUtility.HtmlDecode(data);
+                        break;
+                    case "htmlencode":
+                        data = WebUtility.HtmlEncode(data);
+                        break;
                    case "timeago":
                    case "reltime":
                        data = DateTimeUtil.FromTimeAgo(data).ToString(DateTimeUtil.Rfc1123ZPattern);
@@ -41,9 +41,10 @@ namespace NzbDrone.Core.Indexers.Cardigann
        public string Type { get; set; }
        public string Language { get; set; }
        public string Encoding { get; set; }
+        public double? RequestDelay { get; set; }
        public List<string> Links { get; set; }
        public List<string> Legacylinks { get; set; }
-        public bool Followredirect { get; set; } = false;
+        public bool Followredirect { get; set; }
        public bool TestLinkTorrent { get; set; } = true;
        public List<string> Certificates { get; set; }
        public CapabilitiesBlock Caps { get; set; }
@@ -94,7 +95,7 @@ namespace NzbDrone.Core.Indexers.Cardigann
        public List<string> Cookies { get; set; }
        public string Method { get; set; }
        public string Form { get; set; }
-        public bool Selectors { get; set; } = false;
+        public bool Selectors { get; set; }
        public Dictionary<string, string> Inputs { get; set; }
        public Dictionary<string, SelectorBlock> Selectorinputs { get; set; }
        public Dictionary<string, SelectorBlock> Getselectorinputs { get; set; }
@@ -113,7 +114,7 @@ namespace NzbDrone.Core.Indexers.Cardigann
    public class SelectorBlock
    {
        public string Selector { get; set; }
-        public bool Optional { get; set; } = false;
+        public bool Optional { get; set; }
        public string Text { get; set; }
        public string Attribute { get; set; }
        public string Remove { get; set; }
@@ -156,7 +157,7 @@ namespace NzbDrone.Core.Indexers.Cardigann
        public int After { get; set; }
        public SelectorBlock Dateheaders { get; set; }
        public SelectorBlock Count { get; set; }
-        public bool Multiple { get; set; } = false;
+        public bool Multiple { get; set; }
    }

    public class SearchPathBlock : RequestBlock
@@ -40,14 +40,18 @@ namespace NzbDrone.Core.Indexers.Cardigann

            if (indexerResponse.HttpResponse.StatusCode != HttpStatusCode.OK)
            {
-                // Remove cookie cache
-                if (indexerResponse.HttpResponse.HasHttpRedirect && indexerResponse.HttpResponse.RedirectUrl
-                        .ContainsIgnoreCase("login.php"))
+                if (indexerResponse.HttpResponse.HasHttpRedirect)
                {
+                    if (indexerResponse.HttpResponse.RedirectUrl.ContainsIgnoreCase("login.php"))
+                    {
+                        // Remove cookie cache
                        CookiesUpdater(null, null);
                        throw new IndexerException(indexerResponse, "We are being redirected to the login page. Most likely your session expired or was killed. Recheck your cookie or credentials and try testing the indexer.");
                    }

+                    throw new IndexerException(indexerResponse, $"Redirected to {indexerResponse.HttpResponse.RedirectUrl} from API request");
+                }
+
                throw new IndexerException(indexerResponse, $"Unexpected response status {indexerResponse.HttpResponse.StatusCode} code from API request");
            }

@@ -62,7 +66,7 @@ namespace NzbDrone.Core.Indexers.Cardigann
            {
                if (request.SearchPath.Response != null &&
                    request.SearchPath.Response.NoResultsMessage != null &&
-                    ((request.SearchPath.Response.NoResultsMessage != string.Empty && results.Contains(request.SearchPath.Response.NoResultsMessage)) || (request.SearchPath.Response.NoResultsMessage == string.Empty && results == string.Empty)))
+                    ((request.SearchPath.Response.NoResultsMessage.IsNotNullOrWhiteSpace() && results.Contains(request.SearchPath.Response.NoResultsMessage)) || (request.SearchPath.Response.NoResultsMessage.IsNullOrWhiteSpace() && results.IsNullOrWhiteSpace())))
                {
                    return releases;
                }
@@ -4,7 +4,6 @@ using System.Collections.Specialized;
 using System.Linq;
 using System.Net;
 using System.Net.Http;
-using System.Text;
 using System.Threading.Tasks;
 using AngleSharp.Html.Dom;
 using AngleSharp.Html.Parser;
@@ -29,11 +28,15 @@ namespace NzbDrone.Core.Indexers.Cardigann
        protected IHtmlDocument landingResultDocument;
        protected override string SiteLink => ResolveSiteLink();

+        private readonly TimeSpan _rateLimit;
+
        public CardigannRequestGenerator(IConfigService configService,
                                         CardigannDefinition definition,
-                                         Logger logger)
+                                         Logger logger,
+                                         TimeSpan rateLimit)
        : base(configService, definition, logger)
        {
+            _rateLimit = rateLimit;
        }

        public Func<IDictionary<string, string>> GetCookies { get; set; }
@@ -218,15 +221,18 @@ namespace NzbDrone.Core.Indexers.Cardigann
                    requestBuilder.AddFormParameter(pair.Key, pair.Value);
                }

-                requestBuilder.Headers.Add("Referer", SiteLink);
+                var request = requestBuilder
+                    .SetHeader("Referer", SiteLink)
+                    .WithRateLimit(_rateLimit.TotalSeconds)
+                    .Build();

-                var response = await HttpClient.ExecuteProxiedAsync(requestBuilder.Build(), Definition);
+                var response = await HttpClient.ExecuteProxiedAsync(request, Definition);

                Cookies = response.GetCookies();

                CheckForError(response, login.Error);

-                CookiesUpdater(Cookies, DateTime.Now + TimeSpan.FromDays(30));
+                CookiesUpdater(Cookies, DateTime.Now.AddDays(30));
            }
            else if (login.Method == "form")
            {
@@ -356,11 +362,13 @@ namespace NzbDrone.Core.Indexers.Cardigann
                        Encoding = _encoding
                    };

-                    requestBuilder.SetCookies(Cookies);
+                    var request = requestBuilder
+                        .SetCookies(Cookies)
+                        .SetHeader("Referer", loginUrl)
+                        .WithRateLimit(_rateLimit.TotalSeconds)
+                        .Build();

-                    requestBuilder.Headers.Add("Referer", loginUrl);
-
-                    var simpleCaptchaResult = await HttpClient.ExecuteProxiedAsync(requestBuilder.Build(), Definition);
+                    var simpleCaptchaResult = await HttpClient.ExecuteProxiedAsync(request, Definition);

                    var simpleCaptchaJSON = JObject.Parse(simpleCaptchaResult.Content);
                    var captchaSelection = simpleCaptchaJSON["images"][0]["hash"].ToString();
@@ -424,10 +432,6 @@ namespace NzbDrone.Core.Indexers.Cardigann
                        Encoding = _encoding
                    };

-                    requestBuilder.Headers.Add("Referer", SiteLink);
-
-                    requestBuilder.SetCookies(Cookies);
-
                    foreach (var pair in pairs)
                    {
                        requestBuilder.AddFormParameter(pair.Key, pair.Value);
@@ -438,7 +442,12 @@ namespace NzbDrone.Core.Indexers.Cardigann
                        requestBuilder.SetHeader(header.Key, header.Value);
                    }

-                    var request = requestBuilder.Build();
+                    var request = requestBuilder
+                        .SetCookies(Cookies)
+                        .SetHeader("Referer", SiteLink)
+                        .WithRateLimit(_rateLimit.TotalSeconds)
+                        .Build();
+
                    request.SetContent(body);

                    loginResult = await HttpClient.ExecuteProxiedAsync(request, Definition);
@@ -454,26 +463,29 @@ namespace NzbDrone.Core.Indexers.Cardigann
                        Encoding = _encoding
                    };

-                    requestBuilder.SetCookies(Cookies);
-                    requestBuilder.Headers.Add("Referer", loginUrl);
-
                    foreach (var pair in pairs)
                    {
                        requestBuilder.AddFormParameter(pair.Key, pair.Value);
                    }

-                    loginResult = await HttpClient.ExecuteProxiedAsync(requestBuilder.Build(), Definition);
+                    var request = requestBuilder
+                        .SetCookies(Cookies)
+                        .SetHeader("Referer", loginUrl)
+                        .WithRateLimit(_rateLimit.TotalSeconds)
+                        .Build();
+
+                    loginResult = await HttpClient.ExecuteProxiedAsync(request, Definition);
                }

                Cookies = loginResult.GetCookies();
                CheckForError(loginResult, login.Error);
-                CookiesUpdater(Cookies, DateTime.Now + TimeSpan.FromDays(30));
+                CookiesUpdater(Cookies, DateTime.Now.AddDays(30));
            }
            else if (login.Method == "cookie")
            {
                CookiesUpdater(null, null);
                Settings.ExtraFieldData.TryGetValue("cookie", out var cookies);
-                CookiesUpdater(CookieUtil.CookieHeaderToDictionary((string)cookies), DateTime.Now + TimeSpan.FromDays(30));
+                CookiesUpdater(CookieUtil.CookieHeaderToDictionary((string)cookies), DateTime.Now.AddDays(30));
            }
            else if (login.Method == "get")
            {
@@ -496,15 +508,18 @@ namespace NzbDrone.Core.Indexers.Cardigann
                    Encoding = _encoding
                };

-                requestBuilder.Headers.Add("Referer", SiteLink);
+                var request = requestBuilder
+                    .SetHeader("Referer", SiteLink)
+                    .WithRateLimit(_rateLimit.TotalSeconds)
+                    .Build();

-                var response = await HttpClient.ExecuteProxiedAsync(requestBuilder.Build(), Definition);
+                var response = await HttpClient.ExecuteProxiedAsync(request, Definition);

                Cookies = response.GetCookies();

                CheckForError(response, login.Error);

-                CookiesUpdater(Cookies, DateTime.Now + TimeSpan.FromDays(30));
+                CookiesUpdater(Cookies, DateTime.Now.AddDays(30));
            }
            else if (login.Method == "oneurl")
            {
@@ -521,15 +536,18 @@ namespace NzbDrone.Core.Indexers.Cardigann
                    Encoding = _encoding
                };

-                requestBuilder.Headers.Add("Referer", SiteLink);
+                var request = requestBuilder
+                    .SetHeader("Referer", SiteLink)
+                    .WithRateLimit(_rateLimit.TotalSeconds)
+                    .Build();

-                var response = await HttpClient.ExecuteProxiedAsync(requestBuilder.Build(), Definition);
+                var response = await HttpClient.ExecuteProxiedAsync(request, Definition);

                Cookies = response.GetCookies();

                CheckForError(response, login.Error);

-                CookiesUpdater(Cookies, DateTime.Now + TimeSpan.FromDays(30));
+                CookiesUpdater(Cookies, DateTime.Now.AddDays(30));
            }
            else
            {
@@ -594,14 +612,15 @@ namespace NzbDrone.Core.Indexers.Cardigann
                Encoding = _encoding
            };

-            requestBuilder.Headers.Add("Referer", SiteLink);
-
            if (Cookies != null)
            {
                requestBuilder.SetCookies(Cookies);
            }

-            var request = requestBuilder.Build();
+            var request = requestBuilder
+                .SetHeader("Referer", SiteLink)
+                .WithRateLimit(_rateLimit.TotalSeconds)
+                .Build();

            landingResult = await HttpClient.ExecuteProxiedAsync(request, Definition);

@@ -646,6 +665,7 @@ namespace NzbDrone.Core.Indexers.Cardigann
                        .SetCookies(landingResult.GetCookies())
                        .SetHeader("Referer", loginUrl.AbsoluteUri)
                        .SetEncoding(_encoding)
+                        .WithRateLimit(_rateLimit.TotalSeconds)
                        .Build();

                    var response = await HttpClient.ExecuteProxiedAsync(request, Definition);
@@ -656,11 +676,9 @@ namespace NzbDrone.Core.Indexers.Cardigann
                        ImageData = response.ResponseData
                    };
                }
-                else
-                {
+
                _logger.Debug("CardigannIndexer ({0}): No captcha image found", _definition.Id);
            }
-            }
            else
            {
                throw new NotImplementedException(string.Format("Captcha type \"{0}\" is not implemented", captcha.Type));
@@ -724,23 +742,28 @@ namespace NzbDrone.Core.Indexers.Cardigann
                requestLinkStr += queryCollection.GetQueryString(_encoding, separator: request.Queryseparator);
            }

-            var httpRequest = new HttpRequestBuilder(requestLinkStr)
-                .SetCookies(Cookies ?? new Dictionary<string, string>())
-                .SetEncoding(_encoding)
-                .SetHeader("Referer", referer);
-
-            httpRequest.Method = method;
+            var httpRequestBuilder = new HttpRequestBuilder(requestLinkStr)
+            {
+                Method = method,
+                Encoding = _encoding
+            };

            // Add form data for POST requests
            if (method == HttpMethod.Post)
            {
                foreach (var param in pairs)
                {
-                    httpRequest.AddFormParameter(param.Key, param.Value);
+                    httpRequestBuilder.AddFormParameter(param.Key, param.Value);
                }
            }

-            var response = await HttpClient.ExecuteProxiedAsync(httpRequest.Build(), Definition);
+            var httpRequest = httpRequestBuilder
+                .SetCookies(Cookies ?? new Dictionary<string, string>())
+                .SetHeader("Referer", referer)
+                .WithRateLimit(_rateLimit.TotalSeconds)
+                .Build();
+
+            var response = await HttpClient.ExecuteProxiedAsync(httpRequest, Definition);

            _logger.Debug("CardigannIndexer ({0}): handleRequest() remote server returned {1}", _definition.Id, response.StatusCode);
            return response;
@@ -766,6 +789,7 @@ namespace NzbDrone.Core.Indexers.Cardigann
                    .SetCookies(Cookies ?? new Dictionary<string, string>())
                    .SetHeaders(headers ?? new Dictionary<string, string>())
                    .SetEncoding(_encoding)
+                    .WithRateLimit(_rateLimit.TotalSeconds)
                    .Build();

                request.AllowAutoRedirect = true;
@@ -856,6 +880,7 @@ namespace NzbDrone.Core.Indexers.Cardigann
                                    .SetCookies(Cookies ?? new Dictionary<string, string>())
                                    .SetHeaders(headers ?? new Dictionary<string, string>())
                                    .SetEncoding(_encoding)
+                                    .WithRateLimit(_rateLimit.TotalSeconds)
                                    .Build();

                                response = await HttpClient.ExecuteProxiedAsync(testLinkRequest, Definition);
@@ -875,6 +900,7 @@ namespace NzbDrone.Core.Indexers.Cardigann
                                .SetCookies(Cookies ?? new Dictionary<string, string>())
                                .SetHeaders(headers ?? new Dictionary<string, string>())
                                .SetEncoding(_encoding)
+                                .WithRateLimit(_rateLimit.TotalSeconds)
                                .Build();

                            selectorDownloadRequest.Method = method;
@@ -895,6 +921,7 @@ namespace NzbDrone.Core.Indexers.Cardigann
                .SetCookies(Cookies ?? new Dictionary<string, string>())
                .SetHeaders(headers ?? new Dictionary<string, string>())
                .SetEncoding(_encoding)
+                .WithRateLimit(_rateLimit.TotalSeconds)
                .Build();

            downloadRequest.Method = method;
@@ -1096,16 +1123,18 @@ namespace NzbDrone.Core.Indexers.Cardigann

                _logger.Info($"Adding request: {searchUrl}");

-                var requestbuilder = new HttpRequestBuilder(searchUrl);
-
-                requestbuilder.Method = method;
+                var requestBuilder = new HttpRequestBuilder(searchUrl)
+                {
+                    Method = method,
+                    Encoding = _encoding
+                };

                // Add FormData for searchs that POST
                if (method == HttpMethod.Post)
                {
                    foreach (var param in queryCollection)
                    {
-                        requestbuilder.AddFormParameter(param.Key, param.Value);
+                        requestBuilder.AddFormParameter(param.Key, param.Value);
                    }
                }

@@ -1113,14 +1142,22 @@ namespace NzbDrone.Core.Indexers.Cardigann
                if (search.Headers != null)
                {
                    var headers = ParseCustomHeaders(search.Headers, variables);
-                    requestbuilder.SetHeaders(headers ?? new Dictionary<string, string>());
+                    requestBuilder.SetHeaders(headers ?? new Dictionary<string, string>());
                }

-                var request = new CardigannRequest(requestbuilder.SetEncoding(_encoding).Build(), variables, searchPath);
+                var request = requestBuilder
+                    .WithRateLimit(_rateLimit.TotalSeconds)
+                    .Build();

-                request.HttpRequest.AllowAutoRedirect = searchPath.Followredirect;
+                var cardigannRequest = new CardigannRequest(request, variables, searchPath)
+                    {
+                        HttpRequest =
+                        {
+                            AllowAutoRedirect = searchPath.Followredirect
+                        }
+                    };

-                yield return request;
+                yield return cardigannRequest;
            }
        }
    }
@@ -1,6 +1,5 @@
 using System.Collections.Generic;
 using NLog;
-using NzbDrone.Common.Http;
 using NzbDrone.Core.Configuration;
 using NzbDrone.Core.Indexers.Definitions.Avistaz;
 using NzbDrone.Core.Messaging.Events;
@@ -10,18 +9,23 @@ namespace NzbDrone.Core.Indexers.Definitions
    public class CinemaZ : AvistazBase
    {
        public override string Name => "CinemaZ";
-        public override string[] IndexerUrls => new string[] { "https://cinemaz.to/" };
+        public override string[] IndexerUrls => new[] { "https://cinemaz.to/" };
        public override string Description => "CinemaZ (EuTorrents) is a Private Torrent Tracker for FOREIGN NON-ASIAN MOVIES.";
        public override IndexerPrivacy Privacy => IndexerPrivacy.Private;

-        public CinemaZ(IIndexerRepository indexerRepository, IIndexerHttpClient httpClient, IEventAggregator eventAggregator, IIndexerStatusService indexerStatusService, IConfigService configService, Logger logger)
+        public CinemaZ(IIndexerRepository indexerRepository,
+                       IIndexerHttpClient httpClient,
+                       IEventAggregator eventAggregator,
+                       IIndexerStatusService indexerStatusService,
+                       IConfigService configService,
+                       Logger logger)
            : base(indexerRepository, httpClient, eventAggregator, indexerStatusService, configService, logger)
        {
        }

        public override IIndexerRequestGenerator GetRequestGenerator()
        {
-            return new AvistazRequestGenerator()
+            return new AvistazRequestGenerator
            {
                Settings = Settings,
                HttpClient = _httpClient,
@@ -52,7 +56,6 @@ namespace NzbDrone.Core.Indexers.Definitions
            caps.Categories.AddCategoryMapping(2, NewznabStandardCategory.TVUHD);
            caps.Categories.AddCategoryMapping(2, NewznabStandardCategory.TVHD);
            caps.Categories.AddCategoryMapping(2, NewznabStandardCategory.TVSD);
-            caps.Categories.AddCategoryMapping(3, NewznabStandardCategory.Audio);

            return caps;
        }
@@ -10,18 +10,23 @@ namespace NzbDrone.Core.Indexers.Definitions
    public class ExoticaZ : AvistazBase
    {
        public override string Name => "ExoticaZ";
-        public override string[] IndexerUrls => new string[] { "https://exoticaz.to/" };
+        public override string[] IndexerUrls => new[] { "https://exoticaz.to/" };
        public override string Description => "ExoticaZ (YourExotic) is a Private Torrent Tracker for 3X";
        public override IndexerPrivacy Privacy => IndexerPrivacy.Private;

-        public ExoticaZ(IIndexerRepository indexerRepository, IIndexerHttpClient httpClient, IEventAggregator eventAggregator, IIndexerStatusService indexerStatusService, IConfigService configService, Logger logger)
+        public ExoticaZ(IIndexerRepository indexerRepository,
+                        IIndexerHttpClient httpClient,
+                        IEventAggregator eventAggregator,
+                        IIndexerStatusService indexerStatusService,
+                        IConfigService configService,
+                        Logger logger)
            : base(indexerRepository, httpClient, eventAggregator, indexerStatusService, configService, logger)
        {
        }

        public override IIndexerRequestGenerator GetRequestGenerator()
        {
-            return new AvistazRequestGenerator()
+            return new AvistazRequestGenerator
            {
                Settings = Settings,
                HttpClient = _httpClient,
@@ -52,7 +57,7 @@ namespace NzbDrone.Core.Indexers.Definitions
        }
    }

-    public class ExoticaZParser : AvistazParser
+    public class ExoticaZParser : AvistazParserBase
    {
        private readonly IndexerCapabilitiesCategories _categories;

@@ -1,15 +1,19 @@
 using System.Collections.Generic;
 using NLog;
-using NzbDrone.Common.Http;
 using NzbDrone.Core.Configuration;
 using NzbDrone.Core.Messaging.Events;

-namespace NzbDrone.Core.Indexers.FileList
+namespace NzbDrone.Core.Indexers.Definitions.FileList;
+
+public class FileList : TorrentIndexerBase<FileListSettings>
 {
-    public class FileList : TorrentIndexerBase<FileListSettings>
-    {
    public override string Name => "FileList.io";
-        public override string[] IndexerUrls => new string[] { "https://filelist.io" };
+    public override string[] IndexerUrls => new[]
+    {
+        "https://filelist.io/",
+        "https://flro.org/"
+    };
+    public override string[] LegacyUrls => new[] { "https://filelist.io" };
    public override string Description => "FileList (FL) is a ROMANIAN Private Torrent Tracker for 0DAY / GENERAL";
    public override DownloadProtocol Protocol => DownloadProtocol.Torrent;
    public override IndexerPrivacy Privacy => IndexerPrivacy.Private;
@@ -18,14 +22,18 @@ namespace NzbDrone.Core.Indexers.FileList
    public override bool SupportsRedirect => true;
    public override IndexerCapabilities Capabilities => SetCapabilities();

-        public FileList(IIndexerHttpClient httpClient, IEventAggregator eventAggregator, IIndexerStatusService indexerStatusService, IConfigService configService, Logger logger)
+    public FileList(IIndexerHttpClient httpClient,
+        IEventAggregator eventAggregator,
+        IIndexerStatusService indexerStatusService,
+        IConfigService configService,
+        Logger logger)
        : base(httpClient, eventAggregator, indexerStatusService, configService, logger)
    {
    }

    public override IIndexerRequestGenerator GetRequestGenerator()
    {
-            return new FileListRequestGenerator() { Settings = Settings, Capabilities = Capabilities };
+        return new FileListRequestGenerator { Settings = Settings, Capabilities = Capabilities };
    }

    public override IParseIndexerResponse GetParser()
@@ -89,5 +97,4 @@ namespace NzbDrone.Core.Indexers.FileList

        return caps;
    }
-    }
 }
--- a/Show More
+++ b/Show More