fixup

Fixes #6925

.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,12 +63,11 @@ body:
     required: true
 - type: textarea
   attributes:
-    label: Anything else?
+    label: Trace Logs?
     description: |
       Trace Logs (https://wiki.servarr.com/radarr/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 Radarr'
 labels: ['Type: Feature Request', 'Status: Needs Triage']
 body:

README.md

@@ -1,19 +1,21 @@
 # Radarr
 
 [![Build Status](https://dev.azure.com/Radarr/Radarr/_apis/build/status/Radarr.Radarr?branchName=develop)](https://dev.azure.com/Radarr/Radarr/_build/latest?definitionId=1&branchName=develop)
-[![Translated](https://translate.servarr.com/widgets/radarr/-/radarr/svg-badge.svg)](https://translate.servarr.com/engage/radarr/?utm_source=widget)
+[![Translated](https://translate.servarr.com/widgets/servarr/-/radarr/svg-badge.svg)](https://translate.servarr.com/engage/radarr/?utm_source=widget)
 [![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/radarr.svg)](https://wiki.servarr.com/radarr/installation#docker)
 ![Github Downloads](https://img.shields.io/github/downloads/Radarr/Radarr/total.svg)
-[![Backers on Open Collective](https://opencollective.com/Radarr/backers/badge.svg)](#backers) 
+[![Backers on Open Collective](https://opencollective.com/Radarr/backers/badge.svg)](#backers)
 [![Sponsors on Open Collective](https://opencollective.com/Radarr/sponsors/badge.svg)](#sponsors)
+[![Mega Sponsors on Open Collective](https://opencollective.com/Radarr/megasponsors/badge.svg)](#mega-sponsors)
 
 Radarr is a movie collection manager for Usenet and BitTorrent users. It can monitor multiple RSS feeds for new movies and will interface with clients and indexers to grab, sort, and rename them. It can also be configured to automatically upgrade the quality of existing files in the library when a better quality format becomes available.
+Note that only one type of a given movie is supported. If you want both an 4k version and 1080p version of a given movie you will need multiple instances.
 
-## Major Features Include:
+## Major Features Include
 
 * Adding new movies with lots of information, such as trailers, ratings, etc.
 * Support for major platforms: Windows, Linux, macOS, Raspberry Pi, etc.
-* Can watch for better quality of the movies you have and do an automatic upgrade. *eg. from DVD to Blu-Ray*
+* Can watch for better quality of the movies you have and do an automatic upgrade. *e.g. from DVD to Blu-Ray*
 * Automatic failed download handling will try another release if one fails
 * Manual search so you can pick any release or to see why a release was not downloaded automatically
 * Full integration with SABnzbd and NZBGet
@@ -21,53 +23,60 @@ Radarr is a movie collection manager for Usenet and BitTorrent users. It can mon
 * Automatically importing downloaded movies
 * Recognizing Special Editions, Director's Cut, etc.
 * Identifying releases with hardcoded subs
-* QBittorrent, Deluge, rTorrent, Transmission, uTorrent, and other download clients are supported 
-* Full integration with Kodi, Plex (notification, library update)
-* A beautiful UI
+* Identifying releases with AKA movie names
+* SABnzbd, NZBGet, QBittorrent, Deluge, rTorrent, Transmission, uTorrent, and other download clients are supported and integrated
+* Full integration with Kodi and Plex (notifications, library updates)
 * Importing Metadata such as trailers or subtitles
 * Adding metadata such as posters and information for Kodi and others to use
 * Advanced customization for profiles, such that Radarr will always download the copy you want
+* A beautiful UI
 
 ## Support
-Note: GitHub Issues are for Bugs and Feature Requests Only
 
+[![Wiki](https://img.shields.io/badge/servarr-wiki-181717.svg?maxAge=60)](https://wiki.servarr.com/radarr)
 [![Discord](https://img.shields.io/badge/discord-chat-7289DA.svg?maxAge=60)](https://radarr.video/discord)
 [![Reddit](https://img.shields.io/badge/reddit-discussion-FF4500.svg?maxAge=60)](https://www.reddit.com/r/Radarr)
+
+Note: GitHub Issues are for Bugs and Feature Requests Only
+
 [![GitHub - Bugs and Feature Requests Only](https://img.shields.io/badge/github-issues-red.svg?maxAge=60)](https://github.com/Radarr/Radarr/issues)
-[![Wiki](https://img.shields.io/badge/servarr-wiki-181717.svg?maxAge=60)](https://wiki.servarr.com/radarr)
 
 ## Contributors & Developers
+
 [API Documentation](https://radarr.video/docs/api/)
 
-This project exists thanks to all the people who contribute. [Contribute](CONTRIBUTING.md).
-<a href="https://github.com/Radarr/Radarr/graphs/contributors"><img src="https://opencollective.com/Radarr/contributors.svg?width=890&button=false" /></a>
+This project exists thanks to all the people who contribute.
+- [Contribute (GitHub)](CONTRIBUTING.md)
+- [Contribution (Wiki Article)](https://wiki.servarr.com/radarr/contributing)
 
+[![Contributors List](https://opencollective.com/Radarr/contributors.svg?width=890&button=false)](https://github.com/Radarr/Radarr/graphs/contributors)
 
 ## Backers
 
 Thank you to all our backers! 🙏 [Become a backer](https://opencollective.com/Radarr#backer)
 
-<img src="https://opencollective.com/Radarr/backers.svg?width=890"></a>
+[![Backers List](https://opencollective.com/Radarr/backers.svg?width=890)](https://opencollective.com/Radarr#backer)
 
 ## Sponsors
 
 Support this project by becoming a sponsor. Your logo will show up here with a link to your website. [Become a sponsor](https://opencollective.com/Radarr#sponsor)
 
-<img src="https://opencollective.com/Radarr/sponsors.svg?width=890"></a>
+[![Sponsors List](https://opencollective.com/Radarr/sponsors.svg?width=890)](https://opencollective.com/Radarr#sponsor)
 
 ## Mega Sponsors
 
-<img src="https://opencollective.com/Radarr/tiers/mega-sponsor.svg?width=890"></a>
+[![Mega Sponsors List](https://opencollective.com/Radarr/tiers/mega-sponsor.svg?width=890)](https://opencollective.com/Radarr#mega-sponsor)
 
 ## JetBrains
+
 Thank you to [<img src="/Logo/jetbrains.svg" alt="JetBrains" width="32"> JetBrains](http://www.jetbrains.com/) for providing us with free licenses to their great tools.
 
 * [<img src="/Logo/resharper.svg" alt="ReSharper" width="32"> ReSharper](http://www.jetbrains.com/resharper/)
-* [<img src="/Logo/webstorm.svg" alt="WebStorm" width="32"> WebStorm](http://www.jetbrains.com/webstorm/)	
-* [<img src="/Logo/rider.svg" alt="Rider" width="32"> Rider](http://www.jetbrains.com/rider/)	
+* [<img src="/Logo/webstorm.svg" alt="WebStorm" width="32"> WebStorm](http://www.jetbrains.com/webstorm/)
+* [<img src="/Logo/rider.svg" alt="Rider" width="32"> Rider](http://www.jetbrains.com/rider/)
 * [<img src="/Logo/dottrace.svg" alt="dotTrace" width="32"> dotTrace](http://www.jetbrains.com/dottrace/)
 
 ### License
 
 * [GNU GPL v3](http://www.gnu.org/licenses/gpl.html)
-* Copyright 2010-2021
+* Copyright 2010-2022

azure-pipelines.yml

@@ -7,13 +7,13 @@ variables:
   outputFolder: './_output'
   artifactsFolder: './_artifacts'
   testsFolder: './_tests'
-  majorVersion: '4.0.0'
+  majorVersion: '4.0.2'
   minorVersion: $[counter('minorVersion', 2000)]
   radarrVersion: '$(majorVersion).$(minorVersion)'
   buildName: '$(Build.SourceBranchName).$(radarrVersion)'
   sentryOrg: 'servarr'
   sentryUrl: 'https://sentry.servarr.com'
-  dotnetVersion: '5.0.401'
+  dotnetVersion: '6.0.101'
   yarnCacheFolder: $(Pipeline.Workspace)/.yarn
 
 trigger:
@@ -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'))
@@ -203,12 +203,12 @@ stages:
       - bash: ./build.sh --packages
         displayName: Create Packages
       - bash: |
-          setup/inno/ISCC.exe setup/radarr.iss //DFramework=net5.0 //DRuntime=win-x86
-          cp setup/output/Radarr.*windows.net5.0.exe ${BUILD_ARTIFACTSTAGINGDIRECTORY}/Radarr.${BUILDNAME}.windows-core-x86-installer.exe
+          setup/inno/ISCC.exe setup/radarr.iss //DFramework=net6.0 //DRuntime=win-x86
+          cp setup/output/Radarr.*windows.net6.0.exe ${BUILD_ARTIFACTSTAGINGDIRECTORY}/Radarr.${BUILDNAME}.windows-core-x86-installer.exe
         displayName: Create .NET Core Windows installer
       - bash: |
-          setup/inno/ISCC.exe setup/radarr.iss //DFramework=net5.0 //DRuntime=win-x64
-          cp setup/output/Radarr.*windows.net5.0.exe ${BUILD_ARTIFACTSTAGINGDIRECTORY}/Radarr.${BUILDNAME}.windows-core-x64-installer.exe
+          setup/inno/ISCC.exe setup/radarr.iss //DFramework=net6.0 //DRuntime=win-x64
+          cp setup/output/Radarr.*windows.net6.0.exe ${BUILD_ARTIFACTSTAGINGDIRECTORY}/Radarr.${BUILDNAME}.windows-core-x64-installer.exe
         displayName: Create .NET Core Windows installer
       - publish: $(Build.ArtifactStagingDirectory)
         artifact: 'WindowsInstaller'
@@ -251,29 +251,44 @@ stages:
           archiveFile: '$(Build.ArtifactStagingDirectory)/Radarr.$(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)/Radarr.$(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)/Radarr.$(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)/Radarr.$(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)/Radarr.$(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)/Radarr.$(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:
@@ -281,7 +296,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:
@@ -289,7 +304,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:
@@ -297,7 +312,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)/Radarr.$(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:
@@ -305,7 +328,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:
@@ -313,7 +336,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:
@@ -321,7 +344,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
@@ -866,8 +889,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

@@ -129,7 +129,7 @@ PackageLinux()
 
     echo "Adding Radarr.Mono to UpdatePackage"
     cp $folder/Radarr.Mono.* $folder/Radarr.Update
-    if [ "$framework" = "net5.0" ]; then
+    if [ "$framework" = "net6.0" ]; then
         cp $folder/Mono.Posix.NETStandard.* $folder/Radarr.Update
         cp $folder/libMonoPosixHelper.* $folder/Radarr.Update
     fi
@@ -140,12 +140,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/Radarr
+    local folder=$artifactsFolder/$runtime/$framework/Radarr
 
-    PackageFiles "$folder" "$framework" "osx-x64"
+    PackageFiles "$folder" "$framework" "$runtime"
 
     echo "Removing Service helpers"
     rm -f $folder/ServiceUninstall.*
@@ -156,7 +157,7 @@ PackageMacOS()
 
     echo "Adding Radarr.Mono to UpdatePackage"
     cp $folder/Radarr.Mono.* $folder/Radarr.Update
-    if [ "$framework" = "net5.0" ]; then
+    if [ "$framework" = "net6.0" ]; then
         cp $folder/Mono.Posix.NETStandard.* $folder/Radarr.Update
         cp $folder/libMonoPosixHelper.* $folder/Radarr.Update
     fi
@@ -167,10 +168,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
@@ -178,7 +180,7 @@ PackageMacOSApp()
     mkdir -p $folder/Radarr.app/Contents/MacOS
 
     echo "Copying Binaries"
-    cp -r $artifactsFolder/macos/$framework/Radarr/* $folder/Radarr.app/Contents/MacOS
+    cp -r $artifactsFolder/$runtime/$framework/Radarr/* $folder/Radarr.app/Contents/MacOS
 
     echo "Removing Update Folder"
     rm -r $folder/Radarr.app/Contents/MacOS/Radarr.Update
@@ -225,8 +227,8 @@ Package()
             PackageWindows "$framework" "$runtime"
             ;;
         osx)
-            PackageMacOS "$framework"
-            PackageMacOSApp "$framework"
+            PackageMacOS "$framework" "$runtime"
+            PackageMacOSApp "$framework" "$runtime"
             ;;
     esac
 }
@@ -326,14 +328,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"
@@ -362,17 +364,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/Activity/Blocklist/Blocklist.js

@@ -120,7 +120,7 @@ class Blocklist extends Component {
         <PageToolbar>
           <PageToolbarSection>
             <PageToolbarButton
-              label="Remove Selected"
+              label={translate('RemoveSelected')}
               iconName={icons.REMOVE}
               isDisabled={!selectedIds.length}
               isSpinning={isRemoving}

frontend/src/Activity/History/Details/HistoryDetails.js

@@ -25,6 +25,7 @@ function HistoryDetails(props) {
       releaseGroup,
       nzbInfoUrl,
       downloadClient,
+      downloadClientName,
       downloadId,
       age,
       ageHours,
@@ -32,6 +33,8 @@ function HistoryDetails(props) {
       publishedDate
     } = data;
 
+    const downloadClientNameInfo = downloadClientName ?? downloadClient;
+
     return (
       <DescriptionList>
         <DescriptionListItem
@@ -71,11 +74,12 @@ function HistoryDetails(props) {
         }
 
         {
-          !!downloadClient &&
+          downloadClientNameInfo ?
             <DescriptionListItem
               title={translate('DownloadClient')}
-              data={downloadClient}
-            />
+              data={downloadClientNameInfo}
+            /> :
+            null
         }
 
         {

frontend/src/AddMovie/AddNewMovie/AddNewMovie.js

@@ -161,7 +161,7 @@ class AddNewMovie extends Component {
                   {translate('YouCanAlsoSearch')}
                 </div>
                 <div>
-                  <Link to="https://wiki.servarr.com/radarr/faq#why-cant-i-add-a-new-movie-to-radarr">
+                  <Link to="https://wiki.servarr.com/radarr/faq#why-can-i-not-add-a-new-movie-to-radarr">
                     {translate('CantFindMovie')}
                   </Link>
                 </div>

frontend/src/AddMovie/AddNewMovie/AddNewMovieSearchResult.js

@@ -183,7 +183,7 @@ class AddNewMovieSearchResult extends Component {
             <div>
               <Label size={sizes.LARGE}>
                 <HeartRating
-                  rating={ratings.value}
+                  ratings={ratings}
                   iconSize={13}
                 />
               </Label>

frontend/src/Calendar/Events/CalendarEvent.js

@@ -43,15 +43,15 @@ class CalendarEvent extends Component {
     const link = `/movie/${titleSlug}`;
     const eventType = [];
 
-    if (moment(date).isSame(moment(inCinemas), 'day')) {
+    if (inCinemas && moment(date).isSame(moment(inCinemas), 'day')) {
       eventType.push('Cinemas');
     }
 
-    if (moment(date).isSame(moment(physicalRelease), 'day')) {
+    if (physicalRelease && moment(date).isSame(moment(physicalRelease), 'day')) {
       eventType.push('Physical');
     }
 
-    if (moment(date).isSame(moment(digitalRelease), 'day')) {
+    if (digitalRelease && moment(date).isSame(moment(digitalRelease), 'day')) {
       eventType.push('Digital');
     }
 

frontend/src/Components/FieldSet.css

@@ -16,4 +16,9 @@
   color: #3a3f51;
   font-size: 21px;
   line-height: inherit;
+
+  &.small {
+    color: #909293;
+    font-size: 18px;
+  }
 }

frontend/src/Components/FieldSet.js

@@ -1,5 +1,7 @@
+import classNames from 'classnames';
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
+import { sizes } from 'Helpers/Props';
 import styles from './FieldSet.css';
 
 class FieldSet extends Component {
@@ -9,13 +11,14 @@ class FieldSet extends Component {
 
   render() {
     const {
+      size,
       legend,
       children
     } = this.props;
 
     return (
       <fieldset className={styles.fieldSet}>
-        <legend className={styles.legend}>
+        <legend className={classNames(styles.legend, (size === sizes.SMALL) && styles.small)}>
           {legend}
         </legend>
         {children}
@@ -26,8 +29,13 @@ class FieldSet extends Component {
 }
 
 FieldSet.propTypes = {
+  size: PropTypes.oneOf(sizes.all).isRequired,
   legend: PropTypes.oneOfType([PropTypes.node, PropTypes.string]),
   children: PropTypes.node
 };
 
+FieldSet.defaultProps = {
+  size: sizes.MEDIUM
+};
+
 export default FieldSet;

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

@@ -166,7 +166,9 @@ class FilterBuilderModalContent extends Component {
             </div>
           </div>
 
-          <div className={styles.label}>Filters</div>
+          <div className={styles.label}>
+            {translate('Filters')}
+          </div>
 
           <div className={styles.rows}>
             {

frontend/src/Components/Form/AvailabilitySelectInput.js

@@ -6,8 +6,7 @@ import SelectInput from './SelectInput';
 const availabilityOptions = [
   { key: 'announced', value: translate('Announced') },
   { key: 'inCinemas', value: translate('InCinemas') },
-  { key: 'released', value: translate('Released') },
-  { key: 'preDB', value: translate('PreDB') }
+  { key: 'released', value: translate('Released') }
 ];
 
 function AvailabilitySelectInput(props) {

frontend/src/Components/Form/DownloadClientSelectInputConnector.js

@@ -0,0 +1,100 @@
+import _ from 'lodash';
+import PropTypes from 'prop-types';
+import React, { Component } from 'react';
+import { connect } from 'react-redux';
+import { createSelector } from 'reselect';
+import { fetchDownloadClients } from 'Store/Actions/settingsActions';
+import sortByName from 'Utilities/Array/sortByName';
+import EnhancedSelectInput from './EnhancedSelectInput';
+
+function createMapStateToProps() {
+  return createSelector(
+    (state) => state.settings.downloadClients,
+    (state, { includeAny }) => includeAny,
+    (state, { protocol }) => protocol,
+    (downloadClients, includeAny, protocolFilter) => {
+      const {
+        isFetching,
+        isPopulated,
+        error,
+        items
+      } = downloadClients;
+
+      const filteredItems = items.filter((item) => item.protocol === protocolFilter);
+
+      const values = _.map(filteredItems.sort(sortByName), (downloadClient) => {
+        return {
+          key: downloadClient.id,
+          value: downloadClient.name
+        };
+      });
+
+      if (includeAny) {
+        values.unshift({
+          key: 0,
+          value: '(Any)'
+        });
+      }
+
+      return {
+        isFetching,
+        isPopulated,
+        error,
+        values
+      };
+    }
+  );
+}
+
+const mapDispatchToProps = {
+  dispatchFetchDownloadClients: fetchDownloadClients
+};
+
+class DownloadClientSelectInputConnector extends Component {
+
+  //
+  // Lifecycle
+
+  componentDidMount() {
+    if (!this.props.isPopulated) {
+      this.props.dispatchFetchDownloadClients();
+    }
+  }
+
+  //
+  // Listeners
+
+  onChange = ({ name, value }) => {
+    this.props.onChange({ name, value: parseInt(value) });
+  }
+
+  //
+  // Render
+
+  render() {
+    return (
+      <EnhancedSelectInput
+        {...this.props}
+        onChange={this.onChange}
+      />
+    );
+  }
+}
+
+DownloadClientSelectInputConnector.propTypes = {
+  isFetching: PropTypes.bool.isRequired,
+  isPopulated: PropTypes.bool.isRequired,
+  name: PropTypes.string.isRequired,
+  value: PropTypes.oneOfType([PropTypes.number, PropTypes.string]).isRequired,
+  values: PropTypes.arrayOf(PropTypes.object).isRequired,
+  includeAny: PropTypes.bool.isRequired,
+  onChange: PropTypes.func.isRequired,
+  dispatchFetchDownloadClients: PropTypes.func.isRequired
+};
+
+DownloadClientSelectInputConnector.defaultProps = {
+  includeAny: false,
+  protocol: 'torrent'
+};
+
+export default connect(createMapStateToProps, mapDispatchToProps)(DownloadClientSelectInputConnector);

frontend/src/Components/Form/FormInputGroup.js

@@ -8,6 +8,7 @@ import AvailabilitySelectInput from './AvailabilitySelectInput';
 import CaptchaInputConnector from './CaptchaInputConnector';
 import CheckInput from './CheckInput';
 import DeviceInputConnector from './DeviceInputConnector';
+import DownloadClientSelectInputConnector from './DownloadClientSelectInputConnector';
 import EnhancedSelectInput from './EnhancedSelectInput';
 import EnhancedSelectInputConnector from './EnhancedSelectInputConnector';
 import FormInputHelpText from './FormInputHelpText';
@@ -73,6 +74,9 @@ function getComponent(type) {
     case inputTypes.INDEXER_FLAGS_SELECT:
       return IndexerFlagsSelectInputConnector;
 
+    case inputTypes.DOWNLOAD_CLIENT_SELECT:
+      return DownloadClientSelectInputConnector;
+
     case inputTypes.LANGUAGE_SELECT:
       return LanguageSelectInputConnector;
 

frontend/src/Components/Form/ProviderFieldFormGroup.js

@@ -64,6 +64,7 @@ function ProviderFieldFormGroup(props) {
     label,
     helpText,
     helpLink,
+    placeholder,
     value,
     type,
     advanced,
@@ -96,6 +97,7 @@ function ProviderFieldFormGroup(props) {
         label={label}
         helpText={helpText}
         helpLink={helpLink}
+        placeholder={placeholder}
         value={value}
         values={getSelectValues(selectOptions)}
         errors={errors}
@@ -121,6 +123,7 @@ ProviderFieldFormGroup.propTypes = {
   label: PropTypes.string.isRequired,
   helpText: PropTypes.string,
   helpLink: PropTypes.string,
+  placeholder: PropTypes.string,
   value: PropTypes.any,
   type: PropTypes.string.isRequired,
   advanced: PropTypes.bool.isRequired,

frontend/src/Components/HeartRating.css

@@ -1,4 +1,5 @@
-.heart {
+.image {
+  align-content: center;
   margin-right: 5px;
-  color: $themeRed;
+  vertical-align: -0.125em;
 }

frontend/src/Components/ImdbRating.css

@@ -0,0 +1,5 @@
+.image {
+  align-content: center;
+  margin-right: 5px;
+  vertical-align: -0.125em;
+}

frontend/src/Components/RottenTomatoRating.css

@@ -0,0 +1,5 @@
+.image {
+  align-content: center;
+  margin-right: 5px;
+  vertical-align: -0.125em;
+}

frontend/src/Components/RottenTomatoRating.js

@@ -0,0 +1,58 @@
+import PropTypes from 'prop-types';
+import React, { PureComponent } from 'react';
+import styles from './RottenTomatoRating.css';
+
+class RottenTomatoRating extends PureComponent {
+
+  //
+  // Render
+
+  render() {
+
+    const {
+      ratings,
+      hideIcon,
+      iconSize
+    } = this.props;
+
+    const rtRotten = 'data:image/svg+xml;base64,PHN2ZyB2aWV3Qm94PSIwIDAgNTYwIDU2MCIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj48cGF0aCBkPSJNNDQ1LjE4NSA0NDQuNjg0Yy03OS4zNjkgNC4xNjctOTUuNTg3LTg2LjY1Mi0xMjYuNzI2LTg2LjAwNi0xMy4yNjguMjc5LTIzLjcyNiAxNC4xNTEtMTkuMTMzIDMwLjMyIDIuNTI1IDguODg4IDkuNTMgMjEuOTIzIDEzLjk0NCAzMC4wMTEgMTUuNTcgMjguNTQ0LTcuNDQ3IDYwLjg0NS0zNC4zODMgNjMuNTc3LTQ0Ljc2IDQuNTQtNjMuNDMzLTIxLjQyNi02Mi4yNzgtNDguMDA3IDEuMy0yOS44NCAyNi42LTYwLjMzMS42NS03My4zMDUtMjcuMTk0LTEzLjU5Ny00OS4zMDEgMzkuNTcyLTc1LjMyNSA1MS40MzktMjMuNTUzIDEwLjc0MS01Ni4yNDggMi40MTMtNjcuODcyLTIzLjc0MS04LjE2NC0xOC4zNzktNi42OC01My43NjggMjkuNjctNjcuMjcgMjIuNzA2LTguNDMzIDczLjMwNSAxMS4wMjkgNzUuOS0xMy42MjMgMi45OTItMjguNDE2LTUzLjE1NS0zMC44MTItNzAuMDYtMzcuNjI2LTI5LjkxMi0xMi4wNTUtNDcuNTY3LTM3Ljg1LTMzLjczNC02NS41MjIgMTAuMzc4LTIwLjc1NyA0MC45MTUtMjkuMjAzIDY0LjIyMy0yMC4xMSAyNy45MjIgMTAuODkyIDMyLjQwNCAzOS44NTMgNDYuNzEgNTEuODk3IDEyLjMyNCAxMC4zOCAyOS4xOSAxMS42OCA0MC4yMiA0LjU0MyA4LjEzNS01LjI2NSAxMC44NDMtMTYuODI4IDcuNzc0LTI3LjM5LTQuMDctMTQuMDIzLTE0Ljg3NS0yMi43NzMtMjUuNDE1LTMxLjM0Ni0xOC43NTgtMTUuMjQ5LTQ1LjI0LTI4LjM2LTI5LjIyMi02OS45ODMgMTMuMTMtMzQuMTEgNTEuNjQyLTM1LjM0IDUxLjY0Mi0zNS4zNCAxNS4zLTEuNzIgMjkuMDAyIDIuOSA0MC4xNjcgMTIuODc1IDE0LjkyNyAxMy4zMzUgMTcuODM0IDMxLjE2IDE1LjMzNiA1MC4xNzYtMi4yODMgMTcuMzU4LTguNDI2IDMyLjU2LTExLjYzIDQ5Ljc1OS0zLjcxNyAxOS45NjYgNi45NTQgNDAuMDg2IDI3LjI0OSA0MC44NjkgMjYuNjk0IDEuMDMxIDM0LjY5OC0xOS40ODYgMzcuOTY0LTMyLjQ5MiA0Ljc4Mi0xOS4wMjggMTEuMDU4LTM2LjY5NCAyOC43MTgtNDcuODIgMjUuMzQ2LTE1Ljk3IDYwLjU1Mi0xMi40NyA3Ni44ODYgMTguMjIyIDEyLjkyIDI0LjI4NCA4Ljc3MiA1Ny43MTUtMTEuMDQ3IDc1Ljk3LTguODkyIDguMTg4LTE5LjU4NCAxMS4wNzUtMzEuMTQ4IDExLjE1Ni0xNi41ODUuMTE3LTMzLjE2Mi0uMjktNDguNTU2IDcuNDcxLTEwLjQ4IDUuMjgxLTE1LjA0NyAxMy44ODgtMTUuMDQ1IDI1LjQyMyAwIDExLjI0MiA1Ljg1MyAxOC41ODUgMTUuMzM2IDIzLjM2MyAxNy44NiA5LjAwMyAzNy41NzcgMTAuODQzIDU2Ljg3MSAxNC4yMjIgMjcuOTggNC45IDUyLjU4MSAxNC43NTUgNjguMzc1IDQwLjcyLjE0Mi4yMjguMjguNDU4LjQxNS42OSAxOC4xMzkgMzAuNzQxLS44MzEgNzUuMDA1LTM2LjQ3NiA3Ni44NzgiIGZpbGw9IiMwQUM4NTUiLz48L3N2Zz4=';
+    const rtFresh = 'data:image/svg+xml;base64,PHN2ZyB2aWV3Qm94PSIwIDAgNTYwIDU2MCIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj48cGF0aCBkPSJtNDc4LjI5IDI5Ni45OGMtMy45OS02My45NjYtMzYuNTItMTExLjgyLTg1LjQ2OC0xMzguNTggMC4yNzggMS41Ni0xLjEwOSAzLjUwOC0yLjY4OCAyLjgxOC0zMi4wMTYtMTQuMDA2LTg2LjMyOCAzMS4zMi0xMjQuMjggNy41ODQgMC4yODUgOC41MTktMS4zNzggNTAuMDcyLTU5LjkxNCA1Mi40ODMtMS4zODIgMC4wNTYtMi4xNDItMS4zNTUtMS4yNjgtMi4zNTQgNy44MjgtOC45MjkgMTUuNzMyLTMxLjUzNSA0LjM2Ny00My41ODYtMjQuMzM4IDIxLjgxLTM4LjQ3MiAzMC4wMTctODUuMTM4IDE5LjE4Ni0yOS44NzggMzEuMjQxLTQ2LjgwOSA3NC00My40ODUgMTI3LjI2IDYuNzggMTA4Ljc0IDEwOC42MyAxNzAuODkgMjExLjE5IDE2NC40OSAxMDIuNTYtNi4zOTUgMTkzLjQ3LTgwLjU3MiAxODYuNjgtMTg5LjMxIiBmaWxsPSIjRkEzMjBBIi8+PHBhdGggZD0iTTI5MS4zNzUgMTMyLjI5M2MyMS4wNzUtNS4wMjMgODEuNjkzLS40OSAxMDEuMTE0IDI1LjI3NCAxLjE2NiAxLjU0NS0uNDc1IDQuNDY4LTIuMzU1IDMuNjQ4LTMyLjAxNi0xNC4wMDYtODYuMzI4IDMxLjMyLTEyNC4yODIgNy41ODQuMjg1IDguNTE5LTEuMzc4IDUwLjA3Mi01OS45MTQgNTIuNDgzLTEuMzgyLjA1Ni0yLjE0Mi0xLjM1NS0xLjI2OC0yLjM1NCA3LjgyOC04LjkyOSAxNS43My0zMS41MzUgNC4zNjctNDMuNTg2LTI2LjUxMiAyMy43NTgtNDAuODg0IDMxLjM5Mi05OC40MjYgMTUuODM4LTEuODgzLS41MDgtMS4yNDEtMy41MzUuNzYyLTQuMjk4IDEwLjg3Ni00LjE1NyAzNS41MTUtMjIuMzYxIDU4LjgyNC0zMC4zODUgNC40MzgtMS41MjYgOC44NjItMi43MSAxMy4xOC0zLjQtMjUuNjY1LTIuMjkzLTM3LjIzNS01Ljg2Mi01My41NTktMy40LTEuNzg5LjI3LTMuMDA0LTEuODEzLTEuODk1LTMuMjQxIDIxLjk5NS0yOC4zMzIgNjIuNTEzLTM2Ljg4OCA4Ny41MTItMjEuODM3LTE1LjQxLTE5LjA5NC0yNy40OC0zNC4zMjEtMjcuNDgtMzQuMzIxbDI4LjYwMS0xNi4yNDZzMTEuODE3IDI2LjQgMjAuNDE0IDQ1LjYxNGMyMS4yNzUtMzEuNDM1IDYwLjg2LTM0LjMzNiA3Ny41ODUtMTIuMDMzLjk5MiAxLjMyNi0uMDQ1IDMuMjEtMS43MDIgMy4xNzEtMTMuNjEyLS4zMzEtMjEuMTA3IDEyLjA1LTIxLjY3NSAyMS40NjZsLjE5Ny4wMjMiIGZpbGw9IiMwMDkxMkQiLz48L3N2Zz4=';
+
+    const rating = ratings.rottenTomatoes;
+
+    let ratingString = '0%';
+
+    if (rating) {
+      ratingString = `${rating.value}%`;
+    }
+
+    return (
+      <span>
+        {
+          !hideIcon &&
+            <img
+              className={styles.image}
+              src={rating.value > 50 ? rtFresh : rtRotten}
+              style={{
+                height: `${iconSize}px`
+              }}
+            />
+        }
+
+        {ratingString}
+      </span>
+    );
+  }
+}
+
+RottenTomatoRating.propTypes = {
+  ratings: PropTypes.object.isRequired,
+  iconSize: PropTypes.number.isRequired,
+  hideIcon: PropTypes.bool
+};
+
+RottenTomatoRating.defaultProps = {
+  iconSize: 14
+};
+
+export default RottenTomatoRating;

frontend/src/Components/TmdbRating.css

@@ -0,0 +1,5 @@
+.image {
+  align-content: center;
+  margin-right: 5px;
+  vertical-align: -0.125em;
+}

frontend/src/Components/TmdbRating.js

@@ -0,0 +1,57 @@
+import PropTypes from 'prop-types';
+import React, { PureComponent } from 'react';
+import styles from './TmdbRating.css';
+
+class TmdbRating extends PureComponent {
+
+  //
+  // Render
+
+  render() {
+
+    const {
+      ratings,
+      hideIcon,
+      iconSize
+    } = this.props;
+
+    const tmdbImage = 'data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAxOTAuMjQgODEuNTIiPjxkZWZzPjxsaW5lYXJHcmFkaWVudCBpZD0iYSIgeTE9IjQwLjc2IiB4Mj0iMTkwLjI0IiB5Mj0iNDAuNzYiIGdyYWRpZW50VW5pdHM9InVzZXJTcGFjZU9uVXNlIj48c3RvcCBvZmZzZXQ9IjAiIHN0b3AtY29sb3I9IiM5MGNlYTEiLz48c3RvcCBvZmZzZXQ9Ii41NiIgc3RvcC1jb2xvcj0iIzNjYmVjOSIvPjxzdG9wIG9mZnNldD0iMSIgc3RvcC1jb2xvcj0iIzAwYjNlNSIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxwYXRoIGQ9Ik0xMDUuNjcgMzYuMDZoNjYuOWExNy42NyAxNy42NyAwIDAwMTcuNjctMTcuNjZBMTcuNjcgMTcuNjcgMCAwMDE3Mi41Ny43M2gtNjYuOUExNy42NyAxNy42NyAwIDAwODggMTguNGExNy42NyAxNy42NyAwIDAwMTcuNjcgMTcuNjZ6bS04OCA0NWg3Ni45YTE3LjY3IDE3LjY3IDAgMDAxNy42Ny0xNy42NiAxNy42NyAxNy42NyAwIDAwLTE3LjY3LTE3LjY3aC03Ni45QTE3LjY3IDE3LjY3IDAgMDAwIDYzLjRhMTcuNjcgMTcuNjcgMCAwMDE3LjY3IDE3LjY2em0tNy4yNi00NS42NGg3LjhWNi45MmgxMC4xVjBoLTI4djYuOWgxMC4xem0yOC4xIDBoNy44VjguMjVoLjFsOSAyNy4xNWg2bDkuMy0yNy4xNWguMVYzNS40aDcuOFYwSDY2Ljc2bC04LjIgMjMuMWgtLjFMNTAuMzEgMGgtMTEuOHptMTEzLjkyIDIwLjI1YTE1LjA3IDE1LjA3IDAgMDAtNC41Mi01LjUyIDE4LjU3IDE4LjU3IDAgMDAtNi42OC0zLjA4IDMzLjU0IDMzLjU0IDAgMDAtOC4wNy0xaC0xMS43djM1LjRoMTIuNzVhMjQuNTggMjQuNTggMCAwMDcuNTUtMS4xNSAxOS4zNCAxOS4zNCAwIDAwNi4zNS0zLjMyIDE2LjI3IDE2LjI3IDAgMDA0LjM3LTUuNSAxNi45MSAxNi45MSAwIDAwMS42My03LjU4IDE4LjUgMTguNSAwIDAwLTEuNjgtOC4yNXpNMTQ1IDY4LjZhOC44IDguOCAwIDAxLTIuNjQgMy40IDEwLjcgMTAuNyAwIDAxLTQgMS44MiAyMS41NyAyMS41NyAwIDAxLTUgLjU1aC00LjA1di0yMWg0LjZhMTcgMTcgMCAwMTQuNjcuNjMgMTEuNjYgMTEuNjYgMCAwMTMuODggMS44N0E5LjE0IDkuMTQgMCAwMTE0NSA1OWE5Ljg3IDkuODcgMCAwMTEgNC41MiAxMS44OSAxMS44OSAwIDAxLTEgNS4wOHptNDQuNjMtLjEzYTggOCAwIDAwLTEuNTgtMi42MiA4LjM4IDguMzggMCAwMC0yLjQyLTEuODUgMTAuMzEgMTAuMzEgMCAwMC0zLjE3LTF2LS4xYTkuMjIgOS4yMiAwIDAwNC40Mi0yLjgyIDcuNDMgNy40MyAwIDAwMS42OC01IDguNDIgOC40MiAwIDAwLTEuMTUtNC42NSA4LjA5IDguMDkgMCAwMC0zLTIuNzIgMTIuNTYgMTIuNTYgMCAwMC00LjE4LTEuMyAzMi44NCAzMi44NCAwIDAwLTQuNjItLjMzaC0xMy4ydjM1LjRoMTQuNWEyMi40MSAyMi40MSAwIDAwNC43Mi0uNSAxMy41MyAxMy41MyAwIDAwNC4yOC0xLjY1IDkuNDIgOS40MiAwIDAwMy4xLTMgOC41MiA4LjUyIDAgMDAxLjItNC42OCA5LjM5IDkuMzkgMCAwMC0uNTUtMy4xOHptLTE5LjQyLTE1Ljc1aDUuM2ExMCAxMCAwIDAxMS44NS4xOCA2LjE4IDYuMTggMCAwMTEuNy41NyAzLjM5IDMuMzkgMCAwMTEuMjIgMS4xMyAzLjIyIDMuMjIgMCAwMS40OCAxLjgyIDMuNjMgMy42MyAwIDAxLS40MyAxLjggMy40IDMuNCAwIDAxLTEuMTIgMS4yIDQuOTIgNC45MiAwIDAxLTEuNTguNjUgNy41MSA3LjUxIDAgMDEtMS43Ny4yaC01LjY1em0xMS43MiAyMGEzLjkgMy45IDAgMDEtMS4yMiAxLjMgNC42NCA0LjY0IDAgMDEtMS42OC43IDguMTggOC4xOCAwIDAxLTEuODIuMmgtN3YtOGg1LjlhMTUuMzUgMTUuMzUgMCAwMTIgLjE1IDguNDcgOC40NyAwIDAxMi4wNS41NSA0IDQgMCAwMTEuNTcgMS4xOCAzLjExIDMuMTEgMCAwMS42MyAyIDMuNzEgMy43MSAwIDAxLS40MyAxLjkyeiIgZmlsbD0idXJsKCNhKSIvPjwvc3ZnPg==';
+
+    const rating = ratings.tmdb;
+
+    let ratingString = '0%';
+
+    if (rating) {
+      ratingString = `${rating.value * 10}%`;
+    }
+
+    return (
+      <span title={`${rating.votes} votes`}>
+        {
+          !hideIcon &&
+            <img
+              className={styles.image}
+              src={tmdbImage}
+              style={{
+                height: `${iconSize}px`
+              }}
+            />
+        }
+
+        {ratingString}
+      </span>
+    );
+  }
+}
+
+TmdbRating.propTypes = {
+  ratings: PropTypes.object.isRequired,
+  iconSize: PropTypes.number.isRequired,
+  hideIcon: PropTypes.bool
+};
+
+TmdbRating.defaultProps = {
+  iconSize: 14
+};
+
+export default TmdbRating;

frontend/src/DiscoverMovie/Overview/DiscoverMovieOverviewInfo.js

@@ -73,7 +73,7 @@ function getInfoRowProps(row, props) {
     return {
       title: translate('Ratings'),
       iconName: icons.HEART,
-      label: `${props.ratings.value * 10}%`
+      label: `${props.ratings.tmdb.value * 10}%`
     };
   }
 

frontend/src/DiscoverMovie/Posters/DiscoverMoviePosterInfo.js

@@ -112,7 +112,7 @@ function DiscoverMoviePosterInfo(props) {
     return (
       <div className={styles.info}>
         <HeartRating
-          rating={ratings.value}
+          ratings={ratings}
         />
       </div>
     );
@@ -129,7 +129,7 @@ DiscoverMoviePosterInfo.propTypes = {
   digitalRelease: PropTypes.string,
   physicalRelease: PropTypes.string,
   runtime: PropTypes.number,
-  ratings: PropTypes.object,
+  ratings: PropTypes.arrayOf(PropTypes.object).isRequired,
   sortKey: PropTypes.string.isRequired,
   showRelativeDates: PropTypes.bool.isRequired,
   shortDateFormat: PropTypes.string.isRequired,

frontend/src/DiscoverMovie/Table/DiscoverMovieRow.js

@@ -246,7 +246,7 @@ class DiscoverMovieRow extends Component {
                   className={styles[name]}
                 >
                   <HeartRating
-                    rating={ratings.value}
+                    ratings={ratings}
                   />
                 </VirtualTableRowCell>
               );
@@ -373,7 +373,7 @@ DiscoverMovieRow.propTypes = {
   digitalRelease: PropTypes.string,
   runtime: PropTypes.number,
   genres: PropTypes.arrayOf(PropTypes.string).isRequired,
-  ratings: PropTypes.object.isRequired,
+  ratings: PropTypes.arrayOf(PropTypes.object).isRequired,
   certification: PropTypes.string,
   collection: PropTypes.object,
   columns: PropTypes.arrayOf(PropTypes.object).isRequired,

frontend/src/Helpers/Props/inputTypes.js

@@ -13,6 +13,7 @@ export const QUALITY_PROFILE_SELECT = 'qualityProfileSelect';
 export const ROOT_FOLDER_SELECT = 'rootFolderSelect';
 export const INDEXER_FLAGS_SELECT = 'indexerFlagsSelect';
 export const LANGUAGE_SELECT = 'languageSelect';
+export const DOWNLOAD_CLIENT_SELECT = 'downloadClientSelect';
 export const SELECT = 'select';
 export const DYNAMIC_SELECT = 'dynamicSelect';
 export const TAG = 'tag';
@@ -35,6 +36,7 @@ export const all = [
   PASSWORD,
   PATH,
   QUALITY_PROFILE_SELECT,
+  DOWNLOAD_CLIENT_SELECT,
   ROOT_FOLDER_SELECT,
   INDEXER_FLAGS_SELECT,
   LANGUAGE_SELECT,

frontend/src/InteractiveImport/Interactive/InteractiveImportModalContent.js

@@ -19,6 +19,7 @@ import { align, icons, kinds, scrollDirections } from 'Helpers/Props';
 import SelectLanguageModal from 'InteractiveImport/Language/SelectLanguageModal';
 import SelectMovieModal from 'InteractiveImport/Movie/SelectMovieModal';
 import SelectQualityModal from 'InteractiveImport/Quality/SelectQualityModal';
+import SelectReleaseGroupModal from 'InteractiveImport/ReleaseGroup/SelectReleaseGroupModal';
 import getErrorMessage from 'Utilities/Object/getErrorMessage';
 import translate from 'Utilities/String/translate';
 import getSelectedIds from 'Utilities/Table/getSelectedIds';
@@ -40,6 +41,11 @@ const columns = [
     isSortable: true,
     isVisible: true
   },
+  {
+    name: 'releaseGroup',
+    label: translate('ReleaseGroup'),
+    isVisible: true
+  },
   {
     name: 'quality',
     label: translate('Quality'),
@@ -83,6 +89,7 @@ const SELECT = 'select';
 const MOVIE = 'movie';
 const LANGUAGE = 'language';
 const QUALITY = 'quality';
+const RELEASE_GROUP = 'releaseGroup';
 
 class InteractiveImportModalContent extends Component {
 
@@ -202,10 +209,11 @@ class InteractiveImportModalContent extends Component {
     const errorMessage = getErrorMessage(error, translate('UnableToLoadManualImportItems'));
 
     const bulkSelectOptions = [
-      {
-        key: SELECT, value: translate('SelectDotDot'), disabled: true },
+      { key: SELECT, value: translate('SelectDotDot'), disabled: true },
       { key: LANGUAGE, value: translate('SelectLanguage') },
-      { key: QUALITY, value: translate('SelectQuality') }];
+      { key: QUALITY, value: translate('SelectQuality') },
+      { key: RELEASE_GROUP, value: translate('SelectReleaseGroup') }
+    ];
 
     if (allowMovieChange) {
       bulkSelectOptions.splice(1, 0, {
@@ -372,6 +380,13 @@ class InteractiveImportModalContent extends Component {
           real={false}
           onModalClose={this.onSelectModalClose}
         />
+
+        <SelectReleaseGroupModal
+          isOpen={selectModalOpen === RELEASE_GROUP}
+          ids={selectedIds}
+          releaseGroup=""
+          onModalClose={this.onSelectModalClose}
+        />
       </ModalContent>
     );
   }

frontend/src/InteractiveImport/Interactive/InteractiveImportModalContentConnector.js

@@ -110,7 +110,8 @@ class InteractiveImportModalContentConnector extends Component {
         const {
           movie,
           quality,
-          languages
+          languages,
+          releaseGroup
         } = item;
 
         if (!movie) {
@@ -132,6 +133,7 @@ class InteractiveImportModalContentConnector extends Component {
           path: item.path,
           folderName: item.folderName,
           movieId: movie.id,
+          releaseGroup,
           quality,
           languages,
           downloadId: this.props.downloadId

frontend/src/InteractiveImport/Interactive/InteractiveImportRow.js

@@ -11,6 +11,7 @@ import { icons, kinds, tooltipPositions } from 'Helpers/Props';
 import SelectLanguageModal from 'InteractiveImport/Language/SelectLanguageModal';
 import SelectMovieModal from 'InteractiveImport/Movie/SelectMovieModal';
 import SelectQualityModal from 'InteractiveImport/Quality/SelectQualityModal';
+import SelectReleaseGroupModal from 'InteractiveImport/ReleaseGroup/SelectReleaseGroupModal';
 import MovieLanguage from 'Movie/MovieLanguage';
 import MovieQuality from 'Movie/MovieQuality';
 import formatBytes from 'Utilities/Number/formatBytes';
@@ -28,6 +29,7 @@ class InteractiveImportRow extends Component {
 
     this.state = {
       isSelectMovieModalOpen: false,
+      isSelectReleaseGroupModalOpen: false,
       isSelectQualityModalOpen: false,
       isSelectLanguageModalOpen: false
     };
@@ -103,6 +105,10 @@ class InteractiveImportRow extends Component {
     this.setState({ isSelectMovieModalOpen: true });
   }
 
+  onSelectReleaseGroupPress = () => {
+    this.setState({ isSelectReleaseGroupModalOpen: true });
+  }
+
   onSelectQualityPress = () => {
     this.setState({ isSelectQualityModalOpen: true });
   }
@@ -116,6 +122,11 @@ class InteractiveImportRow extends Component {
     this.selectRowAfterChange(changed);
   }
 
+  onSelectReleaseGroupModalClose = (changed) => {
+    this.setState({ isSelectReleaseGroupModalOpen: false });
+    this.selectRowAfterChange(changed);
+  }
+
   onSelectQualityModalClose = (changed) => {
     this.setState({ isSelectQualityModalOpen: false });
     this.selectRowAfterChange(changed);
@@ -137,6 +148,7 @@ class InteractiveImportRow extends Component {
       movie,
       quality,
       languages,
+      releaseGroup,
       size,
       rejections,
       isReprocessing,
@@ -147,7 +159,8 @@ class InteractiveImportRow extends Component {
     const {
       isSelectMovieModalOpen,
       isSelectQualityModalOpen,
-      isSelectLanguageModalOpen
+      isSelectLanguageModalOpen,
+      isSelectReleaseGroupModalOpen
     } = this.state;
 
     const movieTitle = movie ? movie.title + ( movie.year > 0 ? ` (${movie.year})` : '') : '';
@@ -155,6 +168,7 @@ class InteractiveImportRow extends Component {
     const showMoviePlaceholder = isSelected && !movie;
     const showQualityPlaceholder = isSelected && !quality;
     const showLanguagePlaceholder = isSelected && !languages && !isReprocessing;
+    const showReleaseGroupPlaceholder = isSelected && !releaseGroup;
 
     return (
       <TableRow>
@@ -181,6 +195,17 @@ class InteractiveImportRow extends Component {
           }
         </TableRowCellButton>
 
+        <TableRowCellButton
+          title={translate('ClickToChangeReleaseGroup')}
+          onPress={this.onSelectReleaseGroupPress}
+        >
+          {
+            showReleaseGroupPlaceholder ?
+              <InteractiveImportRowCellPlaceholder /> :
+              releaseGroup
+          }
+        </TableRowCellButton>
+
         <TableRowCellButton
           className={styles.quality}
           title={translate('ClickToChangeQuality')}
@@ -268,6 +293,13 @@ class InteractiveImportRow extends Component {
           onModalClose={this.onSelectMovieModalClose}
         />
 
+        <SelectReleaseGroupModal
+          isOpen={isSelectReleaseGroupModalOpen}
+          ids={[id]}
+          releaseGroup={releaseGroup ?? ''}
+          onModalClose={this.onSelectReleaseGroupModalClose}
+        />
+
         <SelectQualityModal
           isOpen={isSelectQualityModalOpen}
           ids={[id]}
@@ -296,6 +328,7 @@ InteractiveImportRow.propTypes = {
   movie: PropTypes.object,
   quality: PropTypes.object,
   languages: PropTypes.arrayOf(PropTypes.object),
+  releaseGroup: PropTypes.string,
   size: PropTypes.number.isRequired,
   rejections: PropTypes.arrayOf(PropTypes.object).isRequired,
   isReprocessing: PropTypes.bool,

frontend/src/InteractiveImport/Language/SelectLanguageModalContent.js

@@ -128,7 +128,7 @@ class SelectLanguageModalContent extends Component {
             kind={kinds.SUCCESS}
             onPress={this.onLanguageSelect}
           >
-            {translate('SelectLanguges')}
+            {translate('SelectLanguages')}
           </Button>
         </ModalFooter>
       </ModalContent>

frontend/src/InteractiveImport/ReleaseGroup/SelectReleaseGroupModal.js

@@ -0,0 +1,37 @@
+import PropTypes from 'prop-types';
+import React, { Component } from 'react';
+import Modal from 'Components/Modal/Modal';
+import SelectReleaseGroupModalContentConnector from './SelectReleaseGroupModalContentConnector';
+
+class SelectReleaseGroupModal extends Component {
+
+  //
+  // Render
+
+  render() {
+    const {
+      isOpen,
+      onModalClose,
+      ...otherProps
+    } = this.props;
+
+    return (
+      <Modal
+        isOpen={isOpen}
+        onModalClose={onModalClose}
+      >
+        <SelectReleaseGroupModalContentConnector
+          {...otherProps}
+          onModalClose={onModalClose}
+        />
+      </Modal>
+    );
+  }
+}
+
+SelectReleaseGroupModal.propTypes = {
+  isOpen: PropTypes.bool.isRequired,
+  onModalClose: PropTypes.func.isRequired
+};
+
+export default SelectReleaseGroupModal;

frontend/src/InteractiveImport/ReleaseGroup/SelectReleaseGroupModalContent.js

@@ -0,0 +1,99 @@
+import PropTypes from 'prop-types';
+import React, { Component } from 'react';
+import Form from 'Components/Form/Form';
+import FormGroup from 'Components/Form/FormGroup';
+import FormInputGroup from 'Components/Form/FormInputGroup';
+import FormLabel from 'Components/Form/FormLabel';
+import Button from 'Components/Link/Button';
+import 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';
+
+class SelectReleaseGroupModalContent extends Component {
+
+  //
+  // Lifecycle
+
+  constructor(props, context) {
+    super(props, context);
+
+    const {
+      releaseGroup
+    } = props;
+
+    this.state = {
+      releaseGroup
+    };
+  }
+
+  //
+  // Listeners
+
+  onReleaseGroupChange = ({ value }) => {
+    this.setState({ releaseGroup: value });
+  }
+
+  onReleaseGroupSelect = () => {
+    this.props.onReleaseGroupSelect(this.state);
+  }
+
+  //
+  // Render
+
+  render() {
+    const {
+      onModalClose
+    } = this.props;
+
+    const {
+      releaseGroup
+    } = this.state;
+
+    return (
+      <ModalContent onModalClose={onModalClose}>
+        <ModalHeader>
+          {translate('ManualImportSetReleaseGroup')}
+        </ModalHeader>
+
+        <ModalBody>
+          <Form>
+            <FormGroup>
+              <FormLabel>{translate('ReleaseGroup')}</FormLabel>
+
+              <FormInputGroup
+                type={inputTypes.TEXT}
+                name="releaseGroup"
+                value={releaseGroup}
+                onChange={this.onReleaseGroupChange}
+              />
+            </FormGroup>
+          </Form>
+        </ModalBody>
+
+        <ModalFooter>
+          <Button onPress={onModalClose}>
+            {translate('Cancel')}
+          </Button>
+
+          <Button
+            kind={kinds.SUCCESS}
+            onPress={this.onReleaseGroupSelect}
+          >
+            {translate('SetReleaseGroup')}
+          </Button>
+        </ModalFooter>
+      </ModalContent>
+    );
+  }
+}
+
+SelectReleaseGroupModalContent.propTypes = {
+  releaseGroup: PropTypes.string.isRequired,
+  onReleaseGroupSelect: PropTypes.func.isRequired,
+  onModalClose: PropTypes.func.isRequired
+};
+
+export default SelectReleaseGroupModalContent;

frontend/src/InteractiveImport/ReleaseGroup/SelectReleaseGroupModalContentConnector.js

@@ -0,0 +1,54 @@
+import PropTypes from 'prop-types';
+import React, { Component } from 'react';
+import { connect } from 'react-redux';
+import { reprocessInteractiveImportItems, updateInteractiveImportItems } from 'Store/Actions/interactiveImportActions';
+import SelectReleaseGroupModalContent from './SelectReleaseGroupModalContent';
+
+const mapDispatchToProps = {
+  dispatchUpdateInteractiveImportItems: updateInteractiveImportItems,
+  dispatchReprocessInteractiveImportItems: reprocessInteractiveImportItems
+};
+
+class SelectReleaseGroupModalContentConnector extends Component {
+
+  //
+  // Listeners
+
+  onReleaseGroupSelect = ({ releaseGroup }) => {
+    const {
+      ids,
+      dispatchUpdateInteractiveImportItems,
+      dispatchReprocessInteractiveImportItems
+    } = this.props;
+
+    dispatchUpdateInteractiveImportItems({
+      ids,
+      releaseGroup
+    });
+
+    dispatchReprocessInteractiveImportItems({ ids });
+
+    this.props.onModalClose(true);
+  }
+
+  //
+  // Render
+
+  render() {
+    return (
+      <SelectReleaseGroupModalContent
+        {...this.props}
+        onReleaseGroupSelect={this.onReleaseGroupSelect}
+      />
+    );
+  }
+}
+
+SelectReleaseGroupModalContentConnector.propTypes = {
+  ids: PropTypes.arrayOf(PropTypes.number).isRequired,
+  dispatchUpdateInteractiveImportItems: PropTypes.func.isRequired,
+  dispatchReprocessInteractiveImportItems: PropTypes.func.isRequired,
+  onModalClose: PropTypes.func.isRequired
+};
+
+export default connect(null, mapDispatchToProps)(SelectReleaseGroupModalContentConnector);

frontend/src/Movie/Delete/DeleteMovieModalContent.js

@@ -155,7 +155,7 @@ DeleteMovieModalContent.propTypes = {
   title: PropTypes.string.isRequired,
   path: PropTypes.string.isRequired,
   hasFile: PropTypes.bool.isRequired,
-  sizeOnDisk: PropTypes.string.isRequired,
+  sizeOnDisk: PropTypes.number.isRequired,
   onDeletePress: PropTypes.func.isRequired,
   onModalClose: PropTypes.func.isRequired
 };

frontend/src/Movie/Details/MovieDetails.css

@@ -5,7 +5,7 @@
 .header {
   position: relative;
   width: 100%;
-  height: 350px;
+  height: 375px;
 }
 
 .errorMessage {
@@ -41,8 +41,8 @@
 .poster {
   flex-shrink: 0;
   margin-right: 35px;
-  width: 200px;
-  height: 294px;
+  width: 217px;
+  height: 319px;
 }
 
 .info {

frontend/src/Movie/Details/MovieDetails.js

@@ -3,8 +3,8 @@ import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import { Tab, TabList, TabPanel, Tabs } from 'react-tabs';
 import TextTruncate from 'react-text-truncate';
-import HeartRating from 'Components/HeartRating';
 import Icon from 'Components/Icon';
+import ImdbRating from 'Components/ImdbRating';
 import InfoLabel from 'Components/InfoLabel';
 import IconButton from 'Components/Link/IconButton';
 import Marquee from 'Components/Marquee';
@@ -16,6 +16,8 @@ import PageToolbar from 'Components/Page/Toolbar/PageToolbar';
 import PageToolbarButton from 'Components/Page/Toolbar/PageToolbarButton';
 import PageToolbarSection from 'Components/Page/Toolbar/PageToolbarSection';
 import PageToolbarSeparator from 'Components/Page/Toolbar/PageToolbarSeparator';
+import RottenTomatoRating from 'Components/RottenTomatoRating';
+import TmdbRating from 'Components/TmdbRating';
 import Popover from 'Components/Tooltip/Popover';
 import Tooltip from 'Components/Tooltip/Tooltip';
 import { icons, kinds, sizes, tooltipPositions } from 'Helpers/Props';
@@ -449,17 +451,6 @@ class MovieDetails extends Component {
                         </span>
                     }
 
-                    {
-                      !!ratings &&
-                        <span className={styles.rating}>
-                          <HeartRating
-                            rating={ratings.value}
-                            iconSize={20}
-                            hideHeart={isSmallScreen}
-                          />
-                        </span>
-                    }
-
                     {
                       <span className={styles.links}>
                         <Tooltip
@@ -501,6 +492,36 @@ class MovieDetails extends Component {
                   </div>
                 </div>
 
+                <div className={styles.details}>
+                  {
+                    !!ratings.tmdb &&
+                      <span className={styles.rating}>
+                        <TmdbRating
+                          ratings={ratings}
+                          iconSize={20}
+                        />
+                      </span>
+                  }
+                  {
+                    !!ratings.imdb &&
+                      <span className={styles.rating}>
+                        <ImdbRating
+                          ratings={ratings}
+                          iconSize={20}
+                        />
+                      </span>
+                  }
+                  {
+                    !!ratings.rottenTomatoes &&
+                      <span className={styles.rating}>
+                        <RottenTomatoRating
+                          ratings={ratings}
+                          iconSize={20}
+                        />
+                      </span>
+                  }
+                </div>
+
                 <div className={styles.detailsLabels}>
                   <InfoLabel
                     className={styles.detailsInfoLabel}

frontend/src/Movie/History/MovieHistoryRow.js

@@ -67,8 +67,7 @@ class MovieHistoryRow extends Component {
       data,
       isMarkingAsFailed,
       shortDateFormat,
-      timeFormat,
-      onMarkAsFailedPress
+      timeFormat
     } = this.props;
 
     const {
@@ -143,7 +142,7 @@ class MovieHistoryRow extends Component {
           isMarkingAsFailed={isMarkingAsFailed}
           shortDateFormat={shortDateFormat}
           timeFormat={timeFormat}
-          onMarkAsFailedPress={onMarkAsFailedPress}
+          onMarkAsFailedPress={this.onMarkAsFailedPress}
           onModalClose={this.onDetailsModalClose}
         />
       </TableRow>

frontend/src/Movie/Index/Menus/MovieIndexSortMenu.js

@@ -101,6 +101,15 @@ function MovieIndexSortMenu(props) {
           {translate('DigitalRelease')}
         </SortMenuItem>
 
+        <SortMenuItem
+          name="ratings"
+          sortKey={sortKey}
+          sortDirection={sortDirection}
+          onPress={onSortSelect}
+        >
+          {translate('Ratings')}
+        </SortMenuItem>
+
         <SortMenuItem
           name="path"
           sortKey={sortKey}

frontend/src/Movie/Index/Table/MovieIndexRow.js

@@ -332,7 +332,7 @@ class MovieIndexRow extends Component {
                   className={styles[name]}
                 >
                   <HeartRating
-                    rating={ratings.value}
+                    ratings={ratings}
                   />
                 </VirtualTableRowCell>
               );

frontend/src/Movie/MovieStatus.js

@@ -6,7 +6,7 @@ export function getMovieStatusDetails(status) {
   let statusDetails = {
     icon: icons.ANNOUNCED,
     title: translate('Announced'),
-    message: translate('AnnoucedMsg')
+    message: translate('AnnouncedMsg')
   };
 
   if (status === 'deleted') {

frontend/src/Settings/CustomFormats/CustomFormats/EditCustomFormatModalContent.css

@@ -4,6 +4,11 @@
   margin-right: auto;
 }
 
+.rightButtons {
+  justify-content: flex-end;
+  margin-right: auto;
+}
+
 .addSpecification {
   composes: customFormat from '~./CustomFormat.css';
 

frontend/src/Settings/CustomFormats/CustomFormats/EditCustomFormatModalContent.js

@@ -198,26 +198,25 @@ class EditCustomFormatModalContent extends Component {
           </div>
         </ModalBody>
         <ModalFooter>
-          {
-            id &&
-              <Button
-                className={styles.deleteButton}
-                kind={kinds.DANGER}
-                onPress={onDeleteCustomFormatPress}
-              >
-                {translate('Delete')}
-              </Button>
-          }
+          <div className={styles.rightButtons}>
+            {
+              id &&
+                <Button
+                  className={styles.deleteButton}
+                  kind={kinds.DANGER}
+                  onPress={onDeleteCustomFormatPress}
+                >
+                  {translate('Delete')}
+                </Button>
+            }
 
-          {
-            !id &&
-              <Button
-                className={styles.deleteButton}
-                onPress={this.onImportPress}
-              >
-                {translate('Import')}
-              </Button>
-          }
+            <Button
+              className={styles.deleteButton}
+              onPress={this.onImportPress}
+            >
+              {translate('Import')}
+            </Button>
+          </div>
 
           <Button
             onPress={onModalClose}

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

@@ -1,6 +1,7 @@
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import Alert from 'Components/Alert';
+import FieldSet from 'Components/FieldSet';
 import Form from 'Components/Form/Form';
 import FormGroup from 'Components/Form/FormGroup';
 import FormInputGroup from 'Components/Form/FormInputGroup';
@@ -13,7 +14,7 @@ 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 { inputTypes, kinds, sizes } from 'Helpers/Props';
 import translate from 'Utilities/String/translate';
 import styles from './EditDownloadClientModalContent.css';
 
@@ -45,7 +46,10 @@ class EditDownloadClientModalContent extends Component {
       implementationName,
       name,
       enable,
+      protocol,
       priority,
+      removeCompletedDownloads,
+      removeFailedDownloads,
       fields,
       message
     } = item;
@@ -136,6 +140,38 @@ class EditDownloadClientModalContent extends Component {
                   />
                 </FormGroup>
 
+                <FieldSet
+                  size={sizes.SMALL}
+                  legend={translate('CompletedDownloadHandling')}
+                >
+                  <FormGroup>
+                    <FormLabel>{translate('RemoveCompleted')}</FormLabel>
+
+                    <FormInputGroup
+                      type={inputTypes.CHECK}
+                      name="removeCompletedDownloads"
+                      helpText={translate('RemoveCompletedDownloadsHelpText')}
+                      {...removeCompletedDownloads}
+                      onChange={onInputChange}
+                    />
+                  </FormGroup>
+
+                  {
+                    protocol.value !== 'torrent' &&
+                      <FormGroup>
+                        <FormLabel>{translate('RemoveFailed')}</FormLabel>
+
+                        <FormInputGroup
+                          type={inputTypes.CHECK}
+                          name="removeFailedDownloads"
+                          helpText={translate('RemoveFailedDownloadsHelpText')}
+                          {...removeFailedDownloads}
+                          onChange={onInputChange}
+                        />
+                      </FormGroup>
+                  }
+                </FieldSet>
+
               </Form>
           }
         </ModalBody>

frontend/src/Settings/DownloadClients/Options/DownloadClientOptions.js

@@ -1,12 +1,13 @@
 import PropTypes from 'prop-types';
 import React from 'react';
+import Alert from 'Components/Alert';
 import FieldSet from 'Components/FieldSet';
 import Form from 'Components/Form/Form';
 import FormGroup from 'Components/Form/FormGroup';
 import FormInputGroup from 'Components/Form/FormInputGroup';
 import FormLabel from 'Components/Form/FormLabel';
 import LoadingIndicator from 'Components/Loading/LoadingIndicator';
-import { inputTypes, sizes } from 'Helpers/Props';
+import { inputTypes, kinds, sizes } from 'Helpers/Props';
 import translate from 'Utilities/String/translate';
 
 function DownloadClientOptions(props) {
@@ -34,11 +35,15 @@ function DownloadClientOptions(props) {
       }
 
       {
-        hasSettings && !isFetching && !error &&
+        hasSettings && !isFetching && !error && advancedSettings &&
           <div>
             <FieldSet legend={translate('CompletedDownloadHandling')}>
               <Form>
-                <FormGroup size={sizes.MEDIUM}>
+                <FormGroup
+                  advancedSettings={advancedSettings}
+                  isAdvanced={true}
+                  size={sizes.MEDIUM}
+                >
                   <FormLabel>{translate('Enable')}</FormLabel>
 
                   <FormInputGroup
@@ -50,22 +55,6 @@ function DownloadClientOptions(props) {
                   />
                 </FormGroup>
 
-                <FormGroup
-                  advancedSettings={advancedSettings}
-                  isAdvanced={true}
-                  size={sizes.MEDIUM}
-                >
-                  <FormLabel>{translate('Remove')}</FormLabel>
-
-                  <FormInputGroup
-                    type={inputTypes.CHECK}
-                    name="removeCompletedDownloads"
-                    helpText={translate('RemoveCompletedDownloadsHelpText')}
-                    onChange={onInputChange}
-                    {...settings.removeCompletedDownloads}
-                  />
-                </FormGroup>
-
                 <FormGroup
                   advancedSettings={advancedSettings}
                   isAdvanced={true}
@@ -102,23 +91,10 @@ function DownloadClientOptions(props) {
                     {...settings.autoRedownloadFailed}
                   />
                 </FormGroup>
-
-                <FormGroup
-                  advancedSettings={advancedSettings}
-                  isAdvanced={true}
-                  size={sizes.MEDIUM}
-                >
-                  <FormLabel>{translate('Remove')}</FormLabel>
-
-                  <FormInputGroup
-                    type={inputTypes.CHECK}
-                    name="removeFailedDownloads"
-                    helpText={translate('RemoveFailedDownloadsHelpText')}
-                    onChange={onInputChange}
-                    {...settings.removeFailedDownloads}
-                  />
-                </FormGroup>
               </Form>
+              <Alert kind={kinds.INFO}>
+                {translate('RemoveDownloadsAlert')}
+              </Alert>
             </FieldSet>
           </div>
       }

frontend/src/Settings/DownloadClients/RemotePathMappings/RemotePathMappings.js

@@ -51,9 +51,15 @@ class RemotePathMappings extends Component {
           {...otherProps}
         >
           <div className={styles.remotePathMappingsHeader}>
-            <div className={styles.host}>Host</div>
-            <div className={styles.path}>Remote Path</div>
-            <div className={styles.path}>Local Path</div>
+            <div className={styles.host}>
+              {translate('Host')}
+            </div>
+            <div className={styles.path}>
+              {translate('RemotePath')}
+            </div>
+            <div className={styles.path}>
+              {translate('LocalPath')}
+            </div>
           </div>
 
           <div>

frontend/src/Settings/ImportLists/ImportListExclusions/EditImportListExclusionModal.js

@@ -2,16 +2,16 @@ import PropTypes from 'prop-types';
 import React from 'react';
 import Modal from 'Components/Modal/Modal';
 import { sizes } from 'Helpers/Props';
-import EditImportExclusionModalContentConnector from './EditImportExclusionModalContentConnector';
+import EditImportListExclusionModalContentConnector from './EditImportListExclusionModalContentConnector';
 
-function EditImportExclusionModal({ isOpen, onModalClose, ...otherProps }) {
+function EditImportListExclusionModal({ isOpen, onModalClose, ...otherProps }) {
   return (
     <Modal
       size={sizes.MEDIUM}
       isOpen={isOpen}
       onModalClose={onModalClose}
     >
-      <EditImportExclusionModalContentConnector
+      <EditImportListExclusionModalContentConnector
         {...otherProps}
         onModalClose={onModalClose}
       />
@@ -19,9 +19,9 @@ function EditImportExclusionModal({ isOpen, onModalClose, ...otherProps }) {
   );
 }
 
-EditImportExclusionModal.propTypes = {
+EditImportListExclusionModal.propTypes = {
   isOpen: PropTypes.bool.isRequired,
   onModalClose: PropTypes.func.isRequired
 };
 
-export default EditImportExclusionModal;
+export default EditImportListExclusionModal;

frontend/src/Settings/ImportLists/ImportListExclusions/EditImportListExclusionModalConnector.js

@@ -2,7 +2,7 @@ import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import { connect } from 'react-redux';
 import { clearPendingChanges } from 'Store/Actions/baseActions';
-import EditImportExclusionModal from './EditImportExclusionModal';
+import EditImportListExclusionModal from './EditImportListExclusionModal';
 
 function mapStateToProps() {
   return {};
@@ -12,7 +12,7 @@ const mapDispatchToProps = {
   clearPendingChanges
 };
 
-class EditImportExclusionModalConnector extends Component {
+class EditImportListExclusionModalConnector extends Component {
 
   //
   // Listeners
@@ -27,7 +27,7 @@ class EditImportExclusionModalConnector extends Component {
 
   render() {
     return (
-      <EditImportExclusionModal
+      <EditImportListExclusionModal
         {...this.props}
         onModalClose={this.onModalClose}
       />
@@ -35,9 +35,9 @@ class EditImportExclusionModalConnector extends Component {
   }
 }
 
-EditImportExclusionModalConnector.propTypes = {
+EditImportListExclusionModalConnector.propTypes = {
   onModalClose: PropTypes.func.isRequired,
   clearPendingChanges: PropTypes.func.isRequired
 };
 
-export default connect(mapStateToProps, mapDispatchToProps)(EditImportExclusionModalConnector);
+export default connect(mapStateToProps, mapDispatchToProps)(EditImportListExclusionModalConnector);

frontend/src/Settings/ImportLists/ImportListExclusions/EditImportListExclusionModalContent.js

@@ -13,9 +13,9 @@ 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 './EditImportExclusionModalContent.css';
+import styles from './EditImportListExclusionModalContent.css';
 
-function EditImportExclusionModalContent(props) {
+function EditImportListExclusionModalContent(props) {
   const {
     id,
     isFetching,
@@ -130,7 +130,7 @@ function EditImportExclusionModalContent(props) {
   );
 }
 
-EditImportExclusionModalContent.propTypes = {
+EditImportListExclusionModalContent.propTypes = {
   id: PropTypes.number,
   isFetching: PropTypes.bool.isRequired,
   error: PropTypes.object,
@@ -143,4 +143,4 @@ EditImportExclusionModalContent.propTypes = {
   onDeleteImportExclusionPress: PropTypes.func
 };
 
-export default EditImportExclusionModalContent;
+export default EditImportListExclusionModalContent;

frontend/src/Settings/ImportLists/ImportListExclusions/EditImportListExclusionModalContentConnector.js

@@ -5,7 +5,7 @@ import { connect } from 'react-redux';
 import { createSelector } from 'reselect';
 import { saveImportExclusion, setImportExclusionValue } from 'Store/Actions/settingsActions';
 import selectSettings from 'Store/Selectors/selectSettings';
-import EditImportExclusionModalContent from './EditImportExclusionModalContent';
+import EditImportListExclusionModalContent from './EditImportListExclusionModalContent';
 
 const newImportExclusion = {
   movieTitle: '',
@@ -97,7 +97,7 @@ class EditImportExclusionModalContentConnector extends Component {
 
   render() {
     return (
-      <EditImportExclusionModalContent
+      <EditImportListExclusionModalContent
         {...this.props}
         onSavePress={this.onSavePress}
         onInputChange={this.onInputChange}

frontend/src/Settings/ImportLists/ImportListExclusions/ImportListExclusion.css

@@ -8,12 +8,14 @@
 }
 
 .movieTitle {
-  flex: 0 0 400px;
+  @add-mixin truncate;
+
+  flex: 0 0 600px;
 }
 
 .tmdbId,
 .movieYear {
-  flex: 0 0 200px;
+  flex: 0 0 70px;
 }
 
 .actions {

frontend/src/Settings/ImportLists/ImportListExclusions/ImportListExclusion.js

@@ -6,10 +6,10 @@ import Link from 'Components/Link/Link';
 import ConfirmModal from 'Components/Modal/ConfirmModal';
 import { icons, kinds } from 'Helpers/Props';
 import translate from 'Utilities/String/translate';
-import EditImportExclusionModalConnector from './EditImportExclusionModalConnector';
-import styles from './ImportExclusion.css';
+import EditImportListExclusionModalConnector from './EditImportListExclusionModalConnector';
+import styles from './ImportListExclusion.css';
 
-class ImportExclusion extends Component {
+class ImportListExclusion extends Component {
 
   //
   // Lifecycle
@@ -78,7 +78,7 @@ class ImportExclusion extends Component {
           </Link>
         </div>
 
-        <EditImportExclusionModalConnector
+        <EditImportListExclusionModalConnector
           id={id}
           isOpen={this.state.isEditImportExclusionModalOpen}
           onModalClose={this.onEditImportExclusionModalClose}
@@ -99,7 +99,7 @@ class ImportExclusion extends Component {
   }
 }
 
-ImportExclusion.propTypes = {
+ImportListExclusion.propTypes = {
   id: PropTypes.number.isRequired,
   movieTitle: PropTypes.string.isRequired,
   tmdbId: PropTypes.number.isRequired,
@@ -107,9 +107,9 @@ ImportExclusion.propTypes = {
   onConfirmDeleteImportExclusion: PropTypes.func.isRequired
 };
 
-ImportExclusion.defaultProps = {
+ImportListExclusion.defaultProps = {
   // The drag preview will not connect the drag handle.
   connectDragSource: (node) => node
 };
 
-export default ImportExclusion;
+export default ImportListExclusion;

frontend/src/Settings/ImportLists/ImportListExclusions/ImportListExclusions.css

@@ -1,16 +1,16 @@
-.importExclusionsHeader {
+.importListExclusionsHeader {
   display: flex;
   margin-bottom: 10px;
   font-weight: bold;
 }
 
 .title {
-  flex: 0 0 400px;
+  flex: 0 0 600px;
 }
 
 .tmdbId,
 .movieYear {
-  flex: 0 0 200px;
+  flex: 0 0 70px;
 }
 
 .addImportExclusion {

frontend/src/Settings/ImportLists/ImportListExclusions/ImportListExclusions.js

@@ -6,11 +6,11 @@ import Link from 'Components/Link/Link';
 import PageSectionContent from 'Components/Page/PageSectionContent';
 import { icons } from 'Helpers/Props';
 import translate from 'Utilities/String/translate';
-import EditImportExclusionModalConnector from './EditImportExclusionModalConnector';
-import ImportExclusion from './ImportExclusion';
-import styles from './ImportExclusions.css';
+import EditImportListExclusionModalConnector from './EditImportListExclusionModalConnector';
+import ImportListExclusion from './ImportListExclusion';
+import styles from './ImportListExclusions.css';
 
-class ImportExclusions extends Component {
+class ImportListExclusions extends Component {
 
   //
   // Lifecycle
@@ -50,17 +50,23 @@ class ImportExclusions extends Component {
           errorMessage={translate('UnableToLoadListExclusions')}
           {...otherProps}
         >
-          <div className={styles.importExclusionsHeader}>
-            <div className={styles.tmdbId}>TMDB Id</div>
-            <div className={styles.title}>Title</div>
-            <div className={styles.movieYear}>Year</div>
+          <div className={styles.importListExclusionsHeader}>
+            <div className={styles.tmdbId}>
+              TMDb Id
+            </div>
+            <div className={styles.title}>
+              {translate('Title')}
+            </div>
+            <div className={styles.movieYear}>
+              {translate('Year')}
+            </div>
           </div>
 
           <div>
             {
               items.map((item, index) => {
                 return (
-                  <ImportExclusion
+                  <ImportListExclusion
                     key={item.id}
                     {...item}
                     {...otherProps}
@@ -81,7 +87,7 @@ class ImportExclusions extends Component {
             </Link>
           </div>
 
-          <EditImportExclusionModalConnector
+          <EditImportListExclusionModalConnector
             isOpen={this.state.isAddImportExclusionModalOpen}
             onModalClose={this.onModalClose}
           />
@@ -92,11 +98,11 @@ class ImportExclusions extends Component {
   }
 }
 
-ImportExclusions.propTypes = {
+ImportListExclusions.propTypes = {
   isFetching: PropTypes.bool.isRequired,
   error: PropTypes.object,
   items: PropTypes.arrayOf(PropTypes.object).isRequired,
   onConfirmDeleteImportExclusion: PropTypes.func.isRequired
 };
 
-export default ImportExclusions;
+export default ImportListExclusions;

frontend/src/Settings/ImportLists/ImportListExclusions/ImportListExclusionsConnector.js

@@ -3,7 +3,7 @@ import React, { Component } from 'react';
 import { connect } from 'react-redux';
 import { createSelector } from 'reselect';
 import { deleteImportExclusion, fetchImportExclusions } from 'Store/Actions/settingsActions';
-import ImportExclusions from './ImportExclusions';
+import ImportListExclusions from './ImportListExclusions';
 
 function createMapStateToProps() {
   return createSelector(
@@ -42,7 +42,7 @@ class ImportExclusionsConnector extends Component {
 
   render() {
     return (
-      <ImportExclusions
+      <ImportListExclusions
         {...this.state}
         {...this.props}
         onConfirmDeleteImportExclusion={this.onConfirmDeleteImportExclusion}

frontend/src/Settings/ImportLists/ImportListSettings.js

@@ -7,7 +7,7 @@ import PageToolbarSeparator from 'Components/Page/Toolbar/PageToolbarSeparator';
 import { icons } from 'Helpers/Props';
 import SettingsToolbarConnector from 'Settings/SettingsToolbarConnector';
 import translate from 'Utilities/String/translate';
-import ImportExclusionsConnector from './ImportExclusions/ImportExclusionsConnector';
+import ImportListExclusionsConnector from './ImportListExclusions/ImportListExclusionsConnector';
 import ImportListsConnector from './ImportLists/ImportListsConnector';
 import ImportListOptionsConnector from './Options/ImportListOptionsConnector';
 
@@ -86,7 +86,7 @@ class ImportListSettings extends Component {
             onChildStateChange={this.onChildStateChange}
           />
 
-          <ImportExclusionsConnector />
+          <ImportListExclusionsConnector />
 
         </PageContentBody>
       </PageContent>

frontend/src/Settings/Indexers/Indexers/EditIndexerModalContent.js

@@ -45,7 +45,9 @@ function EditIndexerModalContent(props) {
     supportsSearch,
     tags,
     fields,
-    priority
+    priority,
+    protocol,
+    downloadClientId
   } = item;
 
   return (
@@ -154,8 +156,25 @@ function EditIndexerModalContent(props) {
                 />
               </FormGroup>
 
+              <FormGroup
+                advancedSettings={advancedSettings}
+                isAdvanced={true}
+              >
+                <FormLabel>{translate('DownloadClient')}</FormLabel>
+
+                <FormInputGroup
+                  type={inputTypes.DOWNLOAD_CLIENT_SELECT}
+                  name="downloadClientId"
+                  helpText={translate('IndexerDownloadClientHelpText')}
+                  {...downloadClientId}
+                  includeAny={true}
+                  protocol={protocol.value}
+                  onChange={onInputChange}
+                />
+              </FormGroup>
+
               <FormGroup>
-                <FormLabel>Tags</FormLabel>
+                <FormLabel>{translate('Tags')}</FormLabel>
 
                 <FormInputGroup
                   type={inputTypes.TAG}

frontend/src/Settings/Indexers/Options/IndexerOptions.js

@@ -85,7 +85,7 @@ function IndexerOptions(props) {
                 type={inputTypes.CHECK}
                 name="preferIndexerFlags"
                 helpText={translate('PreferIndexerFlagsHelpText')}
-                helpLink="https://wiki.servarr.com/Definitions#Indexer_Flags"
+                helpLink="https://wiki.servarr.com/radarr/settings#indexer-flags"
                 onChange={onInputChange}
                 {...settings.preferIndexerFlags}
               />

frontend/src/Settings/MediaManagement/Naming/NamingModal.js

@@ -147,7 +147,8 @@ class NamingModal extends Component {
 
       { token: '{MediaInfo VideoCodec}', example: 'x264' },
       { token: '{MediaInfo VideoBitDepth}', example: '10' },
-      { token: '{MediaInfo VideoDynamicRange}', example: 'HDR' }
+      { token: '{MediaInfo VideoDynamicRange}', example: 'HDR' },
+      { token: '{MediaInfo VideoDynamicRangeType}', example: 'DV HDR10' }
     ];
 
     const releaseGroupTokens = [

frontend/src/Settings/Notifications/Notifications/Notification.js

@@ -63,6 +63,7 @@ class Notification extends Component {
       onMovieFileDelete,
       onMovieFileDeleteForUpgrade,
       onHealthIssue,
+      onApplicationUpdate,
       supportsOnGrab,
       supportsOnDownload,
       supportsOnUpgrade,
@@ -70,7 +71,8 @@ class Notification extends Component {
       supportsOnMovieDelete,
       supportsOnMovieFileDelete,
       supportsOnMovieFileDeleteForUpgrade,
-      supportsOnHealthIssue
+      supportsOnHealthIssue,
+      supportsOnApplicationUpdate
     } = this.props;
 
     return (
@@ -123,6 +125,14 @@ class Notification extends Component {
             null
         }
 
+        {
+          supportsOnApplicationUpdate && onApplicationUpdate ?
+            <Label kind={kinds.SUCCESS}>
+              {translate('OnApplicationUpdate')}
+            </Label> :
+            null
+        }
+
         {
           supportsOnMovieDelete && onMovieDelete ?
             <Label kind={kinds.SUCCESS}>
@@ -148,7 +158,7 @@ class Notification extends Component {
         }
 
         {
-          !onGrab && !onDownload && !onRename && !onHealthIssue && !onMovieDelete && !onMovieFileDelete ?
+          !onGrab && !onDownload && !onRename && !onHealthIssue && !onApplicationUpdate && !onMovieDelete && !onMovieFileDelete ?
             <Label
               kind={kinds.DISABLED}
               outline={true}
@@ -190,6 +200,7 @@ Notification.propTypes = {
   onMovieFileDelete: PropTypes.bool.isRequired,
   onMovieFileDeleteForUpgrade: PropTypes.bool.isRequired,
   onHealthIssue: PropTypes.bool.isRequired,
+  onApplicationUpdate: PropTypes.bool.isRequired,
   supportsOnGrab: PropTypes.bool.isRequired,
   supportsOnDownload: PropTypes.bool.isRequired,
   supportsOnMovieDelete: PropTypes.bool.isRequired,
@@ -198,6 +209,7 @@ Notification.propTypes = {
   supportsOnUpgrade: PropTypes.bool.isRequired,
   supportsOnRename: PropTypes.bool.isRequired,
   supportsOnHealthIssue: PropTypes.bool.isRequired,
+  supportsOnApplicationUpdate: PropTypes.bool.isRequired,
   onConfirmDeleteNotification: PropTypes.func.isRequired
 };
 

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

@@ -23,6 +23,7 @@ function NotificationEventItems(props) {
     onMovieFileDelete,
     onMovieFileDeleteForUpgrade,
     onHealthIssue,
+    onApplicationUpdate,
     supportsOnGrab,
     supportsOnDownload,
     supportsOnUpgrade,
@@ -30,6 +31,7 @@ function NotificationEventItems(props) {
     supportsOnMovieDelete,
     supportsOnMovieFileDelete,
     supportsOnMovieFileDeleteForUpgrade,
+    supportsOnApplicationUpdate,
     supportsOnHealthIssue,
     includeHealthWarnings
   } = item;
@@ -150,6 +152,17 @@ function NotificationEventItems(props) {
                 />
               </div>
           }
+
+          <div>
+            <FormInputGroup
+              type={inputTypes.CHECK}
+              name="onApplicationUpdate"
+              helpText={translate('OnApplicationUpdateHelpText')}
+              isDisabled={!supportsOnApplicationUpdate.value}
+              {...onApplicationUpdate}
+              onChange={onInputChange}
+            />
+          </div>
         </div>
       </div>
     </FormGroup>

frontend/src/Settings/Profiles/Delay/DelayProfiles.js

@@ -82,10 +82,18 @@ class DelayProfiles extends Component {
             >
               <div>
                 <div className={styles.delayProfilesHeader}>
-                  <div className={styles.column}>Protocol</div>
-                  <div className={styles.column}>Usenet Delay</div>
-                  <div className={styles.column}>Torrent Delay</div>
-                  <div className={styles.tags}>Tags</div>
+                  <div className={styles.column}>
+                    {translate('Protocol')}
+                  </div>
+                  <div className={styles.column}>
+                    {translate('UsenetDelay')}
+                  </div>
+                  <div className={styles.column}>
+                    {translate('TorrentDelay')}
+                  </div>
+                  <div className={styles.tags}>
+                    {translate('Tags')}
+                  </div>
                 </div>
 
                 <div className={styles.delayProfiles}>

frontend/src/Settings/Quality/Definition/QualityDefinitions.js

@@ -25,9 +25,15 @@ class QualityDefinitions extends Component {
           {...otherProps}
         >
           <div className={styles.header}>
-            <div className={styles.quality}>Quality</div>
-            <div className={styles.title}>Title</div>
-            <div className={styles.sizeLimit}>Size Limit</div>
+            <div className={styles.quality}>
+              {translate('Quality')}
+            </div>
+            <div className={styles.title}>
+              {translate('Title')}
+            </div>
+            <div className={styles.sizeLimit}>
+              {translate('SizeLimit')}
+            </div>
 
             {
               advancedSettings ?

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

@@ -152,7 +152,7 @@ function TagDetailsModalContent(props) {
 
         {
           indexers.length ?
-            <FieldSet legend="Indexers">
+            <FieldSet legend={translate('Indexers')}>
               {
                 indexers.map((item) => {
                   return (

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

@@ -109,6 +109,7 @@ export default {
         selectedSchema.onMovieDelete = selectedSchema.supportsOnMovieDelete;
         selectedSchema.onMovieFileDelete = selectedSchema.supportsOnMovieFileDelete;
         selectedSchema.onMovieFileDeleteForUpgrade = selectedSchema.supportsOnMovieFileDeleteForUpgrade;
+        selectedSchema.onApplicationUpdate = selectedSchema.supportsOnApplicationUpdate;
 
         return selectedSchema;
       });

frontend/src/Store/Actions/discoverMovieActions.js

@@ -200,7 +200,7 @@ export const defaultState = {
     ratings: function(item) {
       const { ratings = {} } = item;
 
-      return ratings.value;
+      return ratings.tmdb? ratings.tmdb.value : 0;
     }
   },
 
@@ -330,8 +330,23 @@ export const defaultState = {
       valueType: filterBuilderValueTypes.MINIMUM_AVAILABILITY
     },
     {
-      name: 'ratings',
-      label: 'Rating',
+      name: 'tmdbRating',
+      label: translate('TmdbRating'),
+      type: filterBuilderTypes.NUMBER
+    },
+    {
+      name: 'tmdbVotes',
+      label: translate('TmdbVotes'),
+      type: filterBuilderTypes.NUMBER
+    },
+    {
+      name: 'imdbRating',
+      label: translate('ImdbRating'),
+      type: filterBuilderTypes.NUMBER
+    },
+    {
+      name: 'imdbVotes',
+      label: translate('ImdbVotes'),
       type: filterBuilderTypes.NUMBER
     },
     {
@@ -600,6 +615,7 @@ export const actionHandlers = handleThunks({
     const promise = createAjaxRequest({
       url: '/exclusions/bulk',
       method: 'POST',
+      contentType: 'application/json',
       data: JSON.stringify(exclusions)
     }).request;
 

frontend/src/Store/Actions/interactiveImportActions.js

@@ -148,9 +148,10 @@ export const actionHandlers = handleThunks({
       return {
         id,
         path: item.path,
-        movieId: item.movie.id,
+        movieId: item.movie ? item.movie.id : undefined,
         quality: item.quality,
         languages: item.languages,
+        releaseGroup: item.releaseGroup,
         downloadId: item.downloadId
       };
     });

frontend/src/Store/Actions/movieActions.js

@@ -131,10 +131,38 @@ export const filterPredicates = {
     return dateFilterPredicate(item.digitalRelease, filterValue, type);
   },
 
-  ratings: function(item, filterValue, type) {
+  tmdbRating: function(item, filterValue, type) {
     const predicate = filterTypePredicates[type];
 
-    return predicate(item.ratings.value * 10, filterValue);
+    const rating = item.ratings.tmdb ? item.ratings.tmdb.value : 0;
+
+    return predicate(rating * 10, filterValue);
+  },
+
+  tmdbVotes: function(item, filterValue, type) {
+    const predicate = filterTypePredicates[type];
+
+    const rating = item.ratings.tmdb ? item.ratings.tmdb.votes : 0;
+
+    return predicate(rating, filterValue);
+  },
+
+  imdbRating: function(item, filterValue, type) {
+    const predicate = filterTypePredicates[type];
+
+    console.log(item.ratings);
+
+    const rating = item.ratings.imdb ? item.ratings.imdb.value : 0;
+
+    return predicate(rating, filterValue);
+  },
+
+  imdbVotes: function(item, filterValue, type) {
+    const predicate = filterTypePredicates[type];
+
+    const rating = item.ratings.imdb ? item.ratings.imdb.votes : 0;
+
+    return predicate(rating, filterValue);
   },
 
   qualityCutoffNotMet: function(item) {

frontend/src/Store/Actions/movieIndexActions.js

@@ -209,7 +209,7 @@ export const defaultState = {
     ratings: function(item) {
       const { ratings = {} } = item;
 
-      return ratings.value;
+      return ratings.tmdb? ratings.tmdb.value : 0;
     }
   },
 
@@ -357,8 +357,23 @@ export const defaultState = {
       }
     },
     {
-      name: 'ratings',
-      label: translate('Ratings'),
+      name: 'tmdbRating',
+      label: translate('TmdbRating'),
+      type: filterBuilderTypes.NUMBER
+    },
+    {
+      name: 'tmdbVotes',
+      label: translate('TmdbVotes'),
+      type: filterBuilderTypes.NUMBER
+    },
+    {
+      name: 'imdbRating',
+      label: translate('ImdbRating'),
+      type: filterBuilderTypes.NUMBER
+    },
+    {
+      name: 'imdbVotes',
+      label: translate('ImdbVotes'),
       type: filterBuilderTypes.NUMBER
     },
     {

frontend/src/Store/Actions/queueActions.js

@@ -27,7 +27,7 @@ const paged = `${section}.paged`;
 
 export const defaultState = {
   options: {
-    includeUnknownMovieItems: false
+    includeUnknownMovieItems: true
   },
 
   status: {

frontend/src/Store/Middleware/createSentryMiddleware.js

@@ -100,7 +100,7 @@ export default function createSentryMiddleware() {
     return;
   }
 
-  const dsn = isProduction ? 'https://b0fb75c38ef4487dbf742f79c4ba62d2@sentry.servarr.com/12' :
+  const dsn = isProduction ? 'https://7794f2858478485ea337fb5535624fbd@sentry.servarr.com/12' :
     'https://da610619280249f891ec3ee306906793@sentry.servarr.com/13';
 
   sentry.init({

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

@@ -19,6 +19,7 @@ function getInternalLink(source) {
     case 'IndexerRssCheck':
     case 'IndexerSearchCheck':
     case 'IndexerStatusCheck':
+    case 'IndexerJackettAllCheck':
     case 'IndexerLongTermStatusCheck':
       return (
         <IconButton

package.json

@@ -30,7 +30,7 @@
     "@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.10",
+    "@microsoft/signalr": "6.0.1",
     "@sentry/browser": "6.13.2",
     "@sentry/integrations": "6.13.2",
     "classnames": "2.3.1",
@@ -82,6 +82,7 @@
   },
   "devDependencies": {
     "@babel/core": "7.13.16",
+    "@babel/eslint-parser": "7.13.14",
     "@babel/plugin-proposal-class-properties": "7.13.0",
     "@babel/plugin-proposal-decorators": "7.13.15",
     "@babel/plugin-proposal-export-default-from": "7.12.13",
@@ -94,7 +95,6 @@
     "@babel/plugin-syntax-dynamic-import": "7.8.3",
     "@babel/preset-env": "7.13.15",
     "@babel/preset-react": "7.13.13",
-    "@babel/eslint-parser": "7.13.14",
     "autoprefixer": "10.2.5",
     "babel-loader": "8.2.2",
     "babel-plugin-inline-classnames": "2.0.1",
@@ -125,12 +125,12 @@
     "run-sequence": "2.2.1",
     "streamqueue": "1.1.2",
     "style-loader": "2.0.0",
+    "stylelint": "13.13.0",
+    "stylelint-order": "4.1.0",
     "url-loader": "4.1.1",
     "webpack": "5.35.1",
     "webpack-cli": "4.6.0",
     "webpack-livereload-plugin": "3.0.1",
-    "worker-loader": "3.0.8",
-    "stylelint": "13.13.0",
-    "stylelint-order": "4.1.0"
+    "worker-loader": "3.0.8"
   }
 }

src/Directory.Build.props

@@ -2,10 +2,11 @@
   <!-- Common to all Radarr Projects -->
   <PropertyGroup>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+	<ErrorOnDuplicatePublishOutputFiles>false</ErrorOnDuplicatePublishOutputFiles>
 
     <PlatformTarget>AnyCPU</PlatformTarget>
     <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
-    <RuntimeIdentifiers>win-x64;win-x86;osx-x64;linux-x64;linux-musl-x64;linux-arm;linux-arm64;linux-musl-arm64</RuntimeIdentifiers>
+    <RuntimeIdentifiers>win-x64;win-x86;osx-x64;osx-arm64;linux-x64;linux-musl-x64;linux-arm;linux-musl-arm;linux-arm64;linux-musl-arm64</RuntimeIdentifiers>
 
     <RadarrRootDir>$(MSBuildThisFileDirectory)..\</RadarrRootDir>
 
@@ -89,13 +90,13 @@
 
   <!-- Standard testing packages -->
   <ItemGroup Condition="'$(TestProject)'=='true'">
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
     <PackageReference Include="NUnit" Version="3.13.2" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.0.0" />
-    <PackageReference Include="NunitXml.TestLogger" Version="2.1.62" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.1.0" />
+    <PackageReference Include="NunitXml.TestLogger" Version="3.0.117" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TestProject)'=='true' and '$(TargetFramework)'=='net5.0'">
+  <ItemGroup Condition="'$(TestProject)'=='true' and '$(TargetFramework)'=='net6.0'">
     <PackageReference Include="coverlet.collector" Version="3.0.4-preview.27.ge7cb7c3b40" />
   </ItemGroup>
 

src/NzbDrone.Api.Test/Radarr.Api.Test.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net5.0</TargetFrameworks>
+    <TargetFrameworks>net6.0</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="NBuilder" Version="6.1.0" />

src/NzbDrone.Automation.Test/Radarr.Automation.Test.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net5.0</TargetFrameworks>
+    <TargetFrameworks>net6.0</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Selenium.Support" Version="3.141.0" />

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

@@ -4,6 +4,7 @@ using System.Globalization;
 using System.IO;
 using System.Linq;
 using System.Net;
+using System.Net.Http;
 using System.Threading;
 using FluentAssertions;
 using Moq;
@@ -15,8 +16,11 @@ using NzbDrone.Common.Http;
 using NzbDrone.Common.Http.Dispatchers;
 using NzbDrone.Common.Http.Proxy;
 using NzbDrone.Common.TPL;
+using NzbDrone.Core.Configuration;
+using NzbDrone.Core.Security;
 using NzbDrone.Test.Common;
 using NzbDrone.Test.Common.Categories;
+using HttpClient = NzbDrone.Common.Http.HttpClient;
 
 namespace NzbDrone.Common.Test.Http
 {
@@ -31,6 +35,8 @@ namespace NzbDrone.Common.Test.Http
         private string _httpBinHost;
         private string _httpBinHost2;
 
+        private System.Net.Http.HttpClient _httpClient = new ();
+
         [OneTimeSetUp]
         public void FixtureSetUp()
         {
@@ -38,7 +44,7 @@ namespace NzbDrone.Common.Test.Http
             var mainHost = "httpbin.servarr.com";
 
             // Use mirrors for tests that use two hosts
-            var candidates = new[] { "eu.httpbin.org", /* "httpbin.org", */ "www.httpbin.org" };
+            var candidates = new[] { "httpbin1.servarr.com" };
 
             // httpbin.org is broken right now, occassionally redirecting to https if it's unavailable.
             _httpBinHost = mainHost;
@@ -46,29 +52,20 @@ namespace NzbDrone.Common.Test.Http
 
             TestLogger.Info($"{candidates.Length} TestSites available.");
 
-            _httpBinSleep = _httpBinHosts.Length < 2 ? 100 : 10;
+            _httpBinSleep = 10;
         }
 
         private bool IsTestSiteAvailable(string site)
         {
             try
             {
-                var req = WebRequest.Create($"https://{site}/get") as HttpWebRequest;
-                var res = req.GetResponse() as HttpWebResponse;
+                var res = _httpClient.GetAsync($"https://{site}/get").GetAwaiter().GetResult();
                 if (res.StatusCode != HttpStatusCode.OK)
                 {
                     return false;
                 }
 
-                try
-                {
-                    req = WebRequest.Create($"https://{site}/status/429") as HttpWebRequest;
-                    res = req.GetResponse() as HttpWebResponse;
-                }
-                catch (WebException ex)
-                {
-                    res = ex.Response as HttpWebResponse;
-                }
+                res = _httpClient.GetAsync($"https://{site}/status/429").GetAwaiter().GetResult();
 
                 if (res == null || res.StatusCode != (HttpStatusCode)429)
                 {
@@ -95,10 +92,13 @@ namespace NzbDrone.Common.Test.Http
             Mocker.GetMock<IOsInfo>().Setup(c => c.Name).Returns("TestOS");
             Mocker.GetMock<IOsInfo>().Setup(c => c.Version).Returns("9.0.0");
 
+            Mocker.GetMock<IConfigService>().SetupGet(x => x.CertificateValidation).Returns(CertificateValidationType.Enabled);
+
             Mocker.SetConstant<IUserAgentBuilder>(Mocker.Resolve<UserAgentBuilder>());
 
             Mocker.SetConstant<ICacheManager>(Mocker.Resolve<CacheManager>());
             Mocker.SetConstant<ICreateManagedWebProxy>(Mocker.Resolve<ManagedWebProxyFactory>());
+            Mocker.SetConstant<ICertificateValidationService>(new X509CertificateValidationService(Mocker.GetMock<IConfigService>().Object, TestLogger));
             Mocker.SetConstant<IRateLimitService>(Mocker.Resolve<RateLimitService>());
             Mocker.SetConstant<IEnumerable<IHttpRequestInterceptor>>(Array.Empty<IHttpRequestInterceptor>());
             Mocker.SetConstant<IHttpDispatcher>(Mocker.Resolve<TDispatcher>());
@@ -138,6 +138,28 @@ namespace NzbDrone.Common.Test.Http
             response.Content.Should().NotBeNullOrWhiteSpace();
         }
 
+        [TestCase(CertificateValidationType.Enabled)]
+        [TestCase(CertificateValidationType.DisabledForLocalAddresses)]
+        public void bad_ssl_should_fail_when_remote_validation_enabled(CertificateValidationType validationType)
+        {
+            Mocker.GetMock<IConfigService>().SetupGet(x => x.CertificateValidation).Returns(validationType);
+            var request = new HttpRequest($"https://expired.badssl.com");
+
+            Assert.Throws<HttpRequestException>(() => Subject.Execute(request));
+            ExceptionVerification.ExpectedErrors(1);
+        }
+
+        [Test]
+        public void bad_ssl_should_pass_if_remote_validation_disabled()
+        {
+            Mocker.GetMock<IConfigService>().SetupGet(x => x.CertificateValidation).Returns(CertificateValidationType.Disabled);
+
+            var request = new HttpRequest($"https://expired.badssl.com");
+
+            Subject.Execute(request);
+            ExceptionVerification.ExpectedErrors(0);
+        }
+
         [Test]
         public void should_execute_typed_get()
         {
@@ -162,15 +184,44 @@ namespace NzbDrone.Common.Test.Http
             response.Resource.Data.Should().Be(message);
         }
 
-        [TestCase("gzip")]
-        public void should_execute_get_using_gzip(string compression)
+        [Test]
+        public void should_execute_post_with_content_type()
         {
-            var request = new HttpRequest($"https://{_httpBinHost}/{compression}");
+            var message = "{ my: 1 }";
+
+            var request = new HttpRequest($"https://{_httpBinHost}/post");
+            request.SetContent(message);
+            request.Headers.ContentType = "application/json";
+
+            var response = Subject.Post<HttpBinResource>(request);
+
+            response.Resource.Data.Should().Be(message);
+        }
+
+        [Test]
+        public void should_execute_get_using_gzip()
+        {
+            var request = new HttpRequest($"https://{_httpBinHost}/gzip");
 
             var response = Subject.Get<HttpBinResource>(request);
 
-            response.Resource.Headers["Accept-Encoding"].ToString().Should().Be(compression);
+            response.Resource.Headers["Accept-Encoding"].ToString().Should().Contain("gzip");
+
             response.Resource.Gzipped.Should().BeTrue();
+            response.Resource.Brotli.Should().BeFalse();
+        }
+
+        [Test]
+        public void should_execute_get_using_brotli()
+        {
+            var request = new HttpRequest($"https://{_httpBinHost}/brotli");
+
+            var response = Subject.Get<HttpBinResource>(request);
+
+            response.Resource.Headers["Accept-Encoding"].ToString().Should().Contain("br");
+
+            response.Resource.Gzipped.Should().BeFalse();
+            response.Resource.Brotli.Should().BeTrue();
         }
 
         [TestCase(HttpStatusCode.Unauthorized)]
@@ -337,13 +388,38 @@ namespace NzbDrone.Common.Test.Http
         {
             var file = GetTempFilePath();
 
-            Assert.Throws<WebException>(() => Subject.DownloadFile("https://download.sonarr.tv/wrongpath", file));
+            Assert.Throws<HttpException>(() => Subject.DownloadFile("https://download.sonarr.tv/wrongpath", file));
 
             File.Exists(file).Should().BeFalse();
 
             ExceptionVerification.ExpectedWarns(1);
         }
 
+        [Test]
+        public void should_not_write_redirect_content_to_stream()
+        {
+            var file = GetTempFilePath();
+
+            using (var fileStream = new FileStream(file, FileMode.Create))
+            {
+                var request = new HttpRequest($"http://{_httpBinHost}/redirect/1");
+                request.AllowAutoRedirect = false;
+                request.ResponseStream = fileStream;
+
+                var response = Subject.Get(request);
+
+                response.StatusCode.Should().Be(HttpStatusCode.Moved);
+            }
+
+            ExceptionVerification.ExpectedErrors(1);
+
+            File.Exists(file).Should().BeTrue();
+
+            var fileInfo = new FileInfo(file);
+
+            fileInfo.Length.Should().Be(0);
+        }
+
         [Test]
         public void should_send_cookie()
         {
@@ -743,7 +819,7 @@ namespace NzbDrone.Common.Test.Http
         {
             try
             {
-                string url = $"https://{_httpBinHost}/response-headers?Set-Cookie={Uri.EscapeUriString(malformedCookie)}";
+                string url = $"https://{_httpBinHost}/response-headers?Set-Cookie={Uri.EscapeDataString(malformedCookie)}";
 
                 var requestSet = new HttpRequest(url);
                 requestSet.AllowAutoRedirect = false;
@@ -773,6 +849,7 @@ namespace NzbDrone.Common.Test.Http
         public string Url { get; set; }
         public string Data { get; set; }
         public bool Gzipped { get; set; }
+        public bool Brotli { get; set; }
     }
 
     public class HttpCookieResource

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

@@ -62,6 +62,7 @@ namespace NzbDrone.Common.Test.InstrumentationTests
         [TestCase("Hardlinking episode file: /home/mySecret/Downloads to /media/abc.mkv")]
         [TestCase("Hardlink '/home/mySecret/Downloads/abs.mkv' to '/media/abc.mkv' failed.")]
         [TestCase("https://notifiarr.com/notifier.php: api=1234530f-422f-4aac-b6b3-01233210aaaa&radarr_health_issue_message=Download")]
+        [TestCase("/readarr/signalr/messages/negotiate?access_token=1234530f422f4aacb6b301233210aaaa&negotiateVersion=1")]
 
         // Announce URLs (passkeys) Magnet & Tracker
         [TestCase(@"magnet_uri"":""magnet:?xt=urn:btih:9pr04sgkillroyimaveql2tyu8xyui&dn=&tr=https%3a%2f%2fxxx.yyy%2f9pr04sg601233210imaveql2tyu8xyui%2fannounce""}")]

src/NzbDrone.Common.Test/Radarr.Common.Test.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net5.0</TargetFrameworks>
+    <TargetFrameworks>net6.0</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\NzbDrone.Host\Radarr.Host.csproj" />

src/NzbDrone.Common.Test/ServiceFactoryFixture.cs

@@ -3,6 +3,8 @@ using DryIoc;
 using DryIoc.Microsoft.DependencyInjection;
 using FluentAssertions;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
+using Moq;
 using NUnit.Framework;
 using NzbDrone.Common.Composition.Extensions;
 using NzbDrone.Common.EnvironmentInfo;
@@ -25,12 +27,15 @@ namespace NzbDrone.Common.Test
                 .AddNzbDroneLogger()
                 .AutoAddServices(Bootstrap.ASSEMBLIES)
                 .AddDummyDatabase()
-                .AddStartupContext(new StartupContext("first", "second"))
-                .GetServiceProvider();
+                .AddStartupContext(new StartupContext("first", "second"));
 
-            container.GetRequiredService<IAppFolderFactory>().Register();
+            container.RegisterInstance<IHostLifetime>(new Mock<IHostLifetime>().Object);
 
-            Mocker.SetConstant<System.IServiceProvider>(container);
+            var serviceProvider = container.GetServiceProvider();
+
+            serviceProvider.GetRequiredService<IAppFolderFactory>().Register();
+
+            Mocker.SetConstant<System.IServiceProvider>(serviceProvider);
 
             var handlers = Subject.BuildAll<IHandle<ApplicationStartedEvent>>()
                                   .Select(c => c.GetType().FullName);

src/NzbDrone.Common/ArchiveService.cs

@@ -106,7 +106,7 @@ namespace NzbDrone.Common
             Stream inStream = File.OpenRead(compressedFile);
             Stream gzipStream = new GZipInputStream(inStream);
 
-            TarArchive tarArchive = TarArchive.CreateInputTarArchive(gzipStream);
+            TarArchive tarArchive = TarArchive.CreateInputTarArchive(gzipStream, null);
             tarArchive.ExtractContents(destination);
             tarArchive.Close();
 

src/NzbDrone.Common/EnvironmentInfo/RuntimeInfo.cs

@@ -1,9 +1,9 @@
 using System;
 using System.Diagnostics;
 using System.IO;
-using System.Reflection;
 using System.Security.Principal;
-using System.ServiceProcess;
+using Microsoft.Extensions.Hosting;
+using Microsoft.Extensions.Hosting.WindowsServices;
 using NLog;
 using NzbDrone.Common.Processes;
 
@@ -14,16 +14,13 @@ namespace NzbDrone.Common.EnvironmentInfo
         private readonly Logger _logger;
         private readonly DateTime _startTime = DateTime.UtcNow;
 
-        public RuntimeInfo(IServiceProvider serviceProvider, Logger logger)
+        public RuntimeInfo(Logger logger, IHostLifetime hostLifetime = null)
         {
             _logger = logger;
 
-            IsWindowsService = !IsUserInteractive &&
-                               OsInfo.IsWindows &&
-                               serviceProvider.ServiceExist(ServiceProvider.SERVICE_NAME) &&
-                               serviceProvider.GetStatus(ServiceProvider.SERVICE_NAME) == ServiceControllerStatus.StartPending;
+            IsWindowsService = hostLifetime is WindowsServiceLifetime;
 
-            // net5.0 will return Radarr.dll for entry assembly, we need the actual
+            // net6.0 will return Radarr.dll for entry assembly, we need the actual
             // executable name (Radarr on linux).  On mono this will return the location of
             // the mono executable itself, which is not what we want.
             var entry = Process.GetCurrentProcess().MainModule;

src/NzbDrone.Common/Extensions/IEnumerableExtensions.cs

@@ -6,13 +6,6 @@ namespace NzbDrone.Common.Extensions
 {
     public static class EnumerableExtensions
     {
-        public static IEnumerable<TSource> DistinctBy<TSource, TKey>(this IEnumerable<TSource> source, Func<TSource, TKey> keySelector)
-        {
-            var knownKeys = new HashSet<TKey>();
-
-            return source.Where(element => knownKeys.Add(keySelector(element)));
-        }
-
         public static IEnumerable<TFirst> IntersectBy<TFirst, TSecond, TKey>(this IEnumerable<TFirst> first,
                                                                              Func<TFirst, TKey> firstKeySelector,
                                                                              IEnumerable<TSecond> second,

src/NzbDrone.Common/Extensions/StringExtensions.cs

@@ -171,5 +171,26 @@ namespace NzbDrone.Common.Extensions
         {
             return source.Contains(value, StringComparer.InvariantCultureIgnoreCase);
         }
+
+        public static string EncodeRFC3986(this string value)
+        {
+            // From Twitterizer http://www.twitterizer.net/
+            if (string.IsNullOrEmpty(value))
+            {
+                return string.Empty;
+            }
+
+            var encoded = Uri.EscapeDataString(value);
+
+            return Regex
+                .Replace(encoded, "(%[0-9a-f][0-9a-f])", c => c.Value.ToUpper())
+                .Replace("(", "%28")
+                .Replace(")", "%29")
+                .Replace("$", "%24")
+                .Replace("!", "%21")
+                .Replace("*", "%2A")
+                .Replace("'", "%27")
+                .Replace("%7E", "~");
+        }
     }
 }

src/NzbDrone.Common/Http/BasicNetworkCredential.cs

@@ -0,0 +1,12 @@
+using System.Net;
+
+namespace NzbDrone.Common.Http
+{
+    public class BasicNetworkCredential : NetworkCredential
+    {
+        public BasicNetworkCredential(string user, string pass)
+        : base(user, pass)
+        {
+        }
+    }
+}

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

@@ -0,0 +1,11 @@
+using System.Net.Http;
+using System.Net.Security;
+using System.Security.Cryptography.X509Certificates;
+
+namespace NzbDrone.Common.Http.Dispatchers
+{
+    public interface ICertificateValidationService
+    {
+        bool ShouldByPassValidationError(object sender, X509Certificate certificate, X509Chain chain, SslPolicyErrors sslPolicyErrors);
+    }
+}

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

@@ -5,6 +5,5 @@ namespace NzbDrone.Common.Http.Dispatchers
     public interface IHttpDispatcher
     {
         HttpResponse GetResponse(HttpRequest request, CookieContainer cookies);
-        void DownloadFile(string url, string fileName);
     }
 }

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

@@ -1,12 +1,13 @@
 using System;
-using System.Diagnostics;
 using System.IO;
-using System.IO.Compression;
 using System.Net;
-using System.Reflection;
-using NLog;
-using NLog.Fluent;
-using NzbDrone.Common.EnvironmentInfo;
+using System.Net.Http;
+using System.Net.Security;
+using System.Net.Sockets;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using NzbDrone.Common.Cache;
 using NzbDrone.Common.Extensions;
 using NzbDrone.Common.Http.Proxy;
 
@@ -14,200 +15,195 @@ namespace NzbDrone.Common.Http.Dispatchers
 {
     public class ManagedHttpDispatcher : IHttpDispatcher
     {
+        private const string NO_PROXY_KEY = "no-proxy";
+
+        private const int connection_establish_timeout = 2000;
+        private static bool useIPv6 = Socket.OSSupportsIPv6;
+        private static bool hasResolvedIPv6Availability;
+
         private readonly IHttpProxySettingsProvider _proxySettingsProvider;
         private readonly ICreateManagedWebProxy _createManagedWebProxy;
+        private readonly ICertificateValidationService _certificateValidationService;
         private readonly IUserAgentBuilder _userAgentBuilder;
-        private readonly IPlatformInfo _platformInfo;
-        private readonly Logger _logger;
+        private readonly ICached<System.Net.Http.HttpClient> _httpClientCache;
+        private readonly ICached<CredentialCache> _credentialCache;
 
-        public ManagedHttpDispatcher(IHttpProxySettingsProvider proxySettingsProvider, ICreateManagedWebProxy createManagedWebProxy, IUserAgentBuilder userAgentBuilder, IPlatformInfo platformInfo, Logger logger)
+        public ManagedHttpDispatcher(IHttpProxySettingsProvider proxySettingsProvider,
+            ICreateManagedWebProxy createManagedWebProxy,
+            ICertificateValidationService certificateValidationService,
+            IUserAgentBuilder userAgentBuilder,
+            ICacheManager cacheManager)
         {
             _proxySettingsProvider = proxySettingsProvider;
             _createManagedWebProxy = createManagedWebProxy;
+            _certificateValidationService = certificateValidationService;
             _userAgentBuilder = userAgentBuilder;
-            _platformInfo = platformInfo;
-            _logger = logger;
+
+            _httpClientCache = cacheManager.GetCache<System.Net.Http.HttpClient>(typeof(ManagedHttpDispatcher));
+            _credentialCache = cacheManager.GetCache<CredentialCache>(typeof(ManagedHttpDispatcher), "credentialcache");
         }
 
         public HttpResponse GetResponse(HttpRequest request, CookieContainer cookies)
         {
-            var webRequest = (HttpWebRequest)WebRequest.Create((Uri)request.Url);
+            var requestMessage = new HttpRequestMessage(request.Method, (Uri)request.Url);
+            requestMessage.Headers.UserAgent.ParseAdd(_userAgentBuilder.GetUserAgent(request.UseSimplifiedUserAgent));
+            requestMessage.Headers.ConnectionClose = !request.ConnectionKeepAlive;
 
-            // Deflate is not a standard and could break depending on implementation.
-            // we should just stick with the more compatible Gzip
-            //http://stackoverflow.com/questions/8490718/how-to-decompress-stream-deflated-with-java-util-zip-deflater-in-net
-            webRequest.AutomaticDecompression = DecompressionMethods.GZip;
-
-            webRequest.Method = request.Method.ToString();
-            webRequest.UserAgent = _userAgentBuilder.GetUserAgent(request.UseSimplifiedUserAgent);
-            webRequest.KeepAlive = request.ConnectionKeepAlive;
-            webRequest.AllowAutoRedirect = false;
-            webRequest.CookieContainer = cookies;
-
-            if (request.RequestTimeout != TimeSpan.Zero)
+            var cookieHeader = cookies.GetCookieHeader((Uri)request.Url);
+            if (cookieHeader.IsNotNullOrWhiteSpace())
             {
-                webRequest.Timeout = (int)Math.Ceiling(request.RequestTimeout.TotalMilliseconds);
+                requestMessage.Headers.Add("Cookie", cookieHeader);
             }
 
-            webRequest.Proxy = GetProxy(request.Url);
+            using var cts = new CancellationTokenSource();
+            if (request.RequestTimeout != TimeSpan.Zero)
+            {
+                cts.CancelAfter(request.RequestTimeout);
+            }
+            else
+            {
+                // The default for System.Net.Http.HttpClient
+                cts.CancelAfter(TimeSpan.FromSeconds(100));
+            }
+
+            if (request.Credentials != null)
+            {
+                if (request.Credentials is BasicNetworkCredential bc)
+                {
+                    // Manually set header to avoid initial challenge response
+                    var authInfo = bc.UserName + ":" + bc.Password;
+                    authInfo = Convert.ToBase64String(Encoding.GetEncoding("ISO-8859-1").GetBytes(authInfo));
+                    requestMessage.Headers.Add("Authorization", "Basic " + authInfo);
+                }
+                else if (request.Credentials is NetworkCredential nc)
+                {
+                    var creds = GetCredentialCache();
+                    foreach (var authtype in new[] { "Basic", "Digest" })
+                    {
+                        creds.Remove((Uri)request.Url, authtype);
+                        creds.Add((Uri)request.Url, authtype, nc);
+                    }
+                }
+            }
+
+            if (request.ContentData != null)
+            {
+                requestMessage.Content = new ByteArrayContent(request.ContentData);
+            }
 
             if (request.Headers != null)
             {
-                AddRequestHeaders(webRequest, request.Headers);
+                AddRequestHeaders(requestMessage, request.Headers);
             }
 
-            HttpWebResponse httpWebResponse;
+            var httpClient = GetClient(request.Url);
 
-            try
+            using var responseMessage = httpClient.Send(requestMessage, HttpCompletionOption.ResponseHeadersRead, cts.Token);
             {
-                if (request.ContentData != null)
-                {
-                    webRequest.ContentLength = request.ContentData.Length;
-                    using (var writeStream = webRequest.GetRequestStream())
-                    {
-                        writeStream.Write(request.ContentData, 0, request.ContentData.Length);
-                    }
-                }
+                byte[] data = null;
 
-                httpWebResponse = (HttpWebResponse)webRequest.GetResponse();
-            }
-            catch (WebException e)
-            {
-                httpWebResponse = (HttpWebResponse)e.Response;
-
-                if (httpWebResponse == null)
+                try
                 {
-                    // The default messages for WebException on mono are pretty horrible.
-                    if (e.Status == WebExceptionStatus.NameResolutionFailure)
+                    if (request.ResponseStream != null && responseMessage.StatusCode == HttpStatusCode.OK)
                     {
-                        throw new WebException($"DNS Name Resolution Failure: '{webRequest.RequestUri.Host}'", e.Status);
-                    }
-                    else if (e.ToString().Contains("TLS Support not"))
-                    {
-                        throw new TlsFailureException(webRequest, e);
-                    }
-                    else if (e.ToString().Contains("The authentication or decryption has failed."))
-                    {
-                        throw new TlsFailureException(webRequest, e);
-                    }
-                    else if (OsInfo.IsNotWindows)
-                    {
-                        throw new WebException($"{e.Message}: '{webRequest.RequestUri}'", e, e.Status, e.Response);
+                        responseMessage.Content.CopyTo(request.ResponseStream, null, cts.Token);
                     }
                     else
                     {
-                        throw;
+                        data = responseMessage.Content.ReadAsByteArrayAsync(cts.Token).GetAwaiter().GetResult();
                     }
                 }
-            }
-
-            byte[] data = null;
-
-            using (var responseStream = httpWebResponse.GetResponseStream())
-            {
-                if (responseStream != null && responseStream != Stream.Null)
+                catch (Exception ex)
                 {
-                    try
-                    {
-                        data = responseStream.ToBytes();
-                    }
-                    catch (Exception ex)
-                    {
-                        throw new WebException("Failed to read complete http response", ex, WebExceptionStatus.ReceiveFailure, httpWebResponse);
-                    }
-                }
-            }
-
-            return new HttpResponse(request, new HttpHeader(httpWebResponse.Headers), data, httpWebResponse.StatusCode);
-        }
-
-        public void DownloadFile(string url, string fileName)
-        {
-            try
-            {
-                var fileInfo = new FileInfo(fileName);
-                if (fileInfo.Directory != null && !fileInfo.Directory.Exists)
-                {
-                    fileInfo.Directory.Create();
+                    throw new WebException("Failed to read complete http response", ex, WebExceptionStatus.ReceiveFailure, null);
                 }
 
-                _logger.Debug("Downloading [{0}] to [{1}]", url, fileName);
+                var headers = responseMessage.Headers.ToNameValueCollection();
 
-                var stopWatch = Stopwatch.StartNew();
-                var uri = new HttpUri(url);
+                headers.Add(responseMessage.Content.Headers.ToNameValueCollection());
 
-                using (var webClient = new GZipWebClient())
-                {
-                    webClient.Headers.Add(HttpRequestHeader.UserAgent, _userAgentBuilder.GetUserAgent());
-                    webClient.Proxy = GetProxy(uri);
-                    webClient.DownloadFile(uri.FullUri, fileName);
-                    stopWatch.Stop();
-                    _logger.Debug("Downloading Completed. took {0:0}s", stopWatch.Elapsed.Seconds);
-                }
-            }
-            catch (WebException e)
-            {
-                _logger.Warn("Failed to get response from: {0} {1}", url, e.Message);
-                throw;
-            }
-            catch (Exception e)
-            {
-                _logger.Warn(e, "Failed to get response from: " + url);
-                throw;
+                return new HttpResponse(request, new HttpHeader(headers), data, responseMessage.StatusCode);
             }
         }
 
-        protected virtual IWebProxy GetProxy(HttpUri uri)
+        protected virtual System.Net.Http.HttpClient GetClient(HttpUri uri)
         {
-            IWebProxy proxy = null;
-
             var proxySettings = _proxySettingsProvider.GetProxySettings(uri);
 
+            var key = proxySettings?.Key ?? NO_PROXY_KEY;
+
+            return _httpClientCache.Get(key, () => CreateHttpClient(proxySettings));
+        }
+
+        protected virtual System.Net.Http.HttpClient CreateHttpClient(HttpProxySettings proxySettings)
+        {
+            var handler = new SocketsHttpHandler()
+            {
+                AutomaticDecompression = DecompressionMethods.GZip | DecompressionMethods.Brotli,
+                UseCookies = false, // sic - we don't want to use a shared cookie container
+                AllowAutoRedirect = false,
+                Credentials = GetCredentialCache(),
+                PreAuthenticate = true,
+                MaxConnectionsPerServer = 12,
+                ConnectCallback = onConnect,
+                SslOptions = new SslClientAuthenticationOptions
+                {
+                    RemoteCertificateValidationCallback = _certificateValidationService.ShouldByPassValidationError
+                }
+            };
+
             if (proxySettings != null)
             {
-                proxy = _createManagedWebProxy.GetWebProxy(proxySettings);
+                handler.Proxy = _createManagedWebProxy.GetWebProxy(proxySettings);
             }
 
-            return proxy;
+            var client = new System.Net.Http.HttpClient(handler)
+            {
+                Timeout = Timeout.InfiniteTimeSpan
+            };
+
+            return client;
         }
 
-        protected virtual void AddRequestHeaders(HttpWebRequest webRequest, HttpHeader headers)
+        protected virtual void AddRequestHeaders(HttpRequestMessage webRequest, HttpHeader headers)
         {
             foreach (var header in headers)
             {
                 switch (header.Key)
                 {
                     case "Accept":
-                        webRequest.Accept = header.Value;
+                        webRequest.Headers.Accept.ParseAdd(header.Value);
                         break;
                     case "Connection":
-                        webRequest.Connection = header.Value;
+                        webRequest.Headers.Connection.Clear();
+                        webRequest.Headers.Connection.Add(header.Value);
                         break;
                     case "Content-Length":
-                        webRequest.ContentLength = Convert.ToInt64(header.Value);
+                        AddContentHeader(webRequest, "Content-Length", header.Value);
                         break;
                     case "Content-Type":
-                        webRequest.ContentType = header.Value;
+                        AddContentHeader(webRequest, "Content-Type", header.Value);
                         break;
                     case "Date":
-                        webRequest.Date = HttpHeader.ParseDateTime(header.Value);
+                        webRequest.Headers.Remove("Date");
+                        webRequest.Headers.Date = HttpHeader.ParseDateTime(header.Value);
                         break;
                     case "Expect":
-                        webRequest.Expect = header.Value;
+                        webRequest.Headers.Expect.ParseAdd(header.Value);
                         break;
                     case "Host":
-                        webRequest.Host = header.Value;
+                        webRequest.Headers.Host = header.Value;
                         break;
                     case "If-Modified-Since":
-                        webRequest.IfModifiedSince = HttpHeader.ParseDateTime(header.Value);
+                        webRequest.Headers.IfModifiedSince = HttpHeader.ParseDateTime(header.Value);
                         break;
                     case "Range":
                         throw new NotImplementedException();
                     case "Referer":
-                        webRequest.Referer = header.Value;
+                        webRequest.Headers.Add("Referer", header.Value);
                         break;
                     case "Transfer-Encoding":
-                        webRequest.TransferEncoding = header.Value;
+                        webRequest.Headers.TransferEncoding.ParseAdd(header.Value);
                         break;
                     case "User-Agent":
                         throw new NotSupportedException("User-Agent other than Radarr not allowed.");
@@ -219,5 +215,84 @@ namespace NzbDrone.Common.Http.Dispatchers
                 }
             }
         }
+
+        private void AddContentHeader(HttpRequestMessage request, string header, string value)
+        {
+            var headers = request.Content?.Headers;
+            if (headers == null)
+            {
+                return;
+            }
+
+            headers.Remove(header);
+            headers.Add(header, value);
+        }
+
+        private CredentialCache GetCredentialCache()
+        {
+            return _credentialCache.Get("credentialCache", () => new CredentialCache());
+        }
+
+        private static async ValueTask<Stream> onConnect(SocketsHttpConnectionContext context, CancellationToken cancellationToken)
+        {
+            // Until .NET supports an implementation of Happy Eyeballs (https://tools.ietf.org/html/rfc8305#section-2), let's make IPv4 fallback work in a simple way.
+            // This issue is being tracked at https://github.com/dotnet/runtime/issues/26177 and expected to be fixed in .NET 6.
+            if (useIPv6)
+            {
+                try
+                {
+                    var localToken = cancellationToken;
+
+                    if (!hasResolvedIPv6Availability)
+                    {
+                        // to make things move fast, use a very low timeout for the initial ipv6 attempt.
+                        var quickFailCts = new CancellationTokenSource(connection_establish_timeout);
+                        var linkedTokenSource = CancellationTokenSource.CreateLinkedTokenSource(cancellationToken, quickFailCts.Token);
+
+                        localToken = linkedTokenSource.Token;
+                    }
+
+                    return await attemptConnection(AddressFamily.InterNetworkV6, context, localToken);
+                }
+                catch
+                {
+                    // very naively fallback to ipv4 permanently for this execution based on the response of the first connection attempt.
+                    // note that this may cause users to eventually get switched to ipv4 (on a random failure when they are switching networks, for instance)
+                    // but in the interest of keeping this implementation simple, this is acceptable.
+                    useIPv6 = false;
+                }
+                finally
+                {
+                    hasResolvedIPv6Availability = true;
+                }
+            }
+
+            // fallback to IPv4.
+            return await attemptConnection(AddressFamily.InterNetwork, context, cancellationToken);
+        }
+
+        private static async ValueTask<Stream> attemptConnection(AddressFamily addressFamily, SocketsHttpConnectionContext context, CancellationToken cancellationToken)
+        {
+            // The following socket constructor will create a dual-mode socket on systems where IPV6 is available.
+            var socket = new Socket(addressFamily, SocketType.Stream, ProtocolType.Tcp)
+            {
+                // Turn off Nagle's algorithm since it degrades performance in most HttpClient scenarios.
+                NoDelay = true
+            };
+
+            try
+            {
+                await socket.ConnectAsync(context.DnsEndPoint, cancellationToken).ConfigureAwait(false);
+
+                // The stream should take the ownership of the underlying socket,
+                // closing it when it's disposed.
+                return new NetworkStream(socket, ownsSocket: true);
+            }
+            catch
+            {
+                socket.Dispose();
+                throw;
+            }
+        }
     }
 }

src/NzbDrone.Common/Http/GZipWebClient.cs

@@ -1,15 +0,0 @@
-using System;
-using System.Net;
-
-namespace NzbDrone.Common.Http
-{
-    public class GZipWebClient : WebClient
-    {
-        protected override WebRequest GetWebRequest(Uri address)
-        {
-            var request = (HttpWebRequest)base.GetWebRequest(address);
-            request.AutomaticDecompression = DecompressionMethods.GZip;
-            return request;
-        }
-    }
-}

src/NzbDrone.Common/Http/HttpClient.cs

@@ -1,8 +1,10 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
+using System.IO;
 using System.Linq;
 using System.Net;
+using System.Net.Http;
 using NLog;
 using NzbDrone.Common.Cache;
 using NzbDrone.Common.EnvironmentInfo;
@@ -119,8 +121,6 @@ namespace NzbDrone.Common.Http
 
             var stopWatch = Stopwatch.StartNew();
 
-            PrepareRequestCookies(request, cookieContainer);
-
             var response = _httpDispatcher.GetResponse(request, cookieContainer);
 
             HandleResponseCookies(response, cookieContainer);
@@ -187,57 +187,98 @@ namespace NzbDrone.Common.Http
             }
         }
 
-        private void PrepareRequestCookies(HttpRequest request, CookieContainer cookieContainer)
+        private void HandleResponseCookies(HttpResponse response, CookieContainer container)
         {
-            // Don't collect persistnet cookies for intermediate/redirected urls.
-            /*lock (_cookieContainerCache)
+            foreach (Cookie cookie in container.GetAllCookies())
             {
-                var presistentContainer = _cookieContainerCache.Get("container", () => new CookieContainer());
-                var persistentCookies = presistentContainer.GetCookies((Uri)request.Url);
-                var existingCookies = cookieContainer.GetCookies((Uri)request.Url);
+                cookie.Expired = true;
+            }
 
-                cookieContainer.Add(persistentCookies);
-                cookieContainer.Add(existingCookies);
-            }*/
-        }
-
-        private void HandleResponseCookies(HttpResponse response, CookieContainer cookieContainer)
-        {
             var cookieHeaders = response.GetCookieHeaders();
+
             if (cookieHeaders.Empty())
             {
                 return;
             }
 
+            AddCookiesToContainer(response.Request.Url, cookieHeaders, container);
+
             if (response.Request.StoreResponseCookie)
             {
                 lock (_cookieContainerCache)
                 {
                     var persistentCookieContainer = _cookieContainerCache.Get("container", () => new CookieContainer());
 
-                    foreach (var cookieHeader in cookieHeaders)
-                    {
-                        try
-                        {
-                            persistentCookieContainer.SetCookies((Uri)response.Request.Url, cookieHeader);
-                        }
-                        catch (Exception ex)
-                        {
-                            _logger.Debug(ex, "Invalid cookie in {0}", response.Request.Url);
-                        }
-                    }
+                    AddCookiesToContainer(response.Request.Url, cookieHeaders, persistentCookieContainer);
+                }
+            }
+        }
+
+        private void AddCookiesToContainer(HttpUri url, string[] cookieHeaders, CookieContainer container)
+        {
+            foreach (var cookieHeader in cookieHeaders)
+            {
+                try
+                {
+                    container.SetCookies((Uri)url, cookieHeader);
+                }
+                catch (Exception ex)
+                {
+                    _logger.Debug(ex, "Invalid cookie in {0}", url);
                 }
             }
         }
 
         public void DownloadFile(string url, string fileName)
         {
-            _httpDispatcher.DownloadFile(url, fileName);
+            var fileNamePart = fileName + ".part";
+
+            try
+            {
+                var fileInfo = new FileInfo(fileName);
+                if (fileInfo.Directory != null && !fileInfo.Directory.Exists)
+                {
+                    fileInfo.Directory.Create();
+                }
+
+                _logger.Debug("Downloading [{0}] to [{1}]", url, fileName);
+
+                var stopWatch = Stopwatch.StartNew();
+                using (var fileStream = new FileStream(fileNamePart, FileMode.Create, FileAccess.ReadWrite))
+                {
+                    var request = new HttpRequest(url);
+                    request.AllowAutoRedirect = true;
+                    request.ResponseStream = fileStream;
+                    var response = Get(request);
+
+                    if (response.Headers.ContentType != null && response.Headers.ContentType.Contains("text/html"))
+                    {
+                        throw new HttpException(request, response, "Site responded with html content.");
+                    }
+                }
+
+                stopWatch.Stop();
+
+                if (File.Exists(fileName))
+                {
+                    File.Delete(fileName);
+                }
+
+                File.Move(fileNamePart, fileName);
+                _logger.Debug("Downloading Completed. took {0:0}s", stopWatch.Elapsed.Seconds);
+            }
+            finally
+            {
+                if (File.Exists(fileNamePart))
+                {
+                    File.Delete(fileNamePart);
+                }
+            }
         }
 
         public HttpResponse Get(HttpRequest request)
         {
-            request.Method = HttpMethod.GET;
+            request.Method = HttpMethod.Get;
             return Execute(request);
         }
 
@@ -251,13 +292,13 @@ namespace NzbDrone.Common.Http
 
         public HttpResponse Head(HttpRequest request)
         {
-            request.Method = HttpMethod.HEAD;
+            request.Method = HttpMethod.Head;
             return Execute(request);
         }
 
         public HttpResponse Post(HttpRequest request)
         {
-            request.Method = HttpMethod.POST;
+            request.Method = HttpMethod.Post;
             return Execute(request);
         }
 

src/NzbDrone.Common/Http/HttpHeader.cs

@@ -1,14 +1,30 @@
-using System;
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.Specialized;
 using System.Globalization;
 using System.Linq;
+using System.Net;
+using System.Net.Http.Headers;
 using System.Text;
 using NzbDrone.Common.Extensions;
 
 namespace NzbDrone.Common.Http
 {
+    public static class WebHeaderCollectionExtensions
+    {
+        public static NameValueCollection ToNameValueCollection(this HttpHeaders headers)
+        {
+            var result = new NameValueCollection();
+            foreach (var header in headers)
+            {
+                result.Add(header.Key, header.Value.ConcatToString(";"));
+            }
+
+            return result;
+        }
+    }
+
     public class HttpHeader : NameValueCollection, IEnumerable<KeyValuePair<string, string>>, IEnumerable
     {
         public HttpHeader(NameValueCollection headers)
@@ -16,6 +32,11 @@ namespace NzbDrone.Common.Http
         {
         }
 
+        public HttpHeader(HttpHeaders headers)
+            : base(headers.ToNameValueCollection())
+        {
+        }
+
         public HttpHeader()
         {
         }

src/NzbDrone.Common/Http/HttpMethod.cs

@@ -1,14 +0,0 @@
-namespace NzbDrone.Common.Http
-{
-    public enum HttpMethod
-    {
-        GET,
-        POST,
-        PUT,
-        DELETE,
-        HEAD,
-        OPTIONS,
-        PATCH,
-        MERGE
-    }
-}

src/NzbDrone.Common/Http/HttpRequest.cs

@@ -1,6 +1,8 @@
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Net;
+using System.Net.Http;
 using System.Text;
 using NzbDrone.Common.EnvironmentInfo;
 using NzbDrone.Common.Extensions;
@@ -11,6 +13,7 @@ namespace NzbDrone.Common.Http
     {
         public HttpRequest(string url, HttpAccept httpAccept = null)
         {
+            Method = HttpMethod.Get;
             Url = new HttpUri(url);
             Headers = new HttpHeader();
             AllowAutoRedirect = true;
@@ -35,6 +38,7 @@ namespace NzbDrone.Common.Http
         public HttpHeader Headers { get; set; }
         public byte[] ContentData { get; set; }
         public string ContentSummary { get; set; }
+        public ICredentials Credentials { get; set; }
         public bool SuppressHttpError { get; set; }
         public IEnumerable<HttpStatusCode> SuppressHttpErrorStatusCodes { get; set; }
         public bool UseSimplifiedUserAgent { get; set; }
@@ -49,6 +53,7 @@ namespace NzbDrone.Common.Http
         public TimeSpan RequestTimeout { get; set; }
         public TimeSpan RateLimit { get; set; }
         public string RateLimitKey { get; set; }
+        public Stream ResponseStream { get; set; }
 
         public override string ToString()
         {
@@ -85,12 +90,5 @@ namespace NzbDrone.Common.Http
             var encoding = HttpHeader.GetEncodingFromContentType(Headers.ContentType);
             ContentData = encoding.GetBytes(data);
         }
-
-        public void AddBasicAuthentication(string username, string password)
-        {
-            var authInfo = Convert.ToBase64String(Encoding.GetEncoding("ISO-8859-1").GetBytes($"{username}:{password}"));
-
-            Headers.Set("Authorization", "Basic " + authInfo);
-        }
     }
 }

src/NzbDrone.Common/Http/HttpRequestBuilder.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Net;
+using System.Net.Http;
 using System.Text;
 using NzbDrone.Common.Extensions;
 
@@ -25,17 +26,16 @@ namespace NzbDrone.Common.Http
         public bool ConnectionKeepAlive { get; set; }
         public TimeSpan RateLimit { get; set; }
         public bool LogResponseContent { get; set; }
-        public NetworkCredential NetworkCredential { get; set; }
+        public ICredentials NetworkCredential { get; set; }
         public Dictionary<string, string> Cookies { get; private set; }
         public List<HttpFormData> FormData { get; private set; }
-
         public Action<HttpRequest> PostProcess { get; set; }
 
         public HttpRequestBuilder(string baseUrl)
         {
             BaseUrl = new HttpUri(baseUrl);
             ResourceUrl = string.Empty;
-            Method = HttpMethod.GET;
+            Method = HttpMethod.Get;
             QueryParams = new List<KeyValuePair<string, string>>();
             SuffixQueryParams = new List<KeyValuePair<string, string>>();
             Segments = new Dictionary<string, string>();
@@ -108,13 +108,7 @@ namespace NzbDrone.Common.Http
             request.ConnectionKeepAlive = ConnectionKeepAlive;
             request.RateLimit = RateLimit;
             request.LogResponseContent = LogResponseContent;
-
-            if (NetworkCredential != null)
-            {
-                var authInfo = NetworkCredential.UserName + ":" + NetworkCredential.Password;
-                authInfo = Convert.ToBase64String(Encoding.GetEncoding("ISO-8859-1").GetBytes(authInfo));
-                request.Headers.Set("Authorization", "Basic " + authInfo);
-            }
+            request.Credentials = NetworkCredential;
 
             foreach (var header in Headers)
             {
@@ -271,7 +265,7 @@ namespace NzbDrone.Common.Http
 
         public virtual HttpRequestBuilder Post()
         {
-            Method = HttpMethod.POST;
+            Method = HttpMethod.Post;
 
             return this;
         }
@@ -362,7 +356,7 @@ namespace NzbDrone.Common.Http
 
         public virtual HttpRequestBuilder AddFormParameter(string key, object value)
         {
-            if (Method != HttpMethod.POST)
+            if (Method != HttpMethod.Post)
             {
                 throw new NotSupportedException("HttpRequest Method must be POST to add FormParameter.");
             }
@@ -378,7 +372,7 @@ namespace NzbDrone.Common.Http
 
         public virtual HttpRequestBuilder AddFormUpload(string name, string fileName, byte[] data, string contentType = "application/octet-stream")
         {
-            if (Method != HttpMethod.POST)
+            if (Method != HttpMethod.Post)
             {
                 throw new NotSupportedException("HttpRequest Method must be POST to add FormUpload.");
             }

src/NzbDrone.Common/Http/JsonRpcRequestBuilder.cs

@@ -1,6 +1,7 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Net.Http;
 using Newtonsoft.Json;
 using NzbDrone.Common.Serializer;
 
@@ -17,14 +18,14 @@ namespace NzbDrone.Common.Http
         public JsonRpcRequestBuilder(string baseUrl)
             : base(baseUrl)
         {
-            Method = HttpMethod.POST;
+            Method = HttpMethod.Post;
             JsonParameters = new List<object>();
         }
 
         public JsonRpcRequestBuilder(string baseUrl, string method, IEnumerable<object> parameters)
             : base(baseUrl)
         {
-            Method = HttpMethod.POST;
+            Method = HttpMethod.Post;
             JsonMethod = method;
             JsonParameters = parameters.ToList();
         }

src/NzbDrone.Common/Http/Proxy/ManagedWebProxyFactory.cs

@@ -1,9 +1,5 @@
-using System;
-using System.Linq;
+using System;
 using System.Net;
-using System.Net.Sockets;
-using com.LandonKey.SocksWebProxy;
-using com.LandonKey.SocksWebProxy.Proxy;
 using NzbDrone.Common.Cache;
 using NzbDrone.Common.Extensions;
 
@@ -33,54 +29,37 @@ namespace NzbDrone.Common.Http.Proxy
         }
 
         private IWebProxy CreateWebProxy(HttpProxySettings proxySettings)
+        {
+            var uri = GetProxyUri(proxySettings);
+
+            if (uri == null)
+            {
+                return null;
+            }
+
+            if (proxySettings.Username.IsNotNullOrWhiteSpace() && proxySettings.Password.IsNotNullOrWhiteSpace())
+            {
+                return new WebProxy(uri, proxySettings.BypassLocalAddress, proxySettings.BypassListAsArray, new NetworkCredential(proxySettings.Username, proxySettings.Password));
+            }
+            else
+            {
+                return new WebProxy(uri, proxySettings.BypassLocalAddress, proxySettings.BypassListAsArray);
+            }
+        }
+
+        private Uri GetProxyUri(HttpProxySettings proxySettings)
         {
             switch (proxySettings.Type)
             {
                 case ProxyType.Http:
-                    if (proxySettings.Username.IsNotNullOrWhiteSpace() && proxySettings.Password.IsNotNullOrWhiteSpace())
-                    {
-                        return new WebProxy(proxySettings.Host + ":" + proxySettings.Port, proxySettings.BypassLocalAddress, proxySettings.BypassListAsArray, new NetworkCredential(proxySettings.Username, proxySettings.Password));
-                    }
-                    else
-                    {
-                        return new WebProxy(proxySettings.Host + ":" + proxySettings.Port, proxySettings.BypassLocalAddress, proxySettings.BypassListAsArray);
-                    }
-
+                    return new Uri("http://" + proxySettings.Host + ":" + proxySettings.Port);
                 case ProxyType.Socks4:
-                    return new SocksWebProxy(new ProxyConfig(IPAddress.Loopback, GetNextFreePort(), GetProxyIpAddress(proxySettings.Host), proxySettings.Port, ProxyConfig.SocksVersion.Four, proxySettings.Username, proxySettings.Password), false);
+                    return new Uri("socks4://" + proxySettings.Host + ":" + proxySettings.Port);
                 case ProxyType.Socks5:
-                    return new SocksWebProxy(new ProxyConfig(IPAddress.Loopback, GetNextFreePort(), GetProxyIpAddress(proxySettings.Host), proxySettings.Port, ProxyConfig.SocksVersion.Five, proxySettings.Username, proxySettings.Password), false);
+                    return new Uri("socks5://" + proxySettings.Host + ":" + proxySettings.Port);
+                default:
+                    return null;
             }
-
-            return null;
-        }
-
-        private static IPAddress GetProxyIpAddress(string host)
-        {
-            IPAddress ipAddress;
-            if (!IPAddress.TryParse(host, out ipAddress))
-            {
-                try
-                {
-                    ipAddress = Dns.GetHostEntry(host).AddressList.OrderByDescending(a => a.AddressFamily == AddressFamily.InterNetwork).First();
-                }
-                catch (Exception e)
-                {
-                    throw new InvalidOperationException(string.Format("Unable to resolve proxy hostname '{0}' to a valid IP address.", host), e);
-                }
-            }
-
-            return ipAddress;
-        }
-
-        private static int GetNextFreePort()
-        {
-            var listener = new TcpListener(IPAddress.Loopback, 0);
-            listener.Start();
-            var port = ((IPEndPoint)listener.LocalEndpoint).Port;
-            listener.Stop();
-
-            return port;
         }
     }
 }

src/NzbDrone.Common/Http/XmlRpcRequestBuilder.cs

@@ -0,0 +1,103 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net.Http;
+using System.Xml.Linq;
+using NLog;
+using NzbDrone.Common.Instrumentation;
+
+namespace NzbDrone.Common.Http
+{
+    public class XmlRpcRequestBuilder : HttpRequestBuilder
+    {
+        public static string XmlRpcContentType = "text/xml";
+
+        private static readonly Logger Logger = NzbDroneLogger.GetLogger(typeof(XmlRpcRequestBuilder));
+
+        public string XmlMethod { get; private set; }
+        public List<object> XmlParameters { get; private set; }
+
+        public XmlRpcRequestBuilder(string baseUrl)
+            : base(baseUrl)
+        {
+            Method = HttpMethod.Post;
+            XmlParameters = new List<object>();
+        }
+
+        public XmlRpcRequestBuilder(bool useHttps, string host, int port, string urlBase = null)
+            : this(BuildBaseUrl(useHttps, host, port, urlBase))
+        {
+        }
+
+        public override HttpRequestBuilder Clone()
+        {
+            var clone = base.Clone() as XmlRpcRequestBuilder;
+            clone.XmlParameters = new List<object>(XmlParameters);
+            return clone;
+        }
+
+        public XmlRpcRequestBuilder Call(string method, params object[] parameters)
+        {
+            var clone = Clone() as XmlRpcRequestBuilder;
+            clone.XmlMethod = method;
+            clone.XmlParameters = parameters.ToList();
+            return clone;
+        }
+
+        protected override void Apply(HttpRequest request)
+        {
+            base.Apply(request);
+
+            request.Headers.ContentType = XmlRpcContentType;
+
+            var methodCallElements = new List<XElement> { new XElement("methodName", XmlMethod) };
+
+            if (XmlParameters.Any())
+            {
+                var argElements = XmlParameters.Select(x => new XElement("param", ConvertParameter(x))).ToList();
+                var paramsElement = new XElement("params", argElements);
+                methodCallElements.Add(paramsElement);
+            }
+
+            var message = new XDocument(
+                new XDeclaration("1.0", "utf-8", "yes"),
+                new XElement("methodCall", methodCallElements));
+
+            var body = message.ToString();
+
+            Logger.Debug($"Executing remote method: {XmlMethod}");
+
+            Logger.Trace($"methodCall {XmlMethod} body:\n{body}");
+
+            request.SetContent(body);
+        }
+
+        private static XElement ConvertParameter(object value)
+        {
+            XElement data;
+
+            if (value is string s)
+            {
+                data = new XElement("string", s);
+            }
+            else if (value is List<string> l)
+            {
+                data = new XElement("array", new XElement("data", l.Select(x => new XElement("value", new XElement("string", x)))));
+            }
+            else if (value is int i)
+            {
+                data = new XElement("int", i);
+            }
+            else if (value is byte[] bytes)
+            {
+                data = new XElement("base64", Convert.ToBase64String(bytes));
+            }
+            else
+            {
+                throw new InvalidOperationException($"Unhandled argument type {value.GetType().Name}");
+            }
+
+            return new XElement("value", data);
+        }
+    }
+}