Translated using Weblate (Greek)

Currently translated at 100.0% (471 of 471 strings)

Translated using Weblate (Ukrainian)

Currently translated at 73.4% (346 of 471 strings)

Translated using Weblate (Russian)

Currently translated at 76.6% (361 of 471 strings)

Translated using Weblate (Dutch)

Currently translated at 88.7% (418 of 471 strings)

Translated using Weblate (Hebrew)

Currently translated at 81.5% (384 of 471 strings)

Translated using Weblate (French)

Currently translated at 98.9% (466 of 471 strings)

Translated using Weblate (Greek)

Currently translated at 75.5% (356 of 471 strings)

Translated using Weblate (Danish)

Currently translated at 74.7% (352 of 471 strings)

Translated using Weblate (French)

Currently translated at 97.0% (457 of 471 strings)

Translated using Weblate (French)

Currently translated at 97.0% (457 of 471 strings)

Translated using Weblate (French)

Currently translated at 97.0% (457 of 471 strings)

Translated using Weblate (French)

Currently translated at 96.1% (453 of 471 strings)

Translated using Weblate (French)

Currently translated at 96.1% (453 of 471 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (471 of 471 strings)

Co-authored-by: Anonymous <noreply@weblate.org>
Co-authored-by: Havok Dan <havokdan@yahoo.com.br>
Co-authored-by: KevoM <lilmarsu@gmail.com>
Co-authored-by: Vasilis Ieropoulos <kirav96@gmail.com>
Co-authored-by: Weblate <noreply@weblate.org>
Co-authored-by: louismaxx <lmdupouy@gmail.com>
Translate-URL: https://translate.servarr.com/projects/servarr/prowlarr/da/
Translate-URL: https://translate.servarr.com/projects/servarr/prowlarr/el/
Translate-URL: https://translate.servarr.com/projects/servarr/prowlarr/fr/
Translate-URL: https://translate.servarr.com/projects/servarr/prowlarr/he/
Translate-URL: https://translate.servarr.com/projects/servarr/prowlarr/nl/
Translate-URL: https://translate.servarr.com/projects/servarr/prowlarr/pt_BR/
Translate-URL: https://translate.servarr.com/projects/servarr/prowlarr/ru/
Translate-URL: https://translate.servarr.com/projects/servarr/prowlarr/uk/
Translation: Servarr/Prowlarr

.github/workflows/azuresync.yml

@@ -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

azure-pipelines.yml

@@ -9,13 +9,13 @@ variables:
   testsFolder: './_tests'
   yarnCacheFolder: $(Pipeline.Workspace)/.yarn
   nugetCacheFolder: $(Pipeline.Workspace)/.nuget/packages
-  majorVersion: '1.0.0'
+  majorVersion: '1.2.0'
   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'

frontend/build/webpack.config.js

@@ -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',

frontend/src/Indexer/Index/Table/CapabilitiesLabel.js

@@ -14,7 +14,7 @@ function CapabilitiesLabel(props) {
   let filteredList = categories.filter((item) => item.id < 100000);
 
   if (categoryFilter.length > 0) {
-    filteredList = filteredList.filter((item) => categoryFilter.includes(item.id));
+    filteredList = filteredList.filter((item) => categoryFilter.includes(item.id) || (item.subCategories && item.subCategories.some((r) => categoryFilter.includes(r.id))));
   }
 
   const nameList = filteredList.map((item) => item.name).sort();

frontend/src/Indexer/Index/Table/IndexerIndexRow.js

@@ -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,

frontend/src/Indexer/Info/IndexerInfoModalContent.js

@@ -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

frontend/src/Search/Mobile/SearchIndexOverview.css

@@ -35,9 +35,11 @@ $hoverScale: 1.05;
 }
 
 .title {
+  overflow: hidden;
   width: 85%;
   font-weight: 500;
   font-size: 14px;
+  overflow-wrap: break-word;
 }
 
 .actions {

frontend/src/Search/Mobile/SearchIndexOverview.js

@@ -3,6 +3,7 @@ import React, { Component } from 'react';
 import TextTruncate from 'react-text-truncate';
 import Label from 'Components/Label';
 import IconButton from 'Components/Link/IconButton';
+import Link from 'Components/Link/Link';
 import SpinnerIconButton from 'Components/Link/SpinnerIconButton';
 import { icons, kinds } from 'Helpers/Props';
 import CategoryLabel from 'Search/Table/CategoryLabel';
@@ -52,12 +53,17 @@ class SearchIndexOverview extends Component {
   //
   // Listeners
 
-  onEditSeriesPress = () => {
-    this.setState({ isEditSeriesModalOpen: true });
-  };
+  onGrabPress = () => {
+    const {
+      guid,
+      indexerId,
+      onGrabPress
+    } = this.props;
 
-  onEditSeriesModalClose = () => {
-    this.setState({ isEditSeriesModalOpen: false });
+    onGrabPress({
+      guid,
+      indexerId
+    });
   };
 
   //
@@ -66,6 +72,7 @@ class SearchIndexOverview extends Component {
   render() {
     const {
       title,
+      infoUrl,
       protocol,
       downloadUrl,
       categories,
@@ -91,10 +98,16 @@ class SearchIndexOverview extends Component {
           <div className={styles.info} style={{ height: contentHeight }}>
             <div className={styles.titleRow}>
               <div className={styles.title}>
-                <TextTruncate
-                  line={2}
-                  text={title}
-                />
+                <Link
+                  to={infoUrl}
+                  title={title}
+                >
+                  <TextTruncate
+                    line={2}
+                    text={title}
+                  />
+                </Link>
+
               </div>
 
               <div className={styles.actions}>

frontend/src/Search/Mobile/SearchIndexOverviews.js

@@ -49,7 +49,7 @@ class SearchIndexOverviews extends Component {
       this._grid &&
         (prevState.width !== width ||
             prevState.rowHeight !== rowHeight ||
-            hasDifferentItemsOrOrder(prevProps.items, items)
+            hasDifferentItemsOrOrder(prevProps.items, items, 'guid')
         )
     ) {
       // recomputeGridSize also forces Grid to discard its cache of rendered cells
@@ -93,7 +93,6 @@ class SearchIndexOverviews extends Component {
   cellRenderer = ({ key, rowIndex, style }) => {
     const {
       items,
-      sortKey,
       showRelativeDates,
       shortDateFormat,
       longDateFormat,
@@ -117,7 +116,6 @@ class SearchIndexOverviews extends Component {
         <SearchIndexItemConnector
           key={release.guid}
           component={SearchIndexOverview}
-          sortKey={sortKey}
           rowHeight={rowHeight}
           showRelativeDates={showRelativeDates}
           shortDateFormat={shortDateFormat}

frontend/src/Search/Table/SearchIndexItemConnector.js

@@ -41,7 +41,7 @@ const mapDispatchToProps = {
   dispatchExecuteCommand: executeCommand
 };
 
-class MovieIndexItemConnector extends Component {
+class SearchIndexItemConnector extends Component {
 
   //
   // Render
@@ -66,9 +66,9 @@ class MovieIndexItemConnector extends Component {
   }
 }
 
-MovieIndexItemConnector.propTypes = {
+SearchIndexItemConnector.propTypes = {
   guid: PropTypes.string,
   component: PropTypes.elementType.isRequired
 };
 
-export default connect(createMapStateToProps, mapDispatchToProps)(MovieIndexItemConnector);
+export default connect(createMapStateToProps, mapDispatchToProps)(SearchIndexItemConnector);

frontend/src/index.ejs

@@ -11,7 +11,7 @@
     <!-- Windows Phone -->
     <meta name="msapplication-navbutton-color" content="#3a3f51" />
 
-    <meta name="description" content="Prowlarr (Preview)" />
+    <meta name="description" content="Prowlarr" />
 
     <link
       rel="apple-touch-icon"
@@ -50,7 +50,7 @@
     <link rel="stylesheet" type="text/css" href="/Content/Fonts/fonts.css">
     <!-- webpack bundles head -->
 
-    <title>Prowlarr (Preview)</title>
+    <title>Prowlarr</title>
 
     <!--
       The super basic styling for .root  will live here,

package.json

@@ -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",

src/NzbDrone.Common.Test/Http/HttpUriFixture.cs

@@ -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")]

src/NzbDrone.Common.Test/InstrumentationTests/CleanseLogMessageFixture.cs

@@ -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"",")]

src/NzbDrone.Common/Http/HttpResponse.cs

@@ -76,6 +76,7 @@ namespace NzbDrone.Common.Http
             get
             {
                 var newUrl = Headers["Location"];
+
                 if (newUrl == null)
                 {
                     newUrl = Headers["Refresh"];

src/NzbDrone.Common/Http/HttpUri.cs

@@ -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)

src/NzbDrone.Common/Http/TooManyRequestsException.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 
 namespace NzbDrone.Common.Http
 {
@@ -25,5 +25,11 @@ namespace NzbDrone.Common.Http
                 }
             }
         }
+
+        public TooManyRequestsException(HttpRequest request, HttpResponse response, TimeSpan retryWait)
+            : base(request, response)
+        {
+            RetryAfter = retryWait;
+        }
     }
 }

src/NzbDrone.Common/Instrumentation/CleanseLogMessage.cs

@@ -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,9 +58,10 @@ 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),
-            };
+        };
 
         private static readonly Regex CleanseRemoteIPRegex = new Regex(@"(?:Auth-\w+(?<!Failure|Unauthorized) ip|from) (\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})", RegexOptions.Compiled);
 

src/NzbDrone.Common/Instrumentation/Sentry/SentryTarget.cs

@@ -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;

src/NzbDrone.Common/Prowlarr.Common.csproj

@@ -10,6 +10,7 @@
     <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" />

src/NzbDrone.Core.Test/HealthCheck/Checks/ReleaseBranchCheckFixture.cs

@@ -28,15 +28,15 @@ namespace NzbDrone.Core.Test.HealthCheck.Checks
         [Test]
         public void should_return_warning_when_branch_not_valid()
         {
-            GivenValidBranch("master");
+            GivenValidBranch("test");
 
             Subject.Check().ShouldBeWarning();
         }
 
-        [TestCase("Develop")]
-        [TestCase("develop")]
         [TestCase("nightly")]
         [TestCase("Nightly")]
+        [TestCase("develop")]
+        [TestCase("master")]
         public void should_return_no_warning_when_branch_valid(string branch)
         {
             GivenValidBranch(branch);

src/NzbDrone.Core.Test/IndexerTests/AvistazTests/AvistazFixture.cs

@@ -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);

src/NzbDrone.Core.Test/IndexerTests/CardigannTests/ApplyGoTemplateTextFixture.cs

@@ -71,12 +71,12 @@ namespace NzbDrone.Core.Test.IndexerTests.CardigannTests
             result.Should().Be(expected);
         }
 
-        [TestCase("{{ .Today.Year }}", "2022")]
-        public void should_handle_variables_statements(string template, string expected)
+        [TestCase("{{ .Today.Year }}")]
+        public void should_handle_variables_statements(string template)
         {
             var result = Subject.ApplyGoTemplateText(template, _variables);
 
-            result.Should().Be(expected);
+            result.Should().Be(DateTime.Now.Year.ToString());
         }
 
         [TestCase("{{if .False }}0{{else}}1{{end}}", "1")]

src/NzbDrone.Core.Test/IndexerTests/FileListTests/FileListFixture.cs

@@ -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);
         }
     }
 }

src/NzbDrone.Core.Test/IndexerTests/FileListTests/FileListRequestGeneratorFixture.cs

@@ -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,34 +16,35 @@ 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>
-                       {
-                           MovieSearchParam.Q, MovieSearchParam.ImdbId
-                       },
+                {
+                    MovieSearchParam.Q, MovieSearchParam.ImdbId
+                },
                 MusicSearchParams = new List<MusicSearchParam>
-                       {
-                           MusicSearchParam.Q
-                       },
+                {
+                    MusicSearchParam.Q
+                },
                 BookSearchParams = new List<BookSearchParam>
-                       {
-                           BookSearchParam.Q
-                       },
+                {
+                    BookSearchParam.Q
+                },
                 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");
         }
     }
 }

src/NzbDrone.Core.Test/IndexerTests/HDBitsTests/HDBitsFixture.cs

@@ -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;

src/NzbDrone.Core.Test/IndexerTests/HDBitsTests/HDBitsRequestGeneratorFixture.cs

@@ -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();
+        }
     }
 }

src/NzbDrone.Core.Test/IndexerTests/OrpheusTests/OrpheusFixture.cs

@@ -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");

src/NzbDrone.Core.Test/IndexerTests/SecretCinemaTests/SecretCinemaFixture.cs

@@ -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;
 

src/NzbDrone.Core.Test/ThingiProviderTests/ProviderStatusServiceFixture.cs

@@ -90,7 +90,7 @@ namespace NzbDrone.Core.Test.ThingiProviderTests
             var status = Subject.GetBlockedProviders().FirstOrDefault();
             status.Should().NotBeNull();
             status.DisabledTill.Should().HaveValue();
-            status.DisabledTill.Value.Should().BeCloseTo(_epoch + TimeSpan.FromMinutes(5), 500);
+            status.DisabledTill.Value.Should().BeCloseTo(_epoch + TimeSpan.FromMinutes(1), 500);
         }
 
         [Test]
@@ -133,7 +133,7 @@ namespace NzbDrone.Core.Test.ThingiProviderTests
             var status = Subject.GetBlockedProviders().FirstOrDefault();
             status.Should().NotBeNull();
             status.DisabledTill.Should().HaveValue();
-            status.DisabledTill.Value.Should().BeCloseTo(_epoch + TimeSpan.FromMinutes(15), 500);
+            status.DisabledTill.Value.Should().BeCloseTo(_epoch + TimeSpan.FromMinutes(5), 500);
         }
 
         [Test]
@@ -160,7 +160,7 @@ namespace NzbDrone.Core.Test.ThingiProviderTests
             status.Should().NotBeNull();
 
             origStatus.EscalationLevel.Should().Be(3);
-            status.DisabledTill.Should().BeCloseTo(_epoch + TimeSpan.FromMinutes(5), 500);
+            status.DisabledTill.Should().BeCloseTo(_epoch + TimeSpan.FromMinutes(1), 500);
         }
     }
 }

src/NzbDrone.Core/Applications/LazyLibrarian/LazyLibrarian.cs

@@ -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;

src/NzbDrone.Core/Applications/LazyLibrarian/LazyLibrarianIndexer.cs

@@ -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;
         }
     }
 }

src/NzbDrone.Core/Applications/LazyLibrarian/LazyLibrarianV1Proxy.cs

@@ -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;
     }
 }

src/NzbDrone.Core/Applications/Lidarr/Lidarr.cs

@@ -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;
 

src/NzbDrone.Core/Applications/Radarr/Radarr.cs

@@ -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;
             }

src/NzbDrone.Core/Applications/Readarr/Readarr.cs

@@ -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;
 

src/NzbDrone.Core/Applications/Sonarr/Sonarr.cs

@@ -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;

src/NzbDrone.Core/Applications/Whisparr/Whisparr.cs

@@ -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;
             }

src/NzbDrone.Core/Configuration/DeploymentInfoProvider.cs

@@ -33,7 +33,7 @@ namespace NzbDrone.Core.Configuration
             var releaseInfoPath = Path.Combine(bin, "release_info");
 
             PackageUpdateMechanism = UpdateMechanism.BuiltIn;
-            DefaultBranch = "develop";
+            DefaultBranch = "master";
 
             if (Path.GetFileName(bin) == "bin" && diskProvider.FileExists(packageInfoPath))
             {

src/NzbDrone.Core/Datastore/Migration/025_speedcd_userpasssettings_to_speedcdsettings.cs

@@ -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" });
+        }
+    }
+}

src/NzbDrone.Core/Datastore/Migration/026_torrentday_cookiesettings_to_torrentdaysettings.cs

@@ -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" });
+        }
+    }
+}

src/NzbDrone.Core/Datastore/Migration/027_alpharatio_greatposterwall_config_contract.cs

@@ -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" });
+    }
+}

src/NzbDrone.Core/Datastore/Migration/028_remove_notwhatcd.cs

@@ -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" });
+    }
+}

src/NzbDrone.Core/Download/Clients/FreeboxDownload/FreeboxDownloadEncoding.cs

@@ -0,0 +1,27 @@
+namespace NzbDrone.Core.Download.Clients.FreeboxDownload
+{
+    public static class EncodingForBase64
+    {
+        public static string EncodeBase64(this string text)
+        {
+            if (text == null)
+            {
+                return null;
+            }
+
+            byte[] textAsBytes = System.Text.Encoding.UTF8.GetBytes(text);
+            return System.Convert.ToBase64String(textAsBytes);
+        }
+
+        public static string DecodeBase64(this string encodedText)
+        {
+            if (encodedText == null)
+            {
+                return null;
+            }
+
+            byte[] textAsBytes = System.Convert.FromBase64String(encodedText);
+            return System.Text.Encoding.UTF8.GetString(textAsBytes);
+        }
+    }
+}

src/NzbDrone.Core/Download/Clients/FreeboxDownload/FreeboxDownloadException.cs

@@ -0,0 +1,10 @@
+namespace NzbDrone.Core.Download.Clients.FreeboxDownload
+{
+    public class FreeboxDownloadException : DownloadClientException
+    {
+        public FreeboxDownloadException(string message)
+            : base(message)
+        {
+        }
+    }
+}

src/NzbDrone.Core/Download/Clients/FreeboxDownload/FreeboxDownloadPriority.cs

@@ -0,0 +1,8 @@
+namespace NzbDrone.Core.Download.Clients.FreeboxDownload
+{
+    public enum FreeboxDownloadPriority
+    {
+        Last = 0,
+        First = 1
+    }
+}

src/NzbDrone.Core/Download/Clients/FreeboxDownload/FreeboxDownloadProxy.cs

@@ -0,0 +1,271 @@
+using System.Collections.Generic;
+using System.Net;
+using System.Net.Http;
+using System.Security.Cryptography;
+using NLog;
+using NzbDrone.Common.Cache;
+using NzbDrone.Common.Extensions;
+using NzbDrone.Common.Http;
+using NzbDrone.Common.Serializer;
+using NzbDrone.Core.Download.Clients.FreeboxDownload.Responses;
+
+namespace NzbDrone.Core.Download.Clients.FreeboxDownload
+{
+    public interface IFreeboxDownloadProxy
+    {
+        void Authenticate(FreeboxDownloadSettings settings);
+        string AddTaskFromUrl(string url, string directory, bool addPaused, bool addFirst, FreeboxDownloadSettings settings);
+        string AddTaskFromFile(string fileName, byte[] fileContent, string directory, bool addPaused, bool addFirst, FreeboxDownloadSettings settings);
+        void DeleteTask(string id, bool deleteData, FreeboxDownloadSettings settings);
+        FreeboxDownloadConfiguration GetDownloadConfiguration(FreeboxDownloadSettings settings);
+        List<FreeboxDownloadTask> GetTasks(FreeboxDownloadSettings settings);
+    }
+
+    public class FreeboxDownloadProxy : IFreeboxDownloadProxy
+    {
+        private readonly IHttpClient _httpClient;
+        private readonly Logger _logger;
+        private ICached<string> _authSessionTokenCache;
+
+        public FreeboxDownloadProxy(ICacheManager cacheManager, IHttpClient httpClient, Logger logger)
+        {
+            _httpClient = httpClient;
+            _logger = logger;
+            _authSessionTokenCache = cacheManager.GetCache<string>(GetType(), "authSessionToken");
+        }
+
+        public void Authenticate(FreeboxDownloadSettings settings)
+        {
+            var request = BuildRequest(settings).Resource("/login").Build();
+
+            var response = ProcessRequest<FreeboxLogin>(request, settings);
+
+            if (response.Result.LoggedIn == false)
+            {
+                throw new DownloadClientAuthenticationException("Not logged");
+            }
+        }
+
+        public string AddTaskFromUrl(string url, string directory, bool addPaused, bool addFirst, FreeboxDownloadSettings settings)
+        {
+            var request = BuildRequest(settings).Resource("/downloads/add").Post();
+            request.Headers.ContentType = "application/x-www-form-urlencoded";
+
+            request.AddFormParameter("download_url", System.Web.HttpUtility.UrlPathEncode(url));
+
+            if (!directory.IsNullOrWhiteSpace())
+            {
+                request.AddFormParameter("download_dir", directory);
+            }
+
+            var response = ProcessRequest<FreeboxDownloadTask>(request.Build(), settings);
+
+            SetTorrentSettings(response.Result.Id, addPaused, addFirst, settings);
+
+            return response.Result.Id;
+        }
+
+        public string AddTaskFromFile(string fileName, byte[] fileContent, string directory, bool addPaused, bool addFirst, FreeboxDownloadSettings settings)
+        {
+            var request = BuildRequest(settings).Resource("/downloads/add").Post();
+
+            request.AddFormUpload("download_file", fileName, fileContent, "multipart/form-data");
+
+            if (directory.IsNotNullOrWhiteSpace())
+            {
+                request.AddFormParameter("download_dir", directory);
+            }
+
+            var response = ProcessRequest<FreeboxDownloadTask>(request.Build(), settings);
+
+            SetTorrentSettings(response.Result.Id, addPaused, addFirst, settings);
+
+            return response.Result.Id;
+        }
+
+        public void DeleteTask(string id, bool deleteData, FreeboxDownloadSettings settings)
+        {
+            var uri = "/downloads/" + id;
+
+            if (deleteData == true)
+            {
+                uri += "/erase";
+            }
+
+            var request = BuildRequest(settings).Resource(uri).Build();
+
+            request.Method = HttpMethod.Delete;
+
+            ProcessRequest<string>(request, settings);
+        }
+
+        public FreeboxDownloadConfiguration GetDownloadConfiguration(FreeboxDownloadSettings settings)
+        {
+            var request = BuildRequest(settings).Resource("/downloads/config/").Build();
+
+            return ProcessRequest<FreeboxDownloadConfiguration>(request, settings).Result;
+        }
+
+        public List<FreeboxDownloadTask> GetTasks(FreeboxDownloadSettings settings)
+        {
+            var request = BuildRequest(settings).Resource("/downloads/").Build();
+
+            return ProcessRequest<List<FreeboxDownloadTask>>(request, settings).Result;
+        }
+
+        private static string BuildCachedHeaderKey(FreeboxDownloadSettings settings)
+        {
+            return $"{settings.Host}:{settings.AppId}:{settings.AppToken}";
+        }
+
+        private void SetTorrentSettings(string id, bool addPaused, bool addFirst, FreeboxDownloadSettings settings)
+        {
+            var request = BuildRequest(settings).Resource("/downloads/" + id).Build();
+
+            request.Method = HttpMethod.Put;
+
+            var body = new Dictionary<string, object> { };
+
+            if (addPaused)
+            {
+                body.Add("status", FreeboxDownloadTaskStatus.Stopped.ToString().ToLower());
+            }
+
+            if (addFirst)
+            {
+                body.Add("queue_pos", "1");
+            }
+
+            if (body.Count == 0)
+            {
+                return;
+            }
+
+            request.SetContent(body.ToJson());
+
+            ProcessRequest<FreeboxDownloadTask>(request, settings);
+        }
+
+        private string GetSessionToken(HttpRequestBuilder requestBuilder, FreeboxDownloadSettings settings, bool force = false)
+        {
+            var sessionToken = _authSessionTokenCache.Find(BuildCachedHeaderKey(settings));
+
+            if (sessionToken == null || force)
+            {
+                _authSessionTokenCache.Remove(BuildCachedHeaderKey(settings));
+
+                _logger.Debug($"Client needs a new Session Token to reach the API with App ID '{settings.AppId}'");
+
+                // Obtaining a Session Token (from official documentation):
+                // To protect the app_token secret, it will never be used directly to authenticate the
+                // application, instead the API will provide a challenge the app will combine to its
+                // app_token to open a session and get a session_token.
+                // The validity of the session_token is limited in time and the app will have to renew
+                // this session_token once in a while.
+
+                // Retrieving the 'challenge' value (it changes frequently and have a limited time validity)
+                // needed to build password
+                var challengeRequest = requestBuilder.Resource("/login").Build();
+                challengeRequest.Method = HttpMethod.Get;
+
+                var challenge = ProcessRequest<FreeboxLogin>(challengeRequest, settings).Result.Challenge;
+
+                // The password is computed using the 'challenge' value and the 'app_token' ('App Token' setting)
+                var enc = System.Text.Encoding.ASCII;
+                var hmac = new HMACSHA1(enc.GetBytes(settings.AppToken));
+                hmac.Initialize();
+                var buffer = enc.GetBytes(challenge);
+                var password = System.BitConverter.ToString(hmac.ComputeHash(buffer)).Replace("-", "").ToLower();
+
+                // Both 'app_id' ('App ID' setting) and computed password are set to get a Session Token
+                var sessionRequest = requestBuilder.Resource("/login/session").Post().Build();
+                var body = new Dictionary<string, object>
+                {
+                    { "app_id", settings.AppId },
+                    { "password", password }
+                };
+                sessionRequest.SetContent(body.ToJson());
+
+                sessionToken = ProcessRequest<FreeboxLogin>(sessionRequest, settings).Result.SessionToken;
+
+                _authSessionTokenCache.Set(BuildCachedHeaderKey(settings), sessionToken);
+
+                _logger.Debug($"New Session Token stored in cache for App ID '{settings.AppId}', ready to reach API");
+            }
+
+            return sessionToken;
+        }
+
+        private HttpRequestBuilder BuildRequest(FreeboxDownloadSettings settings, bool authentication = true)
+        {
+            var requestBuilder = new HttpRequestBuilder(settings.UseSsl, settings.Host, settings.Port, settings.ApiUrl)
+            {
+                LogResponseContent = true
+            };
+
+            requestBuilder.Headers.ContentType = "application/json";
+
+            if (authentication == true)
+            {
+                requestBuilder.SetHeader("X-Fbx-App-Auth", GetSessionToken(requestBuilder, settings));
+            }
+
+            return requestBuilder;
+        }
+
+        private FreeboxResponse<T> ProcessRequest<T>(HttpRequest request, FreeboxDownloadSettings settings)
+        {
+            request.LogResponseContent = true;
+            request.SuppressHttpError = true;
+
+            HttpResponse response;
+
+            try
+            {
+                response = _httpClient.Execute(request);
+            }
+            catch (HttpRequestException ex)
+            {
+                throw new DownloadClientUnavailableException($"Unable to reach Freebox API. Verify 'Host', 'Port' or 'Use SSL' settings. (Error: {ex.Message})", ex);
+            }
+            catch (WebException ex)
+            {
+                throw new DownloadClientUnavailableException("Unable to connect to Freebox API, please check your settings", ex);
+            }
+
+            if (response.StatusCode == HttpStatusCode.Forbidden || response.StatusCode == HttpStatusCode.Unauthorized)
+            {
+                _authSessionTokenCache.Remove(BuildCachedHeaderKey(settings));
+
+                var responseContent = Json.Deserialize<FreeboxResponse<FreeboxLogin>>(response.Content);
+
+                var msg = $"Authentication to Freebox API failed. Reason: {responseContent.GetErrorDescription()}";
+                _logger.Error(msg);
+                throw new DownloadClientAuthenticationException(msg);
+            }
+            else if (response.StatusCode == HttpStatusCode.NotFound)
+            {
+                throw new FreeboxDownloadException("Unable to reach Freebox API. Verify 'API URL' setting for base URL and version.");
+            }
+            else if (response.StatusCode == HttpStatusCode.OK)
+            {
+                var responseContent = Json.Deserialize<FreeboxResponse<T>>(response.Content);
+
+                if (responseContent.Success)
+                {
+                    return responseContent;
+                }
+                else
+                {
+                    var msg = $"Freebox API returned error: {responseContent.GetErrorDescription()}";
+                    _logger.Error(msg);
+                    throw new DownloadClientException(msg);
+                }
+            }
+            else
+            {
+                throw new DownloadClientException("Unable to connect to Freebox, please check your settings.");
+            }
+        }
+    }
+}

src/NzbDrone.Core/Download/Clients/FreeboxDownload/FreeboxDownloadSettings.cs

@@ -0,0 +1,84 @@
+using System.Text.RegularExpressions;
+using FluentValidation;
+using NzbDrone.Common.Extensions;
+using NzbDrone.Core.Annotations;
+using NzbDrone.Core.ThingiProvider;
+using NzbDrone.Core.Validation;
+using NzbDrone.Core.Validation.Paths;
+
+namespace NzbDrone.Core.Download.Clients.FreeboxDownload
+{
+    public class FreeboxDownloadSettingsValidator : AbstractValidator<FreeboxDownloadSettings>
+    {
+        public FreeboxDownloadSettingsValidator()
+        {
+            RuleFor(c => c.Host).ValidHost();
+            RuleFor(c => c.Port).InclusiveBetween(1, 65535);
+            RuleFor(c => c.ApiUrl).NotEmpty()
+                                  .WithMessage("'API URL' must not be empty.");
+            RuleFor(c => c.ApiUrl).ValidUrlBase();
+            RuleFor(c => c.AppId).NotEmpty()
+                                 .WithMessage("'App ID' must not be empty.");
+            RuleFor(c => c.AppToken).NotEmpty()
+                                    .WithMessage("'App Token' must not be empty.");
+            RuleFor(c => c.Category).Matches(@"^\.?[-a-z]*$", RegexOptions.IgnoreCase)
+                                    .WithMessage("Allowed characters a-z and -");
+            RuleFor(c => c.DestinationDirectory).IsValidPath()
+                                                .When(c => c.DestinationDirectory.IsNotNullOrWhiteSpace());
+            RuleFor(c => c.DestinationDirectory).Empty()
+                                    .When(c => c.Category.IsNotNullOrWhiteSpace())
+                                    .WithMessage("Cannot use 'Category' and 'Destination Directory' at the same time.");
+            RuleFor(c => c.Category).Empty()
+                                    .When(c => c.DestinationDirectory.IsNotNullOrWhiteSpace())
+                                    .WithMessage("Cannot use 'Category' and 'Destination Directory' at the same time.");
+        }
+    }
+
+    public class FreeboxDownloadSettings : IProviderConfig
+    {
+        private static readonly FreeboxDownloadSettingsValidator Validator = new FreeboxDownloadSettingsValidator();
+
+        public FreeboxDownloadSettings()
+        {
+            Host = "mafreebox.freebox.fr";
+            Port = 443;
+            UseSsl = true;
+            ApiUrl = "/api/v1/";
+        }
+
+        [FieldDefinition(0, Label = "Host", Type = FieldType.Textbox, HelpText = "Hostname or host IP address of the Freebox, defaults to 'mafreebox.freebox.fr' (will only work if on same network)")]
+        public string Host { get; set; }
+
+        [FieldDefinition(1, Label = "Port", Type = FieldType.Textbox, HelpText = "Port used to access Freebox interface, defaults to '443'")]
+        public int Port { get; set; }
+
+        [FieldDefinition(2, Label = "Use SSL", Type = FieldType.Checkbox, HelpText = "Use secured connection when connecting to Freebox API")]
+        public bool UseSsl { get; set; }
+
+        [FieldDefinition(3, Label = "API URL", Type = FieldType.Textbox, Advanced = true, HelpText = "Define Freebox API base URL with API version, eg http://[host]:[port]/[api_base_url]/[api_version]/, defaults to '/api/v1/'")]
+        public string ApiUrl { get; set; }
+
+        [FieldDefinition(4, Label = "App ID", Type = FieldType.Textbox, HelpText = "App ID given when creating access to Freebox API (ie 'app_id')")]
+        public string AppId { get; set; }
+
+        [FieldDefinition(5, Label = "App Token", Type = FieldType.Password, Privacy = PrivacyLevel.Password, HelpText = "App token retrieved when creating access to Freebox API (ie 'app_token')")]
+        public string AppToken { get; set; }
+
+        [FieldDefinition(6, Label = "Destination Directory", Type = FieldType.Textbox, Advanced = true, HelpText = "Optional location to put downloads in, leave blank to use the default Freebox download location")]
+        public string DestinationDirectory { get; set; }
+
+        [FieldDefinition(7, Label = "Default Category", Type = FieldType.Textbox, HelpText = "Adding a category specific to Prowlarr avoids conflicts with unrelated non-Prowlarr downloads (will create a [category] subdirectory in the output directory)")]
+        public string Category { get; set; }
+
+        [FieldDefinition(8, Label = "Priority", Type = FieldType.Select, SelectOptions = typeof(FreeboxDownloadPriority), HelpText = "Priority to use when grabbing")]
+        public int Priority { get; set; }
+
+        [FieldDefinition(10, Label = "Add Paused", Type = FieldType.Checkbox)]
+        public bool AddPaused { get; set; }
+
+        public NzbDroneValidationResult Validate()
+        {
+            return new NzbDroneValidationResult(Validator.Validate(this));
+        }
+    }
+}

src/NzbDrone.Core/Download/Clients/FreeboxDownload/Responses/FreeboxDownloadConfiguration.cs

@@ -0,0 +1,21 @@
+using Newtonsoft.Json;
+
+namespace NzbDrone.Core.Download.Clients.FreeboxDownload.Responses
+{
+    public class FreeboxDownloadConfiguration
+    {
+        [JsonProperty(PropertyName = "download_dir")]
+        public string DownloadDirectory { get; set; }
+        public string DecodedDownloadDirectory
+        {
+            get
+            {
+                return DownloadDirectory.DecodeBase64();
+            }
+            set
+            {
+                DownloadDirectory = value.EncodeBase64();
+            }
+        }
+    }
+}

src/NzbDrone.Core/Download/Clients/FreeboxDownload/Responses/FreeboxDownloadTask.cs

@@ -0,0 +1,137 @@
+using System.Collections.Generic;
+using Newtonsoft.Json;
+using NzbDrone.Common.Serializer;
+
+namespace NzbDrone.Core.Download.Clients.FreeboxDownload.Responses
+{
+    public enum FreeboxDownloadTaskType
+    {
+        Bt,
+        Nzb,
+        Http,
+        Ftp
+    }
+
+    public enum FreeboxDownloadTaskStatus
+    {
+        Unknown,
+        Stopped,
+        Queued,
+        Starting,
+        Downloading,
+        Stopping,
+        Error,
+        Done,
+        Checking,
+        Repairing,
+        Extracting,
+        Seeding,
+        Retry
+    }
+
+    public enum FreeboxDownloadTaskIoPriority
+    {
+        Low,
+        Normal,
+        High
+    }
+
+    public class FreeboxDownloadTask
+    {
+        private static readonly Dictionary<string, string> Descriptions;
+
+        [JsonProperty(PropertyName = "id")]
+        public string Id { get; set; }
+        [JsonProperty(PropertyName = "name")]
+        public string Name { get; set; }
+        [JsonProperty(PropertyName = "download_dir")]
+        public string DownloadDirectory { get; set; }
+        public string DecodedDownloadDirectory
+        {
+            get
+            {
+                return DownloadDirectory.DecodeBase64();
+            }
+            set
+            {
+                DownloadDirectory = value.EncodeBase64();
+            }
+        }
+
+        [JsonProperty(PropertyName = "info_hash")]
+        public string InfoHash { get; set; }
+        [JsonProperty(PropertyName = "queue_pos")]
+        public int QueuePosition { get; set; }
+        [JsonConverter(typeof(UnderscoreStringEnumConverter), FreeboxDownloadTaskStatus.Unknown)]
+        public FreeboxDownloadTaskStatus Status { get; set; }
+        [JsonProperty(PropertyName = "eta")]
+        public long Eta { get; set; }
+        [JsonProperty(PropertyName = "error")]
+        public string Error { get; set; }
+        [JsonProperty(PropertyName = "type")]
+        public string Type { get; set; }
+        [JsonProperty(PropertyName = "io_priority")]
+        public string IoPriority { get; set; }
+        [JsonProperty(PropertyName = "stop_ratio")]
+        public long StopRatio { get; set; }
+        [JsonProperty(PropertyName = "piece_length")]
+        public long PieceLength { get; set; }
+        [JsonProperty(PropertyName = "created_ts")]
+        public long CreatedTimestamp { get; set; }
+        [JsonProperty(PropertyName = "size")]
+        public long Size { get; set; }
+        [JsonProperty(PropertyName = "rx_pct")]
+        public long ReceivedPrct { get; set; }
+        [JsonProperty(PropertyName = "rx_bytes")]
+        public long ReceivedBytes { get; set; }
+        [JsonProperty(PropertyName = "rx_rate")]
+        public long ReceivedRate { get; set; }
+        [JsonProperty(PropertyName = "tx_pct")]
+        public long TransmittedPrct { get; set; }
+        [JsonProperty(PropertyName = "tx_bytes")]
+        public long TransmittedBytes { get; set; }
+        [JsonProperty(PropertyName = "tx_rate")]
+        public long TransmittedRate { get; set; }
+
+        static FreeboxDownloadTask()
+        {
+            Descriptions = new Dictionary<string, string>
+            {
+                { "internal", "Internal error." },
+                { "disk_full", "The disk is full." },
+                { "unknown", "Unknown error." },
+                { "parse_error", "Parse error." },
+                { "unknown_host", "Unknown host." },
+                { "timeout", "Timeout." },
+                { "bad_authentication", "Invalid credentials." },
+                { "connection_refused", "Remote host refused connection." },
+                { "bt_tracker_error", "Unable to announce on tracker." },
+                { "bt_missing_files", "Missing torrent files." },
+                { "bt_file_error", "Error accessing torrent files." },
+                { "missing_ctx_file", "Error accessing task context file." },
+                { "nzb_no_group", "Cannot find the requested group on server." },
+                { "nzb_not_found", "Article not fount on the server." },
+                { "nzb_invalid_crc", "Invalid article CRC." },
+                { "nzb_invalid_size", "Invalid article size." },
+                { "nzb_invalid_filename", "Invalid filename." },
+                { "nzb_open_failed", "Error opening." },
+                { "nzb_write_failed", "Error writing." },
+                { "nzb_missing_size", "Missing article size." },
+                { "nzb_decode_error", "Article decoding error." },
+                { "nzb_missing_segments", "Missing article segments." },
+                { "nzb_error", "Other nzb error." },
+                { "nzb_authentication_required", "Nzb server need authentication." }
+            };
+        }
+
+        public string GetErrorDescription()
+        {
+            if (Descriptions.ContainsKey(Error))
+            {
+                return Descriptions[Error];
+            }
+
+            return $"{Error} - Unknown error";
+        }
+    }
+}

src/NzbDrone.Core/Download/Clients/FreeboxDownload/Responses/FreeboxLogin.cs

@@ -0,0 +1,18 @@
+using Newtonsoft.Json;
+
+namespace NzbDrone.Core.Download.Clients.FreeboxDownload.Responses
+{
+    public class FreeboxLogin
+    {
+        [JsonProperty(PropertyName = "logged_in")]
+        public bool LoggedIn { get; set; }
+        [JsonProperty(PropertyName = "challenge")]
+        public string Challenge { get; set; }
+        [JsonProperty(PropertyName = "password_salt")]
+        public string PasswordSalt { get; set; }
+        [JsonProperty(PropertyName = "password_set")]
+        public bool PasswordSet { get; set; }
+        [JsonProperty(PropertyName = "session_token")]
+        public string SessionToken { get; set; }
+    }
+}

src/NzbDrone.Core/Download/Clients/FreeboxDownload/Responses/FreeboxResponse.cs

@@ -0,0 +1,69 @@
+using System.Collections.Generic;
+using Newtonsoft.Json;
+
+namespace NzbDrone.Core.Download.Clients.FreeboxDownload.Responses
+{
+    public class FreeboxResponse<T>
+    {
+        private static readonly Dictionary<string, string> Descriptions;
+
+        [JsonProperty(PropertyName = "success")]
+        public bool Success { get; set; }
+        [JsonProperty(PropertyName = "msg")]
+        public string Message { get; set; }
+        [JsonProperty(PropertyName = "error_code")]
+        public string ErrorCode { get; set; }
+        [JsonProperty(PropertyName = "result")]
+        public T Result { get; set; }
+
+        static FreeboxResponse()
+        {
+            Descriptions = new Dictionary<string, string>
+            {
+                // Common errors
+                { "invalid_request", "Your request is invalid." },
+                { "invalid_api_version", "Invalid API base url or unknown API version." },
+                { "internal_error", "Internal error." },
+
+                // Login API errors
+                { "auth_required", "Invalid session token, or no session token sent." },
+                { "invalid_token", "The app token you are trying to use is invalid or has been revoked." },
+                { "pending_token", "The app token you are trying to use has not been validated by user yet." },
+                { "insufficient_rights", "Your app permissions does not allow accessing this API." },
+                { "denied_from_external_ip", "You are trying to get an app_token from a remote IP." },
+                { "ratelimited", "Too many auth error have been made from your IP." },
+                { "new_apps_denied", "New application token request has been disabled." },
+                { "apps_denied", "API access from apps has been disabled." },
+
+                // Download API errors
+                { "task_not_found", "No task was found with the given id." },
+                { "invalid_operation", "Attempt to perform an invalid operation." },
+                { "invalid_file", "Error with the download file (invalid format ?)." },
+                { "invalid_url", "URL is invalid." },
+                { "not_implemented", "Method not implemented." },
+                { "out_of_memory", "No more memory available to perform the requested action." },
+                { "invalid_task_type", "The task type is invalid." },
+                { "hibernating", "The downloader is hibernating." },
+                { "need_bt_stopped_done", "This action is only valid for Bittorrent task in stopped or done state." },
+                { "bt_tracker_not_found", "Attempt to access an invalid tracker object." },
+                { "too_many_tasks", "Too many tasks." },
+                { "invalid_address", "Invalid peer address." },
+                { "port_conflict", "Port conflict when setting config." },
+                { "invalid_priority", "Invalid priority." },
+                { "ctx_file_error", "Failed to initialize task context file (need to check disk)." },
+                { "exists", "Same task already exists." },
+                { "port_outside_range", "Incoming port is not available for this customer." }
+            };
+        }
+
+        public string GetErrorDescription()
+        {
+            if (Descriptions.ContainsKey(ErrorCode))
+            {
+                return Descriptions[ErrorCode];
+            }
+
+            return $"{ErrorCode} - Unknown error";
+        }
+    }
+}

src/NzbDrone.Core/Download/Clients/FreeboxDownload/TorrentFreeboxDownload.cs

@@ -0,0 +1,137 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text.RegularExpressions;
+using FluentValidation.Results;
+using NLog;
+using NzbDrone.Common.Disk;
+using NzbDrone.Common.Extensions;
+using NzbDrone.Common.Http;
+using NzbDrone.Core.Configuration;
+using NzbDrone.Core.Download.Clients.FreeboxDownload.Responses;
+using NzbDrone.Core.Parser.Model;
+
+namespace NzbDrone.Core.Download.Clients.FreeboxDownload
+{
+    public class TorrentFreeboxDownload : TorrentClientBase<FreeboxDownloadSettings>
+    {
+        private readonly IFreeboxDownloadProxy _proxy;
+
+        public TorrentFreeboxDownload(IFreeboxDownloadProxy proxy,
+            ITorrentFileInfoReader torrentFileInfoReader,
+            IHttpClient httpClient,
+            IConfigService configService,
+            IDiskProvider diskProvider,
+            Logger logger)
+            : base(torrentFileInfoReader, httpClient, configService, diskProvider, logger)
+        {
+            _proxy = proxy;
+        }
+
+        public override string Name => "Freebox Download";
+
+        public override bool SupportsCategories => true;
+
+        protected IEnumerable<FreeboxDownloadTask> GetTorrents()
+        {
+            return _proxy.GetTasks(Settings).Where(v => v.Type.ToLower() == FreeboxDownloadTaskType.Bt.ToString().ToLower());
+        }
+
+        protected override string AddFromMagnetLink(ReleaseInfo release, string hash, string magnetLink)
+        {
+            return _proxy.AddTaskFromUrl(magnetLink,
+                                         GetDownloadDirectory(release).EncodeBase64(),
+                                         ToBePaused(),
+                                         ToBeQueuedFirst(),
+                                         Settings);
+        }
+
+        protected override string AddFromTorrentFile(ReleaseInfo release, string hash, string filename, byte[] fileContent)
+        {
+            return _proxy.AddTaskFromFile(filename,
+                                          fileContent,
+                                          GetDownloadDirectory(release).EncodeBase64(),
+                                          ToBePaused(),
+                                          ToBeQueuedFirst(),
+                                          Settings);
+        }
+
+        protected override string AddFromTorrentLink(ReleaseInfo release, string hash, string torrentLink)
+        {
+            return _proxy.AddTaskFromUrl(torrentLink,
+                                         GetDownloadDirectory(release).EncodeBase64(),
+                                         ToBePaused(),
+                                         ToBeQueuedFirst(),
+                                         Settings);
+        }
+
+        protected override void Test(List<ValidationFailure> failures)
+        {
+            try
+            {
+                _proxy.Authenticate(Settings);
+            }
+            catch (DownloadClientUnavailableException ex)
+            {
+                failures.Add(new ValidationFailure("Host", ex.Message));
+                failures.Add(new ValidationFailure("Port", ex.Message));
+            }
+            catch (DownloadClientAuthenticationException ex)
+            {
+                failures.Add(new ValidationFailure("AppId", ex.Message));
+                failures.Add(new ValidationFailure("AppToken", ex.Message));
+            }
+            catch (FreeboxDownloadException ex)
+            {
+                failures.Add(new ValidationFailure("ApiUrl", ex.Message));
+            }
+        }
+
+        protected override void ValidateCategories(List<ValidationFailure> failures)
+        {
+            base.ValidateCategories(failures);
+
+            foreach (var label in Categories)
+            {
+                if (!Regex.IsMatch(label.ClientCategory, "^\\.?[-a-z]*$"))
+                {
+                    failures.AddIfNotNull(new ValidationFailure(string.Empty, "Mapped Categories allowed characters a-z and -"));
+                }
+            }
+        }
+
+        private string GetDownloadDirectory(ReleaseInfo release)
+        {
+            if (Settings.DestinationDirectory.IsNotNullOrWhiteSpace())
+            {
+                return Settings.DestinationDirectory.TrimEnd('/');
+            }
+
+            var destDir = _proxy.GetDownloadConfiguration(Settings).DecodedDownloadDirectory.TrimEnd('/');
+
+            if (Settings.Category.IsNotNullOrWhiteSpace())
+            {
+                var category = GetCategoryForRelease(release) ?? Settings.Category;
+
+                destDir = $"{destDir}/{category}";
+            }
+
+            return destDir;
+        }
+
+        private bool ToBeQueuedFirst()
+        {
+            if (Settings.Priority == (int)FreeboxDownloadPriority.First)
+            {
+                return true;
+            }
+
+            return false;
+        }
+
+        private bool ToBePaused()
+        {
+            return Settings.AddPaused;
+        }
+    }
+}

src/NzbDrone.Core/HealthCheck/Checks/ReleaseBranchCheck.cs

@@ -31,6 +31,7 @@ namespace NzbDrone.Core.HealthCheck.Checks
 
         public enum ReleaseBranches
         {
+            Master,
             Develop,
             Nightly
         }

src/NzbDrone.Core/HealthCheck/HealthCheckService.cs

@@ -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()

src/NzbDrone.Core/Http/CloudFlare/CloudFlareDetectionService.cs

@@ -1,7 +1,7 @@
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Net;
-using System.Text.RegularExpressions;
 using NLog;
 using NzbDrone.Common.Http;
 
@@ -9,7 +9,7 @@ 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,7 +28,15 @@ 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

src/NzbDrone.Core/IndexerProxies/FlareSolverr/FlareSolverr.cs

@@ -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);

src/NzbDrone.Core/IndexerSearch/Definitions/BookSearchCriteria.cs

@@ -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();
     }
 }

src/NzbDrone.Core/IndexerSearch/Definitions/MovieSearchCriteria.cs

@@ -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);
 

src/NzbDrone.Core/IndexerSearch/Definitions/MusicSearchCriteria.cs

@@ -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();
     }
 }

src/NzbDrone.Core/IndexerSearch/Definitions/SearchCriteriaBase.cs

@@ -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
+        public override string ToString() => $"{SearchQuery}, Offset: {Offset ?? 0}, Limit: {Limit ?? 0}, Categories: [{string.Join(", ", Categories)}]";
+
+        public virtual string SearchQuery => $"Term: [{SearchTerm}]";
+
+        public virtual bool RssSearch => SearchTerm.IsNullOrWhiteSpace();
+
+        public string SanitizedSearchTerm => GetSanitizedTerm(SearchTerm);
+
+        private static string GetSanitizedTerm(string term)
         {
-            get
-            {
-                return $"Term: [{SearchTerm}]";
-            }
-        }
+            term ??= "";
 
-        public override string ToString()
-        {
-            return $"{SearchQuery}, Offset: {Offset ?? 0}, Limit: {Limit ?? 0}, Categories: [{string.Join(", ", Categories)}]";
-        }
+            term = StandardizeDashesRegex.Replace(term, "-");
+            term = StandardizeSingleQuotesRegex.Replace(term, "'");
 
-        public virtual bool RssSearch
-        {
-            get
-            {
-                if (SearchTerm.IsNullOrWhiteSpace())
-                {
-                    return true;
-                }
+            var safeTitle = term.Where(c => char.IsLetterOrDigit(c) || char.IsWhiteSpace(c) || c is '-' or '.' or '_' or '(' or ')' or '@' or '/' or '\'' or '[' or ']' or '+' or '%');
 
-                return false;
-            }
-        }
-
-        public string SanitizedSearchTerm
-        {
-            get
-            {
-                var term = SearchTerm;
-                if (SearchTerm == null)
-                {
-                    term = "";
-                }
-
-                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);
-            }
+            return string.Concat(safeTitle);
         }
     }
 }

src/NzbDrone.Core/IndexerSearch/Definitions/TvSearchCriteria.cs

@@ -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
         {

src/NzbDrone.Core/IndexerSearch/NewznabResults.cs

@@ -93,12 +93,13 @@ namespace NzbDrone.Core.IndexerSearch
                             r.Languages == null ? null : from c in r.Languages select GetNabElement("language", c, protocol),
                             r.Subs == null ? null : from c in r.Subs select GetNabElement("subs", c, protocol),
                             r.Genres == null ? null : GetNabElement("genre", string.Join(", ", r.Genres), protocol),
-                            GetNabElement("rageid", r.TvRageId, protocol),
-                            GetNabElement("tvdbid", r.TvdbId, protocol),
-                            GetNabElement("imdb", r.ImdbId.ToString("D7"), protocol),
-                            GetNabElement("tmdbid", r.TmdbId, protocol),
-                            GetNabElement("traktid", r.TraktId, protocol),
-                            GetNabElement("doubanid", r.DoubanId, protocol),
+                            r.TvRageId == 0 ? null : GetNabElement("rageid", r.TvRageId, protocol),
+                            r.TvdbId == 0 ? null : GetNabElement("tvdbid", r.TvdbId, protocol),
+                            r.ImdbId == 0 ? null : GetNabElement("imdb", r.ImdbId.ToString("D7"), protocol),
+                            r.TmdbId == 0 ? null : GetNabElement("tmdbid", r.TmdbId, protocol),
+                            r.TraktId == 0 ? null : GetNabElement("traktid", r.TraktId, protocol),
+                            r.TvMazeId == 0 ? null : GetNabElement("tvmazeid", r.TvMazeId, protocol),
+                            r.DoubanId == 0 ? null : GetNabElement("doubanid", r.DoubanId, protocol),
                             GetNabElement("seeders", t.Seeders, protocol),
                             GetNabElement("files", r.Files, protocol),
                             GetNabElement("grabs", r.Grabs, protocol),

src/NzbDrone.Core/IndexerVersions/IndexerDefinitionUpdateService.cs

@@ -29,7 +29,7 @@ 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>()

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

@@ -1,85 +1,120 @@
 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[] { "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)
+        : base(httpClient, eventAggregator, indexerStatusService, configService, logger)
     {
-        public override string Name => "AlphaRatio";
-        public override string[] IndexerUrls => new string[] { "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)
-            : base(httpClient, eventAggregator, indexerStatusService, configService, logger)
-        {
-        }
-
-        public override IIndexerRequestGenerator GetRequestGenerator()
-        {
-            return new AlphaRatioRequestGenerator()
-            {
-                Settings = Settings,
-                HttpClient = _httpClient,
-                Logger = _logger,
-                Capabilities = Capabilities
-            };
-        }
-
-        protected override IndexerCapabilities SetCapabilities()
-        {
-            var caps = new IndexerCapabilities
-            {
-                TvSearchParams = new List<TvSearchParam>
-                       {
-                           TvSearchParam.Q, TvSearchParam.Season, TvSearchParam.Ep
-                       },
-                MovieSearchParams = new List<MovieSearchParam>
-                       {
-                           MovieSearchParam.Q
-                       }
-            };
-
-            caps.Categories.AddCategoryMapping(1, NewznabStandardCategory.TVSD, "TvSD");
-            caps.Categories.AddCategoryMapping(2, NewznabStandardCategory.TVHD, "TvHD");
-            caps.Categories.AddCategoryMapping(3, NewznabStandardCategory.TVUHD, "TvUHD");
-            caps.Categories.AddCategoryMapping(4, NewznabStandardCategory.TVSD, "TvDVDRip");
-            caps.Categories.AddCategoryMapping(5, NewznabStandardCategory.TVSD, "TvPackSD");
-            caps.Categories.AddCategoryMapping(6, NewznabStandardCategory.TVHD, "TvPackHD");
-            caps.Categories.AddCategoryMapping(7, NewznabStandardCategory.TVUHD, "TvPackUHD");
-            caps.Categories.AddCategoryMapping(8, NewznabStandardCategory.MoviesSD, "MovieSD");
-            caps.Categories.AddCategoryMapping(9, NewznabStandardCategory.MoviesHD, "MovieHD");
-            caps.Categories.AddCategoryMapping(10, NewznabStandardCategory.MoviesUHD, "MovieUHD");
-            caps.Categories.AddCategoryMapping(11, NewznabStandardCategory.MoviesSD, "MoviePackSD");
-            caps.Categories.AddCategoryMapping(12, NewznabStandardCategory.MoviesHD, "MoviePackHD");
-            caps.Categories.AddCategoryMapping(13, NewznabStandardCategory.MoviesUHD, "MoviePackUHD");
-            caps.Categories.AddCategoryMapping(14, NewznabStandardCategory.XXX, "MovieXXX");
-            caps.Categories.AddCategoryMapping(15, NewznabStandardCategory.MoviesBluRay, "Bluray");
-            caps.Categories.AddCategoryMapping(16, NewznabStandardCategory.TVAnime, "AnimeSD");
-            caps.Categories.AddCategoryMapping(17, NewznabStandardCategory.TVAnime, "AnimeHD");
-            caps.Categories.AddCategoryMapping(18, NewznabStandardCategory.PCGames, "GamesPC");
-            caps.Categories.AddCategoryMapping(19, NewznabStandardCategory.ConsoleXBox, "GamesxBox");
-            caps.Categories.AddCategoryMapping(20, NewznabStandardCategory.ConsolePS4, "GamesPS");
-            caps.Categories.AddCategoryMapping(21, NewznabStandardCategory.ConsoleWii, "GamesNin");
-            caps.Categories.AddCategoryMapping(22, NewznabStandardCategory.PC0day, "AppsWindows");
-            caps.Categories.AddCategoryMapping(23, NewznabStandardCategory.PCMac, "AppsMAC");
-            caps.Categories.AddCategoryMapping(24, NewznabStandardCategory.PC0day, "AppsLinux");
-            caps.Categories.AddCategoryMapping(25, NewznabStandardCategory.PCMobileOther, "AppsMobile");
-            caps.Categories.AddCategoryMapping(26, NewznabStandardCategory.XXX, "0dayXXX");
-            caps.Categories.AddCategoryMapping(27, NewznabStandardCategory.Books, "eBook");
-            caps.Categories.AddCategoryMapping(28, NewznabStandardCategory.AudioAudiobook, "AudioBook");
-            caps.Categories.AddCategoryMapping(29, NewznabStandardCategory.AudioOther, "Music");
-            caps.Categories.AddCategoryMapping(30, NewznabStandardCategory.Other, "Misc");
-
-            return caps;
-        }
     }
 
-    public class AlphaRatioRequestGenerator : Gazelle.GazelleRequestGenerator
+    public override IIndexerRequestGenerator GetRequestGenerator()
     {
-        protected override bool ImdbInTags => true;
+        return new AlphaRatioRequestGenerator(Settings, Capabilities, _httpClient, _logger);
+    }
+
+    protected override IndexerCapabilities SetCapabilities()
+    {
+        var caps = new IndexerCapabilities
+        {
+            TvSearchParams = new List<TvSearchParam>
+            {
+                TvSearchParam.Q, TvSearchParam.Season, TvSearchParam.Ep
+            },
+            MovieSearchParams = new List<MovieSearchParam>
+            {
+                MovieSearchParam.Q
+            }
+        };
+
+        caps.Categories.AddCategoryMapping(1, NewznabStandardCategory.TVSD, "TvSD");
+        caps.Categories.AddCategoryMapping(2, NewznabStandardCategory.TVHD, "TvHD");
+        caps.Categories.AddCategoryMapping(3, NewznabStandardCategory.TVUHD, "TvUHD");
+        caps.Categories.AddCategoryMapping(4, NewznabStandardCategory.TVSD, "TvDVDRip");
+        caps.Categories.AddCategoryMapping(5, NewznabStandardCategory.TVSD, "TvPackSD");
+        caps.Categories.AddCategoryMapping(6, NewznabStandardCategory.TVHD, "TvPackHD");
+        caps.Categories.AddCategoryMapping(7, NewznabStandardCategory.TVUHD, "TvPackUHD");
+        caps.Categories.AddCategoryMapping(8, NewznabStandardCategory.MoviesSD, "MovieSD");
+        caps.Categories.AddCategoryMapping(9, NewznabStandardCategory.MoviesHD, "MovieHD");
+        caps.Categories.AddCategoryMapping(10, NewznabStandardCategory.MoviesUHD, "MovieUHD");
+        caps.Categories.AddCategoryMapping(11, NewznabStandardCategory.MoviesSD, "MoviePackSD");
+        caps.Categories.AddCategoryMapping(12, NewznabStandardCategory.MoviesHD, "MoviePackHD");
+        caps.Categories.AddCategoryMapping(13, NewznabStandardCategory.MoviesUHD, "MoviePackUHD");
+        caps.Categories.AddCategoryMapping(14, NewznabStandardCategory.XXX, "MovieXXX");
+        caps.Categories.AddCategoryMapping(15, NewznabStandardCategory.MoviesBluRay, "Bluray");
+        caps.Categories.AddCategoryMapping(16, NewznabStandardCategory.TVAnime, "AnimeSD");
+        caps.Categories.AddCategoryMapping(17, NewznabStandardCategory.TVAnime, "AnimeHD");
+        caps.Categories.AddCategoryMapping(18, NewznabStandardCategory.PCGames, "GamesPC");
+        caps.Categories.AddCategoryMapping(19, NewznabStandardCategory.ConsoleXBox, "GamesxBox");
+        caps.Categories.AddCategoryMapping(20, NewznabStandardCategory.ConsolePS4, "GamesPS");
+        caps.Categories.AddCategoryMapping(21, NewznabStandardCategory.ConsoleWii, "GamesNin");
+        caps.Categories.AddCategoryMapping(22, NewznabStandardCategory.PC0day, "AppsWindows");
+        caps.Categories.AddCategoryMapping(23, NewznabStandardCategory.PCMac, "AppsMAC");
+        caps.Categories.AddCategoryMapping(24, NewznabStandardCategory.PC0day, "AppsLinux");
+        caps.Categories.AddCategoryMapping(25, NewznabStandardCategory.PCMobileOther, "AppsMobile");
+        caps.Categories.AddCategoryMapping(26, NewznabStandardCategory.XXX, "0dayXXX");
+        caps.Categories.AddCategoryMapping(27, NewznabStandardCategory.Books, "eBook");
+        caps.Categories.AddCategoryMapping(28, NewznabStandardCategory.AudioAudiobook, "AudioBook");
+        caps.Categories.AddCategoryMapping(29, NewznabStandardCategory.AudioOther, "Music");
+        caps.Categories.AddCategoryMapping(30, NewznabStandardCategory.Other, "Misc");
+
+        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;
+    }
+
+    protected override NameValueCollection GetBasicSearchParameters(string term, int[] categories)
+    {
+        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; }
+}

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

@@ -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,
+    }
+}

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

@@ -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,33 +247,37 @@ 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>
-            {
-                { "/anime_tv/full", "14" },
-                { "/anime_tv/anime_ongoing", "10" },
-                { "/anime_tv/shonen", "11" },
-                { "/anime_tv", "2" },
-                { "/xxx", "13" },
-                { "/manga", "15" },
-                { "/ost", "16" },
-                { "/podcast", "17" },
-                { "/anime_movie", "3" },
-                { "/anime_ova/anime_ona", "5" },
-                { "/anime_ova", "4" },
-                { "/dorama/japan_dorama", "6" },
-                { "/dorama/korea_dorama", "7" },
-                { "/dorama/china_dorama", "8" },
-                { "/dorama", "9" },
-                { "/anons_ongoing", "12" }
-            };
+        private static Dictionary<string, string> CategoriesMap => new ()
+        {
+            { "/anime_tv/full", "14" },
+            { "/anime_tv/anime_ongoing", "10" },
+            { "/anime_tv/shonen", "11" },
+            { "/anime_tv", "2" },
+            { "/xxx", "13" },
+            { "/manga", "15" },
+            { "/ost", "16" },
+            { "/podcast", "17" },
+            { "/anime_movie", "3" },
+            { "/anime_ova/anime_ona", "5" },
+            { "/anime_ova", "4" },
+            { "/dorama/japan_dorama", "6" },
+            { "/dorama/korea_dorama", "7" },
+            { "/dorama/china_dorama", "8" },
+            { "/dorama", "9" },
+            { "/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));

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

@@ -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()
         {

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

@@ -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()
@@ -100,13 +91,13 @@ namespace NzbDrone.Core.Indexers.Definitions
             var caps = new IndexerCapabilities
             {
                 TvSearchParams = new List<TvSearchParam>
-                       {
-                           TvSearchParam.Q, TvSearchParam.Season, TvSearchParam.Ep
-                       },
+                {
+                    TvSearchParam.Q, TvSearchParam.Season, TvSearchParam.Ep
+                },
                 MovieSearchParams = new List<MovieSearchParam>
-                       {
-                           MovieSearchParam.Q
-                       }
+                {
+                    MovieSearchParam.Q
+                }
             };
 
             caps.Categories.AddCategoryMapping(1, NewznabStandardCategory.MoviesSD, "Anime Movie");
@@ -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;

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

@@ -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()
@@ -51,38 +48,40 @@ namespace NzbDrone.Core.Indexers.Definitions
             var caps = new IndexerCapabilities
             {
                 TvSearchParams = new List<TvSearchParam>
-                                   {
-                                       TvSearchParam.Q, TvSearchParam.Season, TvSearchParam.Ep
-                                   },
+                {
+                    TvSearchParam.Q, TvSearchParam.Season, TvSearchParam.Ep
+                },
                 MovieSearchParams = new List<MovieSearchParam>
-                                   {
-                                       MovieSearchParam.Q
-                                   }
+                {
+                    MovieSearchParam.Q
+                }
             };
+
             caps.Categories.AddCategoryMapping(1, NewznabStandardCategory.TVAnime, "TV 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));

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

@@ -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()
@@ -108,13 +95,13 @@ namespace NzbDrone.Core.Indexers.Definitions
             var caps = new IndexerCapabilities
             {
                 TvSearchParams = new List<TvSearchParam>
-                                   {
-                                       TvSearchParam.Q, TvSearchParam.Season, TvSearchParam.Ep
-                                   },
+                {
+                    TvSearchParam.Q, TvSearchParam.Season, TvSearchParam.Ep
+                },
                 MovieSearchParams = new List<MovieSearchParam>
-                                   {
-                                       MovieSearchParam.Q
-                                   }
+                {
+                    MovieSearchParam.Q
+                }
             };
 
             caps.Categories.AddCategoryMapping("1", NewznabStandardCategory.Movies, "Film/Feature");
@@ -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('/'));

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

@@ -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; }
+}

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

@@ -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,18 +34,23 @@ namespace NzbDrone.Core.Indexers.Definitions
             };
         }
 
+        public override IParseIndexerResponse GetParser()
+        {
+            return new AvistaZParser();
+        }
+
         protected override IndexerCapabilities SetCapabilities()
         {
             var caps = new IndexerCapabilities
             {
                 TvSearchParams = new List<TvSearchParam>
-                       {
-                           TvSearchParam.Q, TvSearchParam.Season, TvSearchParam.Ep, TvSearchParam.ImdbId, TvSearchParam.TvdbId, TvSearchParam.Genre
-                       },
+                {
+                    TvSearchParam.Q, TvSearchParam.Season, TvSearchParam.Ep, TvSearchParam.ImdbId, TvSearchParam.TvdbId, TvSearchParam.Genre
+                },
                 MovieSearchParams = new List<MovieSearchParam>
-                       {
-                           MovieSearchParam.Q, MovieSearchParam.ImdbId, MovieSearchParam.TmdbId, MovieSearchParam.Genre
-                       }
+                {
+                    MovieSearchParam.Q, MovieSearchParam.ImdbId, MovieSearchParam.TmdbId, MovieSearchParam.Genre
+                }
             };
 
             caps.Categories.AddCategoryMapping(1, NewznabStandardCategory.Movies);
@@ -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";
+    }
 }

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

@@ -1,4 +1,3 @@
-using System;
 using System.Collections.Generic;
 using Newtonsoft.Json;
 

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

@@ -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)
@@ -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)

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

@@ -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,

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

@@ -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))
@@ -73,7 +69,8 @@ namespace NzbDrone.Core.Indexers.Definitions.Avistaz
         {
             var searchUrl = SearchUrl + "?" + searchParameters.GetQueryString();
 
-            var request = new IndexerRequest(searchUrl, HttpAccept.Json);
+            // TODO: Change to HttpAccept.Json after they fix the issue with missing headers
+            var request = new IndexerRequest(searchUrl, HttpAccept.Html);
             request.HttpRequest.Headers.Add("Authorization", $"Bearer {Settings.Token}");
 
             yield return request;

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

@@ -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")]

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

@@ -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()
@@ -118,21 +102,21 @@ namespace NzbDrone.Core.Indexers.Definitions
             var caps = new IndexerCapabilities
             {
                 TvSearchParams = new List<TvSearchParam>
-                                   {
-                                       TvSearchParam.Q, TvSearchParam.Season, TvSearchParam.Ep
-                                   },
+                {
+                    TvSearchParam.Q, TvSearchParam.Season, TvSearchParam.Ep
+                },
                 MovieSearchParams = new List<MovieSearchParam>
-                                   {
-                                       MovieSearchParam.Q
-                                   },
+                {
+                    MovieSearchParam.Q
+                },
                 MusicSearchParams = new List<MusicSearchParam>
-                                   {
-                                       MusicSearchParam.Q
-                                   },
+                {
+                    MusicSearchParam.Q
+                },
                 BookSearchParams = new List<BookSearchParam>
-                                   {
-                                       BookSearchParam.Q
-                                   }
+                {
+                    BookSearchParam.Q
+                }
             };
 
             caps.Categories.AddCategoryMapping(1, NewznabStandardCategory.Audio);
@@ -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('/'));

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

@@ -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()
@@ -52,14 +50,14 @@ namespace NzbDrone.Core.Indexers.Definitions
         public override async Task<byte[]> Download(Uri link)
         {
             var request = new HttpRequestBuilder(link.ToString())
-                        .SetCookies(GetCookies() ?? new Dictionary<string, string>())
-                        .Build();
+                .SetCookies(GetCookies() ?? new Dictionary<string, string>())
+                .Build();
 
             var response = await _httpClient.ExecuteProxiedAsync(request, Definition);
 
             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()
@@ -130,21 +120,21 @@ namespace NzbDrone.Core.Indexers.Definitions
             var caps = new IndexerCapabilities
             {
                 TvSearchParams = new List<TvSearchParam>
-                       {
-                           TvSearchParam.Q, TvSearchParam.Season, TvSearchParam.Ep
-                       },
+                {
+                    TvSearchParam.Q, TvSearchParam.Season, TvSearchParam.Ep
+                },
                 MovieSearchParams = new List<MovieSearchParam>
-                       {
-                           MovieSearchParam.Q
-                       },
+                {
+                    MovieSearchParam.Q
+                },
                 MusicSearchParams = new List<MusicSearchParam>
-                       {
-                           MusicSearchParam.Q
-                       },
+                {
+                    MusicSearchParam.Q
+                },
                 BookSearchParams = new List<BookSearchParam>
-                       {
-                           BookSearchParam.Q
-                       }
+                {
+                    BookSearchParam.Q
+                }
             };
 
             caps.Categories.AddCategoryMapping(1, NewznabStandardCategory.TVAnime, "Anime Series");
@@ -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)
         {
@@ -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; }
 

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

@@ -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()
         {

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

@@ -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()
         {

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

@@ -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; }

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

@@ -1,38 +1,39 @@
 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[] { "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)
+        : base(httpClient, eventAggregator, indexerStatusService, configService, logger)
     {
-        public override string Name => "BrokenStones";
-        public override string[] IndexerUrls => new string[] { "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)
-            : base(httpClient, eventAggregator, indexerStatusService, configService, logger)
-        {
-        }
+    protected override IndexerCapabilities SetCapabilities()
+    {
+        var caps = new IndexerCapabilities();
 
-        protected override IndexerCapabilities SetCapabilities()
-        {
-            var caps = new IndexerCapabilities
-            {
-            };
+        caps.Categories.AddCategoryMapping(1, NewznabStandardCategory.PCMac, "MacOS Apps");
+        caps.Categories.AddCategoryMapping(2, NewznabStandardCategory.PCMac, "MacOS Games");
+        caps.Categories.AddCategoryMapping(3, NewznabStandardCategory.PCMobileiOS, "iOS Apps");
+        caps.Categories.AddCategoryMapping(4, NewznabStandardCategory.PCMobileiOS, "iOS Games");
+        caps.Categories.AddCategoryMapping(5, NewznabStandardCategory.Other, "Graphics");
+        caps.Categories.AddCategoryMapping(6, NewznabStandardCategory.Audio, "Audio");
+        caps.Categories.AddCategoryMapping(7, NewznabStandardCategory.Other, "Tutorials");
+        caps.Categories.AddCategoryMapping(8, NewznabStandardCategory.Other, "Other");
 
-            caps.Categories.AddCategoryMapping(1, NewznabStandardCategory.PCMac, "MacOS Apps");
-            caps.Categories.AddCategoryMapping(2, NewznabStandardCategory.PCMac, "MacOS Games");
-            caps.Categories.AddCategoryMapping(3, NewznabStandardCategory.PCMobileiOS, "iOS Apps");
-            caps.Categories.AddCategoryMapping(4, NewznabStandardCategory.PCMobileiOS, "iOS Games");
-            caps.Categories.AddCategoryMapping(5, NewznabStandardCategory.Other, "Graphics");
-            caps.Categories.AddCategoryMapping(6, NewznabStandardCategory.Audio, "Audio");
-            caps.Categories.AddCategoryMapping(7, NewznabStandardCategory.Other, "Tutorials");
-            caps.Categories.AddCategoryMapping(8, NewznabStandardCategory.Other, "Other");
-
-            return caps;
-        }
+        return caps;
     }
 }

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

@@ -1,37 +1,38 @@
 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[] { "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)
+        : base(httpClient, eventAggregator, indexerStatusService, configService, logger)
     {
-        public override string Name => "CGPeers";
-        public override string[] IndexerUrls => new string[] { "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)
-            : base(httpClient, eventAggregator, indexerStatusService, configService, logger)
-        {
-        }
+    protected override IndexerCapabilities SetCapabilities()
+    {
+        var caps = new IndexerCapabilities();
 
-        protected override IndexerCapabilities SetCapabilities()
-        {
-            var caps = new IndexerCapabilities
-            {
-            };
+        caps.Categories.AddCategoryMapping(1, NewznabStandardCategory.PCISO, "Full Applications");
+        caps.Categories.AddCategoryMapping(2, NewznabStandardCategory.PC0day, "Plugins");
+        caps.Categories.AddCategoryMapping(3, NewznabStandardCategory.Other, "Tutorials");
+        caps.Categories.AddCategoryMapping(4, NewznabStandardCategory.Other, "Models");
+        caps.Categories.AddCategoryMapping(5, NewznabStandardCategory.Other, "Materials");
+        caps.Categories.AddCategoryMapping(6, NewznabStandardCategory.OtherMisc, "Misc");
+        caps.Categories.AddCategoryMapping(7, NewznabStandardCategory.Other, "GameDev");
 
-            caps.Categories.AddCategoryMapping(1, NewznabStandardCategory.PCISO, "Full Applications");
-            caps.Categories.AddCategoryMapping(2, NewznabStandardCategory.PC0day, "Plugins");
-            caps.Categories.AddCategoryMapping(3, NewznabStandardCategory.Other, "Tutorials");
-            caps.Categories.AddCategoryMapping(4, NewznabStandardCategory.Other, "Models");
-            caps.Categories.AddCategoryMapping(5, NewznabStandardCategory.Other, "Materials");
-            caps.Categories.AddCategoryMapping(6, NewznabStandardCategory.OtherMisc, "Misc");
-            caps.Categories.AddCategoryMapping(7, NewznabStandardCategory.Other, "GameDev");
-
-            return caps;
-        }
+        return caps;
     }
 }

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

@@ -30,9 +30,24 @@ 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, () =>

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

@@ -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;
@@ -132,20 +132,22 @@ namespace NzbDrone.Core.Indexers.Cardigann
 
             if (selector.Selector != null)
             {
-                if (dom.Matches(selector.Selector))
+                var selectorSelector = ApplyGoTemplateText(selector.Selector, variables);
+
+                if (dom.Matches(selectorSelector))
                 {
                     selection = dom;
                 }
                 else
                 {
-                    selection = QuerySelector(dom, selector.Selector);
+                    selection = QuerySelector(dom, selectorSelector);
                 }
 
                 if (selection == null)
                 {
                     if (required)
                     {
-                        throw new Exception(string.Format("Selector \"{0}\" didn't match {1}", selector.Selector, dom.ToHtmlPretty()));
+                        throw new Exception(string.Format("Selector \"{0}\" didn't match {1}", selectorSelector, dom.ToHtmlPretty()));
                     }
 
                     return null;
@@ -678,6 +680,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);

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

@@ -41,6 +41,7 @@ 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;

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

@@ -40,12 +40,16 @@ 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)
                 {
-                    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.");
+                    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");

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

@@ -226,7 +226,7 @@ namespace NzbDrone.Core.Indexers.Cardigann
 
                 CheckForError(response, login.Error);
 
-                CookiesUpdater(Cookies, DateTime.Now + TimeSpan.FromDays(30));
+                CookiesUpdater(Cookies, DateTime.Now.AddDays(30));
             }
             else if (login.Method == "form")
             {
@@ -467,13 +467,13 @@ namespace NzbDrone.Core.Indexers.Cardigann
 
                 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")
             {
@@ -504,7 +504,7 @@ namespace NzbDrone.Core.Indexers.Cardigann
 
                 CheckForError(response, login.Error);
 
-                CookiesUpdater(Cookies, DateTime.Now + TimeSpan.FromDays(30));
+                CookiesUpdater(Cookies, DateTime.Now.AddDays(30));
             }
             else if (login.Method == "oneurl")
             {
@@ -529,7 +529,7 @@ namespace NzbDrone.Core.Indexers.Cardigann
 
                 CheckForError(response, login.Error);
 
-                CookiesUpdater(Cookies, DateTime.Now + TimeSpan.FromDays(30));
+                CookiesUpdater(Cookies, DateTime.Now.AddDays(30));
             }
             else
             {
@@ -716,15 +716,12 @@ namespace NzbDrone.Core.Indexers.Cardigann
 
             if (queryCollection.Count > 0)
             {
-                if (!requestLinkStr.Contains("?"))
+                if (!requestLinkStr.Contains('?'))
                 {
-                    // TODO Need Encoding here if we add it back
-                    requestLinkStr += "?" + queryCollection.GetQueryString(separator: request.Queryseparator).Substring(1);
-                }
-                else
-                {
-                    requestLinkStr += queryCollection.GetQueryString(separator: request.Queryseparator);
+                    requestLinkStr += "?";
                 }
+
+                requestLinkStr += queryCollection.GetQueryString(_encoding, separator: request.Queryseparator);
             }
 
             var httpRequest = new HttpRequestBuilder(requestLinkStr)

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

@@ -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;
         }

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

@@ -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;
 

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

@@ -1,92 +1,100 @@
 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[]
     {
-        public override string Name => "FileList.io";
-        public override string[] IndexerUrls => new string[] { "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;
-        public override bool SupportsRss => true;
-        public override bool SupportsSearch => true;
-        public override bool SupportsRedirect => true;
-        public override IndexerCapabilities Capabilities => SetCapabilities();
+        "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;
+    public override bool SupportsRss => true;
+    public override bool SupportsSearch => true;
+    public override bool SupportsRedirect => true;
+    public override IndexerCapabilities Capabilities => SetCapabilities();
 
-        public FileList(IIndexerHttpClient httpClient, IEventAggregator eventAggregator, IIndexerStatusService indexerStatusService, IConfigService configService, Logger logger)
-            : base(httpClient, eventAggregator, indexerStatusService, configService, 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 };
-        }
+    public override IIndexerRequestGenerator GetRequestGenerator()
+    {
+        return new FileListRequestGenerator { Settings = Settings, Capabilities = Capabilities };
+    }
 
-        public override IParseIndexerResponse GetParser()
-        {
-            return new FileListParser(Settings, Capabilities.Categories);
-        }
+    public override IParseIndexerResponse GetParser()
+    {
+        return new FileListParser(Settings, Capabilities.Categories);
+    }
 
-        private IndexerCapabilities SetCapabilities()
+    private IndexerCapabilities SetCapabilities()
+    {
+        var caps = new IndexerCapabilities
         {
-            var caps = new IndexerCapabilities
+            TvSearchParams = new List<TvSearchParam>
             {
-                TvSearchParams = new List<TvSearchParam>
-                       {
-                           TvSearchParam.Q, TvSearchParam.Season, TvSearchParam.Ep
-                       },
-                MovieSearchParams = new List<MovieSearchParam>
-                       {
-                           MovieSearchParam.Q, MovieSearchParam.ImdbId
-                       },
-                MusicSearchParams = new List<MusicSearchParam>
-                       {
-                           MusicSearchParam.Q
-                       },
-                BookSearchParams = new List<BookSearchParam>
-                       {
-                           BookSearchParam.Q
-                       },
-                Flags = new List<IndexerFlag>
-                {
-                    IndexerFlag.FreeLeech
-                }
-            };
+                TvSearchParam.Q, TvSearchParam.ImdbId, TvSearchParam.Season, TvSearchParam.Ep
+            },
+            MovieSearchParams = new List<MovieSearchParam>
+            {
+                MovieSearchParam.Q, MovieSearchParam.ImdbId
+            },
+            MusicSearchParams = new List<MusicSearchParam>
+            {
+                MusicSearchParam.Q
+            },
+            BookSearchParams = new List<BookSearchParam>
+            {
+                BookSearchParam.Q
+            },
+            Flags = new List<IndexerFlag>
+            {
+                IndexerFlag.Internal,
+                IndexerFlag.FreeLeech
+            }
+        };
 
-            caps.Categories.AddCategoryMapping(1, NewznabStandardCategory.MoviesSD, "Filme SD");
-            caps.Categories.AddCategoryMapping(2, NewznabStandardCategory.MoviesDVD, "Filme DVD");
-            caps.Categories.AddCategoryMapping(3, NewznabStandardCategory.MoviesForeign, "Filme DVD-RO");
-            caps.Categories.AddCategoryMapping(4, NewznabStandardCategory.MoviesHD, "Filme HD");
-            caps.Categories.AddCategoryMapping(5, NewznabStandardCategory.AudioLossless, "FLAC");
-            caps.Categories.AddCategoryMapping(6, NewznabStandardCategory.MoviesUHD, "Filme 4K");
-            caps.Categories.AddCategoryMapping(7, NewznabStandardCategory.XXX, "XXX");
-            caps.Categories.AddCategoryMapping(8, NewznabStandardCategory.PC, "Programe");
-            caps.Categories.AddCategoryMapping(9, NewznabStandardCategory.PCGames, "Jocuri PC");
-            caps.Categories.AddCategoryMapping(10, NewznabStandardCategory.Console, "Jocuri Console");
-            caps.Categories.AddCategoryMapping(11, NewznabStandardCategory.Audio, "Audio");
-            caps.Categories.AddCategoryMapping(12, NewznabStandardCategory.AudioVideo, "Videoclip");
-            caps.Categories.AddCategoryMapping(13, NewznabStandardCategory.TVSport, "Sport");
-            caps.Categories.AddCategoryMapping(15, NewznabStandardCategory.TV, "Desene");
-            caps.Categories.AddCategoryMapping(16, NewznabStandardCategory.Books, "Docs");
-            caps.Categories.AddCategoryMapping(17, NewznabStandardCategory.PC, "Linux");
-            caps.Categories.AddCategoryMapping(18, NewznabStandardCategory.Other, "Diverse");
-            caps.Categories.AddCategoryMapping(19, NewznabStandardCategory.MoviesForeign, "Filme HD-RO");
-            caps.Categories.AddCategoryMapping(20, NewznabStandardCategory.MoviesBluRay, "Filme Blu-Ray");
-            caps.Categories.AddCategoryMapping(21, NewznabStandardCategory.TVHD, "Seriale HD");
-            caps.Categories.AddCategoryMapping(22, NewznabStandardCategory.PCMobileOther, "Mobile");
-            caps.Categories.AddCategoryMapping(23, NewznabStandardCategory.TVSD, "Seriale SD");
-            caps.Categories.AddCategoryMapping(24, NewznabStandardCategory.TVAnime, "Anime");
-            caps.Categories.AddCategoryMapping(25, NewznabStandardCategory.Movies3D, "Filme 3D");
-            caps.Categories.AddCategoryMapping(26, NewznabStandardCategory.MoviesBluRay, "Filme 4K Blu-Ray");
-            caps.Categories.AddCategoryMapping(27, NewznabStandardCategory.TVUHD, "Seriale 4K");
+        caps.Categories.AddCategoryMapping(1, NewznabStandardCategory.MoviesSD, "Filme SD");
+        caps.Categories.AddCategoryMapping(2, NewznabStandardCategory.MoviesDVD, "Filme DVD");
+        caps.Categories.AddCategoryMapping(3, NewznabStandardCategory.MoviesForeign, "Filme DVD-RO");
+        caps.Categories.AddCategoryMapping(4, NewznabStandardCategory.MoviesHD, "Filme HD");
+        caps.Categories.AddCategoryMapping(5, NewznabStandardCategory.AudioLossless, "FLAC");
+        caps.Categories.AddCategoryMapping(6, NewznabStandardCategory.MoviesUHD, "Filme 4K");
+        caps.Categories.AddCategoryMapping(7, NewznabStandardCategory.XXX, "XXX");
+        caps.Categories.AddCategoryMapping(8, NewznabStandardCategory.PC, "Programe");
+        caps.Categories.AddCategoryMapping(9, NewznabStandardCategory.PCGames, "Jocuri PC");
+        caps.Categories.AddCategoryMapping(10, NewznabStandardCategory.Console, "Jocuri Console");
+        caps.Categories.AddCategoryMapping(11, NewznabStandardCategory.Audio, "Audio");
+        caps.Categories.AddCategoryMapping(12, NewznabStandardCategory.AudioVideo, "Videoclip");
+        caps.Categories.AddCategoryMapping(13, NewznabStandardCategory.TVSport, "Sport");
+        caps.Categories.AddCategoryMapping(15, NewznabStandardCategory.TV, "Desene");
+        caps.Categories.AddCategoryMapping(16, NewznabStandardCategory.Books, "Docs");
+        caps.Categories.AddCategoryMapping(17, NewznabStandardCategory.PC, "Linux");
+        caps.Categories.AddCategoryMapping(18, NewznabStandardCategory.Other, "Diverse");
+        caps.Categories.AddCategoryMapping(19, NewznabStandardCategory.MoviesForeign, "Filme HD-RO");
+        caps.Categories.AddCategoryMapping(20, NewznabStandardCategory.MoviesBluRay, "Filme Blu-Ray");
+        caps.Categories.AddCategoryMapping(21, NewznabStandardCategory.TVHD, "Seriale HD");
+        caps.Categories.AddCategoryMapping(22, NewznabStandardCategory.PCMobileOther, "Mobile");
+        caps.Categories.AddCategoryMapping(23, NewznabStandardCategory.TVSD, "Seriale SD");
+        caps.Categories.AddCategoryMapping(24, NewznabStandardCategory.TVAnime, "Anime");
+        caps.Categories.AddCategoryMapping(25, NewznabStandardCategory.Movies3D, "Filme 3D");
+        caps.Categories.AddCategoryMapping(26, NewznabStandardCategory.MoviesBluRay, "Filme 4K Blu-Ray");
+        caps.Categories.AddCategoryMapping(27, NewznabStandardCategory.TVUHD, "Seriale 4K");
 
-            return caps;
-        }
+        return caps;
     }
 }

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

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

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

@@ -1,96 +1,112 @@
 using System;
 using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
 using System.Net;
 using Newtonsoft.Json;
 using NzbDrone.Common.Http;
 using NzbDrone.Core.Indexers.Exceptions;
 using NzbDrone.Core.Parser.Model;
 
-namespace NzbDrone.Core.Indexers.FileList
+namespace NzbDrone.Core.Indexers.Definitions.FileList;
+
+public class FileListParser : IParseIndexerResponse
 {
-    public class FileListParser : IParseIndexerResponse
+    private readonly FileListSettings _settings;
+    private readonly IndexerCapabilitiesCategories _categories;
+
+    public FileListParser(FileListSettings settings, IndexerCapabilitiesCategories categories)
     {
-        private readonly FileListSettings _settings;
-        private readonly IndexerCapabilitiesCategories _categories;
+        _settings = settings;
+        _categories = categories;
+    }
 
-        public FileListParser(FileListSettings settings, IndexerCapabilitiesCategories categories)
+    public IList<ReleaseInfo> ParseResponse(IndexerResponse indexerResponse)
+    {
+        if (indexerResponse.HttpResponse.StatusCode != HttpStatusCode.OK)
         {
-            _settings = settings;
-            _categories = categories;
+            throw new IndexerException(indexerResponse, "Unexpected response status {0} code from API request", indexerResponse.HttpResponse.StatusCode);
         }
 
-        public IList<ReleaseInfo> ParseResponse(IndexerResponse indexerResponse)
+        if (!indexerResponse.HttpResponse.Headers.ContentType.Contains(HttpAccept.Json.Value))
         {
-            var torrentInfos = new List<ReleaseInfo>();
+            throw new IndexerException(indexerResponse, $"Unexpected response header {indexerResponse.HttpResponse.Headers.ContentType} from API request, expected {HttpAccept.Json.Value}");
+        }
 
-            if (indexerResponse.HttpResponse.StatusCode != HttpStatusCode.OK)
+        var releaseInfos = new List<ReleaseInfo>();
+
+        var results = JsonConvert.DeserializeObject<List<FileListTorrent>>(indexerResponse.Content);
+
+        foreach (var row in results)
+        {
+            // skip non-freeleech results when freeleech only is set
+            if (_settings.FreeleechOnly && !row.FreeLeech)
             {
-                throw new IndexerException(indexerResponse,
-                    "Unexpected response status {0} code from API request",
-                    indexerResponse.HttpResponse.StatusCode);
+                continue;
             }
 
-            var queryResults = JsonConvert.DeserializeObject<List<FileListTorrent>>(indexerResponse.Content);
+            var id = row.Id;
 
-            foreach (var result in queryResults)
+            var flags = new HashSet<IndexerFlag>();
+            if (row.Internal)
             {
-                var id = result.Id;
-
-                var flags = new List<IndexerFlag>();
-
-                var imdbId = 0;
-                if (result.ImdbId != null && result.ImdbId.Length > 2)
-                {
-                    imdbId = int.Parse(result.ImdbId.Substring(2));
-                }
-
-                var downloadVolumeFactor = result.FreeLeech == true ? 0 : 1;
-                var uploadVolumeFactor = result.DoubleUp == true ? 2 : 1;
-
-                torrentInfos.Add(new TorrentInfo()
-                {
-                    Guid = string.Format("FileList-{0}", id),
-                    Title = result.Name,
-                    Size = result.Size,
-                    Categories = _categories.MapTrackerCatDescToNewznab(result.Category),
-                    DownloadUrl = GetDownloadUrl(id),
-                    InfoUrl = GetInfoUrl(id),
-                    Seeders = result.Seeders,
-                    Peers = result.Leechers + result.Seeders,
-                    PublishDate = result.UploadDate,
-                    ImdbId = imdbId,
-                    IndexerFlags = flags,
-                    Files = (int)result.Files,
-                    Grabs = (int)result.TimesCompleted,
-                    DownloadVolumeFactor = downloadVolumeFactor,
-                    UploadVolumeFactor = uploadVolumeFactor,
-                    MinimumRatio = 1,
-                    MinimumSeedTime = 172800, //48 hours
-                });
+                flags.Add(IndexerFlag.Internal);
             }
 
-            return torrentInfos.ToArray();
+            var imdbId = 0;
+            if (row.ImdbId != null && row.ImdbId.Length > 2)
+            {
+                imdbId = int.Parse(row.ImdbId.Substring(2));
+            }
+
+            var downloadVolumeFactor = row.FreeLeech ? 0 : 1;
+            var uploadVolumeFactor = row.DoubleUp ? 2 : 1;
+
+            releaseInfos.Add(new TorrentInfo
+            {
+                Guid = string.Format("FileList-{0}", id),
+                Title = row.Name,
+                Size = row.Size,
+                Categories = _categories.MapTrackerCatDescToNewznab(row.Category),
+                DownloadUrl = GetDownloadUrl(id),
+                InfoUrl = GetInfoUrl(id),
+                Seeders = row.Seeders,
+                Peers = row.Leechers + row.Seeders,
+                PublishDate = DateTime.Parse(row.UploadDate + " +0200", CultureInfo.InvariantCulture, DateTimeStyles.AdjustToUniversal),
+                Description = row.SmallDescription,
+                Genres = row.SmallDescription.Split(',', StringSplitOptions.TrimEntries | StringSplitOptions.RemoveEmptyEntries).ToList(),
+                ImdbId = imdbId,
+                IndexerFlags = flags,
+                Files = (int)row.Files,
+                Grabs = (int)row.TimesCompleted,
+                DownloadVolumeFactor = downloadVolumeFactor,
+                UploadVolumeFactor = uploadVolumeFactor,
+                MinimumRatio = 1,
+                MinimumSeedTime = 172800, // 48 hours
+            });
         }
 
-        public Action<IDictionary<string, string>, DateTime?> CookiesUpdater { get; set; }
+        return releaseInfos.ToArray();
+    }
 
-        private string GetDownloadUrl(string torrentId)
-        {
-            var url = new HttpUri(_settings.BaseUrl)
-                .CombinePath("/download.php")
-                .AddQueryParam("id", torrentId)
-                .AddQueryParam("passkey", _settings.Passkey);
+    public Action<IDictionary<string, string>, DateTime?> CookiesUpdater { get; set; }
 
-            return url.FullUri;
-        }
+    private string GetDownloadUrl(string torrentId)
+    {
+        var url = new HttpUri(_settings.BaseUrl)
+            .CombinePath("/download.php")
+            .AddQueryParam("id", torrentId)
+            .AddQueryParam("passkey", _settings.Passkey);
 
-        private string GetInfoUrl(string torrentId)
-        {
-            var url = new HttpUri(_settings.BaseUrl)
-                .CombinePath("/details.php")
-                .AddQueryParam("id", torrentId);
+        return url.FullUri;
+    }
 
-            return url.FullUri;
-        }
+    private string GetInfoUrl(string torrentId)
+    {
+        var url = new HttpUri(_settings.BaseUrl)
+            .CombinePath("/details.php")
+            .AddQueryParam("id", torrentId);
+
+        return url.FullUri;
     }
 }

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

@@ -1,120 +1,153 @@
 using System;
 using System.Collections.Generic;
+using System.Collections.Specialized;
 using NzbDrone.Common.Extensions;
 using NzbDrone.Common.Http;
 using NzbDrone.Core.IndexerSearch.Definitions;
+using NzbDrone.Core.Parser;
 
-namespace NzbDrone.Core.Indexers.FileList
+namespace NzbDrone.Core.Indexers.Definitions.FileList;
+
+public class FileListRequestGenerator : IIndexerRequestGenerator
 {
-    public class FileListRequestGenerator : IIndexerRequestGenerator
+    public FileListSettings Settings { get; set; }
+    public IndexerCapabilities Capabilities { get; set; }
+    public Func<IDictionary<string, string>> GetCookies { get; set; }
+    public Action<IDictionary<string, string>, DateTime?> CookiesUpdater { get; set; }
+
+    public IndexerPageableRequestChain GetSearchRequests(TvSearchCriteria searchCriteria)
     {
-        public FileListSettings Settings { get; set; }
-        public IndexerCapabilities Capabilities { get; set; }
-        public Func<IDictionary<string, string>> GetCookies { get; set; }
-        public Action<IDictionary<string, string>, DateTime?> CookiesUpdater { get; set; }
+        var pageableRequests = new IndexerPageableRequestChain();
+        var parameters = GetDefaultParameters();
 
-        public virtual IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchCriteria)
+        if (searchCriteria.ImdbId.IsNotNullOrWhiteSpace() || searchCriteria.SearchTerm.IsNotNullOrWhiteSpace())
         {
-            var pageableRequests = new IndexerPageableRequestChain();
+            parameters.Add("action", "search-torrents");
 
             if (searchCriteria.ImdbId.IsNotNullOrWhiteSpace())
             {
-                pageableRequests.Add(GetRequest("search-torrents", searchCriteria.Categories, string.Format("&type=imdb&query={0}", searchCriteria.FullImdbId)));
+                parameters.Add("type", "imdb");
+                parameters.Add("query", searchCriteria.FullImdbId);
             }
             else if (searchCriteria.SearchTerm.IsNotNullOrWhiteSpace())
             {
-                var titleYearSearchQuery = string.Format("{0}", searchCriteria.SanitizedSearchTerm);
-                pageableRequests.Add(GetRequest("search-torrents", searchCriteria.Categories, string.Format("&type=name&query={0}", titleYearSearchQuery.Trim())));
-            }
-            else
-            {
-                pageableRequests.Add(GetRequest("latest-torrents", searchCriteria.Categories, ""));
+                parameters.Add("type", "name");
+                parameters.Add("query", searchCriteria.SanitizedSearchTerm.Trim());
             }
 
-            return pageableRequests;
+            if (searchCriteria.Season.HasValue)
+            {
+                parameters.Add("season", searchCriteria.Season.ToString());
+                parameters.Add("episode", searchCriteria.Episode);
+            }
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(MusicSearchCriteria searchCriteria)
+        pageableRequests.Add(GetRequest(searchCriteria, parameters));
+
+        return pageableRequests;
+    }
+
+    public virtual IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchCriteria)
+    {
+        var pageableRequests = new IndexerPageableRequestChain();
+        var parameters = GetDefaultParameters();
+
+        if (searchCriteria.ImdbId.IsNotNullOrWhiteSpace())
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-            if (searchCriteria.SearchTerm.IsNotNullOrWhiteSpace())
-            {
-                var titleYearSearchQuery = string.Format("{0}", searchCriteria.SanitizedSearchTerm);
-                pageableRequests.Add(GetRequest("search-torrents", searchCriteria.Categories, string.Format("&type=name&query={0}", titleYearSearchQuery.Trim())));
-            }
-            else
-            {
-                pageableRequests.Add(GetRequest("latest-torrents", searchCriteria.Categories, ""));
-            }
-
-            return pageableRequests;
+            parameters.Add("action", "search-torrents");
+            parameters.Add("type", "imdb");
+            parameters.Add("query", searchCriteria.FullImdbId);
         }
-
-        public IndexerPageableRequestChain GetSearchRequests(TvSearchCriteria searchCriteria)
+        else if (searchCriteria.SearchTerm.IsNotNullOrWhiteSpace())
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            if (searchCriteria.ImdbId.IsNotNullOrWhiteSpace())
-            {
-                pageableRequests.Add(GetRequest("search-torrents", searchCriteria.Categories, string.Format("&type=imdb&query={0}&season={1}&episode={2}", searchCriteria.FullImdbId, searchCriteria.Season, searchCriteria.Episode)));
-            }
-            else if (searchCriteria.SearchTerm.IsNotNullOrWhiteSpace())
-            {
-                var titleYearSearchQuery = string.Format("{0}", searchCriteria.SanitizedSearchTerm);
-                pageableRequests.Add(GetRequest("search-torrents", searchCriteria.Categories, string.Format("&type=name&query={0}&season={1}&episode={2}", titleYearSearchQuery.Trim(), searchCriteria.Season, searchCriteria.Episode)));
-            }
-            else
-            {
-                pageableRequests.Add(GetRequest("latest-torrents", searchCriteria.Categories, ""));
-            }
-
-            return pageableRequests;
+            parameters.Add("action", "search-torrents");
+            parameters.Add("type", "name");
+            parameters.Add("query", searchCriteria.SanitizedSearchTerm.Trim());
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(BookSearchCriteria searchCriteria)
+        pageableRequests.Add(GetRequest(searchCriteria, parameters));
+
+        return pageableRequests;
+    }
+
+    public IndexerPageableRequestChain GetSearchRequests(MusicSearchCriteria searchCriteria)
+    {
+        var pageableRequests = new IndexerPageableRequestChain();
+        var parameters = GetDefaultParameters();
+
+        if (searchCriteria.SearchTerm.IsNotNullOrWhiteSpace())
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-            if (searchCriteria.SearchTerm.IsNotNullOrWhiteSpace())
-            {
-                var titleYearSearchQuery = string.Format("{0}", searchCriteria.SanitizedSearchTerm);
-                pageableRequests.Add(GetRequest("search-torrents", searchCriteria.Categories, string.Format("&type=name&query={0}", titleYearSearchQuery.Trim())));
-            }
-            else
-            {
-                pageableRequests.Add(GetRequest("latest-torrents", searchCriteria.Categories, ""));
-            }
-
-            return pageableRequests;
+            parameters.Add("action", "search-torrents");
+            parameters.Add("type", "name");
+            parameters.Add("query", searchCriteria.SanitizedSearchTerm.Trim());
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(BasicSearchCriteria searchCriteria)
+        pageableRequests.Add(GetRequest(searchCriteria, parameters));
+
+        return pageableRequests;
+    }
+
+    public IndexerPageableRequestChain GetSearchRequests(BookSearchCriteria searchCriteria)
+    {
+        var pageableRequests = new IndexerPageableRequestChain();
+        var parameters = GetDefaultParameters();
+
+        if (searchCriteria.SearchTerm.IsNotNullOrWhiteSpace())
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-            if (searchCriteria.SearchTerm.IsNotNullOrWhiteSpace())
-            {
-                var titleYearSearchQuery = string.Format("{0}", searchCriteria.SanitizedSearchTerm);
-                pageableRequests.Add(GetRequest("search-torrents", searchCriteria.Categories, string.Format("&type=name&query={0}", titleYearSearchQuery.Trim())));
-            }
-            else
-            {
-                pageableRequests.Add(GetRequest("latest-torrents", searchCriteria.Categories, ""));
-            }
-
-            return pageableRequests;
+            parameters.Add("action", "search-torrents");
+            parameters.Add("type", "name");
+            parameters.Add("query", searchCriteria.SanitizedSearchTerm.Trim());
         }
 
-        private IEnumerable<IndexerRequest> GetRequest(string searchType, int[] categories, string parameters)
+        pageableRequests.Add(GetRequest(searchCriteria, parameters));
+
+        return pageableRequests;
+    }
+
+    public IndexerPageableRequestChain GetSearchRequests(BasicSearchCriteria searchCriteria)
+    {
+        var pageableRequests = new IndexerPageableRequestChain();
+        var parameters = GetDefaultParameters();
+
+        if (searchCriteria.SearchTerm.IsNotNullOrWhiteSpace())
         {
-            var categoriesQuery = string.Join(",", Capabilities.Categories.MapTorznabCapsToTrackers(categories));
-
-            var baseUrl = string.Format("{0}/api.php?action={1}&category={2}&username={3}&passkey={4}{5}", Settings.BaseUrl.TrimEnd('/'), searchType, categoriesQuery, Settings.Username.Trim(), Settings.Passkey.Trim(), parameters);
-
-            if (Settings.FreeleechOnly)
-            {
-                baseUrl += "&freeleech=1";
-            }
-
-            yield return new IndexerRequest(baseUrl, HttpAccept.Json);
+            parameters.Add("action", "search-torrents");
+            parameters.Add("type", "name");
+            parameters.Add("query", searchCriteria.SanitizedSearchTerm.Trim());
         }
+
+        pageableRequests.Add(GetRequest(searchCriteria, parameters));
+
+        return pageableRequests;
+    }
+
+    private IEnumerable<IndexerRequest> GetRequest(SearchCriteriaBase searchCriteria, NameValueCollection parameters)
+    {
+        if (parameters.Get("action") is null)
+        {
+            parameters.Add("action", "latest-torrents");
+        }
+
+        parameters.Add("category", string.Join(",", Capabilities.Categories.MapTorznabCapsToTrackers(searchCriteria.Categories)));
+
+        var searchUrl = $"{Settings.BaseUrl.TrimEnd('/')}/api.php?{parameters.GetQueryString()}";
+
+        yield return new IndexerRequest(searchUrl, HttpAccept.Json);
+    }
+
+    private NameValueCollection GetDefaultParameters()
+    {
+        var parameters = new NameValueCollection
+        {
+            { "username", Settings.Username.Trim() },
+            { "passkey", Settings.Passkey.Trim() }
+        };
+
+        if (Settings.FreeleechOnly)
+        {
+            parameters.Add("freeleech", "1");
+        }
+
+        return parameters;
     }
 }

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

@@ -3,38 +3,32 @@ using NzbDrone.Core.Annotations;
 using NzbDrone.Core.Indexers.Settings;
 using NzbDrone.Core.Validation;
 
-namespace NzbDrone.Core.Indexers.FileList
+namespace NzbDrone.Core.Indexers.Definitions.FileList;
+
+public class FileListSettingsValidator : NoAuthSettingsValidator<FileListSettings>
 {
-    public class FileListSettingsValidator : AbstractValidator<FileListSettings>
+    public FileListSettingsValidator()
     {
-        public FileListSettingsValidator()
-        {
-            RuleFor(c => c.Username).NotEmpty();
-            RuleFor(c => c.Passkey).NotEmpty();
-        }
-    }
-
-    public class FileListSettings : NoAuthTorrentBaseSettings
-    {
-        private static readonly FileListSettingsValidator Validator = new FileListSettingsValidator();
-
-        public FileListSettings()
-        {
-            BaseUrl = "https://filelist.io";
-        }
-
-        [FieldDefinition(2, Label = "Username", HelpText = "Site Username", Privacy = PrivacyLevel.UserName)]
-        public string Username { get; set; }
-
-        [FieldDefinition(3, Label = "Passkey", HelpText = "Site Passkey (This is the alphanumeric string in the tracker url shown in your download client)", Privacy = PrivacyLevel.Password, Type = FieldType.Password)]
-        public string Passkey { get; set; }
-
-        [FieldDefinition(4, Label = "Freeleech Only", HelpText = "Search Freeleech torrents only", Type = FieldType.Checkbox)]
-        public bool FreeleechOnly { get; set; }
-
-        public override NzbDroneValidationResult Validate()
-        {
-            return new NzbDroneValidationResult(Validator.Validate(this));
-        }
+        RuleFor(c => c.Username).NotEmpty();
+        RuleFor(c => c.Passkey).NotEmpty();
+    }
+}
+
+public class FileListSettings : NoAuthTorrentBaseSettings
+{
+    private static readonly FileListSettingsValidator Validator = new ();
+
+    [FieldDefinition(2, Label = "Username", HelpText = "Site Username", Privacy = PrivacyLevel.UserName)]
+    public string Username { get; set; }
+
+    [FieldDefinition(3, Label = "Passkey", HelpText = "Site Passkey (This is the alphanumeric string in the tracker url shown in your download client)", Privacy = PrivacyLevel.Password, Type = FieldType.Password)]
+    public string Passkey { get; set; }
+
+    [FieldDefinition(4, Label = "Freeleech Only", HelpText = "Search Freeleech torrents only", Type = FieldType.Checkbox)]
+    public bool FreeleechOnly { get; set; }
+
+    public override NzbDroneValidationResult Validate()
+    {
+        return new NzbDroneValidationResult(Validator.Validate(this));
     }
 }

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

@@ -0,0 +1,343 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.Specialized;
+using System.Linq;
+using System.Net.Http;
+using System.Text;
+using System.Threading.Tasks;
+using AngleSharp.Html.Parser;
+using NLog;
+using NzbDrone.Common.Extensions;
+using NzbDrone.Common.Http;
+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 FunFile : TorrentIndexerBase<UserPassTorrentBaseSettings>
+{
+    public override string Name => "FunFile";
+    public override string[] IndexerUrls => new[] { "https://www.funfile.org/" };
+    public override string Description => "FunFile is a general tracker";
+    public override string Language => "en-US";
+    public override Encoding Encoding => Encoding.GetEncoding("iso-8859-1");
+    public override DownloadProtocol Protocol => DownloadProtocol.Torrent;
+    public override IndexerPrivacy Privacy => IndexerPrivacy.Private;
+    public override IndexerCapabilities Capabilities => SetCapabilities();
+
+    public FunFile(IIndexerHttpClient httpClient,
+                   IEventAggregator eventAggregator,
+                   IIndexerStatusService indexerStatusService,
+                   IConfigService configService,
+                   Logger logger)
+        : base(httpClient, eventAggregator, indexerStatusService, configService, logger)
+    {
+    }
+
+    public override IIndexerRequestGenerator GetRequestGenerator()
+    {
+        return new FunFileRequestGenerator(Settings, Capabilities);
+    }
+
+    public override IParseIndexerResponse GetParser()
+    {
+        return new FunFileParser(Settings, Capabilities.Categories);
+    }
+
+    protected override async Task DoLogin()
+    {
+        var requestBuilder = new HttpRequestBuilder(Settings.BaseUrl + "takelogin.php")
+        {
+            LogResponseContent = true,
+            AllowAutoRedirect = true,
+            Method = HttpMethod.Post
+        };
+
+        var authLoginRequest = requestBuilder
+            .AddFormParameter("username", Settings.Username)
+            .AddFormParameter("password", Settings.Password)
+            .AddFormParameter("returnto", "")
+            .AddFormParameter("login", "Login")
+            .SetHeader("Content-Type", "application/x-www-form-urlencoded")
+            .Build();
+
+        var response = await ExecuteAuth(authLoginRequest);
+
+        if (CheckIfLoginNeeded(response))
+        {
+            var parser = new HtmlParser();
+            var dom = parser.ParseDocument(response.Content);
+            var errorMessage = dom.QuerySelector("td.mf_content")?.TextContent.Trim();
+
+            throw new IndexerAuthException(errorMessage ?? "Unknown error message, please report.");
+        }
+
+        var cookies = response.GetCookies();
+        UpdateCookies(cookies, DateTime.Now.AddDays(30));
+
+        _logger.Debug("Authentication succeeded.");
+    }
+
+    protected override bool CheckIfLoginNeeded(HttpResponse httpResponse)
+    {
+        return !httpResponse.Content.Contains("logout.php");
+    }
+
+    private IndexerCapabilities SetCapabilities()
+    {
+        var caps = new IndexerCapabilities
+        {
+            TvSearchParams = new List<TvSearchParam>
+            {
+                TvSearchParam.Q, TvSearchParam.Season, TvSearchParam.Ep, TvSearchParam.ImdbId
+            },
+            MovieSearchParams = new List<MovieSearchParam>
+            {
+                MovieSearchParam.Q, MovieSearchParam.ImdbId
+            },
+            MusicSearchParams = new List<MusicSearchParam>
+            {
+                MusicSearchParam.Q
+            },
+            BookSearchParams = new List<BookSearchParam>
+            {
+                BookSearchParam.Q
+            }
+        };
+
+        caps.Categories.AddCategoryMapping(44, NewznabStandardCategory.TVAnime, "Anime");
+        caps.Categories.AddCategoryMapping(22, NewznabStandardCategory.PC, "Applications");
+        caps.Categories.AddCategoryMapping(43, NewznabStandardCategory.AudioAudiobook, "Audio Books");
+        caps.Categories.AddCategoryMapping(27, NewznabStandardCategory.Books, "Ebook");
+        caps.Categories.AddCategoryMapping(4, NewznabStandardCategory.PCGames, "Games");
+        caps.Categories.AddCategoryMapping(40, NewznabStandardCategory.OtherMisc, "Miscellaneous");
+        caps.Categories.AddCategoryMapping(19, NewznabStandardCategory.Movies, "Movies");
+        caps.Categories.AddCategoryMapping(6, NewznabStandardCategory.Audio, "Music");
+        caps.Categories.AddCategoryMapping(31, NewznabStandardCategory.PCMobileOther, "Portable");
+        caps.Categories.AddCategoryMapping(49, NewznabStandardCategory.Other, "Tutorials");
+        caps.Categories.AddCategoryMapping(7, NewznabStandardCategory.TV, "TV");
+
+        return caps;
+    }
+}
+
+public class FunFileRequestGenerator : IIndexerRequestGenerator
+{
+    private readonly UserPassTorrentBaseSettings _settings;
+    private readonly IndexerCapabilities _capabilities;
+
+    public FunFileRequestGenerator(UserPassTorrentBaseSettings settings, IndexerCapabilities capabilities)
+    {
+        _settings = settings;
+        _capabilities = capabilities;
+    }
+
+    public IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchCriteria)
+    {
+        var pageableRequests = new IndexerPageableRequestChain();
+
+        pageableRequests.Add(GetPagedRequests($"{searchCriteria.SanitizedSearchTerm}", searchCriteria.Categories, searchCriteria.FullImdbId));
+
+        return pageableRequests;
+    }
+
+    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.SanitizedTvSearchString}", searchCriteria.Categories, searchCriteria.FullImdbId));
+
+        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, string imdbId = null)
+    {
+        var parameters = new NameValueCollection
+        {
+            { "cat", "0" },
+            { "incldead", "1" },
+            { "showspam", "1" },
+            { "s_title", "1" }
+        };
+
+        if (imdbId.IsNotNullOrWhiteSpace())
+        {
+            parameters.Set("search", imdbId);
+            parameters.Set("s_desc", "1");
+        }
+        else if (term.IsNotNullOrWhiteSpace())
+        {
+            parameters.Set("search", term);
+        }
+
+        var queryCats = _capabilities.Categories.MapTorznabCapsToTrackers(categories);
+        if (queryCats.Any())
+        {
+            queryCats.ForEach(cat => parameters.Set($"c{cat}", "1"));
+        }
+
+        var searchUrl = _settings.BaseUrl + "browse.php";
+
+        if (parameters.Count > 0)
+        {
+            searchUrl += $"?{parameters.GetQueryString()}";
+        }
+
+        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 FunFileParser : IParseIndexerResponse
+{
+    private readonly UserPassTorrentBaseSettings _settings;
+    private readonly IndexerCapabilitiesCategories _categories;
+
+    private readonly List<string> _validTagList = new ()
+    {
+        "action",
+        "adventure",
+        "animation",
+        "biography",
+        "comedy",
+        "crime",
+        "documentary",
+        "drama",
+        "family",
+        "fantasy",
+        "game-show",
+        "history",
+        "home_&_garden",
+        "home_and_garden",
+        "horror",
+        "music",
+        "musical",
+        "mystery",
+        "news",
+        "reality",
+        "reality-tv",
+        "romance",
+        "sci-fi",
+        "science-fiction",
+        "short",
+        "sport",
+        "talk-show",
+        "thriller",
+        "travel",
+        "war",
+        "western"
+    };
+
+    private readonly char[] _delimiters = { ',', ' ', '/', ')', '(', '.', ';', '[', ']', '"', '|', ':' };
+
+    public FunFileParser(UserPassTorrentBaseSettings settings, IndexerCapabilitiesCategories categories)
+    {
+        _settings = settings;
+        _categories = categories;
+    }
+
+    public IList<ReleaseInfo> ParseResponse(IndexerResponse indexerResponse)
+    {
+        var releaseInfos = new List<TorrentInfo>();
+
+        var parser = new HtmlParser();
+        var dom = parser.ParseDocument(indexerResponse.Content);
+
+        var rows = dom.QuerySelectorAll("table.mainframe table[cellpadding=\"2\"] > tbody > tr:has(td.row3)");
+        foreach (var row in rows)
+        {
+            var qDownloadLink = row.QuerySelector("a[href^=\"download.php\"]");
+            if (qDownloadLink == null)
+            {
+                throw new Exception("Download links not found. Make sure you can download from the website.");
+            }
+
+            var link = _settings.BaseUrl + qDownloadLink.GetAttribute("href");
+
+            var qDetailsLink = row.QuerySelector("a[href^=\"details.php?id=\"]");
+            var title = qDetailsLink?.GetAttribute("title")?.Trim();
+            var details = _settings.BaseUrl + qDetailsLink?.GetAttribute("href")?.Replace("&hit=1", "");
+
+            var categoryLink = row.QuerySelector("a[href^=\"browse.php?cat=\"]")?.GetAttribute("href");
+            var cat = ParseUtil.GetArgumentFromQueryString(categoryLink, "cat");
+
+            var seeders = ParseUtil.CoerceInt(row.Children[9].TextContent);
+            var leechers = ParseUtil.CoerceInt(row.Children[10].TextContent);
+
+            var release = new TorrentInfo
+            {
+                Guid = link,
+                InfoUrl = link,
+                DownloadUrl = details,
+                Title = title,
+                Categories = _categories.MapTrackerCatToNewznab(cat),
+                Size = ParseUtil.GetBytes(row.Children[7].TextContent),
+                Files = ParseUtil.CoerceInt(row.Children[3].TextContent),
+                Grabs = ParseUtil.CoerceInt(row.Children[8].TextContent),
+                Seeders = seeders,
+                Peers = leechers + seeders,
+                PublishDate = DateTimeUtil.FromTimeAgo(row.Children[5].TextContent),
+                DownloadVolumeFactor = 1,
+                UploadVolumeFactor = 1,
+                MinimumRatio = 1,
+                MinimumSeedTime = 172800 // 48 hours
+            };
+
+            var nextRow = row.NextElementSibling;
+            if (nextRow != null)
+            {
+                var qStats = nextRow.QuerySelector("table > tbody > tr:nth-child(3)");
+                release.UploadVolumeFactor = ParseUtil.CoerceDouble(qStats?.Children[0].TextContent.Replace("X", ""));
+                release.DownloadVolumeFactor = ParseUtil.CoerceDouble(qStats?.Children[1].TextContent.Replace("X", ""));
+
+                release.Description = nextRow.QuerySelector("span[style=\"float:left\"]")?.TextContent.Trim();
+                var genres = release.Description.ToLower().Replace(" & ", "_&_").Replace(" and ", "_and_");
+
+                var releaseGenres = _validTagList.Intersect(genres.Split(_delimiters, StringSplitOptions.TrimEntries | StringSplitOptions.RemoveEmptyEntries));
+                release.Genres = releaseGenres.Select(x => x.Replace("_", " ")).ToList();
+            }
+
+            releaseInfos.Add(release);
+        }
+
+        return releaseInfos.ToArray();
+    }
+
+    public Action<IDictionary<string, string>, DateTime?> CookiesUpdater { get; set; }
+}

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

@@ -1,117 +0,0 @@
-using System;
-using System.Net.Http;
-using System.Threading.Tasks;
-using NLog;
-using NzbDrone.Common.Http;
-using NzbDrone.Core.Configuration;
-using NzbDrone.Core.Messaging.Events;
-
-namespace NzbDrone.Core.Indexers.Gazelle
-{
-    public abstract class Gazelle : TorrentIndexerBase<GazelleSettings>
-    {
-        public override DownloadProtocol Protocol => DownloadProtocol.Torrent;
-        public override string[] IndexerUrls => new string[] { "" };
-        protected virtual string LoginUrl => Settings.BaseUrl + "login.php";
-        public override bool SupportsRss => true;
-        public override bool SupportsSearch => true;
-        public override int PageSize => 50;
-        public override IndexerCapabilities Capabilities => SetCapabilities();
-
-        public Gazelle(IIndexerHttpClient httpClient,
-                       IEventAggregator eventAggregator,
-                       IIndexerStatusService indexerStatusService,
-                       IConfigService configService,
-                       Logger logger)
-            : base(httpClient, eventAggregator, indexerStatusService, configService, logger)
-        {
-        }
-
-        public override IIndexerRequestGenerator GetRequestGenerator()
-        {
-            return new GazelleRequestGenerator()
-            {
-                Settings = Settings,
-                HttpClient = _httpClient,
-                Logger = _logger,
-                Capabilities = Capabilities
-            };
-        }
-
-        public override IParseIndexerResponse GetParser()
-        {
-            return new GazelleParser(Settings, Capabilities);
-        }
-
-        protected virtual IndexerCapabilities SetCapabilities()
-        {
-            var caps = new IndexerCapabilities();
-
-            return caps;
-        }
-
-        protected override async Task DoLogin()
-        {
-            var requestBuilder = new HttpRequestBuilder(LoginUrl)
-            {
-                LogResponseContent = true
-            };
-
-            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")
-                .SetHeader("Content-Type", "multipart/form-data")
-                .Accept(HttpAccept.Json)
-                .Build();
-
-            var response = await ExecuteAuth(authLoginRequest);
-
-            cookies = response.GetCookies();
-
-            UpdateCookies(cookies, DateTime.Now + TimeSpan.FromDays(30));
-
-            _logger.Debug("Gazelle authentication succeeded.");
-        }
-
-        public override async Task<byte[]> Download(Uri link)
-        {
-            var response = await base.Download(link);
-
-            if (response.Length >= 1
-                && response[0] != 'd' // simple test for torrent vs HTML content
-                && link.Query.Contains("usetoken=1"))
-            {
-                var html = Encoding.GetString(response);
-                if (html.Contains("You do not have any freeleech tokens left.")
-                    || html.Contains("You do not have enough freeleech tokens")
-                    || html.Contains("This torrent is too large.")
-                    || html.Contains("You cannot use tokens here"))
-                {
-                    // download again with usetoken=0
-                    var requestLinkNew = link.ToString().Replace("usetoken=1", "usetoken=0");
-
-                    response = await base.Download(new Uri(requestLinkNew));
-                }
-            }
-
-            return response;
-        }
-
-        protected override bool CheckIfLoginNeeded(HttpResponse response)
-        {
-            if (response.HasHttpRedirect || (response.Content != null && response.Content.Contains("\"bad credentials\"")))
-            {
-                return true;
-            }
-
-            return false;
-        }
-    }
-}

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

@@ -1,96 +1,95 @@
 using System;
 using System.Collections.Generic;
 
-namespace NzbDrone.Core.Indexers.Gazelle
+namespace NzbDrone.Core.Indexers.Definitions.Gazelle;
+
+public class GazelleArtist
 {
-    public class GazelleArtist
-    {
-        public string Name { get; set; }
-        public string Id { get; set; }
-        public string Aliasid { get; set; }
-    }
-
-    public class GazelleTorrent
-    {
-        public int TorrentId { get; set; }
-        public int EditionId { get; set; }
-        public List<GazelleArtist> Artists { get; set; }
-        public bool Remastered { get; set; }
-        public string RemasterYear { get; set; }
-        public string RemasterTitle { get; set; }
-        public string Media { get; set; }
-        public string Encoding { get; set; }
-        public string Format { get; set; }
-        public bool HasLog { get; set; }
-        public int LogScore { get; set; }
-        public bool HasCue { get; set; }
-        public bool Scene { get; set; }
-        public bool VanityHouse { get; set; }
-        public int FileCount { get; set; }
-        public DateTime Time { get; set; }
-        public string Size { get; set; }
-        public int? Snatches { get; set; }
-        public string Seeders { get; set; }
-        public string Leechers { get; set; }
-        public string Category { get; set; }
-        public bool IsFreeLeech { get; set; }
-        public bool IsNeutralLeech { get; set; }
-        public bool IsPersonalFreeLeech { get; set; }
-        public bool CanUseToken { get; set; }
-    }
-
-    public class GazelleRelease
-    {
-        public string GroupId { get; set; }
-        public string GroupName { get; set; }
-        public int TorrentId { get; set; }
-        public string Size { get; set; }
-        public int FileCount { get; set; }
-        public int? Snatches { get; set; }
-        public string Seeders { get; set; }
-        public string Leechers { get; set; }
-        public string Category { get; set; }
-        public string Artist { get; set; }
-        public string GroupYear { get; set; }
-        public string Cover { get; set; }
-        public List<string> Tags { get; set; }
-        public string ReleaseType { get; set; }
-        public int TotalLeechers { get; set; }
-        public int TotalSeeders { get; set; }
-        public int TotalSnatched { get; set; }
-        public long MaxSize { get; set; }
-        public string GroupTime { get; set; }
-        public List<GazelleTorrent> Torrents { get; set; }
-        public bool IsFreeLeech { get; set; }
-        public bool IsNeutralLeech { get; set; }
-        public bool IsPersonalFreeLeech { get; set; }
-        public bool CanUseToken { get; set; }
-    }
-
-    public class GazelleResponse
-    {
-        public string Status { get; set; }
-        public GazelleBrowseResponse Response { get; set; }
-    }
-
-    public class GazelleBrowseResponse
-    {
-        public List<GazelleRelease> Results { get; set; }
-        public string CurrentPage { get; set; }
-        public string Pages { get; set; }
-    }
-
-    public class GazelleAuthResponse
-    {
-        public string Status { get; set; }
-        public GazelleIndexResponse Response { get; set; }
-    }
-
-    public class GazelleIndexResponse
-    {
-        public string Username { get; set; }
-        public string Id { get; set; }
-        public string Authkey { get; set; }
-        public string Passkey { get; set; }
-    }
+    public string Name { get; set; }
+    public string Id { get; set; }
+    public string Aliasid { get; set; }
+}
+
+public class GazelleTorrent
+{
+    public int TorrentId { get; set; }
+    public int EditionId { get; set; }
+    public List<GazelleArtist> Artists { get; set; }
+    public bool Remastered { get; set; }
+    public string RemasterYear { get; set; }
+    public string RemasterTitle { get; set; }
+    public string Media { get; set; }
+    public string Encoding { get; set; }
+    public string Format { get; set; }
+    public bool HasLog { get; set; }
+    public int LogScore { get; set; }
+    public bool HasCue { get; set; }
+    public bool Scene { get; set; }
+    public bool VanityHouse { get; set; }
+    public int FileCount { get; set; }
+    public DateTime Time { get; set; }
+    public string Size { get; set; }
+    public int? Snatches { get; set; }
+    public string Seeders { get; set; }
+    public string Leechers { get; set; }
+    public string Category { get; set; }
+    public bool IsFreeLeech { get; set; }
+    public bool IsNeutralLeech { get; set; }
+    public bool IsPersonalFreeLeech { get; set; }
+    public bool CanUseToken { get; set; }
+}
+
+public class GazelleRelease
+{
+    public string GroupId { get; set; }
+    public string GroupName { get; set; }
+    public int TorrentId { get; set; }
+    public string Size { get; set; }
+    public int FileCount { get; set; }
+    public int? Snatches { get; set; }
+    public string Seeders { get; set; }
+    public string Leechers { get; set; }
+    public string Category { get; set; }
+    public string Artist { get; set; }
+    public string GroupYear { get; set; }
+    public string Cover { get; set; }
+    public List<string> Tags { get; set; }
+    public string ReleaseType { get; set; }
+    public int TotalLeechers { get; set; }
+    public int TotalSeeders { get; set; }
+    public int TotalSnatched { get; set; }
+    public long MaxSize { get; set; }
+    public string GroupTime { get; set; }
+    public List<GazelleTorrent> Torrents { get; set; }
+    public bool IsFreeLeech { get; set; }
+    public bool IsNeutralLeech { get; set; }
+    public bool IsPersonalFreeLeech { get; set; }
+    public bool CanUseToken { get; set; }
+}
+
+public class GazelleResponse
+{
+    public string Status { get; set; }
+    public GazelleBrowseResponse Response { get; set; }
+}
+
+public class GazelleBrowseResponse
+{
+    public List<GazelleRelease> Results { get; set; }
+    public string CurrentPage { get; set; }
+    public string Pages { get; set; }
+}
+
+public class GazelleAuthResponse
+{
+    public string Status { get; set; }
+    public GazelleIndexResponse Response { get; set; }
+}
+
+public class GazelleIndexResponse
+{
+    public string Username { get; set; }
+    public string Id { get; set; }
+    public string Authkey { get; set; }
+    public string Passkey { get; set; }
 }