Added Indexer Factory

request extension

start migration controller/resource

removed unneccesary using - probalby more to go still

more scaffolding

added more framework; contemplating using the importlists from other arrs as a base for this

Revert "jackett config"

This reverts commit 6523eaf55450ceed84b3667421595a9d9e34dc51.

added stuff from nit's radarr pr

neated code up a little bit, more to do on this though

get config sorted, api logic also added - migration todo and indexer config to do

.github/FUNDING.yml

@@ -1,6 +1,6 @@
 # These are supported funding model platforms
 
-github: Prowlarr # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
 patreon: # Replace with a single Patreon username
 open_collective: prowlarr
 ko_fi: # Replace with a single Ko-fi username

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,36 @@
+---
+name: Bug Report
+about: Support Requests will be closed immediately, if you are not 100% certain this is a bug please go to our Reddit or Discord first. Exceptions do not mean you found a bug!
+title: ''
+labels: 'Type: Bug'
+assignees: ''
+
+---
+<!-- Support Requests will be closed immediately, if you are unsure go to our Reddit or Discord first. Exceptions do not mean you found a bug! -->
+**Describe the bug**
+<!-- A clear and concise description of what the bug is. -->
+
+**To Reproduce**
+<!-- Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error -->
+
+**Expected behavior**
+<!-- A clear and concise description of what you expected to happen.-->
+
+**Screenshots**
+<!-- If applicable, add screenshots to help explain your problem.-->
+
+**Platform Information (please complete the following information):**
+ - OS: <!-- [e.g. Windows 10 2004 / Ubuntu 20.04] -->
+ - Docker: <!-- [Yes/No] -->
+ - .NET Version (System -> Status): <!--[e.g. .NET 5.0.1] -->
+ - Browser and Version (Only needed for UI issues): <!--[e.g. chrome 86.0.4240.198] -->
+ - Prowlarr Version: <!--[e.g. 0.1.2.1854-->
+ - Prowlarr Branch: <!--[e.g. develop, nightly]-->
+
+Turn on Trace logs under Settings -> General and wait for the bug to occur again.
+**Upload the full log file here (or another site (e.g. pastebin) and link it). Issues will be closed, if they do not include this!**
+<!-- Trace logs are named Prowlarr.trace.txt or Prowlarr.trace.#.txt and will contain "trace" in them-->

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -1,74 +0,0 @@
-name: Bug Report
-title: "[BUG]: "
-description: 'Report a new bug, if you are not 100% certain this is a bug please go to our Reddit or Discord first'
-labels: ['Type: Bug', 'Status: Needs Triage']
-body:
-- type: checkboxes
-  attributes:
-    label: Is there an existing issue for this?
-    description: Please search to see if an issue already exists for the bug you encountered.
-    options:
-    - label: I have searched the existing issues
-      required: true
-- type: textarea
-  attributes:
-    label: Current Behavior
-    description: A concise description of what you're experiencing.
-  validations:
-    required: true
-- type: textarea
-  attributes:
-    label: Expected Behavior
-    description: A concise description of what you expected to happen.
-  validations:
-    required: true
-- type: textarea
-  attributes:
-    label: Steps To Reproduce
-    description: Steps to reproduce the behavior.
-    placeholder: |
-      1. In this environment...
-      2. With this config...
-      3. Run '...'
-      4. See error...
-  validations:
-    required: false
-- type: textarea
-  attributes:
-    label: Environment
-    description: |
-      examples:
-        - **OS**: Ubuntu 20.04
-        - **Prowlarr**: Prowlarr 0.1.0.650
-        - **Docker Install**: Yes
-        - **Using Reverse Proxy**: No
-        - **Browser**: Firefox 90 (If UI related)
-    value: |
-        - OS: 
-        - Prowlarr:
-        - Docker Install:
-        - Using Reverse Proxy:
-        - Browser:
-    render: markdown
-  validations:
-    required: true
-- type: dropdown
-  attributes:
-    label: What branch are you running?
-    options:
-      - Master
-      - Develop
-      - Nightly
-      - Other (This issue will be closed)
-  validations:
-    required: true
-- type: textarea
-  attributes:
-    label: Anything else?
-    description: |
-      Trace Logs (https://wiki.servarr.com/prowlarr/troubleshooting#logging-and-log-files) 
-      Links? References? Anything that will give us more context about the issue you are encountering!
-      
-      Tip: You can attach images or log files by clicking this area to highlight it and then dragging files in.
-  validations:
-    required: true

.github/ISSUE_TEMPLATE/config.yml

@@ -1,8 +1,5 @@
 blank_issues_enabled: false
 contact_links:
-  - name: Indexer Requests
-    url: https://requests.prowlarr.com/
-    about: Request new indexers to be added. Vote on existing requests.
   - name: Support via Discord
     url: https://prowlarr.com/discord
     about: Chat with users and devs on support and setup related topics.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,20 @@
+---
+name: Feature Request
+about: Suggest an idea for Prowlarr
+title: ''
+labels: 'Type: Feature Request'
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+<!-- A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] -->
+
+**Describe the solution you'd like**
+<!-- A clear and concise description of what you want to happen. -->
+
+**Describe alternatives you've considered**
+<!-- A clear and concise description of any alternative solutions or features you've considered. -->
+
+**Additional context**
+<!-- Add any other context or screenshots about the feature request here. -->

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -1,39 +0,0 @@
-name: Feature Request
-title: "[FEAT]: "
-description: 'Suggest an idea for Prowlarr'
-labels: ['Type: Feature Request', 'Status: Needs Triage']
-body:
-- type: checkboxes
-  attributes:
-    label: Is there an existing issue for this?
-    description: Please search to see if an issue already exists for the feature you are requesting.
-    options:
-    - label: I have searched the existing issues
-      required: true
-- type: textarea
-  attributes:
-    label: Is your feature request related to a problem? Please describe
-    description: A clear and concise description of what the problem is.
-  validations:
-    required: true
-- type: textarea
-  attributes:
-    label: Describe the solution you'd like
-    description: A clear and concise description of what you want to happen.
-  validations:
-    required: true
-- type: textarea
-  attributes:
-    label: Describe alternatives you've considered
-    description: A clear and concise description of any alternative solutions or features you've considered.
-  validations:
-    required: true
-- type: textarea
-  attributes:
-    label: Anything else?
-    description: |
-      Links? References? Mockups? Anything that will give us more context about the feature you are encountering!
-      
-      Tip: You can attach images or log files by clicking this area to highlight it and then dragging files in.
-  validations:
-    required: true

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,15 +1,14 @@
 #### Database Migration
-YES - XXXX | NO
+YES | NO
 
 #### Description
 A few sentences describing the overall goals of the pull request's commits.
 
 #### Screenshot (if UI related)
-
 #### Todos
 - [ ] Tests
-- [ ] Translation Keys (./src/NzbDrone.Core/Localization/Core/en.json)
-- [ ] [Wiki Updates](https://wiki.servarr.com)
+- [ ] Translation Keys
+- [ ] Wiki Updates
 
 #### Issues Fixed or Closed by this PR
 

.github/workflows/azuresync.yml

@@ -1,41 +0,0 @@
-name: Sync issue to Azure DevOps work item
-
-on:
-  issues:
-    types:
-      [opened, edited, deleted, closed, reopened, labeled, unlabeled, assigned]
-
-concurrency: azuresync-${{ github.event.issue.number }}
-
-jobs:
-  alert:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: danhellem/github-actions-issue-to-work-item@master
-        if: "${{ contains(github.event.issue.labels.*.name, 'Type: Bug') == true }}"
-        env:
-          ado_token: "${{ secrets.ADO_PERSONAL_ACCESS_TOKEN }}"
-          github_token: "${{ github.token }}"
-          ado_organization: "Servarr"
-          ado_project: "Servarr"
-          ado_area_path: "Servarr\\Prowlarr"
-          ado_wit: "Bug"
-          ado_new_state: "New"
-          ado_active_state: "Active"
-          ado_close_state: "Closed"
-          ado_bypassrules: true
-          log_level: 100
-      - uses: danhellem/github-actions-issue-to-work-item@master
-        if: "${{ contains(github.event.issue.labels.*.name, 'Type: Bug') == false }}"
-        env:
-          ado_token: "${{ secrets.ADO_PERSONAL_ACCESS_TOKEN }}"
-          github_token: "${{ github.token }}"
-          ado_organization: "Servarr"
-          ado_project: "Servarr"
-          ado_area_path: "Servarr\\Prowlarr"
-          ado_wit: "User Story"
-          ado_new_state: "New"
-          ado_active_state: "Active"
-          ado_close_state: "Closed"
-          ado_bypassrules: true
-          log_level: 100

CONTRIBUTING.md

@@ -2,30 +2,12 @@
 
 We're always looking for people to help make Prowlarr even better, there are a number of ways to contribute.
 
-This file is updated on an ad-hoc basis, for the latest details please see the [contributing wiki page](https://wiki.servarr.com/prowlarr/contributing).
-
 ## Documentation ##
-Setup guides, FAQ, the more information we have on the [wiki](https://wiki.servarr.com/prowlarr) the better.
+Setup guides, FAQ, the more information we have on the wiki the better.
 
 ## Development ##
 
-### Tools required ###
-- Visual Studio 2019 or higher (https://www.visualstudio.com/vs/).  The community version is free and works (https://www.visualstudio.com/downloads/).
-- HTML/Javascript editor of choice (VS Code/Sublime Text/Webstorm/Atom/etc)
-- [Git](https://git-scm.com/downloads)
-- [NodeJS](https://nodejs.org/en/download/) (Node 12.X.X or higher)
-- [Yarn](https://yarnpkg.com/)
-- .NET Core 5.0. 
-
-### Getting started ###
-
-1. Fork Prowlarr
-2. Clone the repository into your development machine. [*info*](https://docs.github.com/en/github/creating-cloning-and-archiving-repositories/cloning-a-repository-from-github)
-3. Install the required Node Packages `yarn install`
-4. Start gulp to monitor your dev environment for any changes that need post processing using `yarn start` command.
-5. Build the project in Visual Studio, Setting startup project to `Prowlarr.Console` and framework to `net5.0`
-6. Debug the project in Visual Studio
-7. Open http://localhost:9696
+See the readme for information on setting up your development environment.
 
 ### Contributing Code ###
 - If you're adding a new, already requested feature, please comment on [Github Issues](https://github.com/Prowlarr/Prowlarr/issues "Github Issues") so work is not duplicated (If you want to add something not already on there, please talk to us first)
@@ -38,10 +20,6 @@ Setup guides, FAQ, the more information we have on the [wiki](https://wiki.serva
 - One feature/bug fix per pull request to keep things clean and easy to understand
 - Use 4 spaces instead of tabs, this is the default for VS 2019 and WebStorm (to my knowledge)
 
-### Contributing Indexers ###
-- If you're contributing an indexer please phrase your commit as something like: `New: (Indexer) {Indexer Name}`, `New: (Indexer) {Usenet|Torrent} {Indexer Name}`, `New: (Indexer) {Torznab|Newznab} {Indexer Name}`
-- If you're updating an indexer please phrase your commit as something like: `Fixed: (Indexer) {Indexer Name} {changes}` e.g. `Fixed: (Indexer) Changed BHD to use API`
-
 ### Pull Requesting ###
 - Only make pull requests to develop, never master, if you make a PR to master we'll comment on it and close it
 - You're probably going to get some comments or questions from us, they will be to ensure consistency and maintainability

README.md

@@ -2,23 +2,20 @@
 
 [![Build Status](https://dev.azure.com/Prowlarr/Prowlarr/_apis/build/status/Prowlarr.Prowlarr?branchName=develop)](https://dev.azure.com/Prowlarr/Prowlarr/_build/latest?definitionId=1&branchName=develop)
 [![Translated](https://translate.servarr.com/widgets/servarr/-/prowlarr/svg-badge.svg)](https://translate.servarr.com/engage/prowlarr/?utm_source=widget)
-[![Docker Pulls](https://img.shields.io/docker/pulls/hotio/prowlarr.svg)](https://wiki.servarr.com/prowlarr/installation#docker)
+[![Docker Pulls](https://img.shields.io/docker/pulls/hotio/prowlarr.svg)](https://wiki.servarr.com/Prowlarr_Installation#Docker)
 ![Github Downloads](https://img.shields.io/github/downloads/Prowlarr/Prowlarr/total.svg)
 [![Backers on Open Collective](https://opencollective.com/Prowlarr/backers/badge.svg)](#backers) 
 [![Sponsors on Open Collective](https://opencollective.com/Prowlarr/sponsors/badge.svg)](#sponsors)
 
-Prowlarr is an indexer manager/proxy built on the popular arr .net/reactjs base stack to integrate with your various PVR apps. Prowlarr supports management of both Torrent Trackers and Usenet Indexers. It integrates seamlessly with Lidarr, Mylar3, Radarr, Readarr, and Sonarr offering complete management of your indexers with no per app Indexer setup required (we do it all).
+Prowlarr is a indexer manager/proxy built on the popular arr .net/reactjs base stack to integrate with your various PVR apps. Prowlarr supports both Torrent Trackers and Usenet Indexers. It integrates seamlessly with Sonarr, Radarr, Lidarr, and Readarr offering complete management of your indexers with no per app Indexer setup required (we do it all).
 
 ## Major Features Include:
-- Usenet support for 24 indexers natively, including Headphones VIP, and support for any Newznab compatible indexer via "Generic Newznab"
-- Torrent support for over 500 trackers with more added all the time
-- Torrent support for any Torznab compatible tracker via "Generic Torznab"
-- Indexer Sync to Sonarr/Radarr/Readarr/Lidarr/Mylar3, so no manual configuration of the other applications are required
-- Indexer history and statistics
-- Manual searching of Trackers & Indexers at a category level
+- Usenet support for any Newznab compatible indexer, including Headphones VIP
+- Torrent support 400+ trackers & more coming soon
+- Indexer Sync to Sonarr/Radarr/Readarr/Lidarr, so no manual configuration of the other applications are required
+- Indexer History and Statistics
+- Manual Searching of Trackers & Indexers at a category level
 - Support for pushing releases directly to your download clients from Prowlarr
-- Indexer health and status notifications
-- Per Indexer proxy support (SOCKS4, SOCKS5, HTTP, Flaresolverr)
 
 ## Support
 Note: Prowlarr is currently early in life, thus bugs should be expected
@@ -26,24 +23,17 @@ Note: Prowlarr is currently early in life, thus bugs should be expected
 [![Discord](https://img.shields.io/badge/discord-chat-7289DA.svg?maxAge=60)](https://prowlarr.com/discord)
 [![Reddit](https://img.shields.io/badge/reddit-discussion-FF4500.svg?maxAge=60)](https://www.reddit.com/r/Prowlarr)
 [![GitHub - Bugs and Feature Requests Only](https://img.shields.io/badge/github-issues-red.svg?maxAge=60)](https://github.com/Prowlarr/Prowlarr/issues)
-[![Wiki](https://img.shields.io/badge/servarr-wiki-181717.svg?maxAge=60)](https://wiki.servarr.com/prowlarr)
+[![Wiki](https://img.shields.io/badge/servarr-wiki-181717.svg?maxAge=60)](https://wiki.servarr.com/Prowlarr)
 
-## Indexers/Trackers
+## Feature Requests
 
-[Supported Indexers](https://wiki.servarr.com/en/prowlarr/supported-indexers)
-
-[Indexer Requests](https://requests.prowlarr.com)
-- Request or vote on an existing request for a new tracker/indexer
+[Feature Requests](https://github.com/Prowlarr/Prowlarr/issues/new?assignees=&template=feature_request.md&Type%3A%20Feature%20Request&title=)
 
 ## Contributors & Developers
-
-- [Contribute (GitHub)](CONTRIBUTING.md)
-- [Contribution (Wiki Article)](https://wiki.servarr.com/prowlarr/contributing)
-- [YML Indexer Defintion (Wiki Article)](https://wiki.servarr.com/prowlarr/cardigann-yml-definition)
-
-This project exists thanks to all the people who contribute. 
+This project exists thanks to all the people who contribute. [Contribute](CONTRIBUTING.md).
 <a href="https://github.com/Prowlarr/Prowlarr/graphs/contributors"><img src="https://opencollective.com/Prowlarr/contributors.svg?width=890&button=false" /></a>
 
+
 ## Backers
 
 Thank you to all our backers! 🙏 [Become a backer](https://opencollective.com/Prowlarr#backer)

azure-pipelines.yml

@@ -7,13 +7,13 @@ variables:
   outputFolder: './_output'
   artifactsFolder: './_artifacts'
   testsFolder: './_tests'
-  majorVersion: '0.1.1'
+  majorVersion: '0.1.0'
   minorVersion: $[counter('minorVersion', 1)]
   prowlarrVersion: '$(majorVersion).$(minorVersion)'
   buildName: '$(Build.SourceBranchName).$(prowlarrVersion)'
   sentryOrg: 'servarr'
   sentryUrl: 'https://sentry.servarr.com'
-  dotnetVersion: '5.0.400'
+  dotnetVersion: '5.0.203'
   yarnCacheFolder: $(Pipeline.Workspace)/.yarn
 
 trigger:
@@ -879,7 +879,7 @@ stages:
             artifactName: 'WindowsAutomationScreenshots'
             targetPath: $(Build.SourcesDirectory)
         - checkout: none
-        - pwsh: |
+        - powershell: |
             iex ((New-Object System.Net.WebClient).DownloadString('https://raw.githubusercontent.com/Servarr/AzureDiscordNotify/master/DiscordNotify.ps1'))
           env:
             SYSTEM_ACCESSTOKEN: $(System.AccessToken)

frontend/src/App/AppRoutes.js

@@ -11,7 +11,6 @@ import ApplicationSettingsConnector from 'Settings/Applications/ApplicationSetti
 import DevelopmentSettingsConnector from 'Settings/Development/DevelopmentSettingsConnector';
 import DownloadClientSettingsConnector from 'Settings/DownloadClients/DownloadClientSettingsConnector';
 import GeneralSettingsConnector from 'Settings/General/GeneralSettingsConnector';
-import IndexerSettings from 'Settings/Indexers/IndexerSettings';
 import NotificationSettings from 'Settings/Notifications/NotificationSettings';
 import Settings from 'Settings/Settings';
 import TagSettings from 'Settings/Tags/TagSettings';
@@ -91,11 +90,6 @@ function AppRoutes(props) {
         component={Settings}
       />
 
-      <Route
-        path="/settings/indexers"
-        component={IndexerSettings}
-      />
-
       <Route
         path="/settings/applications"
         component={ApplicationSettingsConnector}

frontend/src/Components/Chart/BarChart.js

@@ -23,16 +23,6 @@ class BarChart extends Component {
     this.myChart = new Chart(this.canvasRef.current, {
       type: 'bar',
       options: {
-        x: {
-          ticks: {
-            stepSize: this.props.stepSize
-          }
-        },
-        y: {
-          ticks: {
-            stepSize: this.props.stepSize
-          }
-        },
         indexAxis: this.props.horizontal ? 'y' : 'x',
         maintainAspectRatio: false,
         plugins: {
@@ -74,8 +64,7 @@ BarChart.propTypes = {
   horizontal: PropTypes.bool,
   legend: PropTypes.bool,
   title: PropTypes.string.isRequired,
-  kind: PropTypes.oneOf(kinds.all).isRequired,
-  stepSize: PropTypes.number
+  kind: PropTypes.oneOf(kinds.all).isRequired
 };
 
 BarChart.defaultProps = {
@@ -83,8 +72,7 @@ BarChart.defaultProps = {
   horizontal: false,
   legend: false,
   title: '',
-  kind: kinds.INFO,
-  stepSize: 1
+  kind: kinds.INFO
 };
 
 export default BarChart;

frontend/src/Components/Chart/StackedBarChart.js

@@ -16,16 +16,10 @@ class StackedBarChart extends Component {
         maintainAspectRatio: false,
         scales: {
           x: {
-            stacked: true,
-            ticks: {
-              stepSize: this.props.stepSize
-            }
+            stacked: true
           },
           y: {
-            stacked: true,
-            ticks: {
-              stepSize: this.props.stepSize
-            }
+            stacked: true
           }
         },
         plugins: {
@@ -69,13 +63,11 @@ class StackedBarChart extends Component {
 
 StackedBarChart.propTypes = {
   data: PropTypes.object.isRequired,
-  title: PropTypes.string.isRequired,
-  stepSize: PropTypes.number
+  title: PropTypes.string.isRequired
 };
 
 StackedBarChart.defaultProps = {
-  title: '',
-  stepSize: 1
+  title: ''
 };
 
 export default StackedBarChart;

frontend/src/Components/FileBrowser/FileBrowserModalContent.js

@@ -129,7 +129,7 @@ class FileBrowserModalContent extends Component {
                 className={styles.mappedDrivesWarning}
                 kind={kinds.WARNING}
               >
-                <Link to="https://wiki.servarr.com/prowlarr/faq#why-cant-prowlarr-see-my-files-on-a-remote-server">
+                <Link to="https://wiki.servarr.com/Prowlarr_FAQ#Why_cant_Prowlarr_see_my_files_on_a_remote_server">
                   {translate('MappedDrivesRunningAsService')}
                 </Link>
               </Alert>

frontend/src/Components/Form/FormInputHelpText.js

@@ -25,7 +25,7 @@ function FormInputHelpText(props) {
       isCheckInput && styles.isCheckInput
     )}
     >
-      <div dangerouslySetInnerHTML={{ __html: text }} />
+      {text}
 
       {
         link ?

frontend/src/Components/Form/InfoInput.js

@@ -11,6 +11,8 @@ class InfoInput extends Component {
       value
     } = this.props;
 
+    console.log(this.props);
+
     return (
       <span dangerouslySetInnerHTML={{ __html: value }} />
     );

frontend/src/Components/Page/Sidebar/PageSidebar.js

@@ -48,10 +48,6 @@ const links = [
     title: translate('Settings'),
     to: '/settings',
     children: [
-      {
-        title: translate('Indexers'),
-        to: '/settings/indexers'
-      },
       {
         title: translate('Apps'),
         to: '/settings/applications'

frontend/src/Helpers/Props/icons.js

@@ -228,4 +228,4 @@ export const UNSAVED_SETTING = farDotCircle;
 export const VIEW = fasEye;
 export const WARNING = fasExclamationTriangle;
 export const WIKI = fasBookReader;
-export const BLOCKLIST = fasBan;
+export const BLACKLIST = fasBan;

frontend/src/History/HistoryOptions.js

@@ -73,7 +73,7 @@ class HistoryOptions extends Component {
 }
 
 HistoryOptions.propTypes = {
-  historyCleanupDays: PropTypes.number.isRequired,
+  historyCleanupDays: PropTypes.bool.isRequired,
   dispatchSaveGeneralSettings: PropTypes.func.isRequired
 };
 

frontend/src/Indexer/Add/AddIndexerModalContent.js

@@ -20,25 +20,19 @@ import styles from './AddIndexerModalContent.css';
 const columns = [
   {
     name: 'protocol',
-    label: translate('Protocol'),
+    label: 'Protocol',
     isSortable: true,
     isVisible: true
   },
   {
     name: 'name',
-    label: translate('Name'),
-    isSortable: true,
-    isVisible: true
-  },
-  {
-    name: 'language',
-    label: translate('Language'),
+    label: 'Name',
     isSortable: true,
     isVisible: true
   },
   {
     name: 'privacy',
-    label: translate('Privacy'),
+    label: 'Privacy',
     isSortable: true,
     isVisible: true
   }

frontend/src/Indexer/Add/SelectIndexerRow.js

@@ -26,8 +26,7 @@ class SelectIndexerRow extends Component {
     const {
       protocol,
       privacy,
-      name,
-      language
+      name
     } = this.props;
 
     return (
@@ -42,10 +41,6 @@ class SelectIndexerRow extends Component {
           {name}
         </TableRowCell>
 
-        <TableRowCell>
-          {language}
-        </TableRowCell>
-
         <TableRowCell>
           {privacy}
         </TableRowCell>
@@ -58,7 +53,6 @@ SelectIndexerRow.propTypes = {
   name: PropTypes.string.isRequired,
   protocol: PropTypes.string.isRequired,
   privacy: PropTypes.string.isRequired,
-  language: PropTypes.string.isRequired,
   implementation: PropTypes.string.isRequired,
   onIndexerSelect: PropTypes.func.isRequired
 };

frontend/src/Indexer/Edit/EditIndexerModalContent.js

@@ -13,7 +13,6 @@ 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 AdvancedSettingsButton from 'Settings/AdvancedSettingsButton';
 import translate from 'Utilities/String/translate';
 import styles from './EditIndexerModalContent.css';
 
@@ -32,7 +31,6 @@ function EditIndexerModalContent(props) {
     onSavePress,
     onTestPress,
     onDeleteIndexerPress,
-    onAdvancedSettingsPress,
     ...otherProps
   } = props;
 
@@ -45,7 +43,6 @@ function EditIndexerModalContent(props) {
     supportsRss,
     supportsRedirect,
     appProfileId,
-    tags,
     fields,
     priority
   } = item;
@@ -90,6 +87,7 @@ function EditIndexerModalContent(props) {
                   type={inputTypes.CHECK}
                   name="enable"
                   helpTextWarning={supportsRss.value ? undefined : translate('RSSIsNotSupportedWithThisIndexer')}
+                  isDisabled={!supportsRss.value}
                   {...enable}
                   onChange={onInputChange}
                 />
@@ -101,7 +99,7 @@ function EditIndexerModalContent(props) {
                 <FormInputGroup
                   type={inputTypes.CHECK}
                   name="redirect"
-                  helpText={translate('RedirectHelpText')}
+                  helpText={'Redirect incoming download requests for indexer instead of Proxying using Prowlarr'}
                   isDisabled={!supportsRedirect.value}
                   {...redirect}
                   onChange={onInputChange}
@@ -115,7 +113,6 @@ function EditIndexerModalContent(props) {
                   type={inputTypes.APP_PROFILE_SELECT}
                   name="appProfileId"
                   {...appProfileId}
-                  helpText={translate('AppProfileSelectHelpText')}
                   onChange={onInputChange}
                 />
               </FormGroup>
@@ -152,18 +149,6 @@ function EditIndexerModalContent(props) {
                   onChange={onInputChange}
                 />
               </FormGroup>
-
-              <FormGroup>
-                <FormLabel>{translate('Tags')}</FormLabel>
-
-                <FormInputGroup
-                  type={inputTypes.TAG}
-                  name="tags"
-                  helpText="Use tags to specify default clients, specify Indexer Proxies, or just to organize your indexers."
-                  {...tags}
-                  onChange={onInputChange}
-                />
-              </FormGroup>
             </Form>
         }
       </ModalBody>
@@ -179,12 +164,6 @@ function EditIndexerModalContent(props) {
             </Button>
         }
 
-        <AdvancedSettingsButton
-          advancedSettings={advancedSettings}
-          onAdvancedSettingsPress={onAdvancedSettingsPress}
-          showLabel={false}
-        />
-
         <SpinnerErrorButton
           isSpinning={isTesting}
           error={saveError}
@@ -224,7 +203,6 @@ EditIndexerModalContent.propTypes = {
   onModalClose: PropTypes.func.isRequired,
   onSavePress: PropTypes.func.isRequired,
   onTestPress: PropTypes.func.isRequired,
-  onAdvancedSettingsPress: PropTypes.func.isRequired,
   onDeleteIndexerPress: PropTypes.func
 };
 

frontend/src/Indexer/Edit/EditIndexerModalContentConnector.js

@@ -3,7 +3,6 @@ import React, { Component } from 'react';
 import { connect } from 'react-redux';
 import { createSelector } from 'reselect';
 import { saveIndexer, setIndexerFieldValue, setIndexerValue, testIndexer } from 'Store/Actions/indexerActions';
-import { toggleAdvancedSettings } from 'Store/Actions/settingsActions';
 import createIndexerSchemaSelector from 'Store/Selectors/createIndexerSchemaSelector';
 import EditIndexerModalContent from './EditIndexerModalContent';
 
@@ -24,8 +23,7 @@ const mapDispatchToProps = {
   setIndexerValue,
   setIndexerFieldValue,
   saveIndexer,
-  testIndexer,
-  toggleAdvancedSettings
+  testIndexer
 };
 
 class EditIndexerModalContentConnector extends Component {
@@ -58,10 +56,6 @@ class EditIndexerModalContentConnector extends Component {
     this.props.testIndexer({ id: this.props.id });
   }
 
-  onAdvancedSettingsPress = () => {
-    this.props.toggleAdvancedSettings();
-  }
-
   //
   // Render
 
@@ -71,7 +65,6 @@ class EditIndexerModalContentConnector extends Component {
         {...this.props}
         onSavePress={this.onSavePress}
         onTestPress={this.onTestPress}
-        onAdvancedSettingsPress={this.onAdvancedSettingsPress}
         onInputChange={this.onInputChange}
         onFieldChange={this.onFieldChange}
       />
@@ -87,7 +80,6 @@ EditIndexerModalContentConnector.propTypes = {
   item: PropTypes.object.isRequired,
   setIndexerValue: PropTypes.func.isRequired,
   setIndexerFieldValue: PropTypes.func.isRequired,
-  toggleAdvancedSettings: PropTypes.func.isRequired,
   saveIndexer: PropTypes.func.isRequired,
   testIndexer: PropTypes.func.isRequired,
   onModalClose: PropTypes.func.isRequired

frontend/src/Indexer/Editor/Tags/TagsModalContent.js

@@ -50,7 +50,7 @@ class TagsModalContent extends Component {
 
   render() {
     const {
-      indexerTags,
+      movieTags,
       tagList,
       onModalClose
     } = this.props;
@@ -108,7 +108,7 @@ class TagsModalContent extends Component {
 
               <div className={styles.result}>
                 {
-                  indexerTags.map((t) => {
+                  movieTags.map((t) => {
                     const tag = _.find(tagList, { id: t });
 
                     if (!tag) {
@@ -140,7 +140,7 @@ class TagsModalContent extends Component {
                           return null;
                         }
 
-                        if (indexerTags.indexOf(t) > -1) {
+                        if (movieTags.indexOf(t) > -1) {
                           return null;
                         }
 
@@ -179,7 +179,7 @@ class TagsModalContent extends Component {
 }
 
 TagsModalContent.propTypes = {
-  indexerTags: PropTypes.arrayOf(PropTypes.number).isRequired,
+  movieTags: PropTypes.arrayOf(PropTypes.number).isRequired,
   tagList: PropTypes.arrayOf(PropTypes.object).isRequired,
   onModalClose: PropTypes.func.isRequired,
   onApplyTagsPress: PropTypes.func.isRequired

frontend/src/Indexer/Editor/Tags/TagsModalContentConnector.js

@@ -10,15 +10,15 @@ function createMapStateToProps() {
     (state, { indexerIds }) => indexerIds,
     createAllIndexersSelector(),
     createTagsSelector(),
-    (indexerIds, allIndexers, tagList) => {
-      const indexers = _.intersectionWith(allIndexers, indexerIds, (s, id) => {
+    (indexerIds, allMovies, tagList) => {
+      const movies = _.intersectionWith(allMovies, indexerIds, (s, id) => {
         return s.id === id;
       });
 
-      const indexerTags = _.uniq(_.concat(..._.map(indexers, 'tags')));
+      const movieTags = _.uniq(_.concat(..._.map(movies, 'tags')));
 
       return {
-        indexerTags,
+        movieTags,
         tagList
       };
     }

frontend/src/Indexer/Index/IndexerIndexConnector.js

@@ -4,7 +4,7 @@ import { connect } from 'react-redux';
 import { createSelector } from 'reselect';
 import withScrollPosition from 'Components/withScrollPosition';
 import { testAllIndexers } from 'Store/Actions/indexerActions';
-import { saveIndexerEditor, setMovieFilter, setMovieSort, setMovieTableOption } from 'Store/Actions/indexerIndexActions';
+import { saveMovieEditor, setMovieFilter, setMovieSort, setMovieTableOption } from 'Store/Actions/indexerIndexActions';
 import scrollPositions from 'Store/scrollPositions';
 import createDimensionsSelector from 'Store/Selectors/createDimensionsSelector';
 import createIndexerClientSideCollectionItemsSelector from 'Store/Selectors/createIndexerClientSideCollectionItemsSelector';
@@ -40,8 +40,8 @@ function createMapDispatchToProps(dispatch, props) {
       dispatch(setMovieFilter({ selectedFilterKey }));
     },
 
-    dispatchSaveIndexerEditor(payload) {
-      dispatch(saveIndexerEditor(payload));
+    dispatchSaveMovieEditor(payload) {
+      dispatch(saveMovieEditor(payload));
     },
 
     onTestAllPress() {
@@ -56,7 +56,7 @@ class IndexerIndexConnector extends Component {
   // Listeners
 
   onSaveSelected = (payload) => {
-    this.props.dispatchSaveIndexerEditor(payload);
+    this.props.dispatchSaveMovieEditor(payload);
   }
 
   onScroll = ({ scrollTop }) => {
@@ -79,7 +79,7 @@ class IndexerIndexConnector extends Component {
 
 IndexerIndexConnector.propTypes = {
   isSmallScreen: PropTypes.bool.isRequired,
-  dispatchSaveIndexerEditor: PropTypes.func.isRequired,
+  dispatchSaveMovieEditor: PropTypes.func.isRequired,
   items: PropTypes.arrayOf(PropTypes.object)
 };
 

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

@@ -71,7 +71,7 @@ class IndexerIndexRow extends Component {
     const {
       id,
       name,
-      indexerUrls,
+      baseUrl,
       enable,
       redirect,
       tags,
@@ -248,7 +248,7 @@ class IndexerIndexRow extends Component {
                     className={styles.externalLink}
                     name={icons.EXTERNAL_LINK}
                     title={'Website'}
-                    to={indexerUrls[0].replace('api.', '')}
+                    to={baseUrl}
                   />
 
                   <IconButton
@@ -289,7 +289,7 @@ class IndexerIndexRow extends Component {
 
 IndexerIndexRow.propTypes = {
   id: PropTypes.number.isRequired,
-  indexerUrls: PropTypes.arrayOf(PropTypes.string).isRequired,
+  baseUrl: PropTypes.string.isRequired,
   protocol: PropTypes.string.isRequired,
   privacy: PropTypes.string.isRequired,
   priority: PropTypes.number.isRequired,

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

@@ -31,7 +31,7 @@ function IndexerStatusCell(props) {
         <Icon
           className={styles.statusIcon}
           kind={enabled ? enableKind : kinds.DEFAULT}
-          name={enabled ? enableIcon: icons.BLOCKLIST}
+          name={enabled ? enableIcon: icons.BLACKLIST}
           title={enabled ? enableTitle : 'Indexer is Disabled'}
         />
       }

frontend/src/Indexer/Info/IndexerInfoModalContent.js

@@ -18,7 +18,7 @@ function IndexerInfoModalContent(props) {
     description,
     encoding,
     language,
-    indexerUrls,
+    baseUrl,
     protocol,
     onModalClose
   } = props;
@@ -54,10 +54,10 @@ function IndexerInfoModalContent(props) {
 
           <DescriptionListItemTitle>Indexer Site</DescriptionListItemTitle>
           <DescriptionListItemDescription>
-            <Link to={indexerUrls[0]}>{indexerUrls[0]}</Link>
+            <Link to={baseUrl}>{baseUrl}</Link>
           </DescriptionListItemDescription>
 
-          <DescriptionListItemTitle>{`${protocol === 'usenet' ? 'Newznab' : 'Torznab'} Url`}</DescriptionListItemTitle>
+          <DescriptionListItemTitle>{protocol === 'usenet' ? 'Newznab' : 'Torznab'} Url</DescriptionListItemTitle>
           <DescriptionListItemDescription>
             {`${window.location.origin}${window.Prowlarr.urlBase}/${id}/api`}
           </DescriptionListItemDescription>
@@ -74,7 +74,7 @@ IndexerInfoModalContent.propTypes = {
   description: PropTypes.string.isRequired,
   encoding: PropTypes.string.isRequired,
   language: PropTypes.string.isRequired,
-  indexerUrls: PropTypes.arrayOf(PropTypes.string).isRequired,
+  baseUrl: PropTypes.string.isRequired,
   protocol: PropTypes.string.isRequired,
   onModalClose: PropTypes.func.isRequired
 };

frontend/src/Indexer/Info/IndexerInfoModalContentConnector.js

@@ -10,6 +10,7 @@ function createMapStateToProps() {
     (state) => state.settings.advancedSettings,
     createIndexerSelector(),
     (advancedSettings, indexer) => {
+      console.log(indexer);
       return {
         advancedSettings,
         ...indexer

frontend/src/Indexer/Stats/Stats.js

@@ -19,10 +19,6 @@ function getAverageResponseTimeData(indexerStats) {
     };
   });
 
-  data.sort((a, b) => {
-    return b.value - a.value;
-  });
-
   return data;
 }
 

frontend/src/Search/Menus/SearchIndexSortMenu.js

@@ -26,7 +26,7 @@ function SearchIndexSortMenu(props) {
           sortDirection={sortDirection}
           onPress={onSortSelect}
         >
-          {translate('Protocol')}
+          Protocol
         </SortMenuItem>
 
         <SortMenuItem
@@ -35,7 +35,7 @@ function SearchIndexSortMenu(props) {
           sortDirection={sortDirection}
           onPress={onSortSelect}
         >
-          {translate('Age')}
+          Age
         </SortMenuItem>
 
         <SortMenuItem
@@ -53,7 +53,7 @@ function SearchIndexSortMenu(props) {
           sortDirection={sortDirection}
           onPress={onSortSelect}
         >
-          {translate('Indexer')}
+          Indexer
         </SortMenuItem>
 
         <SortMenuItem
@@ -62,7 +62,7 @@ function SearchIndexSortMenu(props) {
           sortDirection={sortDirection}
           onPress={onSortSelect}
         >
-          {translate('Size')}
+          Size
         </SortMenuItem>
 
         <SortMenuItem
@@ -71,7 +71,7 @@ function SearchIndexSortMenu(props) {
           sortDirection={sortDirection}
           onPress={onSortSelect}
         >
-          {translate('Files')}
+          Files
         </SortMenuItem>
 
         <SortMenuItem
@@ -80,7 +80,7 @@ function SearchIndexSortMenu(props) {
           sortDirection={sortDirection}
           onPress={onSortSelect}
         >
-          {translate('Grabs')}
+          Grabs
         </SortMenuItem>
 
         <SortMenuItem
@@ -89,7 +89,7 @@ function SearchIndexSortMenu(props) {
           sortDirection={sortDirection}
           onPress={onSortSelect}
         >
-          {translate('Peers')}
+          Peers
         </SortMenuItem>
 
         <SortMenuItem
@@ -98,7 +98,7 @@ function SearchIndexSortMenu(props) {
           sortDirection={sortDirection}
           onPress={onSortSelect}
         >
-          {translate('Category')}
+          Category
         </SortMenuItem>
       </MenuContent>
     </SortMenu>

frontend/src/Search/NoSearchResults.js

@@ -19,7 +19,7 @@ function NoSearchResults(props) {
   return (
     <div>
       <div className={styles.message}>
-        {translate('NoSearchResultsFound')}
+        No search results found, try performing a new search below.
       </div>
     </div>
   );

frontend/src/Search/SearchFooter.js

@@ -4,10 +4,8 @@ import React, { Component } from 'react';
 import IndexersSelectInputConnector from 'Components/Form/IndexersSelectInputConnector';
 import NewznabCategorySelectInputConnector from 'Components/Form/NewznabCategorySelectInputConnector';
 import TextInput from 'Components/Form/TextInput';
-import keyboardShortcuts from 'Components/keyboardShortcuts';
 import SpinnerButton from 'Components/Link/SpinnerButton';
 import PageContentFooter from 'Components/Page/PageContentFooter';
-import translate from 'Utilities/String/translate';
 import SearchFooterLabel from './SearchFooterLabel';
 import styles from './SearchFooter.css';
 
@@ -27,7 +25,7 @@ class SearchFooter extends Component {
 
     this.state = {
       searchingReleases: false,
-      searchQuery: defaultSearchQuery || '',
+      searchQuery: defaultSearchQuery,
       searchIndexerIds: defaultIndexerIds,
       searchCategories: defaultCategories
     };
@@ -40,11 +38,9 @@ class SearchFooter extends Component {
       searchQuery
     } = this.state;
 
-    if (searchQuery !== '' || searchCategories.length > 0 || searchIndexerIds.length > 0) {
+    if (searchQuery !== '' || searchCategories !== [] || searchIndexerIds !== []) {
       this.onSearchPress();
     }
-
-    this.props.bindShortcut('enter', this.onSearchPress, { isGlobal: true });
   }
 
   componentDidUpdate(prevProps) {
@@ -52,12 +48,14 @@ class SearchFooter extends Component {
       isFetching,
       defaultIndexerIds,
       defaultCategories,
+      defaultSearchQuery,
       searchError
     } = this.props;
 
     const {
       searchIndexerIds,
-      searchCategories
+      searchCategories,
+      searchQuery
     } = this.state;
 
     const newState = {};
@@ -70,6 +68,10 @@ class SearchFooter extends Component {
       newState.searchCategories = defaultCategories;
     }
 
+    if (searchQuery !== defaultSearchQuery) {
+      newState.searchQuery = defaultSearchQuery;
+    }
+
     if (prevProps.isFetching && !isFetching && !searchError) {
       newState.searchingReleases = false;
     }
@@ -86,10 +88,6 @@ class SearchFooter extends Component {
     this.props.onSearchPress(this.state.searchQuery, this.state.searchIndexerIds, this.state.searchCategories);
   }
 
-  onSearchInputChange = ({ value }) => {
-    this.setState({ searchQuery: value });
-  }
-
   //
   // Render
 
@@ -116,10 +114,9 @@ class SearchFooter extends Component {
 
           <TextInput
             name='searchQuery'
-            autoFocus={true}
             value={searchQuery}
             isDisabled={isFetching}
-            onChange={this.onSearchInputChange}
+            onChange={onInputChange}
           />
         </div>
 
@@ -166,7 +163,7 @@ class SearchFooter extends Component {
                 isDisabled={isFetching || !hasIndexers}
                 onPress={this.onSearchPress}
               >
-                {translate('Search')}
+                Search
               </SpinnerButton>
             </div>
           </div>
@@ -184,8 +181,7 @@ SearchFooter.propTypes = {
   onSearchPress: PropTypes.func.isRequired,
   hasIndexers: PropTypes.bool.isRequired,
   onInputChange: PropTypes.func.isRequired,
-  searchError: PropTypes.object,
-  bindShortcut: PropTypes.func.isRequired
+  searchError: PropTypes.object
 };
 
-export default keyboardShortcuts(SearchFooter);
+export default SearchFooter;

frontend/src/Search/Table/CategoryLabel.js

@@ -1,22 +1,10 @@
 import PropTypes from 'prop-types';
 import React from 'react';
 import Label from 'Components/Label';
-import { kinds, tooltipPositions } from 'Helpers/Props';
-import Tooltip from '../../Components/Tooltip/Tooltip';
 
 function CategoryLabel({ categories }) {
   const sortedCategories = categories.filter((cat) => cat.name !== undefined).sort((c) => c.id);
 
-  if (categories?.length === 0) {
-    return (
-      <Tooltip
-        anchor={<Label kind={kinds.DANGER}>Unknown</Label>}
-        tooltip="Please report this issue to the GitHub as this shouldn't be happening"
-        position={tooltipPositions.LEFT}
-      />
-    );
-  }
-
   return (
     <span>
       {
@@ -32,10 +20,6 @@ function CategoryLabel({ categories }) {
   );
 }
 
-CategoryLabel.defaultProps = {
-  categories: []
-};
-
 CategoryLabel.propTypes = {
   categories: PropTypes.arrayOf(PropTypes.object).isRequired
 };

frontend/src/Settings/AdvancedSettingsButton.js

@@ -10,8 +10,7 @@ import styles from './AdvancedSettingsButton.css';
 function AdvancedSettingsButton(props) {
   const {
     advancedSettings,
-    onAdvancedSettingsPress,
-    showLabel
+    onAdvancedSettingsPress
   } = props;
 
   return (
@@ -44,27 +43,18 @@ function AdvancedSettingsButton(props) {
         />
       </span>
 
-      {
-        showLabel &&
-          <div className={styles.labelContainer}>
-            <div className={styles.label}>
-              {advancedSettings ? translate('HideAdvanced') : translate('ShowAdvanced')}
-            </div>
-          </div>
-      }
-
+      <div className={styles.labelContainer}>
+        <div className={styles.label}>
+          {advancedSettings ? translate('HideAdvanced') : translate('ShowAdvanced')}
+        </div>
+      </div>
     </Link>
   );
 }
 
 AdvancedSettingsButton.propTypes = {
   advancedSettings: PropTypes.bool.isRequired,
-  onAdvancedSettingsPress: PropTypes.func.isRequired,
-  showLabel: PropTypes.bool.isRequired
-};
-
-AdvancedSettingsButton.defaultProps = {
-  showLabel: true
+  onAdvancedSettingsPress: PropTypes.func.isRequired
 };
 
 export default AdvancedSettingsButton;

frontend/src/Settings/Applications/Applications/EditApplicationModalContent.js

@@ -18,9 +18,9 @@ import translate from 'Utilities/String/translate';
 import styles from './EditApplicationModalContent.css';
 
 const syncLevelOptions = [
-  { key: 'disabled', value: translate('Disabled') },
-  { key: 'addOnly', value: translate('AddRemoveOnly') },
-  { key: 'fullSync', value: translate('FullSync') }
+  { key: 'disabled', value: 'Disabled' },
+  { key: 'addOnly', value: 'Add and Remove Only' },
+  { key: 'fullSync', value: 'Full Sync' }
 ];
 
 function EditApplicationModalContent(props) {
@@ -53,7 +53,7 @@ function EditApplicationModalContent(props) {
   return (
     <ModalContent onModalClose={onModalClose}>
       <ModalHeader>
-        {`${id ? translate('Edit') : translate('Add')} ${translate('Application')}`}
+        {`${id ? 'Edit' : 'Add'} Application`}
       </ModalHeader>
 
       <ModalBody>
@@ -94,13 +94,13 @@ function EditApplicationModalContent(props) {
               </FormGroup>
 
               <FormGroup>
-                <FormLabel>{translate('SyncLevel')}</FormLabel>
+                <FormLabel>{'Sync Level'}</FormLabel>
 
                 <FormInputGroup
                   type={inputTypes.SELECT}
                   values={syncLevelOptions}
                   name="syncLevel"
-                  helpText={`${translate('SyncLevelAddRemove')}<br>${translate('SyncLevelFull')}`}
+                  helpText={'Sync Level'}
                   {...syncLevel}
                   onChange={onInputChange}
                 />

frontend/src/Settings/DownloadClients/DownloadClients/AddDownloadClientModalContent.js

@@ -53,9 +53,6 @@ class AddDownloadClientModalContent extends Component {
               <div>
 
                 <Alert kind={kinds.INFO}>
-                  <div>
-                    {translate('AddDownloadClientToProwlarr')}
-                  </div>
                   <div>
                     {translate('ProwlarrSupportsAnyDownloadClient')}
                   </div>

frontend/src/Settings/General/UpdateSettings.js

@@ -55,7 +55,7 @@ function UpdateSettings(props) {
           type={inputTypes.TEXT}
           name="branch"
           helpText={usingExternalUpdateMechanism ? translate('BranchUpdateMechanism') : translate('BranchUpdate')}
-          helpLink="https://wiki.servarr.com/prowlarr/settings#updates"
+          helpLink="https://wiki.servarr.com/Prowlarr_Settings#Updates"
           {...branch}
           onChange={onInputChange}
           readOnly={usingExternalUpdateMechanism}
@@ -92,7 +92,7 @@ function UpdateSettings(props) {
                 name="updateMechanism"
                 values={updateOptions}
                 helpText={translate('UpdateMechanismHelpText')}
-                helpLink="https://wiki.servarr.com/prowlarr/settings#updates"
+                helpLink="https://wiki.servarr.com/Prowlarr_Settings#Updates"
                 onChange={onInputChange}
                 {...updateMechanism}
               />

frontend/src/Settings/Indexers/IndexerProxies/AddIndexerProxyItem.css

@@ -1,44 +0,0 @@
-.indexerProxy {
-  composes: card from '~Components/Card.css';
-
-  position: relative;
-  width: 300px;
-  height: 100px;
-}
-
-.underlay {
-  @add-mixin cover;
-}
-
-.overlay {
-  @add-mixin linkOverlay;
-
-  padding: 10px;
-}
-
-.name {
-  text-align: center;
-  font-weight: lighter;
-  font-size: 24px;
-}
-
-.actions {
-  margin-top: 20px;
-  text-align: right;
-}
-
-.presetsMenu {
-  composes: menu from '~Components/Menu/Menu.css';
-
-  display: inline-block;
-  margin: 0 5px;
-}
-
-.presetsMenuButton {
-  composes: button from '~Components/Link/Button.css';
-
-  &::after {
-    margin-left: 5px;
-    content: '\25BE';
-  }
-}

frontend/src/Settings/Indexers/IndexerProxies/AddIndexerProxyItem.js

@@ -1,111 +0,0 @@
-import PropTypes from 'prop-types';
-import React, { Component } from 'react';
-import Button from 'Components/Link/Button';
-import Link from 'Components/Link/Link';
-import Menu from 'Components/Menu/Menu';
-import MenuContent from 'Components/Menu/MenuContent';
-import { sizes } from 'Helpers/Props';
-import translate from 'Utilities/String/translate';
-import AddIndexerProxyPresetMenuItem from './AddIndexerProxyPresetMenuItem';
-import styles from './AddIndexerProxyItem.css';
-
-class AddIndexerProxyItem extends Component {
-
-  //
-  // Listeners
-
-  onIndexerProxySelect = () => {
-    const {
-      implementation
-    } = this.props;
-
-    this.props.onIndexerProxySelect({ implementation });
-  }
-
-  //
-  // Render
-
-  render() {
-    const {
-      implementation,
-      implementationName,
-      infoLink,
-      presets,
-      onIndexerProxySelect
-    } = this.props;
-
-    const hasPresets = !!presets && !!presets.length;
-
-    return (
-      <div
-        className={styles.indexerProxy}
-      >
-        <Link
-          className={styles.underlay}
-          onPress={this.onIndexerProxySelect}
-        />
-
-        <div className={styles.overlay}>
-          <div className={styles.name}>
-            {implementationName}
-          </div>
-
-          <div className={styles.actions}>
-            {
-              hasPresets &&
-                <span>
-                  <Button
-                    size={sizes.SMALL}
-                    onPress={this.onIndexerProxySelect}
-                  >
-                    Custom
-                  </Button>
-
-                  <Menu className={styles.presetsMenu}>
-                    <Button
-                      className={styles.presetsMenuButton}
-                      size={sizes.SMALL}
-                    >
-                      Presets
-                    </Button>
-
-                    <MenuContent>
-                      {
-                        presets.map((preset) => {
-                          return (
-                            <AddIndexerProxyPresetMenuItem
-                              key={preset.name}
-                              name={preset.name}
-                              implementation={implementation}
-                              onPress={onIndexerProxySelect}
-                            />
-                          );
-                        })
-                      }
-                    </MenuContent>
-                  </Menu>
-                </span>
-            }
-
-            <Button
-              to={infoLink}
-              size={sizes.SMALL}
-            >
-              {translate('MoreInfo')}
-            </Button>
-          </div>
-        </div>
-      </div>
-    );
-  }
-}
-
-AddIndexerProxyItem.propTypes = {
-  implementation: PropTypes.string.isRequired,
-  implementationName: PropTypes.string.isRequired,
-  infoLink: PropTypes.string.isRequired,
-  presets: PropTypes.arrayOf(PropTypes.object),
-  onIndexerProxySelect: PropTypes.func.isRequired
-};
-
-export default AddIndexerProxyItem;

frontend/src/Settings/Indexers/IndexerProxies/AddIndexerProxyModal.js

@@ -1,25 +0,0 @@
-import PropTypes from 'prop-types';
-import React from 'react';
-import Modal from 'Components/Modal/Modal';
-import AddIndexerProxyModalContentConnector from './AddIndexerProxyModalContentConnector';
-
-function AddIndexerProxyModal({ isOpen, onModalClose, ...otherProps }) {
-  return (
-    <Modal
-      isOpen={isOpen}
-      onModalClose={onModalClose}
-    >
-      <AddIndexerProxyModalContentConnector
-        {...otherProps}
-        onModalClose={onModalClose}
-      />
-    </Modal>
-  );
-}
-
-AddIndexerProxyModal.propTypes = {
-  isOpen: PropTypes.bool.isRequired,
-  onModalClose: PropTypes.func.isRequired
-};
-
-export default AddIndexerProxyModal;

frontend/src/Settings/Indexers/IndexerProxies/AddIndexerProxyModalContent.css

@@ -1,5 +0,0 @@
-.indexerProxies {
-  display: flex;
-  justify-content: center;
-  flex-wrap: wrap;
-}

frontend/src/Settings/Indexers/IndexerProxies/AddIndexerProxyModalContent.js

@@ -1,88 +0,0 @@
-import PropTypes from 'prop-types';
-import React, { Component } from 'react';
-import Button from 'Components/Link/Button';
-import LoadingIndicator from 'Components/Loading/LoadingIndicator';
-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 translate from 'Utilities/String/translate';
-import AddIndexerProxyItem from './AddIndexerProxyItem';
-import styles from './AddIndexerProxyModalContent.css';
-
-class AddIndexerProxyModalContent extends Component {
-
-  //
-  // Render
-
-  render() {
-    const {
-      isSchemaFetching,
-      isSchemaPopulated,
-      schemaError,
-      schema,
-      onIndexerProxySelect,
-      onModalClose
-    } = this.props;
-
-    return (
-      <ModalContent onModalClose={onModalClose}>
-        <ModalHeader>
-          {translate('AddIndexerProxy')}
-        </ModalHeader>
-
-        <ModalBody>
-          {
-            isSchemaFetching &&
-              <LoadingIndicator />
-          }
-
-          {
-            !isSchemaFetching && !!schemaError &&
-              <div>
-                {translate('UnableToAddANewIndexerProxyPleaseTryAgain')}
-              </div>
-          }
-
-          {
-            isSchemaPopulated && !schemaError &&
-              <div>
-                <div className={styles.indexerProxies}>
-                  {
-                    schema.map((indexerProxy) => {
-                      return (
-                        <AddIndexerProxyItem
-                          key={indexerProxy.implementation}
-                          implementation={indexerProxy.implementation}
-                          {...indexerProxy}
-                          onIndexerProxySelect={onIndexerProxySelect}
-                        />
-                      );
-                    })
-                  }
-                </div>
-              </div>
-          }
-        </ModalBody>
-        <ModalFooter>
-          <Button
-            onPress={onModalClose}
-          >
-            {translate('Close')}
-          </Button>
-        </ModalFooter>
-      </ModalContent>
-    );
-  }
-}
-
-AddIndexerProxyModalContent.propTypes = {
-  isSchemaFetching: PropTypes.bool.isRequired,
-  isSchemaPopulated: PropTypes.bool.isRequired,
-  schemaError: PropTypes.object,
-  schema: PropTypes.arrayOf(PropTypes.object).isRequired,
-  onIndexerProxySelect: PropTypes.func.isRequired,
-  onModalClose: PropTypes.func.isRequired
-};
-
-export default AddIndexerProxyModalContent;

frontend/src/Settings/Indexers/IndexerProxies/AddIndexerProxyModalContentConnector.js

@@ -1,70 +0,0 @@
-import PropTypes from 'prop-types';
-import React, { Component } from 'react';
-import { connect } from 'react-redux';
-import { createSelector } from 'reselect';
-import { fetchIndexerProxySchema, selectIndexerProxySchema } from 'Store/Actions/settingsActions';
-import AddIndexerProxyModalContent from './AddIndexerProxyModalContent';
-
-function createMapStateToProps() {
-  return createSelector(
-    (state) => state.settings.indexerProxies,
-    (indexerProxies) => {
-      const {
-        isSchemaFetching,
-        isSchemaPopulated,
-        schemaError,
-        schema
-      } = indexerProxies;
-
-      return {
-        isSchemaFetching,
-        isSchemaPopulated,
-        schemaError,
-        schema
-      };
-    }
-  );
-}
-
-const mapDispatchToProps = {
-  fetchIndexerProxySchema,
-  selectIndexerProxySchema
-};
-
-class AddIndexerProxyModalContentConnector extends Component {
-
-  //
-  // Lifecycle
-
-  componentDidMount() {
-    this.props.fetchIndexerProxySchema();
-  }
-
-  //
-  // Listeners
-
-  onIndexerProxySelect = ({ implementation, name }) => {
-    this.props.selectIndexerProxySchema({ implementation, presetName: name });
-    this.props.onModalClose({ indexerProxySelected: true });
-  }
-
-  //
-  // Render
-
-  render() {
-    return (
-      <AddIndexerProxyModalContent
-        {...this.props}
-        onIndexerProxySelect={this.onIndexerProxySelect}
-      />
-    );
-  }
-}
-
-AddIndexerProxyModalContentConnector.propTypes = {
-  fetchIndexerProxySchema: PropTypes.func.isRequired,
-  selectIndexerProxySchema: PropTypes.func.isRequired,
-  onModalClose: PropTypes.func.isRequired
-};
-
-export default connect(createMapStateToProps, mapDispatchToProps)(AddIndexerProxyModalContentConnector);

frontend/src/Settings/Indexers/IndexerProxies/AddIndexerProxyPresetMenuItem.js

@@ -1,49 +0,0 @@
-import PropTypes from 'prop-types';
-import React, { Component } from 'react';
-import MenuItem from 'Components/Menu/MenuItem';
-
-class AddIndexerProxyPresetMenuItem extends Component {
-
-  //
-  // Listeners
-
-  onPress = () => {
-    const {
-      name,
-      implementation
-    } = this.props;
-
-    this.props.onPress({
-      name,
-      implementation
-    });
-  }
-
-  //
-  // Render
-
-  render() {
-    const {
-      name,
-      implementation,
-      ...otherProps
-    } = this.props;
-
-    return (
-      <MenuItem
-        {...otherProps}
-        onPress={this.onPress}
-      >
-        {name}
-      </MenuItem>
-    );
-  }
-}
-
-AddIndexerProxyPresetMenuItem.propTypes = {
-  name: PropTypes.string.isRequired,
-  implementation: PropTypes.string.isRequired,
-  onPress: PropTypes.func.isRequired
-};
-
-export default AddIndexerProxyPresetMenuItem;

frontend/src/Settings/Indexers/IndexerProxies/EditIndexerProxyModal.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 EditIndexerProxyModalContentConnector from './EditIndexerProxyModalContentConnector';
-
-function EditIndexerProxyModal({ isOpen, onModalClose, ...otherProps }) {
-  return (
-    <Modal
-      size={sizes.MEDIUM}
-      isOpen={isOpen}
-      onModalClose={onModalClose}
-    >
-      <EditIndexerProxyModalContentConnector
-        {...otherProps}
-        onModalClose={onModalClose}
-      />
-    </Modal>
-  );
-}
-
-EditIndexerProxyModal.propTypes = {
-  isOpen: PropTypes.bool.isRequired,
-  onModalClose: PropTypes.func.isRequired
-};
-
-export default EditIndexerProxyModal;

frontend/src/Settings/Indexers/IndexerProxies/EditIndexerProxyModalConnector.js

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

frontend/src/Settings/Indexers/IndexerProxies/EditIndexerProxyModalContent.css

@@ -1,11 +0,0 @@
-.deleteButton {
-  composes: button from '~Components/Link/Button.css';
-
-  margin-right: auto;
-}
-
-.message {
-  composes: alert from '~Components/Alert.css';
-
-  margin-bottom: 30px;
-}

frontend/src/Settings/Indexers/IndexerProxies/EditIndexerProxyModalContent.js

@@ -1,175 +0,0 @@
-import PropTypes from 'prop-types';
-import React from 'react';
-import Alert from 'Components/Alert';
-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 Button from 'Components/Link/Button';
-import SpinnerErrorButton from 'Components/Link/SpinnerErrorButton';
-import LoadingIndicator from 'Components/Loading/LoadingIndicator';
-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 './EditIndexerProxyModalContent.css';
-
-function EditIndexerProxyModalContent(props) {
-  const {
-    advancedSettings,
-    isFetching,
-    error,
-    isSaving,
-    isTesting,
-    saveError,
-    item,
-    onInputChange,
-    onFieldChange,
-    onModalClose,
-    onSavePress,
-    onTestPress,
-    onDeleteIndexerProxyPress,
-    ...otherProps
-  } = props;
-
-  const {
-    id,
-    implementationName,
-    name,
-    tags,
-    fields,
-    message
-  } = item;
-
-  return (
-    <ModalContent onModalClose={onModalClose}>
-      <ModalHeader>
-        {`${id ? 'Edit' : 'Add'} Proxy - ${implementationName}`}
-      </ModalHeader>
-
-      <ModalBody>
-        {
-          isFetching &&
-            <LoadingIndicator />
-        }
-
-        {
-          !isFetching && !!error &&
-            <div>
-              {translate('UnableToAddANewIndexerProxyPleaseTryAgain')}
-            </div>
-        }
-
-        {
-          !isFetching && !error &&
-            <Form {...otherProps}>
-              {
-                !!message &&
-                  <Alert
-                    className={styles.message}
-                    kind={message.value.type}
-                  >
-                    {message.value.message}
-                  </Alert>
-              }
-
-              <FormGroup>
-                <FormLabel>{translate('Name')}</FormLabel>
-
-                <FormInputGroup
-                  type={inputTypes.TEXT}
-                  name="name"
-                  {...name}
-                  onChange={onInputChange}
-                />
-              </FormGroup>
-
-              <FormGroup>
-                <FormLabel>{translate('Tags')}</FormLabel>
-
-                <FormInputGroup
-                  type={inputTypes.TAG}
-                  name="tags"
-                  helpText={translate('TagsHelpText')}
-                  {...tags}
-                  onChange={onInputChange}
-                />
-              </FormGroup>
-
-              {
-                fields.map((field) => {
-                  return (
-                    <ProviderFieldFormGroup
-                      key={field.name}
-                      advancedSettings={advancedSettings}
-                      provider="indexerProxy"
-                      providerData={item}
-                      section="settings.indexerProxies"
-                      {...field}
-                      onChange={onFieldChange}
-                    />
-                  );
-                })
-              }
-
-            </Form>
-        }
-      </ModalBody>
-      <ModalFooter>
-        {
-          id &&
-            <Button
-              className={styles.deleteButton}
-              kind={kinds.DANGER}
-              onPress={onDeleteIndexerProxyPress}
-            >
-              {translate('Delete')}
-            </Button>
-        }
-
-        <SpinnerErrorButton
-          isSpinning={isTesting}
-          error={saveError}
-          onPress={onTestPress}
-        >
-          {translate('Test')}
-        </SpinnerErrorButton>
-
-        <Button
-          onPress={onModalClose}
-        >
-          {translate('Cancel')}
-        </Button>
-
-        <SpinnerErrorButton
-          isSpinning={isSaving}
-          error={saveError}
-          onPress={onSavePress}
-        >
-          {translate('Save')}
-        </SpinnerErrorButton>
-      </ModalFooter>
-    </ModalContent>
-  );
-}
-
-EditIndexerProxyModalContent.propTypes = {
-  advancedSettings: PropTypes.bool.isRequired,
-  isFetching: PropTypes.bool.isRequired,
-  error: PropTypes.object,
-  isSaving: PropTypes.bool.isRequired,
-  isTesting: PropTypes.bool.isRequired,
-  saveError: 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,
-  onDeleteIndexerProxyPress: PropTypes.func
-};
-
-export default EditIndexerProxyModalContent;

frontend/src/Settings/Indexers/IndexerProxies/EditIndexerProxyModalContentConnector.js

@@ -1,88 +0,0 @@
-import PropTypes from 'prop-types';
-import React, { Component } from 'react';
-import { connect } from 'react-redux';
-import { createSelector } from 'reselect';
-import { saveIndexerProxy, setIndexerProxyFieldValue, setIndexerProxyValue, testIndexerProxy } from 'Store/Actions/settingsActions';
-import createProviderSettingsSelector from 'Store/Selectors/createProviderSettingsSelector';
-import EditIndexerProxyModalContent from './EditIndexerProxyModalContent';
-
-function createMapStateToProps() {
-  return createSelector(
-    (state) => state.settings.advancedSettings,
-    createProviderSettingsSelector('indexerProxies'),
-    (advancedSettings, indexerProxy) => {
-      return {
-        advancedSettings,
-        ...indexerProxy
-      };
-    }
-  );
-}
-
-const mapDispatchToProps = {
-  setIndexerProxyValue,
-  setIndexerProxyFieldValue,
-  saveIndexerProxy,
-  testIndexerProxy
-};
-
-class EditIndexerProxyModalContentConnector extends Component {
-
-  //
-  // Lifecycle
-
-  componentDidUpdate(prevProps, prevState) {
-    if (prevProps.isSaving && !this.props.isSaving && !this.props.saveError) {
-      this.props.onModalClose();
-    }
-  }
-
-  //
-  // Listeners
-
-  onInputChange = ({ name, value }) => {
-    this.props.setIndexerProxyValue({ name, value });
-  }
-
-  onFieldChange = ({ name, value }) => {
-    this.props.setIndexerProxyFieldValue({ name, value });
-  }
-
-  onSavePress = () => {
-    this.props.saveIndexerProxy({ id: this.props.id });
-  }
-
-  onTestPress = () => {
-    this.props.testIndexerProxy({ id: this.props.id });
-  }
-
-  //
-  // Render
-
-  render() {
-    return (
-      <EditIndexerProxyModalContent
-        {...this.props}
-        onSavePress={this.onSavePress}
-        onTestPress={this.onTestPress}
-        onInputChange={this.onInputChange}
-        onFieldChange={this.onFieldChange}
-      />
-    );
-  }
-}
-
-EditIndexerProxyModalContentConnector.propTypes = {
-  id: PropTypes.number,
-  isFetching: PropTypes.bool.isRequired,
-  isSaving: PropTypes.bool.isRequired,
-  saveError: PropTypes.object,
-  item: PropTypes.object.isRequired,
-  setIndexerProxyValue: PropTypes.func.isRequired,
-  setIndexerProxyFieldValue: PropTypes.func.isRequired,
-  saveIndexerProxy: PropTypes.func.isRequired,
-  testIndexerProxy: PropTypes.func.isRequired,
-  onModalClose: PropTypes.func.isRequired
-};
-
-export default connect(createMapStateToProps, mapDispatchToProps)(EditIndexerProxyModalContentConnector);

frontend/src/Settings/Indexers/IndexerProxies/IndexerProxies.css

@@ -1,20 +0,0 @@
-.indexerProxies {
-  display: flex;
-  flex-wrap: wrap;
-}
-
-.addIndexerProxy {
-  composes: indexerProxy from '~./IndexerProxy.css';
-
-  background-color: $cardAlternateBackgroundColor;
-  color: $gray;
-  text-align: center;
-}
-
-.center {
-  display: inline-block;
-  padding: 5px 20px 0;
-  border: 1px solid $borderColor;
-  border-radius: 4px;
-  background-color: $white;
-}

frontend/src/Settings/Indexers/IndexerProxies/IndexerProxies.js

@@ -1,121 +0,0 @@
-import PropTypes from 'prop-types';
-import React, { Component } from 'react';
-import Card from 'Components/Card';
-import FieldSet from 'Components/FieldSet';
-import Icon from 'Components/Icon';
-import PageSectionContent from 'Components/Page/PageSectionContent';
-import { icons } from 'Helpers/Props';
-import translate from 'Utilities/String/translate';
-import AddIndexerProxyModal from './AddIndexerProxyModal';
-import EditIndexerProxyModalConnector from './EditIndexerProxyModalConnector';
-import IndexerProxy from './IndexerProxy';
-import styles from './IndexerProxies.css';
-
-class IndexerProxies extends Component {
-
-  //
-  // Lifecycle
-
-  constructor(props, context) {
-    super(props, context);
-
-    this.state = {
-      isAddIndexerProxyModalOpen: false,
-      isEditIndexerProxyModalOpen: false
-    };
-  }
-
-  //
-  // Listeners
-
-  onAddIndexerProxyPress = () => {
-    this.setState({ isAddIndexerProxyModalOpen: true });
-  }
-
-  onAddIndexerProxyModalClose = ({ indexerProxySelected = false } = {}) => {
-    this.setState({
-      isAddIndexerProxyModalOpen: false,
-      isEditIndexerProxyModalOpen: indexerProxySelected
-    });
-  }
-
-  onEditIndexerProxyModalClose = () => {
-    this.setState({ isEditIndexerProxyModalOpen: false });
-  }
-
-  //
-  // Render
-
-  render() {
-    const {
-      items,
-      tagList,
-      indexerList,
-      onConfirmDeleteIndexerProxy,
-      ...otherProps
-    } = this.props;
-
-    const {
-      isAddIndexerProxyModalOpen,
-      isEditIndexerProxyModalOpen
-    } = this.state;
-
-    return (
-      <FieldSet legend={translate('Indexer Proxies')}>
-        <PageSectionContent
-          errorMessage={translate('UnableToLoadIndexerProxies')}
-          {...otherProps}
-        >
-          <div className={styles.indexerProxies}>
-            {
-              items.map((item) => {
-                return (
-                  <IndexerProxy
-                    key={item.id}
-                    {...item}
-                    tagList={tagList}
-                    indexerList={indexerList}
-                    onConfirmDeleteIndexerProxy={onConfirmDeleteIndexerProxy}
-                  />
-                );
-              })
-            }
-
-            <Card
-              className={styles.addIndexerProxy}
-              onPress={this.onAddIndexerProxyPress}
-            >
-              <div className={styles.center}>
-                <Icon
-                  name={icons.ADD}
-                  size={45}
-                />
-              </div>
-            </Card>
-          </div>
-
-          <AddIndexerProxyModal
-            isOpen={isAddIndexerProxyModalOpen}
-            onModalClose={this.onAddIndexerProxyModalClose}
-          />
-
-          <EditIndexerProxyModalConnector
-            isOpen={isEditIndexerProxyModalOpen}
-            onModalClose={this.onEditIndexerProxyModalClose}
-          />
-        </PageSectionContent>
-      </FieldSet>
-    );
-  }
-}
-
-IndexerProxies.propTypes = {
-  isFetching: PropTypes.bool.isRequired,
-  error: PropTypes.object,
-  items: PropTypes.arrayOf(PropTypes.object).isRequired,
-  tagList: PropTypes.arrayOf(PropTypes.object).isRequired,
-  indexerList: PropTypes.arrayOf(PropTypes.object).isRequired,
-  onConfirmDeleteIndexerProxy: PropTypes.func.isRequired
-};
-
-export default IndexerProxies;

frontend/src/Settings/Indexers/IndexerProxies/IndexerProxiesConnector.js

@@ -1,65 +0,0 @@
-import PropTypes from 'prop-types';
-import React, { Component } from 'react';
-import { connect } from 'react-redux';
-import { createSelector } from 'reselect';
-import { deleteIndexerProxy, fetchIndexerProxies } from 'Store/Actions/settingsActions';
-import createSortedSectionSelector from 'Store/Selectors/createSortedSectionSelector';
-import createTagsSelector from 'Store/Selectors/createTagsSelector';
-import sortByName from 'Utilities/Array/sortByName';
-import IndexerProxies from './IndexerProxies';
-
-function createMapStateToProps() {
-  return createSelector(
-    createSortedSectionSelector('settings.indexerProxies', sortByName),
-    createSortedSectionSelector('indexers', sortByName),
-    createTagsSelector(),
-    (indexerProxies, indexers, tagList) => {
-      return {
-        ...indexerProxies,
-        indexerList: indexers.items,
-        tagList
-      };
-    }
-  );
-}
-
-const mapDispatchToProps = {
-  fetchIndexerProxies,
-  deleteIndexerProxy
-};
-
-class IndexerProxiesConnector extends Component {
-
-  //
-  // Lifecycle
-
-  componentDidMount() {
-    this.props.fetchIndexerProxies();
-  }
-
-  //
-  // Listeners
-
-  onConfirmDeleteIndexerProxy = (id) => {
-    this.props.deleteIndexerProxy({ id });
-  }
-
-  //
-  // Render
-
-  render() {
-    return (
-      <IndexerProxies
-        {...this.props}
-        onConfirmDeleteIndexerProxy={this.onConfirmDeleteIndexerProxy}
-      />
-    );
-  }
-}
-
-IndexerProxiesConnector.propTypes = {
-  fetchIndexerProxies: PropTypes.func.isRequired,
-  deleteIndexerProxy: PropTypes.func.isRequired
-};
-
-export default connect(createMapStateToProps, mapDispatchToProps)(IndexerProxiesConnector);

frontend/src/Settings/Indexers/IndexerProxies/IndexerProxy.css

@@ -1,23 +0,0 @@
-.indexerProxy {
-  composes: card from '~Components/Card.css';
-
-  width: 290px;
-}
-
-.name {
-  @add-mixin truncate;
-
-  margin-bottom: 20px;
-  font-weight: 300;
-  font-size: 24px;
-}
-
-.indexers {
-  flex: 1 0 auto;
-}
-
-.enabled {
-  display: flex;
-  flex-wrap: wrap;
-  margin-top: 5px;
-}

frontend/src/Settings/Indexers/IndexerProxies/IndexerProxy.js

@@ -1,144 +0,0 @@
-import _ from 'lodash';
-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 TagList from 'Components/TagList';
-import { kinds } from 'Helpers/Props';
-import translate from 'Utilities/String/translate';
-import EditIndexerProxyModalConnector from './EditIndexerProxyModalConnector';
-import styles from './IndexerProxy.css';
-
-class IndexerProxy extends Component {
-
-  //
-  // Lifecycle
-
-  constructor(props, context) {
-    super(props, context);
-
-    this.state = {
-      isEditIndexerProxyModalOpen: false,
-      isDeleteIndexerProxyModalOpen: false
-    };
-  }
-
-  //
-  // Listeners
-
-  onEditIndexerProxyPress = () => {
-    this.setState({ isEditIndexerProxyModalOpen: true });
-  }
-
-  onEditIndexerProxyModalClose = () => {
-    this.setState({ isEditIndexerProxyModalOpen: false });
-  }
-
-  onDeleteIndexerProxyPress = () => {
-    this.setState({
-      isEditIndexerProxyModalOpen: false,
-      isDeleteIndexerProxyModalOpen: true
-    });
-  }
-
-  onDeleteIndexerProxyModalClose= () => {
-    this.setState({ isDeleteIndexerProxyModalOpen: false });
-  }
-
-  onConfirmDeleteIndexerProxy = () => {
-    this.props.onConfirmDeleteIndexerProxy(this.props.id);
-  }
-
-  //
-  // Render
-
-  render() {
-    const {
-      id,
-      name,
-      tags,
-      tagList,
-      indexerList
-    } = this.props;
-
-    return (
-      <Card
-        className={styles.indexerProxy}
-        overlayContent={true}
-        onPress={this.onEditIndexerProxyPress}
-      >
-        <div className={styles.name}>
-          {name}
-        </div>
-
-        <TagList
-          tags={tags}
-          tagList={tagList}
-        />
-
-        <div className={styles.indexers}>
-          {
-            tags.map((t) => {
-              const indexers = _.filter(indexerList, { tags: [t] });
-
-              if (!indexers || indexers.length === 0) {
-                return null;
-              }
-
-              return indexers.map((i) => {
-                return (
-                  <Label
-                    key={i.name}
-                    kind={kinds.SUCCESS}
-                  >
-                    {i.name}
-                  </Label>
-                );
-              });
-            })
-          }
-        </div>
-
-        {
-          !tags || tags.length === 0 ?
-            <Label
-              kind={kinds.DISABLED}
-              outline={true}
-            >
-              Disabled
-            </Label> :
-            null
-        }
-
-        <EditIndexerProxyModalConnector
-          id={id}
-          isOpen={this.state.isEditIndexerProxyModalOpen}
-          onModalClose={this.onEditIndexerProxyModalClose}
-          onDeleteIndexerProxyPress={this.onDeleteIndexerProxyPress}
-        />
-
-        <ConfirmModal
-          isOpen={this.state.isDeleteIndexerProxyModalOpen}
-          kind={kinds.DANGER}
-          title={translate('DeleteIndexerProxy')}
-          message={translate('DeleteIndexerProxyMessageText', [name])}
-          confirmLabel={translate('Delete')}
-          onConfirm={this.onConfirmDeleteIndexerProxy}
-          onCancel={this.onDeleteIndexerProxyModalClose}
-        />
-      </Card>
-    );
-  }
-}
-
-IndexerProxy.propTypes = {
-  id: PropTypes.number.isRequired,
-  name: PropTypes.string.isRequired,
-  tags: PropTypes.arrayOf(PropTypes.number).isRequired,
-  tagList: PropTypes.arrayOf(PropTypes.object).isRequired,
-  indexerList: PropTypes.arrayOf(PropTypes.object).isRequired,
-  onConfirmDeleteIndexerProxy: PropTypes.func.isRequired
-};
-
-export default IndexerProxy;

frontend/src/Settings/Indexers/IndexerSettings.js

@@ -1,22 +0,0 @@
-import React from 'react';
-import PageContent from 'Components/Page/PageContent';
-import PageContentBody from 'Components/Page/PageContentBody';
-import SettingsToolbarConnector from 'Settings/SettingsToolbarConnector';
-import translate from 'Utilities/String/translate';
-import IndexerProxiesConnector from './IndexerProxies/IndexerProxiesConnector';
-
-function IndexerSettings() {
-  return (
-    <PageContent title={translate('Proxies')}>
-      <SettingsToolbarConnector
-        showSave={false}
-      />
-
-      <PageContentBody>
-        <IndexerProxiesConnector />
-      </PageContentBody>
-    </PageContent>
-  );
-}
-
-export default IndexerSettings;

frontend/src/Settings/Notifications/Notifications/NotificationEventItems.js

@@ -25,8 +25,8 @@ function NotificationEventItems(props) {
       <FormLabel>{translate('NotificationTriggers')}</FormLabel>
       <div>
         <FormInputHelpText
-          text={translate('NotificationTriggersHelpText')}
-          link="https://wiki.servarr.com/prowlarr/settings#connections"
+          text={translate('NotifcationTriggersHelpText')}
+          link="https://wiki.servarr.com/Prowlarr_Settings#Connections"
         />
         <div className={styles.events}>
           <div>

frontend/src/Settings/Settings.js

@@ -14,26 +14,15 @@ function Settings() {
       />
 
       <PageContentBody>
-        <Link
-          className={styles.link}
-          to="/settings/indexers"
-        >
-          {translate('Indexers')}
-        </Link>
-
-        <div className={styles.summary}>
-          {translate('IndexerSettingsSummary')}
-        </div>
-
         <Link
           className={styles.link}
           to="/settings/applications"
         >
-          {translate('Apps')}
+          Applications
         </Link>
 
         <div className={styles.summary}>
-          {translate('AppSettingsSummary')}
+          Applications and settings to configure how prowlarr interacts with your PVR programs
         </div>
 
         <Link
@@ -51,7 +40,7 @@ function Settings() {
           className={styles.link}
           to="/settings/connect"
         >
-          {translate('Notifications')}
+          Notifications
         </Link>
 
         <div className={styles.summary}>

frontend/src/Settings/Tags/Details/TagDetailsDelayProfile.js

@@ -0,0 +1,47 @@
+import PropTypes from 'prop-types';
+import React from 'react';
+import titleCase from 'Utilities/String/titleCase';
+
+function TagDetailsDelayProfile(props) {
+  const {
+    preferredProtocol,
+    enableUsenet,
+    enableTorrent,
+    usenetDelay,
+    torrentDelay
+  } = props;
+
+  return (
+    <div>
+      <div>
+        Protocol: {titleCase(preferredProtocol)}
+      </div>
+
+      <div>
+        {
+          enableUsenet ?
+            `Usenet Delay: ${usenetDelay}` :
+            'Usenet disabled'
+        }
+      </div>
+
+      <div>
+        {
+          enableTorrent ?
+            `Torrent Delay: ${torrentDelay}` :
+            'Torrents disabled'
+        }
+      </div>
+    </div>
+  );
+}
+
+TagDetailsDelayProfile.propTypes = {
+  preferredProtocol: PropTypes.string.isRequired,
+  enableUsenet: PropTypes.bool.isRequired,
+  enableTorrent: PropTypes.bool.isRequired,
+  usenetDelay: PropTypes.number.isRequired,
+  torrentDelay: PropTypes.number.isRequired
+};
+
+export default TagDetailsDelayProfile;

frontend/src/Settings/Tags/Details/TagDetailsModalContent.js

@@ -1,22 +1,26 @@
 import PropTypes from 'prop-types';
 import React from 'react';
 import FieldSet from 'Components/FieldSet';
+import Label from 'Components/Label';
 import Button from 'Components/Link/Button';
 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 { kinds } from 'Helpers/Props';
+import split from 'Utilities/String/split';
 import translate from 'Utilities/String/translate';
+import TagDetailsDelayProfile from './TagDetailsDelayProfile';
 import styles from './TagDetailsModalContent.css';
 
 function TagDetailsModalContent(props) {
   const {
     label,
     isTagUsed,
-    indexers,
+    movies,
+    delayProfiles,
     notifications,
-    indexerProxies,
+    restrictions,
     onModalClose,
     onDeleteTagPress
   } = props;
@@ -36,13 +40,13 @@ function TagDetailsModalContent(props) {
         }
 
         {
-          !!indexers.length &&
-            <FieldSet legend={translate('Indexers')}>
+          !!movies.length &&
+            <FieldSet legend={translate('Movies')}>
               {
-                indexers.map((item) => {
+                movies.map((item) => {
                   return (
                     <div key={item.id}>
-                      {item.name}
+                      {item.title}
                     </div>
                   );
                 })
@@ -50,6 +54,35 @@ function TagDetailsModalContent(props) {
             </FieldSet>
         }
 
+        {
+          !!delayProfiles.length &&
+            <FieldSet legend={translate('DelayProfile')}>
+              {
+                delayProfiles.map((item) => {
+                  const {
+                    id,
+                    preferredProtocol,
+                    enableUsenet,
+                    enableTorrent,
+                    usenetDelay,
+                    torrentDelay
+                  } = item;
+
+                  return (
+                    <TagDetailsDelayProfile
+                      key={id}
+                      preferredProtocol={preferredProtocol}
+                      enableUsenet={enableUsenet}
+                      enableTorrent={enableTorrent}
+                      usenetDelay={usenetDelay}
+                      torrentDelay={torrentDelay}
+                    />
+                  );
+                })
+              }
+            </FieldSet>
+        }
+
         {
           !!notifications.length &&
             <FieldSet legend={translate('Connections')}>
@@ -66,13 +99,44 @@ function TagDetailsModalContent(props) {
         }
 
         {
-          !!indexerProxies.length &&
-            <FieldSet legend={translate('Indexer Proxies')}>
+          !!restrictions.length &&
+            <FieldSet legend={translate('Restrictions')}>
               {
-                indexerProxies.map((item) => {
+                restrictions.map((item) => {
                   return (
-                    <div key={item.id}>
-                      {item.name}
+                    <div
+                      key={item.id}
+                      className={styles.restriction}
+                    >
+                      <div>
+                        {
+                          split(item.required).map((r) => {
+                            return (
+                              <Label
+                                key={r}
+                                kind={kinds.SUCCESS}
+                              >
+                                {r}
+                              </Label>
+                            );
+                          })
+                        }
+                      </div>
+
+                      <div>
+                        {
+                          split(item.ignored).map((i) => {
+                            return (
+                              <Label
+                                key={i}
+                                kind={kinds.DANGER}
+                              >
+                                {i}
+                              </Label>
+                            );
+                          })
+                        }
+                      </div>
                     </div>
                   );
                 })
@@ -107,9 +171,10 @@ function TagDetailsModalContent(props) {
 TagDetailsModalContent.propTypes = {
   label: PropTypes.string.isRequired,
   isTagUsed: PropTypes.bool.isRequired,
-  indexers: PropTypes.arrayOf(PropTypes.object).isRequired,
+  movies: PropTypes.arrayOf(PropTypes.object).isRequired,
+  delayProfiles: PropTypes.arrayOf(PropTypes.object).isRequired,
   notifications: PropTypes.arrayOf(PropTypes.object).isRequired,
-  indexerProxies: PropTypes.arrayOf(PropTypes.object).isRequired,
+  restrictions: PropTypes.arrayOf(PropTypes.object).isRequired,
   onModalClose: PropTypes.func.isRequired,
   onDeleteTagPress: PropTypes.func.isRequired
 };

frontend/src/Settings/Tags/Details/TagDetailsModalContentConnector.js

@@ -1,5 +1,6 @@
 import { connect } from 'react-redux';
 import { createSelector } from 'reselect';
+import createAllIndexersSelector from 'Store/Selectors/createAllIndexersSelector';
 import TagDetailsModalContent from './TagDetailsModalContent';
 
 function findMatchingItems(ids, items) {
@@ -8,15 +9,35 @@ function findMatchingItems(ids, items) {
   });
 }
 
-function createMatchingIndexersSelector() {
+function createUnorderedMatchingMoviesSelector() {
   return createSelector(
     (state, { indexerIds }) => indexerIds,
-    (state) => state.indexers.items,
+    createAllIndexersSelector(),
     findMatchingItems
   );
 }
 
-function createMatchingIndexerProxiesSelector() {
+function createMatchingMoviesSelector() {
+  return createSelector(
+    createUnorderedMatchingMoviesSelector(),
+    (movies) => {
+      return movies.sort((movieA, movieB) => {
+        const sortTitleA = movieA.sortTitle;
+        const sortTitleB = movieB.sortTitle;
+
+        if (sortTitleA > sortTitleB) {
+          return 1;
+        } else if (sortTitleA < sortTitleB) {
+          return -1;
+        }
+
+        return 0;
+      });
+    }
+  );
+}
+
+function createMatchingNotificationsSelector() {
   return createSelector(
     (state, { notificationIds }) => notificationIds,
     (state) => state.settings.notifications.items,
@@ -24,23 +45,13 @@ function createMatchingIndexerProxiesSelector() {
   );
 }
 
-function createMatchingNotificationsSelector() {
-  return createSelector(
-    (state, { indexerProxyIds }) => indexerProxyIds,
-    (state) => state.settings.indexerProxies.items,
-    findMatchingItems
-  );
-}
-
 function createMapStateToProps() {
   return createSelector(
-    createMatchingIndexersSelector(),
-    createMatchingIndexerProxiesSelector(),
+    createMatchingMoviesSelector(),
     createMatchingNotificationsSelector(),
-    (indexers, indexerProxies, notifications) => {
+    (movies, notifications) => {
       return {
-        indexers,
-        indexerProxies,
+        movies,
         notifications
       };
     }

frontend/src/Settings/Tags/Tag.js

@@ -53,9 +53,11 @@ class Tag extends Component {
   render() {
     const {
       label,
+      delayProfileIds,
       notificationIds,
-      indexerIds,
-      indexerProxyIds
+      restrictionIds,
+      importListIds,
+      movieIds
     } = this.props;
 
     const {
@@ -64,9 +66,11 @@ class Tag extends Component {
     } = this.state;
 
     const isTagUsed = !!(
-      indexerIds.length ||
+      delayProfileIds.length ||
       notificationIds.length ||
-      indexerProxyIds.length
+      restrictionIds.length ||
+      importListIds.length ||
+      movieIds.length
     );
 
     return (
@@ -83,9 +87,16 @@ class Tag extends Component {
           isTagUsed &&
             <div>
               {
-                !!indexerIds.length &&
+                !!movieIds.length &&
                   <div>
-                    {indexerIds.length} indexer{indexerIds.length > 1 && 's'}
+                    {movieIds.length} movies
+                  </div>
+              }
+
+              {
+                !!delayProfileIds.length &&
+                  <div>
+                    {delayProfileIds.length} delay profile{delayProfileIds.length > 1 && 's'}
                   </div>
               }
 
@@ -97,9 +108,16 @@ class Tag extends Component {
               }
 
               {
-                !!indexerProxyIds.length &&
+                !!restrictionIds.length &&
                   <div>
-                    {indexerProxyIds.length} indexerProxy{indexerProxyIds.length > 1 && 's'}
+                    {restrictionIds.length} restriction{restrictionIds.length > 1 && 's'}
+                  </div>
+              }
+
+              {
+                !!importListIds.length &&
+                  <div>
+                    {importListIds.length} list{importListIds.length > 1 && 's'}
                   </div>
               }
             </div>
@@ -115,9 +133,11 @@ class Tag extends Component {
         <TagDetailsModal
           label={label}
           isTagUsed={isTagUsed}
-          indexerIds={indexerIds}
+          movieIds={movieIds}
+          delayProfileIds={delayProfileIds}
           notificationIds={notificationIds}
-          indexerProxyIds={indexerProxyIds}
+          restrictionIds={restrictionIds}
+          importListIds={importListIds}
           isOpen={isDetailsModalOpen}
           onModalClose={this.onDetailsModalClose}
           onDeleteTagPress={this.onDeleteTagPress}
@@ -140,16 +160,20 @@ class Tag extends Component {
 Tag.propTypes = {
   id: PropTypes.number.isRequired,
   label: PropTypes.string.isRequired,
+  delayProfileIds: PropTypes.arrayOf(PropTypes.number).isRequired,
   notificationIds: PropTypes.arrayOf(PropTypes.number).isRequired,
-  indexerIds: PropTypes.arrayOf(PropTypes.number).isRequired,
-  indexerProxyIds: PropTypes.arrayOf(PropTypes.number).isRequired,
+  restrictionIds: PropTypes.arrayOf(PropTypes.number).isRequired,
+  importListIds: PropTypes.arrayOf(PropTypes.number).isRequired,
+  movieIds: PropTypes.arrayOf(PropTypes.number).isRequired,
   onConfirmDeleteTag: PropTypes.func.isRequired
 };
 
 Tag.defaultProps = {
-  indexerIds: [],
+  delayProfileIds: [],
   notificationIds: [],
-  indexerProxyIds: []
+  restrictionIds: [],
+  importListIds: [],
+  movieIds: []
 };
 
 export default Tag;

frontend/src/Settings/Tags/TagsConnector.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 { fetchIndexerProxies, fetchNotifications } from 'Store/Actions/settingsActions';
+import { fetchNotifications } from 'Store/Actions/settingsActions';
 import { fetchTagDetails } from 'Store/Actions/tagActions';
 import Tags from './Tags';
 
@@ -26,8 +26,7 @@ function createMapStateToProps() {
 
 const mapDispatchToProps = {
   dispatchFetchTagDetails: fetchTagDetails,
-  dispatchFetchNotifications: fetchNotifications,
-  dispatchFetchIndexerProxies: fetchIndexerProxies
+  dispatchFetchNotifications: fetchNotifications
 };
 
 class MetadatasConnector extends Component {
@@ -38,13 +37,11 @@ class MetadatasConnector extends Component {
   componentDidMount() {
     const {
       dispatchFetchTagDetails,
-      dispatchFetchNotifications,
-      dispatchFetchIndexerProxies
+      dispatchFetchNotifications
     } = this.props;
 
     dispatchFetchTagDetails();
     dispatchFetchNotifications();
-    dispatchFetchIndexerProxies();
   }
 
   //
@@ -61,8 +58,7 @@ class MetadatasConnector extends Component {
 
 MetadatasConnector.propTypes = {
   dispatchFetchTagDetails: PropTypes.func.isRequired,
-  dispatchFetchNotifications: PropTypes.func.isRequired,
-  dispatchFetchIndexerProxies: PropTypes.func.isRequired
+  dispatchFetchNotifications: PropTypes.func.isRequired
 };
 
 export default connect(createMapStateToProps, mapDispatchToProps)(MetadatasConnector);

frontend/src/Store/Actions/Creators/createHandleActions.js

@@ -10,7 +10,7 @@ import {
 import getSectionState from 'Utilities/State/getSectionState';
 import updateSectionState from 'Utilities/State/updateSectionState';
 
-const omittedProperties = [
+const blacklistedProperties = [
   'section',
   'id'
 ];
@@ -31,7 +31,7 @@ export default function createHandleActions(handlers, defaultState, section) {
 
       if (section === baseSection) {
         const newState = Object.assign(getSectionState(state, payloadSection),
-          _.omit(payload, omittedProperties));
+          _.omit(payload, blacklistedProperties));
 
         return updateSectionState(state, payloadSection, newState);
       }

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

@@ -1,110 +0,0 @@
-import { createAction } from 'redux-actions';
-import createFetchHandler from 'Store/Actions/Creators/createFetchHandler';
-import createFetchSchemaHandler from 'Store/Actions/Creators/createFetchSchemaHandler';
-import createRemoveItemHandler from 'Store/Actions/Creators/createRemoveItemHandler';
-import createSaveProviderHandler, { createCancelSaveProviderHandler } from 'Store/Actions/Creators/createSaveProviderHandler';
-import createTestProviderHandler, { createCancelTestProviderHandler } from 'Store/Actions/Creators/createTestProviderHandler';
-import createSetProviderFieldValueReducer from 'Store/Actions/Creators/Reducers/createSetProviderFieldValueReducer';
-import createSetSettingValueReducer from 'Store/Actions/Creators/Reducers/createSetSettingValueReducer';
-import { createThunk } from 'Store/thunks';
-import selectProviderSchema from 'Utilities/State/selectProviderSchema';
-
-//
-// Variables
-
-const section = 'settings.indexerProxies';
-
-//
-// Actions Types
-
-export const FETCH_INDEXER_PROXYS = 'settings/indexerProxies/fetchIndexerProxies';
-export const FETCH_INDEXER_PROXY_SCHEMA = 'settings/indexerProxies/fetchIndexerProxySchema';
-export const SELECT_INDEXER_PROXY_SCHEMA = 'settings/indexerProxies/selectIndexerProxySchema';
-export const SET_INDEXER_PROXY_VALUE = 'settings/indexerProxies/setIndexerProxyValue';
-export const SET_INDEXER_PROXY_FIELD_VALUE = 'settings/indexerProxies/setIndexerProxyFieldValue';
-export const SAVE_INDEXER_PROXY = 'settings/indexerProxies/saveIndexerProxy';
-export const CANCEL_SAVE_INDEXER_PROXY = 'settings/indexerProxies/cancelSaveIndexerProxy';
-export const DELETE_INDEXER_PROXY = 'settings/indexerProxies/deleteIndexerProxy';
-export const TEST_INDEXER_PROXY = 'settings/indexerProxies/testIndexerProxy';
-export const CANCEL_TEST_INDEXER_PROXY = 'settings/indexerProxies/cancelTestIndexerProxy';
-
-//
-// Action Creators
-
-export const fetchIndexerProxies = createThunk(FETCH_INDEXER_PROXYS);
-export const fetchIndexerProxySchema = createThunk(FETCH_INDEXER_PROXY_SCHEMA);
-export const selectIndexerProxySchema = createAction(SELECT_INDEXER_PROXY_SCHEMA);
-
-export const saveIndexerProxy = createThunk(SAVE_INDEXER_PROXY);
-export const cancelSaveIndexerProxy = createThunk(CANCEL_SAVE_INDEXER_PROXY);
-export const deleteIndexerProxy = createThunk(DELETE_INDEXER_PROXY);
-export const testIndexerProxy = createThunk(TEST_INDEXER_PROXY);
-export const cancelTestIndexerProxy = createThunk(CANCEL_TEST_INDEXER_PROXY);
-
-export const setIndexerProxyValue = createAction(SET_INDEXER_PROXY_VALUE, (payload) => {
-  return {
-    section,
-    ...payload
-  };
-});
-
-export const setIndexerProxyFieldValue = createAction(SET_INDEXER_PROXY_FIELD_VALUE, (payload) => {
-  return {
-    section,
-    ...payload
-  };
-});
-
-//
-// Details
-
-export default {
-
-  //
-  // State
-
-  defaultState: {
-    isFetching: false,
-    isPopulated: false,
-    error: null,
-    isSchemaFetching: false,
-    isSchemaPopulated: false,
-    schemaError: null,
-    schema: [],
-    selectedSchema: {},
-    isSaving: false,
-    saveError: null,
-    isTesting: false,
-    items: [],
-    pendingChanges: {}
-  },
-
-  //
-  // Action Handlers
-
-  actionHandlers: {
-    [FETCH_INDEXER_PROXYS]: createFetchHandler(section, '/indexerProxy'),
-    [FETCH_INDEXER_PROXY_SCHEMA]: createFetchSchemaHandler(section, '/indexerProxy/schema'),
-
-    [SAVE_INDEXER_PROXY]: createSaveProviderHandler(section, '/indexerProxy'),
-    [CANCEL_SAVE_INDEXER_PROXY]: createCancelSaveProviderHandler(section),
-    [DELETE_INDEXER_PROXY]: createRemoveItemHandler(section, '/indexerProxy'),
-    [TEST_INDEXER_PROXY]: createTestProviderHandler(section, '/indexerProxy'),
-    [CANCEL_TEST_INDEXER_PROXY]: createCancelTestProviderHandler(section)
-  },
-
-  //
-  // Reducers
-
-  reducers: {
-    [SET_INDEXER_PROXY_VALUE]: createSetSettingValueReducer(section),
-    [SET_INDEXER_PROXY_FIELD_VALUE]: createSetProviderFieldValueReducer(section),
-
-    [SELECT_INDEXER_PROXY_SCHEMA]: (state, { payload }) => {
-      return selectProviderSchema(state, section, payload, (selectedSchema) => {
-        return selectedSchema;
-      });
-    }
-  }
-
-};

frontend/src/Store/Actions/indexerIndexActions.js

@@ -176,7 +176,7 @@ export const SET_MOVIE_SORT = 'indexerIndex/setMovieSort';
 export const SET_MOVIE_FILTER = 'indexerIndex/setMovieFilter';
 export const SET_MOVIE_VIEW = 'indexerIndex/setMovieView';
 export const SET_MOVIE_TABLE_OPTION = 'indexerIndex/setMovieTableOption';
-export const SAVE_INDEXER_EDITOR = 'indexerIndex/saveIndexerEditor';
+export const SAVE_MOVIE_EDITOR = 'indexerIndex/saveMovieEditor';
 export const BULK_DELETE_INDEXERS = 'indexerIndex/bulkDeleteIndexers';
 
 //
@@ -186,14 +186,14 @@ export const setMovieSort = createAction(SET_MOVIE_SORT);
 export const setMovieFilter = createAction(SET_MOVIE_FILTER);
 export const setMovieView = createAction(SET_MOVIE_VIEW);
 export const setMovieTableOption = createAction(SET_MOVIE_TABLE_OPTION);
-export const saveIndexerEditor = createThunk(SAVE_INDEXER_EDITOR);
+export const saveMovieEditor = createThunk(SAVE_MOVIE_EDITOR);
 export const bulkDeleteIndexers = createThunk(BULK_DELETE_INDEXERS);
 
 //
 // Action Handlers
 
 export const actionHandlers = handleThunks({
-  [SAVE_INDEXER_EDITOR]: function(getState, payload, dispatch) {
+  [SAVE_MOVIE_EDITOR]: function(getState, payload, dispatch) {
     dispatch(set({
       section,
       isSaving: true

frontend/src/Store/Actions/releaseActions.js

@@ -202,8 +202,7 @@ export const defaultState = {
 
 export const persistState = [
   'releases.customFilters',
-  'releases.selectedFilterKey',
-  'releases.columns'
+  'releases.selectedFilterKey'
 ];
 
 //

frontend/src/Store/Actions/settingsActions.js

@@ -7,7 +7,6 @@ import development from './Settings/development';
 import downloadClients from './Settings/downloadClients';
 import general from './Settings/general';
 import indexerCategories from './Settings/indexerCategories';
-import indexerProxies from './Settings/indexerProxies';
 import languages from './Settings/languages';
 import notifications from './Settings/notifications';
 import ui from './Settings/ui';
@@ -15,7 +14,6 @@ import ui from './Settings/ui';
 export * from './Settings/downloadClients';
 export * from './Settings/general';
 export * from './Settings/indexerCategories';
-export * from './Settings/indexerProxies';
 export * from './Settings/languages';
 export * from './Settings/notifications';
 export * from './Settings/applications';
@@ -37,7 +35,6 @@ export const defaultState = {
   downloadClients: downloadClients.defaultState,
   general: general.defaultState,
   indexerCategories: indexerCategories.defaultState,
-  indexerProxies: indexerProxies.defaultState,
   languages: languages.defaultState,
   notifications: notifications.defaultState,
   applications: applications.defaultState,
@@ -67,7 +64,6 @@ export const actionHandlers = handleThunks({
   ...downloadClients.actionHandlers,
   ...general.actionHandlers,
   ...indexerCategories.actionHandlers,
-  ...indexerProxies.actionHandlers,
   ...languages.actionHandlers,
   ...notifications.actionHandlers,
   ...applications.actionHandlers,
@@ -88,7 +84,6 @@ export const reducers = createHandleActions({
   ...downloadClients.reducers,
   ...general.reducers,
   ...indexerCategories.reducers,
-  ...indexerProxies.reducers,
   ...languages.reducers,
   ...notifications.reducers,
   ...applications.reducers,

frontend/src/Store/Selectors/createHealthCheckSelector.js

@@ -13,7 +13,7 @@ function createHealthCheckSelector() {
           source: 'UI',
           type: 'warning',
           message: translate('CouldNotConnectSignalR'),
-          wikiUrl: 'https://wiki.servarr.com/prowlarr/system#could-not-connect-to-signalr'
+          wikiUrl: 'https://wiki.servarr.com/Prowlarr_System#Could_not_connect_to_signalR'
         });
       }
 

frontend/src/System/Status/Donations/Donations.js

@@ -1,64 +0,0 @@
-import React, { Component } from 'react';
-import FieldSet from 'Components/FieldSet';
-import Link from 'Components/Link/Link';
-import translate from 'Utilities/String/translate';
-import styles from '../styles.css';
-
-class Donations extends Component {
-
-  //
-  // Render
-
-  render() {
-    return (
-      <FieldSet legend={translate('Donations')}>
-        <div className={styles.logoContainer} title="Radarr">
-          <Link to="https://opencollective.com/radarr">
-            <img
-              className={styles.logo}
-              src={`${window.Prowlarr.urlBase}/Content/Images/Icons/logo-radarr.png`}
-            />
-          </Link>
-        </div>
-        <div className={styles.logoContainer} title="Lidarr">
-          <Link to="https://opencollective.com/lidarr">
-            <img
-              className={styles.logo}
-              src={`${window.Prowlarr.urlBase}/Content/Images/Icons/logo-lidarr.png`}
-            />
-          </Link>
-        </div>
-        <div className={styles.logoContainer} title="Readarr">
-          <Link to="https://opencollective.com/readarr">
-            <img
-              className={styles.logo}
-              src={`${window.Prowlarr.urlBase}/Content/Images/Icons/logo-readarr.png`}
-            />
-          </Link>
-        </div>
-        <div className={styles.logoContainer} title="Prowlarr">
-          <Link to="https://opencollective.com/prowlarr">
-            <img
-              className={styles.logo}
-              src={`${window.Prowlarr.urlBase}/Content/Images/Icons/logo-prowlarr.png`}
-            />
-          </Link>
-        </div>
-        <div className={styles.logoContainer} title="Sonarr">
-          <Link to="https://opencollective.com/sonarr">
-            <img
-              className={styles.logo}
-              src={`${window.Prowlarr.urlBase}/Content/Images/Icons/logo-sonarr.png`}
-            />
-          </Link>
-        </div>
-      </FieldSet>
-    );
-  }
-}
-
-Donations.propTypes = {
-
-};
-
-export default Donations;

frontend/src/System/Status/Health/Health.js

@@ -43,7 +43,6 @@ function getInternalLink(source) {
 function getTestLink(source, props) {
   switch (source) {
     case 'IndexerStatusCheck':
-    case 'IndexerLongTermStatusCheck':
       return (
         <SpinnerIconButton
           name={icons.TEST}

frontend/src/System/Status/MoreInfo/MoreInfo.js

@@ -15,32 +15,32 @@ class MoreInfo extends Component {
     return (
       <FieldSet legend={translate('MoreInfo')}>
         <DescriptionList>
-          <DescriptionListItemTitle>{translate('HomePage')}</DescriptionListItemTitle>
+          <DescriptionListItemTitle>Home page</DescriptionListItemTitle>
           <DescriptionListItemDescription>
             <Link to="https://prowlarr.com/">prowlarr.com</Link>
           </DescriptionListItemDescription>
 
-          <DescriptionListItemTitle>{translate('Wiki')}</DescriptionListItemTitle>
-          <DescriptionListItemDescription>
-            <Link to="https://wiki.servarr.com/prowlarr">wiki.servarr.com/prowlarr</Link>
-          </DescriptionListItemDescription>
-
-          <DescriptionListItemTitle>{translate('Reddit')}</DescriptionListItemTitle>
-          <DescriptionListItemDescription>
-            <Link to="https://reddit.com/r/prowlarr">r/prowlarr</Link>
-          </DescriptionListItemDescription>
-
-          <DescriptionListItemTitle>{translate('Discord')}</DescriptionListItemTitle>
+          <DescriptionListItemTitle>Discord</DescriptionListItemTitle>
           <DescriptionListItemDescription>
             <Link to="https://prowlarr.com/discord">prowlarr.com/discord</Link>
           </DescriptionListItemDescription>
 
-          <DescriptionListItemTitle>{translate('Source')}</DescriptionListItemTitle>
+          <DescriptionListItemTitle>Wiki</DescriptionListItemTitle>
+          <DescriptionListItemDescription>
+            <Link to="https://wiki.servarr.com/Prowlarr">wiki.servarr.com/Prowlarr</Link>
+          </DescriptionListItemDescription>
+
+          <DescriptionListItemTitle>Donations</DescriptionListItemTitle>
+          <DescriptionListItemDescription>
+            <Link to="https://opencollective.com/prowlarr">opencollective.com/prowlarr</Link>
+          </DescriptionListItemDescription>
+
+          <DescriptionListItemTitle>Source</DescriptionListItemTitle>
           <DescriptionListItemDescription>
             <Link to="https://github.com/Prowlarr/Prowlarr/">github.com/Prowlarr/Prowlarr</Link>
           </DescriptionListItemDescription>
 
-          <DescriptionListItemTitle>{translate('FeatureRequests')}</DescriptionListItemTitle>
+          <DescriptionListItemTitle>Feature Requests</DescriptionListItemTitle>
           <DescriptionListItemDescription>
             <Link to="https://github.com/Prowlarr/Prowlarr/issues">github.com/Prowlarr/Prowlarr/issues</Link>
           </DescriptionListItemDescription>

frontend/src/System/Status/Status.js

@@ -3,7 +3,6 @@ import PageContent from 'Components/Page/PageContent';
 import PageContentBody from 'Components/Page/PageContentBody';
 import translate from 'Utilities/String/translate';
 import AboutConnector from './About/AboutConnector';
-import Donations from './Donations/Donations';
 import HealthConnector from './Health/HealthConnector';
 import MoreInfo from './MoreInfo/MoreInfo';
 
@@ -19,7 +18,6 @@ class Status extends Component {
           <HealthConnector />
           <AboutConnector />
           <MoreInfo />
-          <Donations />
         </PageContentBody>
       </PageContent>
     );

frontend/src/System/Status/styles.css

@@ -1,17 +0,0 @@
-.logo {
-  margin: auto;
-  padding: 9px;
-}
-
-.logoContainer {
-  display: inline-block;
-  margin: 0.5em;
-  width: 50px;
-  height: 50px;
-  outline: none;
-  border: solid 1px #e6e6e6;
-  border-radius: 0.5em;
-  background: #f8f8ff;
-  box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2);
-  cursor: pointer;
-}

frontend/src/System/Updates/UpdateChanges.js

@@ -24,7 +24,7 @@ class UpdateChanges extends Component {
         <ul>
           {
             changes.map((change, index) => {
-              const checkChange = change.replace(/#\d{3,5}\b/g, (match, contents) => {
+              const checkChange = change.replace(/#\d{4,5}\b/g, (match, contents) => {
                 return `[${match}](https://github.com/Prowlarr/Prowlarr/issues/${match.substring(1)})`;
               });
 

frontend/src/Utilities/createAjaxRequest.js

@@ -7,6 +7,18 @@ function isRelative(ajaxOptions) {
   return !absUrlRegex.test(ajaxOptions.url);
 }
 
+function moveBodyToQuery(ajaxOptions) {
+  if (ajaxOptions.data && ajaxOptions.type === 'DELETE') {
+    if (ajaxOptions.url.contains('?')) {
+      ajaxOptions.url += '&';
+    } else {
+      ajaxOptions.url += '?';
+    }
+    ajaxOptions.url += $.param(ajaxOptions.data);
+    delete ajaxOptions.data;
+  }
+}
+
 function addRootUrl(ajaxOptions) {
   ajaxOptions.url = apiRoot + ajaxOptions.url;
 }
@@ -20,7 +32,7 @@ function addContentType(ajaxOptions) {
   if (
     ajaxOptions.contentType == null &&
     ajaxOptions.dataType === 'json' &&
-    (ajaxOptions.method === 'PUT' || ajaxOptions.method === 'POST' || ajaxOptions.method === 'DELETE')) {
+    (ajaxOptions.method === 'PUT' || ajaxOptions.method === 'POST')) {
     ajaxOptions.contentType = 'application/json';
   }
 }
@@ -40,6 +52,7 @@ export default function createAjaxRequest(originalAjaxOptions) {
   const ajaxOptions = { dataType: 'json', ...originalAjaxOptions };
 
   if (isRelative(ajaxOptions)) {
+    moveBodyToQuery(ajaxOptions);
     addRootUrl(ajaxOptions);
     addApiKey(ajaxOptions);
     addContentType(ajaxOptions);

frontend/src/login.html

@@ -252,7 +252,7 @@
                 </span>
 
                 <a
-                  href="https://wiki.servarr.com/prowlarr/faq#help-i-have-locked-myself-out"
+                  href="https://wiki.servarr.com/Prowlarr_FAQ#Help_I_have_locked_my_self_out_of_Prowlarr_and_do_not_know_the_password"
                   class="forgot-password"
                   >Forgot your password?</a
                 >

package.json

@@ -30,9 +30,9 @@
     "@fortawesome/free-regular-svg-icons": "5.15.3",
     "@fortawesome/free-solid-svg-icons": "5.15.3",
     "@fortawesome/react-fontawesome": "0.1.14",
-    "@microsoft/signalr": "5.0.9",
-    "@sentry/browser": "6.10.0",
-    "@sentry/integrations": "6.10.0",
+    "@microsoft/signalr": "5.0.6",
+    "@sentry/browser": "6.3.1",
+    "@sentry/integrations": "6.3.1",
     "chart.js": "3.2.0",
     "classnames": "2.3.1",
     "clipboard": "2.0.8",
@@ -98,12 +98,12 @@
     "babel-plugin-transform-react-remove-prop-types": "0.4.24",
     "core-js": "3.11.0",
     "css-loader": "5.2.4",
-    "eslint": "7.31.0",
+    "eslint": "7.25.0",
     "eslint-plugin-filenames": "1.3.2",
-    "eslint-plugin-import": "2.23.4",
-    "eslint-plugin-react": "7.24.0",
+    "eslint-plugin-import": "2.22.1",
+    "eslint-plugin-react": "7.23.2",
     "eslint-plugin-simple-import-sort": "7.0.0",
-    "esprint": "3.1.0",
+    "esprint": "2.0.0",
     "file-loader": "6.2.0",
     "filemanager-webpack-plugin": "5.0.0",
     "html-webpack-plugin": "5.3.1",
@@ -125,7 +125,7 @@
     "webpack": "5.35.1",
     "webpack-cli": "4.6.0",
     "webpack-livereload-plugin": "3.0.1",
-    "stylelint": "13.13.1",
+    "stylelint": "13.13.0",
     "stylelint-order": "4.1.0"
   }
 }

src/Directory.Build.props

@@ -94,7 +94,7 @@
   
   <!-- Standard testing packages -->
   <ItemGroup Condition="'$(TestProject)'=='true'">
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
     <PackageReference Include="NUnit" Version="3.13.1" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
     <PackageReference Include="NunitXml.TestLogger" Version="3.0.97" />

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

@@ -1,24 +0,0 @@
-using FluentAssertions;
-using NUnit.Framework;
-using NzbDrone.Common.Http;
-using NzbDrone.Test.Common;
-
-namespace NzbDrone.Common.Test.Http
-{
-    [TestFixture]
-    public class UserAgentParserFixture : TestBase
-    {
-        // Ref *Arr `_userAgent = $"{BuildInfo.AppName}/{BuildInfo.Version} ({osName} {osVersion})";`
-        // Ref Mylar `Mylar3/' +str(hash) +'(' +vers +') +http://www.github.com/mylar3/mylar3/`
-        [TestCase("Mylar3/ 3ee23rh23irqfq (13123123) http://www.github.com/mylar3/mylar3/", "Mylar3")]
-        [TestCase("Lidarr/1.0.0.2300 (ubuntu 20.04)", "Lidarr")]
-        [TestCase("Radarr/1.0.0.2300 (ubuntu 20.04)", "Radarr")]
-        [TestCase("Readarr/1.0.0.2300 (ubuntu 20.04)", "Readarr")]
-        [TestCase("Sonarr/3.0.6.9999 (ubuntu 20.04)", "Sonarr")]
-        [TestCase("Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/81.0.4044.138 Safari/537.36", "Other")]
-        public void should_parse_user_agent(string userAgent, string parsedAgent)
-        {
-            UserAgentParser.ParseSource(userAgent).Should().Be(parsedAgent);
-        }
-    }
-}

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

@@ -17,11 +17,6 @@ namespace NzbDrone.Common.Test.InstrumentationTests
         [TestCase(@"https://baconbits.org/feeds.php?feed=torrents_tv&user=12345&auth=2b51db35e1910123321025a12b9933d2&passkey=mySecret&authkey=2b51db35e1910123321025a12b9933d2")]
         [TestCase(@"http://127.0.0.1:9117/dl/indexername?jackett_apikey=flwjiefewklfjacketmySecretsdfldskjfsdlk&path=we0re9f0sdfbase64sfdkfjsdlfjk&file=The+Torrent+File+Name.torrent")]
         [TestCase(@"http://nzb.su/getnzb/2b51db35e1912ffc138825a12b9933d2.nzb&i=37292&r=2b51db35e1910123321025a12b9933d2")]
-        [TestCase(@"https://horrorcharnel.org/takeloginhorror.php: username=mySecret&password=mySecret&use_sslvalue==&perm_ssl=1&submitme=X&use_ssl=1&returnto=%2F&captchaSelection=1230456")]
-        [TestCase(@"https://torrentdb.net/login: _token=2b51db35e1912ffc138825a12b9933d2&username=mySecret&password=mySecret&remember=on")]
-        [TestCase(@" var authkey = ""2b51db35e1910123321025a12b9933d2"";")]
-        [TestCase(@"https://hd-space.org/index.php?page=login: uid=mySecret&pwd=mySecret")]
-        [TestCase(@"https://beyond-hd.me/api/torrents/2b51db35e1912ffc138825a12b9933d2")]
 
         // NzbGet
         [TestCase(@"{ ""Name"" : ""ControlUsername"", ""Value"" : ""mySecret"" }, { ""Name"" : ""ControlPassword"", ""Value"" : ""mySecret"" }, ")]
@@ -93,22 +88,5 @@ namespace NzbDrone.Common.Test.InstrumentationTests
 
             cleansedMessage.Should().Be(message);
         }
-
-        [TestCase(@"&useToken=2b51db35e1910123321025a12b9933d2")]
-        [TestCase(@"&useToken=2b51db35e1910123321025a12b9933d2")]
-        public void should_not_clean_usetoken(string message)
-        {
-            var cleansedMessage = CleanseLogMessage.Cleanse(message);
-
-            cleansedMessage.Should().Be(message);
-        }
-
-        [TestCase(@"https://www.torrentleech.org/torrents/browse/list/imdbID/tt8005374/categories/29,2,26,27,32,44,7,34,35")]
-        public void should_not_clean_url(string message)
-        {
-            var cleansedMessage = CleanseLogMessage.Cleanse(message);
-
-            cleansedMessage.Should().Be(message);
-        }
     }
 }

src/NzbDrone.Common/Extensions/DateTimeExtensions.cs

@@ -53,16 +53,6 @@ namespace NzbDrone.Common.Extensions
             return dateTime >= afterDateTime && dateTime <= beforeDateTime;
         }
 
-        public static DateTime EndOfDay(this DateTime date)
-        {
-            return new DateTime(date.Year, date.Month, date.Day, 23, 59, 59, 999);
-        }
-
-        public static DateTime StartOfDay(this DateTime date)
-        {
-            return new DateTime(date.Year, date.Month, date.Day, 0, 0, 0, 0);
-        }
-
         public static DateTime Epoch = new DateTime(1970, 1, 1, 0, 0, 0, DateTimeKind.Utc);
     }
 }

src/NzbDrone.Common/Extensions/StringExtensions.cs

@@ -194,21 +194,5 @@ namespace NzbDrone.Common.Extensions
             var inputBytes = encoding.GetBytes(searchString);
             return encoding.GetString(WebUtility.UrlDecodeToBytes(inputBytes, 0, inputBytes.Length));
         }
-
-        public static string CleanFileName(this string name)
-        {
-            string result = name;
-            string[] badCharacters = { "\\", "/", "<", ">", "?", "*", ":", "|", "\"" };
-            string[] goodCharacters = { "+", "+", "", "", "!", "-", "-", "", "" };
-
-            result = result.Replace(": ", " - ");
-
-            for (int i = 0; i < badCharacters.Length; i++)
-            {
-                result = result.Replace(badCharacters[i], goodCharacters[i]);
-            }
-
-            return result.TrimStart(' ', '.').TrimEnd(' ');
-        }
     }
 }

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

@@ -59,7 +59,7 @@ namespace NzbDrone.Common.Http.Dispatchers
                 webRequest.Timeout = (int)Math.Ceiling(request.RequestTimeout.TotalMilliseconds);
             }
 
-            webRequest.Proxy = request.Proxy ?? GetProxy(request.Url);
+            webRequest.Proxy = GetProxy(request.Url);
 
             if (request.Headers != null)
             {

src/NzbDrone.Common/Http/HttpClient.cs

@@ -61,7 +61,7 @@ namespace NzbDrone.Common.Http
             _cookieContainerCache = cacheManager.GetCache<CookieContainer>(typeof(HttpClient));
         }
 
-        public virtual async Task<HttpResponse> ExecuteAsync(HttpRequest request)
+        public async Task<HttpResponse> ExecuteAsync(HttpRequest request)
         {
             var cookieContainer = InitializeRequestCookies(request);
 
@@ -84,13 +84,6 @@ namespace NzbDrone.Common.Http
                         throw new WebException($"Too many automatic redirections were attempted for {autoRedirectChain.Join(" -> ")}", WebExceptionStatus.ProtocolError);
                     }
 
-                    // 302 or 303 should default to GET on redirect even if POST on original
-                    if (response.StatusCode == HttpStatusCode.Redirect || response.StatusCode == HttpStatusCode.RedirectMethod)
-                    {
-                        request.Method = HttpMethod.GET;
-                        request.ContentData = null;
-                    }
-
                     response = await ExecuteRequestAsync(request, cookieContainer);
                 }
                 while (response.HasHttpRedirect);

src/NzbDrone.Common/Http/HttpRequest.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Net;
 using System.Text;
 using NzbDrone.Common.EnvironmentInfo;
 using NzbDrone.Common.Extensions;
@@ -31,8 +30,6 @@ namespace NzbDrone.Common.Http
         public HttpUri Url { get; set; }
         public HttpMethod Method { get; set; }
         public HttpHeader Headers { get; set; }
-        public Encoding Encoding { get; set; }
-        public IWebProxy Proxy { get; set; }
         public byte[] ContentData { get; set; }
         public string ContentSummary { get; set; }
         public bool SuppressHttpError { get; set; }
@@ -78,28 +75,8 @@ namespace NzbDrone.Common.Http
 
         public void SetContent(string data)
         {
-            if (Encoding != null)
-            {
-                ContentData = Encoding.GetBytes(data);
-            }
-            else
-            {
-                var encoding = HttpHeader.GetEncodingFromContentType(Headers.ContentType);
-                ContentData = encoding.GetBytes(data);
-            }
-        }
-
-        public string GetContent()
-        {
-            if (Encoding != null)
-            {
-                return Encoding.GetString(ContentData);
-            }
-            else
-            {
-                var encoding = HttpHeader.GetEncodingFromContentType(Headers.ContentType);
-                return encoding.GetString(ContentData);
-            }
+            var encoding = HttpHeader.GetEncodingFromContentType(Headers.ContentType);
+            ContentData = encoding.GetBytes(data);
         }
 
         public void AddBasicAuthentication(string username, string password)

src/NzbDrone.Common/Http/HttpResponse.cs

@@ -47,14 +47,7 @@ namespace NzbDrone.Common.Http
             {
                 if (_content == null)
                 {
-                    if (Request.Encoding != null)
-                    {
-                        _content = Request.Encoding.GetString(ResponseData);
-                    }
-                    else
-                    {
-                        _content = Headers.GetEncodingFromContentType().GetString(ResponseData);
-                    }
+                    _content = Headers.GetEncodingFromContentType().GetString(ResponseData);
                 }
 
                 return _content;
@@ -69,20 +62,6 @@ namespace NzbDrone.Common.Http
                                        StatusCode == HttpStatusCode.TemporaryRedirect ||
                                        StatusCode == HttpStatusCode.Found;
 
-        public string RedirectUrl
-        {
-            get
-            {
-                var newUrl = Headers["Location"];
-                if (newUrl == null)
-                {
-                    return string.Empty;
-                }
-
-                return (Request.Url += new HttpUri(newUrl)).FullUri;
-            }
-        }
-
         public string[] GetCookieHeaders()
         {
             return Headers.GetValues("Set-Cookie") ?? Array.Empty<string>();

src/NzbDrone.Common/Http/UserAgentParser.cs

@@ -9,7 +9,7 @@ namespace NzbDrone.Common.Http
 {
     public static class UserAgentParser
     {
-        private static readonly Regex AppSourceRegex = new Regex(@"(?<agent>[a-z0-9]*)\/.*(?:\(.*\))?",
+        private static readonly Regex AppSourceRegex = new Regex(@"(?<agent>.*)\/.*(\(.*\))?",
                                                         RegexOptions.IgnoreCase | RegexOptions.Compiled);
 
         public static string SimplifyUserAgent(string userAgent)

src/NzbDrone.Common/Instrumentation/CleanseLogMessage.cs

@@ -11,15 +11,13 @@ namespace NzbDrone.Common.Instrumentation
         private static readonly Regex[] CleansingRules = new[]
             {
                 // Url
-                new Regex(@"(?<=\?|&|: |;)(apikey|token|passkey|auth|authkey|user|uid|api|[a-z_]*apikey|account|passwd|pwd)=(?<secret>[^&=]+?)(?= |&|$)", RegexOptions.Compiled | RegexOptions.IgnoreCase),
-                new Regex(@"(?<=\?|&| )[^=]*?(_?(?<!use)token|username|passwo?rd)=(?<secret>[^&=]+?)(?= |&|$)", RegexOptions.Compiled | RegexOptions.IgnoreCase),
-                new Regex(@"rss\.torrentleech\.org/(?!rss)(?<secret>[0-9a-z]+)", RegexOptions.Compiled | RegexOptions.IgnoreCase),
-                new Regex(@"rss\.torrentleech\.org/rss/download/[0-9]+/(?<secret>[0-9a-z]+)", RegexOptions.Compiled | RegexOptions.IgnoreCase),
+                new Regex(@"(?<=\?|&|: |;)(apikey|token|passkey|auth|authkey|user|uid|api|[a-z_]*apikey|account|passwd)=(?<secret>[^&=]+?)(?= |&|$)", RegexOptions.Compiled | RegexOptions.IgnoreCase),
+                new Regex(@"(?<=\?|&)[^=]*?(username|password)=(?<secret>[^&=]+?)(?= |&|$)", RegexOptions.Compiled | RegexOptions.IgnoreCase),
+                new Regex(@"torrentleech\.org/(?!rss)(?<secret>[0-9a-z]+)", RegexOptions.Compiled | RegexOptions.IgnoreCase),
+                new Regex(@"torrentleech\.org/rss/download/[0-9]+/(?<secret>[0-9a-z]+)", RegexOptions.Compiled | RegexOptions.IgnoreCase),
                 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(@"(?<=authkey = "")(?<secret>[^&=]+?)(?="")", RegexOptions.Compiled | RegexOptions.IgnoreCase),
-                new Regex(@"(?<=beyond-hd\.[a-z]+/api/torrents/)(?<secret>[^&=][a-z0-9]+)", RegexOptions.Compiled | RegexOptions.IgnoreCase),
 
                 // Path
                 new Regex(@"""C:\\Users\\(?<secret>[^\""]+?)(\\|$)", RegexOptions.Compiled | RegexOptions.IgnoreCase),
@@ -79,6 +77,7 @@ namespace NzbDrone.Common.Instrumentation
         private static string CleanseRemoteIP(Match match)
         {
             var group = match.Groups[1];
+            var valueAll = match.Value;
             var valueIP = group.Value;
 
             if (IPAddress.TryParse(valueIP, out var address) && !address.IsLocalAddress())

src/NzbDrone.Common/Prowlarr.Common.csproj

@@ -5,12 +5,12 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="DotNet4.SocksProxy" Version="1.4.0.1" />
-    <PackageReference Include="DryIoc.dll" Version="4.8.1" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="5.0.2" />
+    <PackageReference Include="DryIoc.dll" Version="4.7.6" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="5.0.1" />
     <PackageReference Include="NLog.Extensions.Logging" Version="1.7.2" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="NLog" Version="4.7.9" />
-    <PackageReference Include="Sentry" Version="3.8.3" />
+    <PackageReference Include="Sentry" Version="3.3.3" />
     <PackageReference Include="SharpZipLib" Version="1.3.1" />
     <PackageReference Include="System.ValueTuple" Version="4.5.0" />
     <PackageReference Include="System.Data.SQLite.Core.Servarr" Version="1.0.113.0-0" />

src/NzbDrone.Core.Test/Download/DownloadClientProviderFixture.cs

@@ -1,227 +0,0 @@
-using System;
-using System.Collections.Generic;
-using FizzWare.NBuilder;
-using FluentAssertions;
-using Moq;
-using NUnit.Framework;
-using NzbDrone.Core.Download;
-using NzbDrone.Core.Indexers;
-using NzbDrone.Core.Test.Framework;
-
-namespace NzbDrone.Core.Test.Download
-{
-    [TestFixture]
-    public class DownloadClientProviderFixture : CoreTest<DownloadClientProvider>
-    {
-        private List<IDownloadClient> _downloadClients;
-        private List<DownloadClientStatus> _blockedProviders;
-        private int _nextId;
-
-        [SetUp]
-        public void SetUp()
-        {
-            _downloadClients = new List<IDownloadClient>();
-            _blockedProviders = new List<DownloadClientStatus>();
-            _nextId = 1;
-
-            Mocker.GetMock<IDownloadClientFactory>()
-                  .Setup(v => v.GetAvailableProviders())
-                  .Returns(_downloadClients);
-
-            Mocker.GetMock<IDownloadClientStatusService>()
-                  .Setup(v => v.GetBlockedProviders())
-                  .Returns(_blockedProviders);
-        }
-
-        private Mock<IDownloadClient> WithUsenetClient(int priority = 0)
-        {
-            var mock = new Mock<IDownloadClient>(MockBehavior.Default);
-            mock.SetupGet(s => s.Definition)
-                .Returns(Builder<DownloadClientDefinition>
-                    .CreateNew()
-                    .With(v => v.Id = _nextId++)
-                    .With(v => v.Priority = priority)
-                    .Build());
-
-            _downloadClients.Add(mock.Object);
-
-            mock.SetupGet(v => v.Protocol).Returns(DownloadProtocol.Usenet);
-
-            return mock;
-        }
-
-        private Mock<IDownloadClient> WithTorrentClient(int priority = 0)
-        {
-            var mock = new Mock<IDownloadClient>(MockBehavior.Default);
-            mock.SetupGet(s => s.Definition)
-                .Returns(Builder<DownloadClientDefinition>
-                    .CreateNew()
-                    .With(v => v.Id = _nextId++)
-                    .With(v => v.Priority = priority)
-                    .Build());
-
-            _downloadClients.Add(mock.Object);
-
-            mock.SetupGet(v => v.Protocol).Returns(DownloadProtocol.Torrent);
-
-            return mock;
-        }
-
-        private void GivenBlockedClient(int id)
-        {
-            _blockedProviders.Add(new DownloadClientStatus
-            {
-                ProviderId = id,
-                DisabledTill = DateTime.UtcNow.AddHours(3)
-            });
-        }
-
-        [Test]
-        public void should_roundrobin_over_usenet_client()
-        {
-            WithUsenetClient();
-            WithUsenetClient();
-            WithUsenetClient();
-            WithTorrentClient();
-
-            var client1 = Subject.GetDownloadClient(DownloadProtocol.Usenet);
-            var client2 = Subject.GetDownloadClient(DownloadProtocol.Usenet);
-            var client3 = Subject.GetDownloadClient(DownloadProtocol.Usenet);
-            var client4 = Subject.GetDownloadClient(DownloadProtocol.Usenet);
-            var client5 = Subject.GetDownloadClient(DownloadProtocol.Usenet);
-
-            client1.Definition.Id.Should().Be(1);
-            client2.Definition.Id.Should().Be(2);
-            client3.Definition.Id.Should().Be(3);
-            client4.Definition.Id.Should().Be(1);
-            client5.Definition.Id.Should().Be(2);
-        }
-
-        [Test]
-        public void should_roundrobin_over_torrent_client()
-        {
-            WithUsenetClient();
-            WithTorrentClient();
-            WithTorrentClient();
-            WithTorrentClient();
-
-            var client1 = Subject.GetDownloadClient(DownloadProtocol.Torrent);
-            var client2 = Subject.GetDownloadClient(DownloadProtocol.Torrent);
-            var client3 = Subject.GetDownloadClient(DownloadProtocol.Torrent);
-            var client4 = Subject.GetDownloadClient(DownloadProtocol.Torrent);
-            var client5 = Subject.GetDownloadClient(DownloadProtocol.Torrent);
-
-            client1.Definition.Id.Should().Be(2);
-            client2.Definition.Id.Should().Be(3);
-            client3.Definition.Id.Should().Be(4);
-            client4.Definition.Id.Should().Be(2);
-            client5.Definition.Id.Should().Be(3);
-        }
-
-        [Test]
-        public void should_roundrobin_over_protocol_separately()
-        {
-            WithUsenetClient();
-            WithTorrentClient();
-            WithTorrentClient();
-
-            var client1 = Subject.GetDownloadClient(DownloadProtocol.Usenet);
-            var client2 = Subject.GetDownloadClient(DownloadProtocol.Torrent);
-            var client3 = Subject.GetDownloadClient(DownloadProtocol.Torrent);
-            var client4 = Subject.GetDownloadClient(DownloadProtocol.Torrent);
-
-            client1.Definition.Id.Should().Be(1);
-            client2.Definition.Id.Should().Be(2);
-            client3.Definition.Id.Should().Be(3);
-            client4.Definition.Id.Should().Be(2);
-        }
-
-        [Test]
-        public void should_skip_blocked_torrent_client()
-        {
-            WithUsenetClient();
-            WithTorrentClient();
-            WithTorrentClient();
-            WithTorrentClient();
-
-            GivenBlockedClient(3);
-
-            var client1 = Subject.GetDownloadClient(DownloadProtocol.Torrent);
-            var client2 = Subject.GetDownloadClient(DownloadProtocol.Torrent);
-            var client3 = Subject.GetDownloadClient(DownloadProtocol.Torrent);
-            var client4 = Subject.GetDownloadClient(DownloadProtocol.Torrent);
-            var client5 = Subject.GetDownloadClient(DownloadProtocol.Torrent);
-
-            client1.Definition.Id.Should().Be(2);
-            client2.Definition.Id.Should().Be(4);
-            client3.Definition.Id.Should().Be(2);
-            client4.Definition.Id.Should().Be(4);
-        }
-
-        [Test]
-        public void should_not_skip_blocked_torrent_client_if_all_blocked()
-        {
-            WithUsenetClient();
-            WithTorrentClient();
-            WithTorrentClient();
-            WithTorrentClient();
-
-            GivenBlockedClient(2);
-            GivenBlockedClient(3);
-            GivenBlockedClient(4);
-
-            var client1 = Subject.GetDownloadClient(DownloadProtocol.Torrent);
-            var client2 = Subject.GetDownloadClient(DownloadProtocol.Torrent);
-            var client3 = Subject.GetDownloadClient(DownloadProtocol.Torrent);
-            var client4 = Subject.GetDownloadClient(DownloadProtocol.Torrent);
-            var client5 = Subject.GetDownloadClient(DownloadProtocol.Torrent);
-
-            client1.Definition.Id.Should().Be(2);
-            client2.Definition.Id.Should().Be(3);
-            client3.Definition.Id.Should().Be(4);
-            client4.Definition.Id.Should().Be(2);
-        }
-
-        [Test]
-        public void should_skip_secondary_prio_torrent_client()
-        {
-            WithUsenetClient();
-            WithTorrentClient(2);
-            WithTorrentClient();
-            WithTorrentClient();
-
-            var client1 = Subject.GetDownloadClient(DownloadProtocol.Torrent);
-            var client2 = Subject.GetDownloadClient(DownloadProtocol.Torrent);
-            var client3 = Subject.GetDownloadClient(DownloadProtocol.Torrent);
-            var client4 = Subject.GetDownloadClient(DownloadProtocol.Torrent);
-            var client5 = Subject.GetDownloadClient(DownloadProtocol.Torrent);
-
-            client1.Definition.Id.Should().Be(3);
-            client2.Definition.Id.Should().Be(4);
-            client3.Definition.Id.Should().Be(3);
-            client4.Definition.Id.Should().Be(4);
-        }
-
-        [Test]
-        public void should_not_skip_secondary_prio_torrent_client_if_primary_blocked()
-        {
-            WithUsenetClient();
-            WithTorrentClient(2);
-            WithTorrentClient(2);
-            WithTorrentClient();
-
-            GivenBlockedClient(4);
-
-            var client1 = Subject.GetDownloadClient(DownloadProtocol.Torrent);
-            var client2 = Subject.GetDownloadClient(DownloadProtocol.Torrent);
-            var client3 = Subject.GetDownloadClient(DownloadProtocol.Torrent);
-            var client4 = Subject.GetDownloadClient(DownloadProtocol.Torrent);
-            var client5 = Subject.GetDownloadClient(DownloadProtocol.Torrent);
-
-            client1.Definition.Id.Should().Be(2);
-            client2.Definition.Id.Should().Be(3);
-            client3.Definition.Id.Should().Be(2);
-            client4.Definition.Id.Should().Be(3);
-        }
-    }
-}

src/NzbDrone.Core.Test/Download/DownloadClientStatusServiceFixture.cs

@@ -1,161 +0,0 @@
-using System;
-using System.Linq;
-using FluentAssertions;
-using Moq;
-using NUnit.Framework;
-using NzbDrone.Common.EnvironmentInfo;
-using NzbDrone.Core.Download;
-using NzbDrone.Core.Test.Framework;
-
-namespace NzbDrone.Core.Test.Download
-{
-    public class DownloadClientStatusServiceFixture : CoreTest<DownloadClientStatusService>
-    {
-        private DateTime _epoch;
-
-        [SetUp]
-        public void SetUp()
-        {
-            _epoch = DateTime.UtcNow;
-
-            Mocker.GetMock<IRuntimeInfo>()
-                .SetupGet(v => v.StartTime)
-                .Returns(_epoch - TimeSpan.FromHours(1));
-        }
-
-        private DownloadClientStatus WithStatus(DownloadClientStatus status)
-        {
-            Mocker.GetMock<IDownloadClientStatusRepository>()
-                .Setup(v => v.FindByProviderId(1))
-                .Returns(status);
-
-            Mocker.GetMock<IDownloadClientStatusRepository>()
-                .Setup(v => v.All())
-                .Returns(new[] { status });
-
-            return status;
-        }
-
-        private void VerifyUpdate()
-        {
-            Mocker.GetMock<IDownloadClientStatusRepository>()
-                .Verify(v => v.Upsert(It.IsAny<DownloadClientStatus>()), Times.Once());
-        }
-
-        private void VerifyNoUpdate()
-        {
-            Mocker.GetMock<IDownloadClientStatusRepository>()
-                .Verify(v => v.Upsert(It.IsAny<DownloadClientStatus>()), Times.Never());
-        }
-
-        [Test]
-        public void should_not_consider_blocked_within_5_minutes_since_initial_failure()
-        {
-            WithStatus(new DownloadClientStatus
-            {
-                InitialFailure = _epoch - TimeSpan.FromMinutes(4),
-                MostRecentFailure = _epoch - TimeSpan.FromSeconds(4),
-                EscalationLevel = 3
-            });
-
-            Subject.RecordFailure(1);
-
-            VerifyUpdate();
-
-            var status = Subject.GetBlockedProviders().FirstOrDefault();
-            status.Should().BeNull();
-        }
-
-        [Test]
-        public void should_consider_blocked_after_5_minutes_since_initial_failure()
-        {
-            WithStatus(new DownloadClientStatus
-            {
-                InitialFailure = _epoch - TimeSpan.FromMinutes(6),
-                MostRecentFailure = _epoch - TimeSpan.FromSeconds(120),
-                EscalationLevel = 3
-            });
-
-            Subject.RecordFailure(1);
-
-            VerifyUpdate();
-
-            var status = Subject.GetBlockedProviders().FirstOrDefault();
-            status.Should().NotBeNull();
-        }
-
-        [Test]
-        public void should_not_escalate_further_till_after_5_minutes_since_initial_failure()
-        {
-            var origStatus = WithStatus(new DownloadClientStatus
-            {
-                InitialFailure = _epoch - TimeSpan.FromMinutes(4),
-                MostRecentFailure = _epoch - TimeSpan.FromSeconds(4),
-                EscalationLevel = 3
-            });
-
-            Subject.RecordFailure(1);
-            Subject.RecordFailure(1);
-            Subject.RecordFailure(1);
-            Subject.RecordFailure(1);
-            Subject.RecordFailure(1);
-            Subject.RecordFailure(1);
-            Subject.RecordFailure(1);
-
-            var status = Subject.GetBlockedProviders().FirstOrDefault();
-            status.Should().BeNull();
-
-            origStatus.EscalationLevel.Should().Be(3);
-        }
-
-        [Test]
-        public void should_escalate_further_after_5_minutes_since_initial_failure()
-        {
-            WithStatus(new DownloadClientStatus
-            {
-                InitialFailure = _epoch - TimeSpan.FromMinutes(6),
-                MostRecentFailure = _epoch - TimeSpan.FromSeconds(120),
-                EscalationLevel = 3
-            });
-
-            Subject.RecordFailure(1);
-            Subject.RecordFailure(1);
-            Subject.RecordFailure(1);
-            Subject.RecordFailure(1);
-            Subject.RecordFailure(1);
-            Subject.RecordFailure(1);
-            Subject.RecordFailure(1);
-
-            var status = Subject.GetBlockedProviders().FirstOrDefault();
-            status.Should().NotBeNull();
-
-            status.EscalationLevel.Should().BeGreaterThan(3);
-        }
-
-        [Test]
-        public void should_not_escalate_beyond_3_hours()
-        {
-            WithStatus(new DownloadClientStatus
-            {
-                InitialFailure = _epoch - TimeSpan.FromMinutes(6),
-                MostRecentFailure = _epoch - TimeSpan.FromSeconds(120),
-                EscalationLevel = 3
-            });
-
-            Subject.RecordFailure(1);
-            Subject.RecordFailure(1);
-            Subject.RecordFailure(1);
-            Subject.RecordFailure(1);
-            Subject.RecordFailure(1);
-            Subject.RecordFailure(1);
-            Subject.RecordFailure(1);
-            Subject.RecordFailure(1);
-            Subject.RecordFailure(1);
-
-            var status = Subject.GetBlockedProviders().FirstOrDefault();
-            status.Should().NotBeNull();
-            status.DisabledTill.Should().HaveValue();
-            status.DisabledTill.Should().NotBeAfter(_epoch + TimeSpan.FromHours(3.1));
-        }
-    }
-}

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

@@ -33,8 +33,14 @@ namespace NzbDrone.Core.Test.HealthCheck.Checks
             Subject.Check().ShouldBeWarning();
         }
 
-        [TestCase("Develop")]
         [TestCase("develop")]
+        public void should_return_error_when_branch_is_v1(string branch)
+        {
+            GivenValidBranch(branch);
+
+            Subject.Check().ShouldBeError();
+        }
+
         [TestCase("nightly")]
         [TestCase("Nightly")]
         public void should_return_no_warning_when_branch_valid(string branch)