Fixed: (Flaresolverr) Ignore http errors on initial request when using FS

Co-Authored-By: ta264 <ta264@users.noreply.github.com>

.editorconfig

@@ -260,7 +260,7 @@ dotnet_diagnostic.CA5392.severity = suggestion
 dotnet_diagnostic.CA5394.severity = suggestion
 dotnet_diagnostic.CA5397.severity = suggestion
 
-
+dotnet_diagnostic.SYSLIB0014.severity = none
 
 [*.{js,html,js,hbs,less,css}]
 charset = utf-8

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -1,5 +1,4 @@
 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:
@@ -64,11 +63,11 @@ body:
     required: true
 - type: textarea
   attributes:
-    label: Anything else?
+    label: Trace Logs?
     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!
-      
+      ***Generally speaking, all bug reports must have trace logs provided.***
       Tip: You can attach images or log files by clicking this area to highlight it and then dragging files in.
+      Additionally, any additional info? Screenshots? References? Anything that will give us more context about the issue you are encountering!
   validations:
     required: true

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -1,5 +1,4 @@
 name: Feature Request
-title: "[FEAT]: "
 description: 'Suggest an idea for Prowlarr'
 labels: ['Type: Feature Request', 'Status: Needs Triage']
 body:

CONTRIBUTING.md

@@ -1,55 +1,13 @@
-# How to Contribute #
+# How to Contribute
 
 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).
+This file has been moved to the wiki 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.
+## Documentation
 
-## Development ##
+Setup guides, [FAQ](https://wiki.servarr.com/prowlarr/faq), the more information we have on the [wiki](https://wiki.servarr.com/prowlarr) the better.
 
-### 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. 
+## Development
 
-### 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
-
-### 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)
-- Rebase from Prowlarr's develop branch, don't merge
-- Make meaningful commits, or squash them
-- Feel free to make a pull request before work is complete, this will let us see where its at and make comments/suggest improvements
-- Reach out to us on the discord if you have any questions
-- Add tests (unit/integration)
-- Commit with *nix line endings for consistency (We checkout Windows and commit *nix)
-- 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
-- We'll try to respond to pull requests as soon as possible, if its been a day or two, please reach out to us, we may have missed it
-- Each PR should come from its own [feature branch](http://martinfowler.com/bliki/FeatureBranch.html) not develop in your fork, it should have a meaningful branch name (what is being added/fixed)
-  - new-feature (Good)
-  - fix-bug (Good)
-  - patch (Bad)
-  - develop (Bad)
-
-If you have any questions about any of this, please let us know.
+See the [Wiki Page](https://wiki.servarr.com/prowlarr/contributing)

azure-pipelines.yml

@@ -7,13 +7,13 @@ variables:
   outputFolder: './_output'
   artifactsFolder: './_artifacts'
   testsFolder: './_tests'
-  majorVersion: '0.1.1'
+  majorVersion: '0.1.6'
   minorVersion: $[counter('minorVersion', 1)]
   prowlarrVersion: '$(majorVersion).$(minorVersion)'
   buildName: '$(Build.SourceBranchName).$(prowlarrVersion)'
   sentryOrg: 'servarr'
   sentryUrl: 'https://sentry.servarr.com'
-  dotnetVersion: '5.0.400'
+  dotnetVersion: '6.0.100'
   yarnCacheFolder: $(Pipeline.Workspace)/.yarn
 
 trigger:
@@ -67,7 +67,7 @@ stages:
             enableAnalysis: 'true'
           Mac:
             osName: 'Mac'
-            imageName: 'macos-10.14'
+            imageName: 'macos-10.15'
             enableAnalysis: 'false'
           Windows:
             osName: 'Windows'
@@ -111,23 +111,23 @@ stages:
         artifact: '$(osName)Backend'
         displayName: Publish Backend
         condition: and(succeeded(), eq(variables['osName'], 'Windows'))
-      - publish: '$(testsFolder)/net5.0/win-x64/publish'
+      - publish: '$(testsFolder)/net6.0/win-x64/publish'
         artifact: WindowsCoreTests
         displayName: Publish Windows Test Package
         condition: and(succeeded(), eq(variables['osName'], 'Windows'))
-      - publish: '$(testsFolder)/net5.0/linux-x64/publish'
+      - publish: '$(testsFolder)/net6.0/linux-x64/publish'
         artifact: LinuxCoreTests
         displayName: Publish Linux Test Package
         condition: and(succeeded(), eq(variables['osName'], 'Windows'))
-      - publish: '$(testsFolder)/net5.0/linux-musl-x64/publish'
+      - publish: '$(testsFolder)/net6.0/linux-musl-x64/publish'
         artifact: LinuxMuslCoreTests
         displayName: Publish Linux Musl Test Package
         condition: and(succeeded(), eq(variables['osName'], 'Windows'))
-      - publish: '$(testsFolder)/net5.0/freebsd-x64/publish'
+      - publish: '$(testsFolder)/net6.0/freebsd-x64/publish'
         artifact: FreebsdCoreTests
         displayName: Publish FreeBSD Test Package
         condition: and(succeeded(), eq(variables['osName'], 'Windows'))
-      - publish: '$(testsFolder)/net5.0/osx-x64/publish'
+      - publish: '$(testsFolder)/net6.0/osx-x64/publish'
         artifact: MacCoreTests
         displayName: Publish MacOS Test Package
         condition: and(succeeded(), eq(variables['osName'], 'Windows'))
@@ -144,7 +144,7 @@ stages:
             imageName: 'ubuntu-18.04'
           Mac:
             osName: 'Mac'
-            imageName: 'macos-10.14'
+            imageName: 'macos-10.15'
           Windows:
             osName: 'Windows'
             imageName: 'windows-2019'
@@ -163,7 +163,6 @@ stages:
           key: 'yarn | "$(osName)" | yarn.lock'
           restoreKeys: |
              yarn | "$(osName)"
-             yarn
           path: $(yarnCacheFolder)
         displayName: Cache Yarn packages
       - bash: ./build.sh --frontend
@@ -203,12 +202,12 @@ stages:
       - bash: ./build.sh --packages
         displayName: Create Packages
       - bash: |
-          distribution/windows/setup/inno/ISCC.exe distribution/windows/setup/prowlarr.iss //DFramework=net5.0 //DRuntime=win-x86
-          cp distribution/windows/setup/output/Prowlarr.*windows.net5.0.exe ${BUILD_ARTIFACTSTAGINGDIRECTORY}/Prowlarr.${BUILDNAME}.windows-core-x86-installer.exe
+          distribution/windows/setup/inno/ISCC.exe distribution/windows/setup/prowlarr.iss //DFramework=net6.0 //DRuntime=win-x86
+          cp distribution/windows/setup/output/Prowlarr.*windows.net6.0.exe ${BUILD_ARTIFACTSTAGINGDIRECTORY}/Prowlarr.${BUILDNAME}.windows-core-x86-installer.exe
         displayName: Create x86 .NET Core Windows installer
       - bash: |
-          distribution/windows/setup/inno/ISCC.exe distribution/windows/setup/prowlarr.iss //DFramework=net5.0 //DRuntime=win-x64
-          cp distribution/windows/setup/output/Prowlarr.*windows.net5.0.exe ${BUILD_ARTIFACTSTAGINGDIRECTORY}/Prowlarr.${BUILDNAME}.windows-core-x64-installer.exe
+          distribution/windows/setup/inno/ISCC.exe distribution/windows/setup/prowlarr.iss //DFramework=net6.0 //DRuntime=win-x64
+          cp distribution/windows/setup/output/Prowlarr.*windows.net6.0.exe ${BUILD_ARTIFACTSTAGINGDIRECTORY}/Prowlarr.${BUILDNAME}.windows-core-x64-installer.exe
         displayName: Create x64 .NET Core Windows installer
       - publish: $(Build.ArtifactStagingDirectory)
         artifact: 'WindowsInstaller'
@@ -250,29 +249,44 @@ stages:
           archiveFile: '$(Build.ArtifactStagingDirectory)/Prowlarr.$(buildName).windows-core-x64.zip'
           archiveType: 'zip'
           includeRootFolder: false
-          rootFolderOrFile: $(artifactsFolder)/win-x64/net5.0
+          rootFolderOrFile: $(artifactsFolder)/win-x64/net6.0
       - task: ArchiveFiles@2
         displayName: Create Windows x86 Core zip
         inputs:
           archiveFile: '$(Build.ArtifactStagingDirectory)/Prowlarr.$(buildName).windows-core-x86.zip'
           archiveType: 'zip'
           includeRootFolder: false
-          rootFolderOrFile: $(artifactsFolder)/win-x86/net5.0
+          rootFolderOrFile: $(artifactsFolder)/win-x86/net6.0
       - task: ArchiveFiles@2
-        displayName: Create MacOS Core app
+        displayName: Create MacOS x64 Core app
         inputs:
           archiveFile: '$(Build.ArtifactStagingDirectory)/Prowlarr.$(buildName).osx-app-core-x64.zip'
           archiveType: 'zip'
           includeRootFolder: false
-          rootFolderOrFile: $(artifactsFolder)/macos-app/net5.0
+          rootFolderOrFile: $(artifactsFolder)/osx-x64-app/net6.0
       - task: ArchiveFiles@2
-        displayName: Create MacOS Core tar
+        displayName: Create MacOS x64 Core tar
         inputs:
           archiveFile: '$(Build.ArtifactStagingDirectory)/Prowlarr.$(buildName).osx-core-x64.tar.gz'
           archiveType: 'tar'
           tarCompression: 'gz'
           includeRootFolder: false
-          rootFolderOrFile: $(artifactsFolder)/macos/net5.0
+          rootFolderOrFile: $(artifactsFolder)/osx-x64/net6.0
+      - task: ArchiveFiles@2
+        displayName: Create MacOS arm64 Core app
+        inputs:
+          archiveFile: '$(Build.ArtifactStagingDirectory)/Prowlarr.$(buildName).osx-app-core-arm64.zip'
+          archiveType: 'zip'
+          includeRootFolder: false
+          rootFolderOrFile: $(artifactsFolder)/osx-arm64-app/net6.0
+      - task: ArchiveFiles@2
+        displayName: Create MacOS arm64 Core tar
+        inputs:
+          archiveFile: '$(Build.ArtifactStagingDirectory)/Prowlarr.$(buildName).osx-core-arm64.tar.gz'
+          archiveType: 'tar'
+          tarCompression: 'gz'
+          includeRootFolder: false
+          rootFolderOrFile: $(artifactsFolder)/osx-arm64/net6.0
       - task: ArchiveFiles@2
         displayName: Create Linux Core tar
         inputs:
@@ -280,7 +294,7 @@ stages:
           archiveType: 'tar'
           tarCompression: 'gz'
           includeRootFolder: false
-          rootFolderOrFile: $(artifactsFolder)/linux-x64/net5.0
+          rootFolderOrFile: $(artifactsFolder)/linux-x64/net6.0
       - task: ArchiveFiles@2
         displayName: Create Linux Musl Core tar
         inputs:
@@ -288,7 +302,7 @@ stages:
           archiveType: 'tar'
           tarCompression: 'gz'
           includeRootFolder: false
-          rootFolderOrFile: $(artifactsFolder)/linux-musl-x64/net5.0
+          rootFolderOrFile: $(artifactsFolder)/linux-musl-x64/net6.0
       - task: ArchiveFiles@2
         displayName: Create ARM32 Linux Core tar
         inputs:
@@ -296,7 +310,15 @@ stages:
           archiveType: 'tar'
           tarCompression: 'gz'
           includeRootFolder: false
-          rootFolderOrFile: $(artifactsFolder)/linux-arm/net5.0
+          rootFolderOrFile: $(artifactsFolder)/linux-arm/net6.0
+      - task: ArchiveFiles@2
+        displayName: Create ARM32 Linux Musl Core tar
+        inputs:
+          archiveFile: '$(Build.ArtifactStagingDirectory)/Prowlarr.$(buildName).linux-musl-core-arm.tar.gz'
+          archiveType: 'tar'
+          tarCompression: 'gz'
+          includeRootFolder: false
+          rootFolderOrFile: $(artifactsFolder)/linux-musl-arm/net6.0
       - task: ArchiveFiles@2
         displayName: Create ARM64 Linux Core tar
         inputs:
@@ -304,7 +326,7 @@ stages:
           archiveType: 'tar'
           tarCompression: 'gz'
           includeRootFolder: false
-          rootFolderOrFile: $(artifactsFolder)/linux-arm64/net5.0
+          rootFolderOrFile: $(artifactsFolder)/linux-arm64/net6.0
       - task: ArchiveFiles@2
         displayName: Create ARM64 Linux Musl Core tar
         inputs:
@@ -312,7 +334,7 @@ stages:
           archiveType: 'tar'
           tarCompression: 'gz'
           includeRootFolder: false
-          rootFolderOrFile: $(artifactsFolder)/linux-musl-arm64/net5.0
+          rootFolderOrFile: $(artifactsFolder)/linux-musl-arm64/net6.0
       - task: ArchiveFiles@2
         displayName: Create FreeBSD Core Core tar
         inputs:
@@ -320,7 +342,7 @@ stages:
           archiveType: 'tar'
           tarCompression: 'gz'
           includeRootFolder: false
-          rootFolderOrFile: $(artifactsFolder)/freebsd-x64/net5.0
+          rootFolderOrFile: $(artifactsFolder)/freebsd-x64/net6.0
       - publish: $(Build.ArtifactStagingDirectory)
         artifact: 'Packages'
         displayName: Publish Packages
@@ -383,7 +405,7 @@ stages:
             osName: 'Mac'
             testName: 'MacCore'
             poolName: 'Azure Pipelines'
-            imageName: 'macos-10.14'
+            imageName: 'macos-10.15'
           WindowsCore:
             osName: 'Windows'
             testName: 'WindowsCore'
@@ -510,7 +532,7 @@ stages:
           MacCore:
             osName: 'Mac'
             testName: 'MacCore'
-            imageName: 'macos-10.14'
+            imageName: 'macos-10.15'
             pattern: 'Prowlarr.*.osx-core-x64.tar.gz'
           WindowsCore:
             osName: 'Windows'
@@ -686,7 +708,7 @@ stages:
             failBuild: false
           Mac:
             osName: 'Mac'
-            imageName: 'macos-10.14'
+            imageName: 'macos-10.15'
             pattern: 'Prowlarr.*.osx-core-x64.tar.gz'
             failBuild: false
           Windows:
@@ -793,7 +815,6 @@ stages:
           key: 'yarn | "$(osName)" | yarn.lock'
           restoreKeys: |
              yarn | "$(osName)"
-             yarn
           path: $(yarnCacheFolder)
         displayName: Cache Yarn packages
       - bash: ./build.sh --lint
@@ -838,8 +859,8 @@ stages:
             sonar.cs.opencover.reportsPaths=$(Build.SourcesDirectory)/CoverageResults/**/coverage.opencover.xml
             sonar.cs.nunit.reportsPaths=$(Build.SourcesDirectory)/TestResult.xml
       - bash: |
-          ./build.sh --backend -f net5.0 -r win-x64
-          TEST_DIR=_tests/net5.0/win-x64/publish/ ./test.sh Windows Unit Coverage
+          ./build.sh --backend -f net6.0 -r win-x64
+          TEST_DIR=_tests/net6.0/win-x64/publish/ ./test.sh Windows Unit Coverage
         displayName: Coverage Unit Tests
       - task: SonarCloudAnalyze@1
         condition: eq(variables['System.PullRequest.IsFork'], 'False')

build.sh

@@ -130,7 +130,7 @@ PackageLinux()
 
     echo "Adding Prowlarr.Mono to UpdatePackage"
     cp $folder/Prowlarr.Mono.* $folder/Prowlarr.Update
-    if [ "$framework" = "net5.0" ]; then
+    if [ "$framework" = "net6.0" ]; then
         cp $folder/Mono.Posix.NETStandard.* $folder/Prowlarr.Update
         cp $folder/libMonoPosixHelper.* $folder/Prowlarr.Update
     fi
@@ -141,12 +141,13 @@ PackageLinux()
 PackageMacOS()
 {
     local framework="$1"
+    local runtime="$2"
     
-    ProgressStart "Creating MacOS Package for $framework"
+    ProgressStart "Creating MacOS Package for $framework $runtime"
 
-    local folder=$artifactsFolder/macos/$framework/Prowlarr
+    local folder=$artifactsFolder/$runtime/$framework/Prowlarr
 
-    PackageFiles "$folder" "$framework" "osx-x64"
+    PackageFiles "$folder" "$framework" "$runtime"
 
     echo "Removing Service helpers"
     rm -f $folder/ServiceUninstall.*
@@ -157,7 +158,7 @@ PackageMacOS()
 
     echo "Adding Prowlarr.Mono to UpdatePackage"
     cp $folder/Prowlarr.Mono.* $folder/Prowlarr.Update
-    if [ "$framework" = "net5.0" ]; then
+    if [ "$framework" = "net6.0" ]; then
         cp $folder/Mono.Posix.NETStandard.* $folder/Prowlarr.Update
         cp $folder/libMonoPosixHelper.* $folder/Prowlarr.Update
     fi
@@ -168,10 +169,11 @@ PackageMacOS()
 PackageMacOSApp()
 {
     local framework="$1"
+    local runtime="$2"
     
-    ProgressStart "Creating macOS App Package for $framework"
+    ProgressStart "Creating macOS App Package for $framework $runtime"
 
-    local folder=$artifactsFolder/macos-app/$framework
+    local folder="$artifactsFolder/$runtime-app/$framework"
 
     rm -rf $folder
     mkdir -p $folder
@@ -179,7 +181,7 @@ PackageMacOSApp()
     mkdir -p $folder/Prowlarr.app/Contents/MacOS
 
     echo "Copying Binaries"
-    cp -r $artifactsFolder/macos/$framework/Prowlarr/* $folder/Prowlarr.app/Contents/MacOS
+    cp -r $artifactsFolder/$runtime/$framework/Prowlarr/* $folder/Prowlarr.app/Contents/MacOS
 
     echo "Removing Update Folder"
     rm -r $folder/Prowlarr.app/Contents/MacOS/Prowlarr.Update
@@ -226,8 +228,8 @@ Package()
             PackageWindows "$framework" "$runtime"
             ;;
         osx)
-            PackageMacOS "$framework"
-            PackageMacOSApp "$framework"
+            PackageMacOS "$framework" "$runtime"
+            PackageMacOSApp "$framework" "$runtime"
             ;;
     esac
 }
@@ -327,14 +329,14 @@ then
     Build
     if [[ -z "$RID" || -z "$FRAMEWORK" ]];
     then
-        PackageTests "net5.0" "win-x64"
-        PackageTests "net5.0" "win-x86"
-        PackageTests "net5.0" "linux-x64"
-        PackageTests "net5.0" "linux-musl-x64"
-        PackageTests "net5.0" "osx-x64"
+        PackageTests "net6.0" "win-x64"
+        PackageTests "net6.0" "win-x86"
+        PackageTests "net6.0" "linux-x64"
+        PackageTests "net6.0" "linux-musl-x64"
+        PackageTests "net6.0" "osx-x64"
         if [ "$ENABLE_BSD" = "YES" ];
         then
-            PackageTests "net5.0" "freebsd-x64"
+            PackageTests "net6.0" "freebsd-x64"
         fi
     else
         PackageTests "$FRAMEWORK" "$RID"
@@ -363,17 +365,19 @@ then
 
     if [[ -z "$RID" || -z "$FRAMEWORK" ]];
     then
-        Package "net5.0" "win-x64"
-        Package "net5.0" "win-x86"
-        Package "net5.0" "linux-x64"
-        Package "net5.0" "linux-musl-x64"
-        Package "net5.0" "linux-arm64"
-        Package "net5.0" "linux-musl-arm64"
-        Package "net5.0" "linux-arm"
-        Package "net5.0" "osx-x64"
+        Package "net6.0" "win-x64"
+        Package "net6.0" "win-x86"
+        Package "net6.0" "linux-x64"
+        Package "net6.0" "linux-musl-x64"
+        Package "net6.0" "linux-arm64"
+        Package "net6.0" "linux-musl-arm64"
+        Package "net6.0" "linux-arm"
+        Package "net6.0" "linux-musl-arm"
+        Package "net6.0" "osx-x64"
+        Package "net6.0" "osx-arm64"
         if [ "$ENABLE_BSD" = "YES" ];
         then
-            Package "net5.0" "freebsd-x64"
+            Package "net6.0" "freebsd-x64"
         fi
     else
         Package "$FRAMEWORK" "$RID"

frontend/src/Commands/commandNames.js

@@ -4,7 +4,5 @@ export const CLEAR_HISTORY = 'ClearHistory';
 export const CLEAR_LOGS = 'ClearLog';
 export const DELETE_LOG_FILES = 'DeleteLogFiles';
 export const DELETE_UPDATE_LOG_FILES = 'DeleteUpdateLogFiles';
-export const INTERACTIVE_IMPORT = 'ManualImport';
 export const RESET_API_KEY = 'ResetApiKey';
-export const RSS_SYNC = 'RssSync';
 export const APP_INDEXER_SYNC = 'ApplicationIndexerSync';

frontend/src/Components/FileBrowser/FileBrowserModalContent.js

@@ -70,18 +70,18 @@ class FileBrowserModalContent extends Component {
     } else {
       this._scrollerNode = null;
     }
-  }
+  };
 
   //
   // Listeners
 
   onPathInputChange = ({ value }) => {
     this.setState({ currentPath: value });
-  }
+  };
 
   onRowPress = (path) => {
     this.props.onFetchPaths(path);
-  }
+  };
 
   onOkPress = () => {
     this.props.onChange({
@@ -91,7 +91,7 @@ class FileBrowserModalContent extends Component {
 
     this.props.onClearPaths();
     this.props.onModalClose();
-  }
+  };
 
   //
   // Render

frontend/src/Components/FileBrowser/FileBrowserModalContentConnector.js

@@ -78,16 +78,16 @@ class FileBrowserModalContentConnector extends Component {
       allowFoldersWithoutTrailingSlashes: true,
       includeFiles
     });
-  }
+  };
 
   onClearPaths = () => {
     // this.props.dispatchClearPaths();
-  }
+  };
 
   onModalClose = () => {
     this.props.dispatchClearPaths();
     this.props.onModalClose();
-  }
+  };
 
   //
   // Render

frontend/src/Components/FileBrowser/FileBrowserRow.js

@@ -28,7 +28,7 @@ class FileBrowserRow extends Component {
 
   onPress = () => {
     this.props.onPress(this.props.path);
-  }
+  };
 
   //
   // Render

frontend/src/Components/Filter/Builder/DateFilterBuilderRowValue.js

@@ -102,7 +102,7 @@ class DateFilterBuilderRowValue extends Component {
       name: NAME,
       value: newValue
     });
-  }
+  };
 
   onTimeChange = ({ value }) => {
     const {
@@ -117,7 +117,7 @@ class DateFilterBuilderRowValue extends Component {
         value: filterValue.value
       }
     });
-  }
+  };
 
   //
   // Render

frontend/src/Components/Filter/Builder/FilterBuilderModalContent.js

@@ -63,7 +63,7 @@ class FilterBuilderModalContent extends Component {
 
   onLabelChange = ({ value }) => {
     this.setState({ label: value });
-  }
+  };
 
   onFilterChange = (index, filter) => {
     const filters = [...this.state.filters];
@@ -72,7 +72,7 @@ class FilterBuilderModalContent extends Component {
     this.setState({
       filters
     });
-  }
+  };
 
   onAddFilterPress = () => {
     const filters = [...this.state.filters];
@@ -81,7 +81,7 @@ class FilterBuilderModalContent extends Component {
     this.setState({
       filters
     });
-  }
+  };
 
   onRemoveFilterPress = (index) => {
     const filters = [...this.state.filters];
@@ -90,7 +90,7 @@ class FilterBuilderModalContent extends Component {
     this.setState({
       filters
     });
-  }
+  };
 
   onSaveFilterPress = () => {
     const {
@@ -122,7 +122,7 @@ class FilterBuilderModalContent extends Component {
       label,
       filters
     });
-  }
+  };
 
   //
   // Render

frontend/src/Components/Filter/Builder/FilterBuilderRow.js

@@ -138,7 +138,7 @@ class FilterBuilderRow extends Component {
 
     this.selectedFilterBuilderProp = selectedFilterBuilderProp;
     onFilterChange(index, filter);
-  }
+  };
 
   onFilterChange = ({ name, value }) => {
     const {
@@ -158,7 +158,7 @@ class FilterBuilderRow extends Component {
     filter[name] = value;
 
     onFilterChange(index, filter);
-  }
+  };
 
   onAddPress = () => {
     const {
@@ -167,7 +167,7 @@ class FilterBuilderRow extends Component {
     } = this.props;
 
     onAddPress(index);
-  }
+  };
 
   onRemovePress = () => {
     const {
@@ -176,7 +176,7 @@ class FilterBuilderRow extends Component {
     } = this.props;
 
     onRemovePress(index);
-  }
+  };
 
   //
   // Render

frontend/src/Components/Filter/Builder/FilterBuilderRowValue.js

@@ -84,7 +84,7 @@ class FilterBuilderRowValue extends Component {
       name: NAME,
       value: [...filterValue, value]
     });
-  }
+  };
 
   onTagDelete = ({ index }) => {
     const {
@@ -98,7 +98,7 @@ class FilterBuilderRowValue extends Component {
       name: NAME,
       value
     });
-  }
+  };
 
   //
   // Render

frontend/src/Components/Filter/Builder/IndexerFilterBuilderRowValueConnector.js

@@ -47,7 +47,7 @@ class IndexerFilterBuilderRowValueConnector extends Component {
     if (!this.props.isPopulated) {
       this.props.dispatchFetchIndexers();
     }
-  }
+  };
 
   //
   // Render

frontend/src/Components/Filter/CustomFilters/CustomFilter.js

@@ -55,7 +55,7 @@ class CustomFilter extends Component {
     } = this.props;
 
     onEditPress(id);
-  }
+  };
 
   onRemovePress = () => {
     const {
@@ -67,7 +67,7 @@ class CustomFilter extends Component {
       dispatchDeleteCustomFilter({ id });
     });
 
-  }
+  };
 
   //
   // Render

frontend/src/Components/Filter/FilterModal.js

@@ -25,14 +25,14 @@ class FilterModal extends Component {
     this.setState({
       filterBuilder: true
     });
-  }
+  };
 
   onEditCustomFilter = (id) => {
     this.setState({
       filterBuilder: true,
       id
     });
-  }
+  };
 
   onCancelPress = () => {
     if (this.state.filterBuilder) {
@@ -43,7 +43,7 @@ class FilterModal extends Component {
     } else {
       this.onModalClose();
     }
-  }
+  };
 
   onModalClose = () => {
     this.setState({
@@ -52,7 +52,7 @@ class FilterModal extends Component {
     }, () => {
       this.props.onModalClose();
     });
-  }
+  };
 
   //
   // Render

frontend/src/Components/Form/AppProfileSelectInputConnector.js

@@ -69,7 +69,7 @@ class AppProfileSelectInputConnector extends Component {
 
   onChange = ({ name, value }) => {
     this.props.onChange({ name, value: parseInt(value) });
-  }
+  };
 
   //
   // Render

frontend/src/Components/Form/AutoCompleteInput.js

@@ -35,11 +35,11 @@ class AutoCompleteInput extends Component {
       name: this.props.name,
       value: newValue
     });
-  }
+  };
 
   onInputBlur = () => {
     this.setState({ suggestions: [] });
-  }
+  };
 
   onSuggestionsFetchRequested = ({ value }) => {
     const { values } = this.props;
@@ -50,11 +50,11 @@ class AutoCompleteInput extends Component {
     });
 
     this.setState({ suggestions: filteredValues });
-  }
+  };
 
   onSuggestionsClearRequested = () => {
     this.setState({ suggestions: [] });
-  }
+  };
 
   //
   // Render

frontend/src/Components/Form/AutoSuggestInput.js

@@ -49,7 +49,7 @@ class AutoSuggestInput extends Component {
         }}
       </Reference>
     );
-  }
+  };
 
   renderSuggestionsContainer = ({ containerProps, children }) => {
     return (
@@ -90,7 +90,7 @@ class AutoSuggestInput extends Component {
         </Popper>
       </Portal>
     );
-  }
+  };
 
   //
   // Listeners
@@ -113,14 +113,14 @@ class AutoSuggestInput extends Component {
     data.styles.width = width;
 
     return data;
-  }
+  };
 
   onInputChange = (event, { newValue }) => {
     this.props.onChange({
       name: this.props.name,
       value: newValue
     });
-  }
+  };
 
   onInputKeyDown = (event) => {
     const {
@@ -144,7 +144,7 @@ class AutoSuggestInput extends Component {
         });
       }
     }
-  }
+  };
 
   //
   // Render

frontend/src/Components/Form/CaptchaInputConnector.js

@@ -39,7 +39,7 @@ class CaptchaInputConnector extends Component {
 
   componentWillUnmount = () => {
     this.props.resetCaptcha();
-  }
+  };
 
   //
   // Listeners
@@ -51,7 +51,7 @@ class CaptchaInputConnector extends Component {
     } = this.props;
 
     this.props.refreshCaptcha({ provider, providerData });
-  }
+  };
 
   onCaptchaChange = (captchaResponse) => {
     // If the captcha has expired `captchaResponse` will be null.
@@ -68,7 +68,7 @@ class CaptchaInputConnector extends Component {
     } = this.props;
 
     this.props.getCaptchaCookie({ provider, providerData, captchaResponse });
-  }
+  };
 
   //
   // Render

frontend/src/Components/Form/CardigannCaptchaInputConnector.js

@@ -31,7 +31,7 @@ class CardigannCaptchaInputConnector extends Component {
 
   componentWillUnmount = () => {
     this.props.resetCaptcha();
-  }
+  };
 
   //
   // Listeners
@@ -48,7 +48,7 @@ class CardigannCaptchaInputConnector extends Component {
     this.props.resetCaptcha();
     this.props.refreshCaptcha({ provider, providerData });
 
-  }
+  };
 
   //
   // Render

frontend/src/Components/Form/CheckInput.js

@@ -59,14 +59,14 @@ class CheckInput extends Component {
         shiftKey
       });
     }
-  }
+  };
 
   //
   // Listeners
 
   setRef = (ref) => {
     this._checkbox = ref;
-  }
+  };
 
   onClick = (event) => {
     if (this.props.isDisabled) {
@@ -78,14 +78,14 @@ class CheckInput extends Component {
 
     event.preventDefault();
     this.toggleChecked(checked, shiftKey);
-  }
+  };
 
   onChange = (event) => {
     const checked = event.target.checked;
     const shiftKey = event.nativeEvent.shiftKey;
 
     this.toggleChecked(checked, shiftKey);
-  }
+  };
 
   //
   // Render

frontend/src/Components/Form/DeviceInput.js

@@ -23,7 +23,7 @@ class DeviceInput extends Component {
       name,
       value: [...value, deviceId]
     });
-  }
+  };
 
   onTagDelete = ({ index }) => {
     const {
@@ -39,7 +39,7 @@ class DeviceInput extends Component {
       name,
       value: newValue
     });
-  }
+  };
 
   //
   // Render

frontend/src/Components/Form/DeviceInputConnector.js

@@ -48,11 +48,11 @@ class DeviceInputConnector extends Component {
 
   componentDidMount = () => {
     this._populate();
-  }
+  };
 
   componentWillUnmount = () => {
     this.props.dispatchClearOptions({ section: 'devices' });
-  }
+  };
 
   //
   // Control
@@ -77,7 +77,7 @@ class DeviceInputConnector extends Component {
 
   onRefreshPress = () => {
     this._populate();
-  }
+  };
 
   //
   // Render

frontend/src/Components/Form/EnhancedSelectInput.js

@@ -149,7 +149,7 @@ class EnhancedSelectInput extends Component {
     }
 
     return data;
-  }
+  };
 
   onWindowClick = (event) => {
     const button = document.getElementById(this._buttonId);
@@ -168,14 +168,14 @@ class EnhancedSelectInput extends Component {
       this.setState({ isOpen: false });
       this._removeListener();
     }
-  }
+  };
 
   onFocus = () => {
     if (this.state.isOpen) {
       this._removeListener();
       this.setState({ isOpen: false });
     }
-  }
+  };
 
   onBlur = () => {
     if (!this.props.isEditable) {
@@ -186,7 +186,7 @@ class EnhancedSelectInput extends Component {
         this.setState({ selectedIndex: origIndex });
       }
     }
-  }
+  };
 
   onKeyDown = (event) => {
     const {
@@ -253,7 +253,7 @@ class EnhancedSelectInput extends Component {
     if (!_.isEmpty(newState)) {
       this.setState(newState);
     }
-  }
+  };
 
   onPress = () => {
     if (this.state.isOpen) {
@@ -267,7 +267,7 @@ class EnhancedSelectInput extends Component {
     }
 
     this.setState({ isOpen: !this.state.isOpen });
-  }
+  };
 
   onSelect = (value) => {
     if (Array.isArray(this.props.value)) {
@@ -291,15 +291,15 @@ class EnhancedSelectInput extends Component {
         value
       });
     }
-  }
+  };
 
   onMeasure = ({ width }) => {
     this.setState({ width });
-  }
+  };
 
   onOptionsModalClose = () => {
     this.setState({ isOpen: false });
-  }
+  };
 
   //
   // Render

frontend/src/Components/Form/EnhancedSelectInputConnector.js

@@ -73,7 +73,7 @@ class EnhancedSelectInputConnector extends Component {
 
   componentDidMount = () => {
     this._populate();
-  }
+  };
 
   componentDidUpdate = (prevProps) => {
     const prevKey = getProviderDataKey(prevProps.providerData);
@@ -82,11 +82,11 @@ class EnhancedSelectInputConnector extends Component {
     if (!_.isEqual(prevKey, nextKey)) {
       this.setState({ refetchRequired: true });
     }
-  }
+  };
 
   componentWillUnmount = () => {
     this._cleanup();
-  }
+  };
 
   //
   // Listeners
@@ -95,7 +95,7 @@ class EnhancedSelectInputConnector extends Component {
     if (this.state.refetchRequired) {
       this._populate();
     }
-  }
+  };
 
   //
   // Control

frontend/src/Components/Form/EnhancedSelectInputOption.js

@@ -21,11 +21,11 @@ class EnhancedSelectInputOption extends Component {
     } = this.props;
 
     onSelect(id);
-  }
+  };
 
   onCheckPress = () => {
     // CheckInput requires a handler. Swallow the change event because onPress will already handle it via event propagation.
-  }
+  };
 
   //
   // Render

frontend/src/Components/Form/FormInputGroup.js

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

frontend/src/Components/Form/IndexerFlagsSelectInputConnector.js

@@ -43,7 +43,7 @@ class IndexerFlagsSelectInputConnector extends Component {
     });
 
     this.props.onChange({ name, value: indexerFlags });
-  }
+  };
 
   //
   // Render

frontend/src/Components/Form/IndexersSelectInputConnector.js

@@ -43,7 +43,7 @@ class IndexersSelectInputConnector extends Component {
 
   onChange = ({ name, value }) => {
     this.props.onChange({ name, value });
-  }
+  };
 
   //
   // Render

frontend/src/Components/Form/KeyValueListInput.js

@@ -39,7 +39,7 @@ class KeyValueListInput extends Component {
       name,
       value: newValue
     });
-  }
+  };
 
   onRemoveItem = (index) => {
     const {
@@ -55,13 +55,13 @@ class KeyValueListInput extends Component {
       name,
       value: newValue
     });
-  }
+  };
 
   onFocus = () => {
     this.setState({
       isFocused: true
     });
-  }
+  };
 
   onBlur = () => {
     this.setState({
@@ -88,7 +88,7 @@ class KeyValueListInput extends Component {
         value: newValue
       });
     }
-  }
+  };
 
   //
   // Render

frontend/src/Components/Form/KeyValueListInputItem.js

@@ -18,7 +18,7 @@ class KeyValueListInputItem extends Component {
     } = this.props;
 
     onChange(index, { key: keyValue, value });
-  }
+  };
 
   onValueChange = ({ value }) => {
     // TODO: Validate here or validate at a lower level component
@@ -30,7 +30,7 @@ class KeyValueListInputItem extends Component {
     } = this.props;
 
     onChange(index, { key: keyValue, value });
-  }
+  };
 
   onRemovePress = () => {
     const {
@@ -39,15 +39,15 @@ class KeyValueListInputItem extends Component {
     } = this.props;
 
     onRemove(index);
-  }
+  };
 
   onFocus = () => {
     this.props.onFocus();
-  }
+  };
 
   onBlur = () => {
     this.props.onBlur();
-  }
+  };
 
   //
   // Render

frontend/src/Components/Form/MovieMonitoredSelectInput.js

@@ -1,52 +0,0 @@
-import PropTypes from 'prop-types';
-import React from 'react';
-import SelectInput from './SelectInput';
-
-const monitorTypesOptions = [
-  { key: 'true', value: 'True' },
-  { key: 'false', value: 'False' }
-];
-
-function MovieMonitoredSelectInput(props) {
-  const values = [...monitorTypesOptions];
-
-  const {
-    includeNoChange,
-    includeMixed
-  } = props;
-
-  if (includeNoChange) {
-    values.unshift({
-      key: 'noChange',
-      value: 'No Change',
-      disabled: true
-    });
-  }
-
-  if (includeMixed) {
-    values.unshift({
-      key: 'mixed',
-      value: '(Mixed)',
-      disabled: true
-    });
-  }
-
-  return (
-    <SelectInput
-      {...props}
-      values={values}
-    />
-  );
-}
-
-MovieMonitoredSelectInput.propTypes = {
-  includeNoChange: PropTypes.bool.isRequired,
-  includeMixed: PropTypes.bool.isRequired
-};
-
-MovieMonitoredSelectInput.defaultProps = {
-  includeNoChange: false,
-  includeMixed: false
-};
-
-export default MovieMonitoredSelectInput;

frontend/src/Components/Form/NewznabCategorySelectInputConnector.js

@@ -42,7 +42,7 @@ class IndexersSelectInputConnector extends Component {
 
   onChange = ({ name, value }) => {
     this.props.onChange({ name, value });
-  }
+  };
 
   //
   // Render

frontend/src/Components/Form/NumberInput.js

@@ -59,11 +59,11 @@ class NumberInput extends Component {
       value: parseValue(this.props, value)
     });
 
-  }
+  };
 
   onFocus = () => {
     this.setState({ isFocused: true });
-  }
+  };
 
   onBlur = () => {
     const {
@@ -88,7 +88,7 @@ class NumberInput extends Component {
       name,
       value: parsedValue
     });
-  }
+  };
 
   //
   // Render

frontend/src/Components/Form/OAuthInputConnector.js

@@ -41,7 +41,7 @@ class OAuthInputConnector extends Component {
 
   componentWillUnmount = () => {
     this.props.resetOAuth();
-  }
+  };
 
   //
   // Listeners
@@ -60,7 +60,7 @@ class OAuthInputConnector extends Component {
       providerData,
       section
     });
-  }
+  };
 
   //
   // Render

frontend/src/Components/Form/PathInput.js

@@ -62,7 +62,7 @@ class PathInput extends Component {
 
   onInputChange = ({ value }) => {
     this.setState({ value });
-  }
+  };
 
   onInputKeyDown = (event) => {
     if (event.key === 'Tab') {
@@ -80,7 +80,7 @@ class PathInput extends Component {
         }
       }
     }
-  }
+  };
 
   onInputBlur = () => {
     this.props.onChange({
@@ -89,28 +89,28 @@ class PathInput extends Component {
     });
 
     this.props.onClearPaths();
-  }
+  };
 
   onSuggestionsFetchRequested = ({ value }) => {
     this.props.onFetchPaths(value);
-  }
+  };
 
   onSuggestionsClearRequested = () => {
     // Required because props aren't always rendered, but no-op
     // because we don't want to reset the paths after a path is selected.
-  }
+  };
 
   onSuggestionSelected = (event, { suggestionValue }) => {
     this.props.onFetchPaths(suggestionValue);
-  }
+  };
 
   onFileBrowserOpenPress = () => {
     this.setState({ isFileBrowserModalOpen: true });
-  }
+  };
 
   onFileBrowserModalClose = () => {
     this.setState({ isFileBrowserModalOpen: false });
-  }
+  };
 
   //
   // Render

frontend/src/Components/Form/PathInputConnector.js

@@ -47,11 +47,11 @@ class PathInputConnector extends Component {
       path,
       includeFiles
     });
-  }
+  };
 
   onClearPaths = () => {
     this.props.dispatchClearPaths();
-  }
+  };
 
   //
   // Render

frontend/src/Components/Form/ProviderFieldFormGroup.js

@@ -53,7 +53,8 @@ function getSelectValues(selectOptions) {
     result.push({
       key: option.value,
       value: option.name,
-      hint: option.hint
+      hint: option.hint,
+      parentKey: option.parentValue
     });
 
     return result;

frontend/src/Components/Form/SelectInput.js

@@ -13,7 +13,7 @@ class SelectInput extends Component {
       name: this.props.name,
       value: event.target.value
     });
-  }
+  };
 
   //
   // Render

frontend/src/Components/Form/TagInput.js

@@ -49,7 +49,7 @@ class TagInput extends Component {
 
   _setAutosuggestRef = (ref) => {
     this._autosuggestRef = ref;
-  }
+  };
 
   getSuggestionValue({ name }) {
     return name;
@@ -57,7 +57,7 @@ class TagInput extends Component {
 
   shouldRenderSuggestions = (value) => {
     return value.length >= this.props.minQueryLength;
-  }
+  };
 
   renderSuggestion({ name }) {
     return name;
@@ -70,14 +70,14 @@ class TagInput extends Component {
       value: '',
       suggestions: []
     });
-  }, 250, { leading: true, trailing: false })
+  }, 250, { leading: true, trailing: false });
 
   //
   // Listeners
 
   onInputContainerPress = () => {
     this._autosuggestRef.input.focus();
-  }
+  };
 
   onInputChange = (event, { newValue, method }) => {
     const value = _.isObject(newValue) ? newValue.name : newValue;
@@ -85,7 +85,7 @@ class TagInput extends Component {
     if (method === 'type') {
       this.setState({ value });
     }
-  }
+  };
 
   onInputKeyDown = (event) => {
     const {
@@ -125,11 +125,11 @@ class TagInput extends Component {
         event.preventDefault();
       }
     }
-  }
+  };
 
   onInputFocus = () => {
     this.setState({ isFocused: true });
-  }
+  };
 
   onInputBlur = () => {
     this.setState({ isFocused: false });
@@ -153,7 +153,7 @@ class TagInput extends Component {
     if (tag) {
       this.addTag(tag);
     }
-  }
+  };
 
   onSuggestionsFetchRequested = ({ value }) => {
     const lowerCaseValue = value.toLowerCase();
@@ -170,16 +170,16 @@ class TagInput extends Component {
     });
 
     this.setState({ suggestions });
-  }
+  };
 
   onSuggestionsClearRequested = () => {
     // Required because props aren't always rendered, but no-op
     // because we don't want to reset the paths after a path is selected.
-  }
+  };
 
   onSuggestionSelected = (event, { suggestion }) => {
     this.addTag(suggestion);
-  }
+  };
 
   //
   // Render
@@ -204,7 +204,7 @@ class TagInput extends Component {
         onInputContainerPress={this.onInputContainerPress}
       />
     );
-  }
+  };
 
   render() {
     const {

frontend/src/Components/Form/TagInputConnector.js

@@ -101,7 +101,7 @@ class TagInputConnector extends Component {
     newValue.push(tag.id);
 
     this.props.onChange({ name, value: newValue });
-  }
+  };
 
   onTagDelete = ({ index }) => {
     const {
@@ -116,7 +116,7 @@ class TagInputConnector extends Component {
       name,
       value: newValue
     });
-  }
+  };
 
   onTagCreated = (tag) => {
     const {
@@ -128,7 +128,7 @@ class TagInputConnector extends Component {
     newValue.push(tag.id);
 
     this.props.onChange({ name, value: newValue });
-  }
+  };
 
   //
   // Render

frontend/src/Components/Form/TagInputInput.js

@@ -19,7 +19,7 @@ class TagInputInput extends Component {
     }
 
     onInputContainerPress();
-  }
+  };
 
   render() {
     const {

frontend/src/Components/Form/TagInputTag.js

@@ -22,7 +22,7 @@ class TagInputTag extends Component {
       index,
       id: tag.id
     });
-  }
+  };
 
   //
   // Render

frontend/src/Components/Form/TagSelectInputConnector.js

@@ -60,7 +60,7 @@ class TagSelectInputConnector extends Component {
     }
 
     this.props.onChange({ name, value: newValue });
-  }
+  };
 
   onTagDelete = ({ index }) => {
     const {
@@ -75,7 +75,7 @@ class TagSelectInputConnector extends Component {
       name,
       value: newValue
     });
-  }
+  };
 
   //
   // Render

frontend/src/Components/Form/TextArea.js

@@ -35,7 +35,7 @@ class TextArea extends Component {
 
   setInputRef = (ref) => {
     this._input = ref;
-  }
+  };
 
   selectionChange() {
     if (this._selectionTimeout) {
@@ -75,7 +75,7 @@ class TextArea extends Component {
     };
 
     onChange(payload);
-  }
+  };
 
   onFocus = (event) => {
     if (this.props.onFocus) {
@@ -83,19 +83,19 @@ class TextArea extends Component {
     }
 
     this.selectionChange();
-  }
+  };
 
   onKeyUp = () => {
     this.selectionChange();
-  }
+  };
 
   onMouseDown = () => {
     this._isMouseTarget = true;
-  }
+  };
 
   onMouseUp = () => {
     this.selectionChange();
-  }
+  };
 
   onDocumentMouseUp = () => {
     if (this._isMouseTarget) {
@@ -103,7 +103,7 @@ class TextArea extends Component {
     }
 
     this._isMouseTarget = false;
-  }
+  };
 
   //
   // Render

frontend/src/Components/Form/TextInput.js

@@ -35,7 +35,7 @@ class TextInput extends Component {
 
   setInputRef = (ref) => {
     this._input = ref;
-  }
+  };
 
   selectionChange() {
     if (this._selectionTimeout) {
@@ -82,7 +82,7 @@ class TextInput extends Component {
     }
 
     onChange(payload);
-  }
+  };
 
   onFocus = (event) => {
     if (this.props.onFocus) {
@@ -90,19 +90,19 @@ class TextInput extends Component {
     }
 
     this.selectionChange();
-  }
+  };
 
   onKeyUp = () => {
     this.selectionChange();
-  }
+  };
 
   onMouseDown = () => {
     this._isMouseTarget = true;
-  }
+  };
 
   onMouseUp = () => {
     this.selectionChange();
-  }
+  };
 
   onDocumentMouseUp = () => {
     if (this._isMouseTarget) {
@@ -110,7 +110,7 @@ class TextInput extends Component {
     }
 
     this._isMouseTarget = false;
-  }
+  };
 
   //
   // Render

frontend/src/Components/Form/TextTagInputConnector.js

@@ -53,7 +53,7 @@ class TextTagInputConnector extends Component {
     });
 
     onChange({ name, value: newValue.join(',') });
-  }
+  };
 
   onTagDelete = ({ index }) => {
     const {
@@ -69,7 +69,7 @@ class TextTagInputConnector extends Component {
       name,
       value: newValue.join(',')
     });
-  }
+  };
 
   //
   // Render

frontend/src/Components/Link/ClipboardButton.js

@@ -63,7 +63,7 @@ class ClipboardButton extends Component {
       showSuccess: false,
       showError: false
     });
-  }
+  };
 
   //
   // Listeners
@@ -72,13 +72,13 @@ class ClipboardButton extends Component {
     this.setState({
       showSuccess: true
     });
-  }
+  };
 
   onError = () => {
     this.setState({
       showError: true
     });
-  }
+  };
 
   //
   // Render

frontend/src/Components/Link/Link.js

@@ -18,7 +18,7 @@ class Link extends Component {
     if (!isDisabled && onPress) {
       onPress(event);
     }
-  }
+  };
 
   //
   // Render

frontend/src/Components/Link/SpinnerErrorButton.js

@@ -90,7 +90,7 @@ class SpinnerErrorButton extends Component {
       hasWarning: false,
       hasError: false
     });
-  }
+  };
 
   //
   // Render

frontend/src/Components/Measure.js

@@ -17,7 +17,7 @@ class Measure extends Component {
 
   onMeasure = _.debounce((payload) => {
     this.props.onMeasure(payload);
-  }, 250, { leading: true, trailing: false })
+  }, 250, { leading: true, trailing: false });
 
   //
   // Render

frontend/src/Components/Menu/FilterMenu.js

@@ -25,11 +25,11 @@ class FilterMenu extends Component {
 
   onCustomFiltersPress = () => {
     this.setState({ isFilterModalOpen: true });
-  }
+  };
 
   onFiltersModalClose = () => {
     this.setState({ isFilterModalOpen: false });
-  }
+  };
 
   //
   // Render

frontend/src/Components/Menu/FilterMenuItem.js

@@ -14,7 +14,7 @@ class FilterMenuItem extends Component {
     } = this.props;
 
     onPress(filterKey);
-  }
+  };
 
   //
   // Render

frontend/src/Components/Menu/Menu.js

@@ -124,7 +124,7 @@ class Menu extends Component {
       this.setState({ isMenuOpen: false });
       this._removeListener();
     }
-  }
+  };
 
   onTouchStart = (event) => {
     const menuButton = document.getElementById(this._menuButtonId);
@@ -148,17 +148,17 @@ class Menu extends Component {
       this.setState({ isMenuOpen: false });
       this._removeListener();
     }
-  }
+  };
 
   onWindowResize = () => {
     this.setMaxHeight();
-  }
+  };
 
   onWindowScroll = (event) => {
     if (this.state.isMenuOpen) {
       this.setMaxHeight();
     }
-  }
+  };
 
   onMenuButtonPress = () => {
     const state = {
@@ -173,7 +173,7 @@ class Menu extends Component {
     }
 
     this.setState(state);
-  }
+  };
 
   //
   // Render

frontend/src/Components/Menu/SearchMenuItem.js

@@ -14,7 +14,7 @@ class SearchMenuItem extends Component {
     } = this.props;
 
     onPress(name);
-  }
+  };
 
   //
   // Render

frontend/src/Components/Menu/SelectedMenuItem.js

@@ -17,7 +17,7 @@ class SelectedMenuItem extends Component {
     } = this.props;
 
     onPress(name);
-  }
+  };
 
   //
   // Render

frontend/src/Components/Modal/Modal.js

@@ -66,7 +66,7 @@ class Modal extends Component {
 
   _setBackgroundRef = (ref) => {
     this._backgroundRef = ref;
-  }
+  };
 
   _openModal() {
     openModals.push(this._modalId);
@@ -131,7 +131,7 @@ class Modal extends Component {
 
   onBackdropBeginPress = (event) => {
     this._isBackdropPressed = this._isBackdropTarget(event);
-  }
+  };
 
   onBackdropEndPress = (event) => {
     const {
@@ -148,7 +148,7 @@ class Modal extends Component {
     }
 
     this._isBackdropPressed = false;
-  }
+  };
 
   onKeyDown = (event) => {
     const keyCode = event.keyCode;
@@ -161,7 +161,7 @@ class Modal extends Component {
         this.props.onModalClose();
       }
     }
-  }
+  };
 
   //
   // Render

frontend/src/Components/Page/Header/IndexerSearchInput.js

@@ -36,12 +36,12 @@ class IndexerSearchInput extends Component {
 
   setAutosuggestRef = (ref) => {
     this._autosuggest = ref;
-  }
+  };
 
   focusInput = (event) => {
     event.preventDefault();
     this._autosuggest.input.focus();
-  }
+  };
 
   getSectionSuggestions(section) {
     return section.suggestions;
@@ -102,7 +102,7 @@ class IndexerSearchInput extends Component {
     }
 
     this.setState({ value: newValue });
-  }
+  };
 
   onKeyDown = (event) => {
     if (event.shiftKey || event.altKey || event.ctrlKey) {
@@ -137,31 +137,31 @@ class IndexerSearchInput extends Component {
 
     this._autosuggest.input.blur();
     this.reset();
-  }
+  };
 
   onBlur = () => {
     this.reset();
-  }
+  };
 
   onSuggestionsClearRequested = () => {
     this.setState({
       suggestions: [],
       loading: false
     });
-  }
+  };
 
   onSuggestionsFetchRequested = () => {
     this.setState({
       suggestions: [],
       loading: false
     });
-  }
+  };
 
   onSuggestionSelected = (event, { suggestion }) => {
     if (suggestion.type === ADD_NEW_TYPE) {
       this.props.onGoToAddNewMovie(this.state.value);
     }
-  }
+  };
 
   //
   // Render

frontend/src/Components/Page/Header/IndexerSearchInputConnector.js

@@ -60,7 +60,7 @@ function createMapStateToProps() {
 function createMapDispatchToProps(dispatch, props) {
   return {
     onGoToAddNewMovie(query) {
-      dispatch(setSearchDefault({ searchQuery: query, searchIndexerIds: [-1, -2] }));
+      dispatch(setSearchDefault({ searchQuery: query }));
       dispatch(push(`${window.Prowlarr.urlBase}/search`));
     }
   };

frontend/src/Components/Page/Header/PageHeader.js

@@ -32,14 +32,14 @@ class PageHeader extends Component {
 
   onOpenKeyboardShortcutsModal = () => {
     this.setState({ isKeyboardShortcutsModalOpen: true });
-  }
+  };
 
   //
   // Listeners
 
   onKeyboardShortcutsModalClose = () => {
     this.setState({ isKeyboardShortcutsModalOpen: false });
-  }
+  };
 
   //
   // Render

frontend/src/Components/Page/Header/PageHeaderActionsMenuConnector.js

@@ -28,11 +28,11 @@ class PageHeaderActionsMenuConnector extends Component {
 
   onRestartPress = () => {
     this.props.restart();
-  }
+  };
 
   onShutdownPress = () => {
     this.props.shutdown();
-  }
+  };
 
   //
   // Render

frontend/src/Components/Page/Page.js

@@ -54,15 +54,15 @@ class Page extends Component {
       width: window.innerWidth,
       height: window.innerHeight
     });
-  }
+  };
 
   onUpdatedModalClose = () => {
     this.setState({ isUpdatedModalOpen: false });
-  }
+  };
 
   onConnectionLostModalClose = () => {
     this.setState({ isConnectionLostModalOpen: false });
-  }
+  };
 
   //
   // Render

frontend/src/Components/Page/PageConnector.js

@@ -232,7 +232,7 @@ class PageConnector extends Component {
 
   onSidebarToggle = () => {
     this.props.onSidebarVisibleChange(!this.props.isSidebarVisible);
-  }
+  };
 
   //
   // Render

frontend/src/Components/Page/PageContentBody.js

@@ -27,7 +27,7 @@ class PageContentBody extends Component {
     if (this.props.onScroll && !isLocked()) {
       onScroll(props);
     }
-  }
+  };
 
   //
   // Render

frontend/src/Components/Page/PageJumpBar.js

@@ -101,7 +101,7 @@ class PageJumpBar extends Component {
 
   onMeasure = ({ height }) => {
     this.setState({ height });
-  }
+  };
 
   //
   // Render

frontend/src/Components/Page/PageJumpBarItem.js

@@ -15,7 +15,7 @@ class PageJumpBarItem extends Component {
     } = this.props;
 
     onItemPress(label);
-  }
+  };
 
   //
   // Render

frontend/src/Components/Page/Sidebar/Messages/Message.js

@@ -13,20 +13,8 @@ function getIconName(name) {
       return icons.BACKUP;
     case 'CheckHealth':
       return icons.HEALTH;
-    case 'EpisodeSearch':
-      return icons.SEARCH;
     case 'Housekeeping':
       return icons.HOUSEKEEPING;
-    case 'RefreshMovie':
-      return icons.REFRESH;
-    case 'RssSync':
-      return icons.RSS;
-    case 'SeasonSearch':
-      return icons.SEARCH;
-    case 'MovieSearch':
-      return icons.SEARCH;
-    case 'UpdateSceneMapping':
-      return icons.REFRESH;
     default:
       return icons.SPINNER;
   }

frontend/src/Components/Page/Sidebar/Messages/MessageConnector.js

@@ -35,11 +35,11 @@ class MessageConnector extends Component {
     if (hideAfter) {
       this._hideTimeoutId = setTimeout(this.hideMessage, hideAfter * 1000);
     }
-  }
+  };
 
   hideMessage = () => {
     this.props.hideMessage({ id: this.props.id });
-  }
+  };
 
   //
   // Render

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

@@ -234,7 +234,7 @@ class PageSidebar extends Component {
 
   _setSidebarRef = (ref) => {
     this._sidebarRef = ref;
-  }
+  };
 
   _setSidebarTransform(isSidebarVisible, transition, callback) {
     this.setState({
@@ -263,11 +263,11 @@ class PageSidebar extends Component {
       event.stopPropagation();
       this.props.onSidebarVisibleChange(false);
     }
-  }
+  };
 
   onWindowScroll = () => {
     this.setState(getPositioning());
-  }
+  };
 
   onTouchStart = (event) => {
     const touches = event.touches;
@@ -287,7 +287,7 @@ class PageSidebar extends Component {
 
     this._touchStartX = touchStartX;
     this._touchStartY = touchStartY;
-  }
+  };
 
   onTouchMove = (event) => {
     const touches = event.touches;
@@ -324,7 +324,7 @@ class PageSidebar extends Component {
       transition: 'none',
       transform
     });
-  }
+  };
 
   onTouchEnd = (event) => {
     const touches = event.changedTouches;
@@ -344,16 +344,16 @@ class PageSidebar extends Component {
 
     this._touchStartX = null;
     this._touchStartY = null;
-  }
+  };
 
   onTouchCancel = (event) => {
     this._touchStartX = null;
     this._touchStartY = null;
-  }
+  };
 
   onItemPress = () => {
     this.props.onSidebarVisibleChange(false);
-  }
+  };
 
   //
   // Render

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

@@ -21,7 +21,7 @@ class PageSidebarItem extends Component {
     if (isChildItem || !isParentItem) {
       onPress();
     }
-  }
+  };
 
   //
   // Render

frontend/src/Components/Page/Toolbar/PageToolbarSection.js

@@ -108,7 +108,7 @@ class PageToolbarSection extends Component {
       isMeasured: true,
       width
     });
-  }
+  };
 
   //
   // Render

frontend/src/Components/Scroller/OverlayScroller.js

@@ -41,7 +41,7 @@ class OverlayScroller extends Component {
     if (ref) {
       this.props.registerScroller(ref.view);
     }
-  }
+  };
 
   _renderThumb = (props) => {
     return (
@@ -50,7 +50,7 @@ class OverlayScroller extends Component {
         {...props}
       />
     );
-  }
+  };
 
   _renderTrackHorizontal = ({ style, props }) => {
     const finalStyle = {
@@ -69,7 +69,7 @@ class OverlayScroller extends Component {
         {...props}
       />
     );
-  }
+  };
 
   _renderTrackVertical = ({ style, props }) => {
     const finalStyle = {
@@ -88,7 +88,7 @@ class OverlayScroller extends Component {
         {...props}
       />
     );
-  }
+  };
 
   _renderView = (props) => {
     return (
@@ -97,18 +97,18 @@ class OverlayScroller extends Component {
         {...props}
       />
     );
-  }
+  };
 
   //
   // Listers
 
   onScrollStart = () => {
     this._isScrolling = true;
-  }
+  };
 
   onScrollStop = () => {
     this._isScrolling = false;
-  }
+  };
 
   onScroll = (event) => {
     const {
@@ -122,7 +122,7 @@ class OverlayScroller extends Component {
     if (onScroll) {
       onScroll({ scrollTop, scrollLeft });
     }
-  }
+  };
 
   //
   // Render

frontend/src/Components/Scroller/Scroller.js

@@ -38,7 +38,7 @@ class Scroller extends Component {
     this._scroller = ref;
 
     this.props.registerScroller(ref);
-  }
+  };
 
   //
   // Render

frontend/src/Components/SignalRConnector.js

@@ -139,7 +139,7 @@ class SignalRConnector extends Component {
     }
 
     console.error(`signalR: Unable to find handler for ${name}`);
-  }
+  };
 
   handleCommand = (body) => {
     if (body.action === 'sync') {
@@ -158,36 +158,36 @@ class SignalRConnector extends Component {
     } else {
       this.props.dispatchUpdateCommand(resource);
     }
-  }
+  };
 
   handleHealth = () => {
     this.props.dispatchFetchHealth();
-  }
+  };
 
   handleIndexerstatus = () => {
     this.props.dispatchFetchIndexerStatus();
-  }
+  };
 
-  handleMovie = (body) => {
+  handleIndexer = (body) => {
     const action = body.action;
-    const section = 'movies';
+    const section = 'indexers';
 
     if (action === 'updated') {
       this.props.dispatchUpdateItem({ section, ...body.resource });
     } else if (action === 'deleted') {
       this.props.dispatchRemoveItem({ section, id: body.resource.id });
     }
-  }
+  };
 
   handleVersion = (body) => {
     const version = body.version;
 
     this.props.dispatchSetVersion({ version });
-  }
+  };
 
   handleSystemTask = () => {
     this.props.dispatchFetchCommands();
-  }
+  };
 
   handleTag = (body) => {
     if (body.action === 'sync') {
@@ -195,7 +195,7 @@ class SignalRConnector extends Component {
       this.props.dispatchFetchTagDetails();
       return;
     }
-  }
+  };
 
   //
   // Listeners
@@ -210,7 +210,7 @@ class SignalRConnector extends Component {
       isDisconnected: false,
       isRestarting: false
     });
-  }
+  };
 
   onStart = () => {
     console.debug('[signalR] connected');
@@ -221,11 +221,11 @@ class SignalRConnector extends Component {
       isDisconnected: false,
       isRestarting: false
     });
-  }
+  };
 
   onReconnecting = () => {
     this.props.dispatchSetAppValue({ isReconnecting: true });
-  }
+  };
 
   onReconnected = () => {
 
@@ -247,17 +247,17 @@ class SignalRConnector extends Component {
     dispatchFetchIndexers();
     dispatchFetchCommands();
     repopulatePage();
-  }
+  };
 
   onClose = () => {
     console.debug('[signalR] connection closed');
-  }
+  };
 
   onReceiveMessage = (message) => {
     console.debug('[signalR] received', message.name, message.body);
 
     this.handleMessage(message);
-  }
+  };
 
   //
   // Render

frontend/src/Components/Table/Cells/TableSelectCell.js

@@ -38,7 +38,7 @@ class TableSelectCell extends Component {
     } = this.props;
 
     onSelectedChange({ id, value, shiftKey });
-  }
+  };
 
   //
   // Render

frontend/src/Components/Table/Cells/VirtualTableSelectCell.js

@@ -35,7 +35,7 @@ class VirtualTableSelectCell extends Component {
     } = this.props;
 
     onSelectedChange({ id, value, shiftKey });
-  }
+  };
 
   //
   // Render

frontend/src/Components/Table/TableHeaderCell.js

@@ -21,7 +21,7 @@ class TableHeaderCell extends Component {
     } else {
       this.props.onSortPress(name);
     }
-  }
+  };
 
   //
   // Render

frontend/src/Components/Table/TableOptions/TableOptionsModal.js

@@ -62,7 +62,7 @@ class TableOptionsModal extends Component {
       pageSize: value,
       pageSizeError
     });
-  }
+  };
 
   onVisibleChange = ({ name, value }) => {
     const columns = _.cloneDeep(this.props.columns);
@@ -71,7 +71,7 @@ class TableOptionsModal extends Component {
     column.isVisible = value;
 
     this.props.onTableOptionChange({ columns });
-  }
+  };
 
   onColumnDragMove = (dragIndex, dropIndex) => {
     if (this.state.dragIndex !== dragIndex || this.state.dropIndex !== dropIndex) {
@@ -80,7 +80,7 @@ class TableOptionsModal extends Component {
         dropIndex
       });
     }
-  }
+  };
 
   onColumnDragEnd = ({ id }, didDrop) => {
     const {
@@ -100,7 +100,7 @@ class TableOptionsModal extends Component {
       dragIndex: null,
       dropIndex: null
     });
-  }
+  };
 
   //
   // Render

frontend/src/Components/Table/TableOptions/TableOptionsModalWrapper.js

@@ -20,11 +20,11 @@ class TableOptionsModalWrapper extends Component {
 
   onTableOptionsPress = () => {
     this.setState({ isTableOptionsModalOpen: true });
-  }
+  };
 
   onTableOptionsModalClose = () => {
     this.setState({ isTableOptionsModalOpen: false });
-  }
+  };
 
   //
   // Render

frontend/src/Components/Table/TablePager.js

@@ -26,16 +26,16 @@ class TablePager extends Component {
 
   onOpenPageSelectClick = () => {
     this.setState({ isShowingPageSelect: true });
-  }
+  };
 
   onPageSelect = ({ value: page }) => {
     this.setState({ isShowingPageSelect: false });
     this.props.onPageSelect(parseInt(page));
-  }
+  };
 
   onPageSelectBlur = () => {
     this.setState({ isShowingPageSelect: false });
-  }
+  };
 
   //
   // Render

frontend/src/Components/Table/VirtualTable.js

@@ -75,7 +75,7 @@ class VirtualTable extends Component {
 
   setGridRef = (ref) => {
     this._grid = ref;
-  }
+  };
 
   //
   // Listeners
@@ -84,7 +84,7 @@ class VirtualTable extends Component {
     this.setState({
       width
     });
-  }
+  };
 
   //
   // Render

frontend/src/Components/Table/VirtualTableHeaderCell.js

@@ -38,7 +38,7 @@ class VirtualTableHeaderCell extends Component {
     } else {
       this.props.onSortPress(name);
     }
-  }
+  };
 
   //
   // Render

frontend/src/Components/Tooltip/Tooltip.js

@@ -80,20 +80,20 @@ class Tooltip extends Component {
     }
 
     return data;
-  }
+  };
 
   //
   // Listeners
 
   onMeasure = ({ width }) => {
     this.setState({ width });
-  }
+  };
 
   onClick = () => {
     if (isMobileUtil()) {
       this.setState({ isOpen: !this.state.isOpen });
     }
-  }
+  };
 
   onMouseEnter = () => {
     if (this._closeTimeout) {
@@ -101,13 +101,13 @@ class Tooltip extends Component {
     }
 
     this.setState({ isOpen: true });
-  }
+  };
 
   onMouseLeave = () => {
     this._closeTimeout = setTimeout(() => {
       this.setState({ isOpen: false });
     }, 100);
-  }
+  };
 
   //
   // Render

frontend/src/Components/keyboardShortcuts.js

@@ -64,12 +64,12 @@ function keyboardShortcuts(WrappedComponent) {
     bindShortcut = (key, callback, options = {}) => {
       this._mousetrap.bind(key, callback);
       this._mousetrapBindings[key] = options;
-    }
+    };
 
     unbindShortcut = (key) => {
       delete this._mousetrapBindings[key];
       this._mousetrap.unbind(key);
-    }
+    };
 
     unbindAllShortcuts = () => {
       const keys = Object.keys(this._mousetrapBindings);
@@ -83,7 +83,7 @@ function keyboardShortcuts(WrappedComponent) {
       });
 
       this._mousetrapBindings = {};
-    }
+    };
 
     stopCallback = (event, element, combo) => {
       const binding = this._mousetrapBindings[combo];
@@ -98,7 +98,7 @@ function keyboardShortcuts(WrappedComponent) {
         element.tagName === 'TEXTAREA' ||
         (element.contentEditable && element.contentEditable === 'true')
       );
-    }
+    };
 
     //
     // Render

frontend/src/Helpers/Props/icons.js

@@ -22,10 +22,12 @@ import {
 import {
   faArrowCircleLeft as fasArrowCircleLeft,
   faArrowCircleRight as fasArrowCircleRight,
+  faAsterisk as fasAsterisk,
   faBackward as fasBackward,
   faBan as fasBan,
   faBars as fasBars,
   faBolt as fasBolt,
+  faBook as fasBook,
   faBookmark as fasBookmark,
   faBookReader as fasBookReader,
   faBroadcastTower as fasBroadcastTower,
@@ -74,6 +76,7 @@ import {
   faLock as fasLock,
   faMedkit as fasMedkit,
   faMinus as fasMinus,
+  faMusic as fasMusic,
   faPause as fasPause,
   faPlay as fasPlay,
   faPlus as fasPlus,
@@ -104,6 +107,7 @@ import {
   faTimes as fasTimes,
   faTimesCircle as fasTimesCircle,
   faTrashAlt as fasTrashAlt,
+  faTv as fasTv,
   faUser as fasUser,
   faUserPlus as fasUserPlus,
   faVial as fasVial,
@@ -121,7 +125,9 @@ export const ADVANCED_SETTINGS = fasCog;
 export const ANNOUNCED = fasBullhorn;
 export const ARROW_LEFT = fasArrowCircleLeft;
 export const ARROW_RIGHT = fasArrowCircleRight;
+export const AUDIO = fasMusic;
 export const BACKUP = farFileArchive;
+export const BOOK = fasBook;
 export const BUG = fasBug;
 export const CALENDAR = fasCalendarAlt;
 export const CALENDAR_O = farCalendar;
@@ -158,6 +164,7 @@ export const FILTER = fasFilter;
 export const FLAG = fasFlag;
 export const FOLDER = farFolder;
 export const FOLDER_OPEN = fasFolderOpen;
+export const FOOTNOTE = fasAsterisk;
 export const GENRE = fasTheaterMasks;
 export const GROUP = farObjectGroup;
 export const HEALTH = fasMedkit;
@@ -220,6 +227,7 @@ export const TAGS = fasTags;
 export const TBA = fasQuestionCircle;
 export const TEST = fasVial;
 export const TRANSLATE = fasLanguage;
+export const TV = fasTv;
 export const UNGROUP = farObjectUngroup;
 export const UNKNOWN = fasQuestion;
 export const UNMONITORED = farBookmark;

frontend/src/History/Details/HistoryDetails.js

@@ -2,6 +2,7 @@ import PropTypes from 'prop-types';
 import React from 'react';
 import DescriptionList from 'Components/DescriptionList/DescriptionList';
 import DescriptionListItem from 'Components/DescriptionList/DescriptionListItem';
+import Link from 'Components/Link/Link';
 import translate from 'Utilities/String/translate';
 import styles from './HistoryDetails.css';
 
@@ -17,7 +18,8 @@ function HistoryDetails(props) {
       query,
       queryResults,
       categories,
-      source
+      source,
+      url
     } = data;
 
     return (
@@ -59,6 +61,14 @@ function HistoryDetails(props) {
               data={source}
             />
         }
+
+        {
+          !!data &&
+            <DescriptionListItem
+              title={'Url'}
+              data={url ? <Link to={url}>{translate('Link')}</Link> : '-'}
+            />
+        }
       </DescriptionList>
     );
   }
@@ -66,7 +76,8 @@ function HistoryDetails(props) {
   if (eventType === 'releaseGrabbed') {
     const {
       source,
-      title
+      title,
+      url
     } = data;
 
     return (
@@ -94,6 +105,14 @@ function HistoryDetails(props) {
               data={title ? title : '-'}
             />
         }
+
+        {
+          !!data &&
+            <DescriptionListItem
+              title={'Url'}
+              data={url ? <Link to={url}>{translate('Link')}</Link> : '-'}
+            />
+        }
       </DescriptionList>
     );
   }

frontend/src/History/History.js

@@ -35,16 +35,16 @@ class History extends Component {
 
   onClearHistoryPress = () => {
     this.setState({ isClearHistoryModalOpen: true });
-  }
+  };
 
   onClearHistoryModalClose = () => {
     this.setState({ isClearHistoryModalOpen: false });
-  }
+  };
 
   onConfirmClearHistory = () => {
     this.setState({ isClearHistoryModalOpen: false });
     this.props.onClearHistoryPress();
-  }
+  };
 
   //
   // Render

frontend/src/History/HistoryConnector.js

@@ -69,42 +69,42 @@ class HistoryConnector extends Component {
 
   repopulate = () => {
     this.props.fetchHistory();
-  }
+  };
 
   //
   // Listeners
 
   onFirstPagePress = () => {
     this.props.gotoHistoryFirstPage();
-  }
+  };
 
   onPreviousPagePress = () => {
     this.props.gotoHistoryPreviousPage();
-  }
+  };
 
   onNextPagePress = () => {
     this.props.gotoHistoryNextPage();
-  }
+  };
 
   onLastPagePress = () => {
     this.props.gotoHistoryLastPage();
-  }
+  };
 
   onPageSelect = (page) => {
     this.props.gotoHistoryPage({ page });
-  }
+  };
 
   onSortPress = (sortKey) => {
     this.props.setHistorySort({ sortKey });
-  }
+  };
 
   onFilterSelect = (selectedFilterKey) => {
     this.props.setHistoryFilter({ selectedFilterKey });
-  }
+  };
 
   onClearHistoryPress = () => {
     this.props.executeCommand({ name: commandNames.CLEAR_HISTORY });
-  }
+  };
 
   onTableOptionChange = (payload) => {
     this.props.setHistoryTableOption(payload);
@@ -112,7 +112,7 @@ class HistoryConnector extends Component {
     if (payload.pageSize) {
       this.props.gotoHistoryFirstPage();
     }
-  }
+  };
 
   //
   // Render

frontend/src/History/HistoryOptions.js

@@ -43,7 +43,7 @@ class HistoryOptions extends Component {
     this.setState(setting, () => {
       dispatchSaveGeneralSettings(setting);
     });
-  }
+  };
 
   //
   // Render

frontend/src/History/HistoryRow.js

@@ -52,15 +52,15 @@ class HistoryRow extends Component {
     }
 
     this.props.onSearchPress(data.query, indexer.id, categories);
-  }
+  };
 
   onDetailsPress = () => {
     this.setState({ isDetailsModalOpen: true });
-  }
+  };
 
   onDetailsModalClose = () => {
     this.setState({ isDetailsModalOpen: false });
-  }
+  };
 
   //
   // Render
@@ -247,6 +247,21 @@ class HistoryRow extends Component {
               );
             }
 
+            if (name === 'grabTitle') {
+              return (
+                <TableRowCell
+                  key={name}
+                  className={styles.indexer}
+                >
+                  {
+                    data.title ?
+                      data.title :
+                      null
+                  }
+                </TableRowCell>
+              );
+            }
+
             if (name === 'categories') {
               return (
                 <TableRowCell

frontend/src/History/HistoryRowConnector.js

@@ -51,11 +51,11 @@ class HistoryRowConnector extends Component {
   onSearchPress = (term, indexerId, categories) => {
     this.props.setSearchDefault({ searchQuery: term, searchIndexerIds: [indexerId], searchCategories: categories });
     this.props.push(`${window.Prowlarr.urlBase}/search`);
-  }
+  };
 
   onMarkAsFailedPress = () => {
     this.props.markAsFailed({ id: this.props.id });
-  }
+  };
 
   //
   // Render

frontend/src/Indexer/Add/AddIndexerModalContent.css

@@ -16,7 +16,7 @@
   composes: input from '~Components/Form/TextInput.css';
 
   flex: 0 0 auto;
-  margin-bottom: 20px;
+  margin-bottom: 16px;
 }
 
 .alert {
@@ -28,3 +28,46 @@
 .scroller {
   flex: 1 1 auto;
 }
+
+.filterRow {
+  display: flex;
+  margin-bottom: 20px;
+}
+
+.filterContainer {
+  display: flex;
+  align-items: stretch;
+  flex: 1;
+  flex-direction: column;
+  margin-right: 12px;
+}
+
+.filterContainer:last-child {
+  margin-right: 0;
+}
+
+.filterLabel {
+  margin-bottom: 3px;
+  font-weight: bold;
+}
+
+@media only screen and (max-width: $breakpointSmall) {
+  .alert {
+    display: none;
+  }
+
+  .filterRow {
+    flex-direction: column;
+  }
+
+  .filterContainer {
+    margin-right: 0;
+    margin-bottom: 12px;
+  }
+
+  .scroller {
+    margin-right: -30px;
+    margin-bottom: -30px;
+    margin-left: -30px;
+  }
+}

frontend/src/Indexer/Add/AddIndexerModalContent.js

@@ -1,6 +1,7 @@
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import Alert from 'Components/Alert';
+import EnhancedSelectInput from 'Components/Form/EnhancedSelectInput';
 import TextInput from 'Components/Form/TextInput';
 import Button from 'Components/Link/Button';
 import LoadingIndicator from 'Components/Loading/LoadingIndicator';
@@ -44,6 +45,17 @@ const columns = [
   }
 ];
 
+const protocols = [
+  {
+    key: 'torrent',
+    value: 'torrent'
+  },
+  {
+    key: 'usenet',
+    value: 'nzb'
+  }
+];
+
 class AddIndexerModalContent extends Component {
 
   //
@@ -53,7 +65,10 @@ class AddIndexerModalContent extends Component {
     super(props, context);
 
     this.state = {
-      filter: ''
+      filter: '',
+      filterProtocols: [],
+      filterLanguages: [],
+      filterPrivacyLevels: []
     };
   }
 
@@ -62,7 +77,7 @@ class AddIndexerModalContent extends Component {
 
   onFilterChange = ({ value }) => {
     this.setState({ filter: value });
-  }
+  };
 
   //
   // Render
@@ -80,8 +95,35 @@ class AddIndexerModalContent extends Component {
       onModalClose
     } = this.props;
 
-    const filter = this.state.filter;
-    const filterLower = filter.toLowerCase();
+    const languages = Array.from(new Set(indexers.map(({ language }) => language)))
+      .sort((a, b) => a.localeCompare(b))
+      .map((language) => ({ key: language, value: language }));
+
+    const privacyLevels = Array.from(new Set(indexers.map(({ privacy }) => privacy)))
+      .sort((a, b) => a.localeCompare(b))
+      .map((privacy) => ({ key: privacy, value: privacy }));
+
+    const filteredIndexers = indexers.filter((indexer) => {
+      const { filter, filterProtocols, filterLanguages, filterPrivacyLevels } = this.state;
+
+      if (!indexer.name.toLowerCase().includes(filter.toLocaleLowerCase())) {
+        return false;
+      }
+
+      if (filterProtocols.length && !filterProtocols.includes(indexer.protocol)) {
+        return false;
+      }
+
+      if (filterLanguages.length && !filterLanguages.includes(indexer.language)) {
+        return false;
+      }
+
+      if (filterPrivacyLevels.length && !filterPrivacyLevels.includes(indexer.privacy)) {
+        return false;
+      }
+
+      return true;
+    });
 
     const errorMessage = getErrorMessage(error, 'Unable to load indexers');
 
@@ -99,11 +141,43 @@ class AddIndexerModalContent extends Component {
             className={styles.filterInput}
             placeholder={translate('FilterPlaceHolder')}
             name="filter"
-            value={filter}
+            value={this.state.filter}
             autoFocus={true}
             onChange={this.onFilterChange}
           />
 
+          <div className={styles.filterRow}>
+            <div className={styles.filterContainer}>
+              <label className={styles.filterLabel}>Protocol</label>
+              <EnhancedSelectInput
+                name="indexerProtocols"
+                value={this.state.filterProtocols}
+                values={protocols}
+                onChange={({ value }) => this.setState({ filterProtocols: value })}
+              />
+            </div>
+
+            <div className={styles.filterContainer}>
+              <label className={styles.filterLabel}>Language</label>
+              <EnhancedSelectInput
+                name="indexerLanguages"
+                value={this.state.filterLanguages}
+                values={languages}
+                onChange={({ value }) => this.setState({ filterLanguages: value })}
+              />
+            </div>
+
+            <div className={styles.filterContainer}>
+              <label className={styles.filterLabel}>Privacy</label>
+              <EnhancedSelectInput
+                name="indexerPrivacyLevels"
+                value={this.state.filterPrivacyLevels}
+                values={privacyLevels}
+                onChange={({ value }) => this.setState({ filterPrivacyLevels: value })}
+              />
+            </div>
+          </div>
+
           <Alert
             kind={kinds.INFO}
             className={styles.alert}
@@ -133,18 +207,14 @@ class AddIndexerModalContent extends Component {
                 >
                   <TableBody>
                     {
-                      indexers.map((indexer) => {
-                        return indexer.name.toLowerCase().includes(filterLower) ?
-                          (
-                            <SelectIndexerRow
-                              key={indexer.name}
-                              implementation={indexer.implementation}
-                              {...indexer}
-                              onIndexerSelect={onIndexerSelect}
-                            />
-                          ) :
-                          null;
-                      })
+                      filteredIndexers.map((indexer) => (
+                        <SelectIndexerRow
+                          key={indexer.name}
+                          implementation={indexer.implementation}
+                          {...indexer}
+                          onIndexerSelect={onIndexerSelect}
+                        />
+                      ))
                     }
                   </TableBody>
                 </Table> :

frontend/src/Indexer/Add/AddIndexerModalContentConnector.js

@@ -52,11 +52,11 @@ class AddIndexerModalContentConnector extends Component {
   onIndexerSelect = ({ implementation, name }) => {
     this.props.selectIndexerSchema({ implementation, name });
     this.props.onModalClose({ indexerSelected: true });
-  }
+  };
 
   onSortPress = (sortKey, sortDirection) => {
     this.props.setIndexerSchemaSort({ sortKey, sortDirection });
-  }
+  };
 
   //
   // Render

frontend/src/Indexer/Add/AddIndexerPresetMenuItem.js

@@ -17,7 +17,7 @@ class AddIndexerPresetMenuItem extends Component {
       name,
       implementation
     });
-  }
+  };
 
   //
   // Render

frontend/src/Indexer/Add/SelectIndexerRow.js

@@ -17,7 +17,7 @@ class SelectIndexerRow extends Component {
     } = this.props;
 
     this.props.onIndexerSelect({ implementation, name });
-  }
+  };
 
   //
   // Render

frontend/src/Indexer/Delete/DeleteIndexerModalContent.js

@@ -27,11 +27,11 @@ class DeleteIndexerModalContent extends Component {
 
   onDeleteFilesChange = ({ value }) => {
     this.setState({ deleteFiles: value });
-  }
+  };
 
   onAddImportExclusionChange = ({ value }) => {
     this.setState({ addImportExclusion: value });
-  }
+  };
 
   onDeleteMovieConfirmed = () => {
     const deleteFiles = this.state.deleteFiles;
@@ -39,7 +39,7 @@ class DeleteIndexerModalContent extends Component {
 
     this.setState({ deleteFiles: false, addImportExclusion: false });
     this.props.onDeletePress(deleteFiles, addImportExclusion);
-  }
+  };
 
   //
   // Render

frontend/src/Indexer/Delete/DeleteIndexerModalContentConnector.js

@@ -32,7 +32,7 @@ class DeleteIndexerModalContentConnector extends Component {
     });
 
     this.props.onModalClose(true);
-  }
+  };
 
   //
   // Render