CHANGELOG-v0.4.4.1947

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -5,9 +5,9 @@ body:
 - type: checkboxes
   attributes:
     label: Is there an existing issue for this?
-    description: Please search to see if an open or closed issue already exists for the bug you encountered. If a bug exists and is closed note that it may only be fixed in an unstable branch.
+    description: Please search to see if an issue already exists for the bug you encountered.
     options:
-    - label: I have searched the existing open and closed issues
+    - label: I have searched the existing issues
       required: true
 - type: textarea
   attributes:

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -5,9 +5,9 @@ body:
 - type: checkboxes
   attributes:
     label: Is there an existing issue for this?
-    description: Please search to see if an open or closed issue already exists for the feature you are requesting. If a request exists and is closed note that it may only be fixed in an unstable branch.
+    description: Please search to see if an issue already exists for the feature you are requesting.
     options:
-    - label: I have searched the existing open and closed issues
+    - label: I have searched the existing issues
       required: true
 - type: textarea
   attributes:

CODE_OF_CONDUCT.md

@@ -1,132 +0,0 @@
-# Contributor Covenant Code of Conduct
-
-## Our Pledge
-
-We as members, contributors, and leaders pledge to make participation in our
-community a harassment-free experience for everyone, regardless of age, body
-size, visible or invisible disability, ethnicity, sex characteristics, gender
-identity and expression, level of experience, education, socio-economic status,
-nationality, personal appearance, race, caste, color, religion, or sexual
-identity and orientation.
-
-We pledge to act and interact in ways that contribute to an open, welcoming,
-diverse, inclusive, and healthy community.
-
-## Our Standards
-
-Examples of behavior that contributes to a positive environment for our
-community include:
-
-* Demonstrating empathy and kindness toward other people
-* Being respectful of differing opinions, viewpoints, and experiences
-* Giving and gracefully accepting constructive feedback
-* Accepting responsibility and apologizing to those affected by our mistakes,
-  and learning from the experience
-* Focusing on what is best not just for us as individuals, but for the overall
-  community
-
-Examples of unacceptable behavior include:
-
-* The use of sexualized language or imagery, and sexual attention or advances of
-  any kind
-* Trolling, insulting or derogatory comments, and personal or political attacks
-* Public or private harassment
-* Publishing others' private information, such as a physical or email address,
-  without their explicit permission
-* Other conduct which could reasonably be considered inappropriate in a
-  professional setting
-
-## Enforcement Responsibilities
-
-Community leaders are responsible for clarifying and enforcing our standards of
-acceptable behavior and will take appropriate and fair corrective action in
-response to any behavior that they deem inappropriate, threatening, offensive,
-or harmful.
-
-Community leaders have the right and responsibility to remove, edit, or reject
-comments, commits, code, wiki edits, issues, and other contributions that are
-not aligned to this Code of Conduct, and will communicate reasons for moderation
-decisions when appropriate.
-
-## Scope
-
-This Code of Conduct applies within all community spaces, and also applies when
-an individual is officially representing the community in public spaces.
-Examples of representing our community include using an official e-mail address,
-posting via an official social media account, or acting as an appointed
-representative at an online or offline event.
-
-## Enforcement
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported to the community leaders responsible for enforcement at
-<development@prowlarr.com>.
-All complaints will be reviewed and investigated promptly and fairly.
-
-All community leaders are obligated to respect the privacy and security of the
-reporter of any incident.
-
-## Enforcement Guidelines
-
-Community leaders will follow these Community Impact Guidelines in determining
-the consequences for any action they deem in violation of this Code of Conduct:
-
-### 1. Correction
-
-**Community Impact**: Use of inappropriate language or other behavior deemed
-unprofessional or unwelcome in the community.
-
-**Consequence**: A private, written warning from community leaders, providing
-clarity around the nature of the violation and an explanation of why the
-behavior was inappropriate. A public apology may be requested.
-
-### 2. Warning
-
-**Community Impact**: A violation through a single incident or series of
-actions.
-
-**Consequence**: A warning with consequences for continued behavior. No
-interaction with the people involved, including unsolicited interaction with
-those enforcing the Code of Conduct, for a specified period of time. This
-includes avoiding interactions in community spaces as well as external channels
-like social media. Violating these terms may lead to a temporary or permanent
-ban.
-
-### 3. Temporary Ban
-
-**Community Impact**: A serious violation of community standards, including
-sustained inappropriate behavior.
-
-**Consequence**: A temporary ban from any sort of interaction or public
-communication with the community for a specified period of time. No public or
-private interaction with the people involved, including unsolicited interaction
-with those enforcing the Code of Conduct, is allowed during this period.
-Violating these terms may lead to a permanent ban.
-
-### 4. Permanent Ban
-
-**Community Impact**: Demonstrating a pattern of violation of community
-standards, including sustained inappropriate behavior, harassment of an
-individual, or aggression toward or disparagement of classes of individuals.
-
-**Consequence**: A permanent ban from any sort of public interaction within the
-community.
-
-## Attribution
-
-This Code of Conduct is adapted from the [Contributor Covenant][homepage],
-version 2.1, available at
-[https://www.contributor-covenant.org/version/2/1/code_of_conduct.html][v2.1].
-
-Community Impact Guidelines were inspired by
-[Mozilla's code of conduct enforcement ladder][Mozilla CoC].
-
-For answers to common questions about this code of conduct, see the FAQ at
-[https://www.contributor-covenant.org/faq][FAQ]. Translations are available at
-[https://www.contributor-covenant.org/translations][translations].
-
-[homepage]: https://www.contributor-covenant.org
-[v2.1]: https://www.contributor-covenant.org/version/2/1/code_of_conduct.html
-[Mozilla CoC]: https://github.com/mozilla/diversity
-[FAQ]: https://www.contributor-covenant.org/faq
-[translations]: https://www.contributor-covenant.org/translations

azure-pipelines.yml

@@ -9,7 +9,7 @@ variables:
   testsFolder: './_tests'
   yarnCacheFolder: $(Pipeline.Workspace)/.yarn
   nugetCacheFolder: $(Pipeline.Workspace)/.nuget/packages
-  majorVersion: '0.4.10'
+  majorVersion: '0.4.5'
   minorVersion: $[counter('minorVersion', 1)]
   prowlarrVersion: '$(majorVersion).$(minorVersion)'
   buildName: '$(Build.SourceBranchName).$(prowlarrVersion)'
@@ -748,7 +748,7 @@ stages:
         inputs:
           buildType: 'current'
           artifactName: Packages
-          itemPattern: '**/$(pattern)'
+          itemPattern: '/$(pattern)'
           targetPath: $(Build.ArtifactStagingDirectory)
       - bash: |
           mkdir -p ${BUILD_ARTIFACTSTAGINGDIRECTORY}/bin
@@ -1108,5 +1108,4 @@ stages:
             SYSTEM_ACCESSTOKEN: $(System.AccessToken)
             DISCORDCHANNELID: $(discordChannelId)
             DISCORDWEBHOOKKEY: $(discordWebhookKey)
-            DISCORDTHREADID: $(discordThreadId)
 

changelogs/CHANGELOG-v0.2.0.1448.md

@@ -0,0 +1,55 @@
+# New Beta Release
+
+Prowlarr v0.2.0.1448 has been released on `develop`
+
+A reminder about the `develop` branch
+
+- **develop - Current Develop/Beta - (Beta): This is the testing edge. Released after tested in nightly to ensure no immediate issues. New features and bug fixes released here first. This version will receive updates either weeklyish or bi-weeklyish depending on development.**
+
+# Announcements
+
+- Automated API Documentation Updates recently implemented
+- [*Coming Soon* - Newznab & All Indexer Definitions to YML - Cardigann v5](https://github.com/Prowlarr/Prowlarr/pull/823)
+- Note that users of Newznab (Usenet) Indexers may see that the UI shows Indexers as added that are not.
+  - This will be fixed with Cardigann v5 and is due to all the Newznab Indexers sharing the same definition.
+  - https://i.imgur.com/tijCHlk.png
+
+# Additional Commentary
+
+- Lidarr v1 coming to `develop` as beta soon^(tm)
+- Readarr official beta on `develop` coming soon^(tm) currently dealing with metadata issues
+- [Radarr](https://www.reddit.com/r/radarr/comments/sgrsb3/new_stable_release_master_v4045909/) v4.0.4 released to `master` (stable)
+- [Radarr Postgres Database Support coming soon (PR#6873)](https://github.com/radarr/radarr/pull/6873)
+- [Lidarr Postgres Database Support in development (Draft PR#2625)](https://github.com/Lidarr/Lidarr/pull/2625)
+
+# Releases
+
+## Native
+
+- [GitHub Releases](https://github.com/Prowlarr/Prowlarr/releases)
+
+- [Wiki Installation Instructions](https://wiki.servarr.com/prowlarr/installation)
+
+## Docker
+
+- [hotio/Prowlarr:testing](https://hotio.dev/containers/prowlarr)
+
+- [lscr.io/linuxserver/Prowlarr:develop](https://docs.linuxserver.io/images/docker-prowlarr)
+
+------------
+
+# Release Notes
+
+## v0.2.0.1448 (changes since v0.2.0.1426)
+
+ - Sync Indexers on app start, go to http if not sync'd yet
+
+ - Misc definition handling improvements
+
+ - Fixed: Updated ruTorrent stopped state helptext
+
+ - Fixed: Added missing translate for Database
+
+ - Fixed: Download limit check was using the query limit instead of the grab limit.
+
+- Other bug fixes and improvements, see github history

changelogs/CHANGELOG-v0.2.0.1678.md

@@ -0,0 +1,212 @@
+# New Beta Release
+
+Prowlarr v0.2.0.1678 has been released on `develop`
+
+- **Users who do not wish to be on the alpha `nightly` testing branch should take advantage of this parity and switch to `develop`
+
+A reminder about the `develop` and `nightly` branches
+
+- **develop** - Current Develop/Beta - (Beta): This is the testing edge. Released after tested in nightly to ensure no immediate issues. New features and bug fixes released here first after nightly. It can be considered semi-stable, but is still beta.**
+- **nightly** - Current Nightly/Unstable - (Alpha/Unstable) : This is the bleeding edge. It is released as soon as code is committed and passes all automated tests. This build may have not been used by us or other users yet. There is no guarantee that it will even run in some cases. This branch is only recommended for advanced users. Issues and self investigation are expected in this branch. Use this branch only if you know what you are doing and are willing to get your hands dirty to recover a failed update. This version is updated immediately.**
+
+# Announcements
+
+- Automated API Documentation Updates recently implemented
+- [*Coming Soon* - Newznab & All Indexer Definitions to YML - Cardigann v6](https://github.com/Prowlarr/Prowlarr/pull/823)
+- Note that users of Newznab (Usenet) Indexers may see that the UI shows Indexers as added that are not.
+  - This will be fixed with Cardigann v6 and is due to all the Newznab Indexers sharing the same definition.
+  - https://i.imgur.com/tijCHlk.png
+
+# Additional Commentary
+
+- Lidarr v1 coming to `develop` as beta soon^(tm)
+- [Lidarr](https://lidarr.audio/donate), [Prowlarr](https://prowlarr.com/donate), [Radarr](https://radarr.video/donate), [Readarr](https://readarr.com/donate) now accept direct bitcoin donations
+- [Readarr official beta on `develop` announced](https://www.reddit.com/r/Readarr/comments/sxvj8y/new_beta_release_develop_v0101248/)
+- Radarr Postgres Database Support in `nightly`
+- [Lidarr Postgres Database Support in development (Draft PR#2625)](https://github.com/Lidarr/Lidarr/pull/2625)
+
+# Releases
+
+## Native
+
+- [GitHub Releases](https://github.com/Prowlarr/Prowlarr/releases)
+
+- [Wiki Installation Instructions](https://wiki.servarr.com/prowlarr/installation)
+
+## Docker
+
+- [hotio/Prowlarr:testing](https://hotio.dev/containers/prowlarr)
+
+- [lscr.io/linuxserver/Prowlarr:develop](https://docs.linuxserver.io/images/docker-prowlarr)
+
+## NAS Packages
+
+- Synology - Please ask the SynoCommunity to update the base package; however, you can update in-app normally
+
+- QNAP - Please ask the QNAP to update the base package; however, you should be able to update in-app normally
+
+------------
+
+# Release Notes
+
+## v0.2.0.1678 (changes since v0.2.0.1448)
+
+ - Bump moment from 2.29.1 to 2.29.2
+
+ - #834 #256 fix for unable to load the Indexes page
+
+ - Fix .editorconfig to disallow `this`
+
+ - New: MyAnonamouse freeleech support
+
+ - Fixed: (BHD) TMDb Parsing Exception
+
+ - Fixed: MoreThanTV indexer from browse page layout changes (#922)
+
+ - We don't have two Radarrs
+
+ - Fix indent from 37c393a659
+
+ - Fixed: (HDBits) Treat 403 as Query Limit
+
+ - Fixed: (PTP) Treat 403 as Query Limit
+
+ - New: (BTN) Rate Limit to 1 Query per 5 Seconds
+
+ - Fixed: (BTN) Handle Query Limit Error
+
+ - New: (Lidarr/Radarr/Readarr/Sonarr) Improved Errors
+
+ - Fixed: Loading old commands from database
+
+ - Fixed: Cleanup Temp files after backup creation
+
+ - Add Support
+
+ - Translated using Weblate (Finnish)
+
+ - Fixed: Indexer Infobox Error (#920)
+
+ - New: Indexer Description in Add Indexer Modal
+
+ - Fixed: Missing Translates
+
+ - New: Add Search Capabilities to Indexer API & InfoBox
+
+ - Fixed: Update from version in logs
+
+ - Automated API Docs update
+
+ - Translated using Weblate (Chinese (Simplified) (zh_CN))
+
+ - Translated using Weblate (Portuguese (Brazil))
+
+ - Fixed: Validation when testing indexers, connections and download clients
+
+ - Fixed: Prevent delete of last profile
+
+ - New: Load more (page) results on Search UI
+
+ - Update webpack packages
+
+ - Frontend Package Updates
+
+ - Backend Package Updates
+
+ - Bump dotnet to 6.0.3
+
+ - Translated using Weblate (Spanish)
+
+ - Fixed: (Gazelle) Replace Periods for Space in Search Term
+
+ - Fixed: (HDSpace) Replace Periods for Space in Search Term
+
+ - Fixed: (Anthelion) Replace Periods for Space in Search Term
+
+ - Fixed: (Redacted) Map Categories Comedy & E-Learning Videos to 'Other'
+
+ - Fixed: No longer require first run as admin on windows (#885)
+
+ - Translated using Weblate (Chinese (Simplified) (zh_CN))
+
+ - indexer(xthor): moved to YAML definition v5
+
+ - Fixed: '/indexers' URL Base breaking UI navigation
+
+ - Translated using Weblate (French)
+
+ - Fix app settings delete modal not closing and reloading app profiles
+
+ - Translated using Weblate (French)
+
+ - Bump Swashbuckle to 6.3.0
+
+ - Translated using Weblate (Portuguese (Brazil))
+
+ - fixup! New: (DanishBytes) Move to YML
+
+ - New: (DanishBytes) Move to YML
+
+ - Update translation files
+
+ - New: (RuTracker.org) add .bet mirror (#876)
+
+ - Fixed:(pornolab) language formatting
+
+ - New: Housekeeper for ApplicationStatus
+
+ - Fixed: Cleanse Tracker api_token from logs
+
+ - New: (HDTorrents) Add hd-torrents.org as Url option
+
+ - New: (Cardigann) Allow JSON filters
+
+ - Fixed: Convert List<HistoryEventTypes> to Int before passing to DB
+
+ - Fixed: WhereBuilder for Postgres
+
+ - Translated using Weblate (Finnish)
+
+ - Fixed: Make authentication cookie name unique to Prowlarr
+
+ - Update Categories
+
+ - Fixed: Enable response compression over https
+
+ - Fixed: (RuTracker) Update Cats
+
+ - Fixed: Clarify App Sync Settings (#847)
+
+ - Set version header to X-Application-Version (missing hyphen)
+
+ - Go to http if def exists on def server
+
+ - Fixed: (BHD) Handle API Auth Errors
+
+ - Fixed: (Immortalseed) Keywordless Search
+
+ - Fixed: (Cardigann) TraktId was mapping to TvRageId
+
+ - New: (Cardigann) - Cardigann v4 Support for Genre, Year, and TraktID
+
+ - New: (Cardigann) - Cardigann v4 Support for categorydesc
+
+ - New: (Cardigann) - Cardigann v4 Add Support for MapTrackerCatDescToNewznab
+
+ - New: (Cardigann) - Cardigann v4 Improved Search Logging
+
+ - Fixed: Corrected Query Limit and Grab Limit HelpText
+
+ - New: (Avistaz) Better error reporting for unauthorized tests
+
+ - Fixed: (Cardigann) Requests Failing for Definitions without LegacyLinks
+
+ - Bump SharpZipLib from 1.3.1 to 1.3.3 in /src/NzbDrone.Common
+
+ - Fixed: (Cardigann) Smarter redirect domain compare
+
+ - Fixed: (Cardigann) Treat "Refresh" header as redirect
+
+ - Fixed: (Cardigann) Replace legacy links with default link when making requests
+
+ - Other bug fixes and improvements, see GitHub history

changelogs/CHANGELOG-v0.3.0.1730.md

@@ -0,0 +1,117 @@
+# New Beta Release
+
+Prowlarr v0.3.0.1730 has been released on `develop`
+
+- **Users who do not wish to be on the alpha `nightly` testing branch should take advantage of this parity and switch to `develop`**
+
+A reminder about the `develop` and `nightly` branches
+
+- **develop** - Current Develop/Beta - (Beta): This is the testing edge. Released after tested in nightly to ensure no immediate issues. New features and bug fixes released here first after nightly. It can be considered semi-stable, but is still beta.
+- **nightly** - Current Nightly/Unstable - (Alpha/Unstable) : This is the bleeding edge. It is released as soon as code is committed and passes all automated tests. This build may have not been used by us or other users yet. There is no guarantee that it will even run in some cases. This branch is only recommended for advanced users. Issues and self investigation are expected in this branch. Use this branch only if you know what you are doing and are willing to get your hands dirty to recover a failed update. This version is updated immediately.
+
+# Announcements
+
+- Automated API Documentation Updates recently implemented
+- [*Coming Soon* - Better \*Arr App  Sync](https://github.com/Prowlarr/Prowlarr/pull/983)
+- [*Coming Soon* - Newznab & All Indexer Definitions to YML - Cardigann v6](https://github.com/Prowlarr/Prowlarr/pull/823)
+- Note that users of Newznab (Usenet) Indexers may see that the UI shows Indexers as added that are not.
+  - This will be fixed with Cardigann v6 and is due to all the Newznab Indexers sharing the same definition.
+  - https://i.imgur.com/tijCHlk.png
+
+# Additional Commentary
+
+- Lidarr v1 coming to `develop` as beta soon^(tm)
+- [Lidarr](https://lidarr.audio/donate), [Prowlarr](https://prowlarr.com/donate), [Radarr](https://radarr.video/donate), [Readarr](https://readarr.com/donate) now accept direct bitcoin donations
+- [Readarr official beta on `develop` announced](https://www.reddit.com/r/Readarr/comments/sxvj8y/new_beta_release_develop_v0101248/)
+- Radarr Postgres Database Support in `nightly`
+- [Lidarr Postgres Database Support in development (Draft PR#2625)](https://github.com/Lidarr/Lidarr/pull/2625)
+
+# Releases
+
+## Native
+
+- [GitHub Releases](https://github.com/Prowlarr/Prowlarr/releases)
+
+- [Wiki Installation Instructions](https://wiki.servarr.com/prowlarr/installation)
+
+## Docker
+
+- [hotio/Prowlarr:testing](https://hotio.dev/containers/prowlarr)
+
+- [lscr.io/linuxserver/Prowlarr:develop](https://docs.linuxserver.io/images/docker-prowlarr)
+
+## NAS Packages
+
+- Synology - Please ask the SynoCommunity to update the base package; however, you can update in-app normally
+
+- QNAP - Please ask the QNAP to update the base package; however, you should be able to update in-app normally
+
+------------
+
+# Release Notes
+
+## v0.3.0.1730 (changes since v0.3.0.1724)
+
+ - Fixed: Prevent endless loop when calling IndexerUrls for Torznab
+
+ - Deleted translation using Weblate (Chinese (Min Nan))
+
+ - Fix some translations
+
+ - Other bug fixes and improvements, see GitHub history
+
+## v0.3.0.1724 (changes since v0.2.0.1678)
+
+- Fixed: Prevent endless loop when calling IndexerUrls for Newznab ( #982 )
+
+- Fixed: Default List for Cardigann LegacyLinks
+
+- New: Auto map known legacy BaseUrls for non-Cardigann
+
+- Fixed: (BTN) Move to HTTPS ( #979 )
+
+- Typo for myanonamouse.
+
+- Fixed: (MoreThanTV) Better Response Cleansing ( #928 )
+
+- New: SceneHD Indexer
+
+- Fixed: (MaM) Handle Auth Errors & Session Expiry
+
+- Fixed: Remove Indexer if categories were changed to not include in sync ( #912 )
+
+- Fixed: Sync Indexers on App Edit
+
+- Cleanup Config Values ( #894 )
+
+- Fixed: (Cardigann) Handle json field selector that returns arrays ( #950 )
+
+- New: Schedule refresh and process monitored download tasks at high priority
+
+- Centralise image choice, update to latest images
+
+- Don't return early after re-running checks after startup grace period ( #7147 )
+
+- Fixed: Delay health check notifications on startup
+
+- New: Add date picker for custom filter dates
+
+- Bump Monotorrent to 2.0.5
+
+- Remove old DotNetVersion method and dep
+
+- New: Add backup size information ( #957 )
+
+- Fixed: (BeyondHD) Use TryCoerceInt for tmdbId ( #960 )
+
+- Fixed: (TorrentDay) TV Search returning Series not S/E Results ( #816 )
+
+- Fixed: (CinemaZ and ExoticaZ) Better Log Cleansing
+
+- Fixed: (exoticaz) Category Parsing
+
+- Fixed: (Indexer) HDTorrents search imdbid + season/episode
+
+- Bump version to 0.3.0
+
+ - Other bug fixes and improvements, see GitHub history

changelogs/CHANGELOG-v0.4.2.1879.md

@@ -0,0 +1,203 @@
+# New Beta Release
+
+Prowlarr v0.4.2.1879 has been released on `develop`
+
+- **Users who do not wish to be on the alpha `nightly` testing branch should take advantage of this parity and switch to `develop`**
+
+A reminder about the `develop` and `nightly` branches
+
+- **develop** - Current Develop/Beta - (Beta): This is the testing edge. Released after tested in nightly to ensure no immediate issues. New features and bug fixes released here first after nightly. It can be considered semi-stable, but is still beta.
+- **nightly** - Current Nightly/Unstable - (Alpha/Unstable) : This is the bleeding edge. It is released as soon as code is committed and passes all automated tests. This build may have not been used by us or other users yet. There is no guarantee that it will even run in some cases. This branch is only recommended for advanced users. Issues and self investigation are expected in this branch. Use this branch only if you know what you are doing and are willing to get your hands dirty to recover a failed update. This version is updated immediately.
+
+# Announcements
+
+- [Prowlarr Cardigann Definitions Schema Versions and Validations created](https://github.com/Prowlarr/indexers#schemas)
+- [*Coming Soon* - Newznab & All Indexer Definitions to YML - Cardigann v7](https://github.com/Prowlarr/Prowlarr/pull/823)
+- Note that users of Newznab (Usenet) Indexers may see that the UI shows Indexers as added that are not.
+  - This will be fixed with Cardigann v6 and is due to all the Newznab Indexers sharing the same definition.
+  - https://i.imgur.com/tijCHlk.png
+ 
+
+# Additional Commentary
+
+- [Lidarr v1 coming to `master` as recently released](https://www.reddit.com/r/Lidarr/comments/v5fdhi/new_stable_release_master_v1022592/)
+- [Lidarr](https://lidarr.audio/donate), [Prowlarr](https://prowlarr.com/donate), [Radarr](https://radarr.video/donate), [Readarr](https://readarr.com/donate) now accept direct bitcoin donations
+- [Readarr official beta on `develop` announced](https://www.reddit.com/r/Readarr/comments/sxvj8y/new_beta_release_develop_v0101248/)
+- Radarr Postgres Database Support in `nightly` and `develop`
+- Prowlarr Postgres Database Support in `nightly` and `develop`
+- [Lidarr Postgres Database Support in development (Draft PR#2625)](https://github.com/Lidarr/Lidarr/pull/2625)
+- \*Arrs Wiki Contributions welcomed and strongly encouraged, simply auth with GitHub on the wiki and update the page
+
+# Releases
+
+## Native
+
+- [GitHub Releases](https://github.com/Prowlarr/Prowlarr/releases)
+
+- [Wiki Installation Instructions](https://wiki.servarr.com/prowlarr/installation)
+
+## Docker
+
+- [hotio/Prowlarr:testing](https://hotio.dev/containers/prowlarr)
+
+- [lscr.io/linuxserver/Prowlarr:develop](https://docs.linuxserver.io/images/docker-prowlarr)
+
+## NAS Packages
+
+- Synology - Please ask the SynoCommunity to update the base package; however, you can update in-app normally
+
+- QNAP - Please ask the QNAP to update the base package; however, you should be able to update in-app normally
+
+------------
+
+# Release Notes
+
+## v0.4.2.1879 (changes since v0.3.0.1730)
+
+ - Don't require user agent for IPTorrents
+
+ - Fixed: (Applications) ApiPath can be null from -arr in some cases
+
+ - ProtectionService Test Fixture
+
+ - Fixed: Lidarr null ref when building indexer for sync
+
+ - Fixed: Lidarr null ref when building indexer for sync
+
+ - Double MultipartBodyLengthLimit for Backup Restore to 256MB
+
+ - Fixed: (IPTorrents) Allow UA override for CF
+
+ - Fixed: Log Cleanse Indexer Response Logic and Test Cases
+
+ - Fixed: Set update executable permissions correctly
+
+ - Fixed: Don't call for server notifications on event driven check
+
+ - Update file and folder handling methods from Radarr (#1051)
+
+ - Running Integration Tests against Postgres Database (#838)
+
+ - Updated NLog Version (#7365)
+
+ - Add additional link logging to DownloadService
+
+ - Fixed: Correctly remove TorrentParadiseMl
+
+ - V6 Cardigann Changes (#1045)
+
+ - Sliding expiration for auth cookie and a little clean up
+
+ - Bump version to 0.4.2
+
+ - Update Sentry to 3.18.0
+
+ - Update Swashbuckle to 6.3.1
+
+ - Bump dotnet to 6.0.6
+
+ - Update AngleSharp to 0.17.0
+
+ - Remove ShowRSS C# Implementation
+
+ - Swallow HTTP issues on analytics call
+
+ - Fix NullRef in analytics service
+
+ - Bump version to 0.4.1
+
+ - Fix Donation Links
+
+ - Fix Tooltips in Dark Theme
+
+ - Fixed: (AnimeBytes) Cleanse Passkey from response
+
+ - Fixed: (Cardigann) Use variables in keywordsfilters block
+
+ - New: (BeyondHD) Better status messages for failures
+
+ - Fixed: VIP Healthcheck not triggered for expired indexers
+
+ - Use DryIoc for Automoqer, drop Unity dependency
+
+ - New: Send description element in nab response
+
+ - (Filelist) Update help text for pass key (#1039)
+
+ - Fixed: (Exoticaz) Category parsing kills search/feed
+
+ - New: (PassThePopcorn) Freeleech only option
+
+ - Fixed: (Cardigann) Searching with nab Parent should also use Child categories
+
+ - Fixed: Better Cleansing of Tracker Announce Keys
+
+ - Automated API Docs update
+
+ - Update FE dev dependencies
+
+ - Ensure .Mono and .Windows projects have all dependencies in build output
+
+ - Fixed: (Gazelle) Parse grouptime as long or date
+
+ - Fixed: (ExoticaZ) Category Parsing
+
+ - Fixed: Input options background color on mobile
+
+ - Fixed: Update AltHub API URL (#1010)
+
+ - Automated API Docs update
+
+ - New: Dark Theme
+
+ - New: Move to CSS Variables for Colorings
+
+ - New: Native Theme Engine
+
+ - diversify chartcolors for doughnut & stackedbar
+
+ - Translated using Weblate (Chinese (Simplified) (zh_CN))
+
+ - Catch Postgres log connection errors
+
+ - Clean lingering Postgres Connections on Close
+
+ - New: Instance name in System/Status API endpoint
+
+ - New: Instance name for Page Title
+
+ - New: Instance Name used for Syslog
+
+ - New: Set Instance Name
+
+ - Fixed: Use separate guid for download protection
+
+ - Fixed: (RuTracker) Support Raw search from apps
+
+ - Fixed: Localization for two part language dialects
+
+ - Fixed: (AnimeBytes) Handle series synonyms with commas (#984)
+
+ - New: Add Lidarr and Readarr DiscographySeedTime Sync
+
+ - New: Add Sonarr SeasonSeedTime Sync
+
+ - Fixed: Indexer Tags Helptext
+
+ - Automated API Docs update
+
+ - New: Seed Settings Sync
+
+ - New: Only sync indexers with matching app tags
+
+ - Indexer Cleanup
+
+ - Bump version to 0.4.0
+
+ - Bump version to 0.3.1
+
+ - Translated using Weblate (Chinese (Simplified) (zh_CN))
+
+ - Fixed: Correct User-Agent api logging
+
+ - Other bug fixes and improvements, see GitHub history

changelogs/CHANGELOG-v0.4.3.1921.md

@@ -0,0 +1,110 @@
+# New Beta Release
+
+Prowlarr v0.4.3.1921 has been released on `develop`
+
+- **Users who do not wish to be on the alpha `nightly` testing branch should take advantage of this parity and switch to `develop`**
+
+A reminder about the `develop` and `nightly` branches
+
+- **develop** - Current Develop/Beta - (Beta): This is the testing edge. Released after tested in nightly to ensure no immediate issues. New features and bug fixes released here first after nightly. It can be considered semi-stable, but is still beta.
+- **nightly** - Current Nightly/Unstable - (Alpha/Unstable) : This is the bleeding edge. It is released as soon as code is committed and passes all automated tests. This build may have not been used by us or other users yet. There is no guarantee that it will even run in some cases. This branch is only recommended for advanced users. Issues and self investigation are expected in this branch. Use this branch only if you know what you are doing and are willing to get your hands dirty to recover a failed update. This version is updated immediately.
+
+# Announcements
+
+- [Prowlarr Cardigann Definitions Schema Versions and Validations created](https://github.com/Prowlarr/indexers#schemas)
+- [*Coming Soon* - Newznab & All Indexer Definitions to YML - Cardigann v8](https://github.com/Prowlarr/Prowlarr/pull/823)
+- Note that users of Newznab (Usenet) Indexers may see that the UI shows Indexers as added that are not.
+  - This will be fixed with Cardigann v8 and is due to all the Newznab Indexers sharing the same definition.
+  - https://i.imgur.com/tijCHlk.png
+ 
+
+# Additional Commentary
+
+- [Radarr Develop recently released](https://www.reddit.com/r/radarr/comments/w3kik4/new_release_develop_v4206438/)
+- [Lidarr](https://lidarr.audio/donate), [Prowlarr](https://prowlarr.com/donate), [Radarr](https://radarr.video/donate), [Readarr](https://readarr.com/donate) now accept direct bitcoin donations
+- Radarr Postgres Database Support in `nightly` and `develop`
+- Prowlarr Postgres Database Support in `nightly` and `develop`
+- [Lidarr Postgres Database Support in development (Draft PR#2625)](https://github.com/Lidarr/Lidarr/pull/2625)
+- \*Arrs Wiki Contributions welcomed and strongly encouraged, simply auth with GitHub on the wiki and update the page
+
+# Releases
+
+## Native
+
+- [GitHub Releases](https://github.com/Prowlarr/Prowlarr/releases)
+
+- [Wiki Installation Instructions](https://wiki.servarr.com/prowlarr/installation)
+
+## Docker
+
+- [hotio/Prowlarr:testing](https://hotio.dev/containers/prowlarr)
+
+- [lscr.io/linuxserver/Prowlarr:develop](https://docs.linuxserver.io/images/docker-prowlarr)
+
+## NAS Packages
+
+- Synology - Please ask the SynoCommunity to update the base package; however, you can update in-app normally
+
+- QNAP - Please ask the QNAP to update the base package; however, you should be able to update in-app normally
+
+------------
+
+# Release Notes
+
+## v0.4.3.1921 (changes since v0.4.2.1879)
+
+ - Fixed: (GazelleGames) Use API instead of scraping
+
+ - Translated using Weblate (Hungarian)
+
+ - Automated API Docs update
+
+ - New: Search by DoubanId
+
+ - Fixed: UI Typos (#1072)
+
+ - Translated using Weblate (Chinese (Traditional) (zh_TW))
+
+ - Update README.md
+
+ - Automated API Docs update
+
+ - Debounce analytics service
+
+ - Fixed: Set Download and Upload Factors from Generic Torznab
+
+ - Translated using Weblate (Portuguese (Brazil))
+
+ - Translation Improvements
+
+ - Cleanup Language and Localization code
+
+ - Added translation using Weblate (Lithuanian)
+
+ - Fixed: BeyondHD using improperly cased Content-Type header
+
+ - Fix NullRef in Cloudflare detection service
+
+ - New: (AvistaZ) Parse Languages and Subs, pass in response
+
+ - Rework Cloudflare Protection Detection
+
+ - New: (FlareSolverr) DDOS Guard Support
+
+ - Bump Mailkit to 3.3.0 (#1054)
+
+ - New: Add linux-x86 builds
+
+ - Remove unused XmlRPC dependency
+
+ - Fixed: (Cardigann) Use Indexer Encoding for Form Parameters
+
+ - Fixed: (Cardigann) Use Session Cookie when making SimpleCaptchaCall
+
+ - Fixed: Delete CustomFilters not handled properly
+
+ - Modern HTTP Client (#685)
+
+ - Bump version to 0.4.3
+
+ - Other bug fixes and improvements, see GitHub history

changelogs/CHANGELOG-v0.4.4.1947.md

@@ -0,0 +1,83 @@
+# New Beta Release
+
+Prowlarr v0.4.4.1947 has been released on `develop`
+
+- **Users who do not wish to be on the alpha `nightly` testing branch should take advantage of this parity and switch to `develop`**
+
+A reminder about the `develop` and `nightly` branches
+
+- **develop** - Current Develop/Beta - (Beta): This is the testing edge. Released after tested in nightly to ensure no immediate issues. New features and bug fixes released here first after nightly. It can be considered semi-stable, but is still beta.
+- **nightly** - Current Nightly/Unstable - (Alpha/Unstable) : This is the bleeding edge. It is released as soon as code is committed and passes all automated tests. This build may have not been used by us or other users yet. There is no guarantee that it will even run in some cases. This branch is only recommended for advanced users. Issues and self investigation are expected in this branch. Use this branch only if you know what you are doing and are willing to get your hands dirty to recover a failed update. This version is updated immediately.
+
+# Announcements
+
+- [Prowlarr Cardigann Definitions Schema Versions and Validations created](https://github.com/Prowlarr/indexers#schemas)
+- [*Coming Soon* - Newznab & All Indexer Definitions to YML - Cardigann v8](https://github.com/Prowlarr/Prowlarr/pull/823)
+- Note that users of Newznab (Usenet) Indexers may see that the UI shows Indexers as added that are not.
+  - This will be fixed with Cardigann v8 and is due to all the Newznab Indexers sharing the same definition.
+  - https://i.imgur.com/tijCHlk.png
+ 
+
+# Additional Commentary
+
+- [Radarr Develop recently released](https://www.reddit.com/r/radarr/comments/w3kik4/new_release_develop_v4206438/)
+- [Lidarr](https://lidarr.audio/donate), [Prowlarr](https://prowlarr.com/donate), [Radarr](https://radarr.video/donate), [Readarr](https://readarr.com/donate) now accept direct bitcoin donations
+- Radarr Postgres Database Support in `nightly` and `develop`
+- Prowlarr Postgres Database Support in `nightly` and `develop`
+- Readarr Postgres Database Support in `nightly`
+- [Lidarr Postgres Database Support in development (Draft PR#2625)](https://github.com/Lidarr/Lidarr/pull/2625)
+- \*Arrs Wiki Contributions welcomed and strongly encouraged, simply auth with GitHub on the wiki and update the page
+
+# Releases
+
+## Native
+
+- [GitHub Releases](https://github.com/Prowlarr/Prowlarr/releases)
+
+- [Wiki Installation Instructions](https://wiki.servarr.com/prowlarr/installation)
+
+## Docker
+
+- [hotio/Prowlarr:testing](https://hotio.dev/containers/prowlarr)
+
+- [lscr.io/linuxserver/Prowlarr:develop](https://docs.linuxserver.io/images/docker-prowlarr)
+
+## NAS Packages
+
+- Synology - Please ask the SynoCommunity to update the base package; however, you can update in-app normally
+
+- QNAP - Please ask the QNAP to update the base package; however, you should be able to update in-app normally
+
+------------
+
+# Release Notes
+
+## v0.4.4.1947 (changes since [v0.4.3.1921](https://www.reddit.com/r/prowlarr/comments/wbanhd/new_develop_release_v0431921/))
+
+ - Translated using Weblate (Chinese (Simplified) (zh_CN))
+
+ - Fixed: Correctly persist FlareSolverr Cookies to ensure it doesn't run on every request
+
+ - Fixed: Correctly use FlareSolverr User Agent
+
+ - Remove duplicate package NLog.Extensions in Prowlarr.Common
+
+ - Fixed: (Cardigann) fix imatch for rows
+
+ - Support for digest auth with HttpRequests
+
+ - Fixed: (Cardigann) Genre is optional
+
+ - Fixed: (Cardigann) Genre Parsing
+
+ - Automated API Docs update
+
+ - Fixed: (Cardigann) Genre Parsing for Releases
+
+ - Fixed: (Cardigann) messy row strdump
+
+ - New: (Cardigann) Additional query support
+
+ - Bump version to 0.4.4
+
+ - Other bug fixes and improvements, see GitHub history

changelogs/templates/announcements.md

@@ -0,0 +1,6 @@
+- [Prowlarr Cardigann Definitions Schema Versions and Validations created](https://github.com/Prowlarr/indexers#schemas)
+- [*Coming Soon* - Newznab & All Indexer Definitions to YML - Cardigann v8](https://github.com/Prowlarr/Prowlarr/pull/823)
+- Note that users of Newznab (Usenet) Indexers may see that the UI shows Indexers as added that are not.
+  - This will be fixed with Cardigann v8 and is due to all the Newznab Indexers sharing the same definition.
+  - https://i.imgur.com/tijCHlk.png
+ 

changelogs/templates/branch-develop.md

@@ -0,0 +1,6 @@
+- **Users who do not wish to be on the alpha `nightly` testing branch should take advantage of this parity and switch to `develop`**
+
+A reminder about the `develop` and `nightly` branches
+
+- **develop** - Current Develop/Beta - (Beta): This is the testing edge. Released after tested in nightly to ensure no immediate issues. New features and bug fixes released here first after nightly. It can be considered semi-stable, but is still beta.
+- **nightly** - Current Nightly/Unstable - (Alpha/Unstable) : This is the bleeding edge. It is released as soon as code is committed and passes all automated tests. This build may have not been used by us or other users yet. There is no guarantee that it will even run in some cases. This branch is only recommended for advanced users. Issues and self investigation are expected in this branch. Use this branch only if you know what you are doing and are willing to get your hands dirty to recover a failed update. This version is updated immediately.

changelogs/templates/branch-master.md

@@ -0,0 +1,6 @@
+- **Users who do not wish to be on the alpha `nightly` or beta `develop` testing branches should take advantage of this parity and switch to `master`
+
+A reminder about the `develop` and `nightly` branches
+
+- **develop** - Current Develop/Beta - (Beta): This is the testing edge. Released after tested in nightly to ensure no immediate issues. New features and bug fixes released here first after nightly. It can be considered semi-stable, but is still beta.**
+- **nightly** - Current Nightly/Unstable - (Alpha/Unstable) : This is the bleeding edge. It is released as soon as code is committed and passes all automated tests. This build may have not been used by us or other users yet. There is no guarantee that it will even run in some cases. This branch is only recommended for advanced users. Issues and self investigation are expected in this branch. Use this branch only if you know what you are doing and are willing to get your hands dirty to recover a failed update. This version is updated immediately.**

changelogs/templates/commentary.md

@@ -0,0 +1,7 @@
+- [Radarr Develop recently released](https://www.reddit.com/r/radarr/comments/w3kik4/new_release_develop_v4206438/)
+- [Lidarr](https://lidarr.audio/donate), [Prowlarr](https://prowlarr.com/donate), [Radarr](https://radarr.video/donate), [Readarr](https://readarr.com/donate) now accept direct bitcoin donations
+- Radarr Postgres Database Support in `nightly` and `develop`
+- Prowlarr Postgres Database Support in `nightly` and `develop`
+- Readarr Postgres Database Support in `nightly`
+- [Lidarr Postgres Database Support in development (Draft PR#2625)](https://github.com/Lidarr/Lidarr/pull/2625)
+- \*Arrs Wiki Contributions welcomed and strongly encouraged, simply auth with GitHub on the wiki and update the page

frontend/src/Indexer/Index/IndexerIndex.js

@@ -221,7 +221,7 @@ class IndexerIndex extends Component {
 
   onKeyUp = (event) => {
     const jumpBarItems = this.state.jumpBarItems.order;
-    if (event.composedPath && event.composedPath().length === 4) {
+    if (event.path.length === 4) {
       if (event.keyCode === keyCodes.HOME && event.ctrlKey) {
         this.setState({ jumpToCharacter: jumpBarItems[0] });
       }

frontend/src/Styles/Themes/index.js

@@ -1,11 +1,7 @@
 import * as dark from './dark';
 import * as light from './light';
 
-const defaultDark = window.matchMedia('(prefers-color-scheme: dark)').matches;
-const auto = defaultDark ? { ...dark } : { ...light };
-
 export default {
-  auto,
   light,
   dark
 };

scripts/prowlarr_changelog_post.sh

@@ -0,0 +1,105 @@
+#!/bin/bash
+# Generate a Markdown change log of pull requests from commits between two tags
+scriptDir=$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &>/dev/null && pwd)
+ghRepo="Prowlarr"
+#branch="develop"
+#read -r -p "What Repo?: " ghRepo
+#read -r -p "What Org?: [Default:$ghRepo]" ghOrg
+read -r -p "What Branch? [master|develop|nightly]:" branch
+ghOrg=${ghOrg:-$ghRepo}
+ghRepoUrl=https://github.com/$ghOrg/$ghRepo
+
+case "${branch}" in
+master)
+    hotioBranch='release'
+    lsioBranch='latest'
+    branchType='Stable'
+    ;;
+develop)
+    hotioBranch='testing'
+    lsioBranch='develop'
+    branchType='Beta'
+    ;;
+nightly)
+    hotioBranch='nightly'
+    lsioBranch='nightly'
+    branchType='Alpha'
+    ;;
+esac
+baseDir=$(dirname "$scriptDir")
+changelogDir="$baseDir/changelogs/"
+templateDir="$changelogDir/templates/"
+# Get a list of all tags in reverse order
+# Assumes the tags are in version format like v1.2.3
+gitTags=$(git ls-remote -t --exit-code --refs --sort='-v:refname' "$ghRepoUrl" | sed -E 's/^[[:xdigit:]]+[[:space:]]+refs\/tags\/(.+)/\1/g')
+
+# Make the tags an array
+
+# shellcheck disable=SC2206
+tags=($gitTags)
+
+latestTag=${tags[0]}
+previousTag=${tags[1]}
+
+# Get a log of commits that occurred between two tags
+# See Pretty format placeholders at https://git-scm.com/docs/pretty-formats
+# -i -E --grep="(Fixed:|New:)"'
+commits=$(git log --pretty=format:' - %s%n' "$previousTag".."$latestTag")
+# Store our changelog in a variable to be saved to a file at the end
+markdown="# New ${branchType^} Release"
+markdown+='\n\n'
+markdown+="$ghRepo $latestTag has been released on \`$branch\`"
+markdown+='\n\n'
+branchmsg=$(cat "$templateDir"/branch-$branch.md)
+if [ -n "$branchmsg" ]; then
+    {
+        markdown+=$branchmsg
+        markdown+='\n\n'
+    }
+fi
+markdown+="# Announcements"
+markdown+='\n\n'
+markdown+=$(cat "$templateDir"/announcements.md)
+markdown+='\n\n'
+markdown+="# Additional Commentary"
+markdown+='\n\n'
+markdown+=$(cat "$templateDir"/commentary.md)
+markdown+='\n\n'
+markdown+="# Releases"
+markdown+='\n\n'
+markdown+="## Native"
+markdown+="\n\n"
+markdown+="- [GitHub Releases]($ghRepoUrl/releases)"
+markdown+="\n\n"
+markdown+="- [Wiki Installation Instructions](https://wiki.servarr.com/${ghRepo,,}/installation)"
+markdown+="\n\n"
+markdown+="## Docker"
+markdown+="\n\n"
+markdown+="- [hotio/$ghRepo:$hotioBranch](https://hotio.dev/containers/${ghRepo,,})"
+markdown+="\n\n"
+markdown+="- [lscr.io/linuxserver/$ghRepo:$lsioBranch](https://docs.linuxserver.io/images/docker-${ghRepo,,})"
+markdown+="\n\n"
+markdown+="## NAS Packages"
+markdown+="\n\n"
+markdown+="- Synology - Please ask the SynoCommunity to update the base package; however, you can update in-app normally"
+markdown+="\n\n"
+markdown+="- QNAP - Please ask the QNAP to update the base package; however, you should be able to update in-app normally"
+markdown+="\n\n"
+markdown+="------------"
+markdown+="\n\n"
+markdown+="# Release Notes"
+markdown+="\n\n"
+markdown+="## $latestTag (changes since $previousTag)"
+markdown+="\n\n"
+markdown+="$commits"
+markdown+="\n\n"
+markdown+=" - Other bug fixes and improvements, see GitHub history"
+# Loop over each commit and look for merged pull requests
+#for COMMIT in $COMMITS; do
+
+#done
+
+# Save our markdown to a file
+mkdir -p "$changelogDir"
+echo -e "$markdown" >"$changelogDir/CHANGELOG-$latestTag.md"
+exit 0

src/NzbDrone.Common.Test/ExtensionTests/StringExtensionTests/IsValidIPAddressFixture.cs

@@ -1,25 +0,0 @@
-using System.Globalization;
-using FluentAssertions;
-using NUnit.Framework;
-using NzbDrone.Common.Extensions;
-
-namespace NzbDrone.Common.Test.ExtensionTests.StringExtensionTests
-{
-    [TestFixture]
-    public class IsValidIPAddressFixture
-    {
-        [TestCase("192.168.0.1")]
-        [TestCase("::1")]
-        [TestCase("2001:db8:4006:812::200e")]
-        public void should_validate_ip_address(string input)
-        {
-            input.IsValidIpAddress().Should().BeTrue();
-        }
-
-        [TestCase("sonarr.tv")]
-        public void should_not_parse_non_ip_address(string input)
-        {
-            input.IsValidIpAddress().Should().BeFalse();
-        }
-    }
-}

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

@@ -212,7 +212,6 @@ namespace NzbDrone.Common.Test.Http
         }
 
         [Test]
-        [Platform(Exclude = "MacOsX", Reason = "Azure agent update prevents brotli on OSX")]
         public void should_execute_get_using_brotli()
         {
             var request = new HttpRequest($"https://{_httpBinHost}/brotli");

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

@@ -1,4 +1,4 @@
-using FluentAssertions;
+using FluentAssertions;
 using NUnit.Framework;
 using NzbDrone.Common.Http;
 using NzbDrone.Test.Common;
@@ -10,7 +10,6 @@ namespace NzbDrone.Common.Test.Http
         [TestCase("abc://my_host.com:8080/root/api/")]
         [TestCase("abc://my_host.com:8080//root/api/")]
         [TestCase("abc://my_host.com:8080/root//api/")]
-        [TestCase("abc://[::1]:8080/root//api/")]
         public void should_parse(string uri)
         {
             var newUri = new HttpUri(uri);

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

@@ -98,30 +98,15 @@ namespace NzbDrone.Common.Test.InstrumentationTests
         // Internal
         [TestCase(@"[Info] MigrationController: *** Migrating Database=prowlarr-main;Host=postgres14;Username=mySecret;Password=mySecret;Port=5432;Enlist=False ***")]
         [TestCase("/readarr/signalr/messages/negotiate?access_token=1234530f422f4aacb6b301233210aaaa&negotiateVersion=1")]
-        [TestCase(@"[Info] MigrationController: *** Migrating Database=prowlarr-main;Host=postgres14;Username=mySecret;Password=mySecret;Port=5432;token=mySecret;Enlist=False&username=mySecret;mypassword=mySecret;mypass=shouldkeep1;test_token=mySecret;password=123%@%_@!#^#@;use_password=mySecret;get_token=shouldkeep2;usetoken=shouldkeep3;passwrd=mySecret;")]
+
         public void should_clean_message(string message)
         {
             var cleansedMessage = CleanseLogMessage.Cleanse(message);
 
             cleansedMessage.Should().NotContain("mySecret");
-            cleansedMessage.Should().NotContain("123%@%_@!#^#@");
             cleansedMessage.Should().NotContain("01233210");
         }
 
-        [TestCase(@"[Info] MigrationController: *** Migrating Database=radarr-main;Host=postgres14;Username=mySecret;Password=mySecret;Port=5432;token=mySecret;Enlist=False&username=mySecret;mypassword=mySecret;mypass=shouldkeep1;test_token=mySecret;password=123%@%_@!#^#@;use_password=mySecret;get_token=shouldkeep2;usetoken=shouldkeep3;passwrd=mySecret;")]
-        public void should_keep_message(string message)
-        {
-            var cleansedMessage = CleanseLogMessage.Cleanse(message);
-
-            cleansedMessage.Should().NotContain("mySecret");
-            cleansedMessage.Should().NotContain("123%@%_@!#^#@");
-            cleansedMessage.Should().NotContain("01233210");
-
-            cleansedMessage.Should().Contain("shouldkeep1");
-            cleansedMessage.Should().Contain("shouldkeep2");
-            cleansedMessage.Should().Contain("shouldkeep3");
-        }
-
         [TestCase(@"Some message (from 32.2.3.5 user agent)")]
         [TestCase(@"Auth-Invalidated ip 32.2.3.5")]
         [TestCase(@"Auth-Success ip 32.2.3.5")]

src/NzbDrone.Common/Extensions/IpAddressExtensions.cs

@@ -7,50 +7,34 @@ namespace NzbDrone.Common.Extensions
     {
         public static bool IsLocalAddress(this IPAddress ipAddress)
         {
-            // Map back to IPv4 if mapped to IPv6, for example "::ffff:1.2.3.4" to "1.2.3.4".
-            if (ipAddress.IsIPv4MappedToIPv6)
+            if (ipAddress.IsIPv6LinkLocal)
             {
-                ipAddress = ipAddress.MapToIPv4();
+                return true;
             }
 
-            // Checks loopback ranges for both IPv4 and IPv6.
             if (IPAddress.IsLoopback(ipAddress))
             {
                 return true;
             }
 
-            // IPv4
             if (ipAddress.AddressFamily == AddressFamily.InterNetwork)
             {
-                return IsLocalIPv4(ipAddress.GetAddressBytes());
-            }
-
-            // IPv6
-            if (ipAddress.AddressFamily == AddressFamily.InterNetworkV6)
-            {
-                return ipAddress.IsIPv6LinkLocal ||
-                        ipAddress.IsIPv6UniqueLocal ||
-                        ipAddress.IsIPv6SiteLocal;
+                byte[] bytes = ipAddress.GetAddressBytes();
+                switch (bytes[0])
+                {
+                    case 10:
+                    case 127:
+                        return true;
+                    case 172:
+                        return bytes[1] < 32 && bytes[1] >= 16;
+                    case 192:
+                        return bytes[1] == 168;
+                    default:
+                        return false;
+                }
             }
 
             return false;
         }
-
-        private static bool IsLocalIPv4(byte[] ipv4Bytes)
-        {
-            // Link local (no IP assigned by DHCP): 169.254.0.0 to 169.254.255.255 (169.254.0.0/16)
-            bool IsLinkLocal() => ipv4Bytes[0] == 169 && ipv4Bytes[1] == 254;
-
-            // Class A private range: 10.0.0.0 – 10.255.255.255 (10.0.0.0/8)
-            bool IsClassA() => ipv4Bytes[0] == 10;
-
-            // Class B private range: 172.16.0.0 – 172.31.255.255 (172.16.0.0/12)
-            bool IsClassB() => ipv4Bytes[0] == 172 && ipv4Bytes[1] >= 16 && ipv4Bytes[1] <= 31;
-
-            // Class C private range: 192.168.0.0 – 192.168.255.255 (192.168.0.0/16)
-            bool IsClassC() => ipv4Bytes[0] == 192 && ipv4Bytes[1] == 168;
-
-            return IsLinkLocal() || IsClassA() || IsClassC() || IsClassB();
-        }
     }
 }

src/NzbDrone.Common/Extensions/StringExtensions.cs

@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
 using System.Net;
-using System.Net.Sockets;
 using System.Text;
 using System.Text.RegularExpressions;
 
@@ -232,30 +231,5 @@ namespace NzbDrone.Common.Extensions
                 .Replace("'", "%27")
                 .Replace("%7E", "~");
         }
-
-        public static bool IsValidIpAddress(this string value)
-        {
-            if (!IPAddress.TryParse(value, out var parsedAddress))
-            {
-                return false;
-            }
-
-            if (parsedAddress.Equals(IPAddress.Parse("255.255.255.255")))
-            {
-                return false;
-            }
-
-            if (parsedAddress.IsIPv6Multicast)
-            {
-                return false;
-            }
-
-            return parsedAddress.AddressFamily == AddressFamily.InterNetwork || parsedAddress.AddressFamily == AddressFamily.InterNetworkV6;
-        }
-
-        public static string ToUrlHost(this string input)
-        {
-            return input.Contains(":") ? $"[{input}]" : input;
-        }
     }
 }

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

@@ -99,7 +99,7 @@ namespace NzbDrone.Common.Http.Dispatchers
                 AddRequestHeaders(requestMessage, request.Headers);
             }
 
-            var httpClient = GetClient(request.Url, request.ProxySettings);
+            var httpClient = GetClient(request.Url);
 
             var sw = new Stopwatch();
 
@@ -154,9 +154,9 @@ namespace NzbDrone.Common.Http.Dispatchers
             }
         }
 
-        protected virtual System.Net.Http.HttpClient GetClient(HttpUri uri, HttpProxySettings requestProxy)
+        protected virtual System.Net.Http.HttpClient GetClient(HttpUri uri)
         {
-            var proxySettings = requestProxy ?? _proxySettingsProvider.GetProxySettings(uri);
+            var proxySettings = _proxySettingsProvider.GetProxySettings(uri);
 
             var key = proxySettings?.Key ?? NO_PROXY_KEY;
 
@@ -174,7 +174,6 @@ namespace NzbDrone.Common.Http.Dispatchers
                 PreAuthenticate = true,
                 MaxConnectionsPerServer = 12,
                 ConnectCallback = onConnect,
-                PooledConnectionLifetime = TimeSpan.FromMinutes(10),
                 SslOptions = new SslClientAuthenticationOptions
                 {
                     RemoteCertificateValidationCallback = _certificateValidationService.ShouldByPassValidationError

src/NzbDrone.Common/Http/HttpRequest.cs

@@ -6,7 +6,6 @@ using System.Net.Http;
 using System.Text;
 using NzbDrone.Common.EnvironmentInfo;
 using NzbDrone.Common.Extensions;
-using NzbDrone.Common.Http.Proxy;
 
 namespace NzbDrone.Common.Http
 {
@@ -38,7 +37,7 @@ namespace NzbDrone.Common.Http
         public HttpMethod Method { get; set; }
         public HttpHeader Headers { get; set; }
         public Encoding Encoding { get; set; }
-        public HttpProxySettings ProxySettings { get; set; }
+        public IWebProxy Proxy { get; set; }
         public byte[] ContentData { get; set; }
         public string ContentSummary { get; set; }
         public ICredentials Credentials { get; set; }

src/NzbDrone.Common/Http/HttpResponse.cs

@@ -89,13 +89,13 @@ namespace NzbDrone.Common.Http
 
                     if (match.Success)
                     {
-                        return (Request.Url + new HttpUri(match.Groups[2].Value)).FullUri;
+                        return (Request.Url += new HttpUri(match.Groups[2].Value)).FullUri;
                     }
 
                     return string.Empty;
                 }
 
-                return (Request.Url + new HttpUri(newUrl)).FullUri;
+                return (Request.Url += new HttpUri(newUrl)).FullUri;
             }
         }
 

src/NzbDrone.Common/Http/HttpUri.cs

@@ -8,7 +8,7 @@ namespace NzbDrone.Common.Http
 {
     public class HttpUri : IEquatable<HttpUri>
     {
-        private static readonly Regex RegexUri = new Regex(@"^(?:(?<scheme>[a-z]+):)?(?://(?<host>[-_A-Z0-9.]+|\[[[A-F0-9:]+\])(?::(?<port>[0-9]{1,5}))?)?(?<path>(?:(?:(?<=^)|/+)[^/?#\r\n]+)+/*|/+)?(?:\?(?<query>[^#\r\n]*))?(?:\#(?<fragment>.*))?$", RegexOptions.Compiled | RegexOptions.IgnoreCase);
+        private static readonly Regex RegexUri = new Regex(@"^(?:(?<scheme>[a-z]+):)?(?://(?<host>[-_A-Z0-9.]+)(?::(?<port>[0-9]{1,5}))?)?(?<path>(?:(?:(?<=^)|/+)[^/?#\r\n]+)+/*|/+)?(?:\?(?<query>[^#\r\n]*))?(?:\#(?<fragment>.*))?$", RegexOptions.Compiled | RegexOptions.IgnoreCase);
 
         private readonly string _uri;
         public string FullUri => _uri;
@@ -70,8 +70,6 @@ namespace NzbDrone.Common.Http
 
         private void Parse()
         {
-            var parseSuccess = Uri.TryCreate(_uri, UriKind.RelativeOrAbsolute, out var uri);
-
             var match = RegexUri.Match(_uri);
 
             var scheme = match.Groups["scheme"];
@@ -81,7 +79,7 @@ namespace NzbDrone.Common.Http
             var query = match.Groups["query"];
             var fragment = match.Groups["fragment"];
 
-            if (!parseSuccess || (scheme.Success && !host.Success && path.Success))
+            if (!match.Success || (scheme.Success && !host.Success && path.Success))
             {
                 throw new ArgumentException("Uri didn't match expected pattern: " + _uri);
             }

src/NzbDrone.Common/Instrumentation/CleanseLogMessage.cs

@@ -18,7 +18,6 @@ namespace NzbDrone.Common.Instrumentation
                 new Regex(@"iptorrents\.com/[/a-z0-9?&;]*?(?:[?&;](u|tp)=(?<secret>[^&=;]+?))+(?= |;|&|$)", RegexOptions.Compiled | RegexOptions.IgnoreCase),
                 new Regex(@"/fetch/[a-z0-9]{32}/(?<secret>[a-z0-9]{32})", RegexOptions.Compiled),
                 new Regex(@"getnzb.*?(?<=\?|&)(r)=(?<secret>[^&=]+?)(?= |&|$)", RegexOptions.Compiled | RegexOptions.IgnoreCase),
-                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),
 

src/NzbDrone.Common/Prowlarr.Common.csproj

@@ -4,13 +4,13 @@
     <DefineConstants Condition="'$(RuntimeIdentifier)' == 'linux-musl-x64' or '$(RuntimeIdentifier)' == 'linux-musl-arm64'">ISMUSL</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="DryIoc.dll" Version="5.2.2" />
+    <PackageReference Include="DryIoc.dll" Version="4.8.8" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
     <PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="6.0.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
     <PackageReference Include="NLog" Version="5.0.1" />
     <PackageReference Include="NLog.Extensions.Logging" Version="5.0.0" />
-    <PackageReference Include="Sentry" Version="3.21.0" />
+    <PackageReference Include="Sentry" Version="3.19.0" />
     <PackageReference Include="NLog.Targets.Syslog" Version="7.0.0" />
     <PackageReference Include="SharpZipLib" Version="1.3.3" />
     <PackageReference Include="System.ValueTuple" Version="4.5.0" />

src/NzbDrone.Core.Test/Datastore/Migration/022_orpheus_apiFixture.cs

@@ -1,58 +0,0 @@
-using System;
-using System.Linq;
-using FluentAssertions;
-using NUnit.Framework;
-using NzbDrone.Common.Serializer;
-using NzbDrone.Core.Datastore.Migration;
-using NzbDrone.Core.Test.Framework;
-
-namespace NzbDrone.Core.Test.Datastore.Migration
-{
-    [TestFixture]
-    public class orpheus_apiFixture : MigrationTest<orpheus_api>
-    {
-        [Test]
-        public void should_convert_and_disable_orpheus_instance()
-        {
-            var db = WithMigrationTestDb(c =>
-            {
-                c.Insert.IntoTable("Indexers").Row(new
-                {
-                    Enable = true,
-                    Name = "Orpheus",
-                    Priority = 25,
-                    Added = DateTime.UtcNow,
-                    Implementation = "Orpheus",
-                    Settings = new GazelleIndexerSettings021
-                    {
-                        Username = "some name",
-                        Password = "some pass"
-                    }.ToJson(),
-                    ConfigContract = "GazelleSettings"
-                });
-            });
-
-            var items = db.Query<IndexerDefinition022>("SELECT \"Id\", \"Enable\", \"ConfigContract\", \"Settings\" FROM \"Indexers\"");
-
-            items.Should().HaveCount(1);
-            items.First().ConfigContract.Should().Be("OrpheusSettings");
-            items.First().Enable.Should().Be(false);
-            items.First().Settings.Should().NotContain("username");
-            items.First().Settings.Should().NotContain("password");
-        }
-    }
-
-    public class IndexerDefinition022
-    {
-        public int Id { get; set; }
-        public bool Enable { get; set; }
-        public string ConfigContract { get; set; }
-        public string Settings { get; set; }
-    }
-
-    public class GazelleIndexerSettings021
-    {
-        public string Username { get; set; }
-        public string Password { get; set; }
-    }
-}

src/NzbDrone.Core.Test/Files/Indexers/GazelleGames/recentfeed-empty.json

@@ -1,4 +0,0 @@
-{
-  "status": "success",
-  "response": []
-}

src/NzbDrone.Core.Test/IndexerTests/GazelleGamesTests/GazelleGamesFixture.cs

@@ -12,7 +12,6 @@ using NzbDrone.Core.Indexers.Definitions;
 using NzbDrone.Core.IndexerSearch.Definitions;
 using NzbDrone.Core.Parser.Model;
 using NzbDrone.Core.Test.Framework;
-using NzbDrone.Test.Common;
 
 namespace NzbDrone.Core.Test.IndexerTests.GazelleGamesTests
 {
@@ -65,19 +64,5 @@ namespace NzbDrone.Core.Test.IndexerTests.GazelleGamesTests
             torrentInfo.DownloadVolumeFactor.Should().Be(1);
             torrentInfo.UploadVolumeFactor.Should().Be(1);
         }
-
-        [Test]
-        public async Task should_not_error_if_empty_response()
-        {
-            var recentFeed = ReadAllText(@"Files/Indexers/GazelleGames/recentfeed-empty.json");
-
-            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 { { "Content-Type", "application/json" } }, new CookieCollection(), recentFeed)));
-
-            var releases = (await Subject.Fetch(new BasicSearchCriteria { Categories = new int[] { 2000 } })).Releases;
-
-            releases.Should().HaveCount(0);
-        }
     }
 }

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

@@ -1,68 +0,0 @@
-using System;
-using System.Linq;
-using System.Net;
-using System.Net.Http;
-using System.Threading.Tasks;
-using FluentAssertions;
-using Moq;
-using NUnit.Framework;
-using NzbDrone.Common.Http;
-using NzbDrone.Core.Indexers;
-using NzbDrone.Core.Indexers.Definitions;
-using NzbDrone.Core.Indexers.Gazelle;
-using NzbDrone.Core.IndexerSearch.Definitions;
-using NzbDrone.Core.Test.Framework;
-
-namespace NzbDrone.Core.Test.IndexerTests.OrpheusTests
-{
-    [TestFixture]
-    public class OrpheusFixture : CoreTest<Orpheus>
-    {
-        [SetUp]
-        public void Setup()
-        {
-            Subject.Definition = new IndexerDefinition()
-            {
-                Name = "Orpheus",
-                Settings = new OrpheusSettings() { Apikey = "somekey" }
-            };
-        }
-
-        [Test]
-        public async Task should_parse_recent_feed_from_GazelleGames()
-        {
-            var recentFeed = ReadAllText(@"Files/Indexers/Orpheus/recentfeed.json");
-
-            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 { { "Content-Type", "application/json" } }, new CookieCollection(), recentFeed)));
-
-            var releases = (await Subject.Fetch(new BasicSearchCriteria { Categories = new int[] { 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.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");
-            torrentInfo.CommentUrl.Should().BeNullOrEmpty();
-            torrentInfo.Indexer.Should().Be(Subject.Definition.Name);
-            torrentInfo.PublishDate.Should().Be(DateTime.Parse("2022-08-08 2:07:39"));
-            torrentInfo.Size.Should().Be(68296866);
-            torrentInfo.InfoHash.Should().Be(null);
-            torrentInfo.MagnetUrl.Should().Be(null);
-            torrentInfo.Peers.Should().Be(0);
-            torrentInfo.Seeders.Should().Be(0);
-            torrentInfo.ImdbId.Should().Be(0);
-            torrentInfo.TmdbId.Should().Be(0);
-            torrentInfo.TvdbId.Should().Be(0);
-            torrentInfo.Languages.Should().HaveCount(0);
-            torrentInfo.Subs.Should().HaveCount(0);
-            torrentInfo.DownloadVolumeFactor.Should().Be(1);
-            torrentInfo.UploadVolumeFactor.Should().Be(1);
-        }
-    }
-}

src/NzbDrone.Core.Test/IndexerTests/RarbgTests/RarbgFixture.cs

@@ -30,7 +30,7 @@ namespace NzbDrone.Core.Test.IndexerTests.RarbgTests
             };
 
             Mocker.GetMock<IRarbgTokenProvider>()
-                .Setup(v => v.GetToken(It.IsAny<RarbgSettings>()))
+                .Setup(v => v.GetToken(It.IsAny<RarbgSettings>(), It.IsAny<string>()))
                 .Returns("validtoken");
         }
 

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

@@ -6,7 +6,7 @@
     <PackageReference Include="Dapper" Version="2.0.123" />
     <PackageReference Include="NBuilder" Version="6.1.0" />
     <PackageReference Include="System.Data.SQLite.Core.Servarr" Version="1.0.115.5-18" />
-    <PackageReference Include="YamlDotNet" Version="12.0.1" />
+    <PackageReference Include="YamlDotNet" Version="11.2.1" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\NzbDrone.Test.Common\Prowlarr.Test.Common.csproj" />
@@ -21,4 +21,7 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Datastore\Migration\" />
+  </ItemGroup>
 </Project>

src/NzbDrone.Core/Configuration/ConfigFileProvider.cs

@@ -206,7 +206,7 @@ namespace NzbDrone.Core.Configuration
         public string PostgresMainDb => _postgresOptions?.MainDb ?? GetValue("PostgresMainDb", "prowlarr-main", persist: false);
         public string PostgresLogDb => _postgresOptions?.LogDb ?? GetValue("PostgresLogDb", "prowlarr-log", persist: false);
         public int PostgresPort => (_postgresOptions?.Port ?? 0) != 0 ? _postgresOptions.Port : GetValueInt("PostgresPort", 5432, persist: false);
-        public string Theme => GetValue("Theme", "auto", persist: false);
+        public string Theme => GetValue("Theme", "light", persist: false);
         public bool LogSql => GetValueBoolean("LogSql", false, persist: false);
         public int LogRotate => GetValueInt("LogRotate", 50, persist: false);
         public bool FilterSentryEvents => GetValueBoolean("FilterSentryEvents", true, persist: false);

src/NzbDrone.Core/Datastore/DbFactory.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Data.Common;
 using System.Data.SQLite;
-using System.Net.Sockets;
 using NLog;
 using Npgsql;
 using NzbDrone.Common.Disk;
@@ -126,37 +125,6 @@ namespace NzbDrone.Core.Datastore
 
                 throw new CorruptDatabaseException("Database file: {0} is corrupt, restore from backup if available. See: https://wiki.servarr.com/prowlarr/faq#i-am-getting-an-error-database-disk-image-is-malformed", e, fileName);
             }
-            catch (NpgsqlException e)
-            {
-                if (e.InnerException is SocketException)
-                {
-                    var retryCount = 3;
-
-                    while (true)
-                    {
-                        Logger.Error(e, "Failure to connect to Postgres DB, {0} retries remaining", retryCount);
-
-                        try
-                        {
-                            _migrationController.Migrate(connectionString, migrationContext);
-                        }
-                        catch (Exception ex)
-                        {
-                            if (--retryCount > 0)
-                            {
-                                System.Threading.Thread.Sleep(5000);
-                                continue;
-                            }
-
-                            throw new ProwlarrStartupException(ex, "Error creating main database");
-                        }
-                    }
-                }
-                else
-                {
-                    throw new ProwlarrStartupException(e, "Error creating main database");
-                }
-            }
             catch (Exception e)
             {
                 throw new ProwlarrStartupException(e, "Error creating main database");

src/NzbDrone.Core/Datastore/Migration/008_redacted_api.cs

@@ -1,4 +1,3 @@
-using System.Collections.Generic;
 using System.Data;
 using FluentMigrator;
 using Newtonsoft.Json.Linq;
@@ -22,8 +21,6 @@ namespace NzbDrone.Core.Datastore.Migration
                 cmd.Transaction = tran;
                 cmd.CommandText = "SELECT \"Id\", \"Settings\" FROM \"Indexers\" WHERE \"Implementation\" = 'Redacted'";
 
-                var updatedIndexers = new List<Indexer008>();
-
                 using (var reader = cmd.ExecuteReader())
                 {
                     while (reader.Read())
@@ -48,26 +45,19 @@ namespace NzbDrone.Core.Datastore.Migration
 
                             // write new json back to db, switch to new ConfigContract, and disable the indexer
                             settings = jsonObject.ToJson();
-
-                            updatedIndexers.Add(new Indexer008
+                            using (var updateCmd = conn.CreateCommand())
                             {
-                                Id = id,
-                                Settings = settings,
-                                ConfigContract = "RedactedSettings",
-                                Enable = false
-                            });
+                                updateCmd.Transaction = tran;
+                                updateCmd.CommandText = "UPDATE \"Indexers\" SET \"Settings\" = ?, \"ConfigContract\" = ?, \"Enable\" = 0 WHERE \"Id\" = ?";
+                                updateCmd.AddParameter(settings);
+                                updateCmd.AddParameter("RedactedSettings");
+                                updateCmd.AddParameter(id);
+                                updateCmd.ExecuteNonQuery();
+                            }
                         }
                     }
                 }
             }
         }
-
-        public class Indexer008
-        {
-            public int Id { get; set; }
-            public string Settings { get; set; }
-            public string ConfigContract { get; set; }
-            public bool Enable { get; set; }
-        }
     }
 }

src/NzbDrone.Core/Datastore/Migration/022_orpheus_api.cs

@@ -1,71 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Data;
-using Dapper;
-using FluentMigrator;
-using Newtonsoft.Json.Linq;
-using NzbDrone.Common.Serializer;
-using NzbDrone.Core.Datastore.Migration.Framework;
-using static NzbDrone.Core.Datastore.Migration.redacted_api;
-
-namespace NzbDrone.Core.Datastore.Migration
-{
-    [Migration(22)]
-    public class orpheus_api : NzbDroneMigrationBase
-    {
-        protected override void MainDbUpgrade()
-        {
-            Execute.WithConnection(MigrateToRedactedApi);
-        }
-
-        private void MigrateToRedactedApi(IDbConnection conn, IDbTransaction tran)
-        {
-            using (var cmd = conn.CreateCommand())
-            {
-                cmd.Transaction = tran;
-                cmd.CommandText = "SELECT \"Id\", \"Settings\" FROM \"Indexers\" WHERE \"Implementation\" = 'Orpheus'";
-
-                var updatedIndexers = new List<Indexer008>();
-
-                using (var reader = cmd.ExecuteReader())
-                {
-                    while (reader.Read())
-                    {
-                        var id = reader.GetInt32(0);
-                        var settings = reader.GetString(1);
-                        if (!string.IsNullOrWhiteSpace(settings))
-                        {
-                            var jsonObject = Json.Deserialize<JObject>(settings);
-
-                            // Remove username
-                            if (jsonObject.ContainsKey("username"))
-                            {
-                                jsonObject.Remove("username");
-                            }
-
-                            // Remove password
-                            if (jsonObject.ContainsKey("password"))
-                            {
-                                jsonObject.Remove("password");
-                            }
-
-                            // write new json back to db, switch to new ConfigContract, and disable the indexer
-                            settings = jsonObject.ToJson();
-
-                            updatedIndexers.Add(new Indexer008
-                            {
-                                Id = id,
-                                Settings = settings,
-                                ConfigContract = "OrpheusSettings",
-                                Enable = false
-                            });
-                        }
-                    }
-                }
-
-                var updateSql = "UPDATE \"Indexers\" SET \"Settings\" = @Settings, \"ConfigContract\" = @ConfigContract, \"Enable\" = @Enable WHERE \"Id\" = @Id";
-                conn.Execute(updateSql, updatedIndexers, transaction: tran);
-            }
-        }
-    }
-}

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

@@ -1,59 +0,0 @@
-using System;
-using System.Linq;
-using NzbDrone.Common.Extensions;
-using NzbDrone.Core.Applications;
-using NzbDrone.Core.Localization;
-using NzbDrone.Core.ThingiProvider.Events;
-
-namespace NzbDrone.Core.HealthCheck.Checks
-{
-    [CheckOn(typeof(ProviderUpdatedEvent<IApplication>))]
-    [CheckOn(typeof(ProviderDeletedEvent<IApplication>))]
-    [CheckOn(typeof(ProviderStatusChangedEvent<IApplication>))]
-    public class ApplicationLongTermStatusCheck : HealthCheckBase
-    {
-        private readonly IApplicationFactory _providerFactory;
-        private readonly IApplicationStatusService _providerStatusService;
-
-        public ApplicationLongTermStatusCheck(IApplicationFactory providerFactory,
-                                          IApplicationStatusService providerStatusService,
-                                          ILocalizationService localizationService)
-            : base(localizationService)
-        {
-            _providerFactory = providerFactory;
-            _providerStatusService = providerStatusService;
-        }
-
-        public override HealthCheck Check()
-        {
-            var enabledProviders = _providerFactory.GetAvailableProviders();
-            var backOffProviders = enabledProviders.Join(_providerStatusService.GetBlockedProviders(),
-                                                       i => i.Definition.Id,
-                                                       s => s.ProviderId,
-                                                       (i, s) => new { Provider = i, Status = s })
-                                                   .Where(p => p.Status.InitialFailure.HasValue &&
-                                                               p.Status.InitialFailure.Value.Before(
-                                                                   DateTime.UtcNow.AddHours(-6)))
-                                                   .ToList();
-
-            if (backOffProviders.Empty())
-            {
-                return new HealthCheck(GetType());
-            }
-
-            if (backOffProviders.Count == enabledProviders.Count)
-            {
-                return new HealthCheck(GetType(),
-                    HealthCheckResult.Error,
-                    _localizationService.GetLocalizedString("ApplicationLongTermStatusCheckAllClientMessage"),
-                    "#applications-are-unavailable-due-to-failures");
-            }
-
-            return new HealthCheck(GetType(),
-                HealthCheckResult.Warning,
-                string.Format(_localizationService.GetLocalizedString("ApplicationLongTermStatusCheckSingleClientMessage"),
-                    string.Join(", ", backOffProviders.Select(v => v.Provider.Definition.Name))),
-                "#applications-are-unavailable-due-to-failures");
-        }
-    }
-}

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

@@ -0,0 +1,34 @@
+using System.Linq;
+using NzbDrone.Common.Extensions;
+using NzbDrone.Core.Indexers;
+using NzbDrone.Core.Indexers.PassThePopcorn;
+using NzbDrone.Core.Localization;
+
+namespace NzbDrone.Core.HealthCheck.Checks
+{
+    public class PTPOldSettingsCheck : HealthCheckBase
+    {
+        private readonly IIndexerFactory _indexerFactory;
+
+        public PTPOldSettingsCheck(IIndexerFactory indexerFactory, ILocalizationService localizationService)
+            : base(localizationService)
+        {
+            _indexerFactory = indexerFactory;
+        }
+
+        public override HealthCheck Check()
+        {
+            var ptpIndexers = _indexerFactory.All().Where(i => i.Settings.GetType() == typeof(PassThePopcornSettings));
+
+            var ptpIndexerOldSettings = ptpIndexers
+                .Where(i => (i.Settings as PassThePopcornSettings).APIUser.IsNullOrWhiteSpace()).Select(i => i.Name);
+
+            if (ptpIndexerOldSettings.Any())
+            {
+                return new HealthCheck(GetType(), HealthCheckResult.Warning, string.Format(_localizationService.GetLocalizedString("PtpOldSettingsCheckMessage"), string.Join(", ", ptpIndexerOldSettings)));
+            }
+
+            return new HealthCheck(GetType());
+        }
+    }
+}

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

@@ -10,7 +10,6 @@ using NzbDrone.Common.Cache;
 using NzbDrone.Common.Cloud;
 using NzbDrone.Common.Extensions;
 using NzbDrone.Common.Http;
-using NzbDrone.Common.Http.Proxy;
 using NzbDrone.Common.Serializer;
 using NzbDrone.Core.Http.CloudFlare;
 using NzbDrone.Core.Localization;
@@ -21,12 +20,10 @@ namespace NzbDrone.Core.IndexerProxies.FlareSolverr
     public class FlareSolverr : HttpIndexerProxyBase<FlareSolverrSettings>
     {
         private readonly ICached<string> _cache;
-        private readonly IHttpProxySettingsProvider _proxySettingsProvider;
 
-        public FlareSolverr(IHttpProxySettingsProvider proxySettingsProvider, IProwlarrCloudRequestBuilder cloudRequestBuilder, IHttpClient httpClient, Logger logger, ILocalizationService localizationService, ICacheManager cacheManager)
+        public FlareSolverr(IProwlarrCloudRequestBuilder cloudRequestBuilder, IHttpClient httpClient, Logger logger, ILocalizationService localizationService, ICacheManager cacheManager)
             : base(cloudRequestBuilder, httpClient, logger, localizationService)
         {
-            _proxySettingsProvider = proxySettingsProvider;
             _cache = cacheManager.GetCache<string>(typeof(string), "UserAgent");
         }
 
@@ -103,10 +100,6 @@ namespace NzbDrone.Core.IndexerProxies.FlareSolverr
             var userAgent = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/81.0.4044.138 Safari/537.36";
             var maxTimeout = Settings.RequestTimeout * 1000;
 
-            // Use Proxy if no credentials are set (creds not supported as of FS 2.2.9)
-            var proxySettings = _proxySettingsProvider.GetProxySettings();
-            var proxyUrl = proxySettings != null && proxySettings.Username.IsNullOrWhiteSpace() && proxySettings.Password.IsNullOrWhiteSpace() ? GetProxyUri(proxySettings) : null;
-
             if (request.Method == HttpMethod.Get)
             {
                 req = new FlareSolverrRequestGet
@@ -114,11 +107,7 @@ namespace NzbDrone.Core.IndexerProxies.FlareSolverr
                     Cmd = "request.get",
                     Url = url,
                     MaxTimeout = maxTimeout,
-                    UserAgent = userAgent,
-                    Proxy = new FlareSolverrProxy
-                    {
-                        Url = proxyUrl?.AbsoluteUri
-                    }
+                    UserAgent = userAgent
                 };
             }
             else if (request.Method == HttpMethod.Post)
@@ -141,11 +130,7 @@ namespace NzbDrone.Core.IndexerProxies.FlareSolverr
                             ContentLength = null
                         },
                         MaxTimeout = maxTimeout,
-                        UserAgent = userAgent,
-                        Proxy = new FlareSolverrProxy
-                        {
-                            Url = proxyUrl?.AbsoluteUri
-                        }
+                        UserAgent = userAgent
                     };
                 }
                 else if (contentTypeType.Contains("multipart/form-data")
@@ -206,59 +191,38 @@ namespace NzbDrone.Core.IndexerProxies.FlareSolverr
             return new ValidationResult(failures);
         }
 
-        private Uri GetProxyUri(HttpProxySettings proxySettings)
-        {
-            switch (proxySettings.Type)
-            {
-                case ProxyType.Http:
-                    return new Uri("http://" + proxySettings.Host + ":" + proxySettings.Port);
-                case ProxyType.Socks4:
-                    return new Uri("socks4://" + proxySettings.Host + ":" + proxySettings.Port);
-                case ProxyType.Socks5:
-                    return new Uri("socks5://" + proxySettings.Host + ":" + proxySettings.Port);
-                default:
-                    return null;
-            }
-        }
-
-        private class FlareSolverrRequest
+        public class FlareSolverrRequest
         {
             public string Cmd { get; set; }
             public string Url { get; set; }
             public string UserAgent { get; set; }
             public Cookie[] Cookies { get; set; }
-            public FlareSolverrProxy Proxy { get; set; }
         }
 
-        private class FlareSolverrRequestGet : FlareSolverrRequest
+        public class FlareSolverrRequestGet : FlareSolverrRequest
         {
             public string Headers { get; set; }
             public int MaxTimeout { get; set; }
         }
 
-        private class FlareSolverrRequestPost : FlareSolverrRequest
+        public class FlareSolverrRequestPost : FlareSolverrRequest
         {
             public string PostData { get; set; }
             public int MaxTimeout { get; set; }
         }
 
-        private class FlareSolverrRequestPostUrlEncoded : FlareSolverrRequestPost
+        public class FlareSolverrRequestPostUrlEncoded : FlareSolverrRequestPost
         {
             public HeadersPost Headers { get; set; }
         }
 
-        private class FlareSolverrProxy
-        {
-            public string Url { get; set; }
-        }
-
-        private class HeadersPost
+        public class HeadersPost
         {
             public string ContentType { get; set; }
             public string ContentLength { get; set; }
         }
 
-        private class FlareSolverrResponse
+        public class FlareSolverrResponse
         {
             public string Status { get; set; }
             public string Message { get; set; }
@@ -268,7 +232,7 @@ namespace NzbDrone.Core.IndexerProxies.FlareSolverr
             public Solution Solution { get; set; }
         }
 
-        private class Solution
+        public class Solution
         {
             public string Url { get; set; }
             public string Status { get; set; }
@@ -278,7 +242,7 @@ namespace NzbDrone.Core.IndexerProxies.FlareSolverr
             public string UserAgent { get; set; }
         }
 
-        private class Cookie
+        public class Cookie
         {
             public string Name { get; set; }
             public string Value { get; set; }
@@ -295,7 +259,7 @@ namespace NzbDrone.Core.IndexerProxies.FlareSolverr
             public System.Net.Cookie ToCookieObj() => new System.Net.Cookie(Name, Value);
         }
 
-        private class Headers
+        public class Headers
         {
             public string Status { get; set; }
             public string Date { get; set; }

src/NzbDrone.Core/IndexerProxies/Http/Http.cs

@@ -3,9 +3,7 @@ using NLog;
 using NzbDrone.Common.Cloud;
 using NzbDrone.Common.Extensions;
 using NzbDrone.Common.Http;
-using NzbDrone.Common.Http.Proxy;
 using NzbDrone.Core.Localization;
-using NzbDrone.Core.Notifications.Prowl;
 
 namespace NzbDrone.Core.IndexerProxies.Http
 {
@@ -20,13 +18,14 @@ namespace NzbDrone.Core.IndexerProxies.Http
 
         public override HttpRequest PreRequest(HttpRequest request)
         {
-            request.ProxySettings = new HttpProxySettings(ProxyType.Http,
-                                Settings.Host,
-                                Settings.Port,
-                                null,
-                                false,
-                                Settings.Username,
-                                Settings.Password);
+            if (Settings.Username.IsNotNullOrWhiteSpace() && Settings.Password.IsNotNullOrWhiteSpace())
+            {
+                request.Proxy = new WebProxy(Settings.Host + ":" + Settings.Port, false, null, new NetworkCredential(Settings.Username, Settings.Password));
+            }
+            else
+            {
+                request.Proxy = new WebProxy(Settings.Host + ":" + Settings.Port, false, null);
+            }
 
             _logger.Debug("Applying HTTP(S) Proxy {0} to request {1}", Name, request.Url);
 

src/NzbDrone.Core/IndexerProxies/Socks4/Socks4.cs

@@ -4,7 +4,6 @@ using NLog;
 using NzbDrone.Common.Cloud;
 using NzbDrone.Common.Extensions;
 using NzbDrone.Common.Http;
-using NzbDrone.Common.Http.Proxy;
 using NzbDrone.Core.Localization;
 
 namespace NzbDrone.Core.IndexerProxies.Socks4
@@ -26,13 +25,14 @@ namespace NzbDrone.Core.IndexerProxies.Socks4
                 return null;
             }
 
-            request.ProxySettings = new HttpProxySettings(ProxyType.Socks4,
-                                Settings.Host,
-                                Settings.Port,
-                                null,
-                                false,
-                                Settings.Username,
-                                Settings.Password);
+            if (Settings.Username.IsNotNullOrWhiteSpace() && Settings.Password.IsNotNullOrWhiteSpace())
+            {
+                request.Proxy = new WebProxy(uri, false, null, new NetworkCredential(Settings.Username, Settings.Password));
+            }
+            else
+            {
+                request.Proxy = new WebProxy(uri);
+            }
 
             _logger.Debug("Applying Socks4 Proxy {0} to request {1}", Name, request.Url);
 

src/NzbDrone.Core/IndexerProxies/Socks5/Socks5.cs

@@ -4,7 +4,6 @@ using NLog;
 using NzbDrone.Common.Cloud;
 using NzbDrone.Common.Extensions;
 using NzbDrone.Common.Http;
-using NzbDrone.Common.Http.Proxy;
 using NzbDrone.Core.Localization;
 
 namespace NzbDrone.Core.IndexerProxies.Socks5
@@ -27,13 +26,14 @@ namespace NzbDrone.Core.IndexerProxies.Socks5
                 return null;
             }
 
-            request.ProxySettings = new HttpProxySettings(ProxyType.Socks5,
-                                Settings.Host,
-                                Settings.Port,
-                                null,
-                                false,
-                                Settings.Username,
-                                Settings.Password);
+            if (Settings.Username.IsNotNullOrWhiteSpace() && Settings.Password.IsNotNullOrWhiteSpace())
+            {
+                request.Proxy = new WebProxy(uri, false, null, new NetworkCredential(Settings.Username, Settings.Password));
+            }
+            else
+            {
+                request.Proxy = new WebProxy(uri);
+            }
 
             _logger.Debug("Applying Socks5 Proxy {0} to request {1}", Name, request.Url);
 

src/NzbDrone.Core/IndexerSearch/ReleaseAnalyticsService.cs

@@ -37,7 +37,7 @@ namespace NzbDrone.Core.IndexerSearch
 
         public void HandleAsync(IndexerQueryEvent message)
         {
-            if (_analyticsService.IsEnabled && message.QueryResult?.Releases != null)
+            if (message.QueryResult?.Releases != null)
             {
                 lock (_pendingUpdates)
                 {

src/NzbDrone.Core/IndexerSearch/ReleaseSearchService.cs

@@ -160,18 +160,6 @@ namespace NzbDrone.Core.IndexerSearch
                     .ToList();
             }
 
-            if (criteriaBase.Categories != null && criteriaBase.Categories.Length > 0)
-            {
-                //Only query supported indexers
-                indexers = indexers.Where(i => ((IndexerDefinition)i.Definition).Capabilities.Categories.SupportedCategories(criteriaBase.Categories).Any()).ToList();
-
-                if (indexers.Count == 0)
-                {
-                    _logger.Debug("All provided categories are unsupported by selected indexers: {0}", string.Join(", ", criteriaBase.Categories));
-                    return new List<ReleaseInfo>();
-                }
-            }
-
             _logger.ProgressInfo("Searching indexer(s): [{0}] for {1}", string.Join(", ", indexers.Select(i => i.Definition.Name).ToList()), criteriaBase.ToString());
 
             var tasks = indexers.Select(x => DispatchIndexer(searchAction, x, criteriaBase));

src/NzbDrone.Core/IndexerVersions/IndexerDefinitionUpdateService.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.IO.Compression;
 using System.Linq;
 using NLog;
 using NzbDrone.Common.Cache;
@@ -283,29 +282,44 @@ namespace NzbDrone.Core.IndexerVersions
         {
             var startupFolder = _appFolderInfo.AppDataFolder;
 
+            var request = new HttpRequest($"https://indexers.prowlarr.com/{DEFINITION_BRANCH}/{DEFINITION_VERSION}");
+            var response = _httpClient.Get<List<CardigannMetaDefinition>>(request);
+
+            var currentDefs = _versionService.All().ToDictionary(x => x.DefinitionId, x => x.Sha);
+
             try
             {
                 EnsureDefinitionsFolder();
 
-                var definitionsFolder = Path.Combine(startupFolder, "Definitions");
-                var saveFile = Path.Combine(definitionsFolder, $"indexers.zip");
-
-                _httpClient.DownloadFile($"https://indexers.prowlarr.com/{DEFINITION_BRANCH}/{DEFINITION_VERSION}/package.zip", saveFile);
-
-                using (ZipArchive archive = ZipFile.OpenRead(saveFile))
+                foreach (var def in response.Resource)
                 {
-                    archive.ExtractToDirectory(definitionsFolder, true);
+                    try
+                    {
+                        var saveFile = Path.Combine(startupFolder, "Definitions", $"{def.File}.yml");
+
+                        if (currentDefs.TryGetValue(def.Id, out var defSha) && defSha == def.Sha)
+                        {
+                            _logger.Trace("Indexer already up to date: {0}", def.File);
+
+                            continue;
+                        }
+
+                        _httpClient.DownloadFile($"https://indexers.prowlarr.com/{DEFINITION_BRANCH}/{DEFINITION_VERSION}/{def.File}", saveFile);
+
+                        _versionService.Upsert(new IndexerDefinitionVersion { Sha = def.Sha, DefinitionId = def.Id, File = def.File, LastUpdated = DateTime.UtcNow });
+
+                        _cache.Remove(def.File);
+                        _logger.Debug("Updated definition: {0}", def.File);
+                    }
+                    catch (Exception ex)
+                    {
+                        _logger.Error("Definition download failed: {0}, {1}", def.File, ex.Message);
+                    }
                 }
-
-                _diskProvider.DeleteFile(saveFile);
-
-                _cache.Clear();
-
-                _logger.Debug("Updated indexer definitions");
             }
             catch (Exception ex)
             {
-                _logger.Error(ex, "Definition update failed");
+                _logger.Error(ex, "Definition download failed, error creating definitions folder in {0}", startupFolder);
             }
         }
     }

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

@@ -228,34 +228,34 @@ namespace NzbDrone.Core.Indexers.Definitions
 
                         if (syn.StringArray != null)
                         {
-                            if (_settings.AddJapaneseTitle && syn.StringArray.Count >= 1)
+                            if (syn.StringArray.Count >= 1)
                             {
                                 synonyms.Add(syn.StringArray[0]);
                             }
 
-                            if (_settings.AddRomajiTitle && syn.StringArray.Count >= 2)
+                            if (syn.StringArray.Count >= 2)
                             {
                                 synonyms.Add(syn.StringArray[1]);
                             }
 
-                            if (_settings.AddAlternativeTitle && syn.StringArray.Count == 3)
+                            if (syn.StringArray.Count == 3)
                             {
                                 synonyms.AddRange(syn.StringArray[2].Split(',').Select(t => t.Trim()));
                             }
                         }
                         else
                         {
-                            if (_settings.AddJapaneseTitle && syn.StringMap.ContainsKey("0"))
+                            if (syn.StringMap.ContainsKey("0"))
                             {
                                 synonyms.Add(syn.StringMap["0"]);
                             }
 
-                            if (_settings.AddRomajiTitle && syn.StringMap.ContainsKey("1"))
+                            if (syn.StringMap.ContainsKey("1"))
                             {
                                 synonyms.Add(syn.StringMap["1"]);
                             }
 
-                            if (_settings.AddAlternativeTitle && syn.StringMap.ContainsKey("2"))
+                            if (syn.StringMap.ContainsKey("2"))
                             {
                                 synonyms.AddRange(syn.StringMap["2"].Split(',').Select(t => t.Trim()));
                             }
@@ -321,10 +321,9 @@ namespace NzbDrone.Core.Indexers.Definitions
 
                         if (episode != null)
                         {
-                            var episodeString = episode is > 0 and < 10
+                            releaseInfo = episode is > 0 and < 10
                                 ? "0" + episode
                                 : episode.ToString();
-                            releaseInfo = $" - {episodeString}";
                         }
                         else
                         {
@@ -450,37 +449,6 @@ namespace NzbDrone.Core.Indexers.Definitions
                         //  Additional 5 hours per GB
                         minimumSeedTime += (int)((size / 1000000000) * 18000);
 
-                        if (_settings.UseFilenameForSingleEpisodes && torrent.FileCount == 1)
-                        {
-                            var fileName = torrent.Files.First().FileName;
-
-                            var guid = new Uri(details + "&nh=" + StringUtil.Hash(fileName));
-
-                            var release = new TorrentInfo
-                            {
-                                MinimumRatio = 1,
-                                MinimumSeedTime = minimumSeedTime,
-                                Title = fileName,
-                                InfoUrl = details.AbsoluteUri,
-                                Guid = guid.AbsoluteUri,
-                                DownloadUrl = link.AbsoluteUri,
-                                PublishDate = publishDate,
-                                Categories = category,
-                                Description = description,
-                                Size = size,
-                                Seeders = seeders,
-                                Peers = peers,
-                                Grabs = snatched,
-                                Files = fileCount,
-                                DownloadVolumeFactor = rawDownMultiplier,
-                                UploadVolumeFactor = rawUpMultiplier,
-                            };
-
-                            torrentInfos.Add(release);
-
-                            continue;
-                        }
-
                         foreach (var title in synonyms)
                         {
                             var releaseTitle = groupName == "Movie" ?
@@ -542,10 +510,6 @@ namespace NzbDrone.Core.Indexers.Definitions
             Passkey = "";
             Username = "";
             EnableSonarrCompatibility = true;
-            UseFilenameForSingleEpisodes = false;
-            AddJapaneseTitle = true;
-            AddRomajiTitle = true;
-            AddAlternativeTitle = true;
         }
 
         [FieldDefinition(2, Label = "Passkey", HelpText = "Site Passkey", Privacy = PrivacyLevel.Password, Type = FieldType.Password)]
@@ -557,18 +521,6 @@ namespace NzbDrone.Core.Indexers.Definitions
         [FieldDefinition(4, Label = "Enable Sonarr Compatibility", Type = FieldType.Checkbox, HelpText = "Makes Prowlarr try to add Season information into Release names, without this Sonarr can't match any Seasons, but it has a lot of false positives as well")]
         public bool EnableSonarrCompatibility { get; set; }
 
-        [FieldDefinition(5, Label = "Use Filenames for Single Episodes", Type = FieldType.Checkbox, HelpText = "Makes Prowlarr replace AnimeBytes release names with the actual filename, this currently only works for single episode releases")]
-        public bool UseFilenameForSingleEpisodes { get; set; }
-
-        [FieldDefinition(6, Label = "Add Japanese title as a synonym", Type = FieldType.Checkbox, HelpText = "Makes Prowlarr add Japanese titles as synonyms, i.e kanji/hiragana/katakana.")]
-        public bool AddJapaneseTitle { get; set; }
-
-        [FieldDefinition(7, Label = "Add Romaji title as a synonym", Type = FieldType.Checkbox, HelpText = "Makes Prowlarr add Romaji title as a synonym, i.e \"Shingeki no Kyojin\" with Attack on Titan")]
-        public bool AddRomajiTitle { get; set; }
-
-        [FieldDefinition(8, Label = "Add alternative title as a synonym", Type = FieldType.Checkbox, HelpText = "Makes Prowlarr add alternative title as a synonym, i.e \"AoT\" with Attack on Titan, but also \"Attack on Titan Season 4\" Instead of \"Attack on Titan: The Final Season\"")]
-        public bool AddAlternativeTitle { get; set; }
-
         public override NzbDroneValidationResult Validate()
         {
             return new NzbDroneValidationResult(Validator.Validate(this));
@@ -726,22 +678,10 @@ namespace NzbDrone.Core.Indexers.Definitions
         [JsonProperty("FileCount")]
         public int FileCount { get; set; }
 
-        [JsonProperty("FileList")]
-        public List<File> Files  { get; set; }
-
         [JsonProperty("UploadTime")]
         public DateTimeOffset UploadTime { get; set; }
     }
 
-    public class File
-    {
-        [JsonProperty("filename")]
-        public string FileName { get; set; }
-
-        [JsonProperty("size")]
-        public string FileSize { get; set; }
-    }
-
     public class EditionData
     {
         [JsonProperty("EditionTitle")]

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

@@ -19,7 +19,6 @@ using NzbDrone.Core.Parser.Model;
 
 namespace NzbDrone.Core.Indexers.Definitions
 {
-    [Obsolete("Moved to YML for Cardigann")]
     public class Anthelion : TorrentIndexerBase<UserPassTorrentBaseSettings>
     {
         public override string Name => "Anthelion";

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

@@ -36,11 +36,11 @@ namespace NzbDrone.Core.Indexers.Definitions
             {
                 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
                        },
                 MovieSearchParams = new List<MovieSearchParam>
                        {
-                           MovieSearchParam.Q, MovieSearchParam.ImdbId, MovieSearchParam.TmdbId, MovieSearchParam.Genre
+                           MovieSearchParam.Q, MovieSearchParam.ImdbId, MovieSearchParam.TmdbId
                        }
             };
 

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

@@ -29,11 +29,6 @@ namespace NzbDrone.Core.Indexers.Definitions.Avistaz
                 return torrentInfos.ToArray();
             }
 
-            if (indexerResponse.HttpResponse.StatusCode == HttpStatusCode.TooManyRequests)
-            {
-                throw new RequestLimitReachedException(indexerResponse, "API Request Limit Reached");
-            }
-
             if (indexerResponse.HttpResponse.StatusCode != HttpStatusCode.OK)
             {
                 throw new IndexerException(indexerResponse, $"Unexpected response status {indexerResponse.HttpResponse.StatusCode} code from API request");

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

@@ -25,7 +25,7 @@ namespace NzbDrone.Core.Indexers.Definitions.Avistaz
         public Action<IDictionary<string, string>, DateTime?> CookiesUpdater { get; set; }
 
         // hook to adjust the search category
-        protected virtual List<KeyValuePair<string, string>> GetBasicSearchParameters(int[] categories, string genre)
+        protected virtual List<KeyValuePair<string, string>> GetBasicSearchParameters(int[] categories)
         {
             var categoryMapping = Capabilities.Categories.MapTorznabCapsToTrackers(categories).Distinct().ToList();
             var qc = new List<KeyValuePair<string, string>> // NameValueCollection don't support cat[]=19&cat[]=6
@@ -34,16 +34,6 @@ namespace NzbDrone.Core.Indexers.Definitions.Avistaz
                 { "type", categoryMapping.Any() ? categoryMapping.First() : "0" }
             };
 
-            if (Settings.FreeleechOnly)
-            {
-                qc.Add("discount[]", "1");
-            }
-
-            if (genre.IsNotNullOrWhiteSpace())
-            {
-                qc.Add("tags", genre);
-            }
-
             // resolution filter to improve the search
             if (!categories.Contains(NewznabStandardCategory.Movies.Id) && !categories.Contains(NewznabStandardCategory.TV.Id) &&
                 !categories.Contains(NewznabStandardCategory.Audio.Id))
@@ -81,7 +71,7 @@ namespace NzbDrone.Core.Indexers.Definitions.Avistaz
 
         public IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchCriteria)
         {
-            var parameters = GetBasicSearchParameters(searchCriteria.Categories, searchCriteria.Genre);
+            var parameters = GetBasicSearchParameters(searchCriteria.Categories);
 
             if (searchCriteria.ImdbId.IsNotNullOrWhiteSpace())
             {
@@ -103,7 +93,7 @@ namespace NzbDrone.Core.Indexers.Definitions.Avistaz
 
         public IndexerPageableRequestChain GetSearchRequests(MusicSearchCriteria searchCriteria)
         {
-            var parameters = GetBasicSearchParameters(searchCriteria.Categories, null);
+            var parameters = GetBasicSearchParameters(searchCriteria.Categories);
 
             parameters.Add("search", GetSearchTerm(searchCriteria.SanitizedSearchTerm).Trim());
 
@@ -114,7 +104,7 @@ namespace NzbDrone.Core.Indexers.Definitions.Avistaz
 
         public IndexerPageableRequestChain GetSearchRequests(TvSearchCriteria searchCriteria)
         {
-            var parameters = GetBasicSearchParameters(searchCriteria.Categories, searchCriteria.Genre);
+            var parameters = GetBasicSearchParameters(searchCriteria.Categories);
 
             if (searchCriteria.ImdbId.IsNotNullOrWhiteSpace())
             {
@@ -146,7 +136,7 @@ namespace NzbDrone.Core.Indexers.Definitions.Avistaz
 
         public IndexerPageableRequestChain GetSearchRequests(BasicSearchCriteria searchCriteria)
         {
-            var parameters = GetBasicSearchParameters(searchCriteria.Categories, null);
+            var parameters = GetBasicSearchParameters(searchCriteria.Categories);
 
             parameters.Add("search", GetSearchTerm(searchCriteria.SanitizedSearchTerm).Trim());
 

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

@@ -22,7 +22,6 @@ namespace NzbDrone.Core.Indexers.Definitions.Avistaz
         public AvistazSettings()
         {
             Token = "";
-            FreeleechOnly = false;
         }
 
         public string Token { get; set; }
@@ -36,9 +35,6 @@ namespace NzbDrone.Core.Indexers.Definitions.Avistaz
         [FieldDefinition(4, Label = "PID", HelpText = "PID from My Account or My Profile page")]
         public string Pid { get; set; }
 
-        [FieldDefinition(5, Label = "Freeleech Only", Type = FieldType.Checkbox, HelpText = "Search freeleech only")]
-        public bool FreeleechOnly { get; set; }
-
         public override NzbDroneValidationResult Validate()
         {
             return new NzbDroneValidationResult(Validator.Validate(this));

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

@@ -45,7 +45,7 @@ namespace NzbDrone.Core.Indexers.Cardigann
                         .ContainsIgnoreCase("login.php"))
                 {
                     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, "We are being redirected to the login page. Most likely your session expired or was killed. Try testing the indexer in the settings.");
                 }
 
                 throw new IndexerException(indexerResponse, $"Unexpected response status {indexerResponse.HttpResponse.StatusCode} code from API request");

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

@@ -152,7 +152,6 @@ namespace NzbDrone.Core.Indexers.Cardigann
             variables[".Query.Offset"] = searchCriteria.Offset?.ToString() ?? null;
             variables[".Query.Extended"] = null;
             variables[".Query.APIKey"] = null;
-            variables[".Query.Genre"] = null;
 
             //Movie
             variables[".Query.Movie"] = null;
@@ -169,7 +168,6 @@ namespace NzbDrone.Core.Indexers.Cardigann
             variables[".Query.TVRageID"] = null;
             variables[".Query.TVMazeID"] = null;
             variables[".Query.TraktID"] = null;
-            variables[".Query.DoubanID"] = null;
             variables[".Query.Episode"] = null;
 
             //Music
@@ -181,7 +179,6 @@ namespace NzbDrone.Core.Indexers.Cardigann
             //Book
             variables[".Query.Author"] = null;
             variables[".Query.Title"] = null;
-            variables[".Query.Publisher"] = null;
 
             return variables;
         }
@@ -945,11 +942,6 @@ namespace NzbDrone.Core.Indexers.Cardigann
 
         public bool CheckIfLoginIsNeeded(HttpResponse response)
         {
-            if (_definition.Login == null)
-            {
-                return false;
-            }
-
             if (response.HasHttpRedirect)
             {
                 var domainHint = GetRedirectDomainHint(response);
@@ -957,27 +949,35 @@ namespace NzbDrone.Core.Indexers.Cardigann
                 {
                     var errormessage = "Got redirected to another domain. Try changing the indexer URL to " + domainHint + ".";
 
-                    _logger.Warn(errormessage);
+                    throw new CardigannException(errormessage);
                 }
 
                 return true;
             }
 
+            if (_definition.Login == null || _definition.Login.Test == null)
+            {
+                return false;
+            }
+
             if (response.HasHttpError)
             {
                 return true;
             }
 
             // Only run html test selector on html responses
-            if (_definition.Login.Test?.Selector != null && (response.Headers.ContentType?.Contains("text/html") ?? true))
+            if (response.Headers.ContentType?.Contains("text/html") ?? true)
             {
                 var parser = new HtmlParser();
                 var document = parser.ParseDocument(response.Content);
 
-                var selection = document.QuerySelectorAll(_definition.Login.Test.Selector);
-                if (selection.Length == 0)
+                if (_definition.Login.Test.Selector != null)
                 {
-                    return true;
+                    var selection = document.QuerySelectorAll(_definition.Login.Test.Selector);
+                    if (selection.Length == 0)
+                    {
+                        return true;
+                    }
                 }
             }
 
@@ -1121,8 +1121,6 @@ namespace NzbDrone.Core.Indexers.Cardigann
 
                 var request = new CardigannRequest(requestbuilder.SetEncoding(_encoding).Build(), variables, searchPath);
 
-                request.HttpRequest.AllowAutoRedirect = searchPath.Followredirect;
-
                 yield return request;
             }
         }

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

@@ -36,11 +36,11 @@ namespace NzbDrone.Core.Indexers.Definitions
             {
                 TvSearchParams = new List<TvSearchParam>
                 {
-                    TvSearchParam.Q, TvSearchParam.Season, TvSearchParam.Ep, TvSearchParam.ImdbId, TvSearchParam.Genre
+                    TvSearchParam.Q, TvSearchParam.Season, TvSearchParam.Ep, TvSearchParam.ImdbId
                 },
                 MovieSearchParams = new List<MovieSearchParam>
                 {
-                    MovieSearchParam.Q, MovieSearchParam.ImdbId, MovieSearchParam.Genre
+                    MovieSearchParam.Q, MovieSearchParam.ImdbId
                 }
             };
 

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

@@ -80,30 +80,6 @@ namespace NzbDrone.Core.Indexers.Gazelle
             _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\"")))

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

@@ -30,19 +30,22 @@ namespace NzbDrone.Core.Indexers.Gazelle
             return pageableRequests;
         }
 
-        protected IEnumerable<IndexerRequest> GetRequest(string searchParameters)
+        private IEnumerable<IndexerRequest> GetRequest(string searchParameters)
         {
+            var filter = "";
+            if (searchParameters == null)
+            {
+            }
+
             var request =
                 new IndexerRequest(
-                    $"{APIUrl}?{searchParameters}",
+                    $"{APIUrl}?{searchParameters}{filter}",
                     HttpAccept.Json);
 
-            request.HttpRequest.AllowAutoRedirect = false;
-
             yield return request;
         }
 
-        protected string GetBasicSearchParameters(string searchTerm, int[] categories)
+        private string GetBasicSearchParameters(string searchTerm, int[] categories)
         {
             var searchString = GetSearchTerm(searchTerm);
 
@@ -64,7 +67,7 @@ namespace NzbDrone.Core.Indexers.Gazelle
             return parameters;
         }
 
-        public virtual IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchCriteria)
+        public IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchCriteria)
         {
             var parameters = GetBasicSearchParameters(searchCriteria.SearchTerm, searchCriteria.Categories);
 

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

@@ -14,7 +14,7 @@ namespace NzbDrone.Core.Indexers.Gazelle
         public string AuthKey;
         public string PassKey;
 
-        [FieldDefinition(4, Type = FieldType.Checkbox, Label = "Use Freeleech Token", HelpText = "Use freeleech tokens when available")]
+        [FieldDefinition(4, Type = FieldType.Checkbox, Label = "Use Freeleech Token", HelpText = "Use Freeleech Token")]
         public bool UseFreeleechToken { get; set; }
     }
 }

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

@@ -341,18 +341,7 @@ namespace NzbDrone.Core.Indexers.Definitions
                 return torrentInfos;
             }
 
-            Dictionary<string, GazelleGamesGroup> response;
-
-            try
-            {
-                response = ((JObject)jsonResponse.Resource.Response).ToObject<Dictionary<string, GazelleGamesGroup>>();
-            }
-            catch
-            {
-                return torrentInfos;
-            }
-
-            foreach (var result in response)
+            foreach (var result in jsonResponse.Resource.Response)
             {
                 Dictionary<string, GazelleGamesTorrent> torrents;
 
@@ -466,7 +455,7 @@ namespace NzbDrone.Core.Indexers.Definitions
     public class GazelleGamesResponse
     {
         public string Status { get; set; }
-        public object Response { get; set; }
+        public Dictionary<string, GazelleGamesGroup> Response { get; set; }
     }
 
     public class GazelleGamesGroup

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

@@ -1,369 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Net;
-using Newtonsoft.Json;
-using NLog;
-using NzbDrone.Common.Extensions;
-using NzbDrone.Common.Http;
-using NzbDrone.Core.Configuration;
-using NzbDrone.Core.Indexers.Exceptions;
-using NzbDrone.Core.Indexers.Gazelle;
-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 GreatPosterWall : Gazelle.Gazelle
-{
-    public override string Name => "GreatPosterWall";
-    public override string[] IndexerUrls => new string[] { "https://greatposterwall.com/" };
-    public override string Description => "GreatPosterWall (GPW) is a CHINESE Private site for MOVIES";
-    public override IndexerPrivacy Privacy => IndexerPrivacy.Private;
-
-    public GreatPosterWall(IIndexerHttpClient httpClient, IEventAggregator eventAggregator, IIndexerStatusService indexerStatusService, IConfigService configService, Logger logger)
-        : base(httpClient, eventAggregator, indexerStatusService, configService, logger)
-    {
-    }
-
-    public override IIndexerRequestGenerator GetRequestGenerator()
-    {
-        return new GreatPosterWallRequestGenerator()
-        {
-            Settings = Settings,
-            HttpClient = _httpClient,
-            Logger = _logger,
-            Capabilities = Capabilities
-        };
-    }
-
-    public override IParseIndexerResponse GetParser()
-    {
-        return new GreatPosterWallParser(Settings, Capabilities);
-    }
-
-    protected override IndexerCapabilities SetCapabilities()
-    {
-        var caps = new IndexerCapabilities
-        {
-            MovieSearchParams = new List<MovieSearchParam>
-            {
-                MovieSearchParam.Q, MovieSearchParam.ImdbId
-            }
-        };
-
-        caps.Categories.AddCategoryMapping(1, NewznabStandardCategory.Movies, "Movies 电影");
-
-        return caps;
-    }
-}
-
-public class GreatPosterWallRequestGenerator : GazelleRequestGenerator
-{
-    protected override bool ImdbInTags => false;
-
-    public override IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchCriteria)
-    {
-        var parameters = GetBasicSearchParameters(searchCriteria.SearchTerm, searchCriteria.Categories);
-
-        if (searchCriteria.ImdbId != null)
-        {
-            parameters += string.Format("&searchstr={0}", searchCriteria.FullImdbId);
-        }
-
-        var pageableRequests = new IndexerPageableRequestChain();
-        pageableRequests.Add(GetRequest(parameters));
-        return pageableRequests;
-    }
-}
-
-public class GreatPosterWallParser : GazelleParser
-{
-    public GreatPosterWallParser(GazelleSettings settings, IndexerCapabilities capabilities)
-        : base(settings, capabilities)
-    {
-    }
-
-    public override IList<ReleaseInfo> ParseResponse(IndexerResponse indexerResponse)
-    {
-        var torrentInfos = new List<ReleaseInfo>();
-
-        if (indexerResponse.HttpResponse.StatusCode != HttpStatusCode.OK)
-        {
-            // Remove cookie cache
-            CookiesUpdater(null, null);
-
-            throw new IndexerException(indexerResponse, $"Unexpected response status {indexerResponse.HttpResponse.StatusCode} code from API request");
-        }
-
-        if (!indexerResponse.HttpResponse.Headers.ContentType.Contains(HttpAccept.Json.Value))
-        {
-            // Remove cookie cache
-            CookiesUpdater(null, null);
-
-            throw new IndexerException(indexerResponse, $"Unexpected response header {indexerResponse.HttpResponse.Headers.ContentType} from API request, expected {HttpAccept.Json.Value}");
-        }
-
-        var jsonResponse = new HttpResponse<GreatPosterWallResponse>(indexerResponse.HttpResponse);
-        if (jsonResponse.Resource.Status != "success" ||
-            jsonResponse.Resource.Status.IsNullOrWhiteSpace() ||
-            jsonResponse.Resource.Response == null)
-        {
-            return torrentInfos;
-        }
-
-        foreach (var result in jsonResponse.Resource.Response.Results)
-        {
-            foreach (var torrent in result.Torrents)
-            {
-                var infoUrl = GetInfoUrl(result.GroupId.ToString(), torrent.TorrentId);
-
-                var time = DateTime.SpecifyKind(torrent.Time, DateTimeKind.Unspecified);
-
-                var release = new GazelleInfo
-                {
-                    MinimumRatio = 1,
-                    MinimumSeedTime = 172800,
-                    Title = torrent.FileName,
-                    InfoUrl = infoUrl,
-                    Guid = infoUrl,
-                    PosterUrl = GetPosterUrl(result.Cover),
-                    DownloadUrl = GetDownloadUrl(torrent.TorrentId, torrent.CanUseToken),
-                    PublishDate = new DateTimeOffset(time, TimeSpan.FromHours(8)).LocalDateTime, // Time is Chinese Time, add 8 hours difference from UTC and then convert back to local time
-                    Categories = new List<IndexerCategory> { NewznabStandardCategory.Movies },
-                    Size = torrent.Size,
-                    Seeders = torrent.Seeders,
-                    Peers = torrent.Seeders + torrent.Leechers,
-                    Grabs = torrent.Snatches,
-                    Files = torrent.FileCount,
-                    Scene = torrent.Scene,
-                    DownloadVolumeFactor = torrent.IsFreeleech || torrent.IsNeutralLeech || torrent.IsPersonalFreeleech ? 0 : 1,
-                    UploadVolumeFactor = torrent.IsNeutralLeech ? 0 : 1
-                };
-
-                var imdbId = ParseUtil.GetImdbID(result.ImdbId);
-
-                if (imdbId != null)
-                {
-                    release.ImdbId = (int)imdbId;
-                }
-
-                switch (torrent.FreeType)
-                {
-                    case "11":
-                        release.DownloadVolumeFactor = 0.75;
-                        break;
-                    case "12":
-                        release.DownloadVolumeFactor = 0.5;
-                        break;
-                    case "13":
-                        release.DownloadVolumeFactor = 0.25;
-                        break;
-                    case "1":
-                        release.DownloadVolumeFactor = 0;
-                        break;
-                    case "2":
-                        release.DownloadVolumeFactor = 0;
-                        release.UploadVolumeFactor = 0;
-                        break;
-                }
-
-                torrentInfos.Add(release);
-            }
-        }
-
-        return torrentInfos;
-    }
-
-    protected string GetDownloadUrl(int torrentId, bool canUseToken)
-    {
-        var url = new HttpUri(_settings.BaseUrl)
-            .CombinePath("/torrents.php")
-            .AddQueryParam("action", "download")
-            .AddQueryParam("usetoken", _settings.UseFreeleechToken && canUseToken ? "1" : "0")
-            .AddQueryParam("id", torrentId);
-
-        return url.FullUri;
-    }
-}
-
-public class GreatPosterWallResponse
-{
-    [JsonProperty("status")]
-    public string Status { get; set; }
-
-    [JsonProperty("response")]
-    public Response Response { get; set; }
-}
-
-public class Response
-{
-        [JsonProperty("currentPage")]
-        public int CurrentPage { get; set; }
-
-        [JsonProperty("pages")]
-        public int Pages { get; set; }
-
-        [JsonProperty("results")]
-        public List<Result> Results { get; set; }
-}
-
-public class Result
-{
-        [JsonProperty("groupId")]
-        public int GroupId { get; set; }
-
-        [JsonProperty("groupName")]
-        public string GroupName { get; set; }
-
-        [JsonProperty("groupSubName")]
-        public string GroupSubName { get; set; }
-
-        [JsonProperty("cover")]
-        public string Cover { get; set; }
-
-        [JsonProperty("tags")]
-        public List<string> Tags { get; set; }
-
-        [JsonProperty("bookmarked")]
-        public bool Bookmarked { get; set; }
-
-        [JsonProperty("groupYear")]
-        public int GroupYear { get; set; }
-
-        [JsonProperty("releaseType")]
-        public string ReleaseType { get; set; }
-
-        [JsonProperty("groupTime")]
-        public string GroupTime { get; set; }
-
-        [JsonProperty("maxSize")]
-        public object MaxSize { get; set; }
-
-        [JsonProperty("totalSnatched")]
-        public int TotalSnatched { get; set; }
-
-        [JsonProperty("totalSeeders")]
-        public int TotalSeeders { get; set; }
-
-        [JsonProperty("totalLeechers")]
-        public int TotalLeechers { get; set; }
-
-        [JsonProperty("imdbId")]
-        public string ImdbId { get; set; }
-
-        [JsonProperty("imdbRating")]
-        public string ImdbRating { get; set; }
-
-        [JsonProperty("imdbVote")]
-        public string ImdbVote { get; set; }
-
-        [JsonProperty("doubanId")]
-        public string DoubanId { get; set; }
-
-        [JsonProperty("doubanRating")]
-        public string DoubanRating { get; set; }
-
-        [JsonProperty("doubanVote")]
-        public string DoubanVote { get; set; }
-
-        [JsonProperty("rtRating")]
-        public string RtRating { get; set; }
-
-        [JsonProperty("region")]
-        public string Region { get; set; }
-
-        [JsonProperty("torrents")]
-        public List<GreatPosterWallTorrent> Torrents { get; set; }
-}
-
-public class GreatPosterWallTorrent
-{
-        [JsonProperty("torrentId")]
-        public int TorrentId { get; set; }
-
-        [JsonProperty("editionId")]
-        public int EditionId { get; set; }
-
-        [JsonProperty("remasterYear")]
-        public int RemasterYear { get; set; }
-
-        [JsonProperty("remasterTitle")]
-        public string RemasterTitle { get; set; }
-
-        [JsonProperty("remasterCustomTitle")]
-        public string RemasterCustomTitle { get; set; }
-
-        [JsonProperty("scene")]
-        public bool Scene { get; set; }
-
-        [JsonProperty("jinzhuan")]
-        public bool Jinzhuan { get; set; }
-
-        [JsonProperty("fileCount")]
-        public int FileCount { get; set; }
-
-        [JsonProperty("time")]
-        public DateTime Time { get; set; }
-
-        [JsonProperty("size")]
-        public long Size { get; set; }
-
-        [JsonProperty("snatches")]
-        public int Snatches { get; set; }
-
-        [JsonProperty("seeders")]
-        public int Seeders { get; set; }
-
-        [JsonProperty("leechers")]
-        public int Leechers { get; set; }
-
-        [JsonProperty("isFreeleech")]
-        public bool IsFreeleech { get; set; }
-
-        [JsonProperty("isNeutralLeech")]
-        public bool IsNeutralLeech { get; set; }
-
-        [JsonProperty("freeType")]
-        public string FreeType { get; set; }
-
-        [JsonProperty("isPersonalFreeleech")]
-        public bool IsPersonalFreeleech { get; set; }
-
-        [JsonProperty("canUseToken")]
-        public bool CanUseToken { get; set; }
-
-        [JsonProperty("hasSnatched")]
-        public bool HasSnatched { get; set; }
-
-        [JsonProperty("resolution")]
-        public string Resolution { get; set; }
-
-        [JsonProperty("source")]
-        public string Source { get; set; }
-
-        [JsonProperty("codec")]
-        public string Codec { get; set; }
-
-        [JsonProperty("container")]
-        public string Container { get; set; }
-
-        [JsonProperty("processing")]
-        public string Processing { get; set; }
-
-        [JsonProperty("chineseDubbed")]
-        public string ChineseDubbed { get; set; }
-
-        [JsonProperty("specialSub")]
-        public string SpecialSub { get; set; }
-
-        [JsonProperty("subtitles")]
-        public string Subtitles { get; set; }
-
-        [JsonProperty("fileName")]
-        public string FileName { get; set; }
-
-        [JsonProperty("releaseGroup")]
-        public string ReleaseGroup { get; set; }
-}

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

@@ -124,24 +124,19 @@ namespace NzbDrone.Core.Indexers.Definitions
             caps.Categories.AddCategoryMapping(15, NewznabStandardCategory.MoviesBluRay, "Movie / Blu-ray");
             caps.Categories.AddCategoryMapping(19, NewznabStandardCategory.MoviesHD, "Movie / 1080p");
             caps.Categories.AddCategoryMapping(18, NewznabStandardCategory.MoviesHD, "Movie / 720p");
-            caps.Categories.AddCategoryMapping(46, NewznabStandardCategory.MoviesUHD, "Movie / 2160p");
             caps.Categories.AddCategoryMapping(40, NewznabStandardCategory.MoviesHD, "Movie / Remux");
             caps.Categories.AddCategoryMapping(16, NewznabStandardCategory.MoviesHD, "Movie / HD-DVD");
             caps.Categories.AddCategoryMapping(41, NewznabStandardCategory.MoviesUHD, "Movie / 4K UHD");
             caps.Categories.AddCategoryMapping(21, NewznabStandardCategory.TVHD, "TV Show / 720p HDTV");
             caps.Categories.AddCategoryMapping(22, NewznabStandardCategory.TVHD, "TV Show / 1080p HDTV");
-            caps.Categories.AddCategoryMapping(45, NewznabStandardCategory.TVUHD, "TV Show / 2160p HDTV");
             caps.Categories.AddCategoryMapping(24, NewznabStandardCategory.TVDocumentary, "Documentary / 720p");
             caps.Categories.AddCategoryMapping(25, NewznabStandardCategory.TVDocumentary, "Documentary / 1080p");
-            caps.Categories.AddCategoryMapping(47, NewznabStandardCategory.TVDocumentary, "Documentary / 2160p");
             caps.Categories.AddCategoryMapping(27, NewznabStandardCategory.TVAnime, "Animation / 720p");
             caps.Categories.AddCategoryMapping(28, NewznabStandardCategory.TVAnime, "Animation / 1080p");
-            caps.Categories.AddCategoryMapping(48, NewznabStandardCategory.TVAnime, "Animation / 2160p");
             caps.Categories.AddCategoryMapping(30, NewznabStandardCategory.AudioLossless, "Music / HQ Audio");
             caps.Categories.AddCategoryMapping(31, NewznabStandardCategory.AudioVideo, "Music / Videos");
             caps.Categories.AddCategoryMapping(33, NewznabStandardCategory.XXX, "XXX / 720p");
             caps.Categories.AddCategoryMapping(34, NewznabStandardCategory.XXX, "XXX / 1080p");
-            caps.Categories.AddCategoryMapping(49, NewznabStandardCategory.XXX, "XXX / 2160p");
             caps.Categories.AddCategoryMapping(36, NewznabStandardCategory.MoviesOther, "Trailers");
             caps.Categories.AddCategoryMapping(37, NewznabStandardCategory.PC, "Software");
             caps.Categories.AddCategoryMapping(38, NewznabStandardCategory.Other, "Others");

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

@@ -190,12 +190,6 @@ public class MoreThanTVParser : IParseIndexerResponse
             {
                 // Parse required data
                 var downloadAnchor = torrent.QuerySelector("span a[href^=\"/torrents.php?action=download\"]");
-
-                if (downloadAnchor == null)
-                {
-                    continue;
-                }
-
                 var title = downloadAnchor.ParentElement.ParentElement.ParentElement.QuerySelector("a[class=\"overlay_torrent\"]").TextContent.Trim();
                 title = CleanUpTitle(title);
 

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

@@ -2,7 +2,6 @@ using System;
 using System.Collections.Generic;
 using System.Collections.Specialized;
 using System.Linq;
-using DryIoc;
 using NzbDrone.Common.Extensions;
 using NzbDrone.Common.Http;
 using NzbDrone.Core.IndexerSearch.Definitions;
@@ -269,10 +268,7 @@ namespace NzbDrone.Core.Indexers.Newznab
                 parameters.Add("offset", searchCriteria.Offset.ToString());
             }
 
-            var request = new IndexerRequest(string.Format("{0}&{1}", baseUrl, parameters.GetQueryString()), HttpAccept.Rss);
-            request.HttpRequest.AllowAutoRedirect = true;
-
-            yield return request;
+            yield return new IndexerRequest(string.Format("{0}&{1}", baseUrl, parameters.GetQueryString()), HttpAccept.Rss);
         }
 
         private static string NewsnabifyTitle(string title)

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

@@ -1,51 +1,25 @@
-using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Net;
-using System.Text;
-using System.Threading.Tasks;
-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.Gazelle;
-using NzbDrone.Core.Indexers.Settings;
-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 Orpheus : TorrentIndexerBase<OrpheusSettings>
+    public class Orpheus : Gazelle.Gazelle
     {
         public override string Name => "Orpheus";
         public override string[] IndexerUrls => new string[] { "https://orpheus.network/" };
         public override string Description => "Orpheus (APOLLO) is a Private Torrent Tracker for MUSIC";
-        public override DownloadProtocol Protocol => DownloadProtocol.Torrent;
         public override IndexerPrivacy Privacy => IndexerPrivacy.Private;
-        public override IndexerCapabilities Capabilities => SetCapabilities();
-        public override bool SupportsRedirect => true;
 
         public Orpheus(IIndexerHttpClient httpClient, IEventAggregator eventAggregator, IIndexerStatusService indexerStatusService, IConfigService configService, Logger logger)
-        : base(httpClient, eventAggregator, indexerStatusService, configService, logger)
+            : base(httpClient, eventAggregator, indexerStatusService, configService, logger)
         {
         }
 
-        public override IIndexerRequestGenerator GetRequestGenerator()
-        {
-            return new OrpheusRequestGenerator() { Settings = Settings, Capabilities = Capabilities, HttpClient = _httpClient };
-        }
-
-        public override IParseIndexerResponse GetParser()
-        {
-            return new OrpheusParser(Settings, Capabilities.Categories);
-        }
-
-        private IndexerCapabilities SetCapabilities()
+        protected override IndexerCapabilities SetCapabilities()
         {
             var caps = new IndexerCapabilities
             {
@@ -70,252 +44,23 @@ namespace NzbDrone.Core.Indexers.Definitions
             return caps;
         }
 
-        public override async Task<byte[]> Download(Uri link)
+        public override IParseIndexerResponse GetParser()
         {
-            var request = new HttpRequestBuilder(link.AbsoluteUri)
-                .SetHeader("Authorization", $"token {Settings.Apikey}")
-                .Build();
-
-            var downloadBytes = Array.Empty<byte>();
-
-            try
-            {
-                var response = await _httpClient.ExecuteProxiedAsync(request, Definition);
-                downloadBytes = response.ResponseData;
-
-                if (downloadBytes.Length >= 1
-                    && downloadBytes[0] != 'd' // simple test for torrent vs HTML content
-                    && link.Query.Contains("usetoken=1"))
-                {
-                    var html = Encoding.GetString(downloadBytes);
-                    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 without usetoken
-                        request.Url = new HttpUri(link.ToString().Replace("&usetoken=1", ""));
-
-                        response = await _httpClient.ExecuteProxiedAsync(request, Definition);
-                        downloadBytes = response.ResponseData;
-                    }
-                }
-            }
-            catch (Exception)
-            {
-                _indexerStatusService.RecordFailure(Definition.Id);
-                _logger.Error("Download failed");
-            }
-
-            return downloadBytes;
+            return new OrpheusParser(Settings, Capabilities);
         }
     }
 
-    public class OrpheusRequestGenerator : IIndexerRequestGenerator
+    public class OrpheusParser : GazelleParser
     {
-        public OrpheusSettings 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 IIndexerHttpClient HttpClient { get; set; }
-
-        public OrpheusRequestGenerator()
+        public OrpheusParser(GazelleSettings settings, IndexerCapabilities capabilities)
+            : base(settings, capabilities)
         {
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(MusicSearchCriteria searchCriteria)
+        protected override string GetDownloadUrl(int torrentId)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            pageableRequests.Add(GetRequest(string.Format("&artistname={0}&groupname={1}", searchCriteria.Artist, searchCriteria.Album)));
-
-            return pageableRequests;
-        }
-
-        public IndexerPageableRequestChain GetSearchRequests(BookSearchCriteria searchCriteria)
-        {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            pageableRequests.Add(GetRequest(searchCriteria.SanitizedSearchTerm));
-
-            return pageableRequests;
-        }
-
-        public IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchCriteria)
-        {
-            return new IndexerPageableRequestChain();
-        }
-
-        public IndexerPageableRequestChain GetSearchRequests(TvSearchCriteria searchCriteria)
-        {
-            return new IndexerPageableRequestChain();
-        }
-
-        public IndexerPageableRequestChain GetSearchRequests(BasicSearchCriteria searchCriteria)
-        {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            pageableRequests.Add(GetRequest(searchCriteria.SanitizedSearchTerm));
-
-            return pageableRequests;
-        }
-
-        private IEnumerable<IndexerRequest> GetRequest(string searchParameters)
-        {
-            var req = RequestBuilder()
-                .Resource($"ajax.php?action=browse&searchstr={searchParameters}")
-                .Build();
-
-            yield return new IndexerRequest(req);
-        }
-
-        private HttpRequestBuilder RequestBuilder()
-        {
-            return new HttpRequestBuilder($"{Settings.BaseUrl.Trim().TrimEnd('/')}")
-                .Accept(HttpAccept.Json)
-                .SetHeader("Authorization", $"token {Settings.Apikey}");
-        }
-    }
-
-    public class OrpheusParser : IParseIndexerResponse
-    {
-        private readonly OrpheusSettings _settings;
-        private readonly IndexerCapabilitiesCategories _categories;
-        public Action<IDictionary<string, string>, DateTime?> CookiesUpdater { get; set; }
-
-        public OrpheusParser(OrpheusSettings settings, IndexerCapabilitiesCategories categories)
-        {
-            _settings = settings;
-            _categories = categories;
-        }
-
-        public IList<ReleaseInfo> ParseResponse(IndexerResponse indexerResponse)
-        {
-            var torrentInfos = new List<ReleaseInfo>();
-
-            if (indexerResponse.HttpResponse.StatusCode != HttpStatusCode.OK)
-            {
-                throw new IndexerException(indexerResponse, $"Unexpected response status {indexerResponse.HttpResponse.StatusCode} code from API request");
-            }
-
-            if (!indexerResponse.HttpResponse.Headers.ContentType.Contains(HttpAccept.Json.Value))
-            {
-                throw new IndexerException(indexerResponse, $"Unexpected response header {indexerResponse.HttpResponse.Headers.ContentType} from API request, expected {HttpAccept.Json.Value}");
-            }
-
-            var jsonResponse = new HttpResponse<GazelleResponse>(indexerResponse.HttpResponse);
-            if (jsonResponse.Resource.Status != "success" ||
-                string.IsNullOrWhiteSpace(jsonResponse.Resource.Status) ||
-                jsonResponse.Resource.Response == null)
-            {
-                return torrentInfos;
-            }
-
-            foreach (var result in jsonResponse.Resource.Response.Results)
-            {
-                if (result.Torrents != null)
-                {
-                    foreach (var torrent in result.Torrents)
-                    {
-                        var id = torrent.TorrentId;
-                        var artist = WebUtility.HtmlDecode(result.Artist);
-                        var album = WebUtility.HtmlDecode(result.GroupName);
-
-                        var title = $"{result.Artist} - {result.GroupName} ({result.GroupYear}) [{torrent.Format} {torrent.Encoding}] [{torrent.Media}]";
-                        if (torrent.HasCue)
-                        {
-                            title += " [Cue]";
-                        }
-
-                        var infoUrl = GetInfoUrl(result.GroupId, id);
-
-                        GazelleInfo release = new GazelleInfo()
-                        {
-                            Guid = infoUrl,
-
-                            // Splice Title from info to avoid calling API again for every torrent.
-                            Title = WebUtility.HtmlDecode(title),
-
-                            Container = torrent.Encoding,
-                            Codec = torrent.Format,
-                            Size = long.Parse(torrent.Size),
-                            DownloadUrl = GetDownloadUrl(id, torrent.CanUseToken),
-                            InfoUrl = infoUrl,
-                            Seeders = int.Parse(torrent.Seeders),
-                            Peers = int.Parse(torrent.Leechers) + int.Parse(torrent.Seeders),
-                            PublishDate = torrent.Time.ToUniversalTime(),
-                            Scene = torrent.Scene,
-                            Freeleech = torrent.IsFreeLeech || torrent.IsPersonalFreeLeech,
-                            Files = torrent.FileCount,
-                            Grabs = torrent.Snatches,
-                            DownloadVolumeFactor = torrent.IsFreeLeech || torrent.IsNeutralLeech || torrent.IsPersonalFreeLeech ? 0 : 1,
-                            UploadVolumeFactor = torrent.IsNeutralLeech ? 0 : 1
-                        };
-
-                        var category = torrent.Category;
-                        if (category == null || category.Contains("Select Category"))
-                        {
-                            release.Categories = _categories.MapTrackerCatToNewznab("1");
-                        }
-                        else
-                        {
-                            release.Categories = _categories.MapTrackerCatDescToNewznab(category);
-                        }
-
-                        torrentInfos.Add(release);
-                    }
-                }
-
-                // Non-Audio files are formatted a little differently (1:1 for group and torrents)
-                else
-                {
-                    var id = result.TorrentId;
-                    var infoUrl = GetInfoUrl(result.GroupId, id);
-
-                    GazelleInfo release = new GazelleInfo()
-                    {
-                        Guid = infoUrl,
-                        Title = WebUtility.HtmlDecode(result.GroupName),
-                        Size = long.Parse(result.Size),
-                        DownloadUrl = GetDownloadUrl(id, result.CanUseToken),
-                        InfoUrl = infoUrl,
-                        Seeders = int.Parse(result.Seeders),
-                        Peers = int.Parse(result.Leechers) + int.Parse(result.Seeders),
-                        PublishDate = long.TryParse(result.GroupTime, out var num) ? DateTimeOffset.FromUnixTimeSeconds(num).UtcDateTime : DateTimeUtil.FromFuzzyTime(result.GroupTime),
-                        Freeleech = result.IsFreeLeech || result.IsPersonalFreeLeech,
-                        Files = result.FileCount,
-                        Grabs = result.Snatches,
-                        DownloadVolumeFactor = result.IsFreeLeech || result.IsNeutralLeech || result.IsPersonalFreeLeech ? 0 : 1,
-                        UploadVolumeFactor = result.IsNeutralLeech ? 0 : 1
-                    };
-
-                    var category = result.Category;
-                    if (category == null || category.Contains("Select Category"))
-                    {
-                        release.Categories = _categories.MapTrackerCatToNewznab("1");
-                    }
-                    else
-                    {
-                        release.Categories = _categories.MapTrackerCatDescToNewznab(category);
-                    }
-
-                    torrentInfos.Add(release);
-                }
-            }
-
-            // order by date
-            return
-                torrentInfos
-                    .OrderByDescending(o => o.PublishDate)
-                    .ToArray();
-        }
-
-        private string GetDownloadUrl(int torrentId, bool canUseToken)
-        {
-            // AuthKey is required but not checked, just pass in a dummy variable
-            // to avoid having to track authkey, which is randomly cycled
             var url = new HttpUri(_settings.BaseUrl)
-                .CombinePath("/ajax.php")
+                .CombinePath("/torrents.php")
                 .AddQueryParam("action", "download")
                 .AddQueryParam("id", torrentId);
 
@@ -327,45 +72,5 @@ namespace NzbDrone.Core.Indexers.Definitions
 
             return url.FullUri;
         }
-
-        private string GetInfoUrl(string groupId, int torrentId)
-        {
-            var url = new HttpUri(_settings.BaseUrl)
-                .CombinePath("/torrents.php")
-                .AddQueryParam("id", groupId)
-                .AddQueryParam("torrentid", torrentId);
-
-            return url.FullUri;
-        }
-    }
-
-    public class OrpheusSettingsValidator : AbstractValidator<OrpheusSettings>
-    {
-        public OrpheusSettingsValidator()
-        {
-            RuleFor(c => c.Apikey).NotEmpty();
-        }
-    }
-
-    public class OrpheusSettings : NoAuthTorrentBaseSettings
-    {
-        private static readonly OrpheusSettingsValidator Validator = new OrpheusSettingsValidator();
-
-        public OrpheusSettings()
-        {
-            Apikey = "";
-            UseFreeleechToken = false;
-        }
-
-        [FieldDefinition(2, Label = "API Key", HelpText = "API Key from the Site (Found in Settings => Access Settings)", Privacy = PrivacyLevel.ApiKey)]
-        public string Apikey { get; set; }
-
-        [FieldDefinition(3, Label = "Use Freeleech Tokens", HelpText = "Use freeleech tokens when available", Type = FieldType.Checkbox)]
-        public bool UseFreeleechToken { get; set; }
-
-        public override NzbDroneValidationResult Validate()
-        {
-            return new NzbDroneValidationResult(Validator.Validate(this));
-        }
     }
 }

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

@@ -34,7 +34,7 @@ namespace NzbDrone.Core.Indexers.PassThePopcorn
                         .ContainsIgnoreCase("login.php"))
                 {
                     CookiesUpdater(null, null);
-                    throw new IndexerAuthException("We are being redirected to the PTP login page. Most likely your session expired or was killed. Recheck your cookie or credentials and try testing the indexer.");
+                    throw new IndexerAuthException("We are being redirected to the PTP login page. Most likely your session expired or was killed. Try testing the indexer in the settings.");
                 }
 
                 if (indexerHttpResponse.StatusCode == HttpStatusCode.Forbidden)

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

@@ -255,8 +255,6 @@ namespace NzbDrone.Core.Indexers.Definitions
 
             var request = new IndexerRequest(searchUrl, HttpAccept.Html);
 
-            request.HttpRequest.AllowAutoRedirect = false;
-
             yield return request;
         }
 

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

@@ -35,11 +35,11 @@ namespace NzbDrone.Core.Indexers.Definitions
             {
                 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
                        },
                 MovieSearchParams = new List<MovieSearchParam>
                        {
-                           MovieSearchParam.Q, MovieSearchParam.ImdbId, MovieSearchParam.TmdbId, MovieSearchParam.Genre
+                           MovieSearchParam.Q, MovieSearchParam.ImdbId, MovieSearchParam.TmdbId
                        },
                 MusicSearchParams = new List<MusicSearchParam>
                        {

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

@@ -1,11 +1,6 @@
 using System;
-using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
-using System.Net.Http.Json;
-using System.Threading.Tasks;
-using System.Web;
-using Newtonsoft.Json;
 using NLog;
 using NzbDrone.Common.EnvironmentInfo;
 using NzbDrone.Common.Extensions;
@@ -13,9 +8,7 @@ using NzbDrone.Common.Http;
 using NzbDrone.Core.Configuration;
 using NzbDrone.Core.Exceptions;
 using NzbDrone.Core.Http.CloudFlare;
-using NzbDrone.Core.Indexers.Exceptions;
 using NzbDrone.Core.Messaging.Events;
-using NzbDrone.Core.Parser;
 using NzbDrone.Core.Validation;
 
 namespace NzbDrone.Core.Indexers.Rarbg
@@ -102,57 +95,6 @@ namespace NzbDrone.Core.Indexers.Rarbg
             return caps;
         }
 
-        protected override async Task<IndexerQueryResult> FetchPage(IndexerRequest request, IParseIndexerResponse parser)
-        {
-            var response = await FetchIndexerResponse(request);
-
-            // try and recover from token or rate limit errors
-            var jsonResponse = new HttpResponse<RarbgResponse>(response.HttpResponse);
-
-            if (jsonResponse.Resource.error_code.HasValue)
-            {
-                if (jsonResponse.Resource.error_code == 4 || jsonResponse.Resource.error_code == 2)
-                {
-                    _logger.Debug("Invalid or expired token, refreshing token from Rarbg");
-                    _tokenProvider.ExpireToken(Settings);
-                    var newToken = _tokenProvider.GetToken(Settings);
-
-                    var qs = HttpUtility.ParseQueryString(request.HttpRequest.Url.Query);
-                    qs.Set("token", newToken);
-
-                    request.HttpRequest.Url = request.Url.SetQuery(qs.GetQueryString());
-                    response = await FetchIndexerResponse(request);
-                }
-                else if (jsonResponse.Resource.error_code == 5 || jsonResponse.Resource.rate_limit.HasValue)
-                {
-                    _logger.Debug("Rarbg rate limit hit, retying request");
-                    response = await FetchIndexerResponse(request);
-                }
-            }
-
-            try
-            {
-                var releases = parser.ParseResponse(response).ToList();
-
-                if (releases.Count == 0)
-                {
-                    _logger.Trace(response.Content);
-                }
-
-                return new IndexerQueryResult
-                {
-                    Releases = releases,
-                    Response = response.HttpResponse
-                };
-            }
-            catch (Exception ex)
-            {
-                ex.WithData(response.HttpResponse, 128 * 1024);
-                _logger.Trace("Unexpected Response content ({0} bytes): {1}", response.HttpResponse.ResponseData.Length, response.HttpResponse.Content);
-                throw;
-            }
-        }
-
         public override object RequestAction(string action, IDictionary<string, string> query)
         {
             if (action == "checkCaptcha")

src/NzbDrone.Core/Indexers/Definitions/Rarbg/RarbgParser.cs

@@ -40,11 +40,9 @@ namespace NzbDrone.Core.Indexers.Rarbg
             if (jsonResponse.Resource.error_code.HasValue)
             {
                 if (jsonResponse.Resource.error_code == 20 || jsonResponse.Resource.error_code == 8
-                    || jsonResponse.Resource.error_code == 9 || jsonResponse.Resource.error_code == 10
-                    || jsonResponse.Resource.error_code == 5 || jsonResponse.Resource.error_code == 13
-                    || jsonResponse.Resource.error_code == 14)
+                    || jsonResponse.Resource.error_code == 9 || jsonResponse.Resource.error_code == 10)
                 {
-                    // No results, rate limit, or imdbid/tvdb not found
+                    // No results or imdbid not found
                     return results;
                 }
 

src/NzbDrone.Core/Indexers/Definitions/Rarbg/RarbgRequestGenerator.cs

@@ -36,7 +36,7 @@ namespace NzbDrone.Core.Indexers.Rarbg
             {
                 requestBuilder.AddQueryParam("search_themoviedb", tmdbId);
             }
-            else if (tvdbId.HasValue && tvdbId > 0)
+            else if (tvdbId.HasValue && tmdbId > 0)
             {
                 requestBuilder.AddQueryParam("search_tvdb", tvdbId);
             }
@@ -60,7 +60,7 @@ namespace NzbDrone.Core.Indexers.Rarbg
             }
 
             requestBuilder.AddQueryParam("limit", "100");
-            requestBuilder.AddQueryParam("token", _tokenProvider.GetToken(Settings));
+            requestBuilder.AddQueryParam("token", _tokenProvider.GetToken(Settings, Settings.BaseUrl));
             requestBuilder.AddQueryParam("format", "json_extended");
             requestBuilder.AddQueryParam("app_id", BuildInfo.AppName);
 
@@ -69,36 +69,42 @@ namespace NzbDrone.Core.Indexers.Rarbg
 
         public IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-            pageableRequests.Add(GetRequest(searchCriteria.SanitizedSearchTerm, searchCriteria.Categories, searchCriteria.FullImdbId, searchCriteria.TmdbId));
-            return pageableRequests;
+            var request = GetRequest(searchCriteria.SanitizedSearchTerm, searchCriteria.Categories, searchCriteria.FullImdbId, searchCriteria.TmdbId);
+            return GetRequestChain(request, 2);
         }
 
         public IndexerPageableRequestChain GetSearchRequests(MusicSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-            pageableRequests.Add(GetRequest(searchCriteria.SanitizedSearchTerm, searchCriteria.Categories));
-            return pageableRequests;
+            var request = GetRequest(searchCriteria.SanitizedSearchTerm, searchCriteria.Categories);
+            return GetRequestChain(request, 2);
         }
 
         public IndexerPageableRequestChain GetSearchRequests(TvSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-            pageableRequests.Add(GetRequest(searchCriteria.SanitizedTvSearchString, searchCriteria.Categories, searchCriteria.FullImdbId, tvdbId: searchCriteria.TvdbId));
-            return pageableRequests;
+            var request = GetRequest(searchCriteria.SanitizedTvSearchString, searchCriteria.Categories, searchCriteria.FullImdbId, tvdbId: searchCriteria.TvdbId);
+            return GetRequestChain(request, 2);
         }
 
         public IndexerPageableRequestChain GetSearchRequests(BookSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-            pageableRequests.Add(GetRequest(searchCriteria.SanitizedSearchTerm, searchCriteria.Categories));
-            return pageableRequests;
+            var request = GetRequest(searchCriteria.SanitizedSearchTerm, searchCriteria.Categories);
+            return GetRequestChain(request, 2);
         }
 
         public IndexerPageableRequestChain GetSearchRequests(BasicSearchCriteria searchCriteria)
+        {
+            var request = GetRequest(searchCriteria.SanitizedSearchTerm, searchCriteria.Categories);
+            return GetRequestChain(request, 2);
+        }
+
+        private IndexerPageableRequestChain GetRequestChain(IEnumerable<IndexerRequest> requests, int retry)
         {
             var pageableRequests = new IndexerPageableRequestChain();
-            pageableRequests.Add(GetRequest(searchCriteria.SanitizedSearchTerm, searchCriteria.Categories));
+
+            for (int i = 0; i < retry; i++)
+            {
+                pageableRequests.AddTier(requests);
+            }
 
             return pageableRequests;
         }

src/NzbDrone.Core/Indexers/Definitions/Rarbg/RarbgResponse.cs

@@ -7,7 +7,6 @@ namespace NzbDrone.Core.Indexers.Rarbg
     {
         public string error { get; set; }
         public int? error_code { get; set; }
-        public int? rate_limit { get; set; }
         public List<RarbgTorrent> torrent_results { get; set; }
     }
 

src/NzbDrone.Core/Indexers/Definitions/Rarbg/RarbgTokenProvider.cs

@@ -3,14 +3,14 @@ using Newtonsoft.Json.Linq;
 using NLog;
 using NzbDrone.Common.Cache;
 using NzbDrone.Common.EnvironmentInfo;
+using NzbDrone.Common.Extensions;
 using NzbDrone.Common.Http;
 
 namespace NzbDrone.Core.Indexers.Rarbg
 {
     public interface IRarbgTokenProvider
     {
-        string GetToken(RarbgSettings settings);
-        void ExpireToken(RarbgSettings settings);
+        string GetToken(RarbgSettings settings, string baseUrl);
     }
 
     public class RarbgTokenProvider : IRarbgTokenProvider
@@ -26,17 +26,12 @@ namespace NzbDrone.Core.Indexers.Rarbg
             _logger = logger;
         }
 
-        public void ExpireToken(RarbgSettings settings)
+        public string GetToken(RarbgSettings settings, string baseUrl)
         {
-            _tokenCache.Remove(settings.BaseUrl);
-        }
-
-        public string GetToken(RarbgSettings settings)
-        {
-            return _tokenCache.Get(settings.BaseUrl,
+            return _tokenCache.Get(baseUrl,
                 () =>
                 {
-                    var requestBuilder = new HttpRequestBuilder(settings.BaseUrl.Trim('/'))
+                    var requestBuilder = new HttpRequestBuilder(baseUrl.Trim('/'))
                         .WithRateLimit(3.0)
                         .Resource($"/pubapi_v2.php?get_token=get_token&app_id={BuildInfo.AppName}")
                         .Accept(HttpAccept.Json);

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

@@ -27,6 +27,8 @@ namespace NzbDrone.Core.Indexers.Definitions
         public override string Name => "Redacted";
         public override string[] IndexerUrls => new string[] { "https://redacted.ch/" };
         public override string Description => "REDActed (Aka.PassTheHeadPhones) is one of the most well-known music trackers.";
+        public override string Language => "en-US";
+        public override Encoding Encoding => Encoding.UTF8;
         public override DownloadProtocol Protocol => DownloadProtocol.Torrent;
         public override IndexerPrivacy Privacy => IndexerPrivacy.Private;
         public override IndexerCapabilities Capabilities => SetCapabilities();
@@ -80,26 +82,10 @@ namespace NzbDrone.Core.Indexers.Definitions
             return caps;
         }
 
-        public override async Task<byte[]> Download(Uri link)
+        protected override async Task Test(List<ValidationFailure> failures)
         {
-            var request = new HttpRequestBuilder(link.AbsoluteUri)
-                .SetHeader("Authorization", Settings.Apikey)
-                .Build();
-
-            var downloadBytes = Array.Empty<byte>();
-
-            try
-            {
-                var response = await _httpClient.ExecuteProxiedAsync(request, Definition);
-                downloadBytes = response.ResponseData;
-            }
-            catch (Exception)
-            {
-                _indexerStatusService.RecordFailure(Definition.Id);
-                _logger.Error("Download failed");
-            }
-
-            return downloadBytes;
+            ((RedactedRequestGenerator)GetRequestGenerator()).FetchPasskey();
+            await base.Test(failures);
         }
     }
 
@@ -152,6 +138,24 @@ namespace NzbDrone.Core.Indexers.Definitions
             return pageableRequests;
         }
 
+        public void FetchPasskey()
+        {
+            // GET on index for the passkey
+            var request = RequestBuilder().Resource("ajax.php?action=index").Build();
+            var indexResponse = HttpClient.Execute(request);
+            var index = Json.Deserialize<GazelleAuthResponse>(indexResponse.Content);
+            if (index == null ||
+                string.IsNullOrWhiteSpace(index.Status) ||
+                index.Status != "success" ||
+                string.IsNullOrWhiteSpace(index.Response.Passkey))
+            {
+                throw new Exception("Failed to authenticate with Redacted.");
+            }
+
+            // Set passkey on settings so it can be used to generate the download URL
+            Settings.Passkey = index.Response.Passkey;
+        }
+
         private IEnumerable<IndexerRequest> GetRequest(string searchParameters)
         {
             var req = RequestBuilder()
@@ -307,9 +311,11 @@ namespace NzbDrone.Core.Indexers.Definitions
             // AuthKey is required but not checked, just pass in a dummy variable
             // to avoid having to track authkey, which is randomly cycled
             var url = new HttpUri(_settings.BaseUrl)
-                .CombinePath("/ajax.php")
+                .CombinePath("/torrents.php")
                 .AddQueryParam("action", "download")
                 .AddQueryParam("id", torrentId)
+                .AddQueryParam("authkey", "prowlarr")
+                .AddQueryParam("torrent_pass", _settings.Passkey)
                 .AddQueryParam("usetoken", (_settings.UseFreeleechToken && canUseToken) ? 1 : 0);
 
             return url.FullUri;
@@ -341,6 +347,7 @@ namespace NzbDrone.Core.Indexers.Definitions
         public RedactedSettings()
         {
             Apikey = "";
+            Passkey = "";
             UseFreeleechToken = false;
         }
 
@@ -350,6 +357,8 @@ namespace NzbDrone.Core.Indexers.Definitions
         [FieldDefinition(3, Label = "Use Freeleech Tokens", HelpText = "Use freeleech tokens when available", Type = FieldType.Checkbox)]
         public bool UseFreeleechToken { get; set; }
 
+        public string Passkey { get; set; }
+
         public override NzbDroneValidationResult Validate()
         {
             return new NzbDroneValidationResult(Validator.Validate(this));

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

@@ -1,62 +0,0 @@
-using System;
-using System.Collections.Generic;
-using NLog;
-using NzbDrone.Core.Configuration;
-using NzbDrone.Core.Messaging.Events;
-
-namespace NzbDrone.Core.Indexers.Definitions
-{
-    public class RetroFlix : SpeedAppBase
-    {
-        public override string Name => "RetroFlix";
-
-        public override string[] IndexerUrls => new string[] { "https://retroflix.club/" };
-        public override string[] LegacyUrls => new string[] { "https://retroflix.net/" };
-
-        public override string Description => "Private Torrent Tracker for Classic Movies / TV / General Releases";
-
-        public override IndexerPrivacy Privacy => IndexerPrivacy.Private;
-        public override TimeSpan RateLimit => TimeSpan.FromSeconds(2.1);
-
-        public RetroFlix(IIndexerHttpClient httpClient, IEventAggregator eventAggregator, IIndexerStatusService indexerStatusService, IConfigService configService, Logger logger, IIndexerRepository indexerRepository)
-            : base(httpClient, eventAggregator, indexerStatusService, configService, logger, indexerRepository)
-        {
-        }
-
-        protected override 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(401, NewznabStandardCategory.Movies, "Movies");
-            caps.Categories.AddCategoryMapping(402, NewznabStandardCategory.TV, "TV Series");
-            caps.Categories.AddCategoryMapping(406, NewznabStandardCategory.AudioVideo, "Music Videos");
-            caps.Categories.AddCategoryMapping(407, NewznabStandardCategory.TVSport, "Sports");
-            caps.Categories.AddCategoryMapping(409, NewznabStandardCategory.Books, "Books");
-            caps.Categories.AddCategoryMapping(408, NewznabStandardCategory.Audio, "HQ Audio");
-
-            return caps;
-        }
-    }
-}

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

@@ -194,8 +194,6 @@ namespace NzbDrone.Core.Indexers.Definitions
 
             var request = new IndexerRequest(searchUrl, HttpAccept.Html);
 
-            request.HttpRequest.AllowAutoRedirect = false;
-
             yield return request;
         }
 

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

@@ -1480,8 +1480,6 @@ namespace NzbDrone.Core.Indexers.Definitions
 
             var request = new IndexerRequest(searchUrl, HttpAccept.Html);
 
-            request.HttpRequest.AllowAutoRedirect = false;
-
             yield return request;
         }
 

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

@@ -1,29 +1,187 @@
+using System;
 using System.Collections.Generic;
+using System.Collections.Specialized;
+using System.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Net.Mime;
+using System.Text;
+using System.Threading.Tasks;
+using FluentValidation;
+using Newtonsoft.Json;
 using NLog;
+using NzbDrone.Common.Extensions;
+using NzbDrone.Common.Http;
+using NzbDrone.Core.Annotations;
 using NzbDrone.Core.Configuration;
+using NzbDrone.Core.Exceptions;
+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;
+using NzbDrone.Core.ThingiProvider;
+using NzbDrone.Core.Validation;
 
 namespace NzbDrone.Core.Indexers.Definitions
 {
-    public class SpeedApp : SpeedAppBase
+    public class SpeedApp : TorrentIndexerBase<SpeedAppSettings>
     {
         public override string Name => "SpeedApp.io";
 
-        public override string[] IndexerUrls => new string[] { "https://speedapp.io/" };
-        public override string[] LegacyUrls => new string[] { "https://speedapp.io" };
+        public override string[] IndexerUrls => new string[] { "https://speedapp.io" };
+
+        private string ApiUrl => $"{Settings.BaseUrl}/api";
+
+        private string LoginUrl => $"{ApiUrl}/login";
 
         public override string Description => "SpeedApp is a ROMANIAN Private Torrent Tracker for MOVIES / TV / GENERAL";
 
         public override string Language => "ro-RO";
 
+        public override Encoding Encoding => Encoding.UTF8;
+
+        public override DownloadProtocol Protocol => DownloadProtocol.Torrent;
+
         public override IndexerPrivacy Privacy => IndexerPrivacy.Private;
 
+        public override IndexerCapabilities Capabilities => SetCapabilities();
+
+        private IIndexerRepository _indexerRepository;
+
         public SpeedApp(IIndexerHttpClient httpClient, IEventAggregator eventAggregator, IIndexerStatusService indexerStatusService, IConfigService configService, Logger logger, IIndexerRepository indexerRepository)
-            : base(httpClient, eventAggregator, indexerStatusService, configService, logger, indexerRepository)
+            : base(httpClient, eventAggregator, indexerStatusService, configService, logger)
         {
+            _indexerRepository = indexerRepository;
         }
 
-        protected override IndexerCapabilities SetCapabilities()
+        public override IIndexerRequestGenerator GetRequestGenerator()
+        {
+            return new SpeedAppRequestGenerator(Capabilities, Settings);
+        }
+
+        public override IParseIndexerResponse GetParser()
+        {
+            return new SpeedAppParser(Settings, Capabilities.Categories);
+        }
+
+        protected override bool CheckIfLoginNeeded(HttpResponse httpResponse)
+        {
+            return Settings.ApiKey.IsNullOrWhiteSpace() || httpResponse.StatusCode == HttpStatusCode.Unauthorized;
+        }
+
+        protected override async Task DoLogin()
+        {
+            var requestBuilder = new HttpRequestBuilder(LoginUrl)
+            {
+                LogResponseContent = true,
+                AllowAutoRedirect = true,
+                Method = HttpMethod.Post,
+            };
+
+            var request = requestBuilder.Build();
+
+            var data = new SpeedAppAuthenticationRequest
+            {
+                Email = Settings.Email,
+                Password = Settings.Password
+            };
+
+            request.SetContent(JsonConvert.SerializeObject(data));
+
+            request.Headers.ContentType = MediaTypeNames.Application.Json;
+
+            var response = await ExecuteAuth(request);
+
+            var statusCode = (int)response.StatusCode;
+
+            if (statusCode is < 200 or > 299)
+            {
+                throw new HttpException(response);
+            }
+
+            var parsedResponse = JsonConvert.DeserializeObject<SpeedAppAuthenticationResponse>(response.Content);
+
+            Settings.ApiKey = parsedResponse.Token;
+
+            if (Definition.Id > 0)
+            {
+                _indexerRepository.UpdateSettings((IndexerDefinition)Definition);
+            }
+
+            _logger.Debug("SpeedApp authentication succeeded.");
+        }
+
+        protected override void ModifyRequest(IndexerRequest request)
+        {
+            request.HttpRequest.Headers.Set("Authorization", $"Bearer {Settings.ApiKey}");
+        }
+
+        public override async Task<byte[]> Download(Uri link)
+        {
+            Cookies = GetCookies();
+
+            if (link.Scheme == "magnet")
+            {
+                ValidateMagnet(link.OriginalString);
+                return Encoding.UTF8.GetBytes(link.OriginalString);
+            }
+
+            var requestBuilder = new HttpRequestBuilder(link.AbsoluteUri);
+
+            if (Cookies != null)
+            {
+                requestBuilder.SetCookies(Cookies);
+            }
+
+            var request = requestBuilder.Build();
+            request.AllowAutoRedirect = FollowRedirect;
+            request.Headers.Set("Authorization", $"Bearer {Settings.ApiKey}");
+
+            byte[] torrentData;
+
+            try
+            {
+                var response = await _httpClient.ExecuteProxiedAsync(request, Definition);
+                torrentData = response.ResponseData;
+            }
+            catch (HttpException ex)
+            {
+                if (ex.Response.StatusCode == HttpStatusCode.NotFound)
+                {
+                    _logger.Error(ex, "Downloading torrent file for release failed since it no longer exists ({0})", link.AbsoluteUri);
+                    throw new ReleaseUnavailableException("Downloading torrent failed", ex);
+                }
+
+                if (ex.Response.StatusCode == HttpStatusCode.TooManyRequests)
+                {
+                    _logger.Error("API Grab Limit reached for {0}", link.AbsoluteUri);
+                }
+                else
+                {
+                    _logger.Error(ex, "Downloading torrent file for release failed ({0})", link.AbsoluteUri);
+                }
+
+                throw new ReleaseDownloadException("Downloading torrent failed", ex);
+            }
+            catch (WebException ex)
+            {
+                _logger.Error(ex, "Downloading torrent file for release failed ({0})", link.AbsoluteUri);
+
+                throw new ReleaseDownloadException("Downloading torrent failed", ex);
+            }
+            catch (Exception)
+            {
+                _indexerStatusService.RecordFailure(Definition.Id);
+                _logger.Error("Downloading torrent failed");
+                throw;
+            }
+
+            return torrentData;
+        }
+
+        private IndexerCapabilities SetCapabilities()
         {
             var caps = new IndexerCapabilities
             {
@@ -95,4 +253,356 @@ namespace NzbDrone.Core.Indexers.Definitions
             return caps;
         }
     }
+
+    public class SpeedAppRequestGenerator : IIndexerRequestGenerator
+    {
+        public Func<IDictionary<string, string>> GetCookies { get; set; }
+
+        public Action<IDictionary<string, string>, DateTime?> CookiesUpdater { get; set; }
+
+        private IndexerCapabilities Capabilities { get; }
+
+        private SpeedAppSettings Settings { get; }
+
+        public SpeedAppRequestGenerator(IndexerCapabilities capabilities, SpeedAppSettings settings)
+        {
+            Capabilities = capabilities;
+            Settings = settings;
+        }
+
+        public IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchCriteria)
+        {
+            return GetSearch(searchCriteria, searchCriteria.FullImdbId);
+        }
+
+        public IndexerPageableRequestChain GetSearchRequests(MusicSearchCriteria searchCriteria)
+        {
+            return GetSearch(searchCriteria);
+        }
+
+        public IndexerPageableRequestChain GetSearchRequests(TvSearchCriteria searchCriteria)
+        {
+            return GetSearch(searchCriteria, searchCriteria.FullImdbId, searchCriteria.Season, searchCriteria.Episode);
+        }
+
+        public IndexerPageableRequestChain GetSearchRequests(BookSearchCriteria searchCriteria)
+        {
+            return GetSearch(searchCriteria);
+        }
+
+        public IndexerPageableRequestChain GetSearchRequests(BasicSearchCriteria searchCriteria)
+        {
+            return GetSearch(searchCriteria);
+        }
+
+        private IndexerPageableRequestChain GetSearch(SearchCriteriaBase searchCriteria, string imdbId = null, int? season = null, string episode = null)
+        {
+            var pageableRequests = new IndexerPageableRequestChain();
+
+            pageableRequests.Add(GetPagedRequests($"{searchCriteria.SanitizedSearchTerm}", searchCriteria.Categories, imdbId, season, episode));
+
+            return pageableRequests;
+        }
+
+        private IEnumerable<IndexerRequest> GetPagedRequests(string term, int[] categories, string imdbId = null, int? season = null, string episode = null)
+        {
+            var qc = new NameValueCollection();
+
+            if (imdbId.IsNotNullOrWhiteSpace())
+            {
+                qc.Add("imdbId", imdbId);
+            }
+            else
+            {
+                qc.Add("search", term);
+            }
+
+            if (season != null)
+            {
+                qc.Add("season", season.Value.ToString());
+            }
+
+            if (episode != null)
+            {
+                qc.Add("episode", episode);
+            }
+
+            var cats = Capabilities.Categories.MapTorznabCapsToTrackers(categories);
+
+            if (cats.Count > 0)
+            {
+                foreach (var cat in cats)
+                {
+                    qc.Add("categories[]", cat);
+                }
+            }
+
+            var searchUrl = Settings.BaseUrl + "/api/torrent?" + qc.GetQueryString(duplicateKeysIfMulti: true);
+
+            var request = new IndexerRequest(searchUrl, HttpAccept.Json);
+
+            request.HttpRequest.Headers.Set("Authorization", $"Bearer {Settings.ApiKey}");
+
+            yield return request;
+        }
+    }
+
+    public class SpeedAppParser : IParseIndexerResponse
+    {
+        private readonly SpeedAppSettings _settings;
+        private readonly IndexerCapabilitiesCategories _categories;
+
+        public Action<IDictionary<string, string>, DateTime?> CookiesUpdater { get; set; }
+
+        public SpeedAppParser(SpeedAppSettings settings, IndexerCapabilitiesCategories categories)
+        {
+            _settings = settings;
+            _categories = categories;
+        }
+
+        public IList<ReleaseInfo> ParseResponse(IndexerResponse indexerResponse)
+        {
+            if (indexerResponse.HttpResponse.StatusCode != HttpStatusCode.OK)
+            {
+                throw new IndexerException(indexerResponse, $"Unexpected response status {indexerResponse.HttpResponse.StatusCode} code from API request");
+            }
+
+            if (!indexerResponse.HttpResponse.Headers.ContentType.Contains(HttpAccept.Json.Value))
+            {
+                throw new IndexerException(indexerResponse, $"Unexpected response header {indexerResponse.HttpResponse.Headers.ContentType} from API request, expected {HttpAccept.Json.Value}");
+            }
+
+            var jsonResponse = new HttpResponse<List<SpeedAppTorrent>>(indexerResponse.HttpResponse);
+
+            return jsonResponse.Resource.Select(torrent => new TorrentInfo
+            {
+                Guid = torrent.Id.ToString(),
+                Title = torrent.Name,
+                Description = torrent.ShortDescription,
+                Size = torrent.Size,
+                ImdbId = ParseUtil.GetImdbID(torrent.ImdbId).GetValueOrDefault(),
+                DownloadUrl = $"{_settings.BaseUrl}/api/torrent/{torrent.Id}/download",
+                PosterUrl = torrent.Poster,
+                InfoUrl = torrent.Url,
+                Grabs = torrent.TimesCompleted,
+                PublishDate = torrent.CreatedAt,
+                Categories = _categories.MapTrackerCatToNewznab(torrent.Category.Id.ToString()),
+                InfoHash = null,
+                Seeders = torrent.Seeders,
+                Peers = torrent.Leechers + torrent.Seeders,
+                MinimumRatio = 1,
+                MinimumSeedTime = 172800,
+                DownloadVolumeFactor = torrent.DownloadVolumeFactor,
+                UploadVolumeFactor = torrent.UploadVolumeFactor,
+            }).ToArray();
+        }
+    }
+
+    public class SpeedAppSettingsValidator : AbstractValidator<SpeedAppSettings>
+    {
+        public SpeedAppSettingsValidator()
+        {
+            RuleFor(c => c.Email).NotEmpty();
+            RuleFor(c => c.Password).NotEmpty();
+        }
+    }
+
+    public class SpeedAppSettings : NoAuthTorrentBaseSettings
+    {
+        private static readonly SpeedAppSettingsValidator Validator = new ();
+
+        public SpeedAppSettings()
+        {
+            Email = "";
+            Password = "";
+        }
+
+        [FieldDefinition(2, Label = "Email", HelpText = "Site Email", Privacy = PrivacyLevel.UserName)]
+        public string Email { get; set; }
+
+        [FieldDefinition(3, Label = "Password", HelpText = "Site Password", Privacy = PrivacyLevel.Password, Type = FieldType.Password)]
+        public string Password { get; set; }
+
+        [FieldDefinition(4, Label = "API Key", Hidden = HiddenType.Hidden)]
+        public string ApiKey { get; set; }
+
+        public override NzbDroneValidationResult Validate()
+        {
+            return new NzbDroneValidationResult(Validator.Validate(this));
+        }
+    }
+
+    public class SpeedAppCategory
+    {
+        [JsonProperty("id")]
+        public int Id { get; set; }
+
+        [JsonProperty("name")]
+        public string Name { get; set; }
+    }
+
+    public class SpeedAppCountry
+    {
+        [JsonProperty("id")]
+        public int Id { get; set; }
+
+        [JsonProperty("name")]
+        public string Name { get; set; }
+
+        [JsonProperty("flag_image")]
+        public string FlagImage { get; set; }
+    }
+
+    public class SpeedAppUploadedBy
+    {
+        [JsonProperty("id")]
+        public int Id { get; set; }
+
+        [JsonProperty("username")]
+        public string Username { get; set; }
+
+        [JsonProperty("email")]
+        public string Email { get; set; }
+
+        [JsonProperty("created_at")]
+        public DateTime CreatedAt { get; set; }
+
+        [JsonProperty("class")]
+        public int Class { get; set; }
+
+        [JsonProperty("avatar")]
+        public string Avatar { get; set; }
+
+        [JsonProperty("uploaded")]
+        public int Uploaded { get; set; }
+
+        [JsonProperty("downloaded")]
+        public int Downloaded { get; set; }
+
+        [JsonProperty("title")]
+        public string Title { get; set; }
+
+        [JsonProperty("country")]
+        public SpeedAppCountry Country { get; set; }
+
+        [JsonProperty("passkey")]
+        public string Passkey { get; set; }
+
+        [JsonProperty("invites")]
+        public int Invites { get; set; }
+
+        [JsonProperty("timezone")]
+        public string Timezone { get; set; }
+
+        [JsonProperty("hit_and_run_count")]
+        public int HitAndRunCount { get; set; }
+
+        [JsonProperty("snatch_count")]
+        public int SnatchCount { get; set; }
+
+        [JsonProperty("need_seed")]
+        public int NeedSeed { get; set; }
+
+        [JsonProperty("average_seed_time")]
+        public int AverageSeedTime { get; set; }
+
+        [JsonProperty("free_leech_tokens")]
+        public int FreeLeechTokens { get; set; }
+
+        [JsonProperty("double_upload_tokens")]
+        public int DoubleUploadTokens { get; set; }
+    }
+
+    public class SpeedAppTag
+    {
+        [JsonProperty("translated_name")]
+        public string TranslatedName { get; set; }
+
+        [JsonProperty("id")]
+        public int Id { get; set; }
+
+        [JsonProperty("name")]
+        public string Name { get; set; }
+
+        [JsonProperty("match_list")]
+        public List<string> MatchList { get; set; }
+
+        [JsonProperty("created_at")]
+        public DateTime CreatedAt { get; set; }
+    }
+
+    public class SpeedAppTorrent
+    {
+        [JsonProperty("download_volume_factor")]
+        public float DownloadVolumeFactor { get; set; }
+
+        [JsonProperty("upload_volume_factor")]
+        public float UploadVolumeFactor { get; set; }
+
+        [JsonProperty("url")]
+        public string Url { get; set; }
+
+        [JsonProperty("id")]
+        public int Id { get; set; }
+
+        [JsonProperty("name")]
+        public string Name { get; set; }
+
+        [JsonProperty("description")]
+        public string Description { get; set; }
+
+        [JsonProperty("category")]
+        public SpeedAppCategory Category { get; set; }
+
+        [JsonProperty("size")]
+        public long Size { get; set; }
+
+        [JsonProperty("created_at")]
+        public DateTime CreatedAt { get; set; }
+
+        [JsonProperty("times_completed")]
+        public int TimesCompleted { get; set; }
+
+        [JsonProperty("leechers")]
+        public int Leechers { get; set; }
+
+        [JsonProperty("seeders")]
+        public int Seeders { get; set; }
+
+        [JsonProperty("uploaded_by")]
+        public SpeedAppUploadedBy UploadedBy { get; set; }
+
+        [JsonProperty("short_description")]
+        public string ShortDescription { get; set; }
+
+        [JsonProperty("poster")]
+        public string Poster { get; set; }
+
+        [JsonProperty("season")]
+        public int Season { get; set; }
+
+        [JsonProperty("episode")]
+        public int Episode { get; set; }
+
+        [JsonProperty("tags")]
+        public List<SpeedAppTag> Tags { get; set; }
+
+        [JsonProperty("imdb_id")]
+        public string ImdbId { get; set; }
+    }
+
+    public class SpeedAppAuthenticationRequest
+    {
+        [JsonProperty("username")]
+        public string Email { get; set; }
+
+        [JsonProperty("password")]
+        public string Password { get; set; }
+    }
+
+    public class SpeedAppAuthenticationResponse
+    {
+        [JsonProperty("token")]
+        public string Token { get; set; }
+    }
 }

src/NzbDrone.Core/Indexers/Definitions/SpeedApp/SpeedAppBase.cs

@@ -1,531 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Collections.Specialized;
-using System.Linq;
-using System.Net;
-using System.Net.Http;
-using System.Net.Mime;
-using System.Text;
-using System.Threading.Tasks;
-using FluentValidation;
-using Newtonsoft.Json;
-using NLog;
-using NzbDrone.Common.Extensions;
-using NzbDrone.Common.Http;
-using NzbDrone.Core.Annotations;
-using NzbDrone.Core.Configuration;
-using NzbDrone.Core.Exceptions;
-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;
-using NzbDrone.Core.ThingiProvider;
-using NzbDrone.Core.Validation;
-
-namespace NzbDrone.Core.Indexers.Definitions
-{
-    public abstract class SpeedAppBase : TorrentIndexerBase<SpeedAppSettings>
-    {
-        private string LoginUrl => Settings.BaseUrl + "api/login";
-
-        public override Encoding Encoding => Encoding.UTF8;
-
-        public override DownloadProtocol Protocol => DownloadProtocol.Torrent;
-
-        public override IndexerCapabilities Capabilities => SetCapabilities();
-
-        private IIndexerRepository _indexerRepository;
-
-        public SpeedAppBase(IIndexerHttpClient httpClient, IEventAggregator eventAggregator, IIndexerStatusService indexerStatusService, IConfigService configService, Logger logger, IIndexerRepository indexerRepository)
-            : base(httpClient, eventAggregator, indexerStatusService, configService, logger)
-        {
-            _indexerRepository = indexerRepository;
-        }
-
-        public override IIndexerRequestGenerator GetRequestGenerator()
-        {
-            return new SpeedAppRequestGenerator(Capabilities, Settings);
-        }
-
-        public override IParseIndexerResponse GetParser()
-        {
-            return new SpeedAppParser(Settings, Capabilities.Categories);
-        }
-
-        protected override bool CheckIfLoginNeeded(HttpResponse httpResponse)
-        {
-            return Settings.ApiKey.IsNullOrWhiteSpace() || httpResponse.StatusCode == HttpStatusCode.Unauthorized;
-        }
-
-        protected override async Task DoLogin()
-        {
-            var requestBuilder = new HttpRequestBuilder(LoginUrl)
-            {
-                LogResponseContent = true,
-                AllowAutoRedirect = true,
-                Method = HttpMethod.Post,
-            };
-
-            var request = requestBuilder.Build();
-
-            var data = new SpeedAppAuthenticationRequest
-            {
-                Email = Settings.Email,
-                Password = Settings.Password
-            };
-
-            request.SetContent(JsonConvert.SerializeObject(data));
-
-            request.Headers.ContentType = MediaTypeNames.Application.Json;
-
-            var response = await ExecuteAuth(request);
-
-            var statusCode = (int)response.StatusCode;
-
-            if (statusCode is < 200 or > 299)
-            {
-                throw new HttpException(response);
-            }
-
-            var parsedResponse = JsonConvert.DeserializeObject<SpeedAppAuthenticationResponse>(response.Content);
-
-            Settings.ApiKey = parsedResponse.Token;
-
-            if (Definition.Id > 0)
-            {
-                _indexerRepository.UpdateSettings((IndexerDefinition)Definition);
-            }
-
-            _logger.Debug("SpeedApp authentication succeeded.");
-        }
-
-        protected override void ModifyRequest(IndexerRequest request)
-        {
-            request.HttpRequest.Headers.Set("Authorization", $"Bearer {Settings.ApiKey}");
-        }
-
-        public override async Task<byte[]> Download(Uri link)
-        {
-            Cookies = GetCookies();
-
-            if (link.Scheme == "magnet")
-            {
-                ValidateMagnet(link.OriginalString);
-                return Encoding.UTF8.GetBytes(link.OriginalString);
-            }
-
-            var requestBuilder = new HttpRequestBuilder(link.AbsoluteUri);
-
-            if (Cookies != null)
-            {
-                requestBuilder.SetCookies(Cookies);
-            }
-
-            var request = requestBuilder.Build();
-            request.AllowAutoRedirect = FollowRedirect;
-            request.Headers.Set("Authorization", $"Bearer {Settings.ApiKey}");
-
-            byte[] torrentData;
-
-            try
-            {
-                var response = await _httpClient.ExecuteProxiedAsync(request, Definition);
-                torrentData = response.ResponseData;
-            }
-            catch (HttpException ex)
-            {
-                if (ex.Response.StatusCode == HttpStatusCode.NotFound)
-                {
-                    _logger.Error(ex, "Downloading torrent file for release failed since it no longer exists ({0})", link.AbsoluteUri);
-                    throw new ReleaseUnavailableException("Downloading torrent failed", ex);
-                }
-
-                if (ex.Response.StatusCode == HttpStatusCode.TooManyRequests)
-                {
-                    _logger.Error("API Grab Limit reached for {0}", link.AbsoluteUri);
-                }
-                else
-                {
-                    _logger.Error(ex, "Downloading torrent file for release failed ({0})", link.AbsoluteUri);
-                }
-
-                throw new ReleaseDownloadException("Downloading torrent failed", ex);
-            }
-            catch (WebException ex)
-            {
-                _logger.Error(ex, "Downloading torrent file for release failed ({0})", link.AbsoluteUri);
-
-                throw new ReleaseDownloadException("Downloading torrent failed", ex);
-            }
-            catch (Exception)
-            {
-                _indexerStatusService.RecordFailure(Definition.Id);
-                _logger.Error("Downloading torrent failed");
-                throw;
-            }
-
-            return torrentData;
-        }
-
-        protected virtual IndexerCapabilities SetCapabilities()
-        {
-            var caps = new IndexerCapabilities();
-
-            return caps;
-        }
-    }
-
-    public class SpeedAppRequestGenerator : IIndexerRequestGenerator
-    {
-        public Func<IDictionary<string, string>> GetCookies { get; set; }
-
-        public Action<IDictionary<string, string>, DateTime?> CookiesUpdater { get; set; }
-
-        private IndexerCapabilities Capabilities { get; }
-
-        private SpeedAppSettings Settings { get; }
-
-        public SpeedAppRequestGenerator(IndexerCapabilities capabilities, SpeedAppSettings settings)
-        {
-            Capabilities = capabilities;
-            Settings = settings;
-        }
-
-        public IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchCriteria)
-        {
-            return GetSearch(searchCriteria, searchCriteria.FullImdbId);
-        }
-
-        public IndexerPageableRequestChain GetSearchRequests(MusicSearchCriteria searchCriteria)
-        {
-            return GetSearch(searchCriteria);
-        }
-
-        public IndexerPageableRequestChain GetSearchRequests(TvSearchCriteria searchCriteria)
-        {
-            return GetSearch(searchCriteria, searchCriteria.FullImdbId, searchCriteria.Season, searchCriteria.Episode);
-        }
-
-        public IndexerPageableRequestChain GetSearchRequests(BookSearchCriteria searchCriteria)
-        {
-            return GetSearch(searchCriteria);
-        }
-
-        public IndexerPageableRequestChain GetSearchRequests(BasicSearchCriteria searchCriteria)
-        {
-            return GetSearch(searchCriteria);
-        }
-
-        private IndexerPageableRequestChain GetSearch(SearchCriteriaBase searchCriteria, string imdbId = null, int? season = null, string episode = null)
-        {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            pageableRequests.Add(GetPagedRequests($"{searchCriteria.SanitizedSearchTerm}", searchCriteria.Categories, imdbId, season, episode));
-
-            return pageableRequests;
-        }
-
-        private IEnumerable<IndexerRequest> GetPagedRequests(string term, int[] categories, string imdbId = null, int? season = null, string episode = null)
-        {
-            var qc = new NameValueCollection();
-
-            if (imdbId.IsNotNullOrWhiteSpace())
-            {
-                qc.Add("imdbId", imdbId);
-            }
-            else
-            {
-                qc.Add("search", term);
-            }
-
-            if (season != null)
-            {
-                qc.Add("season", season.Value.ToString());
-            }
-
-            if (episode != null)
-            {
-                qc.Add("episode", episode);
-            }
-
-            var cats = Capabilities.Categories.MapTorznabCapsToTrackers(categories);
-
-            if (cats.Count > 0)
-            {
-                foreach (var cat in cats)
-                {
-                    qc.Add("categories[]", cat);
-                }
-            }
-
-            var searchUrl = Settings.BaseUrl + "api/torrent?" + qc.GetQueryString(duplicateKeysIfMulti: true);
-
-            var request = new IndexerRequest(searchUrl, HttpAccept.Json);
-
-            request.HttpRequest.Headers.Set("Authorization", $"Bearer {Settings.ApiKey}");
-
-            yield return request;
-        }
-    }
-
-    public class SpeedAppParser : IParseIndexerResponse
-    {
-        private readonly SpeedAppSettings _settings;
-        private readonly IndexerCapabilitiesCategories _categories;
-
-        public Action<IDictionary<string, string>, DateTime?> CookiesUpdater { get; set; }
-
-        public SpeedAppParser(SpeedAppSettings settings, IndexerCapabilitiesCategories categories)
-        {
-            _settings = settings;
-            _categories = categories;
-        }
-
-        public IList<ReleaseInfo> ParseResponse(IndexerResponse indexerResponse)
-        {
-            if (indexerResponse.HttpResponse.StatusCode != HttpStatusCode.OK)
-            {
-                throw new IndexerException(indexerResponse, $"Unexpected response status {indexerResponse.HttpResponse.StatusCode} code from API request");
-            }
-
-            if (!indexerResponse.HttpResponse.Headers.ContentType.Contains(HttpAccept.Json.Value))
-            {
-                throw new IndexerException(indexerResponse, $"Unexpected response header {indexerResponse.HttpResponse.Headers.ContentType} from API request, expected {HttpAccept.Json.Value}");
-            }
-
-            var jsonResponse = new HttpResponse<List<SpeedAppTorrent>>(indexerResponse.HttpResponse);
-
-            return jsonResponse.Resource.Select(torrent => new TorrentInfo
-            {
-                Guid = torrent.Id.ToString(),
-                Title = torrent.Name,
-                Description = torrent.ShortDescription,
-                Size = torrent.Size,
-                ImdbId = ParseUtil.GetImdbID(torrent.ImdbId).GetValueOrDefault(),
-                DownloadUrl = $"{_settings.BaseUrl}/api/torrent/{torrent.Id}/download",
-                PosterUrl = torrent.Poster,
-                InfoUrl = torrent.Url,
-                Grabs = torrent.TimesCompleted,
-                PublishDate = torrent.CreatedAt,
-                Categories = _categories.MapTrackerCatToNewznab(torrent.Category.Id.ToString()),
-                InfoHash = null,
-                Seeders = torrent.Seeders,
-                Peers = torrent.Leechers + torrent.Seeders,
-                MinimumRatio = 1,
-                MinimumSeedTime = 172800,
-                DownloadVolumeFactor = torrent.DownloadVolumeFactor,
-                UploadVolumeFactor = torrent.UploadVolumeFactor,
-            }).ToArray();
-        }
-    }
-
-    public class SpeedAppSettingsValidator : AbstractValidator<SpeedAppSettings>
-    {
-        public SpeedAppSettingsValidator()
-        {
-            RuleFor(c => c.Email).NotEmpty();
-            RuleFor(c => c.Password).NotEmpty();
-        }
-    }
-
-    public class SpeedAppSettings : NoAuthTorrentBaseSettings
-    {
-        private static readonly SpeedAppSettingsValidator Validator = new ();
-
-        public SpeedAppSettings()
-        {
-            Email = "";
-            Password = "";
-        }
-
-        [FieldDefinition(2, Label = "Email", HelpText = "Site Email", Privacy = PrivacyLevel.UserName)]
-        public string Email { get; set; }
-
-        [FieldDefinition(3, Label = "Password", HelpText = "Site Password", Privacy = PrivacyLevel.Password, Type = FieldType.Password)]
-        public string Password { get; set; }
-
-        [FieldDefinition(4, Label = "API Key", Hidden = HiddenType.Hidden)]
-        public string ApiKey { get; set; }
-
-        public override NzbDroneValidationResult Validate()
-        {
-            return new NzbDroneValidationResult(Validator.Validate(this));
-        }
-    }
-
-    public class SpeedAppCategory
-    {
-        [JsonProperty("id")]
-        public int Id { get; set; }
-
-        [JsonProperty("name")]
-        public string Name { get; set; }
-    }
-
-    public class SpeedAppCountry
-    {
-        [JsonProperty("id")]
-        public int Id { get; set; }
-
-        [JsonProperty("name")]
-        public string Name { get; set; }
-
-        [JsonProperty("flag_image")]
-        public string FlagImage { get; set; }
-    }
-
-    public class SpeedAppUploadedBy
-    {
-        [JsonProperty("id")]
-        public int Id { get; set; }
-
-        [JsonProperty("username")]
-        public string Username { get; set; }
-
-        [JsonProperty("email")]
-        public string Email { get; set; }
-
-        [JsonProperty("created_at")]
-        public DateTime CreatedAt { get; set; }
-
-        [JsonProperty("class")]
-        public int Class { get; set; }
-
-        [JsonProperty("avatar")]
-        public string Avatar { get; set; }
-
-        [JsonProperty("uploaded")]
-        public int Uploaded { get; set; }
-
-        [JsonProperty("downloaded")]
-        public int Downloaded { get; set; }
-
-        [JsonProperty("title")]
-        public string Title { get; set; }
-
-        [JsonProperty("country")]
-        public SpeedAppCountry Country { get; set; }
-
-        [JsonProperty("passkey")]
-        public string Passkey { get; set; }
-
-        [JsonProperty("invites")]
-        public int Invites { get; set; }
-
-        [JsonProperty("timezone")]
-        public string Timezone { get; set; }
-
-        [JsonProperty("hit_and_run_count")]
-        public int HitAndRunCount { get; set; }
-
-        [JsonProperty("snatch_count")]
-        public int SnatchCount { get; set; }
-
-        [JsonProperty("need_seed")]
-        public int NeedSeed { get; set; }
-
-        [JsonProperty("average_seed_time")]
-        public int AverageSeedTime { get; set; }
-
-        [JsonProperty("free_leech_tokens")]
-        public int FreeLeechTokens { get; set; }
-
-        [JsonProperty("double_upload_tokens")]
-        public int DoubleUploadTokens { get; set; }
-    }
-
-    public class SpeedAppTag
-    {
-        [JsonProperty("translated_name")]
-        public string TranslatedName { get; set; }
-
-        [JsonProperty("id")]
-        public int Id { get; set; }
-
-        [JsonProperty("name")]
-        public string Name { get; set; }
-
-        [JsonProperty("match_list")]
-        public List<string> MatchList { get; set; }
-
-        [JsonProperty("created_at")]
-        public DateTime CreatedAt { get; set; }
-    }
-
-    public class SpeedAppTorrent
-    {
-        [JsonProperty("download_volume_factor")]
-        public float DownloadVolumeFactor { get; set; }
-
-        [JsonProperty("upload_volume_factor")]
-        public float UploadVolumeFactor { get; set; }
-
-        [JsonProperty("url")]
-        public string Url { get; set; }
-
-        [JsonProperty("id")]
-        public int Id { get; set; }
-
-        [JsonProperty("name")]
-        public string Name { get; set; }
-
-        [JsonProperty("description")]
-        public string Description { get; set; }
-
-        [JsonProperty("category")]
-        public SpeedAppCategory Category { get; set; }
-
-        [JsonProperty("size")]
-        public long Size { get; set; }
-
-        [JsonProperty("created_at")]
-        public DateTime CreatedAt { get; set; }
-
-        [JsonProperty("times_completed")]
-        public int TimesCompleted { get; set; }
-
-        [JsonProperty("leechers")]
-        public int Leechers { get; set; }
-
-        [JsonProperty("seeders")]
-        public int Seeders { get; set; }
-
-        [JsonProperty("uploaded_by")]
-        public SpeedAppUploadedBy UploadedBy { get; set; }
-
-        [JsonProperty("short_description")]
-        public string ShortDescription { get; set; }
-
-        [JsonProperty("poster")]
-        public string Poster { get; set; }
-
-        [JsonProperty("season")]
-        public int Season { get; set; }
-
-        [JsonProperty("episode")]
-        public int Episode { get; set; }
-
-        [JsonProperty("tags")]
-        public List<SpeedAppTag> Tags { get; set; }
-
-        [JsonProperty("imdb_id")]
-        public string ImdbId { get; set; }
-    }
-
-    public class SpeedAppAuthenticationRequest
-    {
-        [JsonProperty("username")]
-        public string Email { get; set; }
-
-        [JsonProperty("password")]
-        public string Password { get; set; }
-    }
-
-    public class SpeedAppAuthenticationResponse
-    {
-        [JsonProperty("token")]
-        public string Token { get; set; }
-    }
-}

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

@@ -89,6 +89,7 @@ namespace NzbDrone.Core.Indexers.Torznab
             get
             {
                 yield return GetDefinition("AnimeTosho", GetSettings("https://feed.animetosho.org"));
+                yield return GetDefinition("HD4Free.xyz", GetSettings("http://hd4free.xyz"));
                 yield return GetDefinition("Generic Torznab", GetSettings(""));
             }
         }

src/NzbDrone.Core/Indexers/HttpIndexerBase.cs

@@ -210,7 +210,7 @@ namespace NzbDrone.Core.Indexers
                 }
 
                 if (webException.Message.Contains("502") || webException.Message.Contains("503") ||
-                    webException.Message.Contains("504") || webException.Message.Contains("timed out"))
+                    webException.Message.Contains("timed out"))
                 {
                     _logger.Warn("{0} server is currently unavailable. {1} {2}", this, url, webException.Message);
                 }
@@ -223,10 +223,16 @@ namespace NzbDrone.Core.Indexers
             {
                 result.Queries.Add(new IndexerQueryResult { Response = ex.Response });
 
-                var retryTime = ex.RetryAfter != TimeSpan.Zero ? ex.RetryAfter : TimeSpan.FromHours(1);
+                if (ex.RetryAfter != TimeSpan.Zero)
+                {
+                    _indexerStatusService.RecordFailure(Definition.Id, ex.RetryAfter);
+                }
+                else
+                {
+                    _indexerStatusService.RecordFailure(Definition.Id, TimeSpan.FromHours(1));
+                }
 
-                _indexerStatusService.RecordFailure(Definition.Id, retryTime);
-                _logger.Warn("Request Limit reached for {0}. Disabled for {1}", this, retryTime);
+                _logger.Warn("Request Limit reached for {0}", this);
             }
             catch (HttpException ex)
             {
@@ -349,6 +355,8 @@ namespace NzbDrone.Core.Indexers
                 request.HttpRequest.LogResponseContent = true;
             }
 
+            request.HttpRequest.AllowAutoRedirect = FollowRedirect;
+
             var originalUrl = request.Url;
 
             Cookies = GetCookies();

src/NzbDrone.Core/Indexers/IndexerTorrentBaseSettings.cs

@@ -41,7 +41,7 @@ namespace NzbDrone.Core.Indexers
         [FieldDefinition(1, Type = FieldType.Textbox, Label = "Seed Ratio", HelpText = "The ratio a torrent should reach before stopping, empty is app's default", Advanced = true)]
         public double? SeedRatio { get; set; }
 
-        [FieldDefinition(2, Type = FieldType.Number, Label = "Seed Time", HelpText = "The time a torrent should be seeded before stopping, empty is app's default", Unit = "minutes", Advanced = true)]
+        [FieldDefinition(2, Type = FieldType.Number, Label = "Seed Time", HelpText = "The time a torrent should be seeded before stopping, empty is app's default", Advanced = true)]
         public int? SeedTime { get; set; }
     }
 }

src/NzbDrone.Core/Localization/Core/ar.json

@@ -331,12 +331,5 @@
     "UnableToLoadIndexers": "تعذر تحميل المفهرسات",
     "Yes": "نعم",
     "GrabReleases": "انتزاع الإصدار",
-    "No": "لا",
-    "Ended": "انتهى",
-    "LastDuration": "المدة الماضية",
-    "ApplicationLongTermStatusCheckAllClientMessage": "جميع المفهرسات غير متوفرة بسبب الفشل لأكثر من 6 ساعات",
-    "ApplicationLongTermStatusCheckSingleClientMessage": "المفهرسات غير متاحة بسبب الإخفاقات لأكثر من 6 ساعات: {0}",
-    "LastExecution": "آخر تنفيذ",
-    "NextExecution": "التنفيذ القادم",
-    "Queued": "في قائمة الانتظار"
+    "No": "لا"
 }

src/NzbDrone.Core/Localization/Core/bg.json

@@ -331,12 +331,5 @@
     "UnableToLoadIndexers": "Индексаторите не могат да се заредят",
     "Yes": "Да",
     "ConnectionLostMessage": "Whisparr е загубил връзката си с бекенда и ще трябва да се презареди, за да възстанови функционалността.",
-    "MappedDrivesRunningAsService": "Картографираните мрежови устройства не са налични, когато се изпълняват като услуга на Windows. Моля, вижте често задаваните въпроси за повече информация",
-    "ApplicationLongTermStatusCheckSingleClientMessage": "Индексатори не са налични поради неуспехи за повече от 6 часа: {0}",
-    "Ended": "Приключи",
-    "LastExecution": "Последно изпълнение",
-    "ApplicationLongTermStatusCheckAllClientMessage": "Всички индексатори са недостъпни поради грешки за повече от 6 часа",
-    "LastDuration": "lastDuration",
-    "NextExecution": "Следващо изпълнение",
-    "Queued": "На опашка"
+    "MappedDrivesRunningAsService": "Картографираните мрежови устройства не са налични, когато се изпълняват като услуга на Windows. Моля, вижте често задаваните въпроси за повече информация"
 }

src/NzbDrone.Core/Localization/Core/ca.json

@@ -305,49 +305,5 @@
     "URLBase": "Base URL",
     "Usenet": "Usenet",
     "View": "Visualitza",
-    "Yesterday": "Ahir",
-    "ApplicationStatusCheckSingleClientMessage": "Llistes no disponibles a causa d'errors: {0}",
-    "AnalyticsEnabledHelpText": "Envieu informació anònima d'ús i errors als servidors de Radarr. Això inclou informació sobre el vostre navegador, quines pàgines Radarr WebUI feu servir, informes d'errors, així com el sistema operatiu i la versió del temps d'execució. Utilitzarem aquesta informació per prioritzar les funcions i les correccions d'errors.",
-    "ApplyTagsHelpTexts1": "Com aplicar etiquetes a les pel·lícules seleccionades",
-    "ApplyTagsHelpTexts2": "Afegeix: afegeix les etiquetes a la llista d'etiquetes existent",
-    "ConnectionLostAutomaticMessage": "Radarr intentarà connectar-se automàticament, o podeu fer clic a recarregar.",
-    "ConnectionLostMessage": "Radarr ha perdut la connexió amb el backend i s'haurà de tornar a carregar per restaurar la funcionalitat.",
-    "HistoryCleanupDaysHelpTextWarning": "Els fitxers de la paperera de reciclatge més antics que el nombre de dies seleccionat es netejaran automàticament",
-    "UnableToAddANewAppProfilePleaseTryAgain": "No es pot afegir un perfil de qualitat nou, torneu-ho a provar.",
-    "BackupFolderHelpText": "Els camins relatius estaran sota el directori AppData del Lidarr",
-    "AllIndexersHiddenDueToFilter": "Totes les pel·lícules estan ocultes a causa del filtre aplicat.",
-    "EnableRss": "Activa RSS",
-    "Grabs": "Captura",
-    "EnableAutomaticSearchHelpText": "S'utilitzarà quan es realitzin cerques automàtiques mitjançant la interfície d'usuari o per Radarr",
-    "UnableToAddANewApplicationPleaseTryAgain": "No es pot afegir una notificació nova, torneu-ho a provar.",
-    "Application": "Aplicacions",
-    "Applications": "Aplicacions",
-    "ApplicationStatusCheckAllClientMessage": "Totes les llistes no estan disponibles a causa d'errors",
-    "AuthenticationMethodHelpText": "Requereix nom d'usuari i contrasenya per accedir al radar",
-    "ApplicationLongTermStatusCheckAllClientMessage": "Tots els indexadors no estan disponibles a causa d'errors durant més de 6 hores",
-    "ApplicationLongTermStatusCheckSingleClientMessage": "Els indexadors no estan disponibles a causa d'errors durant més de 6 hores: {0}",
-    "BindAddressHelpText": "Adreça IPv4 vàlida o '*' per a totes les interfícies",
-    "BranchUpdate": "Branca que s'utilitza per actualitzar Radarr",
-    "Connect": "Notificacions",
-    "DeleteApplicationMessageText": "Esteu segur que voleu suprimir la notificació '{0}'?",
-    "DeleteIndexerProxyMessageText": "Esteu segur que voleu suprimir la llista '{0}'?",
-    "Encoding": "Codificació",
-    "ForMoreInformationOnTheIndividualDownloadClients": "Per obtenir més informació sobre els clients de baixada individuals, feu clic als botons de més informació.",
-    "GeneralSettingsSummary": "Port, SSL, nom d'usuari/contrasenya, servidor intermediari, analítiques i actualitzacions",
-    "GrabReleases": "Captura novetat",
-    "HistoryCleanupDaysHelpText": "Establiu a 0 per desactivar la neteja automàtica",
-    "Notification": "Notificacions",
-    "Notifications": "Notificacions",
-    "PrioritySettings": "Prioritat",
-    "ReleaseBranchCheckOfficialBranchMessage": "La branca {0} no és una branca de llançament de Radarr vàlida, no rebreu actualitzacions",
-    "TagsHelpText": "S'aplica a pel·lícules amb almenys una etiqueta coincident",
-    "Torrent": "Torrent",
-    "UnableToAddANewIndexerProxyPleaseTryAgain": "No es pot afegir un indexador nou, torneu-ho a provar.",
-    "UpdateMechanismHelpText": "Utilitzeu l'actualitzador integrat de Prowlarr o un script",
-    "UserAgentProvidedByTheAppThatCalledTheAPI": "Agent d'usuari proporcionat per l'aplicació per fer peticions a l'API",
-    "IndexerProxyStatusCheckAllClientMessage": "Tots els indexadors no estan disponibles a causa d'errors",
-    "IndexerProxyStatusCheckSingleClientMessage": "Els indexadors no estan disponibles a causa d'errors: {0}",
-    "LaunchBrowserHelpText": " Obriu un navegador web i navegueu a la pàgina d'inici de Radarr a l'inici de l'aplicació.",
-    "Link": "Enllaços",
-    "UILanguageHelpText": "Idioma que utilitzarà Radarr per a la interfície d'usuari"
+    "Yesterday": "Ahir"
 }

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

@@ -17,7 +17,7 @@
     "Settings": "Nastavení",
     "StartTypingOrSelectAPathBelow": "Začněte psát nebo vyberte cestu níže",
     "Usenet": "Usenet",
-    "AddDownloadClient": "Přidat klienta pro stahování",
+    "AddDownloadClient": "Přidat staženého klienta",
     "Backups": "Zálohy",
     "CancelPendingTask": "Opravdu chcete zrušit tento nevyřízený úkol?",
     "MovieIndexScrollBottom": "Rejstřík filmů: Posun dolů",
@@ -116,7 +116,7 @@
     "System": "Systém",
     "Enabled": "Povoleno",
     "IgnoredAddresses": "Ignorované adresy",
-    "AcceptConfirmationModal": "Přijměte potvrzovací modální okno",
+    "AcceptConfirmationModal": "Přijměte potvrzení Modal",
     "Actions": "Akce",
     "Added": "Přidané",
     "AddIndexer": "Přidat indexátor",
@@ -331,12 +331,5 @@
     "No": "Ne",
     "UnableToLoadIndexers": "Nelze načíst indexery",
     "Yes": "Ano",
-    "GrabReleases": "Uchopte uvolnění",
-    "ApplicationLongTermStatusCheckSingleClientMessage": "Indexery nedostupné z důvodu selhání po dobu delší než 6 hodin: {0}",
-    "ApplicationLongTermStatusCheckAllClientMessage": "Všechny indexery nejsou k dispozici z důvodu selhání po dobu delší než 6 hodin",
-    "Ended": "Skončil",
-    "LastDuration": "lastDuration",
-    "LastExecution": "Poslední poprava",
-    "NextExecution": "Další spuštění",
-    "Queued": "Ve frontě"
+    "GrabReleases": "Uchopte uvolnění"
 }

src/NzbDrone.Core/Localization/Core/da.json

@@ -334,12 +334,5 @@
     "No": "Ingen",
     "NetCore": ".NET Core",
     "UnableToLoadIndexers": "Kan ikke indlæse indeksatorer",
-    "Yes": "Ja",
-    "ApplicationLongTermStatusCheckSingleClientMessage": "Indeksatorer er ikke tilgængelige på grund af fejl i mere end 6 timer: {0}",
-    "ApplicationLongTermStatusCheckAllClientMessage": "Alle indeksatorer er ikke tilgængelige på grund af fejl i mere end 6 timer",
-    "Ended": "Afsluttet",
-    "LastDuration": "lastDuration",
-    "LastExecution": "Sidste henrettelse",
-    "NextExecution": "Næste udførelse",
-    "Queued": "I kø"
+    "Yes": "Ja"
 }

src/NzbDrone.Core/Localization/Core/de.json

@@ -317,7 +317,7 @@
     "IndexerRss": "Indexer RSS",
     "IndexerQuery": "Indexer Anfrage",
     "IndexerHealthCheckNoIndexers": "Keine Indexer aktiviert, Prowlarr wird keine Suchergebnisse zurückgeben",
-    "IndexerAuth": "Indexer Authentifizierung",
+    "IndexerAuth": "Indexer Auth",
     "EnableIndexer": "Indexer aktivieren",
     "IndexerObsoleteCheckMessage": "Indexer sind nicht mehr verfügbar oder wurden aktualiiert: {0}. Bitte enfernen und (oder) neu zu Prowlarr hinzufügen",
     "DevelopmentSettings": "Entwicklungseinstellungen",
@@ -397,7 +397,7 @@
     "BookSearch": "Buch Suche",
     "Id": "Id",
     "IndexerProxies": "Indexer-Proxies",
-    "IndexerTagsHelpText": "Benutze Tags, um Indexer-Proxies zu spezifizieren, mit welchen Apps der Indexer synchronisiert oder um Indexer zu organisieren.",
+    "IndexerTagsHelpText": "Benutze Tags, um Indexer-Proxies zu spezifizieren oder um Indexer zu organisieren.",
     "MovieSearch": "Film Suche",
     "QueryOptions": "Abfrage-Optionen",
     "Categories": "Kategorien",
@@ -433,34 +433,5 @@
     "UnableToLoadIndexers": "Indexer konnten nicht geladen werden",
     "Yes": "Ja",
     "InstanceName": "Instanzname",
-    "InstanceNameHelpText": "Instanzname im Browser-Tab und für Syslog-Anwendungsname",
-    "SyncProfiles": "Sync-Profile",
-    "ThemeHelpText": "Prowlarr UI Theme ändern, inspiriert von {0}",
-    "Duration": "Dauer",
-    "EditSyncProfile": "Synchronisationsprofil bearbeiten",
-    "ElapsedTime": "Vergangene Zeit",
-    "EnabledRedirected": "Aktiviert, Weitergeleitet",
-    "Ended": "Beendet",
-    "GrabTitle": "Titel holen",
-    "LastDuration": "Letzte Dauer",
-    "LastExecution": "Letzte Ausführung",
-    "MinimumSeeders": "Mindest-Seeder",
-    "MinimumSeedersHelpText": "Minimale Anzahl an Seedern die von der Anwendung benötigt werden um den Indexer zu holen",
-    "NextExecution": "Nächste Ausführung",
-    "Parameters": "Parameter",
-    "Queued": "In der Warteschlange",
-    "Started": "gestartet",
-    "SyncProfile": "Sync-Profile",
-    "IndexerSite": "Indexer-Seite",
-    "MovieSearchTypes": "Film-Suchtypen",
-    "MusicSearchTypes": "Musik-Suchtypen",
-    "NotSupported": "Nicht unterstützt",
-    "RawSearchSupported": "Raw-Suche unterstützt",
-    "SearchCapabilities": "Suchfähigkeiten",
-    "AddSyncProfile": "Synchronisationsprofil hinzufügen",
-    "BookSearchTypes": "Buch-Suchtypen",
-    "IndexerDetails": "Indexer-Details",
-    "IndexerName": "Indexer-Name",
-    "ApplicationLongTermStatusCheckAllClientMessage": "Alle Anwendungen sind nicht verfügbar, da es zu Störungen für mehr als 6 Stunden kam",
-    "ApplicationLongTermStatusCheckSingleClientMessage": "Anwendungen nicht verfügbar, da es zu Störungen für mehr als 6 Stunden kam: {0}"
+    "InstanceNameHelpText": "Instanzname im Browser-Tab und für Syslog-Anwendungsname"
 }

src/NzbDrone.Core/Localization/Core/el.json

@@ -334,12 +334,5 @@
     "MappedDrivesRunningAsService": "Οι αντιστοιχισμένες μονάδες δίσκου δικτύου δεν είναι διαθέσιμες κατά την εκτέλεση ως υπηρεσία Windows. Ανατρέξτε στις Συχνές Ερωτήσεις για περισσότερες πληροφορίες",
     "No": "Οχι",
     "UnableToLoadIndexers": "Δεν είναι δυνατή η φόρτωση του ευρετηρίου",
-    "Yes": "Ναί",
-    "Ended": "Έληξε",
-    "LastDuration": "τελευταία Διάρκεια",
-    "LastExecution": "Τελευταία εκτέλεση",
-    "ApplicationLongTermStatusCheckAllClientMessage": "Όλοι οι δείκτες δεν είναι διαθέσιμοι λόγω αστοχιών για περισσότερο από 6 ώρες",
-    "ApplicationLongTermStatusCheckSingleClientMessage": "Τα ευρετήρια δεν είναι διαθέσιμα λόγω αστοχιών για περισσότερο από 6 ώρες: {0}",
-    "NextExecution": "Επόμενη εκτέλεση",
-    "Queued": "Σε ουρά"
+    "Yes": "Ναί"
 }

src/NzbDrone.Core/Localization/Core/en.json

@@ -23,8 +23,6 @@
   "AppDataDirectory": "AppData directory",
   "AppDataLocationHealthCheckMessage": "Updating will not be possible to prevent deleting AppData on Update",
   "Application": "Application",
-  "ApplicationLongTermStatusCheckAllClientMessage": "All applications are unavailable due to failures for more than 6 hours",
-  "ApplicationLongTermStatusCheckSingleClientMessage": "Applications unavailable due to failures for more than 6 hours: {0}",
   "Applications": "Applications",
   "ApplicationStatusCheckAllClientMessage": "All applications are unavailable due to failures",
   "ApplicationStatusCheckSingleClientMessage": "Applications unavailable due to failures: {0}",
@@ -54,7 +52,7 @@
   "Backups": "Backups",
   "BeforeUpdate": "Before update",
   "BindAddress": "Bind Address",
-  "BindAddressHelpText": "Valid IP address, localhost or '*' for all interfaces",
+  "BindAddressHelpText": "Valid IP4 address or '*' for all interfaces",
   "BookSearch": "Book Search",
   "BookSearchTypes": "Book Search Types",
   "Branch": "Branch",
@@ -404,7 +402,7 @@
   "TestAllApps": "Test All Apps",
   "TestAllClients": "Test All Clients",
   "TestAllIndexers": "Test All Indexers",
-  "ThemeHelpText": "Change Application UI Theme, 'Auto' Theme will use your OS Theme to set Light or Dark mode. Inspired by {0}",
+  "ThemeHelpText": "Change Prowlarr UI theme, inspired by {0}",
   "Time": "Time",
   "Title": "Title",
   "Today": "Today",

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

@@ -336,8 +336,8 @@
     "OnHealthIssue": "En Problema de Salud",
     "TestAllIndexers": "Comprobar Todos los Indexers",
     "NotificationTriggersHelpText": "Seleccione qué eventos deben activar esta notificación",
-    "OnApplicationUpdate": "Al Actualizar La Aplicación",
-    "OnApplicationUpdateHelpText": "Al Actualizar La Aplicación",
+    "OnApplicationUpdate": "Al actualizar la aplicación",
+    "OnApplicationUpdateHelpText": "Al actualizar la aplicación",
     "AddRemoveOnly": "Sólo añadir y eliminar",
     "AddedToDownloadClient": "Descarga añadida al cliente",
     "AddNewIndexer": "Añadir nuevo indexador",
@@ -361,17 +361,5 @@
     "Notifications": "Notificaciones",
     "UnableToLoadIndexers": "No se pueden cargar los indexers",
     "Yes": "si",
-    "UserAgentProvidedByTheAppThatCalledTheAPI": "User-Agent proporcionado por la aplicación llamó a la API",
-    "InstanceName": "Nombre de Instancia",
-    "InstanceNameHelpText": "Nombre de instancia en pestaña y para nombre de aplicación en Syslog",
-    "Database": "Base de Datos",
-    "Duration": "Duración",
-    "LastDuration": "Duración",
-    "LastExecution": "Última ejecución",
-    "Queued": "En Cola",
-    "ApplicationLongTermStatusCheckAllClientMessage": "Ningún indexer está disponible por errores durando más de 6 horas",
-    "ApplicationLongTermStatusCheckSingleClientMessage": "Indexers no disponible por errores durando más de 6 horas: {0}",
-    "Ended": "Terminó",
-    "NextExecution": "Siguiente ejecución",
-    "Started": "Iniciado"
+    "UserAgentProvidedByTheAppThatCalledTheAPI": "User-Agent proporcionado por la aplicación llamó a la API"
 }

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

@@ -55,7 +55,7 @@
     "UpdateCheckStartupTranslocationMessage": "Päivitystä ei voi asentaa, koska käynnistyskansio '{0}' sijaitsee 'App Translocation' -kansiossa.",
     "UpdateCheckUINotWritableMessage": "Päivitystä ei voi asentaa, koska käyttäjällä '{1}' ei ole kirjoitusoikeutta käyttöliittymäkansioon '{0}'.",
     "UpdateMechanismHelpText": "Käytä Prowlarrin sisäänrakennettua päivitystoimintoa tai omaa komentosarjaasi.",
-    "ApplyTagsHelpTexts3": "- \"Poista\" tyhjentää syötetyt tunnisteet.",
+    "ApplyTagsHelpTexts3": "– 'Poista' ainoastaan syötetyt tunnisteet",
     "Enable": "Käytä",
     "UI": "Käyttöliittymä",
     "UrlBaseHelpText": "Käänteisen välityspalvelimen tuki (esim. 'http://[host]:[port]/[urlBase]'). Käytä oletusta jättämällä tyhjäksi.",
@@ -71,10 +71,10 @@
     "Username": "Käyttäjätunnus",
     "YesCancel": "Kyllä, peruuta",
     "NoTagsHaveBeenAddedYet": "Tunnisteita ei ole vielä lisätty.",
-    "ApplyTags": "Tunnistetoimenpide",
+    "ApplyTags": "Toimenpide tunnisteille",
     "Authentication": "Todennus",
     "AuthenticationMethodHelpText": "Vaadi käyttäjätunnus ja salasana.",
-    "BindAddressHelpText": "Toimiva IPv4-osoite tai '*' (tähti) kaikille yhteyksille.",
+    "BindAddressHelpText": "Toimiva IPv4-osoite tai jokerimerkkinä '*' (tähti) kaikille yhteyksille.",
     "Close": "Sulje",
     "DeleteNotification": "Poista kytkentä",
     "Docker": "Docker",
@@ -186,7 +186,7 @@
     "Discord": "Discord",
     "Donations": "Lahjoitukset",
     "Edit": "Muokkaa",
-    "EnableAutomaticSearchHelpText": "Profiilia käytetään automaattihaun yhteydessä, kun haku suoritetaan käyttöliittymästä tai Prowlarrin toimesta.",
+    "EnableAutomaticSearchHelpText": "Profiilia käytetään automaattihaun yhteydessä, kun sellainen suoritetaan käyttöliittymästä tai Prowlarin toimesta.",
     "Enabled": "Käytössä",
     "EventType": "Tapahtumatyyppi",
     "Exception": "Poikkeus",
@@ -224,7 +224,7 @@
     "Wiki": "Wiki",
     "ApplyTagsHelpTexts1": "Tunnisteisiin kohdistettavat toimenpiteet:",
     "ApplyTagsHelpTexts2": "– 'Lisää' syötetyt tunnisteet aiempiin tunnisteisiin",
-    "ApplyTagsHelpTexts4": "- \"Korvaa\" nykyiset tunnisteet syötetyillä tai tyhjennä kaikki tunnisteet jättämällä tyhjäksi.",
+    "ApplyTagsHelpTexts4": "– 'Korvaa' kaikki aiemmat tunnisteet tai poista kaikki tunnisteet jättämällä tyhjäksi",
     "Port": "Portti",
     "AreYouSureYouWantToResetYourAPIKey": "Haluatko varmasti uudistaa API-avaimesi?",
     "Automatic": "Automaattinen",
@@ -243,7 +243,7 @@
     "Cancel": "Peruuta",
     "CancelPendingTask": "Haluatko varmasti perua tämän odottavan tehtävän?",
     "CertificateValidation": "Varmenteen vahvistus",
-    "CertificateValidationHelpText": "Muuta HTTPS-varmennevahvistuksen tarkkuutta. Älä muuta, jollet ymmärrä tähän liittyviä riskejä.",
+    "CertificateValidationHelpText": "Valitse HTTPS-varmenteen vahvistuksen tarkkuus. Älä muuta, jollet ymmärrä tähän liittyviä riskejä.",
     "ChangeHasNotBeenSavedYet": "Muutosta ei ole vielä tallennettu",
     "Clear": "Tyhjennä",
     "CloneProfile": "Kloonaa profiili",
@@ -402,7 +402,7 @@
     "Filters": "Suodattimet",
     "OnGrab": "Kun elokuva siepataan",
     "OnHealthIssue": "Kun havaitaan kuntoon liittyvä ongelma",
-    "HistoryCleanupDaysHelpText": "Poista automaattinen tyhjennys käytöstä asettamalla arvoksi '0'.",
+    "HistoryCleanupDaysHelpText": "Älä tyhjennä automaattisesti asettamalla arvoksi '0'.",
     "HistoryCleanupDaysHelpTextWarning": "Tässä määritettyä aikaa vanhemmat tiedostot poistetaan automaattisesti roskakorista pysyvästi.",
     "TestAllIndexers": "Testaa tietolähteet",
     "UserAgentProvidedByTheAppThatCalledTheAPI": "User-Agent-tiedon ilmoitti sovellus, joka kommunikoi API:n kanssa",
@@ -460,7 +460,5 @@
     "NextExecution": "Seuraava suoritus",
     "Parameters": "Parametrit",
     "Queued": "Jonossa",
-    "Started": "Alkoi",
-    "ApplicationLongTermStatusCheckAllClientMessage": "Mikään tietolähde ei ole käytettävissä yli 6 tuntia kestäneiden virheiden vuoksi.",
-    "ApplicationLongTermStatusCheckSingleClientMessage": "Tietolähteet eivät ole käytettävissä yli 6 tuntia kestäneiden virheiden vuoksi: {0}"
+    "Started": "Alkoi"
 }

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

@@ -358,7 +358,7 @@
     "Description": "Description",
     "Donations": "Dons",
     "Enabled": "Activé",
-    "Grabs": "Complétés",
+    "Grabs": "Saisie",
     "Id": "Id",
     "Presets": "Préconfigurations",
     "Privacy": "Vie privée",
@@ -440,16 +440,5 @@
     "MovieSearchTypes": "Types de recherches de films",
     "MusicSearchTypes": "Type de recherche de musiques",
     "NotSupported": "Non supporté",
-    "SearchCapabilities": "Capacités de recherche",
-    "Duration": "Durée",
-    "LastDuration": "Dernière durée",
-    "InstanceName": "Nom de l'instance",
-    "InstanceNameHelpText": "Nom de l'instance dans l'onglet du navigateur et pour le nom d'application dans Syslog",
-    "ApplicationLongTermStatusCheckSingleClientMessage": "Indexeurs indisponibles en raison de pannes pendant plus de 6 heures : {0}",
-    "ApplicationLongTermStatusCheckAllClientMessage": "Tous les indexeurs sont indisponibles en raison d'échecs de plus de 6 heures",
-    "Ended": "Terminé",
-    "LastExecution": "Dernière exécution",
-    "NextExecution": "Prochaine exécution",
-    "Queued": "En file d'attente",
-    "Started": "Démarré"
+    "SearchCapabilities": "Capacités de recherche"
 }

src/NzbDrone.Core/Localization/Core/he.json

@@ -337,13 +337,5 @@
     "NotificationTriggersHelpText": "בחר איזה אירועים יפעילו את ההתראה הזאת",
     "OnApplicationUpdate": "כשהאפליקציה מעדכנת גרסא",
     "OnApplicationUpdateHelpText": "כשהאפליקציה מעדכנת גרסא",
-    "Database": "מסד נתונים",
-    "ApplicationLongTermStatusCheckSingleClientMessage": "אינדקסים לא זמינים עקב כשלים במשך יותר משש שעות: {0}",
-    "Duration": "אורך",
-    "Queued": "בתור",
-    "ApplicationLongTermStatusCheckAllClientMessage": "כל האינדקסים אינם זמינים עקב כשלים במשך יותר מ -6 שעות",
-    "Ended": "הסתיים",
-    "LastDuration": "lastDuration",
-    "LastExecution": "ביצוע אחרון",
-    "NextExecution": "הביצוע הבא"
+    "Database": "מסד נתונים"
 }

src/NzbDrone.Core/Localization/Core/hi.json

@@ -331,12 +331,5 @@
     "Link": "लिंक",
     "MappedDrivesRunningAsService": "विंडोज सर्विस के रूप में चलने पर मैप्ड नेटवर्क ड्राइव उपलब्ध नहीं हैं। अधिक जानकारी के लिए कृपया FAQ देखें",
     "No": "नहीं",
-    "UnableToLoadIndexers": "अनुक्रमणिका लोड करने में असमर्थ",
-    "ApplicationLongTermStatusCheckAllClientMessage": "6 घंटे से अधिक समय तक विफलताओं के कारण सभी सूचकांक अनुपलब्ध हैं",
-    "ApplicationLongTermStatusCheckSingleClientMessage": "6 घंटे से अधिक समय तक विफलताओं के कारण सूचकांक उपलब्ध नहीं: {0}",
-    "Ended": "समाप्त",
-    "NextExecution": "अगला निष्पादन",
-    "LastDuration": "lastDuration",
-    "LastExecution": "अंतिम निष्पादन",
-    "Queued": "कतारबद्ध"
+    "UnableToLoadIndexers": "अनुक्रमणिका लोड करने में असमर्थ"
 }

src/NzbDrone.Core/Localization/Core/hu.json

@@ -460,7 +460,5 @@
     "Parameters": "Paraméterek",
     "Queued": "Sorba helyezve",
     "Started": "Elkezdődött",
-    "NextExecution": "Következő végrehajtás",
-    "ApplicationLongTermStatusCheckSingleClientMessage": "Az alkamazások elérhetetlenek több mint 6 órája az alábbi hiba miatt: {0}",
-    "ApplicationLongTermStatusCheckAllClientMessage": "Az összes alkalmazás elérhetetlen több mint 6 órája meghibásodás miatt"
+    "NextExecution": "Következő végrehajtás"
 }

src/NzbDrone.Core/Localization/Core/is.json

@@ -331,12 +331,5 @@
     "No": "Nei",
     "UnableToLoadIndexers": "Ekki er hægt að hlaða Indexers",
     "Yes": "Já",
-    "ConnectionLostMessage": "Whisparr hefur misst tenginguna við bakendann og þarf að endurhlaða hann til að endurheimta virkni.",
-    "LastExecution": "Síðasta aftaka",
-    "ApplicationLongTermStatusCheckAllClientMessage": "Allir verðtryggingaraðilar eru ekki tiltækir vegna bilana í meira en 6 klukkustundir",
-    "ApplicationLongTermStatusCheckSingleClientMessage": "Vísitölufólk er ekki tiltækt vegna bilana í meira en 6 klukkustundir: {0}",
-    "LastDuration": "lastDuration",
-    "Queued": "Í biðröð",
-    "Ended": "Lauk",
-    "NextExecution": "Næsta framkvæmd"
+    "ConnectionLostMessage": "Whisparr hefur misst tenginguna við bakendann og þarf að endurhlaða hann til að endurheimta virkni."
 }