Random

.editorconfig

@@ -19,10 +19,10 @@ indent_size = 4
 dotnet_sort_system_directives_first = true
 
 # Avoid "this." and "Me." if not necessary
-dotnet_style_qualification_for_field = false:warning
-dotnet_style_qualification_for_property = false:warning
-dotnet_style_qualification_for_method = false:warning
-dotnet_style_qualification_for_event = false:warning
+dotnet_style_qualification_for_field = false:refactoring
+dotnet_style_qualification_for_property = false:refactoring
+dotnet_style_qualification_for_method = false:refactoring
+dotnet_style_qualification_for_event = false:refactoring
 
 # Indentation preferences
 csharp_indent_block_contents = true
@@ -32,6 +32,10 @@ csharp_indent_case_contents_when_block = true
 csharp_indent_switch_labels = true
 csharp_indent_labels = flush_left
 
+dotnet_style_qualification_for_field = false:suggestion
+dotnet_style_qualification_for_property = false:suggestion
+dotnet_style_qualification_for_method = false:suggestion
+dotnet_style_qualification_for_event = false:suggestion
 dotnet_naming_style.instance_field_style.capitalization = camel_case
 dotnet_naming_style.instance_field_style.required_prefix = _
 

azure-pipelines.yml

@@ -7,15 +7,13 @@ variables:
   outputFolder: './_output'
   artifactsFolder: './_artifacts'
   testsFolder: './_tests'
-  majorVersion: '0.2.0'
+  majorVersion: '0.1.10'
   minorVersion: $[counter('minorVersion', 1)]
   prowlarrVersion: '$(majorVersion).$(minorVersion)'
   buildName: '$(Build.SourceBranchName).$(prowlarrVersion)'
   sentryOrg: 'servarr'
   sentryUrl: 'https://sentry.servarr.com'
-  dotnetVersion: '6.0.201'
-  innoVersion: '6.2.0'
-  nodeVersion: '16.x'
+  dotnetVersion: '6.0.100'
   yarnCacheFolder: $(Pipeline.Workspace)/.yarn
 
 trigger:
@@ -157,7 +155,7 @@ stages:
       - task: NodeTool@0
         displayName: Set Node.js version
         inputs:
-          versionSpec: $(nodeVersion)
+          versionSpec: '12.x'
       - checkout: self
         submodules: true
         fetchDepth: 1
@@ -202,11 +200,16 @@ stages:
           artifactName: WindowsFrontend
           targetPath: _output
         displayName: Fetch Frontend
+      - bash: ./build.sh --packages
+        displayName: Create Packages
       - bash: |
-          ./build.sh --packages --installer
-          cp distribution/windows/setup/output/Prowlarr.*win-x64.exe ${BUILD_ARTIFACTSTAGINGDIRECTORY}/Prowlarr.${BUILDNAME}.windows-core-x64-installer.exe
-          cp distribution/windows/setup/output/Prowlarr.*win-x86.exe ${BUILD_ARTIFACTSTAGINGDIRECTORY}/Prowlarr.${BUILDNAME}.windows-core-x86-installer.exe
-        displayName: Create Installers
+          distribution/windows/setup/inno/ISCC.exe distribution/windows/setup/prowlarr.iss //DFramework=net6.0 //DRuntime=win-x86
+          cp distribution/windows/setup/output/Prowlarr.*windows.net6.0.exe ${BUILD_ARTIFACTSTAGINGDIRECTORY}/Prowlarr.${BUILDNAME}.windows-core-x86-installer.exe
+        displayName: Create x86 .NET Core Windows installer
+      - bash: |
+          distribution/windows/setup/inno/ISCC.exe distribution/windows/setup/prowlarr.iss //DFramework=net6.0 //DRuntime=win-x64
+          cp distribution/windows/setup/output/Prowlarr.*windows.net6.0.exe ${BUILD_ARTIFACTSTAGINGDIRECTORY}/Prowlarr.${BUILDNAME}.windows-core-x64-installer.exe
+        displayName: Create x64 .NET Core Windows installer
       - publish: $(Build.ArtifactStagingDirectory)
         artifact: 'WindowsInstaller'
         displayName: Publish Installer
@@ -703,17 +706,17 @@ stages:
             osName: 'Linux'
             imageName: 'ubuntu-18.04'
             pattern: 'Prowlarr.*.linux-core-x64.tar.gz'
-            failBuild: true
+            failBuild: false
           Mac:
             osName: 'Mac'
             imageName: 'macos-10.15'
             pattern: 'Prowlarr.*.osx-core-x64.tar.gz'
-            failBuild: true
+            failBuild: false
           Windows:
             osName: 'Windows'
             imageName: 'windows-2019'
             pattern: 'Prowlarr.*.windows-core-x64.zip'
-            failBuild: true
+            failBuild: false
 
       pool:
         vmImage: $(imageName)
@@ -804,7 +807,7 @@ stages:
       - task: NodeTool@0
         displayName: Set Node.js version
         inputs:
-          versionSpec: $(nodeVersion)
+          versionSpec: '12.x'
       - checkout: self
         submodules: true
         fetchDepth: 1
@@ -941,7 +944,7 @@ stages:
     - job:
       displayName: Discord Notification
       pool:
-        vmImage: 'ubuntu-18.04'
+        vmImage: 'windows-2019'
       steps:
         - task: DownloadPipelineArtifact@2
           continueOnError: true

build.sh

@@ -234,32 +234,6 @@ Package()
     esac
 }
 
-BuildInstaller()
-{
-    local framework="$1"
-    local runtime="$2"
-    
-    ./_inno/ISCC.exe distribution/windows/setup/prowlarr.iss "//DFramework=$framework" "//DRuntime=$runtime"
-}
-
-InstallInno()
-{
-    ProgressStart "Installing portable Inno Setup"
-    
-    rm -rf _inno
-    curl -s --output innosetup.exe "https://files.jrsoftware.org/is/6/innosetup-${INNOVERSION:-6.2.0}.exe"
-    mkdir _inno
-    ./innosetup.exe //portable=1 //silent //currentuser //dir=.\\_inno
-    rm innosetup.exe
-    
-    ProgressEnd "Installed portable Inno Setup"
-}
-
-RemoveInno()
-{
-    rm -rf _inno
-}
-
 PackageTests()
 {
     local framework="$1"
@@ -291,7 +265,6 @@ if [ $# -eq 0 ]; then
     BACKEND=YES
     FRONTEND=YES
     PACKAGES=YES
-    INSTALLER=NO
     LINT=YES
     ENABLE_BSD=NO
 fi
@@ -327,10 +300,6 @@ case $key in
         PACKAGES=YES
         shift # past argument
         ;;
-    --installer)
-        INSTALLER=YES
-        shift # past argument
-        ;;
     --lint)
         LINT=YES
         shift # past argument
@@ -414,11 +383,3 @@ then
         Package "$FRAMEWORK" "$RID"
     fi
 fi
-
-if [ "$INSTALLER" = "YES" ];
-then
-    InstallInno
-    BuildInstaller "net6.0" "win-x64"
-    BuildInstaller "net6.0" "win-x86"
-    RemoveInno
-fi

distribution/osx/Prowlarr.app/Contents/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundleIconFile</key>
 	<string>prowlarr.icns</string>
 	<key>CFBundleIdentifier</key>
-	<string>com.osx.prowlarr.com</string>
+	<string>com.osx.prowlarr.video</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>

distribution/windows/setup/build.bat

@@ -0,0 +1,3 @@
+#SET BUILD_NUMBER=1
+#SET branch=develop
+inno\ISCC.exe prowlarr.iss

distribution/windows/setup/inno/Default.isl

@@ -0,0 +1,336 @@
+; *** Inno Setup version 5.5.3+ English messages ***
+;
+; To download user-contributed translations of this file, go to:
+;   http://www.jrsoftware.org/files/istrans/
+;
+; Note: When translating this text, do not add periods (.) to the end of
+; messages that didn't have them already, because on those messages Inno
+; Setup adds the periods automatically (appending a period would result in
+; two periods being displayed).
+
+[LangOptions]
+; The following three entries are very important. Be sure to read and 
+; understand the '[LangOptions] section' topic in the help file.
+LanguageName=English
+LanguageID=$0409
+LanguageCodePage=0
+; If the language you are translating to requires special font faces or
+; sizes, uncomment any of the following entries and change them accordingly.
+;DialogFontName=
+;DialogFontSize=8
+;WelcomeFontName=Verdana
+;WelcomeFontSize=12
+;TitleFontName=Arial
+;TitleFontSize=29
+;CopyrightFontName=Arial
+;CopyrightFontSize=8
+
+[Messages]
+
+; *** Application titles
+SetupAppTitle=Setup
+SetupWindowTitle=Setup - %1
+UninstallAppTitle=Uninstall
+UninstallAppFullTitle=%1 Uninstall
+
+; *** Misc. common
+InformationTitle=Information
+ConfirmTitle=Confirm
+ErrorTitle=Error
+
+; *** SetupLdr messages
+SetupLdrStartupMessage=This will install %1. Do you wish to continue?
+LdrCannotCreateTemp=Unable to create a temporary file. Setup aborted
+LdrCannotExecTemp=Unable to execute file in the temporary directory. Setup aborted
+
+; *** Startup error messages
+LastErrorMessage=%1.%n%nError %2: %3
+SetupFileMissing=The file %1 is missing from the installation directory. Please correct the problem or obtain a new copy of the program.
+SetupFileCorrupt=The setup files are corrupted. Please obtain a new copy of the program.
+SetupFileCorruptOrWrongVer=The setup files are corrupted, or are incompatible with this version of Setup. Please correct the problem or obtain a new copy of the program.
+InvalidParameter=An invalid parameter was passed on the command line:%n%n%1
+SetupAlreadyRunning=Setup is already running.
+WindowsVersionNotSupported=This program does not support the version of Windows your computer is running.
+WindowsServicePackRequired=This program requires %1 Service Pack %2 or later.
+NotOnThisPlatform=This program will not run on %1.
+OnlyOnThisPlatform=This program must be run on %1.
+OnlyOnTheseArchitectures=This program can only be installed on versions of Windows designed for the following processor architectures:%n%n%1
+MissingWOW64APIs=The version of Windows you are running does not include functionality required by Setup to perform a 64-bit installation. To correct this problem, please install Service Pack %1.
+WinVersionTooLowError=This program requires %1 version %2 or later.
+WinVersionTooHighError=This program cannot be installed on %1 version %2 or later.
+AdminPrivilegesRequired=You must be logged in as an administrator when installing this program.
+PowerUserPrivilegesRequired=You must be logged in as an administrator or as a member of the Power Users group when installing this program.
+SetupAppRunningError=Setup has detected that %1 is currently running.%n%nPlease close all instances of it now, then click OK to continue, or Cancel to exit.
+UninstallAppRunningError=Uninstall has detected that %1 is currently running.%n%nPlease close all instances of it now, then click OK to continue, or Cancel to exit.
+
+; *** Misc. errors
+ErrorCreatingDir=Setup was unable to create the directory "%1"
+ErrorTooManyFilesInDir=Unable to create a file in the directory "%1" because it contains too many files
+
+; *** Setup common messages
+ExitSetupTitle=Exit Setup
+ExitSetupMessage=Setup is not complete. If you exit now, the program will not be installed.%n%nYou may run Setup again at another time to complete the installation.%n%nExit Setup?
+AboutSetupMenuItem=&About Setup...
+AboutSetupTitle=About Setup
+AboutSetupMessage=%1 version %2%n%3%n%n%1 home page:%n%4
+AboutSetupNote=
+TranslatorNote=
+
+; *** Buttons
+ButtonBack=< &Back
+ButtonNext=&Next >
+ButtonInstall=&Install
+ButtonOK=OK
+ButtonCancel=Cancel
+ButtonYes=&Yes
+ButtonYesToAll=Yes to &All
+ButtonNo=&No
+ButtonNoToAll=N&o to All
+ButtonFinish=&Finish
+ButtonBrowse=&Browse...
+ButtonWizardBrowse=B&rowse...
+ButtonNewFolder=&Make New Folder
+
+; *** "Select Language" dialog messages
+SelectLanguageTitle=Select Setup Language
+SelectLanguageLabel=Select the language to use during the installation:
+
+; *** Common wizard text
+ClickNext=Click Next to continue, or Cancel to exit Setup.
+BeveledLabel=
+BrowseDialogTitle=Browse For Folder
+BrowseDialogLabel=Select a folder in the list below, then click OK.
+NewFolderName=New Folder
+
+; *** "Welcome" wizard page
+WelcomeLabel1=Welcome to the [name] Setup Wizard
+WelcomeLabel2=This will install [name/ver] on your computer.%n%nIt is recommended that you close all other applications before continuing.
+
+; *** "Password" wizard page
+WizardPassword=Password
+PasswordLabel1=This installation is password protected.
+PasswordLabel3=Please provide the password, then click Next to continue. Passwords are case-sensitive.
+PasswordEditLabel=&Password:
+IncorrectPassword=The password you entered is not correct. Please try again.
+
+; *** "License Agreement" wizard page
+WizardLicense=License Agreement
+LicenseLabel=Please read the following important information before continuing.
+LicenseLabel3=Please read the following License Agreement. You must accept the terms of this agreement before continuing with the installation.
+LicenseAccepted=I &accept the agreement
+LicenseNotAccepted=I &do not accept the agreement
+
+; *** "Information" wizard pages
+WizardInfoBefore=Information
+InfoBeforeLabel=Please read the following important information before continuing.
+InfoBeforeClickLabel=When you are ready to continue with Setup, click Next.
+WizardInfoAfter=Information
+InfoAfterLabel=Please read the following important information before continuing.
+InfoAfterClickLabel=When you are ready to continue with Setup, click Next.
+
+; *** "User Information" wizard page
+WizardUserInfo=User Information
+UserInfoDesc=Please enter your information.
+UserInfoName=&User Name:
+UserInfoOrg=&Organization:
+UserInfoSerial=&Serial Number:
+UserInfoNameRequired=You must enter a name.
+
+; *** "Select Destination Location" wizard page
+WizardSelectDir=Select Destination Location
+SelectDirDesc=Where should [name] be installed?
+SelectDirLabel3=Setup will install [name] into the following folder.
+SelectDirBrowseLabel=To continue, click Next. If you would like to select a different folder, click Browse.
+DiskSpaceMBLabel=At least [mb] MB of free disk space is required.
+CannotInstallToNetworkDrive=Setup cannot install to a network drive.
+CannotInstallToUNCPath=Setup cannot install to a UNC path.
+InvalidPath=You must enter a full path with drive letter; for example:%n%nC:\APP%n%nor a UNC path in the form:%n%n\\server\share
+InvalidDrive=The drive or UNC share you selected does not exist or is not accessible. Please select another.
+DiskSpaceWarningTitle=Not Enough Disk Space
+DiskSpaceWarning=Setup requires at least %1 KB of free space to install, but the selected drive only has %2 KB available.%n%nDo you want to continue anyway?
+DirNameTooLong=The folder name or path is too long.
+InvalidDirName=The folder name is not valid.
+BadDirName32=Folder names cannot include any of the following characters:%n%n%1
+DirExistsTitle=Folder Exists
+DirExists=The folder:%n%n%1%n%nalready exists. Would you like to install to that folder anyway?
+DirDoesntExistTitle=Folder Does Not Exist
+DirDoesntExist=The folder:%n%n%1%n%ndoes not exist. Would you like the folder to be created?
+
+; *** "Select Components" wizard page
+WizardSelectComponents=Select Components
+SelectComponentsDesc=Which components should be installed?
+SelectComponentsLabel2=Select the components you want to install; clear the components you do not want to install. Click Next when you are ready to continue.
+FullInstallation=Full installation
+; if possible don't translate 'Compact' as 'Minimal' (I mean 'Minimal' in your language)
+CompactInstallation=Compact installation
+CustomInstallation=Custom installation
+NoUninstallWarningTitle=Components Exist
+NoUninstallWarning=Setup has detected that the following components are already installed on your computer:%n%n%1%n%nDeselecting these components will not uninstall them.%n%nWould you like to continue anyway?
+ComponentSize1=%1 KB
+ComponentSize2=%1 MB
+ComponentsDiskSpaceMBLabel=Current selection requires at least [mb] MB of disk space.
+
+; *** "Select Additional Tasks" wizard page
+WizardSelectTasks=Select Additional Tasks
+SelectTasksDesc=Which additional tasks should be performed?
+SelectTasksLabel2=Select the additional tasks you would like Setup to perform while installing [name], then click Next.
+
+; *** "Select Start Menu Folder" wizard page
+WizardSelectProgramGroup=Select Start Menu Folder
+SelectStartMenuFolderDesc=Where should Setup place the program's shortcuts?
+SelectStartMenuFolderLabel3=Setup will create the program's shortcuts in the following Start Menu folder.
+SelectStartMenuFolderBrowseLabel=To continue, click Next. If you would like to select a different folder, click Browse.
+MustEnterGroupName=You must enter a folder name.
+GroupNameTooLong=The folder name or path is too long.
+InvalidGroupName=The folder name is not valid.
+BadGroupName=The folder name cannot include any of the following characters:%n%n%1
+NoProgramGroupCheck2=&Don't create a Start Menu folder
+
+; *** "Ready to Install" wizard page
+WizardReady=Ready to Install
+ReadyLabel1=Setup is now ready to begin installing [name] on your computer.
+ReadyLabel2a=Click Install to continue with the installation, or click Back if you want to review or change any settings.
+ReadyLabel2b=Click Install to continue with the installation.
+ReadyMemoUserInfo=User information:
+ReadyMemoDir=Destination location:
+ReadyMemoType=Setup type:
+ReadyMemoComponents=Selected components:
+ReadyMemoGroup=Start Menu folder:
+ReadyMemoTasks=Additional tasks:
+
+; *** "Preparing to Install" wizard page
+WizardPreparing=Preparing to Install
+PreparingDesc=Setup is preparing to install [name] on your computer.
+PreviousInstallNotCompleted=The installation/removal of a previous program was not completed. You will need to restart your computer to complete that installation.%n%nAfter restarting your computer, run Setup again to complete the installation of [name].
+CannotContinue=Setup cannot continue. Please click Cancel to exit.
+ApplicationsFound=The following applications are using files that need to be updated by Setup. It is recommended that you allow Setup to automatically close these applications.
+ApplicationsFound2=The following applications are using files that need to be updated by Setup. It is recommended that you allow Setup to automatically close these applications. After the installation has completed, Setup will attempt to restart the applications.
+CloseApplications=&Automatically close the applications
+DontCloseApplications=&Do not close the applications
+ErrorCloseApplications=Setup was unable to automatically close all applications. It is recommended that you close all applications using files that need to be updated by Setup before continuing.
+
+; *** "Installing" wizard page
+WizardInstalling=Installing
+InstallingLabel=Please wait while Setup installs [name] on your computer.
+
+; *** "Setup Completed" wizard page
+FinishedHeadingLabel=Completing the [name] Setup Wizard
+FinishedLabelNoIcons=Setup has finished installing [name] on your computer.
+FinishedLabel=Setup has finished installing [name] on your computer. The application may be launched by selecting the installed icons.
+ClickFinish=Click Finish to exit Setup.
+FinishedRestartLabel=To complete the installation of [name], Setup must restart your computer. Would you like to restart now?
+FinishedRestartMessage=To complete the installation of [name], Setup must restart your computer.%n%nWould you like to restart now?
+ShowReadmeCheck=Yes, I would like to view the README file
+YesRadio=&Yes, restart the computer now
+NoRadio=&No, I will restart the computer later
+; used for example as 'Run MyProg.exe'
+RunEntryExec=Run %1
+; used for example as 'View Readme.txt'
+RunEntryShellExec=View %1
+
+; *** "Setup Needs the Next Disk" stuff
+ChangeDiskTitle=Setup Needs the Next Disk
+SelectDiskLabel2=Please insert Disk %1 and click OK.%n%nIf the files on this disk can be found in a folder other than the one displayed below, enter the correct path or click Browse.
+PathLabel=&Path:
+FileNotInDir2=The file "%1" could not be located in "%2". Please insert the correct disk or select another folder.
+SelectDirectoryLabel=Please specify the location of the next disk.
+
+; *** Installation phase messages
+SetupAborted=Setup was not completed.%n%nPlease correct the problem and run Setup again.
+EntryAbortRetryIgnore=Click Retry to try again, Ignore to proceed anyway, or Abort to cancel installation.
+
+; *** Installation status messages
+StatusClosingApplications=Closing applications...
+StatusCreateDirs=Creating directories...
+StatusExtractFiles=Extracting files...
+StatusCreateIcons=Creating shortcuts...
+StatusCreateIniEntries=Creating INI entries...
+StatusCreateRegistryEntries=Creating registry entries...
+StatusRegisterFiles=Registering files...
+StatusSavingUninstall=Saving uninstall information...
+StatusRunProgram=Finishing installation...
+StatusRestartingApplications=Restarting applications...
+StatusRollback=Rolling back changes...
+
+; *** Misc. errors
+ErrorInternal2=Internal error: %1
+ErrorFunctionFailedNoCode=%1 failed
+ErrorFunctionFailed=%1 failed; code %2
+ErrorFunctionFailedWithMessage=%1 failed; code %2.%n%3
+ErrorExecutingProgram=Unable to execute file:%n%1
+
+; *** Registry errors
+ErrorRegOpenKey=Error opening registry key:%n%1\%2
+ErrorRegCreateKey=Error creating registry key:%n%1\%2
+ErrorRegWriteKey=Error writing to registry key:%n%1\%2
+
+; *** INI errors
+ErrorIniEntry=Error creating INI entry in file "%1".
+
+; *** File copying errors
+FileAbortRetryIgnore=Click Retry to try again, Ignore to skip this file (not recommended), or Abort to cancel installation.
+FileAbortRetryIgnore2=Click Retry to try again, Ignore to proceed anyway (not recommended), or Abort to cancel installation.
+SourceIsCorrupted=The source file is corrupted
+SourceDoesntExist=The source file "%1" does not exist
+ExistingFileReadOnly=The existing file is marked as read-only.%n%nClick Retry to remove the read-only attribute and try again, Ignore to skip this file, or Abort to cancel installation.
+ErrorReadingExistingDest=An error occurred while trying to read the existing file:
+FileExists=The file already exists.%n%nWould you like Setup to overwrite it?
+ExistingFileNewer=The existing file is newer than the one Setup is trying to install. It is recommended that you keep the existing file.%n%nDo you want to keep the existing file?
+ErrorChangingAttr=An error occurred while trying to change the attributes of the existing file:
+ErrorCreatingTemp=An error occurred while trying to create a file in the destination directory:
+ErrorReadingSource=An error occurred while trying to read the source file:
+ErrorCopying=An error occurred while trying to copy a file:
+ErrorReplacingExistingFile=An error occurred while trying to replace the existing file:
+ErrorRestartReplace=RestartReplace failed:
+ErrorRenamingTemp=An error occurred while trying to rename a file in the destination directory:
+ErrorRegisterServer=Unable to register the DLL/OCX: %1
+ErrorRegSvr32Failed=RegSvr32 failed with exit code %1
+ErrorRegisterTypeLib=Unable to register the type library: %1
+
+; *** Post-installation errors
+ErrorOpeningReadme=An error occurred while trying to open the README file.
+ErrorRestartingComputer=Setup was unable to restart the computer. Please do this manually.
+
+; *** Uninstaller messages
+UninstallNotFound=File "%1" does not exist. Cannot uninstall.
+UninstallOpenError=File "%1" could not be opened. Cannot uninstall
+UninstallUnsupportedVer=The uninstall log file "%1" is in a format not recognized by this version of the uninstaller. Cannot uninstall
+UninstallUnknownEntry=An unknown entry (%1) was encountered in the uninstall log
+ConfirmUninstall=Are you sure you want to completely remove %1 and all of its components?
+UninstallOnlyOnWin64=This installation can only be uninstalled on 64-bit Windows.
+OnlyAdminCanUninstall=This installation can only be uninstalled by a user with administrative privileges.
+UninstallStatusLabel=Please wait while %1 is removed from your computer.
+UninstalledAll=%1 was successfully removed from your computer.
+UninstalledMost=%1 uninstall complete.%n%nSome elements could not be removed. These can be removed manually.
+UninstalledAndNeedsRestart=To complete the uninstallation of %1, your computer must be restarted.%n%nWould you like to restart now?
+UninstallDataCorrupted="%1" file is corrupted. Cannot uninstall
+
+; *** Uninstallation phase messages
+ConfirmDeleteSharedFileTitle=Remove Shared File?
+ConfirmDeleteSharedFile2=The system indicates that the following shared file is no longer in use by any programs. Would you like for Uninstall to remove this shared file?%n%nIf any programs are still using this file and it is removed, those programs may not function properly. If you are unsure, choose No. Leaving the file on your system will not cause any harm.
+SharedFileNameLabel=File name:
+SharedFileLocationLabel=Location:
+WizardUninstalling=Uninstall Status
+StatusUninstalling=Uninstalling %1...
+
+; *** Shutdown block reasons
+ShutdownBlockReasonInstallingApp=Installing %1.
+ShutdownBlockReasonUninstallingApp=Uninstalling %1.
+
+; The custom messages below aren't used by Setup itself, but if you make
+; use of them in your scripts, you'll want to translate them.
+
+[CustomMessages]
+
+NameAndVersion=%1 version %2
+AdditionalIcons=Additional icons:
+CreateDesktopIcon=Create a &desktop icon
+CreateQuickLaunchIcon=Create a &Quick Launch icon
+ProgramOnTheWeb=%1 on the Web
+UninstallProgram=Uninstall %1
+LaunchProgram=Launch %1
+AssocFileExtension=&Associate %1 with the %2 file extension
+AssocingFileExtension=Associating %1 with the %2 file extension...
+AutoStartProgramGroupDescription=Startup:
+AutoStartProgram=Automatically start %1
+AddonHostProgramNotFound=%1 could not be located in the folder you selected.%n%nDo you want to continue anyway?

distribution/windows/setup/prowlarr.iss

@@ -3,12 +3,13 @@
 
 #define AppName "Prowlarr"
 #define AppPublisher "Team Prowlarr"
-#define AppURL "https://prowlarr.com/"
-#define ForumsURL "https://prowlarr.com/discord/"
+#define AppURL "https://prowlarr.video/"
+#define ForumsURL "https://forums.prowlarr.video/"
 #define AppExeName "Prowlarr.exe"
 #define BaseVersion GetEnv('MAJORVERSION')
 #define BuildNumber GetEnv('MINORVERSION')
 #define BuildVersion GetEnv('PROWLARRVERSION')
+#define BranchName GetEnv('BUILD_SOURCEBRANCHNAME')
 
 [Setup]
 ; NOTE: The value of AppId uniquely identifies this application.
@@ -21,15 +22,15 @@ AppPublisher={#AppPublisher}
 AppPublisherURL={#AppURL}
 AppSupportURL={#ForumsURL}
 AppUpdatesURL={#AppURL}
-DefaultDirName={commonappdata}\Prowlarr
+DefaultDirName={commonappdata}\Prowlarr\bin
 DisableDirPage=yes
 DefaultGroupName={#AppName}
 DisableProgramGroupPage=yes
-OutputBaseFilename=Prowlarr.{#BuildVersion}.{#Runtime}
+OutputBaseFilename=Prowlarr.{#BranchName}.{#BuildVersion}.windows.{#Framework}
 SolidCompression=yes
 AppCopyright=Creative Commons 3.0 License
 AllowUNCPath=False
-UninstallDisplayIcon={app}\bin\Prowlarr.exe
+UninstallDisplayIcon={app}\Prowlarr.exe
 DisableReadyPage=True
 CompressionThreads=2
 Compression=lzma2/normal
@@ -37,7 +38,6 @@ AppContact={#ForumsURL}
 VersionInfoVersion={#BaseVersion}.{#BuildNumber}
 SetupLogging=yes
 OutputDir=output
-WizardStyle=modern
 
 [Languages]
 Name: "english"; MessagesFile: "compiler:Default.isl"
@@ -48,31 +48,28 @@ Name: "windowsService"; Description: "Install Windows Service (Starts when the c
 Name: "startupShortcut"; Description: "Create shortcut in Startup folder (Starts when you log into Windows)"; GroupDescription: "Start automatically"; Flags: exclusive unchecked
 Name: "none"; Description: "Do not start automatically"; GroupDescription: "Start automatically"; Flags: exclusive unchecked
 
-[Dirs]
-Name: "{app}"; Permissions: users-modify
-
 [Files]
-Source: "..\..\..\_artifacts\{#Runtime}\{#Framework}\Prowlarr\Prowlarr.exe"; DestDir: "{app}\bin"; Flags: ignoreversion
-Source: "..\..\..\_artifacts\{#Runtime}\{#Framework}\Prowlarr\*"; Excludes: "Prowlarr.Update"; DestDir: "{app}\bin"; Flags: ignoreversion recursesubdirs createallsubdirs
+Source: "..\..\..\_artifacts\{#Runtime}\{#Framework}\Prowlarr\Prowlarr.exe"; DestDir: "{app}"; Flags: ignoreversion
+Source: "..\..\..\_artifacts\{#Runtime}\{#Framework}\Prowlarr\*"; Excludes: "Prowlarr.Update"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
 ; NOTE: Don't use "Flags: ignoreversion" on any shared system files
 
 [Icons]
-Name: "{group}\{#AppName}"; Filename: "{app}\bin\{#AppExeName}"; Parameters: "/icon"
-Name: "{commondesktop}\{#AppName}"; Filename: "{app}\bin\{#AppExeName}"; Parameters: "/icon"; Tasks: desktopIcon
-Name: "{userstartup}\{#AppName}"; Filename: "{app}\bin\Prowlarr.exe"; WorkingDir: "{app}\bin"; Tasks: startupShortcut
+Name: "{group}\{#AppName}"; Filename: "{app}\{#AppExeName}"; Parameters: "/icon"
+Name: "{commondesktop}\{#AppName}"; Filename: "{app}\{#AppExeName}"; Parameters: "/icon"; Tasks: desktopIcon
+Name: "{userstartup}\{#AppName}"; Filename: "{app}\Prowlarr.exe"; WorkingDir: "{app}"; Tasks: startupShortcut
 
 [InstallDelete]
-Name: "{app}\bin"; Type: filesandordirs
+Name: "{app}"; Type: filesandordirs
 
 [Run]
-Filename: "{app}\bin\Prowlarr.Console.exe"; StatusMsg: "Removing previous Windows Service"; Parameters: "/u /exitimmediately"; Flags: runhidden waituntilterminated;
-Filename: "{app}\bin\Prowlarr.Console.exe"; Description: "Enable Access from Other Devices"; StatusMsg: "Enabling Remote access"; Parameters: "/registerurl /exitimmediately"; Flags: postinstall runascurrentuser runhidden waituntilterminated; Tasks: startupShortcut none;
-Filename: "{app}\bin\Prowlarr.Console.exe"; StatusMsg: "Installing Windows Service"; Parameters: "/i /exitimmediately"; Flags: runhidden waituntilterminated; Tasks: windowsService
-Filename: "{app}\bin\Prowlarr.exe"; Description: "Open Prowlarr Web UI"; Flags: postinstall skipifsilent nowait; Tasks: windowsService;
-Filename: "{app}\bin\Prowlarr.exe"; Description: "Start Prowlarr"; Flags: postinstall skipifsilent nowait; Tasks: startupShortcut none;
+Filename: "{app}\Prowlarr.Console.exe"; StatusMsg: "Removing previous Windows Service"; Parameters: "/u /exitimmediately"; Flags: runhidden waituntilterminated;
+Filename: "{app}\Prowlarr.Console.exe"; Description: "Enable Access from Other Devices"; StatusMsg: "Enabling Remote access"; Parameters: "/registerurl /exitimmediately"; Flags: postinstall runascurrentuser runhidden waituntilterminated; Tasks: startupShortcut none;
+Filename: "{app}\Prowlarr.Console.exe"; StatusMsg: "Installing Windows Service"; Parameters: "/i /exitimmediately"; Flags: runhidden waituntilterminated; Tasks: windowsService
+Filename: "{app}\Prowlarr.exe"; Description: "Open Prowlarr Web UI"; Flags: postinstall skipifsilent nowait; Tasks: windowsService;
+Filename: "{app}\Prowlarr.exe"; Description: "Start Prowlarr"; Flags: postinstall skipifsilent nowait; Tasks: startupShortcut none;
 
 [UninstallRun]
-Filename: "{app}\bin\prowlarr.console.exe"; Parameters: "/u"; Flags: waituntilterminated skipifdoesntexist
+Filename: "{app}\prowlarr.console.exe"; Parameters: "/u"; Flags: waituntilterminated skipifdoesntexist
 
 [Code]
 function PrepareToInstall(var NeedsRestart: Boolean): String;

docs.sh

@@ -27,11 +27,11 @@ dotnet clean $slnFile -c Release
 dotnet msbuild -restore $slnFile -p:Configuration=Debug -p:Platform=$platform -p:RuntimeIdentifiers=$RUNTIME -t:PublishAllRids
 
 dotnet new tool-manifest
-dotnet tool install --version 6.3.0 Swashbuckle.AspNetCore.Cli
+dotnet tool install --version 6.2.3 Swashbuckle.AspNetCore.Cli
 
 dotnet tool run swagger tofile --output ./src/Prowlarr.Api.V1/openapi.json "$outputFolder/net6.0/$RUNTIME/prowlarr.console.dll" v1 &
 
-sleep 30
+sleep 10
 
 kill %1
 

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

@@ -8,7 +8,6 @@ import BoolFilterBuilderRowValue from './BoolFilterBuilderRowValue';
 import DateFilterBuilderRowValue from './DateFilterBuilderRowValue';
 import FilterBuilderRowValueConnector from './FilterBuilderRowValueConnector';
 import IndexerFilterBuilderRowValueConnector from './IndexerFilterBuilderRowValueConnector';
-import PrivacyFilterBuilderRowValue from './PrivacyFilterBuilderRowValue';
 import ProtocolFilterBuilderRowValue from './ProtocolFilterBuilderRowValue';
 import TagFilterBuilderRowValueConnector from './TagFilterBuilderRowValueConnector';
 import styles from './FilterBuilderRow.css';
@@ -64,9 +63,6 @@ function getRowValueConnector(selectedFilterBuilderProp) {
     case filterBuilderValueTypes.PROTOCOL:
       return ProtocolFilterBuilderRowValue;
 
-    case filterBuilderValueTypes.PRIVACY:
-      return PrivacyFilterBuilderRowValue;
-
     case filterBuilderValueTypes.TAG:
       return TagFilterBuilderRowValueConnector;
 

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

@@ -1,20 +0,0 @@
-import React from 'react';
-import translate from 'Utilities/String/translate';
-import FilterBuilderRowValue from './FilterBuilderRowValue';
-
-const privacyTypes = [
-  { id: 'public', name: translate('Public') },
-  { id: 'private', name: translate('Private') },
-  { id: 'semiPrivate', name: translate('SemiPrivate') }
-];
-
-function PrivacyFilterBuilderRowValue(props) {
-  return (
-    <FilterBuilderRowValue
-      tagList={privacyTypes}
-      {...props}
-    />
-  );
-}
-
-export default PrivacyFilterBuilderRowValue;

frontend/src/Components/Link/Link.js

@@ -47,6 +47,10 @@ class Link extends Component {
         el = 'a';
         linkProps.href = to;
         linkProps.target = target || '_self';
+      } else if (to.startsWith(`${window.Prowlarr.urlBase}/`)) {
+        el = RouterLink;
+        linkProps.to = to;
+        linkProps.target = target;
       } else {
         el = RouterLink;
         linkProps.to = `${window.Prowlarr.urlBase}/${to.replace(/^\//, '')}`;

frontend/src/Components/Modal/ModalError.js

@@ -37,8 +37,7 @@ function ModalError(props) {
           {translate('Close')}
         </Button>
       </ModalFooter>
-    </ModalContent>
-  );
+    </ModalContent>);
 }
 
 ModalError.propTypes = {

frontend/src/Components/Scroller/OverlayScroller.js

@@ -1,6 +1,6 @@
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
-import { Scrollbars } from 'react-custom-scrollbars-2';
+import { Scrollbars } from 'react-custom-scrollbars';
 import { scrollDirections } from 'Helpers/Props';
 import styles from './OverlayScroller.css';
 

frontend/src/Helpers/Props/filterBuilderValueTypes.js

@@ -4,7 +4,6 @@ export const DATE = 'date';
 export const DEFAULT = 'default';
 export const INDEXER = 'indexer';
 export const PROTOCOL = 'protocol';
-export const PRIVACY = 'privacy';
 export const APP_PROFILE = 'appProfile';
 export const MOVIE_STATUS = 'movieStatus';
 export const TAG = 'tag';

frontend/src/Indexer/Add/AddIndexerModal.js

@@ -4,7 +4,7 @@ import Modal from 'Components/Modal/Modal';
 import AddIndexerModalContentConnector from './AddIndexerModalContentConnector';
 import styles from './AddIndexerModal.css';
 
-function AddIndexerModal({ isOpen, onModalClose, onSelectIndexer, ...otherProps }) {
+function AddIndexerModal({ isOpen, onModalClose, ...otherProps }) {
   return (
     <Modal
       isOpen={isOpen}
@@ -14,7 +14,6 @@ function AddIndexerModal({ isOpen, onModalClose, onSelectIndexer, ...otherProps
       <AddIndexerModalContentConnector
         {...otherProps}
         onModalClose={onModalClose}
-        onSelectIndexer={onSelectIndexer}
       />
     </Modal>
   );
@@ -22,8 +21,7 @@ function AddIndexerModal({ isOpen, onModalClose, onSelectIndexer, ...otherProps
 
 AddIndexerModal.propTypes = {
   isOpen: PropTypes.bool.isRequired,
-  onModalClose: PropTypes.func.isRequired,
-  onSelectIndexer: PropTypes.func.isRequired
+  onModalClose: PropTypes.func.isRequired
 };
 
 export default AddIndexerModal;

frontend/src/Indexer/Add/AddIndexerModalContent.js

@@ -15,7 +15,7 @@ import TableBody from 'Components/Table/TableBody';
 import { kinds, scrollDirections } from 'Helpers/Props';
 import getErrorMessage from 'Utilities/Object/getErrorMessage';
 import translate from 'Utilities/String/translate';
-import SelectIndexerRowConnector from './SelectIndexerRowConnector';
+import SelectIndexerRow from './SelectIndexerRow';
 import styles from './AddIndexerModalContent.css';
 
 const columns = [
@@ -37,12 +37,6 @@ const columns = [
     isSortable: true,
     isVisible: true
   },
-  {
-    name: 'description',
-    label: translate('Description'),
-    isSortable: false,
-    isVisible: true
-  },
   {
     name: 'privacy',
     label: translate('Privacy'),
@@ -142,12 +136,12 @@ class AddIndexerModalContent extends Component {
       return true;
     });
 
-    const errorMessage = getErrorMessage(error, translate('UnableToLoadIndexers'));
+    const errorMessage = getErrorMessage(error, 'Unable to load indexers');
 
     return (
       <ModalContent onModalClose={onModalClose}>
         <ModalHeader>
-          {translate('AddIndexer')}
+          Add Indexer
         </ModalHeader>
 
         <ModalBody
@@ -225,7 +219,7 @@ class AddIndexerModalContent extends Component {
                   <TableBody>
                     {
                       filteredIndexers.map((indexer) => (
-                        <SelectIndexerRowConnector
+                        <SelectIndexerRow
                           key={indexer.name}
                           implementation={indexer.implementation}
                           {...indexer}

frontend/src/Indexer/Add/AddIndexerModalContentConnector.js

@@ -51,7 +51,7 @@ class AddIndexerModalContentConnector extends Component {
 
   onIndexerSelect = ({ implementation, name }) => {
     this.props.selectIndexerSchema({ implementation, name });
-    this.props.onSelectIndexer();
+    this.props.onModalClose({ indexerSelected: true });
   };
 
   onSortPress = (sortKey, sortDirection) => {
@@ -76,8 +76,7 @@ AddIndexerModalContentConnector.propTypes = {
   fetchIndexerSchema: PropTypes.func.isRequired,
   selectIndexerSchema: PropTypes.func.isRequired,
   setIndexerSchemaSort: PropTypes.func.isRequired,
-  onModalClose: PropTypes.func.isRequired,
-  onSelectIndexer: PropTypes.func.isRequired
+  onModalClose: PropTypes.func.isRequired
 };
 
 export default connect(createMapStateToProps, mapDispatchToProps)(AddIndexerModalContentConnector);

frontend/src/Indexer/Add/SelectIndexerRow.css

@@ -3,9 +3,3 @@
 
   width: 32px;
 }
-
-.alreadyExistsIcon {
-  margin-left: 10px;
-  color: #37bc9b;
-  pointer-events: all;
-}

frontend/src/Indexer/Add/SelectIndexerRow.js

@@ -1,9 +1,7 @@
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
-import Icon from 'Components/Icon';
 import TableRowCell from 'Components/Table/Cells/TableRowCell';
 import TableRowButton from 'Components/Table/TableRowButton';
-import { icons } from 'Helpers/Props';
 import ProtocolLabel from 'Indexer/Index/Table/ProtocolLabel';
 import firstCharToUpper from 'Utilities/String/firstCharToUpper';
 import translate from 'Utilities/String/translate';
@@ -31,9 +29,7 @@ class SelectIndexerRow extends Component {
       protocol,
       privacy,
       name,
-      language,
-      description,
-      isExistingIndexer
+      language
     } = this.props;
 
     return (
@@ -46,26 +42,12 @@ class SelectIndexerRow extends Component {
 
         <TableRowCell>
           {name}
-          {
-            isExistingIndexer ?
-              <Icon
-                className={styles.alreadyExistsIcon}
-                name={icons.CHECK_CIRCLE}
-                size={15}
-                title={translate('IndexerAlreadySetup')}
-              /> :
-              null
-          }
         </TableRowCell>
 
         <TableRowCell>
           {language}
         </TableRowCell>
 
-        <TableRowCell>
-          {description}
-        </TableRowCell>
-
         <TableRowCell>
           {translate(firstCharToUpper(privacy))}
         </TableRowCell>
@@ -79,10 +61,8 @@ SelectIndexerRow.propTypes = {
   protocol: PropTypes.string.isRequired,
   privacy: PropTypes.string.isRequired,
   language: PropTypes.string.isRequired,
-  description: PropTypes.string.isRequired,
   implementation: PropTypes.string.isRequired,
-  onIndexerSelect: PropTypes.func.isRequired,
-  isExistingIndexer: PropTypes.bool.isRequired
+  onIndexerSelect: PropTypes.func.isRequired
 };
 
 export default SelectIndexerRow;

frontend/src/Indexer/Add/SelectIndexerRowConnector.js

@@ -1,18 +0,0 @@
-
-import { connect } from 'react-redux';
-import { createSelector } from 'reselect';
-import createExistingIndexerSelector from 'Store/Selectors/createExistingIndexerSelector';
-import SelectIndexerRow from './SelectIndexerRow';
-
-function createMapStateToProps() {
-  return createSelector(
-    createExistingIndexerSelector(),
-    (isExistingIndexer, dimensions) => {
-      return {
-        isExistingIndexer
-      };
-    }
-  );
-}
-
-export default connect(createMapStateToProps)(SelectIndexerRow);

frontend/src/Indexer/Edit/EditIndexerModalContent.js

@@ -39,7 +39,6 @@ function EditIndexerModalContent(props) {
   const {
     id,
     implementationName,
-    definitionName,
     name,
     enable,
     redirect,
@@ -51,12 +50,10 @@ function EditIndexerModalContent(props) {
     priority
   } = item;
 
-  const indexerDisplayName = implementationName === definitionName ? implementationName : `${implementationName} (${definitionName})`;
-
   return (
     <ModalContent onModalClose={onModalClose}>
       <ModalHeader>
-        {`${id ? translate('EditIndexer') : translate('AddIndexer')} - ${indexerDisplayName}`}
+        {`${id ? translate('EditIndexer') : translate('AddIndexer')} - ${implementationName}`}
       </ModalHeader>
 
       <ModalBody>

frontend/src/Indexer/Index/IndexerIndex.js

@@ -193,12 +193,11 @@ class IndexerIndex extends Component {
     this.setState({ isAddIndexerModalOpen: true });
   };
 
-  onAddIndexerModalClose = () => {
-    this.setState({ isAddIndexerModalOpen: false });
-  };
-
-  onAddIndexerSelectIndexer = () => {
-    this.setState({ isEditIndexerModalOpen: true });
+  onAddIndexerModalClose = ({ indexerSelected = false } = {}) => {
+    this.setState({
+      isAddIndexerModalOpen: false,
+      isEditIndexerModalOpen: indexerSelected
+    });
   };
 
   onEditIndexerModalClose = () => {
@@ -464,7 +463,6 @@ class IndexerIndex extends Component {
         <AddIndexerModal
           isOpen={isAddIndexerModalOpen}
           onModalClose={this.onAddIndexerModalClose}
-          onSelectIndexer={this.onAddIndexerSelectIndexer}
         />
 
         <EditIndexerModalConnector

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

@@ -190,7 +190,7 @@ class IndexerIndexRow extends Component {
                   key={name}
                   className={styles[column.name]}
                 >
-                  {appProfile?.name || ''}
+                  {appProfile.name}
                 </VirtualTableRowCell>
               );
             }
@@ -244,15 +244,12 @@ class IndexerIndexRow extends Component {
                     onPress={this.onIndexerInfoPress}
                   />
 
-                  {
-                    indexerUrls ?
-                      <IconButton
-                        className={styles.externalLink}
-                        name={icons.EXTERNAL_LINK}
-                        title={translate('Website')}
-                        to={indexerUrls[0].replace('api.', '')}
-                      /> : null
-                  }
+                  <IconButton
+                    className={styles.externalLink}
+                    name={icons.EXTERNAL_LINK}
+                    title={translate('Website')}
+                    to={indexerUrls[0].replace('api.', '')}
+                  />
 
                   <IconButton
                     name={icons.EDIT}
@@ -292,7 +289,7 @@ class IndexerIndexRow extends Component {
 
 IndexerIndexRow.propTypes = {
   id: PropTypes.number.isRequired,
-  indexerUrls: PropTypes.arrayOf(PropTypes.string),
+  indexerUrls: PropTypes.arrayOf(PropTypes.string).isRequired,
   protocol: PropTypes.string.isRequired,
   privacy: PropTypes.string.isRequired,
   priority: PropTypes.number.isRequired,
@@ -301,7 +298,7 @@ IndexerIndexRow.propTypes = {
   redirect: PropTypes.bool.isRequired,
   appProfile: PropTypes.object.isRequired,
   status: PropTypes.object,
-  capabilities: PropTypes.object,
+  capabilities: PropTypes.object.isRequired,
   added: PropTypes.string.isRequired,
   tags: PropTypes.arrayOf(PropTypes.number).isRequired,
   columns: PropTypes.arrayOf(PropTypes.object).isRequired,

frontend/src/Indexer/Info/IndexerInfoModalContent.js

@@ -4,7 +4,6 @@ import DescriptionList from 'Components/DescriptionList/DescriptionList';
 import DescriptionListItem from 'Components/DescriptionList/DescriptionListItem';
 import DescriptionListItemDescription from 'Components/DescriptionList/DescriptionListItemDescription';
 import DescriptionListItemTitle from 'Components/DescriptionList/DescriptionListItemTitle';
-import FieldSet from 'Components/FieldSet';
 import Link from 'Components/Link/Link';
 import ModalBody from 'Components/Modal/ModalBody';
 import ModalContent from 'Components/Modal/ModalContent';
@@ -21,7 +20,6 @@ function IndexerInfoModalContent(props) {
     language,
     indexerUrls,
     protocol,
-    capabilities,
     onModalClose
   } = props;
 
@@ -32,78 +30,41 @@ function IndexerInfoModalContent(props) {
       </ModalHeader>
 
       <ModalBody>
-        <FieldSet legend={translate('IndexerDetails')}>
-          <div className={styles.groups}>
-            <DescriptionList>
-              <DescriptionListItem
-                descriptionClassName={styles.description}
-                title={translate('Id')}
-                data={id}
-              />
-              <DescriptionListItem
-                descriptionClassName={styles.description}
-                title={translate('Description')}
-                data={description ? description : '-'}
-              />
-              <DescriptionListItem
-                descriptionClassName={styles.description}
-                title={translate('Encoding')}
-                data={encoding ? encoding : '-'}
-              />
-              <DescriptionListItem
-                descriptionClassName={styles.description}
-                title={translate('Language')}
-                data={language ?? '-'}
-              />
-              <DescriptionListItemTitle>{translate('IndexerSite')}</DescriptionListItemTitle>
-              <DescriptionListItemDescription>
-                <Link to={indexerUrls[0]}>{indexerUrls[0]}</Link>
-              </DescriptionListItemDescription>
-              <DescriptionListItemTitle>{`${protocol === 'usenet' ? 'Newznab' : 'Torznab'} Url`}</DescriptionListItemTitle>
-              <DescriptionListItemDescription>
-                {`${window.location.origin}${window.Prowlarr.urlBase}/${id}/api`}
-              </DescriptionListItemDescription>
-            </DescriptionList>
-          </div>
-        </FieldSet>
-        <FieldSet legend={translate('SearchCapabilities')}>
-          <div className={styles.groups}>
-            <DescriptionList>
-              <DescriptionListItem
-                descriptionClassName={styles.description}
-                title={translate('RawSearchSupported')}
-                data={capabilities.supportsRawSearch ? translate('Yes') : translate('No')}
-              />
-              <DescriptionListItem
-                descriptionClassName={styles.description}
-                title={translate('SearchTypes')}
-                data={capabilities.searchParams.length === 0 ? translate('NotSupported') : capabilities.searchParams[0]}
-              />
-              <DescriptionListItem
-                descriptionClassName={styles.description}
-                title={translate('TVSearchTypes')}
-                data={capabilities.tvSearchParams.length === 0 ? translate('NotSupported') : capabilities.tvSearchParams.join(', ')}
-              />
-              <DescriptionListItem
-                descriptionClassName={styles.description}
-                title={translate('MovieSearchTypes')}
-                data={capabilities.movieSearchParams.length === 0 ? translate('NotSupported') : capabilities.movieSearchParams.join(', ')}
-              />
-              <DescriptionListItem
-                descriptionClassName={styles.description}
-                title={translate('BookSearchTypes')}
-                data={capabilities.bookSearchParams.length === 0 ? translate('NotSupported') : capabilities.bookSearchParams.join(', ')}
-              />
-              <DescriptionListItem
-                descriptionClassName={styles.description}
-                title={translate('MusicSearchTypes')}
-                data={capabilities.musicSearchParams.length === 0 ? translate('NotSupported') : capabilities.musicSearchParams.join(', ')}
-              />
-            </DescriptionList>
-          </div>
-        </FieldSet>
+        <DescriptionList>
+          <DescriptionListItem
+            descriptionClassName={styles.description}
+            title={translate('Id')}
+            data={id}
+          />
+          <DescriptionListItem
+            descriptionClassName={styles.description}
+            title={translate('Description')}
+            data={description ? description : '-'}
+          />
+          <DescriptionListItem
+            descriptionClassName={styles.description}
+            title={translate('Encoding')}
+            data={encoding ? encoding : '-'}
+          />
+          <DescriptionListItem
+            descriptionClassName={styles.description}
+            title={translate('Language')}
+            data={language ?? '-'}
+          />
+
+          <DescriptionListItemTitle>Indexer Site</DescriptionListItemTitle>
+          <DescriptionListItemDescription>
+            <Link to={indexerUrls[0]}>{indexerUrls[0]}</Link>
+          </DescriptionListItemDescription>
+
+          <DescriptionListItemTitle>{`${protocol === 'usenet' ? 'Newznab' : 'Torznab'} Url`}</DescriptionListItemTitle>
+          <DescriptionListItemDescription>
+            {`${window.location.origin}${window.Prowlarr.urlBase}/${id}/api`}
+          </DescriptionListItemDescription>
+
+        </DescriptionList>
       </ModalBody>
-    </ModalContent >
+    </ModalContent>
   );
 }
 
@@ -115,7 +76,6 @@ IndexerInfoModalContent.propTypes = {
   language: PropTypes.string.isRequired,
   indexerUrls: PropTypes.arrayOf(PropTypes.string).isRequired,
   protocol: PropTypes.string.isRequired,
-  capabilities: PropTypes.object.isRequired,
   onModalClose: PropTypes.func.isRequired
 };
 

frontend/src/Search/QueryParameterModal.js

@@ -248,7 +248,7 @@ class QueryParameterModal extends Component {
               onSelectionChange={this.onInputSelectionChange}
             />
             <Button onPress={onModalClose}>
-              {translate('Close')}
+              Close
             </Button>
           </ModalFooter>
         </ModalContent>

frontend/src/Search/SearchFooter.js

@@ -37,10 +37,7 @@ class SearchFooter extends Component {
       searchingReleases: false,
       searchQuery: defaultSearchQuery || '',
       searchIndexerIds: defaultIndexerIds,
-      searchCategories: defaultCategories,
-      searchLimit: 100,
-      searchOffset: 0,
-      newSearch: true
+      searchCategories: defaultCategories
     };
   }
 
@@ -118,28 +115,11 @@ class SearchFooter extends Component {
   };
 
   onSearchPress = () => {
-
-    const {
-      searchLimit,
-      searchOffset,
-      searchQuery,
-      searchIndexerIds,
-      searchCategories,
-      searchType
-    } = this.state;
-
-    this.props.onSearchPress(searchQuery, searchIndexerIds, searchCategories, searchType, searchLimit, searchOffset);
-
-    this.setState({ searchOffset: searchOffset + 100, newSearch: false });
+    this.props.onSearchPress(this.state.searchQuery, this.state.searchIndexerIds, this.state.searchCategories, this.state.searchType);
   };
 
   onSearchInputChange = ({ value }) => {
-    this.setState({ searchQuery: value, newSearch: true, searchOffset: 0 });
-  };
-
-  onInputChange = ({ name, value }) => {
-    this.props.onInputChange({ name, value });
-    this.setState({ newSearch: true, searchOffset: 0 });
+    this.setState({ searchQuery: value });
   };
 
   //
@@ -161,7 +141,6 @@ class SearchFooter extends Component {
       searchQuery,
       searchIndexerIds,
       searchCategories,
-      newSearch,
       isQueryParameterModalOpen,
       queryModalOptions,
       searchType
@@ -227,7 +206,7 @@ class SearchFooter extends Component {
             name='searchIndexerIds'
             value={searchIndexerIds}
             isDisabled={isFetching}
-            onChange={this.onInputChange}
+            onChange={onInputChange}
           />
         </div>
 
@@ -241,7 +220,7 @@ class SearchFooter extends Component {
             name='searchCategories'
             value={searchCategories}
             isDisabled={isFetching}
-            onChange={this.onInputChange}
+            onChange={onInputChange}
           />
         </div>
 
@@ -264,7 +243,7 @@ class SearchFooter extends Component {
                     isDisabled={isFetching || !hasIndexers || selectedCount === 0}
                     onPress={onBulkGrabPress}
                   >
-                    {translate('GrabReleases')}
+                    {translate('Grab Releases')}
                   </SpinnerButton>
               }
 
@@ -274,7 +253,7 @@ class SearchFooter extends Component {
                 isDisabled={isFetching || !hasIndexers}
                 onPress={this.onSearchPress}
               >
-                {newSearch ? translate('Search') : translate('More')}
+                {translate('Search')}
               </SpinnerButton>
             </div>
           </div>

frontend/src/Search/SearchIndex.js

@@ -196,8 +196,8 @@ class SearchIndex extends Component {
     this.setState({ jumpToCharacter });
   };
 
-  onSearchPress = (query, indexerIds, categories, type, limit, offset) => {
-    this.props.onSearchPress({ query, indexerIds, categories, type, limit, offset });
+  onSearchPress = (query, indexerIds, categories, type) => {
+    this.props.onSearchPress({ query, indexerIds, categories, type });
   };
 
   onBulkGrabPress = () => {

frontend/src/Store/Actions/indexerIndexActions.js

@@ -118,12 +118,12 @@ export const defaultState = {
   filterBuilderProps: [
     {
       name: 'name',
-      label: translate('IndexerName'),
+      label: 'Indexer Name',
       type: filterBuilderTypes.STRING
     },
     {
       name: 'enable',
-      label: translate('Enabled'),
+      label: 'Enabled',
       type: filterBuilderTypes.EXACT,
       valueType: filterBuilderValueTypes.BOOL
     },
@@ -135,21 +135,15 @@ export const defaultState = {
     },
     {
       name: 'priority',
-      label: translate('Priority'),
+      label: 'Priority',
       type: filterBuilderTypes.NUMBER
     },
     {
       name: 'protocol',
-      label: translate('Protocol'),
+      label: 'Protocol',
       type: filterBuilderTypes.EXACT,
       valueType: filterBuilderValueTypes.PROTOCOL
     },
-    {
-      name: 'privacy',
-      label: translate('Privacy'),
-      type: filterBuilderTypes.EXACT,
-      valueType: filterBuilderValueTypes.PRIVACY
-    },
     {
       name: 'appProfileId',
       label: translate('AppProfile'),

frontend/src/Store/Middleware/createSentryMiddleware.js

@@ -80,8 +80,8 @@ export default function createSentryMiddleware() {
     return;
   }
 
-  const dsn = isProduction ? 'https://b233094711fe4430a0b0c5da2e01df93@sentry.servarr.com/28' :
-    'https://116efebd253a4dff9df9475a31510001@sentry.servarr.com/37';
+  const dsn = isProduction ? 'https://b0fb75c38ef4487dbf742f79c4ba62d2@sentry.servarr.com/12' :
+    'https://da610619280249f891ec3ee306906793@sentry.servarr.com/13';
 
   sentry.init({
     dsn,

frontend/src/Store/Selectors/createExclusionMovieSelector.js

@@ -0,0 +1,14 @@
+import _ from 'lodash';
+import { createSelector } from 'reselect';
+
+function createExclusionMovieSelector() {
+  return createSelector(
+    (state, { tmdbId }) => tmdbId,
+    (state) => state.settings.importExclusions,
+    (tmdbId, importExclusions) => {
+      return _.some(importExclusions.items, { tmdbId });
+    }
+  );
+}
+
+export default createExclusionMovieSelector;

frontend/src/Store/Selectors/createExistingIndexerSelector.js

@@ -1,15 +0,0 @@
-import _ from 'lodash';
-import { createSelector } from 'reselect';
-import createAllIndexersSelector from './createAllIndexersSelector';
-
-function createExistingIndexerSelector() {
-  return createSelector(
-    (state, { definitionName }) => definitionName,
-    createAllIndexersSelector(),
-    (definitionName, indexers) => {
-      return _.some(indexers, { definitionName });
-    }
-  );
-}
-
-export default createExistingIndexerSelector;

frontend/src/Store/Selectors/createProfileInUseSelector.js

@@ -5,14 +5,13 @@ import createAllIndexersSelector from './createAllIndexersSelector';
 function createProfileInUseSelector(profileProp) {
   return createSelector(
     (state, { id }) => id,
-    (state) => state.settings.appProfiles.items,
     createAllIndexersSelector(),
-    (id, profiles, indexers) => {
+    (id, indexers) => {
       if (!id) {
         return false;
       }
 
-      if (_.some(indexers, { [profileProp]: id }) || profiles.length <= 1) {
+      if (_.some(indexers, { [profileProp]: id })) {
         return true;
       }
 

frontend/src/Store/Selectors/selectSettings.js

@@ -36,12 +36,6 @@ function selectSettings(item, pendingChanges, saveError) {
       return result;
     }
 
-    if (key === 'definitionName') {
-      result.definitionName = item[key];
-
-      return result;
-    }
-
     const setting = {
       value: item[key],
       errors: _.map(_.remove(validationFailures, (failure) => {

package.json

@@ -25,17 +25,17 @@
     "not chrome < 60"
   ],
   "dependencies": {
-    "@fortawesome/fontawesome-free": "6.1.1",
-    "@fortawesome/fontawesome-svg-core": "6.1.1",
-    "@fortawesome/free-regular-svg-icons": "6.1.1",
-    "@fortawesome/free-solid-svg-icons": "6.1.1",
-    "@fortawesome/react-fontawesome": "0.1.18",
-    "@microsoft/signalr": "6.0.3",
-    "@sentry/browser": "6.19.2",
-    "@sentry/integrations": "6.19.2",
-    "chart.js": "3.7.1",
+    "@fortawesome/fontawesome-free": "5.15.3",
+    "@fortawesome/fontawesome-svg-core": "1.2.35",
+    "@fortawesome/free-regular-svg-icons": "5.15.3",
+    "@fortawesome/free-solid-svg-icons": "5.15.3",
+    "@fortawesome/react-fontawesome": "0.1.14",
+    "@microsoft/signalr": "6.0.0",
+    "@sentry/browser": "6.15.0",
+    "@sentry/integrations": "6.15.0",
+    "chart.js": "3.2.0",
     "classnames": "2.3.1",
-    "clipboard": "2.0.10",
+    "clipboard": "2.0.8",
     "connected-react-router": "6.9.1",
     "element-class": "0.2.2",
     "filesize": "6.3.0",
@@ -45,16 +45,16 @@
     "jquery": "3.6.0",
     "lodash": "4.17.21",
     "mobile-detect": "1.4.5",
-    "moment": "2.29.2",
+    "moment": "2.29.1",
     "mousetrap": "1.6.5",
     "normalize.css": "8.0.1",
-    "prop-types": "15.8.1",
-    "qs": "6.10.3",
+    "prop-types": "15.7.2",
+    "qs": "6.10.1",
     "react": "17.0.2",
     "react-addons-shallow-compare": "15.6.3",
     "react-async-script": "1.2.0",
     "react-autosuggest": "10.1.0",
-    "react-custom-scrollbars-2": "4.4.0",
+    "react-custom-scrollbars": "4.2.1",
     "react-dnd": "14.0.4",
     "react-dnd-html5-backend": "14.0.2",
     "react-dnd-multi-backend": "6.0.2",
@@ -78,41 +78,41 @@
     "reselect": "4.0.0"
   },
   "devDependencies": {
-    "@babel/core": "7.17.8",
-    "@babel/eslint-parser": "7.17.0",
-    "@babel/plugin-proposal-class-properties": "7.16.7",
-    "@babel/plugin-proposal-decorators": "7.17.8",
-    "@babel/plugin-proposal-export-default-from": "7.16.7",
-    "@babel/plugin-proposal-export-namespace-from": "7.16.7",
-    "@babel/plugin-proposal-function-sent": "7.16.7",
-    "@babel/plugin-proposal-nullish-coalescing-operator": "7.16.7",
-    "@babel/plugin-proposal-numeric-separator": "7.16.7",
-    "@babel/plugin-proposal-optional-chaining": "7.16.7",
-    "@babel/plugin-proposal-throw-expressions": "7.16.7",
+    "@babel/core": "7.16.0",
+    "@babel/eslint-parser": "7.16.3",
+    "@babel/plugin-proposal-class-properties": "7.16.0",
+    "@babel/plugin-proposal-decorators": "7.16.4",
+    "@babel/plugin-proposal-export-default-from": "7.16.0",
+    "@babel/plugin-proposal-export-namespace-from": "7.16.0",
+    "@babel/plugin-proposal-function-sent": "7.16.0",
+    "@babel/plugin-proposal-nullish-coalescing-operator": "7.16.0",
+    "@babel/plugin-proposal-numeric-separator": "7.16.0",
+    "@babel/plugin-proposal-optional-chaining": "7.16.0",
+    "@babel/plugin-proposal-throw-expressions": "7.16.0",
     "@babel/plugin-syntax-dynamic-import": "7.8.3",
-    "@babel/preset-env": "7.16.11",
-    "@babel/preset-react": "7.16.7",
-    "autoprefixer": "10.4.4",
-    "babel-loader": "8.2.4",
+    "@babel/preset-env": "7.16.4",
+    "@babel/preset-react": "7.16.0",
+    "autoprefixer": "10.2.5",
+    "babel-loader": "8.2.3",
     "babel-plugin-inline-classnames": "2.0.1",
     "babel-plugin-transform-react-remove-prop-types": "0.4.24",
-    "core-js": "3.21.1",
-    "css-loader": "6.7.1",
-    "eslint": "8.11.0",
+    "core-js": "3.11.0",
+    "css-loader": "6.5.1",
+    "eslint": "8.3.0",
     "eslint-plugin-filenames": "1.3.2",
-    "eslint-plugin-import": "2.25.4",
-    "eslint-plugin-react": "7.29.4",
+    "eslint-plugin-import": "2.25.3",
+    "eslint-plugin-react": "7.27.1",
     "eslint-plugin-simple-import-sort": "7.0.0",
-    "esprint": "3.3.0",
+    "esprint": "3.1.0",
     "file-loader": "6.2.0",
     "filemanager-webpack-plugin": "6.1.7",
     "html-webpack-plugin": "5.5.0",
     "loader-utils": "^3.0.0",
-    "mini-css-extract-plugin": "2.6.0",
-    "postcss": "8.4.12",
+    "mini-css-extract-plugin": "2.4.5",
+    "postcss": "8.3.11",
     "postcss-color-function": "4.1.0",
-    "postcss-loader": "6.2.1",
-    "postcss-mixins": "9.0.2",
+    "postcss-loader": "6.2.0",
+    "postcss-mixins": "8.1.0",
     "postcss-nested": "5.0.6",
     "postcss-simple-vars": "6.0.3",
     "postcss-url": "10.1.3",
@@ -121,11 +121,11 @@
     "run-sequence": "2.2.1",
     "streamqueue": "1.1.2",
     "style-loader": "3.3.1",
-    "stylelint": "14.6.0",
+    "stylelint": "14.1.0",
     "stylelint-order": "5.0.0",
     "url-loader": "4.1.1",
-    "webpack": "5.70.0",
-    "webpack-cli": "4.9.2",
+    "webpack": "5.64.2",
+    "webpack-cli": "4.9.1",
     "webpack-livereload-plugin": "3.0.2"
   }
 }

src/Directory.Build.props

@@ -94,10 +94,10 @@
   
   <!-- Standard testing packages -->
   <ItemGroup Condition="'$(TestProject)'=='true'">
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
-    <PackageReference Include="NUnit" Version="3.13.3" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
-    <PackageReference Include="NunitXml.TestLogger" Version="3.0.117" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
+    <PackageReference Include="NUnit" Version="3.13.1" />
+    <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
+    <PackageReference Include="NunitXml.TestLogger" Version="3.0.97" />
     <PackageReference Include="coverlet.collector" Version="3.0.4-preview.27.ge7cb7c3b40" />
   </ItemGroup>
 

src/NzbDrone.Automation.Test/AutomationTest.cs

@@ -20,7 +20,7 @@ namespace NzbDrone.Automation.Test
     public abstract class AutomationTest
     {
         private NzbDroneRunner _runner;
-        protected WebDriver driver;
+        protected RemoteWebDriver driver;
 
         public AutomationTest()
         {

src/NzbDrone.Automation.Test/PageModel/PageBase.cs

@@ -1,15 +1,16 @@
 using System;
 using System.Threading;
 using OpenQA.Selenium;
+using OpenQA.Selenium.Remote;
 using OpenQA.Selenium.Support.UI;
 
 namespace NzbDrone.Automation.Test.PageModel
 {
     public class PageBase
     {
-        private readonly WebDriver _driver;
+        private readonly RemoteWebDriver _driver;
 
-        public PageBase(WebDriver driver)
+        public PageBase(RemoteWebDriver driver)
         {
             _driver = driver;
             driver.Manage().Window.Maximize();

src/NzbDrone.Automation.Test/Prowlarr.Automation.Test.csproj

@@ -3,8 +3,8 @@
     <TargetFrameworks>net6.0</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Selenium.Support" Version="4.1.0" />
-    <PackageReference Include="Selenium.WebDriver.ChromeDriver" Version="99.0.4844.5100" />
+    <PackageReference Include="Selenium.Support" Version="3.141.0" />
+    <PackageReference Include="Selenium.WebDriver.ChromeDriver" Version="90.0.4430.2400" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\NzbDrone.Test.Common\Prowlarr.Test.Common.csproj" />

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

@@ -23,7 +23,6 @@ namespace NzbDrone.Common.Test.InstrumentationTests
         [TestCase(@"https://hd-space.org/index.php?page=login: uid=mySecret&pwd=mySecret")]
         [TestCase(@"https://beyond-hd.me/api/torrents/2b51db35e1912ffc138825a12b9933d2")]
         [TestCase(@"Req: [POST] https://www3.yggtorrent.nz/user/login: id=mySecret&pass=mySecret&ci_csrf_token=2b51db35e1912ffc138825a12b9933d2")]
-        [TestCase(@"https://torrentseeds.org/api/torrents/filter?api_token=2b51db35e1912ffc138825a12b9933d2&name=&sortField=created_at&sortDirection=desc&perPage=100&page=1")]
 
         //Indexer Responses
 

src/NzbDrone.Common/Disk/SystemFolders.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using NzbDrone.Common.EnvironmentInfo;
 
@@ -24,8 +24,7 @@ namespace NzbDrone.Common.Disk
                        "/boot",
                        "/lib",
                        "/sbin",
-                       "/proc",
-                       "/usr/bin"
+                       "/proc"
                    };
         }
     }

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

@@ -82,6 +82,9 @@ namespace NzbDrone.Common.Http.Dispatchers
 
                 if (httpWebResponse == null)
                 {
+                    // Workaround for mono not closing connections properly in certain situations.
+                    AbortWebRequest(webRequest);
+
                     // The default messages for WebException on mono are pretty horrible.
                     if (e.Status == WebExceptionStatus.NameResolutionFailure)
                     {
@@ -239,5 +242,36 @@ namespace NzbDrone.Common.Http.Dispatchers
                 }
             }
         }
+
+        // Workaround for mono not closing connections properly on timeouts
+        private void AbortWebRequest(HttpWebRequest webRequest)
+        {
+            // First affected version was mono 5.16
+            if (OsInfo.IsNotWindows && _platformInfo.Version >= new Version(5, 16))
+            {
+                try
+                {
+                    var currentOperationInfo = webRequest.GetType().GetField("currentOperation", BindingFlags.NonPublic | BindingFlags.Instance);
+                    var currentOperation = currentOperationInfo.GetValue(webRequest);
+
+                    if (currentOperation != null)
+                    {
+                        var responseStreamInfo = currentOperation.GetType().GetField("responseStream", BindingFlags.NonPublic | BindingFlags.Instance);
+                        var responseStream = responseStreamInfo.GetValue(currentOperation) as Stream;
+
+                        // Note that responseStream will likely be null once mono fixes it.
+                        responseStream?.Dispose();
+                    }
+                }
+                catch (Exception ex)
+                {
+                    // This can fail randomly on future mono versions that have been changed/fixed. Log to sentry and ignore.
+                    _logger.Trace()
+                           .Exception(ex)
+                           .Message("Unable to dispose responseStream on mono {0}", _platformInfo.Version)
+                           .Write();
+                }
+            }
+        }
     }
 }

src/NzbDrone.Common/Http/HttpClient.cs

@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
 using System.Net;
-using System.Net.Http;
 using System.Threading.Tasks;
 using NLog;
 using NzbDrone.Common.Cache;
@@ -75,7 +74,7 @@ namespace NzbDrone.Common.Http
 
                 do
                 {
-                    request.Url = new HttpUri(response.RedirectUrl);
+                    request.Url += new HttpUri(response.Headers.GetSingleValue("Location"));
                     autoRedirectChain.Add(request.Url.ToString());
 
                     _logger.Trace("Redirected to {0}", request.Url);
@@ -88,11 +87,13 @@ namespace NzbDrone.Common.Http
                     // 302 or 303 should default to GET on redirect even if POST on original
                     if (response.StatusCode == HttpStatusCode.Redirect || response.StatusCode == HttpStatusCode.RedirectMethod)
                     {
-                        request.Method = HttpMethod.Get;
+                        request.Method = HttpMethod.GET;
                         request.ContentData = null;
                     }
 
-                    response = await ExecuteRequestAsync(request, cookieContainer);
+                    var redirectContainer = HandleRedirectCookies(request, response);
+
+                    response = await ExecuteRequestAsync(request, redirectContainer);
                 }
                 while (response.HasHttpRedirect);
             }
@@ -163,6 +164,41 @@ namespace NzbDrone.Common.Http
             return response;
         }
 
+        private CookieContainer HandleRedirectCookies(HttpRequest request, HttpResponse response)
+        {
+            var sourceContainer = new CookieContainer();
+
+            var responseCookies = response.GetCookies();
+
+            if (responseCookies.Count != 0)
+            {
+                foreach (var pair in responseCookies)
+                {
+                    Cookie cookie;
+                    if (pair.Value == null)
+                    {
+                        cookie = new Cookie(pair.Key, "", "/")
+                        {
+                            Expires = DateTime.Now.AddDays(-1)
+                        };
+                    }
+                    else
+                    {
+                        cookie = new Cookie(pair.Key, pair.Value, "/")
+                        {
+                            // Use Now rather than UtcNow to work around Mono cookie expiry bug.
+                            // See https://gist.github.com/ta264/7822b1424f72e5b4c961
+                            Expires = DateTime.Now.AddHours(1)
+                        };
+                    }
+
+                    sourceContainer.Add((Uri)request.Url, cookie);
+                }
+            }
+
+            return sourceContainer;
+        }
+
         private CookieContainer InitializeRequestCookies(HttpRequest request)
         {
             lock (_cookieContainerCache)
@@ -264,7 +300,7 @@ namespace NzbDrone.Common.Http
 
         public Task<HttpResponse> GetAsync(HttpRequest request)
         {
-            request.Method = HttpMethod.Get;
+            request.Method = HttpMethod.GET;
             return ExecuteAsync(request);
         }
 
@@ -289,7 +325,7 @@ namespace NzbDrone.Common.Http
 
         public Task<HttpResponse> HeadAsync(HttpRequest request)
         {
-            request.Method = HttpMethod.Head;
+            request.Method = HttpMethod.HEAD;
             return ExecuteAsync(request);
         }
 
@@ -300,7 +336,7 @@ namespace NzbDrone.Common.Http
 
         public Task<HttpResponse> PostAsync(HttpRequest request)
         {
-            request.Method = HttpMethod.Post;
+            request.Method = HttpMethod.POST;
             return ExecuteAsync(request);
         }
 

src/NzbDrone.Common/Http/HttpMethod.cs

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

src/NzbDrone.Common/Http/HttpRequest.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Net;
-using System.Net.Http;
 using System.Text;
 using NzbDrone.Common.EnvironmentInfo;
 using NzbDrone.Common.Extensions;
@@ -14,7 +13,6 @@ namespace NzbDrone.Common.Http
         {
             Url = new HttpUri(url);
             Headers = new HttpHeader();
-            Method = HttpMethod.Get;
             ConnectionKeepAlive = true;
             AllowAutoRedirect = true;
             Cookies = new Dictionary<string, string>();

src/NzbDrone.Common/Http/HttpRequestBuilder.cs

@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Net;
-using System.Net.Http;
 using System.Text;
 using NzbDrone.Common.Extensions;
 
@@ -38,7 +37,7 @@ namespace NzbDrone.Common.Http
         {
             BaseUrl = new HttpUri(baseUrl);
             ResourceUrl = string.Empty;
-            Method = HttpMethod.Get;
+            Method = HttpMethod.GET;
             Encoding = Encoding.UTF8;
             QueryParams = new List<KeyValuePair<string, string>>();
             SuffixQueryParams = new List<KeyValuePair<string, string>>();
@@ -276,7 +275,7 @@ namespace NzbDrone.Common.Http
 
         public virtual HttpRequestBuilder Post()
         {
-            Method = HttpMethod.Post;
+            Method = HttpMethod.POST;
 
             return this;
         }
@@ -398,7 +397,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.");
             }
@@ -414,7 +413,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/HttpResponse.cs

@@ -9,23 +9,21 @@ namespace NzbDrone.Common.Http
 {
     public class HttpResponse
     {
-        private static readonly Regex RegexRefresh = new Regex("^(.*?url)=(.*?)(?:;|$)", RegexOptions.Compiled);
+        private static readonly Regex RegexSetCookie = new Regex("^(.*?)=(.*?)(?:;|$)", RegexOptions.Compiled);
 
-        public HttpResponse(HttpRequest request, HttpHeader headers, CookieCollection cookies, byte[] binaryData, long elapsedTime = 0, HttpStatusCode statusCode = HttpStatusCode.OK)
+        public HttpResponse(HttpRequest request, HttpHeader headers, byte[] binaryData, long elapsedTime = 0, HttpStatusCode statusCode = HttpStatusCode.OK)
         {
             Request = request;
             Headers = headers;
-            Cookies = cookies;
             ResponseData = binaryData;
             StatusCode = statusCode;
             ElapsedTime = elapsedTime;
         }
 
-        public HttpResponse(HttpRequest request, HttpHeader headers, CookieCollection cookies, string content, long elapsedTime = 0, HttpStatusCode statusCode = HttpStatusCode.OK)
+        public HttpResponse(HttpRequest request, HttpHeader headers, string content, long elapsedTime = 0, HttpStatusCode statusCode = HttpStatusCode.OK)
         {
             Request = request;
             Headers = headers;
-            Cookies = cookies;
             ResponseData = Headers.GetEncodingFromContentType().GetBytes(content);
             _content = content;
             StatusCode = statusCode;
@@ -34,7 +32,6 @@ namespace NzbDrone.Common.Http
 
         public HttpRequest Request { get; private set; }
         public HttpHeader Headers { get; private set; }
-        public CookieCollection Cookies { get; private set; }
         public HttpStatusCode StatusCode { get; private set; }
         public long ElapsedTime { get; private set; }
         public byte[] ResponseData { get; private set; }
@@ -67,8 +64,7 @@ namespace NzbDrone.Common.Http
                                        StatusCode == HttpStatusCode.MovedPermanently ||
                                        StatusCode == HttpStatusCode.RedirectMethod ||
                                        StatusCode == HttpStatusCode.TemporaryRedirect ||
-                                       StatusCode == HttpStatusCode.Found ||
-                                       Headers.ContainsKey("Refresh");
+                                       StatusCode == HttpStatusCode.Found;
 
         public string RedirectUrl
         {
@@ -77,20 +73,6 @@ namespace NzbDrone.Common.Http
                 var newUrl = Headers["Location"];
                 if (newUrl == null)
                 {
-                    newUrl = Headers["Refresh"];
-
-                    if (newUrl == null)
-                    {
-                        return string.Empty;
-                    }
-
-                    var match = RegexRefresh.Match(newUrl);
-
-                    if (match.Success)
-                    {
-                        return (Request.Url += new HttpUri(match.Groups[2].Value)).FullUri;
-                    }
-
                     return string.Empty;
                 }
 
@@ -107,9 +89,14 @@ namespace NzbDrone.Common.Http
         {
             var result = new Dictionary<string, string>();
 
-            foreach (Cookie cookie in Cookies)
+            var setCookieHeaders = CookieUtil.CookieHeaderToDictionary();
+            foreach (var cookie in setCookieHeaders)
             {
-                result[cookie.Name] = cookie.Value;
+                var match = RegexSetCookie.Match(cookie);
+                if (match.Success)
+                {
+                    result[match.Groups[1].Value] = match.Groups[2].Value;
+                }
             }
 
             return result;

src/NzbDrone.Common/Http/JsonRpcRequestBuilder.cs

@@ -1,7 +1,6 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Net.Http;
 using Newtonsoft.Json;
 using NzbDrone.Common.Serializer;
 
@@ -18,14 +17,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/Instrumentation/CleanseLogMessage.cs

@@ -11,7 +11,7 @@ namespace NzbDrone.Common.Instrumentation
         private static readonly Regex[] CleansingRules = new[]
             {
                 // Url
-                new Regex(@"(?<=[?&: ;])(apikey|(?:(?:access|api)[-_]?)?token|pass(?:key|wd)?|auth|authkey|user|u?id|api|[a-z_]*apikey|account|pwd)=(?<secret>[^&=]+?)(?= |&|$|<)", RegexOptions.Compiled | RegexOptions.IgnoreCase),
+                new Regex(@"(?<=[?&: ;])(apikey|(?:access[-_]?)?token|pass(?:key|wd)?|auth|authkey|user|u?id|api|[a-z_]*apikey|account|pwd)=(?<secret>[^&=]+?)(?= |&|$|<)", RegexOptions.Compiled | RegexOptions.IgnoreCase),
                 new Regex(@"(?<=[?& ;])[^=]*?(_?(?<!use|get_)token|username|passwo?rd)=(?<secret>[^&=]+?)(?= |&|$|;)", RegexOptions.Compiled | RegexOptions.IgnoreCase),
                 new Regex(@"rss\.torrentleech\.org/(?!rss)(?<secret>[0-9a-z]+)", RegexOptions.Compiled | RegexOptions.IgnoreCase),
                 new Regex(@"rss\.torrentleech\.org/rss/download/[0-9]+/(?<secret>[0-9a-z]+)", RegexOptions.Compiled | RegexOptions.IgnoreCase),

src/NzbDrone.Common/Prowlarr.Common.csproj

@@ -4,14 +4,14 @@
     <DefineConstants Condition="'$(RuntimeIdentifier)' == 'linux-musl-x64' or '$(RuntimeIdentifier)' == 'linux-musl-arm64'">ISMUSL</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="DryIoc.dll" Version="4.8.8" />
+    <PackageReference Include="DryIoc.dll" Version="4.8.1" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
-    <PackageReference Include="NLog.Extensions.Logging" Version="1.7.4" />
+    <PackageReference Include="NLog.Extensions.Logging" Version="1.7.2" />
     <PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="6.0.0" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="NLog" Version="4.7.14" />
-    <PackageReference Include="Sentry" Version="3.15.0" />
-    <PackageReference Include="SharpZipLib" Version="1.3.3" />
+    <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
+    <PackageReference Include="NLog" Version="4.7.9" />
+    <PackageReference Include="Sentry" Version="3.8.3" />
+    <PackageReference Include="SharpZipLib" Version="1.3.1" />
     <PackageReference Include="System.ValueTuple" Version="4.5.0" />
     <PackageReference Include="System.Data.SQLite.Core.Servarr" Version="1.0.115.5-18" />
     <PackageReference Include="System.Configuration.ConfigurationManager" Version="6.0.0" />

src/NzbDrone.Core.Test/Housekeeping/Housekeepers/CleanupOrphanedApplicationStatusFixture.cs

@@ -1,54 +0,0 @@
-using FizzWare.NBuilder;
-using FluentAssertions;
-using NUnit.Framework;
-using NzbDrone.Core.Applications;
-using NzbDrone.Core.Housekeeping.Housekeepers;
-using NzbDrone.Core.Test.Framework;
-
-namespace NzbDrone.Core.Test.Housekeeping.Housekeepers
-{
-    [TestFixture]
-    public class CleanupOrphanedApplicationFixture : DbTest<CleanupOrphanedApplicationStatus, ApplicationStatus>
-    {
-        private ApplicationDefinition _application;
-
-        [SetUp]
-        public void Setup()
-        {
-            _application = Builder<ApplicationDefinition>.CreateNew()
-                                                         .BuildNew();
-        }
-
-        private void GivenApplication()
-        {
-            Db.Insert(_application);
-        }
-
-        [Test]
-        public void should_delete_orphaned_applicationstatus()
-        {
-            var status = Builder<ApplicationStatus>.CreateNew()
-                                                   .With(h => h.ProviderId = _application.Id)
-                                                   .BuildNew();
-            Db.Insert(status);
-
-            Subject.Clean();
-            AllStoredModels.Should().BeEmpty();
-        }
-
-        [Test]
-        public void should_not_delete_unorphaned_applicationstatus()
-        {
-            GivenApplication();
-
-            var status = Builder<ApplicationStatus>.CreateNew()
-                                                   .With(h => h.ProviderId = _application.Id)
-                                                   .BuildNew();
-            Db.Insert(status);
-
-            Subject.Clean();
-            AllStoredModels.Should().HaveCount(1);
-            AllStoredModels.Should().Contain(h => h.ProviderId == _application.Id);
-        }
-    }
-}

src/NzbDrone.Core.Test/Housekeeping/Housekeepers/CleanupOrphanedDownloadClientStatusFixture.cs

@@ -1,56 +0,0 @@
-using FizzWare.NBuilder;
-using FluentAssertions;
-using NUnit.Framework;
-using NzbDrone.Core.Download;
-using NzbDrone.Core.Download.Clients.Flood;
-using NzbDrone.Core.Housekeeping.Housekeepers;
-using NzbDrone.Core.Test.Framework;
-
-namespace NzbDrone.Core.Test.Housekeeping.Housekeepers
-{
-    [TestFixture]
-    public class CleanupOrphanedDownloadClientStatusFixture : DbTest<CleanupOrphanedDownloadClientStatus, DownloadClientStatus>
-    {
-        private DownloadClientDefinition _downloadClient;
-
-        [SetUp]
-        public void Setup()
-        {
-            _downloadClient = Builder<DownloadClientDefinition>.CreateNew()
-                                                               .With(c => c.Settings = new FloodSettings())
-                                                               .BuildNew();
-        }
-
-        private void GivenClient()
-        {
-            Db.Insert(_downloadClient);
-        }
-
-        [Test]
-        public void should_delete_orphaned_downloadclientstatus()
-        {
-            var status = Builder<DownloadClientStatus>.CreateNew()
-                                                      .With(h => h.ProviderId = _downloadClient.Id)
-                                                      .BuildNew();
-            Db.Insert(status);
-
-            Subject.Clean();
-            AllStoredModels.Should().BeEmpty();
-        }
-
-        [Test]
-        public void should_not_delete_unorphaned_downloadclientstatus()
-        {
-            GivenClient();
-
-            var status = Builder<DownloadClientStatus>.CreateNew()
-                                                      .With(h => h.ProviderId = _downloadClient.Id)
-                                                      .BuildNew();
-            Db.Insert(status);
-
-            Subject.Clean();
-            AllStoredModels.Should().HaveCount(1);
-            AllStoredModels.Should().Contain(h => h.ProviderId == _downloadClient.Id);
-        }
-    }
-}

src/NzbDrone.Core.Test/Housekeeping/Housekeepers/FixFutureApplicationStatusTimesFixture.cs

@@ -1,109 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using FizzWare.NBuilder;
-using Moq;
-using NUnit.Framework;
-using NzbDrone.Core.Applications;
-using NzbDrone.Core.Housekeeping.Housekeepers;
-using NzbDrone.Core.Test.Framework;
-using NzbDrone.Core.ThingiProvider.Status;
-
-namespace NzbDrone.Core.Test.Housekeeping.Housekeepers
-{
-    [TestFixture]
-    public class FixFutureApplicationStatusTimesFixture : CoreTest<FixFutureApplicationStatusTimes>
-    {
-        [Test]
-        public void should_set_disabled_till_when_its_too_far_in_the_future()
-        {
-            var disabledTillTime = EscalationBackOff.Periods[1];
-            var applicationStatuses = Builder<ApplicationStatus>.CreateListOfSize(5)
-                                                        .All()
-                                                        .With(t => t.DisabledTill = DateTime.UtcNow.AddDays(5))
-                                                        .With(t => t.InitialFailure = DateTime.UtcNow.AddDays(-5))
-                                                        .With(t => t.MostRecentFailure = DateTime.UtcNow.AddDays(-5))
-                                                        .With(t => t.EscalationLevel = 1)
-                                                        .BuildListOfNew();
-
-            Mocker.GetMock<IApplicationStatusRepository>()
-                  .Setup(s => s.All())
-                  .Returns(applicationStatuses);
-
-            Subject.Clean();
-
-            Mocker.GetMock<IApplicationStatusRepository>()
-                  .Verify(v => v.UpdateMany(
-                          It.Is<List<ApplicationStatus>>(i => i.All(
-                              s => s.DisabledTill.Value <= DateTime.UtcNow.AddMinutes(disabledTillTime)))));
-        }
-
-        [Test]
-        public void should_set_initial_failure_when_its_in_the_future()
-        {
-            var applicationStatuses = Builder<ApplicationStatus>.CreateListOfSize(5)
-                                                        .All()
-                                                        .With(t => t.DisabledTill = DateTime.UtcNow.AddDays(-5))
-                                                        .With(t => t.InitialFailure = DateTime.UtcNow.AddDays(5))
-                                                        .With(t => t.MostRecentFailure = DateTime.UtcNow.AddDays(-5))
-                                                        .With(t => t.EscalationLevel = 1)
-                                                        .BuildListOfNew();
-
-            Mocker.GetMock<IApplicationStatusRepository>()
-                  .Setup(s => s.All())
-                  .Returns(applicationStatuses);
-
-            Subject.Clean();
-
-            Mocker.GetMock<IApplicationStatusRepository>()
-                  .Verify(v => v.UpdateMany(
-                          It.Is<List<ApplicationStatus>>(i => i.All(
-                              s => s.InitialFailure.Value <= DateTime.UtcNow))));
-        }
-
-        [Test]
-        public void should_set_most_recent_failure_when_its_in_the_future()
-        {
-            var applicationStatuses = Builder<ApplicationStatus>.CreateListOfSize(5)
-                                                        .All()
-                                                        .With(t => t.DisabledTill = DateTime.UtcNow.AddDays(-5))
-                                                        .With(t => t.InitialFailure = DateTime.UtcNow.AddDays(-5))
-                                                        .With(t => t.MostRecentFailure = DateTime.UtcNow.AddDays(5))
-                                                        .With(t => t.EscalationLevel = 1)
-                                                        .BuildListOfNew();
-
-            Mocker.GetMock<IApplicationStatusRepository>()
-                  .Setup(s => s.All())
-                  .Returns(applicationStatuses);
-
-            Subject.Clean();
-
-            Mocker.GetMock<IApplicationStatusRepository>()
-                  .Verify(v => v.UpdateMany(
-                          It.Is<List<ApplicationStatus>>(i => i.All(
-                              s => s.MostRecentFailure.Value <= DateTime.UtcNow))));
-        }
-
-        [Test]
-        public void should_not_change_statuses_when_times_are_in_the_past()
-        {
-            var indexerStatuses = Builder<ApplicationStatus>.CreateListOfSize(5)
-                                                        .All()
-                                                        .With(t => t.DisabledTill = DateTime.UtcNow.AddDays(-5))
-                                                        .With(t => t.InitialFailure = DateTime.UtcNow.AddDays(-5))
-                                                        .With(t => t.MostRecentFailure = DateTime.UtcNow.AddDays(-5))
-                                                        .With(t => t.EscalationLevel = 0)
-                                                        .BuildListOfNew();
-
-            Mocker.GetMock<IApplicationStatusRepository>()
-                  .Setup(s => s.All())
-                  .Returns(indexerStatuses);
-
-            Subject.Clean();
-
-            Mocker.GetMock<IApplicationStatusRepository>()
-                  .Verify(v => v.UpdateMany(
-                          It.Is<List<ApplicationStatus>>(i => i.Count == 0)));
-        }
-    }
-}

src/NzbDrone.Core.Test/Housekeeping/Housekeepers/FixFutureDownloadClientStatusTimesFixture.cs

@@ -1,109 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using FizzWare.NBuilder;
-using Moq;
-using NUnit.Framework;
-using NzbDrone.Core.Download;
-using NzbDrone.Core.Housekeeping.Housekeepers;
-using NzbDrone.Core.Test.Framework;
-using NzbDrone.Core.ThingiProvider.Status;
-
-namespace NzbDrone.Core.Test.Housekeeping.Housekeepers
-{
-    [TestFixture]
-    public class FixFutureDownloadClientStatusTimesFixture : CoreTest<FixFutureDownloadClientStatusTimes>
-    {
-        [Test]
-        public void should_set_disabled_till_when_its_too_far_in_the_future()
-        {
-            var disabledTillTime = EscalationBackOff.Periods[1];
-            var clientStatuses = Builder<DownloadClientStatus>.CreateListOfSize(5)
-                                                        .All()
-                                                        .With(t => t.DisabledTill = DateTime.UtcNow.AddDays(5))
-                                                        .With(t => t.InitialFailure = DateTime.UtcNow.AddDays(-5))
-                                                        .With(t => t.MostRecentFailure = DateTime.UtcNow.AddDays(-5))
-                                                        .With(t => t.EscalationLevel = 1)
-                                                        .BuildListOfNew();
-
-            Mocker.GetMock<IDownloadClientStatusRepository>()
-                  .Setup(s => s.All())
-                  .Returns(clientStatuses);
-
-            Subject.Clean();
-
-            Mocker.GetMock<IDownloadClientStatusRepository>()
-                  .Verify(v => v.UpdateMany(
-                          It.Is<List<DownloadClientStatus>>(i => i.All(
-                              s => s.DisabledTill.Value <= DateTime.UtcNow.AddMinutes(disabledTillTime)))));
-        }
-
-        [Test]
-        public void should_set_initial_failure_when_its_in_the_future()
-        {
-            var clientStatuses = Builder<DownloadClientStatus>.CreateListOfSize(5)
-                                                        .All()
-                                                        .With(t => t.DisabledTill = DateTime.UtcNow.AddDays(-5))
-                                                        .With(t => t.InitialFailure = DateTime.UtcNow.AddDays(5))
-                                                        .With(t => t.MostRecentFailure = DateTime.UtcNow.AddDays(-5))
-                                                        .With(t => t.EscalationLevel = 1)
-                                                        .BuildListOfNew();
-
-            Mocker.GetMock<IDownloadClientStatusRepository>()
-                  .Setup(s => s.All())
-                  .Returns(clientStatuses);
-
-            Subject.Clean();
-
-            Mocker.GetMock<IDownloadClientStatusRepository>()
-                  .Verify(v => v.UpdateMany(
-                          It.Is<List<DownloadClientStatus>>(i => i.All(
-                              s => s.InitialFailure.Value <= DateTime.UtcNow))));
-        }
-
-        [Test]
-        public void should_set_most_recent_failure_when_its_in_the_future()
-        {
-            var clientStatuses = Builder<DownloadClientStatus>.CreateListOfSize(5)
-                                                        .All()
-                                                        .With(t => t.DisabledTill = DateTime.UtcNow.AddDays(-5))
-                                                        .With(t => t.InitialFailure = DateTime.UtcNow.AddDays(-5))
-                                                        .With(t => t.MostRecentFailure = DateTime.UtcNow.AddDays(5))
-                                                        .With(t => t.EscalationLevel = 1)
-                                                        .BuildListOfNew();
-
-            Mocker.GetMock<IDownloadClientStatusRepository>()
-                  .Setup(s => s.All())
-                  .Returns(clientStatuses);
-
-            Subject.Clean();
-
-            Mocker.GetMock<IDownloadClientStatusRepository>()
-                  .Verify(v => v.UpdateMany(
-                          It.Is<List<DownloadClientStatus>>(i => i.All(
-                              s => s.MostRecentFailure.Value <= DateTime.UtcNow))));
-        }
-
-        [Test]
-        public void should_not_change_statuses_when_times_are_in_the_past()
-        {
-            var clientStatuses = Builder<DownloadClientStatus>.CreateListOfSize(5)
-                                                        .All()
-                                                        .With(t => t.DisabledTill = DateTime.UtcNow.AddDays(-5))
-                                                        .With(t => t.InitialFailure = DateTime.UtcNow.AddDays(-5))
-                                                        .With(t => t.MostRecentFailure = DateTime.UtcNow.AddDays(-5))
-                                                        .With(t => t.EscalationLevel = 0)
-                                                        .BuildListOfNew();
-
-            Mocker.GetMock<IDownloadClientStatusRepository>()
-                  .Setup(s => s.All())
-                  .Returns(clientStatuses);
-
-            Subject.Clean();
-
-            Mocker.GetMock<IDownloadClientStatusRepository>()
-                  .Verify(v => v.UpdateMany(
-                          It.Is<List<DownloadClientStatus>>(i => i.Count == 0)));
-        }
-    }
-}

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

@@ -1,7 +1,6 @@
 using System;
 using System.Linq;
 using System.Net;
-using System.Net.Http;
 using System.Threading.Tasks;
 using FluentAssertions;
 using Moq;
@@ -35,7 +34,7 @@ namespace NzbDrone.Core.Test.IndexerTests.AvistazTests
             var recentFeed = ReadAllText(@"Files/Indexers/Avistaz/recentfeed.json");
 
             Mocker.GetMock<IIndexerHttpClient>()
-                .Setup(o => o.ExecuteProxiedAsync(It.Is<HttpRequest>(v => v.Method == HttpMethod.Get), Subject.Definition))
+                .Setup(o => o.ExecuteProxiedAsync(It.Is<HttpRequest>(v => v.Method == HttpMethod.GET), Subject.Definition))
                 .Returns<HttpRequest, IndexerDefinition>((r, d) => Task.FromResult(new HttpResponse(r, new HttpHeader { { "Content-Type", "application/json" } }, new CookieCollection(), recentFeed)));
 
             var releases = (await Subject.Fetch(new MovieSearchCriteria { Categories = new int[] { 2000 } })).Releases;

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

@@ -1,7 +1,6 @@
 using System;
 using System.Linq;
 using System.Net;
-using System.Net.Http;
 using System.Threading.Tasks;
 using FluentAssertions;
 using Moq;
@@ -35,7 +34,7 @@ namespace NzbDrone.Core.Test.IndexerTests.AvistazTests
             var recentFeed = ReadAllText(@"Files/Indexers/PrivateHD/recentfeed.json");
 
             Mocker.GetMock<IIndexerHttpClient>()
-                .Setup(o => o.ExecuteProxiedAsync(It.Is<HttpRequest>(v => v.Method == HttpMethod.Get), Subject.Definition))
+                .Setup(o => o.ExecuteProxiedAsync(It.Is<HttpRequest>(v => v.Method == HttpMethod.GET), Subject.Definition))
                 .Returns<HttpRequest, IndexerDefinition>((r, d) => Task.FromResult(new HttpResponse(r, new HttpHeader { { "Content-Type", "application/json" } }, new CookieCollection(), recentFeed)));
 
             var releases = (await Subject.Fetch(new MovieSearchCriteria { Categories = new int[] { 2000 } })).Releases;

src/NzbDrone.Core.Test/IndexerTests/FileListTests/FileListFixture.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Linq;
 using System.Net;
-using System.Net.Http;
 using System.Threading.Tasks;
 using FluentAssertions;
 using Moq;
@@ -34,7 +33,7 @@ namespace NzbDrone.Core.Test.IndexerTests.FileListTests
             var recentFeed = ReadAllText(@"Files/Indexers/FileList/recentfeed.json");
 
             Mocker.GetMock<IIndexerHttpClient>()
-                .Setup(o => o.ExecuteProxiedAsync(It.Is<HttpRequest>(v => v.Method == HttpMethod.Get), Subject.Definition))
+                .Setup(o => o.ExecuteProxiedAsync(It.Is<HttpRequest>(v => v.Method == HttpMethod.GET), Subject.Definition))
                 .Returns<HttpRequest, IndexerDefinition>((r, d) => Task.FromResult(new HttpResponse(r, new HttpHeader(), new CookieCollection(), recentFeed)));
 
             var releases = (await Subject.Fetch(new MovieSearchCriteria { Categories = new int[] { 2000 } })).Releases;

src/NzbDrone.Core.Test/IndexerTests/HDBitsTests/HDBitsFixture.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Linq;
 using System.Net;
-using System.Net.Http;
 using System.Text;
 using System.Threading.Tasks;
 using FluentAssertions;
@@ -46,7 +45,7 @@ namespace NzbDrone.Core.Test.IndexerTests.HDBitsTests
             var responseJson = ReadAllText(fileName);
 
             Mocker.GetMock<IIndexerHttpClient>()
-                .Setup(o => o.ExecuteProxiedAsync(It.Is<HttpRequest>(v => v.Method == HttpMethod.Post), Subject.Definition))
+                .Setup(o => o.ExecuteProxiedAsync(It.Is<HttpRequest>(v => v.Method == HttpMethod.POST), Subject.Definition))
                 .Returns<HttpRequest, IndexerDefinition>((r, d) => Task.FromResult(new HttpResponse(r, new HttpHeader(), new CookieCollection(), responseJson)));
 
             var torrents = (await Subject.Fetch(_movieSearchCriteria)).Releases;

src/NzbDrone.Core.Test/IndexerTests/NewznabTests/NewznabFixture.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Linq;
 using System.Net;
-using System.Net.Http;
 using System.Threading.Tasks;
 using FluentAssertions;
 using Moq;
@@ -44,7 +43,7 @@ namespace NzbDrone.Core.Test.IndexerTests.NewznabTests
             var recentFeed = ReadAllText(@"Files/Indexers/Newznab/newznab_nzb_su.xml");
 
             Mocker.GetMock<IIndexerHttpClient>()
-                .Setup(o => o.ExecuteProxiedAsync(It.Is<HttpRequest>(v => v.Method == HttpMethod.Get), Subject.Definition))
+                .Setup(o => o.ExecuteProxiedAsync(It.Is<HttpRequest>(v => v.Method == HttpMethod.GET), Subject.Definition))
                 .Returns<HttpRequest, IndexerDefinition>((r, d) => Task.FromResult(new HttpResponse(r, new HttpHeader(), new CookieCollection(), recentFeed)));
 
             var releases = (await Subject.Fetch(new MovieSearchCriteria { Categories = new int[] { 2000 }, Limit = 100, Offset = 0 })).Releases;

src/NzbDrone.Core.Test/IndexerTests/PTPTests/PTPFixture.cs

@@ -1,6 +1,5 @@
 using System.Linq;
 using System.Net;
-using System.Net.Http;
 using System.Threading.Tasks;
 using FluentAssertions;
 using Moq;
@@ -38,11 +37,11 @@ namespace NzbDrone.Core.Test.IndexerTests.PTPTests
             var responseJson = ReadAllText(fileName);
 
             Mocker.GetMock<IIndexerHttpClient>()
-                  .Setup(o => o.ExecuteProxiedAsync(It.Is<HttpRequest>(v => v.Method == HttpMethod.Post), Subject.Definition))
+                  .Setup(o => o.ExecuteProxiedAsync(It.Is<HttpRequest>(v => v.Method == HttpMethod.POST), Subject.Definition))
                   .Returns<HttpRequest, IndexerDefinition>((r, d) => Task.FromResult(new HttpResponse(r, new HttpHeader(), new CookieCollection(), authStream.ToString())));
 
             Mocker.GetMock<IIndexerHttpClient>()
-                .Setup(o => o.ExecuteProxiedAsync(It.Is<HttpRequest>(v => v.Method == HttpMethod.Get), Subject.Definition))
+                .Setup(o => o.ExecuteProxiedAsync(It.Is<HttpRequest>(v => v.Method == HttpMethod.GET), Subject.Definition))
                   .Returns<HttpRequest, IndexerDefinition>((r, d) => Task.FromResult(new HttpResponse(r, new HttpHeader { ContentType = HttpAccept.Json.Value }, new CookieCollection(), responseJson)));
 
             var torrents = (await Subject.Fetch(new MovieSearchCriteria())).Releases;

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

@@ -1,7 +1,6 @@
 using System;
 using System.Linq;
 using System.Net;
-using System.Net.Http;
 using System.Threading.Tasks;
 using FluentAssertions;
 using Moq;
@@ -40,7 +39,7 @@ namespace NzbDrone.Core.Test.IndexerTests.RarbgTests
             var recentFeed = ReadAllText(@"Files/Indexers/Rarbg/RecentFeed_v2.json");
 
             Mocker.GetMock<IIndexerHttpClient>()
-                .Setup(o => o.ExecuteProxiedAsync(It.Is<HttpRequest>(v => v.Method == HttpMethod.Get), Subject.Definition))
+                .Setup(o => o.ExecuteProxiedAsync(It.Is<HttpRequest>(v => v.Method == HttpMethod.GET), Subject.Definition))
                 .Returns<HttpRequest, IndexerDefinition>((r, d) => Task.FromResult(new HttpResponse(r, new HttpHeader(), new CookieCollection(), recentFeed)));
 
             var releases = (await Subject.Fetch(new MovieSearchCriteria { Categories = new int[] { 2000 } })).Releases;
@@ -67,7 +66,7 @@ namespace NzbDrone.Core.Test.IndexerTests.RarbgTests
         public async Task should_parse_error_20_as_empty_results()
         {
             Mocker.GetMock<IIndexerHttpClient>()
-                   .Setup(o => o.ExecuteProxiedAsync(It.Is<HttpRequest>(v => v.Method == HttpMethod.Get), Subject.Definition))
+                   .Setup(o => o.ExecuteProxiedAsync(It.Is<HttpRequest>(v => v.Method == HttpMethod.GET), Subject.Definition))
                    .Returns<HttpRequest, IndexerDefinition>((r, d) => Task.FromResult(new HttpResponse(r, new HttpHeader(), new CookieCollection(), "{ error_code: 20, error: \"some message\" }")));
 
             var releases = (await Subject.Fetch(new MovieSearchCriteria { Categories = new int[] { 2000 } })).Releases;
@@ -79,7 +78,7 @@ namespace NzbDrone.Core.Test.IndexerTests.RarbgTests
         public async Task should_warn_on_unknown_error()
         {
             Mocker.GetMock<IIndexerHttpClient>()
-                   .Setup(o => o.ExecuteProxiedAsync(It.Is<HttpRequest>(v => v.Method == HttpMethod.Get), Subject.Definition))
+                   .Setup(o => o.ExecuteProxiedAsync(It.Is<HttpRequest>(v => v.Method == HttpMethod.GET), Subject.Definition))
                    .Returns<HttpRequest, IndexerDefinition>((r, d) => Task.FromResult(new HttpResponse(r, new HttpHeader(), new CookieCollection(), "{ error_code: 25, error: \"some message\" }")));
 
             var releases = (await Subject.Fetch(new MovieSearchCriteria { Categories = new int[] { 2000 } })).Releases;

src/NzbDrone.Core.Test/IndexerTests/TorznabTests/TorznabFixture.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Linq;
 using System.Net;
-using System.Net.Http;
 using System.Threading.Tasks;
 using FluentAssertions;
 using Moq;
@@ -45,7 +44,7 @@ namespace NzbDrone.Core.Test.IndexerTests.TorznabTests
             var recentFeed = ReadAllText(@"Files/Indexers/Torznab/torznab_hdaccess_net.xml");
 
             Mocker.GetMock<IIndexerHttpClient>()
-                .Setup(o => o.ExecuteProxiedAsync(It.Is<HttpRequest>(v => v.Method == HttpMethod.Get), Subject.Definition))
+                .Setup(o => o.ExecuteProxiedAsync(It.Is<HttpRequest>(v => v.Method == HttpMethod.GET), Subject.Definition))
                 .Returns<HttpRequest, IndexerDefinition>((r, d) => Task.FromResult(new HttpResponse(r, new HttpHeader(), new CookieCollection(), recentFeed)));
 
             var releases = (await Subject.Fetch(new MovieSearchCriteria())).Releases;
@@ -74,7 +73,7 @@ namespace NzbDrone.Core.Test.IndexerTests.TorznabTests
             var recentFeed = ReadAllText(@"Files/Indexers/Torznab/torznab_tpb.xml");
 
             Mocker.GetMock<IIndexerHttpClient>()
-                .Setup(o => o.ExecuteProxiedAsync(It.Is<HttpRequest>(v => v.Method == HttpMethod.Get), Subject.Definition))
+                .Setup(o => o.ExecuteProxiedAsync(It.Is<HttpRequest>(v => v.Method == HttpMethod.GET), Subject.Definition))
                 .Returns<HttpRequest, IndexerDefinition>((r, d) => Task.FromResult(new HttpResponse(r, new HttpHeader(), new CookieCollection(), recentFeed)));
 
             var releases = (await Subject.Fetch(new MovieSearchCriteria())).Releases;
@@ -104,7 +103,7 @@ namespace NzbDrone.Core.Test.IndexerTests.TorznabTests
             var recentFeed = ReadAllText(@"Files/Indexers/Torznab/torznab_animetosho.xml");
 
             Mocker.GetMock<IIndexerHttpClient>()
-                .Setup(o => o.ExecuteProxiedAsync(It.Is<HttpRequest>(v => v.Method == HttpMethod.Get), Subject.Definition))
+                .Setup(o => o.ExecuteProxiedAsync(It.Is<HttpRequest>(v => v.Method == HttpMethod.GET), Subject.Definition))
                 .Returns<HttpRequest, IndexerDefinition>((r, d) => Task.FromResult(new HttpResponse(r, new HttpHeader(), new CookieCollection(), recentFeed)));
 
             var releases = (await Subject.Fetch(new MovieSearchCriteria())).Releases;

src/NzbDrone.Core.Test/ParserTests/ParseUtilFixture.cs

@@ -30,27 +30,9 @@ namespace NzbDrone.Core.Test.ParserTests
         [TestCase("1", 1)]
         [TestCase("11", 11)]
         [TestCase("1000 grabs", 1000)]
-        [TestCase("2.222", 2222)]
-        [TestCase("2,222", 2222)]
-        [TestCase("2 222", 2222)]
-        [TestCase("2,22", 222)]
         public void should_parse_int_from_string(string original, int parsedInt)
         {
             ParseUtil.CoerceInt(original).Should().Be(parsedInt);
         }
-
-        [TestCase("1.0", 1.0)]
-        [TestCase("1.1", 1.1)]
-        [TestCase("1000 grabs", 1000.0)]
-        [TestCase("2.222", 2.222)]
-        [TestCase("2,222", 2.222)]
-        [TestCase("2.222,22", 2222.22)]
-        [TestCase("2,222.22", 2222.22)]
-        [TestCase("2 222", 2222.0)]
-        [TestCase("2,22", 2.22)]
-        public void should_parse_double_from_string(string original, double parsedInt)
-        {
-            ParseUtil.CoerceDouble(original).Should().Be(parsedInt);
-        }
     }
 }

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

@@ -3,7 +3,7 @@
     <TargetFrameworks>net6.0</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Dapper" Version="2.0.123" />
+    <PackageReference Include="Dapper" Version="2.0.90" />
     <PackageReference Include="NBuilder" Version="6.1.0" />
     <PackageReference Include="System.Data.SQLite.Core.Servarr" Version="1.0.115.5-18" />
     <PackageReference Include="YamlDotNet" Version="11.2.1" />

src/NzbDrone.Core/Applications/LazyLibrarian/LazyLibrarianV1Proxy.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Net.Http;
 using FluentValidation.Results;
 using Newtonsoft.Json;
 using NLog;
@@ -32,13 +31,13 @@ namespace NzbDrone.Core.Applications.LazyLibrarian
 
         public LazyLibrarianStatus GetStatus(LazyLibrarianSettings settings)
         {
-            var request = BuildRequest(settings, "/api", "getVersion", HttpMethod.Get);
+            var request = BuildRequest(settings, "/api", "getVersion", HttpMethod.GET);
             return Execute<LazyLibrarianStatus>(request);
         }
 
         public List<LazyLibrarianIndexer> GetIndexers(LazyLibrarianSettings settings)
         {
-            var request = BuildRequest(settings, "/api", "listNabProviders", HttpMethod.Get);
+            var request = BuildRequest(settings, "/api", "listNabProviders", HttpMethod.GET);
 
             var response = Execute<LazyLibrarianIndexerResponse>(request);
 
@@ -77,7 +76,7 @@ namespace NzbDrone.Core.Applications.LazyLibrarian
                 { "providertype", indexerType.ToString().ToLower() }
             };
 
-            var request = BuildRequest(settings, "/api", "delProvider", HttpMethod.Get, parameters);
+            var request = BuildRequest(settings, "/api", "delProvider", HttpMethod.GET, parameters);
             CheckForError(Execute<LazyLibrarianStatus>(request));
         }
 
@@ -93,7 +92,7 @@ namespace NzbDrone.Core.Applications.LazyLibrarian
                 { "categories", indexer.Categories }
             };
 
-            var request = BuildRequest(settings, "/api", "addProvider", HttpMethod.Get, parameters);
+            var request = BuildRequest(settings, "/api", "addProvider", HttpMethod.GET, parameters);
             CheckForError(Execute<LazyLibrarianStatus>(request));
             return indexer;
         }
@@ -111,7 +110,7 @@ namespace NzbDrone.Core.Applications.LazyLibrarian
                 { "altername", indexer.Altername }
             };
 
-            var request = BuildRequest(settings, "/api", "changeProvider", HttpMethod.Get, parameters);
+            var request = BuildRequest(settings, "/api", "changeProvider", HttpMethod.GET, parameters);
             CheckForError(Execute<LazyLibrarianStatus>(request));
             return indexer;
         }

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

@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Net;
-using System.Net.Http;
 using FluentValidation.Results;
 using Newtonsoft.Json;
 using NLog;
@@ -34,13 +33,13 @@ namespace NzbDrone.Core.Applications.Lidarr
 
         public LidarrStatus GetStatus(LidarrSettings settings)
         {
-            var request = BuildRequest(settings, "/api/v1/system/status", HttpMethod.Get);
+            var request = BuildRequest(settings, "/api/v1/system/status", HttpMethod.GET);
             return Execute<LidarrStatus>(request);
         }
 
         public List<LidarrIndexer> GetIndexers(LidarrSettings settings)
         {
-            var request = BuildRequest(settings, "/api/v1/indexer", HttpMethod.Get);
+            var request = BuildRequest(settings, "/api/v1/indexer", HttpMethod.GET);
             return Execute<List<LidarrIndexer>>(request);
         }
 
@@ -48,7 +47,7 @@ namespace NzbDrone.Core.Applications.Lidarr
         {
             try
             {
-                var request = BuildRequest(settings, $"/api/v1/indexer/{indexerId}", HttpMethod.Get);
+                var request = BuildRequest(settings, $"/api/v1/indexer/{indexerId}", HttpMethod.GET);
                 return Execute<LidarrIndexer>(request);
             }
             catch (HttpException ex)
@@ -64,19 +63,19 @@ namespace NzbDrone.Core.Applications.Lidarr
 
         public void RemoveIndexer(int indexerId, LidarrSettings settings)
         {
-            var request = BuildRequest(settings, $"/api/v1/indexer/{indexerId}", HttpMethod.Delete);
+            var request = BuildRequest(settings, $"/api/v1/indexer/{indexerId}", HttpMethod.DELETE);
             _httpClient.Execute(request);
         }
 
         public List<LidarrIndexer> GetIndexerSchema(LidarrSettings settings)
         {
-            var request = BuildRequest(settings, "/api/v1/indexer/schema", HttpMethod.Get);
+            var request = BuildRequest(settings, "/api/v1/indexer/schema", HttpMethod.GET);
             return Execute<List<LidarrIndexer>>(request);
         }
 
         public LidarrIndexer AddIndexer(LidarrIndexer indexer, LidarrSettings settings)
         {
-            var request = BuildRequest(settings, "/api/v1/indexer", HttpMethod.Post);
+            var request = BuildRequest(settings, "/api/v1/indexer", HttpMethod.POST);
 
             request.SetContent(indexer.ToJson());
 
@@ -85,7 +84,7 @@ namespace NzbDrone.Core.Applications.Lidarr
 
         public LidarrIndexer UpdateIndexer(LidarrIndexer indexer, LidarrSettings settings)
         {
-            var request = BuildRequest(settings, $"/api/v1/indexer/{indexer.Id}", HttpMethod.Put);
+            var request = BuildRequest(settings, $"/api/v1/indexer/{indexer.Id}", HttpMethod.PUT);
 
             request.SetContent(indexer.ToJson());
 
@@ -94,7 +93,7 @@ namespace NzbDrone.Core.Applications.Lidarr
 
         public ValidationFailure TestConnection(LidarrIndexer indexer, LidarrSettings settings)
         {
-            var request = BuildRequest(settings, $"/api/v1/indexer/test", HttpMethod.Post);
+            var request = BuildRequest(settings, $"/api/v1/indexer/test", HttpMethod.POST);
 
             request.SetContent(indexer.ToJson());
 
@@ -116,12 +115,6 @@ namespace NzbDrone.Core.Applications.Lidarr
                     return new ValidationFailure("ProwlarrUrl", "Prowlarr url is invalid, Lidarr cannot connect to Prowlarr");
                 }
 
-                if (ex.Response.StatusCode == HttpStatusCode.SeeOther)
-                {
-                    _logger.Error(ex, "Lidarr returned redirect and is invalid");
-                    return new ValidationFailure("BaseUrl", "Lidarr url is invalid, Prowlarr cannot connect to Lidarr - are you missing a url base?");
-                }
-
                 _logger.Error(ex, "Unable to send test message");
                 return new ValidationFailure("BaseUrl", "Unable to complete application test");
             }

src/NzbDrone.Core/Applications/Mylar/MylarV3Proxy.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Net.Http;
 using FluentValidation.Results;
 using Newtonsoft.Json;
 using NLog;
@@ -32,13 +31,13 @@ namespace NzbDrone.Core.Applications.Mylar
 
         public MylarStatus GetStatus(MylarSettings settings)
         {
-            var request = BuildRequest(settings, "/api", "getVersion", HttpMethod.Get);
+            var request = BuildRequest(settings, "/api", "getVersion", HttpMethod.GET);
             return Execute<MylarStatus>(request);
         }
 
         public List<MylarIndexer> GetIndexers(MylarSettings settings)
         {
-            var request = BuildRequest(settings, "/api", "listProviders", HttpMethod.Get);
+            var request = BuildRequest(settings, "/api", "listProviders", HttpMethod.GET);
 
             var response = Execute<MylarIndexerResponse>(request);
 
@@ -77,7 +76,7 @@ namespace NzbDrone.Core.Applications.Mylar
                 { "providertype", indexerType.ToString().ToLower() }
             };
 
-            var request = BuildRequest(settings, "/api", "delProvider", HttpMethod.Get, parameters);
+            var request = BuildRequest(settings, "/api", "delProvider", HttpMethod.GET, parameters);
             CheckForError(Execute<MylarStatus>(request));
         }
 
@@ -93,7 +92,7 @@ namespace NzbDrone.Core.Applications.Mylar
                 { "categories", indexer.Categories }
             };
 
-            var request = BuildRequest(settings, "/api", "addProvider", HttpMethod.Get, parameters);
+            var request = BuildRequest(settings, "/api", "addProvider", HttpMethod.GET, parameters);
             CheckForError(Execute<MylarStatus>(request));
             return indexer;
         }
@@ -111,7 +110,7 @@ namespace NzbDrone.Core.Applications.Mylar
                 { "altername", indexer.Altername }
             };
 
-            var request = BuildRequest(settings, "/api", "changeProvider", HttpMethod.Get, parameters);
+            var request = BuildRequest(settings, "/api", "changeProvider", HttpMethod.GET, parameters);
             CheckForError(Execute<MylarStatus>(request));
             return indexer;
         }

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

@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Net;
-using System.Net.Http;
 using FluentValidation.Results;
 using Newtonsoft.Json;
 using NLog;
@@ -34,13 +33,13 @@ namespace NzbDrone.Core.Applications.Radarr
 
         public RadarrStatus GetStatus(RadarrSettings settings)
         {
-            var request = BuildRequest(settings, "/api/v3/system/status", HttpMethod.Get);
+            var request = BuildRequest(settings, "/api/v3/system/status", HttpMethod.GET);
             return Execute<RadarrStatus>(request);
         }
 
         public List<RadarrIndexer> GetIndexers(RadarrSettings settings)
         {
-            var request = BuildRequest(settings, "/api/v3/indexer", HttpMethod.Get);
+            var request = BuildRequest(settings, "/api/v3/indexer", HttpMethod.GET);
             return Execute<List<RadarrIndexer>>(request);
         }
 
@@ -48,7 +47,7 @@ namespace NzbDrone.Core.Applications.Radarr
         {
             try
             {
-                var request = BuildRequest(settings, $"/api/v3/indexer/{indexerId}", HttpMethod.Get);
+                var request = BuildRequest(settings, $"/api/v3/indexer/{indexerId}", HttpMethod.GET);
                 return Execute<RadarrIndexer>(request);
             }
             catch (HttpException ex)
@@ -64,19 +63,19 @@ namespace NzbDrone.Core.Applications.Radarr
 
         public void RemoveIndexer(int indexerId, RadarrSettings settings)
         {
-            var request = BuildRequest(settings, $"/api/v3/indexer/{indexerId}", HttpMethod.Delete);
+            var request = BuildRequest(settings, $"/api/v3/indexer/{indexerId}", HttpMethod.DELETE);
             _httpClient.Execute(request);
         }
 
         public List<RadarrIndexer> GetIndexerSchema(RadarrSettings settings)
         {
-            var request = BuildRequest(settings, "/api/v3/indexer/schema", HttpMethod.Get);
+            var request = BuildRequest(settings, "/api/v3/indexer/schema", HttpMethod.GET);
             return Execute<List<RadarrIndexer>>(request);
         }
 
         public RadarrIndexer AddIndexer(RadarrIndexer indexer, RadarrSettings settings)
         {
-            var request = BuildRequest(settings, "/api/v3/indexer", HttpMethod.Post);
+            var request = BuildRequest(settings, "/api/v3/indexer", HttpMethod.POST);
 
             request.SetContent(indexer.ToJson());
 
@@ -85,7 +84,7 @@ namespace NzbDrone.Core.Applications.Radarr
 
         public RadarrIndexer UpdateIndexer(RadarrIndexer indexer, RadarrSettings settings)
         {
-            var request = BuildRequest(settings, $"/api/v3/indexer/{indexer.Id}", HttpMethod.Put);
+            var request = BuildRequest(settings, $"/api/v3/indexer/{indexer.Id}", HttpMethod.PUT);
 
             request.SetContent(indexer.ToJson());
 
@@ -94,7 +93,7 @@ namespace NzbDrone.Core.Applications.Radarr
 
         public ValidationFailure TestConnection(RadarrIndexer indexer, RadarrSettings settings)
         {
-            var request = BuildRequest(settings, $"/api/v3/indexer/test", HttpMethod.Post);
+            var request = BuildRequest(settings, $"/api/v3/indexer/test", HttpMethod.POST);
 
             request.SetContent(indexer.ToJson());
 
@@ -116,12 +115,6 @@ namespace NzbDrone.Core.Applications.Radarr
                     return new ValidationFailure("ProwlarrUrl", "Prowlarr url is invalid, Radarr cannot connect to Prowlarr");
                 }
 
-                if (ex.Response.StatusCode == HttpStatusCode.SeeOther)
-                {
-                    _logger.Error(ex, "Radarr returned redirect and is invalid");
-                    return new ValidationFailure("BaseUrl", "Radarr url is invalid, Prowlarr cannot connect to Radarr - are you missing a url base?");
-                }
-
                 _logger.Error(ex, "Unable to send test message");
                 return new ValidationFailure("BaseUrl", "Unable to complete application test");
             }

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

@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Net;
-using System.Net.Http;
 using FluentValidation.Results;
 using Newtonsoft.Json;
 using NLog;
@@ -34,13 +33,13 @@ namespace NzbDrone.Core.Applications.Readarr
 
         public ReadarrStatus GetStatus(ReadarrSettings settings)
         {
-            var request = BuildRequest(settings, "/api/v1/system/status", HttpMethod.Get);
+            var request = BuildRequest(settings, "/api/v1/system/status", HttpMethod.GET);
             return Execute<ReadarrStatus>(request);
         }
 
         public List<ReadarrIndexer> GetIndexers(ReadarrSettings settings)
         {
-            var request = BuildRequest(settings, "/api/v1/indexer", HttpMethod.Get);
+            var request = BuildRequest(settings, "/api/v1/indexer", HttpMethod.GET);
             return Execute<List<ReadarrIndexer>>(request);
         }
 
@@ -48,7 +47,7 @@ namespace NzbDrone.Core.Applications.Readarr
         {
             try
             {
-                var request = BuildRequest(settings, $"/api/v1/indexer/{indexerId}", HttpMethod.Get);
+                var request = BuildRequest(settings, $"/api/v1/indexer/{indexerId}", HttpMethod.GET);
                 return Execute<ReadarrIndexer>(request);
             }
             catch (HttpException ex)
@@ -64,19 +63,19 @@ namespace NzbDrone.Core.Applications.Readarr
 
         public void RemoveIndexer(int indexerId, ReadarrSettings settings)
         {
-            var request = BuildRequest(settings, $"/api/v1/indexer/{indexerId}", HttpMethod.Delete);
+            var request = BuildRequest(settings, $"/api/v1/indexer/{indexerId}", HttpMethod.DELETE);
             _httpClient.Execute(request);
         }
 
         public List<ReadarrIndexer> GetIndexerSchema(ReadarrSettings settings)
         {
-            var request = BuildRequest(settings, "/api/v1/indexer/schema", HttpMethod.Get);
+            var request = BuildRequest(settings, "/api/v1/indexer/schema", HttpMethod.GET);
             return Execute<List<ReadarrIndexer>>(request);
         }
 
         public ReadarrIndexer AddIndexer(ReadarrIndexer indexer, ReadarrSettings settings)
         {
-            var request = BuildRequest(settings, "/api/v1/indexer", HttpMethod.Post);
+            var request = BuildRequest(settings, "/api/v1/indexer", HttpMethod.POST);
 
             request.SetContent(indexer.ToJson());
 
@@ -85,7 +84,7 @@ namespace NzbDrone.Core.Applications.Readarr
 
         public ReadarrIndexer UpdateIndexer(ReadarrIndexer indexer, ReadarrSettings settings)
         {
-            var request = BuildRequest(settings, $"/api/v1/indexer/{indexer.Id}", HttpMethod.Put);
+            var request = BuildRequest(settings, $"/api/v1/indexer/{indexer.Id}", HttpMethod.PUT);
 
             request.SetContent(indexer.ToJson());
 
@@ -94,7 +93,7 @@ namespace NzbDrone.Core.Applications.Readarr
 
         public ValidationFailure TestConnection(ReadarrIndexer indexer, ReadarrSettings settings)
         {
-            var request = BuildRequest(settings, $"/api/v1/indexer/test", HttpMethod.Post);
+            var request = BuildRequest(settings, $"/api/v1/indexer/test", HttpMethod.POST);
 
             request.SetContent(indexer.ToJson());
 
@@ -116,12 +115,6 @@ namespace NzbDrone.Core.Applications.Readarr
                     return new ValidationFailure("ProwlarrUrl", "Prowlarr url is invalid, Readarr cannot connect to Prowlarr");
                 }
 
-                if (ex.Response.StatusCode == HttpStatusCode.SeeOther)
-                {
-                    _logger.Error(ex, "Readarr returned redirect and is invalid");
-                    return new ValidationFailure("BaseUrl", "Readarr url is invalid, Prowlarr cannot connect to Readarr - are you missing a url base?");
-                }
-
                 _logger.Error(ex, "Unable to send test message");
                 return new ValidationFailure("BaseUrl", "Unable to complete application test");
             }

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

@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Net;
-using System.Net.Http;
 using FluentValidation.Results;
 using Newtonsoft.Json;
 using NLog;
@@ -34,13 +33,13 @@ namespace NzbDrone.Core.Applications.Sonarr
 
         public SonarrStatus GetStatus(SonarrSettings settings)
         {
-            var request = BuildRequest(settings, "/api/v3/system/status", HttpMethod.Get);
+            var request = BuildRequest(settings, "/api/v3/system/status", HttpMethod.GET);
             return Execute<SonarrStatus>(request);
         }
 
         public List<SonarrIndexer> GetIndexers(SonarrSettings settings)
         {
-            var request = BuildRequest(settings, "/api/v3/indexer", HttpMethod.Get);
+            var request = BuildRequest(settings, "/api/v3/indexer", HttpMethod.GET);
             return Execute<List<SonarrIndexer>>(request);
         }
 
@@ -48,7 +47,7 @@ namespace NzbDrone.Core.Applications.Sonarr
         {
             try
             {
-                var request = BuildRequest(settings, $"/api/v3/indexer/{indexerId}", HttpMethod.Get);
+                var request = BuildRequest(settings, $"/api/v3/indexer/{indexerId}", HttpMethod.GET);
                 return Execute<SonarrIndexer>(request);
             }
             catch (HttpException ex)
@@ -64,19 +63,19 @@ namespace NzbDrone.Core.Applications.Sonarr
 
         public void RemoveIndexer(int indexerId, SonarrSettings settings)
         {
-            var request = BuildRequest(settings, $"/api/v3/indexer/{indexerId}", HttpMethod.Delete);
+            var request = BuildRequest(settings, $"/api/v3/indexer/{indexerId}", HttpMethod.DELETE);
             _httpClient.Execute(request);
         }
 
         public List<SonarrIndexer> GetIndexerSchema(SonarrSettings settings)
         {
-            var request = BuildRequest(settings, "/api/v3/indexer/schema", HttpMethod.Get);
+            var request = BuildRequest(settings, "/api/v3/indexer/schema", HttpMethod.GET);
             return Execute<List<SonarrIndexer>>(request);
         }
 
         public SonarrIndexer AddIndexer(SonarrIndexer indexer, SonarrSettings settings)
         {
-            var request = BuildRequest(settings, "/api/v3/indexer", HttpMethod.Post);
+            var request = BuildRequest(settings, "/api/v3/indexer", HttpMethod.POST);
 
             request.SetContent(indexer.ToJson());
 
@@ -85,7 +84,7 @@ namespace NzbDrone.Core.Applications.Sonarr
 
         public SonarrIndexer UpdateIndexer(SonarrIndexer indexer, SonarrSettings settings)
         {
-            var request = BuildRequest(settings, $"/api/v3/indexer/{indexer.Id}", HttpMethod.Put);
+            var request = BuildRequest(settings, $"/api/v3/indexer/{indexer.Id}", HttpMethod.PUT);
 
             request.SetContent(indexer.ToJson());
 
@@ -94,7 +93,7 @@ namespace NzbDrone.Core.Applications.Sonarr
 
         public ValidationFailure TestConnection(SonarrIndexer indexer, SonarrSettings settings)
         {
-            var request = BuildRequest(settings, $"/api/v3/indexer/test", HttpMethod.Post);
+            var request = BuildRequest(settings, $"/api/v3/indexer/test", HttpMethod.POST);
 
             request.SetContent(indexer.ToJson());
 
@@ -116,18 +115,6 @@ namespace NzbDrone.Core.Applications.Sonarr
                     return new ValidationFailure("ProwlarrUrl", "Prowlarr url is invalid, Sonarr cannot connect to Prowlarr");
                 }
 
-                if (ex.Response.StatusCode == HttpStatusCode.SeeOther)
-                {
-                    _logger.Error(ex, "Sonarr returned redirect and is invalid");
-                    return new ValidationFailure("BaseUrl", "Sonarr url is invalid, Prowlarr cannot connect to Sonarr - are you missing a url base?");
-                }
-
-                if (ex.Response.StatusCode == HttpStatusCode.NotFound)
-                {
-                    _logger.Error(ex, "Sonarr not found");
-                    return new ValidationFailure("BaseUrl", "Sonarr url is invalid, Prowlarr cannot connect to Sonarr. Is Sonarr running and accessible? Sonarr v2 is not supported.");
-                }
-
                 _logger.Error(ex, "Unable to send test message");
                 return new ValidationFailure("BaseUrl", "Unable to complete application test");
             }

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

@@ -1,179 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net;
-using FluentValidation.Results;
-using Newtonsoft.Json.Linq;
-using NLog;
-using NzbDrone.Common.Cache;
-using NzbDrone.Common.Extensions;
-using NzbDrone.Core.Configuration;
-using NzbDrone.Core.Indexers;
-
-namespace NzbDrone.Core.Applications.Whisparr
-{
-    public class Whisparr : ApplicationBase<WhisparrSettings>
-    {
-        public override string Name => "Whisparr";
-
-        private readonly IWhisparrV3Proxy _whisparrV3Proxy;
-        private readonly ICached<List<WhisparrIndexer>> _schemaCache;
-        private readonly IConfigFileProvider _configFileProvider;
-
-        public Whisparr(ICacheManager cacheManager, IWhisparrV3Proxy whisparrV3Proxy, IConfigFileProvider configFileProvider, IAppIndexerMapService appIndexerMapService, Logger logger)
-            : base(appIndexerMapService, logger)
-        {
-            _schemaCache = cacheManager.GetCache<List<WhisparrIndexer>>(GetType());
-            _whisparrV3Proxy = whisparrV3Proxy;
-            _configFileProvider = configFileProvider;
-        }
-
-        public override ValidationResult Test()
-        {
-            var failures = new List<ValidationFailure>();
-
-            var testIndexer = new IndexerDefinition
-            {
-                Id = 0,
-                Name = "Test",
-                Protocol = DownloadProtocol.Usenet,
-                Capabilities = new IndexerCapabilities()
-            };
-
-            foreach (var cat in NewznabStandardCategory.AllCats)
-            {
-                testIndexer.Capabilities.Categories.AddCategoryMapping(1, cat);
-            }
-
-            try
-            {
-                failures.AddIfNotNull(_whisparrV3Proxy.TestConnection(BuildWhisparrIndexer(testIndexer, DownloadProtocol.Usenet), Settings));
-            }
-            catch (WebException ex)
-            {
-                _logger.Error(ex, "Unable to send test message");
-                failures.AddIfNotNull(new ValidationFailure("BaseUrl", "Unable to complete application test, cannot connect to Whisparr"));
-            }
-
-            return new ValidationResult(failures);
-        }
-
-        public override List<AppIndexerMap> GetIndexerMappings()
-        {
-            var indexers = _whisparrV3Proxy.GetIndexers(Settings)
-                                         .Where(i => i.Implementation == "Newznab" || i.Implementation == "Torznab");
-
-            var mappings = new List<AppIndexerMap>();
-
-            foreach (var indexer in indexers)
-            {
-                if ((string)indexer.Fields.FirstOrDefault(x => x.Name == "apiKey")?.Value == _configFileProvider.ApiKey)
-                {
-                    var match = AppIndexerRegex.Match((string)indexer.Fields.FirstOrDefault(x => x.Name == "baseUrl").Value);
-
-                    if (match.Groups["indexer"].Success && int.TryParse(match.Groups["indexer"].Value, out var indexerId))
-                    {
-                        //Add parsed mapping if it's mapped to a Indexer in this Prowlarr instance
-                        mappings.Add(new AppIndexerMap { RemoteIndexerId = indexer.Id, IndexerId = indexerId });
-                    }
-                }
-            }
-
-            return mappings;
-        }
-
-        public override void AddIndexer(IndexerDefinition indexer)
-        {
-            if (indexer.Capabilities.Categories.SupportedCategories(Settings.SyncCategories.ToArray()).Any())
-            {
-                var radarrIndexer = BuildWhisparrIndexer(indexer, indexer.Protocol);
-
-                var remoteIndexer = _whisparrV3Proxy.AddIndexer(radarrIndexer, Settings);
-                _appIndexerMapService.Insert(new AppIndexerMap { AppId = Definition.Id, IndexerId = indexer.Id, RemoteIndexerId = remoteIndexer.Id });
-            }
-        }
-
-        public override void RemoveIndexer(int indexerId)
-        {
-            var appMappings = _appIndexerMapService.GetMappingsForApp(Definition.Id);
-
-            var indexerMapping = appMappings.FirstOrDefault(m => m.IndexerId == indexerId);
-
-            if (indexerMapping != null)
-            {
-                //Remove Indexer remotely and then remove the mapping
-                _whisparrV3Proxy.RemoveIndexer(indexerMapping.RemoteIndexerId, Settings);
-                _appIndexerMapService.Delete(indexerMapping.Id);
-            }
-        }
-
-        public override void UpdateIndexer(IndexerDefinition indexer)
-        {
-            _logger.Debug("Updating indexer {0} [{1}]", indexer.Name, indexer.Id);
-
-            var appMappings = _appIndexerMapService.GetMappingsForApp(Definition.Id);
-            var indexerMapping = appMappings.FirstOrDefault(m => m.IndexerId == indexer.Id);
-
-            var radarrIndexer = BuildWhisparrIndexer(indexer, indexer.Protocol, indexerMapping?.RemoteIndexerId ?? 0);
-
-            var remoteIndexer = _whisparrV3Proxy.GetIndexer(indexerMapping.RemoteIndexerId, Settings);
-
-            if (remoteIndexer != null)
-            {
-                _logger.Debug("Remote indexer found, syncing with current settings");
-
-                if (!radarrIndexer.Equals(remoteIndexer))
-                {
-                    _whisparrV3Proxy.UpdateIndexer(radarrIndexer, Settings);
-                }
-            }
-            else
-            {
-                _appIndexerMapService.Delete(indexerMapping.Id);
-
-                if (indexer.Capabilities.Categories.SupportedCategories(Settings.SyncCategories.ToArray()).Any())
-                {
-                    _logger.Debug("Remote indexer not found, re-adding {0} to Whisparr", indexer.Name);
-                    radarrIndexer.Id = 0;
-                    var newRemoteIndexer = _whisparrV3Proxy.AddIndexer(radarrIndexer, Settings);
-                    _appIndexerMapService.Insert(new AppIndexerMap { AppId = Definition.Id, IndexerId = indexer.Id, RemoteIndexerId = newRemoteIndexer.Id });
-                }
-                else
-                {
-                    _logger.Debug("Remote indexer not found for {0}, skipping re-add to Radarr due to indexer capabilities", indexer.Name);
-                }
-            }
-        }
-
-        private WhisparrIndexer BuildWhisparrIndexer(IndexerDefinition indexer, DownloadProtocol protocol, int id = 0)
-        {
-            var cacheKey = $"{Settings.BaseUrl}";
-            var schemas = _schemaCache.Get(cacheKey, () => _whisparrV3Proxy.GetIndexerSchema(Settings), TimeSpan.FromDays(7));
-
-            var newznab = schemas.Where(i => i.Implementation == "Newznab").First();
-            var torznab = schemas.Where(i => i.Implementation == "Torznab").First();
-
-            var schema = protocol == DownloadProtocol.Usenet ? newznab : torznab;
-
-            var whisparrIndexer = new WhisparrIndexer
-            {
-                Id = id,
-                Name = $"{indexer.Name} (Prowlarr)",
-                EnableRss = indexer.Enable && indexer.AppProfile.Value.EnableRss,
-                EnableAutomaticSearch = indexer.Enable && indexer.AppProfile.Value.EnableAutomaticSearch,
-                EnableInteractiveSearch = indexer.Enable && indexer.AppProfile.Value.EnableInteractiveSearch,
-                Priority = indexer.Priority,
-                Implementation = indexer.Protocol == DownloadProtocol.Usenet ? "Newznab" : "Torznab",
-                ConfigContract = schema.ConfigContract,
-                Fields = schema.Fields,
-            };
-
-            whisparrIndexer.Fields.FirstOrDefault(x => x.Name == "baseUrl").Value = $"{Settings.ProwlarrUrl.TrimEnd('/')}/{indexer.Id}/";
-            whisparrIndexer.Fields.FirstOrDefault(x => x.Name == "apiPath").Value = "/api";
-            whisparrIndexer.Fields.FirstOrDefault(x => x.Name == "apiKey").Value = _configFileProvider.ApiKey;
-            whisparrIndexer.Fields.FirstOrDefault(x => x.Name == "categories").Value = JArray.FromObject(indexer.Capabilities.Categories.SupportedCategories(Settings.SyncCategories.ToArray()));
-
-            return whisparrIndexer;
-        }
-    }
-}

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

@@ -1,22 +0,0 @@
-namespace NzbDrone.Core.Applications.Whisparr
-{
-    public class WhisparrField
-    {
-        public int Order { get; set; }
-        public string Name { get; set; }
-        public string Label { get; set; }
-        public string Unit { get; set; }
-        public string HelpText { get; set; }
-        public string HelpLink { get; set; }
-        public object Value { get; set; }
-        public string Type { get; set; }
-        public bool Advanced { get; set; }
-        public string Section { get; set; }
-        public string Hidden { get; set; }
-
-        public WhisparrField Clone()
-        {
-            return (WhisparrField)MemberwiseClone();
-        }
-    }
-}

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

@@ -1,44 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using Newtonsoft.Json.Linq;
-
-namespace NzbDrone.Core.Applications.Whisparr
-{
-    public class WhisparrIndexer
-    {
-        public int Id { get; set; }
-        public bool EnableRss { get; set; }
-        public bool EnableAutomaticSearch { get; set; }
-        public bool EnableInteractiveSearch { get; set; }
-        public int Priority { get; set; }
-        public string Name { get; set; }
-        public string ImplementationName { get; set; }
-        public string Implementation { get; set; }
-        public string ConfigContract { get; set; }
-        public string InfoLink { get; set; }
-        public HashSet<int> Tags { get; set; }
-        public List<WhisparrField> Fields { get; set; }
-
-        public bool Equals(WhisparrIndexer other)
-        {
-            if (ReferenceEquals(null, other))
-            {
-                return false;
-            }
-
-            var baseUrl = (string)Fields.FirstOrDefault(x => x.Name == "baseUrl").Value == (string)other.Fields.FirstOrDefault(x => x.Name == "baseUrl").Value;
-            var apiPath = (string)Fields.FirstOrDefault(x => x.Name == "apiPath").Value == (string)other.Fields.FirstOrDefault(x => x.Name == "apiPath").Value;
-            var apiKey = (string)Fields.FirstOrDefault(x => x.Name == "apiKey").Value == (string)other.Fields.FirstOrDefault(x => x.Name == "apiKey").Value;
-            var cats = JToken.DeepEquals((JArray)Fields.FirstOrDefault(x => x.Name == "categories").Value, (JArray)other.Fields.FirstOrDefault(x => x.Name == "categories").Value);
-
-            return other.EnableRss == EnableRss &&
-                other.EnableAutomaticSearch == EnableAutomaticSearch &&
-                other.EnableInteractiveSearch == EnableInteractiveSearch &&
-                other.Name == Name &&
-                other.Implementation == Implementation &&
-                other.Priority == Priority &&
-                other.Id == Id &&
-                apiKey && apiPath && baseUrl && cats;
-        }
-    }
-}

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

@@ -1,46 +0,0 @@
-using System.Collections.Generic;
-using FluentValidation;
-using NzbDrone.Core.Annotations;
-using NzbDrone.Core.Indexers;
-using NzbDrone.Core.Validation;
-
-namespace NzbDrone.Core.Applications.Whisparr
-{
-    public class WhisparrSettingsValidator : AbstractValidator<WhisparrSettings>
-    {
-        public WhisparrSettingsValidator()
-        {
-            RuleFor(c => c.BaseUrl).IsValidUrl();
-            RuleFor(c => c.ProwlarrUrl).IsValidUrl();
-            RuleFor(c => c.ApiKey).NotEmpty();
-            RuleFor(c => c.SyncCategories).NotEmpty();
-        }
-    }
-
-    public class WhisparrSettings : IApplicationSettings
-    {
-        private static readonly WhisparrSettingsValidator Validator = new WhisparrSettingsValidator();
-
-        public WhisparrSettings()
-        {
-            SyncCategories = new[] { 6000, 6010, 6020, 6030, 6040, 6045, 6050, 6070, 6080, 6090 };
-        }
-
-        [FieldDefinition(0, Label = "Prowlarr Server", HelpText = "Prowlarr server URL as Whisparr sees it, including http(s)://, port, and urlbase if needed", Placeholder = "http://localhost:9696")]
-        public string ProwlarrUrl { get; set; }
-
-        [FieldDefinition(1, Label = "Whisparr Server", HelpText = "URL used to connect to Whisparr server, including http(s)://, port, and urlbase if required", Placeholder = "http://localhost:6969")]
-        public string BaseUrl { get; set; }
-
-        [FieldDefinition(2, Label = "ApiKey", Privacy = PrivacyLevel.ApiKey, HelpText = "The ApiKey generated by Whisparr in Settings/General")]
-        public string ApiKey { get; set; }
-
-        [FieldDefinition(3, Label = "Sync Categories", Type = FieldType.Select, SelectOptions = typeof(NewznabCategoryFieldConverter), Advanced = true, HelpText = "Only Indexers that support these categories will be synced")]
-        public IEnumerable<int> SyncCategories { get; set; }
-
-        public NzbDroneValidationResult Validate()
-        {
-            return new NzbDroneValidationResult(Validator.Validate(this));
-        }
-    }
-}

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

@@ -1,7 +0,0 @@
-namespace NzbDrone.Core.Applications.Whisparr
-{
-    public class WhisparrStatus
-    {
-        public string Version { get; set; }
-    }
-}

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

@@ -1,163 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Net;
-using System.Net.Http;
-using FluentValidation.Results;
-using Newtonsoft.Json;
-using NLog;
-using NzbDrone.Common.Http;
-using NzbDrone.Common.Serializer;
-
-namespace NzbDrone.Core.Applications.Whisparr
-{
-    public interface IWhisparrV3Proxy
-    {
-        WhisparrIndexer AddIndexer(WhisparrIndexer indexer, WhisparrSettings settings);
-        List<WhisparrIndexer> GetIndexers(WhisparrSettings settings);
-        WhisparrIndexer GetIndexer(int indexerId, WhisparrSettings settings);
-        List<WhisparrIndexer> GetIndexerSchema(WhisparrSettings settings);
-        void RemoveIndexer(int indexerId, WhisparrSettings settings);
-        WhisparrIndexer UpdateIndexer(WhisparrIndexer indexer, WhisparrSettings settings);
-        ValidationFailure TestConnection(WhisparrIndexer indexer, WhisparrSettings settings);
-    }
-
-    public class WhisparrV3Proxy : IWhisparrV3Proxy
-    {
-        private readonly IHttpClient _httpClient;
-        private readonly Logger _logger;
-
-        public WhisparrV3Proxy(IHttpClient httpClient, Logger logger)
-        {
-            _httpClient = httpClient;
-            _logger = logger;
-        }
-
-        public WhisparrStatus GetStatus(WhisparrSettings settings)
-        {
-            var request = BuildRequest(settings, "/api/v3/system/status", HttpMethod.Get);
-            return Execute<WhisparrStatus>(request);
-        }
-
-        public List<WhisparrIndexer> GetIndexers(WhisparrSettings settings)
-        {
-            var request = BuildRequest(settings, "/api/v3/indexer", HttpMethod.Get);
-            return Execute<List<WhisparrIndexer>>(request);
-        }
-
-        public WhisparrIndexer GetIndexer(int indexerId, WhisparrSettings settings)
-        {
-            try
-            {
-                var request = BuildRequest(settings, $"/api/v3/indexer/{indexerId}", HttpMethod.Get);
-                return Execute<WhisparrIndexer>(request);
-            }
-            catch (HttpException ex)
-            {
-                if (ex.Response.StatusCode != HttpStatusCode.NotFound)
-                {
-                    throw;
-                }
-            }
-
-            return null;
-        }
-
-        public void RemoveIndexer(int indexerId, WhisparrSettings settings)
-        {
-            var request = BuildRequest(settings, $"/api/v3/indexer/{indexerId}", HttpMethod.Delete);
-            _httpClient.Execute(request);
-        }
-
-        public List<WhisparrIndexer> GetIndexerSchema(WhisparrSettings settings)
-        {
-            var request = BuildRequest(settings, "/api/v3/indexer/schema", HttpMethod.Get);
-            return Execute<List<WhisparrIndexer>>(request);
-        }
-
-        public WhisparrIndexer AddIndexer(WhisparrIndexer indexer, WhisparrSettings settings)
-        {
-            var request = BuildRequest(settings, "/api/v3/indexer", HttpMethod.Post);
-
-            request.SetContent(indexer.ToJson());
-
-            return Execute<WhisparrIndexer>(request);
-        }
-
-        public WhisparrIndexer UpdateIndexer(WhisparrIndexer indexer, WhisparrSettings settings)
-        {
-            var request = BuildRequest(settings, $"/api/v3/indexer/{indexer.Id}", HttpMethod.Put);
-
-            request.SetContent(indexer.ToJson());
-
-            return Execute<WhisparrIndexer>(request);
-        }
-
-        public ValidationFailure TestConnection(WhisparrIndexer indexer, WhisparrSettings settings)
-        {
-            var request = BuildRequest(settings, $"/api/v3/indexer/test", HttpMethod.Post);
-
-            request.SetContent(indexer.ToJson());
-
-            try
-            {
-                Execute<WhisparrIndexer>(request);
-            }
-            catch (HttpException ex)
-            {
-                if (ex.Response.StatusCode == HttpStatusCode.Unauthorized)
-                {
-                    _logger.Error(ex, "API Key is invalid");
-                    return new ValidationFailure("ApiKey", "API Key is invalid");
-                }
-
-                if (ex.Response.StatusCode == HttpStatusCode.BadRequest)
-                {
-                    _logger.Error(ex, "Prowlarr URL is invalid");
-                    return new ValidationFailure("ProwlarrUrl", "Prowlarr url is invalid, Whisparr cannot connect to Prowlarr");
-                }
-
-                if (ex.Response.StatusCode == HttpStatusCode.SeeOther)
-                {
-                    _logger.Error(ex, "Whisparr returned redirect and is invalid");
-                    return new ValidationFailure("BaseUrl", "Whisparr url is invalid, Prowlarr cannot connect to Whisparr - are you missing a url base?");
-                }
-
-                _logger.Error(ex, "Unable to send test message");
-                return new ValidationFailure("BaseUrl", "Unable to complete application test");
-            }
-            catch (Exception ex)
-            {
-                _logger.Error(ex, "Unable to send test message");
-                return new ValidationFailure("", "Unable to send test message");
-            }
-
-            return null;
-        }
-
-        private HttpRequest BuildRequest(WhisparrSettings settings, string resource, HttpMethod method)
-        {
-            var baseUrl = settings.BaseUrl.TrimEnd('/');
-
-            var request = new HttpRequestBuilder(baseUrl).Resource(resource)
-                .SetHeader("X-Api-Key", settings.ApiKey)
-                .Build();
-
-            request.Headers.ContentType = "application/json";
-
-            request.Method = method;
-            request.AllowAutoRedirect = true;
-
-            return request;
-        }
-
-        private TResource Execute<TResource>(HttpRequest request)
-             where TResource : new()
-        {
-            var response = _httpClient.Execute(request);
-
-            var results = JsonConvert.DeserializeObject<TResource>(response.Content);
-
-            return results;
-        }
-    }
-}

src/NzbDrone.Core/Backup/BackupService.cs

@@ -90,8 +90,6 @@ namespace NzbDrone.Core.Backup
 
             _archiveService.CreateZip(backupPath, _diskProvider.GetFiles(_backupTempFolder, SearchOption.TopDirectoryOnly));
 
-            Cleanup();
-
             _logger.ProgressDebug("Backup zip created");
         }
 

src/NzbDrone.Core/Configuration/ConfigFileProvider.cs

@@ -197,7 +197,7 @@ namespace NzbDrone.Core.Configuration
         public string PostgresPassword => GetValue("PostgresPassword", string.Empty, persist: false);
         public string PostgresMainDb => GetValue("PostgresMainDb", "prowlarr-main", persist: false);
         public string PostgresLogDb => GetValue("PostgresLogDb", "prowlarr-log", persist: false);
-        public int PostgresPort => GetValueInt("PostgresPort", 5432, persist: false);
+        public int PostgresPort => GetValueInt("PostgresPort", 5436, persist: false);
         public bool LogSql => GetValueBoolean("LogSql", false, persist: false);
         public int LogRotate => GetValueInt("LogRotate", 50, persist: false);
         public bool FilterSentryEvents => GetValueBoolean("FilterSentryEvents", true, persist: false);

src/NzbDrone.Core/Datastore/BasicRepository.cs

@@ -66,7 +66,7 @@ namespace NzbDrone.Core.Datastore
             _updateSql = GetUpdateSql(_properties);
         }
 
-        protected virtual SqlBuilder Builder() => new SqlBuilder(_database.DatabaseType);
+        protected virtual SqlBuilder Builder() => new SqlBuilder();
 
         protected virtual List<TModel> Query(SqlBuilder builder) => _database.Query<TModel>(builder).ToList();
 

src/NzbDrone.Core/Datastore/Converters/TimeSpanConverter.cs

@@ -1,19 +0,0 @@
-using System;
-using System.Data;
-using Dapper;
-
-namespace NzbDrone.Core.Datastore.Converters
-{
-    public class DapperTimeSpanConverter : SqlMapper.TypeHandler<TimeSpan>
-    {
-        public override void SetValue(IDbDataParameter parameter, TimeSpan value)
-        {
-            parameter.Value = value.ToString();
-        }
-
-        public override TimeSpan Parse(object value)
-        {
-            return TimeSpan.Parse((string)value);
-        }
-    }
-}

src/NzbDrone.Core/Datastore/Extensions/BuilderExtensions.cs

@@ -42,21 +42,21 @@ namespace NzbDrone.Core.Datastore
 
         public static SqlBuilder Where<TModel>(this SqlBuilder builder, Expression<Func<TModel, bool>> filter)
         {
-            var wb = GetWhereBuilder(builder.DatabaseType, filter, true, builder.Sequence);
+            var wb = new WhereBuilder(filter, true, builder.Sequence);
 
             return builder.Where(wb.ToString(), wb.Parameters);
         }
 
         public static SqlBuilder OrWhere<TModel>(this SqlBuilder builder, Expression<Func<TModel, bool>> filter)
         {
-            var wb = GetWhereBuilder(builder.DatabaseType, filter, true, builder.Sequence);
+            var wb = new WhereBuilder(filter, true, builder.Sequence);
 
             return builder.OrWhere(wb.ToString(), wb.Parameters);
         }
 
         public static SqlBuilder Join<TLeft, TRight>(this SqlBuilder builder, Expression<Func<TLeft, TRight, bool>> filter)
         {
-            var wb = GetWhereBuilder(builder.DatabaseType, filter, false, builder.Sequence);
+            var wb = new WhereBuilder(filter, false, builder.Sequence);
 
             var rightTable = TableMapping.Mapper.TableNameMapping(typeof(TRight));
 
@@ -65,7 +65,7 @@ namespace NzbDrone.Core.Datastore
 
         public static SqlBuilder LeftJoin<TLeft, TRight>(this SqlBuilder builder, Expression<Func<TLeft, TRight, bool>> filter)
         {
-            var wb = GetWhereBuilder(builder.DatabaseType, filter, false, builder.Sequence);
+            var wb = new WhereBuilder(filter, false, builder.Sequence);
 
             var rightTable = TableMapping.Mapper.TableNameMapping(typeof(TRight));
 
@@ -138,18 +138,6 @@ namespace NzbDrone.Core.Datastore
             return sb.ToString();
         }
 
-        private static WhereBuilder GetWhereBuilder(DatabaseType databaseType, Expression filter, bool requireConcrete, int seq)
-        {
-            if (databaseType == DatabaseType.PostgreSQL)
-            {
-                return new WhereBuilderPostgres(filter, requireConcrete, seq);
-            }
-            else
-            {
-                return new WhereBuilderSqlite(filter, requireConcrete, seq);
-            }
-        }
-
         private static Dictionary<string, object> ToDictionary(this DynamicParameters dynamicParams)
         {
             var argsDictionary = new Dictionary<string, object>();

src/NzbDrone.Core/Datastore/Migration/015_indexer_versions.cs

@@ -1,18 +0,0 @@
-using FluentMigrator;
-using NzbDrone.Core.Datastore.Migration.Framework;
-
-namespace NzbDrone.Core.Datastore.Migration
-{
-    [Migration(15)]
-    public class IndexerVersions : NzbDroneMigrationBase
-    {
-        protected override void MainDbUpgrade()
-        {
-            Create.TableForModel("IndexerDefinitionVersions")
-                .WithColumn("DefinitionId").AsString().NotNullable().Unique()
-                .WithColumn("File").AsString().NotNullable().Unique()
-                .WithColumn("Sha").AsString().Nullable()
-                .WithColumn("LastUpdated").AsDateTime().Nullable();
-        }
-    }
-}

src/NzbDrone.Core/Datastore/SqlBuilder.cs

@@ -8,17 +8,9 @@ namespace NzbDrone.Core.Datastore
     public class SqlBuilder
     {
         private readonly Dictionary<string, Clauses> _data = new Dictionary<string, Clauses>();
-        private readonly DatabaseType _databaseType;
-
-        public SqlBuilder(DatabaseType databaseType)
-        {
-            _databaseType = databaseType;
-        }
 
         public int Sequence { get; private set; }
 
-        public DatabaseType DatabaseType => _databaseType;
-
         public Template AddTemplate(string sql, dynamic parameters = null) =>
             new Template(this, sql, parameters);
 

src/NzbDrone.Core/Datastore/TableMapper.cs

@@ -183,7 +183,7 @@ namespace NzbDrone.Core.Datastore
                             (db, parent) =>
                             {
                                 var id = childIdSelector(parent);
-                                return db.Query<TChild>(new SqlBuilder(db.DatabaseType).Where<TChild>(x => x.Id == id)).SingleOrDefault();
+                                return db.Query<TChild>(new SqlBuilder().Where<TChild>(x => x.Id == id)).SingleOrDefault();
                             },
                             parent => childIdSelector(parent) > 0);
         }

src/NzbDrone.Core/Datastore/TableMapping.cs

@@ -11,7 +11,6 @@ using NzbDrone.Core.Datastore.Converters;
 using NzbDrone.Core.Download;
 using NzbDrone.Core.IndexerProxies;
 using NzbDrone.Core.Indexers;
-using NzbDrone.Core.IndexerVersions;
 using NzbDrone.Core.Instrumentation;
 using NzbDrone.Core.Jobs;
 using NzbDrone.Core.Languages;
@@ -95,7 +94,6 @@ namespace NzbDrone.Core.Datastore
             Mapper.Entity<UpdateHistory>("UpdateHistory").RegisterModel();
 
             Mapper.Entity<AppSyncProfile>("AppSyncProfiles").RegisterModel();
-            Mapper.Entity<IndexerDefinitionVersion>("IndexerDefinitionVersions").RegisterModel();
         }
 
         private static void RegisterMappers()
@@ -105,7 +103,6 @@ namespace NzbDrone.Core.Datastore
 
             SqlMapper.RemoveTypeMap(typeof(DateTime));
             SqlMapper.AddTypeHandler(new DapperUtcConverter());
-            SqlMapper.AddTypeHandler(new DapperTimeSpanConverter());
             SqlMapper.AddTypeHandler(new EmbeddedDocumentConverter<Dictionary<string, string>>());
             SqlMapper.AddTypeHandler(new CookieConverter());
             SqlMapper.AddTypeHandler(new EmbeddedDocumentConverter<List<int>>());

src/NzbDrone.Core/Datastore/WhereBuilder.cs

@@ -1,9 +1,389 @@
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Linq.Expressions;
+using System.Reflection;
+using System.Text;
 using Dapper;
 
 namespace NzbDrone.Core.Datastore
 {
-    public abstract class WhereBuilder : ExpressionVisitor
+    public class WhereBuilder : ExpressionVisitor
     {
-        public DynamicParameters Parameters { get; protected set; }
+        protected StringBuilder _sb;
+
+        private const DbType EnumerableMultiParameter = (DbType)(-1);
+        private readonly string _paramNamePrefix;
+        private readonly bool _requireConcreteValue = false;
+        private int _paramCount = 0;
+        private bool _gotConcreteValue = false;
+
+        public WhereBuilder(Expression filter, bool requireConcreteValue, int seq)
+        {
+            _paramNamePrefix = string.Format("Clause{0}", seq + 1);
+            _requireConcreteValue = requireConcreteValue;
+            _sb = new StringBuilder();
+
+            Parameters = new DynamicParameters();
+
+            if (filter != null)
+            {
+                Visit(filter);
+            }
+        }
+
+        public DynamicParameters Parameters { get; private set; }
+
+        private string AddParameter(object value, DbType? dbType = null)
+        {
+            _gotConcreteValue = true;
+            _paramCount++;
+            var name = _paramNamePrefix + "_P" + _paramCount;
+            Parameters.Add(name, value, dbType);
+            return '@' + name;
+        }
+
+        protected override Expression VisitBinary(BinaryExpression expression)
+        {
+            _sb.Append('(');
+
+            Visit(expression.Left);
+
+            _sb.AppendFormat(" {0} ", Decode(expression));
+
+            Visit(expression.Right);
+
+            _sb.Append(')');
+
+            return expression;
+        }
+
+        protected override Expression VisitMethodCall(MethodCallExpression expression)
+        {
+            var method = expression.Method.Name;
+
+            switch (expression.Method.Name)
+            {
+                case "Contains":
+                    ParseContainsExpression(expression);
+                    break;
+
+                case "StartsWith":
+                    ParseStartsWith(expression);
+                    break;
+
+                case "EndsWith":
+                    ParseEndsWith(expression);
+                    break;
+
+                default:
+                    var msg = string.Format("'{0}' expressions are not yet implemented in the where clause expression tree parser.", method);
+                    throw new NotImplementedException(msg);
+            }
+
+            return expression;
+        }
+
+        protected override Expression VisitMemberAccess(MemberExpression expression)
+        {
+            var tableName = expression?.Expression?.Type != null ? TableMapping.Mapper.TableNameMapping(expression.Expression.Type) : null;
+            var gotValue = TryGetRightValue(expression, out var value);
+
+            // Only use the SQL condition if the expression didn't resolve to an actual value
+            if (tableName != null && !gotValue)
+            {
+                _sb.Append($"\"{tableName}\".\"{expression.Member.Name}\"");
+            }
+            else
+            {
+                if (value != null)
+                {
+                    // string is IEnumerable<Char> but we don't want to pick up that case
+                    var type = value.GetType();
+                    var typeInfo = type.GetTypeInfo();
+                    var isEnumerable =
+                        type != typeof(string) && (
+                            typeInfo.ImplementedInterfaces.Any(ti => ti.IsGenericType && ti.GetGenericTypeDefinition() == typeof(IEnumerable<>)) ||
+                            (typeInfo.IsGenericType && typeInfo.GetGenericTypeDefinition() == typeof(IEnumerable<>)));
+
+                    var paramName = isEnumerable ? AddParameter(value, EnumerableMultiParameter) : AddParameter(value);
+                    _sb.Append(paramName);
+                }
+                else
+                {
+                    _gotConcreteValue = true;
+                    _sb.Append("NULL");
+                }
+            }
+
+            return expression;
+        }
+
+        protected override Expression VisitConstant(ConstantExpression expression)
+        {
+            if (expression.Value != null)
+            {
+                var paramName = AddParameter(expression.Value);
+                _sb.Append(paramName);
+            }
+            else
+            {
+                _gotConcreteValue = true;
+                _sb.Append("NULL");
+            }
+
+            return expression;
+        }
+
+        private bool TryGetConstantValue(Expression expression, out object result)
+        {
+            result = null;
+
+            if (expression is ConstantExpression constExp)
+            {
+                result = constExp.Value;
+                return true;
+            }
+
+            return false;
+        }
+
+        private bool TryGetPropertyValue(MemberExpression expression, out object result)
+        {
+            result = null;
+
+            if (expression.Expression is MemberExpression nested)
+            {
+                // Value is passed in as a property on a parent entity
+                var container = (nested.Expression as ConstantExpression)?.Value;
+
+                if (container == null)
+                {
+                    return false;
+                }
+
+                var entity = GetFieldValue(container, nested.Member);
+                result = GetFieldValue(entity, expression.Member);
+                return true;
+            }
+
+            return false;
+        }
+
+        private bool TryGetVariableValue(MemberExpression expression, out object result)
+        {
+            result = null;
+
+            // Value is passed in as a variable
+            if (expression.Expression is ConstantExpression nested)
+            {
+                result = GetFieldValue(nested.Value, expression.Member);
+                return true;
+            }
+
+            return false;
+        }
+
+        private bool TryGetRightValue(Expression expression, out object value)
+        {
+            value = null;
+
+            if (TryGetConstantValue(expression, out value))
+            {
+                return true;
+            }
+
+            var memberExp = expression as MemberExpression;
+
+            if (TryGetPropertyValue(memberExp, out value))
+            {
+                return true;
+            }
+
+            if (TryGetVariableValue(memberExp, out value))
+            {
+                return true;
+            }
+
+            return false;
+        }
+
+        private object GetFieldValue(object entity, MemberInfo member)
+        {
+            if (member.MemberType == MemberTypes.Field)
+            {
+                return (member as FieldInfo).GetValue(entity);
+            }
+
+            if (member.MemberType == MemberTypes.Property)
+            {
+                return (member as PropertyInfo).GetValue(entity);
+            }
+
+            throw new ArgumentException(string.Format("WhereBuilder could not get the value for {0}.{1}.", entity.GetType().Name, member.Name));
+        }
+
+        private bool IsNullVariable(Expression expression)
+        {
+            if (expression.NodeType == ExpressionType.Constant &&
+                TryGetConstantValue(expression, out var constResult) &&
+                constResult == null)
+            {
+                return true;
+            }
+
+            if (expression.NodeType == ExpressionType.MemberAccess &&
+                expression is MemberExpression member &&
+                ((TryGetPropertyValue(member, out var result) && result == null) ||
+                 (TryGetVariableValue(member, out result) && result == null)))
+            {
+                return true;
+            }
+
+            return false;
+        }
+
+        private string Decode(BinaryExpression expression)
+        {
+            if (IsNullVariable(expression.Right))
+            {
+                switch (expression.NodeType)
+                {
+                    case ExpressionType.Equal: return "IS";
+                    case ExpressionType.NotEqual: return "IS NOT";
+                }
+            }
+
+            switch (expression.NodeType)
+            {
+                case ExpressionType.AndAlso: return "AND";
+                case ExpressionType.And: return "AND";
+                case ExpressionType.Equal: return "=";
+                case ExpressionType.GreaterThan: return ">";
+                case ExpressionType.GreaterThanOrEqual: return ">=";
+                case ExpressionType.LessThan: return "<";
+                case ExpressionType.LessThanOrEqual: return "<=";
+                case ExpressionType.NotEqual: return "<>";
+                case ExpressionType.OrElse: return "OR";
+                case ExpressionType.Or: return "OR";
+                default: throw new NotSupportedException(string.Format("{0} statement is not supported", expression.NodeType.ToString()));
+            }
+        }
+
+        private void ParseContainsExpression(MethodCallExpression expression)
+        {
+            var list = expression.Object;
+
+            if (list != null && (list.Type == typeof(string)))
+            {
+                ParseStringContains(expression);
+                return;
+            }
+
+            ParseEnumerableContains(expression);
+        }
+
+        private void ParseEnumerableContains(MethodCallExpression body)
+        {
+            // Fish out the list and the item to compare
+            // It's in a different form for arrays and Lists
+            var list = body.Object;
+            Expression item;
+
+            if (list != null)
+            {
+                // Generic collection
+                item = body.Arguments[0];
+            }
+            else
+            {
+                // Static method
+                // Must be Enumerable.Contains(source, item)
+                if (body.Method.DeclaringType != typeof(Enumerable) || body.Arguments.Count != 2)
+                {
+                    throw new NotSupportedException("Unexpected form of Enumerable.Contains");
+                }
+
+                list = body.Arguments[0];
+                item = body.Arguments[1];
+            }
+
+            _sb.Append('(');
+
+            Visit(item);
+
+            _sb.Append(" IN ");
+
+            // hardcode the integer list if it exists to bypass parameter limit
+            if (item.Type == typeof(int) && TryGetRightValue(list, out var value))
+            {
+                var items = (IEnumerable<int>)value;
+                _sb.Append('(');
+                _sb.Append(string.Join(", ", items));
+                _sb.Append(')');
+
+                _gotConcreteValue = true;
+            }
+            else
+            {
+                Visit(list);
+            }
+
+            _sb.Append(')');
+        }
+
+        private void ParseStringContains(MethodCallExpression body)
+        {
+            _sb.Append('(');
+
+            Visit(body.Object);
+
+            _sb.Append(" LIKE '%' || ");
+
+            Visit(body.Arguments[0]);
+
+            _sb.Append(" || '%')");
+        }
+
+        private void ParseStartsWith(MethodCallExpression body)
+        {
+            _sb.Append('(');
+
+            Visit(body.Object);
+
+            _sb.Append(" LIKE ");
+
+            Visit(body.Arguments[0]);
+
+            _sb.Append(" || '%')");
+        }
+
+        private void ParseEndsWith(MethodCallExpression body)
+        {
+            _sb.Append('(');
+
+            Visit(body.Object);
+
+            _sb.Append(" LIKE '%' || ");
+
+            Visit(body.Arguments[0]);
+
+            _sb.Append(')');
+        }
+
+        public override string ToString()
+        {
+            var sql = _sb.ToString();
+
+            if (_requireConcreteValue && !_gotConcreteValue)
+            {
+                var e = new InvalidOperationException("WhereBuilder requires a concrete condition");
+                e.Data.Add("sql", sql);
+                throw e;
+            }
+
+            return sql;
+        }
     }
 }

src/NzbDrone.Core/Datastore/WhereBuilderPostgres.cs

@@ -1,374 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.Linq;
-using System.Linq.Expressions;
-using System.Reflection;
-using System.Text;
-using Dapper;
-
-namespace NzbDrone.Core.Datastore
-{
-    public class WhereBuilderPostgres : WhereBuilder
-    {
-        protected StringBuilder _sb;
-
-        private const DbType EnumerableMultiParameter = (DbType)(-1);
-        private readonly string _paramNamePrefix;
-        private readonly bool _requireConcreteValue = false;
-        private int _paramCount = 0;
-        private bool _gotConcreteValue = false;
-
-        public WhereBuilderPostgres(Expression filter, bool requireConcreteValue, int seq)
-        {
-            _paramNamePrefix = string.Format("Clause{0}", seq + 1);
-            _requireConcreteValue = requireConcreteValue;
-            _sb = new StringBuilder();
-
-            Parameters = new DynamicParameters();
-
-            if (filter != null)
-            {
-                Visit(filter);
-            }
-        }
-
-        private string AddParameter(object value, DbType? dbType = null)
-        {
-            _gotConcreteValue = true;
-            _paramCount++;
-            var name = _paramNamePrefix + "_P" + _paramCount;
-            Parameters.Add(name, value, dbType);
-            return '@' + name;
-        }
-
-        protected override Expression VisitBinary(BinaryExpression expression)
-        {
-            _sb.Append('(');
-
-            Visit(expression.Left);
-
-            _sb.AppendFormat(" {0} ", Decode(expression));
-
-            Visit(expression.Right);
-
-            _sb.Append(')');
-
-            return expression;
-        }
-
-        protected override Expression VisitMethodCall(MethodCallExpression expression)
-        {
-            var method = expression.Method.Name;
-
-            switch (expression.Method.Name)
-            {
-                case "Contains":
-                    ParseContainsExpression(expression);
-                    break;
-
-                case "StartsWith":
-                    ParseStartsWith(expression);
-                    break;
-
-                case "EndsWith":
-                    ParseEndsWith(expression);
-                    break;
-
-                default:
-                    var msg = string.Format("'{0}' expressions are not yet implemented in the where clause expression tree parser.", method);
-                    throw new NotImplementedException(msg);
-            }
-
-            return expression;
-        }
-
-        protected override Expression VisitMemberAccess(MemberExpression expression)
-        {
-            var tableName = expression?.Expression?.Type != null ? TableMapping.Mapper.TableNameMapping(expression.Expression.Type) : null;
-            var gotValue = TryGetRightValue(expression, out var value);
-
-            // Only use the SQL condition if the expression didn't resolve to an actual value
-            if (tableName != null && !gotValue)
-            {
-                _sb.Append($"\"{tableName}\".\"{expression.Member.Name}\"");
-            }
-            else
-            {
-                if (value != null)
-                {
-                    // string is IEnumerable<Char> but we don't want to pick up that case
-                    var type = value.GetType();
-                    var typeInfo = type.GetTypeInfo();
-                    var isEnumerable =
-                        type != typeof(string) && (
-                            typeInfo.ImplementedInterfaces.Any(ti => ti.IsGenericType && ti.GetGenericTypeDefinition() == typeof(IEnumerable<>)) ||
-                            (typeInfo.IsGenericType && typeInfo.GetGenericTypeDefinition() == typeof(IEnumerable<>)));
-
-                    var paramName = isEnumerable ? AddParameter(value, EnumerableMultiParameter) : AddParameter(value);
-                    _sb.Append(paramName);
-                }
-                else
-                {
-                    _gotConcreteValue = true;
-                    _sb.Append("NULL");
-                }
-            }
-
-            return expression;
-        }
-
-        protected override Expression VisitConstant(ConstantExpression expression)
-        {
-            if (expression.Value != null)
-            {
-                var paramName = AddParameter(expression.Value);
-                _sb.Append(paramName);
-            }
-            else
-            {
-                _gotConcreteValue = true;
-                _sb.Append("NULL");
-            }
-
-            return expression;
-        }
-
-        private bool TryGetConstantValue(Expression expression, out object result)
-        {
-            result = null;
-
-            if (expression is ConstantExpression constExp)
-            {
-                result = constExp.Value;
-                return true;
-            }
-
-            return false;
-        }
-
-        private bool TryGetPropertyValue(MemberExpression expression, out object result)
-        {
-            result = null;
-
-            if (expression.Expression is MemberExpression nested)
-            {
-                // Value is passed in as a property on a parent entity
-                var container = (nested.Expression as ConstantExpression)?.Value;
-
-                if (container == null)
-                {
-                    return false;
-                }
-
-                var entity = GetFieldValue(container, nested.Member);
-                result = GetFieldValue(entity, expression.Member);
-                return true;
-            }
-
-            return false;
-        }
-
-        private bool TryGetVariableValue(MemberExpression expression, out object result)
-        {
-            result = null;
-
-            // Value is passed in as a variable
-            if (expression.Expression is ConstantExpression nested)
-            {
-                result = GetFieldValue(nested.Value, expression.Member);
-                return true;
-            }
-
-            return false;
-        }
-
-        private bool TryGetRightValue(Expression expression, out object value)
-        {
-            value = null;
-
-            if (TryGetConstantValue(expression, out value))
-            {
-                return true;
-            }
-
-            var memberExp = expression as MemberExpression;
-
-            if (TryGetPropertyValue(memberExp, out value))
-            {
-                return true;
-            }
-
-            if (TryGetVariableValue(memberExp, out value))
-            {
-                return true;
-            }
-
-            return false;
-        }
-
-        private object GetFieldValue(object entity, MemberInfo member)
-        {
-            if (member.MemberType == MemberTypes.Field)
-            {
-                return (member as FieldInfo).GetValue(entity);
-            }
-
-            if (member.MemberType == MemberTypes.Property)
-            {
-                return (member as PropertyInfo).GetValue(entity);
-            }
-
-            throw new ArgumentException(string.Format("WhereBuilder could not get the value for {0}.{1}.", entity.GetType().Name, member.Name));
-        }
-
-        private bool IsNullVariable(Expression expression)
-        {
-            if (expression.NodeType == ExpressionType.Constant &&
-                TryGetConstantValue(expression, out var constResult) &&
-                constResult == null)
-            {
-                return true;
-            }
-
-            if (expression.NodeType == ExpressionType.MemberAccess &&
-                expression is MemberExpression member &&
-                ((TryGetPropertyValue(member, out var result) && result == null) ||
-                 (TryGetVariableValue(member, out result) && result == null)))
-            {
-                return true;
-            }
-
-            return false;
-        }
-
-        private string Decode(BinaryExpression expression)
-        {
-            if (IsNullVariable(expression.Right))
-            {
-                switch (expression.NodeType)
-                {
-                    case ExpressionType.Equal: return "IS";
-                    case ExpressionType.NotEqual: return "IS NOT";
-                }
-            }
-
-            switch (expression.NodeType)
-            {
-                case ExpressionType.AndAlso: return "AND";
-                case ExpressionType.And: return "AND";
-                case ExpressionType.Equal: return "=";
-                case ExpressionType.GreaterThan: return ">";
-                case ExpressionType.GreaterThanOrEqual: return ">=";
-                case ExpressionType.LessThan: return "<";
-                case ExpressionType.LessThanOrEqual: return "<=";
-                case ExpressionType.NotEqual: return "<>";
-                case ExpressionType.OrElse: return "OR";
-                case ExpressionType.Or: return "OR";
-                default: throw new NotSupportedException(string.Format("{0} statement is not supported", expression.NodeType.ToString()));
-            }
-        }
-
-        private void ParseContainsExpression(MethodCallExpression expression)
-        {
-            var list = expression.Object;
-
-            if (list != null && (list.Type == typeof(string)))
-            {
-                ParseStringContains(expression);
-                return;
-            }
-
-            ParseEnumerableContains(expression);
-        }
-
-        private void ParseEnumerableContains(MethodCallExpression body)
-        {
-            // Fish out the list and the item to compare
-            // It's in a different form for arrays and Lists
-            var list = body.Object;
-            Expression item;
-
-            if (list != null)
-            {
-                // Generic collection
-                item = body.Arguments[0];
-            }
-            else
-            {
-                // Static method
-                // Must be Enumerable.Contains(source, item)
-                if (body.Method.DeclaringType != typeof(Enumerable) || body.Arguments.Count != 2)
-                {
-                    throw new NotSupportedException("Unexpected form of Enumerable.Contains");
-                }
-
-                list = body.Arguments[0];
-                item = body.Arguments[1];
-            }
-
-            _sb.Append('(');
-
-            Visit(item);
-
-            _sb.Append(" = ANY (");
-
-            Visit(list);
-
-            _sb.Append("))");
-        }
-
-        private void ParseStringContains(MethodCallExpression body)
-        {
-            _sb.Append('(');
-
-            Visit(body.Object);
-
-            _sb.Append(" LIKE '%' || ");
-
-            Visit(body.Arguments[0]);
-
-            _sb.Append(" || '%')");
-        }
-
-        private void ParseStartsWith(MethodCallExpression body)
-        {
-            _sb.Append('(');
-
-            Visit(body.Object);
-
-            _sb.Append(" LIKE ");
-
-            Visit(body.Arguments[0]);
-
-            _sb.Append(" || '%')");
-        }
-
-        private void ParseEndsWith(MethodCallExpression body)
-        {
-            _sb.Append('(');
-
-            Visit(body.Object);
-
-            _sb.Append(" LIKE '%' || ");
-
-            Visit(body.Arguments[0]);
-
-            _sb.Append(')');
-        }
-
-        public override string ToString()
-        {
-            var sql = _sb.ToString();
-
-            if (_requireConcreteValue && !_gotConcreteValue)
-            {
-                var e = new InvalidOperationException("WhereBuilder requires a concrete condition");
-                e.Data.Add("sql", sql);
-                throw e;
-            }
-
-            return sql;
-        }
-    }
-}

src/NzbDrone.Core/Datastore/WhereBuilderSqlite.cs

@@ -1,387 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.Linq;
-using System.Linq.Expressions;
-using System.Reflection;
-using System.Text;
-using Dapper;
-
-namespace NzbDrone.Core.Datastore
-{
-    public class WhereBuilderSqlite : WhereBuilder
-    {
-        protected StringBuilder _sb;
-
-        private const DbType EnumerableMultiParameter = (DbType)(-1);
-        private readonly string _paramNamePrefix;
-        private readonly bool _requireConcreteValue = false;
-        private int _paramCount = 0;
-        private bool _gotConcreteValue = false;
-
-        public WhereBuilderSqlite(Expression filter, bool requireConcreteValue, int seq)
-        {
-            _paramNamePrefix = string.Format("Clause{0}", seq + 1);
-            _requireConcreteValue = requireConcreteValue;
-            _sb = new StringBuilder();
-
-            Parameters = new DynamicParameters();
-
-            if (filter != null)
-            {
-                Visit(filter);
-            }
-        }
-
-        private string AddParameter(object value, DbType? dbType = null)
-        {
-            _gotConcreteValue = true;
-            _paramCount++;
-            var name = _paramNamePrefix + "_P" + _paramCount;
-            Parameters.Add(name, value, dbType);
-            return '@' + name;
-        }
-
-        protected override Expression VisitBinary(BinaryExpression expression)
-        {
-            _sb.Append('(');
-
-            Visit(expression.Left);
-
-            _sb.AppendFormat(" {0} ", Decode(expression));
-
-            Visit(expression.Right);
-
-            _sb.Append(')');
-
-            return expression;
-        }
-
-        protected override Expression VisitMethodCall(MethodCallExpression expression)
-        {
-            var method = expression.Method.Name;
-
-            switch (expression.Method.Name)
-            {
-                case "Contains":
-                    ParseContainsExpression(expression);
-                    break;
-
-                case "StartsWith":
-                    ParseStartsWith(expression);
-                    break;
-
-                case "EndsWith":
-                    ParseEndsWith(expression);
-                    break;
-
-                default:
-                    var msg = string.Format("'{0}' expressions are not yet implemented in the where clause expression tree parser.", method);
-                    throw new NotImplementedException(msg);
-            }
-
-            return expression;
-        }
-
-        protected override Expression VisitMemberAccess(MemberExpression expression)
-        {
-            var tableName = expression?.Expression?.Type != null ? TableMapping.Mapper.TableNameMapping(expression.Expression.Type) : null;
-            var gotValue = TryGetRightValue(expression, out var value);
-
-            // Only use the SQL condition if the expression didn't resolve to an actual value
-            if (tableName != null && !gotValue)
-            {
-                _sb.Append($"\"{tableName}\".\"{expression.Member.Name}\"");
-            }
-            else
-            {
-                if (value != null)
-                {
-                    // string is IEnumerable<Char> but we don't want to pick up that case
-                    var type = value.GetType();
-                    var typeInfo = type.GetTypeInfo();
-                    var isEnumerable =
-                        type != typeof(string) && (
-                            typeInfo.ImplementedInterfaces.Any(ti => ti.IsGenericType && ti.GetGenericTypeDefinition() == typeof(IEnumerable<>)) ||
-                            (typeInfo.IsGenericType && typeInfo.GetGenericTypeDefinition() == typeof(IEnumerable<>)));
-
-                    var paramName = isEnumerable ? AddParameter(value, EnumerableMultiParameter) : AddParameter(value);
-                    _sb.Append(paramName);
-                }
-                else
-                {
-                    _gotConcreteValue = true;
-                    _sb.Append("NULL");
-                }
-            }
-
-            return expression;
-        }
-
-        protected override Expression VisitConstant(ConstantExpression expression)
-        {
-            if (expression.Value != null)
-            {
-                var paramName = AddParameter(expression.Value);
-                _sb.Append(paramName);
-            }
-            else
-            {
-                _gotConcreteValue = true;
-                _sb.Append("NULL");
-            }
-
-            return expression;
-        }
-
-        private bool TryGetConstantValue(Expression expression, out object result)
-        {
-            result = null;
-
-            if (expression is ConstantExpression constExp)
-            {
-                result = constExp.Value;
-                return true;
-            }
-
-            return false;
-        }
-
-        private bool TryGetPropertyValue(MemberExpression expression, out object result)
-        {
-            result = null;
-
-            if (expression.Expression is MemberExpression nested)
-            {
-                // Value is passed in as a property on a parent entity
-                var container = (nested.Expression as ConstantExpression)?.Value;
-
-                if (container == null)
-                {
-                    return false;
-                }
-
-                var entity = GetFieldValue(container, nested.Member);
-                result = GetFieldValue(entity, expression.Member);
-                return true;
-            }
-
-            return false;
-        }
-
-        private bool TryGetVariableValue(MemberExpression expression, out object result)
-        {
-            result = null;
-
-            // Value is passed in as a variable
-            if (expression.Expression is ConstantExpression nested)
-            {
-                result = GetFieldValue(nested.Value, expression.Member);
-                return true;
-            }
-
-            return false;
-        }
-
-        private bool TryGetRightValue(Expression expression, out object value)
-        {
-            value = null;
-
-            if (TryGetConstantValue(expression, out value))
-            {
-                return true;
-            }
-
-            var memberExp = expression as MemberExpression;
-
-            if (TryGetPropertyValue(memberExp, out value))
-            {
-                return true;
-            }
-
-            if (TryGetVariableValue(memberExp, out value))
-            {
-                return true;
-            }
-
-            return false;
-        }
-
-        private object GetFieldValue(object entity, MemberInfo member)
-        {
-            if (member.MemberType == MemberTypes.Field)
-            {
-                return (member as FieldInfo).GetValue(entity);
-            }
-
-            if (member.MemberType == MemberTypes.Property)
-            {
-                return (member as PropertyInfo).GetValue(entity);
-            }
-
-            throw new ArgumentException(string.Format("WhereBuilder could not get the value for {0}.{1}.", entity.GetType().Name, member.Name));
-        }
-
-        private bool IsNullVariable(Expression expression)
-        {
-            if (expression.NodeType == ExpressionType.Constant &&
-                TryGetConstantValue(expression, out var constResult) &&
-                constResult == null)
-            {
-                return true;
-            }
-
-            if (expression.NodeType == ExpressionType.MemberAccess &&
-                expression is MemberExpression member &&
-                ((TryGetPropertyValue(member, out var result) && result == null) ||
-                 (TryGetVariableValue(member, out result) && result == null)))
-            {
-                return true;
-            }
-
-            return false;
-        }
-
-        private string Decode(BinaryExpression expression)
-        {
-            if (IsNullVariable(expression.Right))
-            {
-                switch (expression.NodeType)
-                {
-                    case ExpressionType.Equal: return "IS";
-                    case ExpressionType.NotEqual: return "IS NOT";
-                }
-            }
-
-            switch (expression.NodeType)
-            {
-                case ExpressionType.AndAlso: return "AND";
-                case ExpressionType.And: return "AND";
-                case ExpressionType.Equal: return "=";
-                case ExpressionType.GreaterThan: return ">";
-                case ExpressionType.GreaterThanOrEqual: return ">=";
-                case ExpressionType.LessThan: return "<";
-                case ExpressionType.LessThanOrEqual: return "<=";
-                case ExpressionType.NotEqual: return "<>";
-                case ExpressionType.OrElse: return "OR";
-                case ExpressionType.Or: return "OR";
-                default: throw new NotSupportedException(string.Format("{0} statement is not supported", expression.NodeType.ToString()));
-            }
-        }
-
-        private void ParseContainsExpression(MethodCallExpression expression)
-        {
-            var list = expression.Object;
-
-            if (list != null && (list.Type == typeof(string)))
-            {
-                ParseStringContains(expression);
-                return;
-            }
-
-            ParseEnumerableContains(expression);
-        }
-
-        private void ParseEnumerableContains(MethodCallExpression body)
-        {
-            // Fish out the list and the item to compare
-            // It's in a different form for arrays and Lists
-            var list = body.Object;
-            Expression item;
-
-            if (list != null)
-            {
-                // Generic collection
-                item = body.Arguments[0];
-            }
-            else
-            {
-                // Static method
-                // Must be Enumerable.Contains(source, item)
-                if (body.Method.DeclaringType != typeof(Enumerable) || body.Arguments.Count != 2)
-                {
-                    throw new NotSupportedException("Unexpected form of Enumerable.Contains");
-                }
-
-                list = body.Arguments[0];
-                item = body.Arguments[1];
-            }
-
-            _sb.Append('(');
-
-            Visit(item);
-
-            _sb.Append(" IN ");
-
-            // hardcode the integer list if it exists to bypass parameter limit
-            if (item.Type == typeof(int) && TryGetRightValue(list, out var value))
-            {
-                var items = (IEnumerable<int>)value;
-                _sb.Append('(');
-                _sb.Append(string.Join(", ", items));
-                _sb.Append(')');
-
-                _gotConcreteValue = true;
-            }
-            else
-            {
-                Visit(list);
-            }
-
-            _sb.Append(')');
-        }
-
-        private void ParseStringContains(MethodCallExpression body)
-        {
-            _sb.Append('(');
-
-            Visit(body.Object);
-
-            _sb.Append(" LIKE '%' || ");
-
-            Visit(body.Arguments[0]);
-
-            _sb.Append(" || '%')");
-        }
-
-        private void ParseStartsWith(MethodCallExpression body)
-        {
-            _sb.Append('(');
-
-            Visit(body.Object);
-
-            _sb.Append(" LIKE ");
-
-            Visit(body.Arguments[0]);
-
-            _sb.Append(" || '%')");
-        }
-
-        private void ParseEndsWith(MethodCallExpression body)
-        {
-            _sb.Append('(');
-
-            Visit(body.Object);
-
-            _sb.Append(" LIKE '%' || ");
-
-            Visit(body.Arguments[0]);
-
-            _sb.Append(')');
-        }
-
-        public override string ToString()
-        {
-            var sql = _sb.ToString();
-
-            if (_requireConcreteValue && !_gotConcreteValue)
-            {
-                var e = new InvalidOperationException("WhereBuilder requires a concrete condition");
-                e.Data.Add("sql", sql);
-                throw e;
-            }
-
-            return sql;
-        }
-    }
-}

src/NzbDrone.Core/Download/Clients/DownloadStation/Proxies/DiskStationProxyBase.cs

@@ -1,7 +1,6 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Net;
-using System.Net.Http;
 using NLog;
 using NzbDrone.Common.Cache;
 using NzbDrone.Common.Http;
@@ -143,19 +142,15 @@ namespace NzbDrone.Core.Download.Clients.DownloadStation.Proxies
             return authResponse.Data.SId;
         }
 
-        protected HttpRequestBuilder BuildRequest(DownloadStationSettings settings, string methodName, int apiVersion, HttpMethod httpVerb = null)
+        protected HttpRequestBuilder BuildRequest(DownloadStationSettings settings, string methodName, int apiVersion, HttpMethod httpVerb = HttpMethod.GET)
         {
-            httpVerb ??= HttpMethod.Get;
-
             var info = GetApiInfo(_apiType, settings);
 
             return BuildRequest(settings, info, methodName, apiVersion, httpVerb);
         }
 
-        private HttpRequestBuilder BuildRequest(DownloadStationSettings settings, DiskStationApiInfo apiInfo, string methodName, int apiVersion, HttpMethod httpVerb = null)
+        private HttpRequestBuilder BuildRequest(DownloadStationSettings settings, DiskStationApiInfo apiInfo, string methodName, int apiVersion, HttpMethod httpVerb = HttpMethod.GET)
         {
-            httpVerb ??= HttpMethod.Get;
-
             var requestBuilder = new HttpRequestBuilder(settings.UseSsl, settings.Host, settings.Port).Resource($"webapi/{apiInfo.Path}");
             requestBuilder.Method = httpVerb;
             requestBuilder.LogResponseContent = true;
@@ -168,7 +163,7 @@ namespace NzbDrone.Core.Download.Clients.DownloadStation.Proxies
                 throw new ArgumentOutOfRangeException(nameof(apiVersion));
             }
 
-            if (httpVerb == HttpMethod.Post)
+            if (httpVerb == HttpMethod.POST)
             {
                 if (apiInfo.NeedsAuthentication)
                 {

src/NzbDrone.Core/Download/Clients/DownloadStation/Proxies/DownloadStationTaskProxy.cs

@@ -1,5 +1,4 @@
-using System.Collections.Generic;
-using System.Net.Http;
+using System.Collections.Generic;
 using NLog;
 using NzbDrone.Common.Cache;
 using NzbDrone.Common.Extensions;
@@ -25,7 +24,7 @@ namespace NzbDrone.Core.Download.Clients.DownloadStation.Proxies
 
         public void AddTaskFromData(byte[] data, string filename, string downloadDirectory, DownloadStationSettings settings)
         {
-            var requestBuilder = BuildRequest(settings, "create", 2, HttpMethod.Post);
+            var requestBuilder = BuildRequest(settings, "create", 2, HttpMethod.POST);
 
             if (downloadDirectory.IsNotNullOrWhiteSpace())
             {

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

@@ -1,7 +1,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Net;
-using System.Net.Http;
 using NLog;
 using NzbDrone.Common.Cache;
 using NzbDrone.Common.Http;
@@ -108,7 +107,7 @@ namespace NzbDrone.Core.Download.Clients.Flood
         {
             var verifyRequest = BuildRequest(settings).Resource("/auth/verify").Build();
 
-            verifyRequest.Method = HttpMethod.Get;
+            verifyRequest.Method = HttpMethod.GET;
 
             HandleRequest(verifyRequest, settings);
         }
@@ -181,7 +180,7 @@ namespace NzbDrone.Core.Download.Clients.Flood
         {
             var getTorrentsRequest = BuildRequest(settings).Resource("/torrents").Build();
 
-            getTorrentsRequest.Method = HttpMethod.Get;
+            getTorrentsRequest.Method = HttpMethod.GET;
 
             return Json.Deserialize<TorrentListSummary>(HandleRequest(getTorrentsRequest, settings).Content).Torrents;
         }
@@ -190,7 +189,7 @@ namespace NzbDrone.Core.Download.Clients.Flood
         {
             var contentsRequest = BuildRequest(settings).Resource($"/torrents/{hash}/contents").Build();
 
-            contentsRequest.Method = HttpMethod.Get;
+            contentsRequest.Method = HttpMethod.GET;
 
             return Json.Deserialize<List<TorrentContent>>(HandleRequest(contentsRequest, settings).Content).ConvertAll(content => content.Path);
         }
@@ -199,7 +198,7 @@ namespace NzbDrone.Core.Download.Clients.Flood
         {
             var tagsRequest = BuildRequest(settings).Resource("/torrents/tags").Build();
 
-            tagsRequest.Method = HttpMethod.Patch;
+            tagsRequest.Method = HttpMethod.PATCH;
 
             var body = new Dictionary<string, object>
             {

src/NzbDrone.Core/Download/Clients/rTorrent/RTorrentSettings.cs

@@ -57,7 +57,7 @@ namespace NzbDrone.Core.Download.Clients.RTorrent
         [FieldDefinition(8, Label = "Priority", Type = FieldType.Select, SelectOptions = typeof(RTorrentPriority), HelpText = "Priority to use when grabbing items")]
         public int Priority { get; set; }
 
-        [FieldDefinition(9, Label = "Add Stopped", Type = FieldType.Checkbox, HelpText = "Enabling will add torrents and magnets to ruTorrent in a stopped state")]
+        [FieldDefinition(9, Label = "Add Stopped", Type = FieldType.Checkbox, HelpText = "Enabling will prevent magnets from downloading before downloading")]
         public bool AddStopped { get; set; }
 
         public NzbDroneValidationResult Validate()

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

@@ -1,48 +0,0 @@
-using System.Linq;
-using NLog;
-using NzbDrone.Core.Indexers;
-using NzbDrone.Core.Indexers.Cardigann;
-using NzbDrone.Core.IndexerVersions;
-using NzbDrone.Core.Localization;
-using NzbDrone.Core.ThingiProvider.Events;
-
-namespace NzbDrone.Core.HealthCheck.Checks
-{
-    [CheckOn(typeof(ProviderDeletedEvent<IIndexer>))]
-    public class NoDefinitionCheck : HealthCheckBase
-    {
-        private readonly IIndexerDefinitionUpdateService _indexerDefinitionUpdateService;
-        private readonly IIndexerFactory _indexerFactory;
-
-        public NoDefinitionCheck(IIndexerDefinitionUpdateService indexerDefinitionUpdateService, IIndexerFactory indexerFactory, ILocalizationService localizationService)
-            : base(localizationService)
-        {
-            _indexerDefinitionUpdateService = indexerDefinitionUpdateService;
-            _indexerFactory = indexerFactory;
-        }
-
-        public override HealthCheck Check()
-        {
-            var currentDefs = _indexerDefinitionUpdateService.All();
-
-            var noDefIndexers = _indexerFactory.AllProviders(false)
-                    .Where(i => i.Definition.Implementation == "Cardigann" && !currentDefs.Any(d => d.File == ((CardigannSettings)i.Definition.Settings).DefinitionFile)).ToList();
-
-            if (noDefIndexers.Count == 0)
-            {
-                return new HealthCheck(GetType());
-            }
-
-            var healthType = HealthCheckResult.Error;
-            var healthMessage = string.Format(_localizationService.GetLocalizedString("IndexerNoDefCheckMessage"),
-                string.Join(", ", noDefIndexers.Select(v => v.Definition.Name)));
-
-            return new HealthCheck(GetType(),
-                healthType,
-                healthMessage,
-                "#indexers-have-no-definition");
-        }
-
-        public override bool CheckOnSchedule => false;
-    }
-}