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.11'
+  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/Components/Form/FormInputGroup.js

@@ -16,7 +16,6 @@ import FormInputHelpText from './FormInputHelpText';
 import IndexerFlagsSelectInputConnector from './IndexerFlagsSelectInputConnector';
 import InfoInput from './InfoInput';
 import KeyValueListInput from './KeyValueListInput';
-import NewznabCategorySelectInputConnector from './NewznabCategorySelectInputConnector';
 import NumberInput from './NumberInput';
 import OAuthInputConnector from './OAuthInputConnector';
 import PasswordInput from './PasswordInput';
@@ -69,9 +68,6 @@ function getComponent(type) {
     case inputTypes.PATH:
       return PathInputConnector;
 
-    case inputTypes.CATEGORY_SELECT:
-      return NewznabCategorySelectInputConnector;
-
     case inputTypes.INDEXER_FLAGS_SELECT:
       return IndexerFlagsSelectInputConnector;
 

frontend/src/Components/Form/NewznabCategorySelectInputConnector.js

@@ -31,7 +31,7 @@ function createMapStateToProps() {
       });
 
       return {
-        value: value || [],
+        value,
         values
       };
     }

frontend/src/Helpers/Props/inputTypes.js

@@ -8,7 +8,6 @@ export const DEVICE = 'device';
 export const KEY_VALUE_LIST = 'keyValueList';
 export const INFO = 'info';
 export const MOVIE_MONITORED_SELECT = 'movieMonitoredSelect';
-export const CATEGORY_SELECT = 'newznabCategorySelect';
 export const NUMBER = 'number';
 export const OAUTH = 'oauth';
 export const PASSWORD = 'password';
@@ -33,7 +32,6 @@ export const all = [
   KEY_VALUE_LIST,
   INFO,
   MOVIE_MONITORED_SELECT,
-  CATEGORY_SELECT,
   NUMBER,
   OAUTH,
   PASSWORD,

frontend/src/Indexer/Add/AddIndexerModalContent.js

@@ -123,7 +123,7 @@ class AddIndexerModalContent extends Component {
     const filteredIndexers = indexers.filter((indexer) => {
       const { filter, filterProtocols, filterLanguages, filterPrivacyLevels } = this.state;
 
-      if (!indexer.name.toLowerCase().includes(filter.toLocaleLowerCase()) && !indexer.description.toLowerCase().includes(filter.toLocaleLowerCase())) {
+      if (!indexer.name.toLowerCase().includes(filter.toLocaleLowerCase())) {
         return false;
       }
 

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] });
       }
@@ -272,7 +272,6 @@ class IndexerIndex extends Component {
       saveError,
       isDeleting,
       isTestingAll,
-      isSyncingIndexers,
       deleteError,
       onScroll,
       onSortSelect,
@@ -310,15 +309,6 @@ class IndexerIndex extends Component {
               onPress={this.onAddIndexerPress}
             />
 
-            <PageToolbarSeparator />
-
-            <PageToolbarButton
-              label={translate('SyncAppIndexers')}
-              iconName={icons.REFRESH}
-              isSpinning={isSyncingIndexers}
-              onPress={this.props.onAppIndexerSyncPress}
-            />
-
             <PageToolbarButton
               label={translate('TestAllIndexers')}
               iconName={icons.TEST}
@@ -503,12 +493,10 @@ IndexerIndex.propTypes = {
   saveError: PropTypes.object,
   isDeleting: PropTypes.bool.isRequired,
   isTestingAll: PropTypes.bool.isRequired,
-  isSyncingIndexers: PropTypes.bool.isRequired,
   deleteError: PropTypes.object,
   onSortSelect: PropTypes.func.isRequired,
   onFilterSelect: PropTypes.func.isRequired,
   onTestAllPress: PropTypes.func.isRequired,
-  onAppIndexerSyncPress: PropTypes.func.isRequired,
   onScroll: PropTypes.func.isRequired,
   onSaveSelected: PropTypes.func.isRequired
 };

frontend/src/Indexer/Index/IndexerIndexConnector.js

@@ -2,13 +2,10 @@ import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import { connect } from 'react-redux';
 import { createSelector } from 'reselect';
-import * as commandNames from 'Commands/commandNames';
 import withScrollPosition from 'Components/withScrollPosition';
-import { executeCommand } from 'Store/Actions/commandActions';
 import { testAllIndexers } from 'Store/Actions/indexerActions';
 import { saveIndexerEditor, setMovieFilter, setMovieSort, setMovieTableOption } from 'Store/Actions/indexerIndexActions';
 import scrollPositions from 'Store/scrollPositions';
-import createCommandExecutingSelector from 'Store/Selectors/createCommandExecutingSelector';
 import createDimensionsSelector from 'Store/Selectors/createDimensionsSelector';
 import createIndexerClientSideCollectionItemsSelector from 'Store/Selectors/createIndexerClientSideCollectionItemsSelector';
 import IndexerIndex from './IndexerIndex';
@@ -16,16 +13,13 @@ import IndexerIndex from './IndexerIndex';
 function createMapStateToProps() {
   return createSelector(
     createIndexerClientSideCollectionItemsSelector('indexerIndex'),
-    createCommandExecutingSelector(commandNames.APP_INDEXER_SYNC),
     createDimensionsSelector(),
     (
       indexers,
-      isSyncingIndexers,
       dimensionsState
     ) => {
       return {
         ...indexers,
-        isSyncingIndexers,
         isSmallScreen: dimensionsState.isSmallScreen
       };
     }
@@ -52,12 +46,6 @@ function createMapDispatchToProps(dispatch, props) {
 
     onTestAllPress() {
       dispatch(testAllIndexers());
-    },
-
-    onAppIndexerSyncPress() {
-      dispatch(executeCommand({
-        name: commandNames.APP_INDEXER_SYNC
-      }));
     }
   };
 }

frontend/src/Settings/DownloadClients/DownloadClients/Categories/AddCategoryModal.js

@@ -1,27 +0,0 @@
-import PropTypes from 'prop-types';
-import React from 'react';
-import Modal from 'Components/Modal/Modal';
-import { sizes } from 'Helpers/Props';
-import AddCategoryModalContentConnector from './AddCategoryModalContentConnector';
-
-function AddCategoryModal({ isOpen, onModalClose, ...otherProps }) {
-  return (
-    <Modal
-      size={sizes.MEDIUM}
-      isOpen={isOpen}
-      onModalClose={onModalClose}
-    >
-      <AddCategoryModalContentConnector
-        {...otherProps}
-        onModalClose={onModalClose}
-      />
-    </Modal>
-  );
-}
-
-AddCategoryModal.propTypes = {
-  isOpen: PropTypes.bool.isRequired,
-  onModalClose: PropTypes.func.isRequired
-};
-
-export default AddCategoryModal;

frontend/src/Settings/DownloadClients/DownloadClients/Categories/AddCategoryModalConnector.js

@@ -1,50 +0,0 @@
-import PropTypes from 'prop-types';
-import React, { Component } from 'react';
-import { connect } from 'react-redux';
-import { clearPendingChanges } from 'Store/Actions/baseActions';
-import AddCategoryModal from './AddCategoryModal';
-
-function createMapDispatchToProps(dispatch, props) {
-  const section = 'settings.downloadClientCategories';
-
-  return {
-    dispatchClearPendingChanges() {
-      dispatch(clearPendingChanges({ section }));
-    }
-  };
-}
-
-class AddCategoryModalConnector extends Component {
-
-  //
-  // Listeners
-
-  onModalClose = () => {
-    this.props.dispatchClearPendingChanges();
-    this.props.onModalClose();
-  };
-
-  //
-  // Render
-
-  render() {
-    const {
-      dispatchClearPendingChanges,
-      ...otherProps
-    } = this.props;
-
-    return (
-      <AddCategoryModal
-        {...otherProps}
-        onModalClose={this.onModalClose}
-      />
-    );
-  }
-}
-
-AddCategoryModalConnector.propTypes = {
-  onModalClose: PropTypes.func.isRequired,
-  dispatchClearPendingChanges: PropTypes.func.isRequired
-};
-
-export default connect(null, createMapDispatchToProps)(AddCategoryModalConnector);

frontend/src/Settings/DownloadClients/DownloadClients/Categories/AddCategoryModalContent.css

@@ -1,5 +0,0 @@
-.deleteButton {
-  composes: button from '~Components/Link/Button.css';
-
-  margin-right: auto;
-}

frontend/src/Settings/DownloadClients/DownloadClients/Categories/AddCategoryModalContent.js

@@ -1,111 +0,0 @@
-import PropTypes from 'prop-types';
-import React from 'react';
-import Form from 'Components/Form/Form';
-import FormGroup from 'Components/Form/FormGroup';
-import FormInputGroup from 'Components/Form/FormInputGroup';
-import FormLabel from 'Components/Form/FormLabel';
-import Button from 'Components/Link/Button';
-import SpinnerErrorButton from 'Components/Link/SpinnerErrorButton';
-import ModalBody from 'Components/Modal/ModalBody';
-import ModalContent from 'Components/Modal/ModalContent';
-import ModalFooter from 'Components/Modal/ModalFooter';
-import ModalHeader from 'Components/Modal/ModalHeader';
-import { inputTypes, kinds } from 'Helpers/Props';
-import translate from 'Utilities/String/translate';
-import styles from './AddCategoryModalContent.css';
-
-function AddCategoryModalContent(props) {
-  const {
-    advancedSettings,
-    item,
-    onInputChange,
-    onFieldChange,
-    onCancelPress,
-    onSavePress,
-    onDeleteSpecificationPress,
-    ...otherProps
-  } = props;
-
-  const {
-    id,
-    clientCategory,
-    categories
-  } = item;
-
-  return (
-    <ModalContent onModalClose={onCancelPress}>
-      <ModalHeader>
-        {`${id ? 'Edit' : 'Add'} Category`}
-      </ModalHeader>
-
-      <ModalBody>
-        <Form
-          {...otherProps}
-        >
-          <FormGroup>
-            <FormLabel>
-              {translate('DownloadClientCategory')}
-            </FormLabel>
-
-            <FormInputGroup
-              type={inputTypes.TEXT}
-              name="clientCategory"
-              {...clientCategory}
-              onChange={onInputChange}
-            />
-          </FormGroup>
-
-          <FormGroup>
-            <FormLabel>
-              {translate('MappedCategories')}
-            </FormLabel>
-
-            <FormInputGroup
-              type={inputTypes.CATEGORY_SELECT}
-              name="categories"
-              {...categories}
-              onChange={onInputChange}
-            />
-          </FormGroup>
-        </Form>
-      </ModalBody>
-      <ModalFooter>
-        {
-          id &&
-            <Button
-              className={styles.deleteButton}
-              kind={kinds.DANGER}
-              onPress={onDeleteSpecificationPress}
-            >
-              {translate('Delete')}
-            </Button>
-        }
-
-        <Button
-          onPress={onCancelPress}
-        >
-          {translate('Cancel')}
-        </Button>
-
-        <SpinnerErrorButton
-          isSpinning={false}
-          onPress={onSavePress}
-        >
-          {translate('Save')}
-        </SpinnerErrorButton>
-      </ModalFooter>
-    </ModalContent>
-  );
-}
-
-AddCategoryModalContent.propTypes = {
-  advancedSettings: PropTypes.bool.isRequired,
-  item: PropTypes.object.isRequired,
-  onInputChange: PropTypes.func.isRequired,
-  onFieldChange: PropTypes.func.isRequired,
-  onCancelPress: PropTypes.func.isRequired,
-  onSavePress: PropTypes.func.isRequired,
-  onDeleteSpecificationPress: PropTypes.func
-};
-
-export default AddCategoryModalContent;

frontend/src/Settings/DownloadClients/DownloadClients/Categories/AddCategoryModalContentConnector.js

@@ -1,78 +0,0 @@
-import PropTypes from 'prop-types';
-import React, { Component } from 'react';
-import { connect } from 'react-redux';
-import { createSelector } from 'reselect';
-import { clearDownloadClientCategoryPending, saveDownloadClientCategory, setDownloadClientCategoryFieldValue, setDownloadClientCategoryValue } from 'Store/Actions/settingsActions';
-import createProviderSettingsSelector from 'Store/Selectors/createProviderSettingsSelector';
-import AddCategoryModalContent from './AddCategoryModalContent';
-
-function createMapStateToProps() {
-  return createSelector(
-    (state) => state.settings.advancedSettings,
-    createProviderSettingsSelector('downloadClientCategories'),
-    (advancedSettings, specification) => {
-      return {
-        advancedSettings,
-        ...specification
-      };
-    }
-  );
-}
-
-const mapDispatchToProps = {
-  setDownloadClientCategoryValue,
-  setDownloadClientCategoryFieldValue,
-  saveDownloadClientCategory,
-  clearDownloadClientCategoryPending
-};
-
-class AddCategoryModalContentConnector extends Component {
-
-  //
-  // Listeners
-
-  onInputChange = ({ name, value }) => {
-    this.props.setDownloadClientCategoryValue({ name, value });
-  };
-
-  onFieldChange = ({ name, value }) => {
-    this.props.setDownloadClientCategoryFieldValue({ name, value });
-  };
-
-  onCancelPress = () => {
-    this.props.clearDownloadClientCategoryPending();
-    this.props.onModalClose();
-  };
-
-  onSavePress = () => {
-    this.props.saveDownloadClientCategory({ id: this.props.id });
-    this.props.onModalClose();
-  };
-
-  //
-  // Render
-
-  render() {
-    return (
-      <AddCategoryModalContent
-        {...this.props}
-        onCancelPress={this.onCancelPress}
-        onSavePress={this.onSavePress}
-        onInputChange={this.onInputChange}
-        onFieldChange={this.onFieldChange}
-      />
-    );
-  }
-}
-
-AddCategoryModalContentConnector.propTypes = {
-  id: PropTypes.number,
-  item: PropTypes.object.isRequired,
-  setDownloadClientCategoryValue: PropTypes.func.isRequired,
-  setDownloadClientCategoryFieldValue: PropTypes.func.isRequired,
-  clearDownloadClientCategoryPending: PropTypes.func.isRequired,
-  saveDownloadClientCategory: PropTypes.func.isRequired,
-  onModalClose: PropTypes.func.isRequired
-};
-
-export default connect(createMapStateToProps, mapDispatchToProps)(AddCategoryModalContentConnector);

frontend/src/Settings/DownloadClients/DownloadClients/Categories/Category.css

@@ -1,32 +0,0 @@
-.customFormat {
-  composes: card from '~Components/Card.css';
-
-  width: 300px;
-}
-
-.nameContainer {
-  display: flex;
-  justify-content: space-between;
-}
-
-.name {
-  @add-mixin truncate;
-
-  margin-bottom: 5px;
-  font-weight: 300;
-  font-size: 20px;
-}
-
-.labels {
-  display: flex;
-  flex-wrap: wrap;
-  margin-top: 5px;
-  pointer-events: all;
-}
-
-.tooltipLabel {
-  composes: label from '~Components/Label.css';
-
-  margin: 0;
-  border: none;
-}

frontend/src/Settings/DownloadClients/DownloadClients/Categories/Category.js

@@ -1,111 +0,0 @@
-import PropTypes from 'prop-types';
-import React, { Component } from 'react';
-import Card from 'Components/Card';
-import Label from 'Components/Label';
-import ConfirmModal from 'Components/Modal/ConfirmModal';
-import { kinds } from 'Helpers/Props';
-import translate from 'Utilities/String/translate';
-import AddCategoryModalConnector from './AddCategoryModalConnector';
-import styles from './Category.css';
-
-class Category extends Component {
-
-  //
-  // Lifecycle
-
-  constructor(props, context) {
-    super(props, context);
-
-    this.state = {
-      isEditSpecificationModalOpen: false,
-      isDeleteSpecificationModalOpen: false
-    };
-  }
-
-  //
-  // Listeners
-
-  onEditSpecificationPress = () => {
-    this.setState({ isEditSpecificationModalOpen: true });
-  };
-
-  onEditSpecificationModalClose = () => {
-    this.setState({ isEditSpecificationModalOpen: false });
-  };
-
-  onDeleteSpecificationPress = () => {
-    this.setState({
-      isEditSpecificationModalOpen: false,
-      isDeleteSpecificationModalOpen: true
-    });
-  };
-
-  onDeleteSpecificationModalClose = () => {
-    this.setState({ isDeleteSpecificationModalOpen: false });
-  };
-
-  onConfirmDeleteSpecification = () => {
-    this.props.onConfirmDeleteSpecification(this.props.id);
-  };
-
-  //
-  // Lifecycle
-
-  render() {
-    const {
-      id,
-      clientCategory,
-      categories
-    } = this.props;
-
-    return (
-      <Card
-        className={styles.customFormat}
-        overlayContent={true}
-        onPress={this.onEditSpecificationPress}
-      >
-        <div className={styles.nameContainer}>
-          <div className={styles.name}>
-            {clientCategory}
-          </div>
-        </div>
-
-        <Label kind={kinds.PRIMARY}>
-          {`${categories.length} ${categories.length > 1 ? translate('Categories') : translate('Category')}`}
-        </Label>
-
-        <AddCategoryModalConnector
-          id={id}
-          isOpen={this.state.isEditSpecificationModalOpen}
-          onModalClose={this.onEditSpecificationModalClose}
-          onDeleteSpecificationPress={this.onDeleteSpecificationPress}
-        />
-
-        <ConfirmModal
-          isOpen={this.state.isDeleteSpecificationModalOpen}
-          kind={kinds.DANGER}
-          title={translate('DeleteClientCategory')}
-          message={
-            <div>
-              <div>
-                {translate('AreYouSureYouWantToDeleteCategory', [name])}
-              </div>
-            </div>
-          }
-          confirmLabel={translate('Delete')}
-          onConfirm={this.onConfirmDeleteSpecification}
-          onCancel={this.onDeleteSpecificationModalClose}
-        />
-      </Card>
-    );
-  }
-}
-
-Category.propTypes = {
-  id: PropTypes.number.isRequired,
-  categories: PropTypes.arrayOf(PropTypes.number).isRequired,
-  clientCategory: PropTypes.string.isRequired,
-  onConfirmDeleteSpecification: PropTypes.func.isRequired
-};
-
-export default Category;

frontend/src/Settings/DownloadClients/DownloadClients/EditDownloadClientModalContent.js

@@ -1,14 +1,11 @@
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import Alert from 'Components/Alert';
-import Card from 'Components/Card';
-import FieldSet from 'Components/FieldSet';
 import Form from 'Components/Form/Form';
 import FormGroup from 'Components/Form/FormGroup';
 import FormInputGroup from 'Components/Form/FormInputGroup';
 import FormLabel from 'Components/Form/FormLabel';
 import ProviderFieldFormGroup from 'Components/Form/ProviderFieldFormGroup';
-import Icon from 'Components/Icon';
 import Button from 'Components/Link/Button';
 import SpinnerErrorButton from 'Components/Link/SpinnerErrorButton';
 import LoadingIndicator from 'Components/Loading/LoadingIndicator';
@@ -16,33 +13,12 @@ import ModalBody from 'Components/Modal/ModalBody';
 import ModalContent from 'Components/Modal/ModalContent';
 import ModalFooter from 'Components/Modal/ModalFooter';
 import ModalHeader from 'Components/Modal/ModalHeader';
-import { icons, inputTypes, kinds } from 'Helpers/Props';
+import { inputTypes, kinds } from 'Helpers/Props';
 import translate from 'Utilities/String/translate';
-import AddCategoryModalConnector from './Categories/AddCategoryModalConnector';
-import Category from './Categories/Category';
 import styles from './EditDownloadClientModalContent.css';
 
 class EditDownloadClientModalContent extends Component {
 
-  //
-  // Lifecycle
-
-  constructor(props, context) {
-    super(props, context);
-
-    this.state = {
-      isAddCategoryModalOpen: false
-    };
-  }
-
-  onAddCategoryPress = () => {
-    this.setState({ isAddCategoryModalOpen: true });
-  };
-
-  onAddCategoryModalClose = () => {
-    this.setState({ isAddCategoryModalOpen: false });
-  };
-
   //
   // Render
 
@@ -51,7 +27,6 @@ class EditDownloadClientModalContent extends Component {
       advancedSettings,
       isFetching,
       error,
-      categories,
       isSaving,
       isTesting,
       saveError,
@@ -62,21 +37,15 @@ class EditDownloadClientModalContent extends Component {
       onSavePress,
       onTestPress,
       onDeleteDownloadClientPress,
-      onConfirmDeleteCategory,
       ...otherProps
     } = this.props;
 
-    const {
-      isAddCategoryModalOpen
-    } = this.state;
-
     const {
       id,
       implementationName,
       name,
       enable,
       priority,
-      supportsCategories,
       fields,
       message
     } = item;
@@ -167,43 +136,6 @@ class EditDownloadClientModalContent extends Component {
                   />
                 </FormGroup>
 
-                {
-                  supportsCategories.value ?
-                    <FieldSet legend={translate('MappedCategories')}>
-                      <div className={styles.customFormats}>
-                        {
-                          categories.map((tag) => {
-                            return (
-                              <Category
-                                key={tag.id}
-                                {...tag}
-                                onConfirmDeleteSpecification={onConfirmDeleteCategory}
-                              />
-                            );
-                          })
-                        }
-
-                        <Card
-                          className={styles.addCategory}
-                          onPress={this.onAddCategoryPress}
-                        >
-                          <div className={styles.center}>
-                            <Icon
-                              name={icons.ADD}
-                              size={25}
-                            />
-                          </div>
-                        </Card>
-                      </div>
-                    </FieldSet> :
-                    null
-                }
-
-                <AddCategoryModalConnector
-                  isOpen={isAddCategoryModalOpen}
-                  onModalClose={this.onAddCategoryModalClose}
-                />
-
               </Form>
           }
         </ModalBody>
@@ -253,15 +185,13 @@ EditDownloadClientModalContent.propTypes = {
   isSaving: PropTypes.bool.isRequired,
   saveError: PropTypes.object,
   isTesting: PropTypes.bool.isRequired,
-  categories: PropTypes.arrayOf(PropTypes.object),
   item: PropTypes.object.isRequired,
   onInputChange: PropTypes.func.isRequired,
   onFieldChange: PropTypes.func.isRequired,
   onModalClose: PropTypes.func.isRequired,
   onSavePress: PropTypes.func.isRequired,
   onTestPress: PropTypes.func.isRequired,
-  onDeleteDownloadClientPress: PropTypes.func,
-  onConfirmDeleteCategory: PropTypes.func.isRequired
+  onDeleteDownloadClientPress: PropTypes.func
 };
 
 export default EditDownloadClientModalContent;

frontend/src/Settings/DownloadClients/DownloadClients/EditDownloadClientModalContentConnector.js

@@ -2,7 +2,7 @@ import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import { connect } from 'react-redux';
 import { createSelector } from 'reselect';
-import { deleteDownloadClientCategory, fetchDownloadClientCategories, saveDownloadClient, setDownloadClientFieldValue, setDownloadClientValue, testDownloadClient } from 'Store/Actions/settingsActions';
+import { saveDownloadClient, setDownloadClientFieldValue, setDownloadClientValue, testDownloadClient } from 'Store/Actions/settingsActions';
 import createProviderSettingsSelector from 'Store/Selectors/createProviderSettingsSelector';
 import EditDownloadClientModalContent from './EditDownloadClientModalContent';
 
@@ -10,12 +10,10 @@ function createMapStateToProps() {
   return createSelector(
     (state) => state.settings.advancedSettings,
     createProviderSettingsSelector('downloadClients'),
-    (state) => state.settings.downloadClientCategories,
-    (advancedSettings, downloadClient, categories) => {
+    (advancedSettings, downloadClient) => {
       return {
         advancedSettings,
-        ...downloadClient,
-        categories: categories.items
+        ...downloadClient
       };
     }
   );
@@ -25,9 +23,7 @@ const mapDispatchToProps = {
   setDownloadClientValue,
   setDownloadClientFieldValue,
   saveDownloadClient,
-  testDownloadClient,
-  fetchDownloadClientCategories,
-  deleteDownloadClientCategory
+  testDownloadClient
 };
 
 class EditDownloadClientModalContentConnector extends Component {
@@ -35,14 +31,6 @@ class EditDownloadClientModalContentConnector extends Component {
   //
   // Lifecycle
 
-  componentDidMount() {
-    const {
-      id,
-      tagsFromId
-    } = this.props;
-    this.props.fetchDownloadClientCategories({ id: tagsFromId || id });
-  }
-
   componentDidUpdate(prevProps, prevState) {
     if (prevProps.isSaving && !this.props.isSaving && !this.props.saveError) {
       this.props.onModalClose();
@@ -68,10 +56,6 @@ class EditDownloadClientModalContentConnector extends Component {
     this.props.testDownloadClient({ id: this.props.id });
   };
 
-  onConfirmDeleteCategory = (id) => {
-    this.props.deleteDownloadClientCategory({ id });
-  };
-
   //
   // Render
 
@@ -83,7 +67,6 @@ class EditDownloadClientModalContentConnector extends Component {
         onTestPress={this.onTestPress}
         onInputChange={this.onInputChange}
         onFieldChange={this.onFieldChange}
-        onConfirmDeleteCategory={this.onConfirmDeleteCategory}
       />
     );
   }
@@ -91,13 +74,10 @@ class EditDownloadClientModalContentConnector extends Component {
 
 EditDownloadClientModalContentConnector.propTypes = {
   id: PropTypes.number,
-  tagsFromId: PropTypes.number,
   isFetching: PropTypes.bool.isRequired,
   isSaving: PropTypes.bool.isRequired,
   saveError: PropTypes.object,
   item: PropTypes.object.isRequired,
-  fetchDownloadClientCategories: PropTypes.func.isRequired,
-  deleteDownloadClientCategory: PropTypes.func.isRequired,
   setDownloadClientValue: PropTypes.func.isRequired,
   setDownloadClientFieldValue: PropTypes.func.isRequired,
   saveDownloadClient: PropTypes.func.isRequired,

frontend/src/Settings/UI/UISettingsConnector.js

@@ -14,6 +14,8 @@ function createLanguagesSelector() {
   return createSelector(
     (state) => state.localization,
     (localization) => {
+      console.log(localization);
+
       const items = localization.items;
 
       if (!items) {

frontend/src/Store/Actions/Settings/downloadClientCategories.js

@@ -1,169 +0,0 @@
-import { createAction } from 'redux-actions';
-import { batchActions } from 'redux-batched-actions';
-import createClearReducer from 'Store/Actions/Creators/Reducers/createClearReducer';
-import createSetProviderFieldValueReducer from 'Store/Actions/Creators/Reducers/createSetProviderFieldValueReducer';
-import createSetSettingValueReducer from 'Store/Actions/Creators/Reducers/createSetSettingValueReducer';
-import { createThunk } from 'Store/thunks';
-import getNextId from 'Utilities/State/getNextId';
-import getProviderState from 'Utilities/State/getProviderState';
-import getSectionState from 'Utilities/State/getSectionState';
-import selectProviderSchema from 'Utilities/State/selectProviderSchema';
-import { removeItem, set, update, updateItem } from '../baseActions';
-
-//
-// Variables
-
-const section = 'settings.downloadClientCategories';
-
-//
-// Actions Types
-
-export const FETCH_DOWNLOAD_CLIENT_CATEGORIES = 'settings/downloadClientCategories/fetchDownloadClientCategories';
-export const FETCH_DOWNLOAD_CLIENT_CATEGORY_SCHEMA = 'settings/downloadClientCategories/fetchDownloadClientCategorySchema';
-export const SELECT_DOWNLOAD_CLIENT_CATEGORY_SCHEMA = 'settings/downloadClientCategories/selectDownloadClientCategorySchema';
-export const SET_DOWNLOAD_CLIENT_CATEGORY_VALUE = 'settings/downloadClientCategories/setDownloadClientCategoryValue';
-export const SET_DOWNLOAD_CLIENT_CATEGORY_FIELD_VALUE = 'settings/downloadClientCategories/setDownloadClientCategoryFieldValue';
-export const SAVE_DOWNLOAD_CLIENT_CATEGORY = 'settings/downloadClientCategories/saveDownloadClientCategory';
-export const DELETE_DOWNLOAD_CLIENT_CATEGORY = 'settings/downloadClientCategories/deleteDownloadClientCategory';
-export const DELETE_ALL_DOWNLOAD_CLIENT_CATEGORY = 'settings/downloadClientCategories/deleteAllDownloadClientCategory';
-export const CLEAR_DOWNLOAD_CLIENT_CATEGORIES = 'settings/downloadClientCategories/clearDownloadClientCategories';
-export const CLEAR_DOWNLOAD_CLIENT_CATEGORY_PENDING = 'settings/downloadClientCategories/clearDownloadClientCategoryPending';
-//
-// Action Creators
-
-export const fetchDownloadClientCategories = createThunk(FETCH_DOWNLOAD_CLIENT_CATEGORIES);
-export const fetchDownloadClientCategorySchema = createThunk(FETCH_DOWNLOAD_CLIENT_CATEGORY_SCHEMA);
-export const selectDownloadClientCategorySchema = createAction(SELECT_DOWNLOAD_CLIENT_CATEGORY_SCHEMA);
-
-export const saveDownloadClientCategory = createThunk(SAVE_DOWNLOAD_CLIENT_CATEGORY);
-export const deleteDownloadClientCategory = createThunk(DELETE_DOWNLOAD_CLIENT_CATEGORY);
-export const deleteAllDownloadClientCategory = createThunk(DELETE_ALL_DOWNLOAD_CLIENT_CATEGORY);
-
-export const setDownloadClientCategoryValue = createAction(SET_DOWNLOAD_CLIENT_CATEGORY_VALUE, (payload) => {
-  return {
-    section,
-    ...payload
-  };
-});
-
-export const setDownloadClientCategoryFieldValue = createAction(SET_DOWNLOAD_CLIENT_CATEGORY_FIELD_VALUE, (payload) => {
-  return {
-    section,
-    ...payload
-  };
-});
-
-export const clearDownloadClientCategory = createAction(CLEAR_DOWNLOAD_CLIENT_CATEGORIES);
-
-export const clearDownloadClientCategoryPending = createThunk(CLEAR_DOWNLOAD_CLIENT_CATEGORY_PENDING);
-
-//
-// Details
-
-export default {
-
-  //
-  // State
-
-  defaultState: {
-    isPopulated: false,
-    error: null,
-    isSchemaFetching: false,
-    isSchemaPopulated: false,
-    schemaError: null,
-    schema: [],
-    selectedSchema: {},
-    isSaving: false,
-    saveError: null,
-    items: [],
-    pendingChanges: {}
-  },
-
-  //
-  // Action Handlers
-
-  actionHandlers: {
-    [FETCH_DOWNLOAD_CLIENT_CATEGORIES]: (getState, payload, dispatch) => {
-      let tags = [];
-      if (payload.id) {
-        const cfState = getSectionState(getState(), 'settings.downloadClients', true);
-        const cf = cfState.items[cfState.itemMap[payload.id]];
-        tags = cf.categories.map((tag, i) => {
-          return {
-            id: i + 1,
-            ...tag
-          };
-        });
-      }
-
-      dispatch(batchActions([
-        update({ section, data: tags }),
-        set({
-          section,
-          isPopulated: true
-        })
-      ]));
-    },
-
-    [SAVE_DOWNLOAD_CLIENT_CATEGORY]: (getState, payload, dispatch) => {
-      const {
-        id,
-        ...otherPayload
-      } = payload;
-
-      const saveData = getProviderState({ id, ...otherPayload }, getState, section, false);
-
-      // we have to set id since not actually posting to server yet
-      if (!saveData.id) {
-        saveData.id = getNextId(getState().settings.downloadClientCategories.items);
-      }
-
-      dispatch(batchActions([
-        updateItem({ section, ...saveData }),
-        set({
-          section,
-          pendingChanges: {}
-        })
-      ]));
-    },
-
-    [DELETE_DOWNLOAD_CLIENT_CATEGORY]: (getState, payload, dispatch) => {
-      const id = payload.id;
-      return dispatch(removeItem({ section, id }));
-    },
-
-    [DELETE_ALL_DOWNLOAD_CLIENT_CATEGORY]: (getState, payload, dispatch) => {
-      return dispatch(set({
-        section,
-        items: []
-      }));
-    },
-
-    [CLEAR_DOWNLOAD_CLIENT_CATEGORY_PENDING]: (getState, payload, dispatch) => {
-      return dispatch(set({
-        section,
-        pendingChanges: {}
-      }));
-    }
-  },
-
-  //
-  // Reducers
-
-  reducers: {
-    [SET_DOWNLOAD_CLIENT_CATEGORY_VALUE]: createSetSettingValueReducer(section),
-    [SET_DOWNLOAD_CLIENT_CATEGORY_FIELD_VALUE]: createSetProviderFieldValueReducer(section),
-
-    [SELECT_DOWNLOAD_CLIENT_CATEGORY_SCHEMA]: (state, { payload }) => {
-      return selectProviderSchema(state, section, payload, (selectedSchema) => {
-        return selectedSchema;
-      });
-    },
-
-    [CLEAR_DOWNLOAD_CLIENT_CATEGORIES]: createClearReducer(section, {
-      isPopulated: false,
-      error: null,
-      items: []
-    })
-  }
-};

frontend/src/Store/Actions/Settings/downloadClients.js

@@ -9,7 +9,6 @@ import createSetProviderFieldValueReducer from 'Store/Actions/Creators/Reducers/
 import createSetSettingValueReducer from 'Store/Actions/Creators/Reducers/createSetSettingValueReducer';
 import { createThunk } from 'Store/thunks';
 import selectProviderSchema from 'Utilities/State/selectProviderSchema';
-import { set } from '../baseActions';
 
 //
 // Variables
@@ -91,34 +90,10 @@ export default {
     [FETCH_DOWNLOAD_CLIENTS]: createFetchHandler(section, '/downloadclient'),
     [FETCH_DOWNLOAD_CLIENT_SCHEMA]: createFetchSchemaHandler(section, '/downloadclient/schema'),
 
-    [SAVE_DOWNLOAD_CLIENT]: (getState, payload, dispatch) => {
-      // move the format tags in as a pending change
-      const state = getState();
-      const pendingChanges = state.settings.downloadClients.pendingChanges;
-      pendingChanges.categories = state.settings.downloadClientCategories.items;
-      dispatch(set({
-        section,
-        pendingChanges
-      }));
-
-      createSaveProviderHandler(section, '/downloadclient')(getState, payload, dispatch);
-    },
-
+    [SAVE_DOWNLOAD_CLIENT]: createSaveProviderHandler(section, '/downloadclient'),
     [CANCEL_SAVE_DOWNLOAD_CLIENT]: createCancelSaveProviderHandler(section),
     [DELETE_DOWNLOAD_CLIENT]: createRemoveItemHandler(section, '/downloadclient'),
-
-    [TEST_DOWNLOAD_CLIENT]: (getState, payload, dispatch) => {
-      const state = getState();
-      const pendingChanges = state.settings.downloadClients.pendingChanges;
-      pendingChanges.categories = state.settings.downloadClientCategories.items;
-      dispatch(set({
-        section,
-        pendingChanges
-      }));
-
-      createTestProviderHandler(section, '/downloadclient')(getState, payload, dispatch);
-    },
-
+    [TEST_DOWNLOAD_CLIENT]: createTestProviderHandler(section, '/downloadclient'),
     [CANCEL_TEST_DOWNLOAD_CLIENT]: createCancelTestProviderHandler(section),
     [TEST_ALL_DOWNLOAD_CLIENTS]: createTestAllProvidersHandler(section, '/downloadclient')
   },

frontend/src/Store/Actions/releaseActions.js

@@ -310,6 +310,8 @@ export const actionHandlers = handleThunks({
       isGrabbing: true
     }));
 
+    console.log(payload);
+
     const promise = createAjaxRequest({
       url: '/search/bulk',
       method: 'POST',

frontend/src/Store/Actions/settingsActions.js

@@ -4,7 +4,6 @@ import createHandleActions from './Creators/createHandleActions';
 import applications from './Settings/applications';
 import appProfiles from './Settings/appProfiles';
 import development from './Settings/development';
-import downloadClientCategories from './Settings/downloadClientCategories';
 import downloadClients from './Settings/downloadClients';
 import general from './Settings/general';
 import indexerCategories from './Settings/indexerCategories';
@@ -12,7 +11,6 @@ import indexerProxies from './Settings/indexerProxies';
 import notifications from './Settings/notifications';
 import ui from './Settings/ui';
 
-export * from './Settings/downloadClientCategories';
 export * from './Settings/downloadClients';
 export * from './Settings/general';
 export * from './Settings/indexerCategories';
@@ -34,7 +32,6 @@ export const section = 'settings';
 export const defaultState = {
   advancedSettings: false,
 
-  downloadClientCategories: downloadClientCategories.defaultState,
   downloadClients: downloadClients.defaultState,
   general: general.defaultState,
   indexerCategories: indexerCategories.defaultState,
@@ -64,7 +61,6 @@ export const toggleAdvancedSettings = createAction(TOGGLE_ADVANCED_SETTINGS);
 // Action Handlers
 
 export const actionHandlers = handleThunks({
-  ...downloadClientCategories.actionHandlers,
   ...downloadClients.actionHandlers,
   ...general.actionHandlers,
   ...indexerCategories.actionHandlers,
@@ -85,7 +81,6 @@ export const reducers = createHandleActions({
     return Object.assign({}, state, { advancedSettings: !state.advancedSettings });
   },
 
-  ...downloadClientCategories.reducers,
   ...downloadClients.reducers,
   ...general.reducers,
   ...indexerCategories.reducers,

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/Files/Indexers/Newznab/newznab_caps.xml

@@ -18,7 +18,6 @@
       <subcat id="5030" name="SD"/>
       <subcat id="5060" name="Sport"/>
       <subcat id="5010" name="WEB-DL"/>
-      <subcat id="5999" name="Other"/>
     </category>
     <category id="7000" name="Other">
       <subcat id="7010" name="Misc"/>

src/NzbDrone.Core.Test/IndexerStatsTests/IndexerStatisticsServiceFixture.cs

@@ -1,55 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using FizzWare.NBuilder;
-using FluentAssertions;
-using Moq;
-using NUnit.Framework;
-using NzbDrone.Core.History;
-using NzbDrone.Core.Indexers;
-using NzbDrone.Core.IndexerStats;
-using NzbDrone.Core.Test.Framework;
-
-namespace NzbDrone.Core.Test.IndexerStatsTests
-{
-    public class IndexerStatisticsServiceFixture : CoreTest<IndexerStatisticsService>
-    {
-        private IndexerDefinition _indexer;
-
-        [SetUp]
-        public void Setup()
-        {
-            _indexer = Builder<IndexerDefinition>.CreateNew().With(x => x.Id = 5).Build();
-
-            Mocker.GetMock<IIndexerFactory>()
-                  .Setup(o => o.All())
-                  .Returns(new List<IndexerDefinition> { _indexer });
-        }
-
-        [Test]
-        public void should_pull_stats_if_all_events_are_failures()
-        {
-            var history = new List<History.History>
-            {
-                new History.History
-                {
-                    Date = DateTime.UtcNow.AddHours(-1),
-                    EventType = HistoryEventType.IndexerRss,
-                    Successful = false,
-                    Id = 8,
-                    IndexerId = 5,
-                    Data = new Dictionary<string, string> { { "source", "prowlarr" } }
-                }
-            };
-
-            Mocker.GetMock<IHistoryService>()
-                .Setup(o => o.Between(It.IsAny<DateTime>(), It.IsAny<DateTime>()))
-                .Returns<DateTime, DateTime>((s, f) => history);
-
-            var statistics = Subject.IndexerStatistics(DateTime.UtcNow.AddMonths(-1), DateTime.UtcNow);
-
-            statistics.IndexerStatistics.Count.Should().Be(1);
-            statistics.IndexerStatistics.First().AverageResponseTime.Should().Be(0);
-        }
-    }
-}

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

@@ -51,7 +51,7 @@ namespace NzbDrone.Core.Test.IndexerTests.AvistazTests
             torrentInfo.InfoUrl.Should().Be("https://avistaz.to/torrent/187240-japan-sinks-people-of-hope-2021-s01e05-720p-nf-web-dl-ddp20-x264-seikel");
             torrentInfo.CommentUrl.Should().BeNullOrEmpty();
             torrentInfo.Indexer.Should().Be(Subject.Definition.Name);
-            torrentInfo.PublishDate.Should().Be(DateTime.Parse("2021-11-15 04:26:21"));
+            torrentInfo.PublishDate.Should().Be(DateTime.Parse("2021-11-14 23:26:21"));
             torrentInfo.Size.Should().Be(935127615);
             torrentInfo.InfoHash.Should().Be("a879261d4e6e792402f92401141a21de70d51bf2");
             torrentInfo.MagnetUrl.Should().Be(null);

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

@@ -51,7 +51,7 @@ namespace NzbDrone.Core.Test.IndexerTests.AvistazTests
             torrentInfo.InfoUrl.Should().Be("https://exoticaz.to/torrent/64040-ssis-419-my-first-experience-is-yua-mikami-from-the-day-i-lost-my-virginity-i-was-devoted-to-sex");
             torrentInfo.CommentUrl.Should().BeNullOrEmpty();
             torrentInfo.Indexer.Should().Be(Subject.Definition.Name);
-            torrentInfo.PublishDate.Should().Be(DateTime.Parse("2022-06-11 16:04:50"));
+            torrentInfo.PublishDate.Should().Be(DateTime.Parse("2022-06-11 11:04:50"));
             torrentInfo.Size.Should().Be(7085405541);
             torrentInfo.InfoHash.Should().Be("asdjfiasdf54asd7f4a2sdf544asdf");
             torrentInfo.MagnetUrl.Should().Be(null);

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

@@ -51,7 +51,7 @@ namespace NzbDrone.Core.Test.IndexerTests.AvistazTests
             torrentInfo.InfoUrl.Should().Be("https://privatehd.to/torrent/78506-godzilla-2014-2160p-uhd-bluray-remux-hdr-hevc-atmos-triton");
             torrentInfo.CommentUrl.Should().BeNullOrEmpty();
             torrentInfo.Indexer.Should().Be(Subject.Definition.Name);
-            torrentInfo.PublishDate.Should().Be(DateTime.Parse("2021-03-21 05:24:49"));
+            torrentInfo.PublishDate.Should().Be(DateTime.Parse("2021-03-21 00:24:49"));
             torrentInfo.Size.Should().Be(69914591044);
             torrentInfo.InfoHash.Should().Be("a879261d4e6e792402f92401141a21de70d51bf2");
             torrentInfo.MagnetUrl.Should().Be(null);

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/NewznabTests/NewznabCapabilitiesProviderFixture.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Linq;
 using System.Net;
 using System.Threading.Tasks;
 using System.Xml;
@@ -71,32 +70,6 @@ namespace NzbDrone.Core.Test.IndexerTests.NewznabTests
             caps.LimitsMax.Value.Should().Be(60);
         }
 
-        [Test]
-        public void should_map_different_categories()
-        {
-            GivenCapsResponse(_caps);
-
-            var caps = Subject.GetCapabilities(_settings, _definition);
-
-            var bookCats = caps.Categories.MapTorznabCapsToTrackers(new int[] { NewznabStandardCategory.Books.Id });
-
-            bookCats.Count.Should().Be(2);
-            bookCats.Should().Contain("8000");
-        }
-
-        [Test]
-        public void should_map_by_name_when_available()
-        {
-            GivenCapsResponse(_caps);
-
-            var caps = Subject.GetCapabilities(_settings, _definition);
-
-            var bookCats = caps.Categories.MapTrackerCatToNewznab("5999");
-
-            bookCats.Count.Should().Be(2);
-            bookCats.First().Id.Should().Be(5050);
-        }
-
         [Test]
         public void should_use_default_pagesize_if_missing()
         {

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/Applications/Lidarr/Lidarr.cs

@@ -126,12 +126,6 @@ namespace NzbDrone.Core.Applications.Lidarr
                 {
                     if (indexer.Capabilities.Categories.SupportedCategories(Settings.SyncCategories.ToArray()).Any())
                     {
-                        // Retain user fields not-affiliated with Prowlarr
-                        lidarrIndexer.Fields.AddRange(remoteIndexer.Fields.Where(f => !lidarrIndexer.Fields.Any(s => s.Name == f.Name)));
-
-                        // Retain user settings not-affiliated with Prowlarr
-                        lidarrIndexer.DownloadClientId = remoteIndexer.DownloadClientId;
-
                         // Update the indexer if it still has categories that match
                         _lidarrV1Proxy.UpdateIndexer(lidarrIndexer, Settings);
                     }
@@ -165,7 +159,6 @@ namespace NzbDrone.Core.Applications.Lidarr
         {
             var cacheKey = $"{Settings.BaseUrl}";
             var schemas = _schemaCache.Get(cacheKey, () => _lidarrV1Proxy.GetIndexerSchema(Settings), TimeSpan.FromDays(7));
-            var syncFields = new string[] { "baseUrl", "apiPath", "apiKey", "categories", "minimumSeeders", "seedCriteria.seedRatio", "seedCriteria.seedTime", "seedCriteria.discographySeedTime" };
 
             var newznab = schemas.Where(i => i.Implementation == "Newznab").First();
             var torznab = schemas.Where(i => i.Implementation == "Torznab").First();
@@ -182,11 +175,9 @@ namespace NzbDrone.Core.Applications.Lidarr
                 Priority = indexer.Priority,
                 Implementation = indexer.Protocol == DownloadProtocol.Usenet ? "Newznab" : "Torznab",
                 ConfigContract = schema.ConfigContract,
-                Fields = new List<LidarrField>()
+                Fields = schema.Fields,
             };
 
-            lidarrIndexer.Fields.AddRange(schema.Fields.Where(x => syncFields.Contains(x.Name)));
-
             lidarrIndexer.Fields.FirstOrDefault(x => x.Name == "baseUrl").Value = $"{Settings.ProwlarrUrl.TrimEnd('/')}/{indexer.Id}/";
             lidarrIndexer.Fields.FirstOrDefault(x => x.Name == "apiPath").Value = "/api";
             lidarrIndexer.Fields.FirstOrDefault(x => x.Name == "apiKey").Value = _configFileProvider.ApiKey;
@@ -200,7 +191,7 @@ namespace NzbDrone.Core.Applications.Lidarr
 
                 if (lidarrIndexer.Fields.FirstOrDefault(x => x.Name == "seedCriteria.discographySeedTime") != null)
                 {
-                    lidarrIndexer.Fields.FirstOrDefault(x => x.Name == "seedCriteria.discographySeedTime").Value = ((ITorrentIndexerSettings)indexer.Settings).TorrentBaseSettings.PackSeedTime ?? ((ITorrentIndexerSettings)indexer.Settings).TorrentBaseSettings.SeedTime;
+                    lidarrIndexer.Fields.FirstOrDefault(x => x.Name == "seedCriteria.discographySeedTime").Value = ((ITorrentIndexerSettings)indexer.Settings).TorrentBaseSettings.SeedTime;
                 }
             }
 

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

@@ -17,7 +17,6 @@ namespace NzbDrone.Core.Applications.Lidarr
         public string Implementation { get; set; }
         public string ConfigContract { get; set; }
         public string InfoLink { get; set; }
-        public int? DownloadClientId { get; set; }
         public HashSet<int> Tags { get; set; }
         public List<LidarrField> Fields { get; set; }
 
@@ -34,7 +33,7 @@ namespace NzbDrone.Core.Applications.Lidarr
 
             var apiPath = Fields.FirstOrDefault(x => x.Name == "apiPath")?.Value == null ? null : Fields.FirstOrDefault(x => x.Name == "apiPath").Value;
             var otherApiPath = other.Fields.FirstOrDefault(x => x.Name == "apiPath")?.Value == null ? null : other.Fields.FirstOrDefault(x => x.Name == "apiPath").Value;
-            var apiPathCompare = apiPath.Equals(otherApiPath);
+            var apiPathCompare = apiPath == otherApiPath;
 
             var minimumSeeders = Fields.FirstOrDefault(x => x.Name == "minimumSeeders")?.Value == null ? null : (int?)Convert.ToInt32(Fields.FirstOrDefault(x => x.Name == "minimumSeeders").Value);
             var otherMinimumSeeders = other.Fields.FirstOrDefault(x => x.Name == "minimumSeeders")?.Value == null ? null : (int?)Convert.ToInt32(other.Fields.FirstOrDefault(x => x.Name == "minimumSeeders").Value);

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

@@ -126,12 +126,6 @@ namespace NzbDrone.Core.Applications.Radarr
                 {
                     if (indexer.Capabilities.Categories.SupportedCategories(Settings.SyncCategories.ToArray()).Any())
                     {
-                        // Retain user fields not-affiliated with Prowlarr
-                        radarrIndexer.Fields.AddRange(remoteIndexer.Fields.Where(f => !radarrIndexer.Fields.Any(s => s.Name == f.Name)));
-
-                        // Retain user settings not-affiliated with Prowlarr
-                        radarrIndexer.DownloadClientId = remoteIndexer.DownloadClientId;
-
                         // Update the indexer if it still has categories that match
                         _radarrV3Proxy.UpdateIndexer(radarrIndexer, Settings);
                     }
@@ -165,7 +159,6 @@ namespace NzbDrone.Core.Applications.Radarr
         {
             var cacheKey = $"{Settings.BaseUrl}";
             var schemas = _schemaCache.Get(cacheKey, () => _radarrV3Proxy.GetIndexerSchema(Settings), TimeSpan.FromDays(7));
-            var syncFields = new string[] { "baseUrl", "apiPath", "apiKey", "categories", "minimumSeeders", "seedCriteria.seedRatio", "seedCriteria.seedTime" };
 
             var newznab = schemas.Where(i => i.Implementation == "Newznab").First();
             var torznab = schemas.Where(i => i.Implementation == "Torznab").First();
@@ -182,11 +175,9 @@ namespace NzbDrone.Core.Applications.Radarr
                 Priority = indexer.Priority,
                 Implementation = indexer.Protocol == DownloadProtocol.Usenet ? "Newznab" : "Torznab",
                 ConfigContract = schema.ConfigContract,
-                Fields = new List<RadarrField>()
+                Fields = schema.Fields,
             };
 
-            radarrIndexer.Fields.AddRange(schema.Fields.Where(x => syncFields.Contains(x.Name)));
-
             radarrIndexer.Fields.FirstOrDefault(x => x.Name == "baseUrl").Value = $"{Settings.ProwlarrUrl.TrimEnd('/')}/{indexer.Id}/";
             radarrIndexer.Fields.FirstOrDefault(x => x.Name == "apiPath").Value = "/api";
             radarrIndexer.Fields.FirstOrDefault(x => x.Name == "apiKey").Value = _configFileProvider.ApiKey;

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

@@ -17,7 +17,6 @@ namespace NzbDrone.Core.Applications.Radarr
         public string Implementation { get; set; }
         public string ConfigContract { get; set; }
         public string InfoLink { get; set; }
-        public int? DownloadClientId { get; set; }
         public HashSet<int> Tags { get; set; }
         public List<RadarrField> Fields { get; set; }
 
@@ -34,7 +33,7 @@ namespace NzbDrone.Core.Applications.Radarr
 
             var apiPath = Fields.FirstOrDefault(x => x.Name == "apiPath")?.Value == null ? null : Fields.FirstOrDefault(x => x.Name == "apiPath").Value;
             var otherApiPath = other.Fields.FirstOrDefault(x => x.Name == "apiPath")?.Value == null ? null : other.Fields.FirstOrDefault(x => x.Name == "apiPath").Value;
-            var apiPathCompare = apiPath.Equals(otherApiPath);
+            var apiPathCompare = apiPath == otherApiPath;
 
             var minimumSeeders = Fields.FirstOrDefault(x => x.Name == "minimumSeeders")?.Value == null ? null : (int?)Convert.ToInt32(Fields.FirstOrDefault(x => x.Name == "minimumSeeders").Value);
             var otherMinimumSeeders = other.Fields.FirstOrDefault(x => x.Name == "minimumSeeders")?.Value == null ? null : (int?)Convert.ToInt32(other.Fields.FirstOrDefault(x => x.Name == "minimumSeeders").Value);

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

@@ -126,8 +126,6 @@ namespace NzbDrone.Core.Applications.Readarr
                 {
                     if (indexer.Capabilities.Categories.SupportedCategories(Settings.SyncCategories.ToArray()).Any())
                     {
-                        readarrIndexer.Fields.AddRange(remoteIndexer.Fields.Where(f => !readarrIndexer.Fields.Any(s => s.Name == f.Name)));
-
                         // Update the indexer if it still has categories that match
                         _readarrV1Proxy.UpdateIndexer(readarrIndexer, Settings);
                     }
@@ -161,7 +159,6 @@ namespace NzbDrone.Core.Applications.Readarr
         {
             var cacheKey = $"{Settings.BaseUrl}";
             var schemas = _schemaCache.Get(cacheKey, () => _readarrV1Proxy.GetIndexerSchema(Settings), TimeSpan.FromDays(7));
-            var syncFields = new string[] { "baseUrl", "apiPath", "apiKey", "categories", "minimumSeeders", "seedCriteria.seedRatio", "seedCriteria.seedTime", "seedCriteria.discographySeedTime" };
 
             var newznab = schemas.Where(i => i.Implementation == "Newznab").First();
             var torznab = schemas.Where(i => i.Implementation == "Torznab").First();
@@ -178,11 +175,9 @@ namespace NzbDrone.Core.Applications.Readarr
                 Priority = indexer.Priority,
                 Implementation = indexer.Protocol == DownloadProtocol.Usenet ? "Newznab" : "Torznab",
                 ConfigContract = schema.ConfigContract,
-                Fields = new List<ReadarrField>()
+                Fields = schema.Fields,
             };
 
-            readarrIndexer.Fields.AddRange(schema.Fields.Where(x => syncFields.Contains(x.Name)));
-
             readarrIndexer.Fields.FirstOrDefault(x => x.Name == "baseUrl").Value = $"{Settings.ProwlarrUrl.TrimEnd('/')}/{indexer.Id}/";
             readarrIndexer.Fields.FirstOrDefault(x => x.Name == "apiPath").Value = "/api";
             readarrIndexer.Fields.FirstOrDefault(x => x.Name == "apiKey").Value = _configFileProvider.ApiKey;
@@ -196,7 +191,7 @@ namespace NzbDrone.Core.Applications.Readarr
 
                 if (readarrIndexer.Fields.FirstOrDefault(x => x.Name == "seedCriteria.discographySeedTime") != null)
                 {
-                    readarrIndexer.Fields.FirstOrDefault(x => x.Name == "seedCriteria.discographySeedTime").Value = ((ITorrentIndexerSettings)indexer.Settings).TorrentBaseSettings.PackSeedTime ?? ((ITorrentIndexerSettings)indexer.Settings).TorrentBaseSettings.SeedTime;
+                    readarrIndexer.Fields.FirstOrDefault(x => x.Name == "seedCriteria.discographySeedTime").Value = ((ITorrentIndexerSettings)indexer.Settings).TorrentBaseSettings.SeedTime;
                 }
             }
 

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

@@ -33,7 +33,7 @@ namespace NzbDrone.Core.Applications.Readarr
 
             var apiPath = Fields.FirstOrDefault(x => x.Name == "apiPath")?.Value == null ? null : Fields.FirstOrDefault(x => x.Name == "apiPath").Value;
             var otherApiPath = other.Fields.FirstOrDefault(x => x.Name == "apiPath")?.Value == null ? null : other.Fields.FirstOrDefault(x => x.Name == "apiPath").Value;
-            var apiPathCompare = apiPath.Equals(otherApiPath);
+            var apiPathCompare = apiPath == otherApiPath;
 
             var minimumSeeders = Fields.FirstOrDefault(x => x.Name == "minimumSeeders")?.Value == null ? null : (int?)Convert.ToInt32(Fields.FirstOrDefault(x => x.Name == "minimumSeeders").Value);
             var otherMinimumSeeders = other.Fields.FirstOrDefault(x => x.Name == "minimumSeeders")?.Value == null ? null : (int?)Convert.ToInt32(other.Fields.FirstOrDefault(x => x.Name == "minimumSeeders").Value);

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

@@ -126,13 +126,6 @@ namespace NzbDrone.Core.Applications.Sonarr
                 {
                     if (indexer.Capabilities.Categories.SupportedCategories(Settings.SyncCategories.ToArray()).Any() || indexer.Capabilities.Categories.SupportedCategories(Settings.AnimeSyncCategories.ToArray()).Any())
                     {
-                        // Retain user fields not-affiliated with Prowlarr
-                        sonarrIndexer.Fields.AddRange(remoteIndexer.Fields.Where(f => !sonarrIndexer.Fields.Any(s => s.Name == f.Name)));
-
-                        // Retain user settings not-affiliated with Prowlarr
-                        sonarrIndexer.DownloadClientId = remoteIndexer.DownloadClientId;
-                        sonarrIndexer.SeasonSearchMaximumSingleEpisodeAge = remoteIndexer.SeasonSearchMaximumSingleEpisodeAge;
-
                         // Update the indexer if it still has categories that match
                         _sonarrV3Proxy.UpdateIndexer(sonarrIndexer, Settings);
                     }
@@ -166,7 +159,6 @@ namespace NzbDrone.Core.Applications.Sonarr
         {
             var cacheKey = $"{Settings.BaseUrl}";
             var schemas = _schemaCache.Get(cacheKey, () => _sonarrV3Proxy.GetIndexerSchema(Settings), TimeSpan.FromDays(7));
-            var syncFields = new string[] { "baseUrl", "apiPath", "apiKey", "categories", "animeCategories", "minimumSeeders", "seedCriteria.seedRatio", "seedCriteria.seedTime", "seedCriteria.seasonPackSeedTime" };
 
             var newznab = schemas.Where(i => i.Implementation == "Newznab").First();
             var torznab = schemas.Where(i => i.Implementation == "Torznab").First();
@@ -183,11 +175,9 @@ namespace NzbDrone.Core.Applications.Sonarr
                 Priority = indexer.Priority,
                 Implementation = indexer.Protocol == DownloadProtocol.Usenet ? "Newznab" : "Torznab",
                 ConfigContract = schema.ConfigContract,
-                Fields = new List<SonarrField>()
+                Fields = schema.Fields,
             };
 
-            sonarrIndexer.Fields.AddRange(schema.Fields.Where(x => syncFields.Contains(x.Name)));
-
             sonarrIndexer.Fields.FirstOrDefault(x => x.Name == "baseUrl").Value = $"{Settings.ProwlarrUrl.TrimEnd('/')}/{indexer.Id}/";
             sonarrIndexer.Fields.FirstOrDefault(x => x.Name == "apiPath").Value = "/api";
             sonarrIndexer.Fields.FirstOrDefault(x => x.Name == "apiKey").Value = _configFileProvider.ApiKey;
@@ -199,7 +189,7 @@ namespace NzbDrone.Core.Applications.Sonarr
                 sonarrIndexer.Fields.FirstOrDefault(x => x.Name == "minimumSeeders").Value = indexer.AppProfile.Value.MinimumSeeders;
                 sonarrIndexer.Fields.FirstOrDefault(x => x.Name == "seedCriteria.seedRatio").Value = ((ITorrentIndexerSettings)indexer.Settings).TorrentBaseSettings.SeedRatio;
                 sonarrIndexer.Fields.FirstOrDefault(x => x.Name == "seedCriteria.seedTime").Value = ((ITorrentIndexerSettings)indexer.Settings).TorrentBaseSettings.SeedTime;
-                sonarrIndexer.Fields.FirstOrDefault(x => x.Name == "seedCriteria.seasonPackSeedTime").Value = ((ITorrentIndexerSettings)indexer.Settings).TorrentBaseSettings.PackSeedTime ?? ((ITorrentIndexerSettings)indexer.Settings).TorrentBaseSettings.SeedTime;
+                sonarrIndexer.Fields.FirstOrDefault(x => x.Name == "seedCriteria.seasonPackSeedTime").Value = ((ITorrentIndexerSettings)indexer.Settings).TorrentBaseSettings.SeedTime;
             }
 
             return sonarrIndexer;

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

@@ -17,8 +17,6 @@ namespace NzbDrone.Core.Applications.Sonarr
         public string Implementation { get; set; }
         public string ConfigContract { get; set; }
         public string InfoLink { get; set; }
-        public int? DownloadClientId { get; set; }
-        public int? SeasonSearchMaximumSingleEpisodeAge { get; set; }
         public HashSet<int> Tags { get; set; }
         public List<SonarrField> Fields { get; set; }
 
@@ -36,7 +34,7 @@ namespace NzbDrone.Core.Applications.Sonarr
 
             var apiPath = Fields.FirstOrDefault(x => x.Name == "apiPath")?.Value == null ? null : Fields.FirstOrDefault(x => x.Name == "apiPath").Value;
             var otherApiPath = other.Fields.FirstOrDefault(x => x.Name == "apiPath")?.Value == null ? null : other.Fields.FirstOrDefault(x => x.Name == "apiPath").Value;
-            var apiPathCompare = apiPath.Equals(otherApiPath);
+            var apiPathCompare = apiPath == otherApiPath;
 
             var minimumSeeders = Fields.FirstOrDefault(x => x.Name == "minimumSeeders")?.Value == null ? null : (int?)Convert.ToInt32(Fields.FirstOrDefault(x => x.Name == "minimumSeeders").Value);
             var otherMinimumSeeders = other.Fields.FirstOrDefault(x => x.Name == "minimumSeeders")?.Value == null ? null : (int?)Convert.ToInt32(other.Fields.FirstOrDefault(x => x.Name == "minimumSeeders").Value);

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

@@ -126,8 +126,6 @@ namespace NzbDrone.Core.Applications.Whisparr
                 {
                     if (indexer.Capabilities.Categories.SupportedCategories(Settings.SyncCategories.ToArray()).Any())
                     {
-                        whisparrIndexer.Fields.AddRange(remoteIndexer.Fields.Where(f => !whisparrIndexer.Fields.Any(s => s.Name == f.Name)));
-
                         // Update the indexer if it still has categories that match
                         _whisparrV3Proxy.UpdateIndexer(whisparrIndexer, Settings);
                     }
@@ -161,7 +159,6 @@ namespace NzbDrone.Core.Applications.Whisparr
         {
             var cacheKey = $"{Settings.BaseUrl}";
             var schemas = _schemaCache.Get(cacheKey, () => _whisparrV3Proxy.GetIndexerSchema(Settings), TimeSpan.FromDays(7));
-            var syncFields = new string[] { "baseUrl", "apiPath", "apiKey", "categories", "minimumSeeders", "seedCriteria.seedRatio", "seedCriteria.seedTime" };
 
             var newznab = schemas.Where(i => i.Implementation == "Newznab").First();
             var torznab = schemas.Where(i => i.Implementation == "Torznab").First();
@@ -178,11 +175,9 @@ namespace NzbDrone.Core.Applications.Whisparr
                 Priority = indexer.Priority,
                 Implementation = indexer.Protocol == DownloadProtocol.Usenet ? "Newznab" : "Torznab",
                 ConfigContract = schema.ConfigContract,
-                Fields = new List<WhisparrField>()
+                Fields = schema.Fields,
             };
 
-            whisparrIndexer.Fields.AddRange(schema.Fields.Where(x => syncFields.Contains(x.Name)));
-
             whisparrIndexer.Fields.FirstOrDefault(x => x.Name == "baseUrl").Value = $"{Settings.ProwlarrUrl.TrimEnd('/')}/{indexer.Id}/";
             whisparrIndexer.Fields.FirstOrDefault(x => x.Name == "apiPath").Value = "/api";
             whisparrIndexer.Fields.FirstOrDefault(x => x.Name == "apiKey").Value = _configFileProvider.ApiKey;

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

@@ -33,7 +33,7 @@ namespace NzbDrone.Core.Applications.Whisparr
 
             var apiPath = Fields.FirstOrDefault(x => x.Name == "apiPath")?.Value == null ? null : Fields.FirstOrDefault(x => x.Name == "apiPath").Value;
             var otherApiPath = other.Fields.FirstOrDefault(x => x.Name == "apiPath")?.Value == null ? null : other.Fields.FirstOrDefault(x => x.Name == "apiPath").Value;
-            var apiPathCompare = apiPath.Equals(otherApiPath);
+            var apiPathCompare = apiPath == otherApiPath;
 
             var minimumSeeders = Fields.FirstOrDefault(x => x.Name == "minimumSeeders")?.Value == null ? null : (int?)Convert.ToInt32(Fields.FirstOrDefault(x => x.Name == "minimumSeeders").Value);
             var otherMinimumSeeders = other.Fields.FirstOrDefault(x => x.Name == "minimumSeeders")?.Value == null ? null : (int?)Convert.ToInt32(other.Fields.FirstOrDefault(x => x.Name == "minimumSeeders").Value);

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/Datastore/Migration/023_download_client_categories.cs

@@ -1,15 +0,0 @@
-using FluentMigrator;
-using NzbDrone.Core.Datastore.Migration.Framework;
-
-namespace NzbDrone.Core.Datastore.Migration
-{
-    [Migration(023)]
-    public class download_client_categories : NzbDroneMigrationBase
-    {
-        protected override void MainDbUpgrade()
-        {
-            Alter.Table("DownloadClients")
-                .AddColumn("Categories").AsString().WithDefaultValue("[]");
-        }
-    }
-}

src/NzbDrone.Core/Datastore/TableMapping.cs

@@ -60,8 +60,7 @@ namespace NzbDrone.Core.Datastore
 
             Mapper.Entity<DownloadClientDefinition>("DownloadClients").RegisterModel()
                   .Ignore(x => x.ImplementationName)
-                  .Ignore(d => d.SupportsCategories)
-                  .Ignore(d => d.Protocol)
+                  .Ignore(i => i.Protocol)
                   .Ignore(d => d.Tags);
 
             Mapper.Entity<NotificationDefinition>("Notifications").RegisterModel()
@@ -116,7 +115,6 @@ namespace NzbDrone.Core.Datastore
             SqlMapper.AddTypeHandler(new EmbeddedDocumentConverter<List<string>>());
             SqlMapper.AddTypeHandler(new EmbeddedDocumentConverter<ReleaseInfo>());
             SqlMapper.AddTypeHandler(new EmbeddedDocumentConverter<HashSet<int>>());
-            SqlMapper.AddTypeHandler(new EmbeddedDocumentConverter<List<DownloadClientCategory>>());
             SqlMapper.AddTypeHandler(new OsPathConverter());
             SqlMapper.RemoveTypeMap(typeof(Guid));
             SqlMapper.RemoveTypeMap(typeof(Guid?));

src/NzbDrone.Core/Download/Clients/Aria2/Aria2.cs

@@ -18,8 +18,6 @@ namespace NzbDrone.Core.Download.Clients.Aria2
 
         public override string Name => "Aria2";
 
-        public override bool SupportsCategories => false;
-
         public Aria2(IAria2Proxy proxy,
                         ITorrentFileInfoReader torrentFileInfoReader,
                         IHttpClient httpClient,

src/NzbDrone.Core/Download/Clients/Blackhole/TorrentBlackhole.cs

@@ -74,8 +74,6 @@ namespace NzbDrone.Core.Download.Clients.Blackhole
 
         public override string Name => "Torrent Blackhole";
 
-        public override bool SupportsCategories => false;
-
         protected override void Test(List<ValidationFailure> failures)
         {
             failures.AddIfNotNull(TestFolder(Settings.TorrentFolder, "TorrentFolder"));

src/NzbDrone.Core/Download/Clients/Blackhole/UsenetBlackhole.cs

@@ -45,7 +45,6 @@ namespace NzbDrone.Core.Download.Clients.Blackhole
         }
 
         public override string Name => "Usenet Blackhole";
-        public override bool SupportsCategories => false;
 
         protected override void Test(List<ValidationFailure> failures)
         {

src/NzbDrone.Core/Download/Clients/Deluge/Deluge.cs

@@ -2,7 +2,6 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Net;
-using System.Text.RegularExpressions;
 using FluentValidation.Results;
 using NLog;
 using NzbDrone.Common.Disk;
@@ -39,10 +38,9 @@ namespace NzbDrone.Core.Download.Clients.Deluge
             }
 
             // _proxy.SetTorrentSeedingConfiguration(actualHash, remoteMovie.SeedConfiguration, Settings);
-            var category = GetCategoryForRelease(release) ?? Settings.Category;
-            if (category.IsNotNullOrWhiteSpace())
+            if (Settings.Category.IsNotNullOrWhiteSpace())
             {
-                _proxy.SetTorrentLabel(actualHash, category, Settings);
+                _proxy.SetTorrentLabel(actualHash, Settings.Category, Settings);
             }
 
             if (Settings.Priority == (int)DelugePriority.First)
@@ -63,10 +61,9 @@ namespace NzbDrone.Core.Download.Clients.Deluge
             }
 
             // _proxy.SetTorrentSeedingConfiguration(actualHash, release.SeedConfiguration, Settings);
-            var category = GetCategoryForRelease(release) ?? Settings.Category;
-            if (category.IsNotNullOrWhiteSpace())
+            if (Settings.Category.IsNotNullOrWhiteSpace())
             {
-                _proxy.SetTorrentLabel(actualHash, category, Settings);
+                _proxy.SetTorrentLabel(actualHash, Settings.Category, Settings);
             }
 
             if (Settings.Priority == (int)DelugePriority.First)
@@ -78,7 +75,6 @@ namespace NzbDrone.Core.Download.Clients.Deluge
         }
 
         public override string Name => "Deluge";
-        public override bool SupportsCategories => true;
 
         protected override void Test(List<ValidationFailure> failures)
         {
@@ -143,7 +139,7 @@ namespace NzbDrone.Core.Download.Clients.Deluge
 
         private ValidationFailure TestCategory()
         {
-            if (Categories.Count == 0)
+            if (Settings.Category.IsNullOrWhiteSpace())
             {
                 return null;
             }
@@ -160,42 +156,23 @@ namespace NzbDrone.Core.Download.Clients.Deluge
 
             var labels = _proxy.GetAvailableLabels(Settings);
 
-            var categories = Categories.Select(c => c.ClientCategory).ToList();
-            categories.Add(Settings.Category);
-
-            foreach (var category in categories)
+            if (Settings.Category.IsNotNullOrWhiteSpace() && !labels.Contains(Settings.Category))
             {
-                if (category.IsNotNullOrWhiteSpace() && !labels.Contains(category))
-                {
-                    _proxy.AddLabel(category, Settings);
-                    labels = _proxy.GetAvailableLabels(Settings);
+                _proxy.AddLabel(Settings.Category, Settings);
+                labels = _proxy.GetAvailableLabels(Settings);
 
-                    if (!labels.Contains(category))
+                if (!labels.Contains(Settings.Category))
+                {
+                    return new NzbDroneValidationFailure("Category", "Configuration of label failed")
                     {
-                        return new NzbDroneValidationFailure("Category", "Configuration of label failed")
-                        {
-                            DetailedDescription = "Prowlarr was unable to add the label to Deluge."
-                        };
-                    }
+                        DetailedDescription = "Prowlarr was unable to add the label to Deluge."
+                    };
                 }
             }
 
             return null;
         }
 
-        protected override void ValidateCategories(List<ValidationFailure> failures)
-        {
-            base.ValidateCategories(failures);
-
-            foreach (var label in Categories)
-            {
-                if (!Regex.IsMatch(label.ClientCategory, "^[-a-z0-9]*$"))
-                {
-                    failures.AddIfNotNull(new ValidationFailure(string.Empty, "Mapped Categories allowed characters a-z, 0-9 and -"));
-                }
-            }
-        }
-
         private ValidationFailure TestGetTorrents()
         {
             try

src/NzbDrone.Core/Download/Clients/Deluge/DelugeProxy.cs

@@ -19,7 +19,7 @@ namespace NzbDrone.Core.Download.Clients.Deluge
         string[] GetAvailablePlugins(DelugeSettings settings);
         string[] GetEnabledPlugins(DelugeSettings settings);
         string[] GetAvailableLabels(DelugeSettings settings);
-        DelugeLabel GetLabelOptions(DelugeSettings settings, string label);
+        DelugeLabel GetLabelOptions(DelugeSettings settings);
         void SetTorrentLabel(string hash, string label, DelugeSettings settings);
         void SetTorrentConfiguration(string hash, string key, object value, DelugeSettings settings);
         void SetTorrentSeedingConfiguration(string hash, TorrentSeedConfiguration seedConfiguration, DelugeSettings settings);
@@ -158,9 +158,9 @@ namespace NzbDrone.Core.Download.Clients.Deluge
             return response;
         }
 
-        public DelugeLabel GetLabelOptions(DelugeSettings settings, string label)
+        public DelugeLabel GetLabelOptions(DelugeSettings settings)
         {
-            var response = ProcessRequest<DelugeLabel>(settings, "label.get_options", label);
+            var response = ProcessRequest<DelugeLabel>(settings, "label.get_options", settings.Category);
 
             return response;
         }

src/NzbDrone.Core/Download/Clients/Deluge/DelugeSettings.cs

@@ -43,7 +43,7 @@ namespace NzbDrone.Core.Download.Clients.Deluge
         [FieldDefinition(4, Label = "Password", Type = FieldType.Password, Privacy = PrivacyLevel.Password)]
         public string Password { get; set; }
 
-        [FieldDefinition(5, Label = "Default Category", Type = FieldType.Textbox, HelpText = "Default fallback Category if no mapped category exists for a release. Adding a category specific to Prowlarr avoids conflicts with unrelated downloads, but it's optional")]
+        [FieldDefinition(5, Label = "Category", Type = FieldType.Textbox, HelpText = "Adding a category specific to Prowlarr avoids conflicts with unrelated downloads, but it's optional")]
         public string Category { get; set; }
 
         [FieldDefinition(6, Label = "Priority", Type = FieldType.Select, SelectOptions = typeof(DelugePriority), HelpText = "Priority to use when grabbing items")]

src/NzbDrone.Core/Download/Clients/DownloadStation/DownloadStationSettings.cs

@@ -18,9 +18,9 @@ namespace NzbDrone.Core.Download.Clients.DownloadStation
                                        .When(c => c.TvDirectory.IsNotNullOrWhiteSpace())
                                        .WithMessage("Cannot start with /");
 
-            RuleFor(c => c.Category).Matches(@"^\.?[-a-z]*$", RegexOptions.IgnoreCase).WithMessage("Allowed characters a-z and -");
+            RuleFor(c => c.TvCategory).Matches(@"^\.?[-a-z]*$", RegexOptions.IgnoreCase).WithMessage("Allowed characters a-z and -");
 
-            RuleFor(c => c.Category).Empty()
+            RuleFor(c => c.TvCategory).Empty()
                                       .When(c => c.TvDirectory.IsNotNullOrWhiteSpace())
                                       .WithMessage("Cannot use Category and Directory");
         }
@@ -45,8 +45,8 @@ namespace NzbDrone.Core.Download.Clients.DownloadStation
         [FieldDefinition(4, Label = "Password", Type = FieldType.Password, Privacy = PrivacyLevel.Password)]
         public string Password { get; set; }
 
-        [FieldDefinition(5, Label = "Default Category", Type = FieldType.Textbox, HelpText = "Default fallback category if no mapped category exists for a release. Adding a category specific to Prowlarr avoids conflicts with unrelated downloads, but it's optional. Creates a [category] subdirectory in the output directory.")]
-        public string Category { get; set; }
+        [FieldDefinition(5, Label = "Category", Type = FieldType.Textbox, HelpText = "Adding a category specific to Prowlarr avoids conflicts with unrelated downloads, but it's optional. Creates a [category] subdirectory in the output directory.")]
+        public string TvCategory { get; set; }
 
         [FieldDefinition(6, Label = "Directory", Type = FieldType.Textbox, HelpText = "Optional shared folder to put downloads into, leave blank to use the default Download Station location")]
         public string TvDirectory { get; set; }

src/NzbDrone.Core/Download/Clients/DownloadStation/TorrentDownloadStation.cs

@@ -44,7 +44,6 @@ namespace NzbDrone.Core.Download.Clients.DownloadStation
         }
 
         public override string Name => "Download Station";
-        public override bool SupportsCategories => false;
 
         public override ProviderMessage Message => new ProviderMessage("Prowlarr is unable to connect to Download Station if 2-Factor Authentication is enabled on your DSM account", ProviderMessageType.Warning);
 
@@ -199,7 +198,7 @@ namespace NzbDrone.Core.Download.Clients.DownloadStation
                 if (downloadDir != null)
                 {
                     var sharedFolder = downloadDir.Split('\\', '/')[0];
-                    var fieldName = Settings.TvDirectory.IsNotNullOrWhiteSpace() ? nameof(Settings.TvDirectory) : nameof(Settings.Category);
+                    var fieldName = Settings.TvDirectory.IsNotNullOrWhiteSpace() ? nameof(Settings.TvDirectory) : nameof(Settings.TvCategory);
 
                     var folderInfo = _fileStationProxy.GetInfoFileOrDirectory($"/{downloadDir}", Settings);
 
@@ -312,11 +311,11 @@ namespace NzbDrone.Core.Download.Clients.DownloadStation
             {
                 return Settings.TvDirectory.TrimStart('/');
             }
-            else if (Settings.Category.IsNotNullOrWhiteSpace())
+            else if (Settings.TvCategory.IsNotNullOrWhiteSpace())
             {
                 var destDir = GetDefaultDir();
 
-                return $"{destDir.TrimEnd('/')}/{Settings.Category}";
+                return $"{destDir.TrimEnd('/')}/{Settings.TvCategory}";
             }
 
             return null;

src/NzbDrone.Core/Download/Clients/DownloadStation/UsenetDownloadStation.cs

@@ -42,7 +42,6 @@ namespace NzbDrone.Core.Download.Clients.DownloadStation
         }
 
         public override string Name => "Download Station";
-        public override bool SupportsCategories => false;
 
         public override ProviderMessage Message => new ProviderMessage("Prowlarr is unable to connect to Download Station if 2-Factor Authentication is enabled on your DSM account", ProviderMessageType.Warning);
 
@@ -102,7 +101,7 @@ namespace NzbDrone.Core.Download.Clients.DownloadStation
                 if (downloadDir != null)
                 {
                     var sharedFolder = downloadDir.Split('\\', '/')[0];
-                    var fieldName = Settings.TvDirectory.IsNotNullOrWhiteSpace() ? nameof(Settings.TvDirectory) : nameof(Settings.Category);
+                    var fieldName = Settings.TvDirectory.IsNotNullOrWhiteSpace() ? nameof(Settings.TvDirectory) : nameof(Settings.TvCategory);
 
                     var folderInfo = _fileStationProxy.GetInfoFileOrDirectory($"/{downloadDir}", Settings);
 
@@ -273,11 +272,11 @@ namespace NzbDrone.Core.Download.Clients.DownloadStation
             {
                 return Settings.TvDirectory.TrimStart('/');
             }
-            else if (Settings.Category.IsNotNullOrWhiteSpace())
+            else if (Settings.TvCategory.IsNotNullOrWhiteSpace())
             {
                 var destDir = GetDefaultDir();
 
-                return $"{destDir.TrimEnd('/')}/{Settings.Category}";
+                return $"{destDir.TrimEnd('/')}/{Settings.TvCategory}";
             }
 
             return null;

src/NzbDrone.Core/Download/Clients/Flood/Flood.cs

@@ -27,7 +27,7 @@ namespace NzbDrone.Core.Download.Clients.Flood
             _proxy = proxy;
         }
 
-        private static IEnumerable<string> HandleTags(ReleaseInfo release, FloodSettings settings, string mappedCategory)
+        private static IEnumerable<string> HandleTags(ReleaseInfo release, FloodSettings settings)
         {
             var result = new HashSet<string>();
 
@@ -36,11 +36,6 @@ namespace NzbDrone.Core.Download.Clients.Flood
                 result.UnionWith(settings.Tags);
             }
 
-            if (mappedCategory != null)
-            {
-                result.Add(mappedCategory);
-            }
-
             if (settings.AdditionalTags.Any())
             {
                 foreach (var additionalTag in settings.AdditionalTags)
@@ -60,19 +55,18 @@ namespace NzbDrone.Core.Download.Clients.Flood
         }
 
         public override string Name => "Flood";
-        public override bool SupportsCategories => true;
         public override ProviderMessage Message => new ProviderMessage("Prowlarr is unable to remove torrents that have finished seeding when using Flood", ProviderMessageType.Warning);
 
         protected override string AddFromTorrentFile(ReleaseInfo release, string hash, string filename, byte[] fileContent)
         {
-            _proxy.AddTorrentByFile(Convert.ToBase64String(fileContent), HandleTags(release, Settings, GetCategoryForRelease(release)), Settings);
+            _proxy.AddTorrentByFile(Convert.ToBase64String(fileContent), HandleTags(release, Settings), Settings);
 
             return hash;
         }
 
         protected override string AddFromMagnetLink(ReleaseInfo release, string hash, string magnetLink)
         {
-            _proxy.AddTorrentByUrl(magnetLink, HandleTags(release, Settings, GetCategoryForRelease(release)), Settings);
+            _proxy.AddTorrentByUrl(magnetLink, HandleTags(release, Settings), Settings);
 
             return hash;
         }

src/NzbDrone.Core/Download/Clients/Hadouken/Hadouken.cs

@@ -27,7 +27,6 @@ namespace NzbDrone.Core.Download.Clients.Hadouken
         }
 
         public override string Name => "Hadouken";
-        public override bool SupportsCategories => true;
 
         protected override void Test(List<ValidationFailure> failures)
         {
@@ -42,14 +41,14 @@ namespace NzbDrone.Core.Download.Clients.Hadouken
 
         protected override string AddFromMagnetLink(ReleaseInfo release, string hash, string magnetLink)
         {
-            _proxy.AddTorrentUri(Settings, magnetLink, GetCategoryForRelease(release) ?? Settings.Category);
+            _proxy.AddTorrentUri(Settings, magnetLink);
 
             return hash.ToUpper();
         }
 
         protected override string AddFromTorrentFile(ReleaseInfo release, string hash, string filename, byte[] fileContent)
         {
-            return _proxy.AddTorrentFile(Settings, fileContent, GetCategoryForRelease(release) ?? Settings.Category).ToUpper();
+            return _proxy.AddTorrentFile(Settings, fileContent).ToUpper();
         }
 
         private ValidationFailure TestConnection()

src/NzbDrone.Core/Download/Clients/Hadouken/HadoukenProxy.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Net;
 using NLog;
@@ -13,8 +13,8 @@ namespace NzbDrone.Core.Download.Clients.Hadouken
         HadoukenSystemInfo GetSystemInfo(HadoukenSettings settings);
         HadoukenTorrent[] GetTorrents(HadoukenSettings settings);
         IReadOnlyDictionary<string, object> GetConfig(HadoukenSettings settings);
-        string AddTorrentFile(HadoukenSettings settings, byte[] fileContent, string label);
-        void AddTorrentUri(HadoukenSettings settings, string torrentUrl, string label);
+        string AddTorrentFile(HadoukenSettings settings, byte[] fileContent);
+        void AddTorrentUri(HadoukenSettings settings, string torrentUrl);
         void RemoveTorrent(HadoukenSettings settings, string downloadId);
         void RemoveTorrentAndData(HadoukenSettings settings, string downloadId);
     }
@@ -47,14 +47,14 @@ namespace NzbDrone.Core.Download.Clients.Hadouken
             return ProcessRequest<IReadOnlyDictionary<string, object>>(settings, "webui.getSettings");
         }
 
-        public string AddTorrentFile(HadoukenSettings settings, byte[] fileContent, string label)
+        public string AddTorrentFile(HadoukenSettings settings, byte[] fileContent)
         {
-            return ProcessRequest<string>(settings, "webui.addTorrent", "file", Convert.ToBase64String(fileContent), new { label });
+            return ProcessRequest<string>(settings, "webui.addTorrent", "file", Convert.ToBase64String(fileContent), new { label = settings.Category });
         }
 
-        public void AddTorrentUri(HadoukenSettings settings, string torrentUrl, string label)
+        public void AddTorrentUri(HadoukenSettings settings, string torrentUrl)
         {
-            ProcessRequest<string>(settings, "webui.addTorrent", "url", torrentUrl, new { label });
+            ProcessRequest<string>(settings, "webui.addTorrent", "url", torrentUrl, new { label = settings.Category });
         }
 
         public void RemoveTorrent(HadoukenSettings settings, string downloadId)

src/NzbDrone.Core/Download/Clients/Hadouken/HadoukenSettings.cs

@@ -51,7 +51,7 @@ namespace NzbDrone.Core.Download.Clients.Hadouken
         [FieldDefinition(5, Label = "Password", Type = FieldType.Password, Privacy = PrivacyLevel.Password)]
         public string Password { get; set; }
 
-        [FieldDefinition(6, Label = "Default Category", Type = FieldType.Textbox, HelpText = "Default fallback category if no mapped category exists for a release.")]
+        [FieldDefinition(6, Label = "Category", Type = FieldType.Textbox)]
         public string Category { get; set; }
 
         public NzbDroneValidationResult Validate()

src/NzbDrone.Core/Download/Clients/NzbVortex/NzbVortex.cs

@@ -29,9 +29,8 @@ namespace NzbDrone.Core.Download.Clients.NzbVortex
         protected override string AddFromNzbFile(ReleaseInfo release, string filename, byte[] fileContents)
         {
             var priority = Settings.Priority;
-            var category = GetCategoryForRelease(release) ?? Settings.Category;
 
-            var response = _proxy.DownloadNzb(fileContents, filename, priority, Settings, category);
+            var response = _proxy.DownloadNzb(fileContents, filename, priority, Settings);
 
             if (response == null)
             {
@@ -42,7 +41,6 @@ namespace NzbDrone.Core.Download.Clients.NzbVortex
         }
 
         public override string Name => "NZBVortex";
-        public override bool SupportsCategories => true;
 
         protected List<NzbVortexGroup> GetGroups()
         {
@@ -113,27 +111,19 @@ namespace NzbDrone.Core.Download.Clients.NzbVortex
 
         private ValidationFailure TestCategory()
         {
-            var groups = GetGroups();
+            var group = GetGroups().FirstOrDefault(c => c.GroupName == Settings.Category);
 
-            foreach (var category in Categories)
+            if (group == null)
             {
-                if (!category.ClientCategory.IsNullOrWhiteSpace() && !groups.Any(v => v.GroupName == category.ClientCategory))
+                if (Settings.Category.IsNotNullOrWhiteSpace())
                 {
-                    return new NzbDroneValidationFailure(string.Empty, "Group does not exist")
+                    return new NzbDroneValidationFailure("Category", "Group does not exist")
                     {
-                        DetailedDescription = "A mapped category you entered doesn't exist in NzbVortex. Go to NzbVortex to create it."
+                        DetailedDescription = "The Group you entered doesn't exist in NzbVortex. Go to NzbVortex to create it."
                     };
                 }
             }
 
-            if (!Settings.Category.IsNullOrWhiteSpace() && !groups.Any(v => v.GroupName == Settings.Category))
-            {
-                return new NzbDroneValidationFailure("Category", "Category does not exist")
-                {
-                    DetailedDescription = "The category you entered doesn't exist in NzbVortex. Go to NzbVortex to create it."
-                };
-            }
-
             return null;
         }
 

src/NzbDrone.Core/Download/Clients/NzbVortex/NzbVortexProxy.cs

@@ -13,7 +13,7 @@ namespace NzbDrone.Core.Download.Clients.NzbVortex
 {
     public interface INzbVortexProxy
     {
-        string DownloadNzb(byte[] nzbData, string filename, int priority, NzbVortexSettings settings, string group);
+        string DownloadNzb(byte[] nzbData, string filename, int priority, NzbVortexSettings settings);
         void Remove(int id, bool deleteData, NzbVortexSettings settings);
         NzbVortexVersionResponse GetVersion(NzbVortexSettings settings);
         NzbVortexApiVersionResponse GetApiVersion(NzbVortexSettings settings);
@@ -37,7 +37,7 @@ namespace NzbDrone.Core.Download.Clients.NzbVortex
             _authSessionIdCache = cacheManager.GetCache<string>(GetType(), "authCache");
         }
 
-        public string DownloadNzb(byte[] nzbData, string filename, int priority, NzbVortexSettings settings, string group)
+        public string DownloadNzb(byte[] nzbData, string filename, int priority, NzbVortexSettings settings)
         {
             var requestBuilder = BuildRequest(settings).Resource("nzb/add")
                                                        .Post()
@@ -45,7 +45,7 @@ namespace NzbDrone.Core.Download.Clients.NzbVortex
 
             if (settings.Category.IsNotNullOrWhiteSpace())
             {
-                requestBuilder.AddQueryParam("groupname", group);
+                requestBuilder.AddQueryParam("groupname", settings.Category);
             }
 
             requestBuilder.AddFormUpload("name", filename, nzbData, "application/x-nzb");

src/NzbDrone.Core/Download/Clients/NzbVortex/NzbVortexSettings.cs

@@ -47,7 +47,7 @@ namespace NzbDrone.Core.Download.Clients.NzbVortex
         [FieldDefinition(3, Label = "API Key", Type = FieldType.Textbox, Privacy = PrivacyLevel.ApiKey)]
         public string ApiKey { get; set; }
 
-        [FieldDefinition(4, Label = "Default Category", Type = FieldType.Textbox, HelpText = "Default fallback category if no mapped category exists for a release. Adding a category specific to Prowlarr avoids conflicts with unrelated downloads, but it's optional")]
+        [FieldDefinition(4, Label = "Group", Type = FieldType.Textbox, HelpText = "Adding a category specific to Prowlarr avoids conflicts with unrelated downloads, but it's optional")]
         public string Category { get; set; }
 
         [FieldDefinition(5, Label = "Priority", Type = FieldType.Select, SelectOptions = typeof(NzbVortexPriority), HelpText = "Priority to use when grabbing items")]

src/NzbDrone.Core/Download/Clients/Nzbget/Nzbget.cs

@@ -33,7 +33,7 @@ namespace NzbDrone.Core.Download.Clients.Nzbget
 
         protected override string AddFromNzbFile(ReleaseInfo release, string filename, byte[] fileContent)
         {
-            var category = GetCategoryForRelease(release) ?? Settings.Category;
+            var category = Settings.Category;
 
             var priority = Settings.Priority;
 
@@ -50,7 +50,7 @@ namespace NzbDrone.Core.Download.Clients.Nzbget
 
         protected override string AddFromLink(ReleaseInfo release)
         {
-            var category = GetCategoryForRelease(release) ?? Settings.Category;
+            var category = Settings.Category;
 
             var priority = Settings.Priority;
 
@@ -66,7 +66,6 @@ namespace NzbDrone.Core.Download.Clients.Nzbget
         }
 
         public override string Name => "NZBGet";
-        public override bool SupportsCategories => true;
 
         protected IEnumerable<NzbgetCategory> GetCategories(Dictionary<string, string> config)
         {
@@ -140,18 +139,6 @@ namespace NzbDrone.Core.Download.Clients.Nzbget
             var config = _proxy.GetConfig(Settings);
             var categories = GetCategories(config);
 
-            foreach (var category in Categories)
-            {
-                if (!category.ClientCategory.IsNullOrWhiteSpace() && !categories.Any(v => v.Name == category.ClientCategory))
-                {
-                    return new NzbDroneValidationFailure(string.Empty, "Category does not exist")
-                    {
-                        InfoLink = _proxy.GetBaseUrl(Settings),
-                        DetailedDescription = "A mapped category you entered doesn't exist in NZBGet. Go to NZBGet to create it."
-                    };
-                }
-            }
-
             if (!Settings.Category.IsNullOrWhiteSpace() && !categories.Any(v => v.Name == Settings.Category))
             {
                 return new NzbDroneValidationFailure("Category", "Category does not exist")

src/NzbDrone.Core/Download/Clients/Nzbget/NzbgetSettings.cs

@@ -53,7 +53,7 @@ namespace NzbDrone.Core.Download.Clients.Nzbget
         [FieldDefinition(5, Label = "Password", Type = FieldType.Password, Privacy = PrivacyLevel.Password)]
         public string Password { get; set; }
 
-        [FieldDefinition(6, Label = "Default Category", Type = FieldType.Textbox, HelpText = "Default fallback category if no mapped category exists for a release. Adding a category specific to Prowlarr avoids conflicts with unrelated downloads, but it's optional")]
+        [FieldDefinition(6, Label = "Category", Type = FieldType.Textbox, HelpText = "Adding a category specific to Prowlarr avoids conflicts with unrelated downloads, but it's optional")]
         public string Category { get; set; }
 
         [FieldDefinition(7, Label = "Priority", Type = FieldType.Select, SelectOptions = typeof(NzbgetPriority), HelpText = "Priority for items added from Prowlarr")]

src/NzbDrone.Core/Download/Clients/Pneumatic/Pneumatic.cs

@@ -23,7 +23,6 @@ namespace NzbDrone.Core.Download.Clients.Pneumatic
         }
 
         public override string Name => "Pneumatic";
-        public override bool SupportsCategories => false;
 
         public override DownloadProtocol Protocol => DownloadProtocol.Usenet;
 

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

@@ -52,9 +52,8 @@ namespace NzbDrone.Core.Download.Clients.QBittorrent
             //var addHasSetShareLimits = setShareLimits && ProxyApiVersion >= new Version(2, 8, 1);
             var itemToTop = Settings.Priority == (int)QBittorrentPriority.First;
             var forceStart = (QBittorrentState)Settings.InitialState == QBittorrentState.ForceStart;
-            var category = GetCategoryForRelease(release) ?? Settings.Category;
 
-            Proxy.AddTorrentFromUrl(magnetLink, null, Settings, category);
+            Proxy.AddTorrentFromUrl(magnetLink, null, Settings);
 
             if (itemToTop || forceStart)
             {
@@ -101,9 +100,8 @@ namespace NzbDrone.Core.Download.Clients.QBittorrent
             //var addHasSetShareLimits = setShareLimits && ProxyApiVersion >= new Version(2, 8, 1);
             var itemToTop = Settings.Priority == (int)QBittorrentPriority.First;
             var forceStart = (QBittorrentState)Settings.InitialState == QBittorrentState.ForceStart;
-            var category = GetCategoryForRelease(release) ?? Settings.Category;
 
-            Proxy.AddTorrentFromFile(filename, fileContent, null, Settings, category);
+            Proxy.AddTorrentFromFile(filename, fileContent, null, Settings);
 
             if (itemToTop || forceStart)
             {
@@ -169,7 +167,6 @@ namespace NzbDrone.Core.Download.Clients.QBittorrent
         }
 
         public override string Name => "qBittorrent";
-        public override bool SupportsCategories => true;
 
         protected override void Test(List<ValidationFailure> failures)
         {
@@ -200,7 +197,7 @@ namespace NzbDrone.Core.Download.Clients.QBittorrent
                 else if (version < Version.Parse("1.6"))
                 {
                     // API version 6 introduced support for labels
-                    if (Settings.Category.IsNotNullOrWhiteSpace() || Categories.Count > 0)
+                    if (Settings.Category.IsNotNullOrWhiteSpace())
                     {
                         return new NzbDroneValidationFailure("Category", "Category is not supported")
                         {
@@ -208,6 +205,15 @@ namespace NzbDrone.Core.Download.Clients.QBittorrent
                         };
                     }
                 }
+                else if (Settings.Category.IsNullOrWhiteSpace())
+                {
+                    // warn if labels are supported, but category is not provided
+                    return new NzbDroneValidationFailure("Category", "Category is recommended")
+                    {
+                        IsWarning = true,
+                        DetailedDescription = "Prowlarr will not attempt to import completed downloads without a category."
+                    };
+                }
             }
             catch (DownloadClientAuthenticationException ex)
             {
@@ -245,7 +251,7 @@ namespace NzbDrone.Core.Download.Clients.QBittorrent
 
         private ValidationFailure TestCategory()
         {
-            if (Settings.Category.IsNullOrWhiteSpace() && Categories.Count == 0)
+            if (Settings.Category.IsNullOrWhiteSpace())
             {
                 return null;
             }
@@ -259,23 +265,6 @@ namespace NzbDrone.Core.Download.Clients.QBittorrent
 
             Dictionary<string, QBittorrentLabel> labels = Proxy.GetLabels(Settings);
 
-            foreach (var category in Categories)
-            {
-                if (category.ClientCategory.IsNotNullOrWhiteSpace() && !labels.ContainsKey(category.ClientCategory))
-                {
-                    Proxy.AddLabel(category.ClientCategory, Settings);
-                    labels = Proxy.GetLabels(Settings);
-
-                    if (!labels.ContainsKey(category.ClientCategory))
-                    {
-                        return new NzbDroneValidationFailure(string.Empty, "Configuration of label failed")
-                        {
-                            DetailedDescription = "Prowlarr was unable to add the label to qBittorrent."
-                        };
-                    }
-                }
-            }
-
             if (Settings.Category.IsNotNullOrWhiteSpace() && !labels.ContainsKey(Settings.Category))
             {
                 Proxy.AddLabel(Settings.Category, Settings);

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

@@ -18,8 +18,8 @@ namespace NzbDrone.Core.Download.Clients.QBittorrent
         QBittorrentTorrentProperties GetTorrentProperties(string hash, QBittorrentSettings settings);
         List<QBittorrentTorrentFile> GetTorrentFiles(string hash, QBittorrentSettings settings);
 
-        void AddTorrentFromUrl(string torrentUrl, TorrentSeedConfiguration seedConfiguration, QBittorrentSettings settings, string category);
-        void AddTorrentFromFile(string fileName, byte[] fileContent, TorrentSeedConfiguration seedConfiguration, QBittorrentSettings settings, string category);
+        void AddTorrentFromUrl(string torrentUrl, TorrentSeedConfiguration seedConfiguration, QBittorrentSettings settings);
+        void AddTorrentFromFile(string fileName, byte[] fileContent, TorrentSeedConfiguration seedConfiguration, QBittorrentSettings settings);
 
         void RemoveTorrent(string hash, bool removeData, QBittorrentSettings settings);
         void SetTorrentLabel(string hash, string label, QBittorrentSettings settings);

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

@@ -113,15 +113,15 @@ namespace NzbDrone.Core.Download.Clients.QBittorrent
             return response;
         }
 
-        public void AddTorrentFromUrl(string torrentUrl, TorrentSeedConfiguration seedConfiguration, QBittorrentSettings settings, string category)
+        public void AddTorrentFromUrl(string torrentUrl, TorrentSeedConfiguration seedConfiguration, QBittorrentSettings settings)
         {
             var request = BuildRequest(settings).Resource("/command/download")
                                                 .Post()
                                                 .AddFormParameter("urls", torrentUrl);
 
-            if (category.IsNotNullOrWhiteSpace())
+            if (settings.Category.IsNotNullOrWhiteSpace())
             {
-                request.AddFormParameter("category", category);
+                request.AddFormParameter("category", settings.Category);
             }
 
             // Note: ForceStart is handled by separate api call
@@ -143,15 +143,15 @@ namespace NzbDrone.Core.Download.Clients.QBittorrent
             }
         }
 
-        public void AddTorrentFromFile(string fileName, byte[] fileContent, TorrentSeedConfiguration seedConfiguration, QBittorrentSettings settings, string category)
+        public void AddTorrentFromFile(string fileName, byte[] fileContent, TorrentSeedConfiguration seedConfiguration, QBittorrentSettings settings)
         {
             var request = BuildRequest(settings).Resource("/command/upload")
                                                 .Post()
                                                 .AddFormUpload("torrents", fileName, fileContent);
 
-            if (category.IsNotNullOrWhiteSpace())
+            if (settings.Category.IsNotNullOrWhiteSpace())
             {
-                request.AddFormParameter("category", category);
+                request.AddFormParameter("category", settings.Category);
             }
 
             // Note: ForceStart is handled by separate api call

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

@@ -119,14 +119,14 @@ namespace NzbDrone.Core.Download.Clients.QBittorrent
             return response;
         }
 
-        public void AddTorrentFromUrl(string torrentUrl, TorrentSeedConfiguration seedConfiguration, QBittorrentSettings settings, string category)
+        public void AddTorrentFromUrl(string torrentUrl, TorrentSeedConfiguration seedConfiguration, QBittorrentSettings settings)
         {
             var request = BuildRequest(settings).Resource("/api/v2/torrents/add")
                                                 .Post()
                                                 .AddFormParameter("urls", torrentUrl);
-            if (category.IsNotNullOrWhiteSpace())
+            if (settings.Category.IsNotNullOrWhiteSpace())
             {
-                request.AddFormParameter("category", category);
+                request.AddFormParameter("category", settings.Category);
             }
 
             // Note: ForceStart is handled by separate api call
@@ -153,15 +153,15 @@ namespace NzbDrone.Core.Download.Clients.QBittorrent
             }
         }
 
-        public void AddTorrentFromFile(string fileName, byte[] fileContent, TorrentSeedConfiguration seedConfiguration, QBittorrentSettings settings, string category)
+        public void AddTorrentFromFile(string fileName, byte[] fileContent, TorrentSeedConfiguration seedConfiguration, QBittorrentSettings settings)
         {
             var request = BuildRequest(settings).Resource("/api/v2/torrents/add")
                                                 .Post()
                                                 .AddFormUpload("torrents", fileName, fileContent);
 
-            if (category.IsNotNullOrWhiteSpace())
+            if (settings.Category.IsNotNullOrWhiteSpace())
             {
-                request.AddFormParameter("category", category);
+                request.AddFormParameter("category", settings.Category);
             }
 
             // Note: ForceStart is handled by separate api call