ToDo: Fix Broken Parsing

Fixed: Parsing of Movie Names with Year

Fixes: #5799

azure-pipelines.yml

@@ -7,14 +7,13 @@ variables:
   outputFolder: './_output'
   artifactsFolder: './_artifacts'
   testsFolder: './_tests'
-  majorVersion: '4.0.5'
+  majorVersion: '4.0.0'
   minorVersion: $[counter('minorVersion', 2000)]
   radarrVersion: '$(majorVersion).$(minorVersion)'
   buildName: '$(Build.SourceBranchName).$(radarrVersion)'
   sentryOrg: 'servarr'
   sentryUrl: 'https://sentry.servarr.com'
-  dotnetVersion: '6.0.101'
-  innoVersion: '6.2.0'
+  dotnetVersion: '6.0.100'
   yarnCacheFolder: $(Pipeline.Workspace)/.yarn
 
 trigger:
@@ -201,11 +200,16 @@ stages:
           artifactName: WindowsFrontend
           targetPath: _output
         displayName: Fetch Frontend
+      - bash: ./build.sh --packages
+        displayName: Create Packages
       - bash: |
-          ./build.sh --packages --installer
-          cp setup/output/Radarr.*win-x64.exe ${BUILD_ARTIFACTSTAGINGDIRECTORY}/Radarr.${BUILDNAME}.windows-core-x64-installer.exe
-          cp setup/output/Radarr.*win-x86.exe ${BUILD_ARTIFACTSTAGINGDIRECTORY}/Radarr.${BUILDNAME}.windows-core-x86-installer.exe
-        displayName: Create Installers
+          setup/inno/ISCC.exe setup/radarr.iss //DFramework=net6.0 //DRuntime=win-x86
+          cp setup/output/Radarr.*windows.net6.0.exe ${BUILD_ARTIFACTSTAGINGDIRECTORY}/Radarr.${BUILDNAME}.windows-core-x86-installer.exe
+        displayName: Create .NET Core Windows installer
+      - bash: |
+          setup/inno/ISCC.exe setup/radarr.iss //DFramework=net6.0 //DRuntime=win-x64
+          cp setup/output/Radarr.*windows.net6.0.exe ${BUILD_ARTIFACTSTAGINGDIRECTORY}/Radarr.${BUILDNAME}.windows-core-x64-installer.exe
+        displayName: Create .NET Core Windows installer
       - publish: $(Build.ArtifactStagingDirectory)
         artifact: 'WindowsInstaller'
         displayName: Publish Installer

build.sh

@@ -233,32 +233,6 @@ Package()
     esac
 }
 
-BuildInstaller()
-{
-    local framework="$1"
-    local runtime="$2"
-    
-    ./_inno/ISCC.exe setup/radarr.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"
@@ -290,7 +264,6 @@ if [ $# -eq 0 ]; then
     BACKEND=YES
     FRONTEND=YES
     PACKAGES=YES
-    INSTALLER=NO
     LINT=YES
     ENABLE_BSD=NO
 fi
@@ -326,10 +299,6 @@ case $key in
         PACKAGES=YES
         shift # past argument
         ;;
-    --installer)
-        INSTALLER=YES
-        shift # past argument
-        ;;
     --lint)
         LINT=YES
         shift # past argument
@@ -413,11 +382,3 @@ then
         Package "$FRAMEWORK" "$RID"
     fi
 fi
-
-if [ "$INSTALLER" = "YES" ];
-then
-    InstallInno
-    BuildInstaller "net6.0" "win-x64"
-    BuildInstaller "net6.0" "win-x86"
-    RemoveInno
-fi

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

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

frontend/src/AddMovie/AddNewMovie/AddNewMovieSearchResult.js

@@ -86,13 +86,6 @@ class AddNewMovieSearchResult extends Component {
     } = this.state;
 
     const linkProps = isExistingMovie ? { to: `/movie/${titleSlug}` } : { onPress: this.onPress };
-    const posterWidth = 167;
-    const posterHeight = 250;
-
-    const elementStyle = {
-      width: `${posterWidth}px`,
-      height: `${posterHeight}px`
-    };
 
     return (
       <div className={styles.searchResult}>
@@ -109,7 +102,6 @@ class AddNewMovieSearchResult extends Component {
                 <div className={styles.posterContainer}>
                   <MoviePoster
                     className={styles.poster}
-                    style={elementStyle}
                     images={images}
                     size={250}
                     overflow={true}
@@ -122,7 +114,7 @@ class AddNewMovieSearchResult extends Component {
                       monitored={monitored}
                       hasFile={hasFile}
                       status={status}
-                      posterWidth={posterWidth}
+                      posterWidth={167}
                       detailedProgressBar={true}
                       queueStatus={queueStatus}
                       queueState={queueState}
@@ -191,7 +183,7 @@ class AddNewMovieSearchResult extends Component {
             <div>
               <Label size={sizes.LARGE}>
                 <HeartRating
-                  ratings={ratings}
+                  rating={ratings.value}
                   iconSize={13}
                 />
               </Label>

frontend/src/Components/HeartRating.css

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

frontend/src/Components/ImdbRating.css

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

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

@@ -81,7 +81,7 @@ class PageHeader extends Component {
           <IconButton
             className={styles.donate}
             name={icons.HEART}
-            to="https://radarr.video/donate"
+            to="https://opencollective.com/radarr"
             size={14}
           />
           <IconButton

frontend/src/Components/Page/PageJumpBar.js

@@ -100,9 +100,7 @@ class PageJumpBar extends Component {
   // Listeners
 
   onMeasure = ({ height }) => {
-    if (height > 0) {
-      this.setState({ height });
-    }
+    this.setState({ height });
   }
 
   //

frontend/src/Components/RottenTomatoRating.css

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

frontend/src/Components/RottenTomatoRating.js

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

frontend/src/Components/TmdbRating.css

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

frontend/src/Components/TmdbRating.js

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

frontend/src/DiscoverMovie/Overview/DiscoverMovieOverviewInfo.js

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

frontend/src/DiscoverMovie/Posters/DiscoverMoviePosterInfo.js

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

frontend/src/DiscoverMovie/Table/DiscoverMovieRow.js

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

frontend/src/Movie/Details/MovieDetails.css

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

frontend/src/Movie/Details/MovieDetails.js

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

frontend/src/Movie/History/MovieHistoryRow.js

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

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

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

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

@@ -50,7 +50,7 @@ class ImportListExclusions extends Component {
           errorMessage={translate('UnableToLoadListExclusions')}
           {...otherProps}
         >
-          <div className={styles.importListExclusionsHeader}>
+          <div className={styles.importExclusionsHeader}>
             <div className={styles.tmdbId}>
               TMDb Id
             </div>

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

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

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

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

frontend/src/Store/Actions/discoverMovieActions.js

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

frontend/src/Store/Actions/movieActions.js

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

frontend/src/Store/Actions/movieIndexActions.js

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

frontend/src/Store/Middleware/createSentryMiddleware.js

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

frontend/src/Store/Migrators/migrate.js

@@ -1,7 +1,5 @@
 import migrateBlacklistToBlocklist from './migrateBlacklistToBlocklist';
-import migratePreDbToReleased from './migratePreDbToReleased';
 
 export default function migrate(persistedState) {
   migrateBlacklistToBlocklist(persistedState);
-  migratePreDbToReleased(persistedState);
 }

frontend/src/Store/Migrators/migratePreDbToReleased.js

@@ -1,18 +0,0 @@
-import get from 'lodash';
-
-export default function migratePreDbToReleased(persistedState) {
-  const addMovie = get(persistedState, 'addMovie.defaults.minimumAvailability');
-  const discoverMovie = get(persistedState, 'discoverMovie.defaults.minimumAvailability');
-
-  if (!addMovie && !discoverMovie) {
-    return;
-  }
-
-  if (addMovie === 'preDB') {
-    persistedState.addMovie.defaults.minimumAvailability = 'released';
-  }
-
-  if (discoverMovie === 'preDB') {
-    persistedState.discoverMovie.defaults.minimumAvailability = 'released';
-  }
-}

frontend/src/System/Backup/BackupRow.js

@@ -8,7 +8,6 @@ import RelativeDateCellConnector from 'Components/Table/Cells/RelativeDateCellCo
 import TableRowCell from 'Components/Table/Cells/TableRowCell';
 import TableRow from 'Components/Table/TableRow';
 import { icons, kinds } from 'Helpers/Props';
-import formatBytes from 'Utilities/Number/formatBytes';
 import translate from 'Utilities/String/translate';
 import RestoreBackupModalConnector from './RestoreBackupModalConnector';
 import styles from './BackupRow.css';
@@ -66,7 +65,6 @@ class BackupRow extends Component {
       type,
       name,
       path,
-      size,
       time
     } = this.props;
 
@@ -106,10 +104,6 @@ class BackupRow extends Component {
           </Link>
         </TableRowCell>
 
-        <TableRowCell>
-          {formatBytes(size)}
-        </TableRowCell>
-
         <RelativeDateCellConnector
           date={time}
         />
@@ -153,7 +147,6 @@ BackupRow.propTypes = {
   type: PropTypes.string.isRequired,
   name: PropTypes.string.isRequired,
   path: PropTypes.string.isRequired,
-  size: PropTypes.number.isRequired,
   time: PropTypes.string.isRequired,
   onDeleteBackupPress: PropTypes.func.isRequired
 };

frontend/src/System/Backup/Backups.js

@@ -23,11 +23,6 @@ const columns = [
     label: translate('Name'),
     isVisible: true
   },
-  {
-    name: 'size',
-    label: 'Size',
-    isVisible: true
-  },
   {
     name: 'time',
     label: translate('Time'),
@@ -132,7 +127,6 @@ class Backups extends Component {
                         type,
                         name,
                         path,
-                        size,
                         time
                       } = item;
 
@@ -143,7 +137,6 @@ class Backups extends Component {
                           type={type}
                           name={name}
                           path={path}
-                          size={size}
                           time={time}
                           onDeleteBackupPress={onDeleteBackupPress}
                         />

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

@@ -13,7 +13,7 @@ class Donations extends Component {
     return (
       <FieldSet legend={translate('Donations')}>
         <div className={styles.logoContainer} title="Radarr">
-          <Link to="https://radarr.video/donate">
+          <Link to="https://opencollective.com/radarr">
             <img
               className={styles.logo}
               src={`${window.Radarr.urlBase}/Content/Images/Icons/logo-radarr.png`}
@@ -21,7 +21,7 @@ class Donations extends Component {
           </Link>
         </div>
         <div className={styles.logoContainer} title="Lidarr">
-          <Link to="https://lidarr.audio/donate">
+          <Link to="https://opencollective.com/lidarr">
             <img
               className={styles.logo}
               src={`${window.Radarr.urlBase}/Content/Images/Icons/logo-lidarr.png`}
@@ -29,7 +29,7 @@ class Donations extends Component {
           </Link>
         </div>
         <div className={styles.logoContainer} title="Readarr">
-          <Link to="https://readarr.com/donate">
+          <Link to="https://opencollective.com/readarr">
             <img
               className={styles.logo}
               src={`${window.Radarr.urlBase}/Content/Images/Icons/logo-readarr.png`}
@@ -37,7 +37,7 @@ class Donations extends Component {
           </Link>
         </div>
         <div className={styles.logoContainer} title="Prowlarr">
-          <Link to="https://prowlarr.com/donate">
+          <Link to="https://opencollective.com/prowlarr">
             <img
               className={styles.logo}
               src={`${window.Radarr.urlBase}/Content/Images/Icons/logo-prowlarr.png`}
@@ -45,7 +45,7 @@ class Donations extends Component {
           </Link>
         </div>
         <div className={styles.logoContainer} title="Sonarr">
-          <Link to="https://sonarr.tv/donate">
+          <Link to="https://opencollective.com/sonarr">
             <img
               className={styles.logo}
               src={`${window.Radarr.urlBase}/Content/Images/Icons/logo-sonarr.png`}

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

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

frontend/src/System/Tasks/Queued/QueuedTaskRow.js

@@ -200,7 +200,7 @@ class QueuedTaskRow extends Component {
           {
             clientUserAgent ?
               <span className={styles.userAgent} title={translate('TaskUserAgentTooltip')}>
-                {translate('From')}: {clientUserAgent}
+                {translate('from')}: {clientUserAgent}
               </span> :
               null
           }

frontend/src/Utilities/Movie/getStatusStyle.js

@@ -2,7 +2,7 @@ import { kinds } from 'Helpers/Props';
 
 function getStatusStyle(status, monitored, hasFile, isAvailable, returnType, queue = false) {
   if (queue) {
-    return returnType === 'kinds' ? kinds.QUEUE : 'queue';
+    return returnType === 'kinds' ? kinds.SUCCESS : 'queue';
   }
 
   if (hasFile && monitored) {

package.json

@@ -30,7 +30,7 @@
     "@fortawesome/free-regular-svg-icons": "5.15.3",
     "@fortawesome/free-solid-svg-icons": "5.15.3",
     "@fortawesome/react-fontawesome": "0.1.14",
-    "@microsoft/signalr": "6.0.1",
+    "@microsoft/signalr": "6.0.0",
     "@sentry/browser": "6.13.2",
     "@sentry/integrations": "6.13.2",
     "classnames": "2.3.1",

setup/build.bat

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

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?

setup/radarr.iss

@@ -4,11 +4,12 @@
 #define AppName "Radarr"
 #define AppPublisher "Team Radarr"
 #define AppURL "https://radarr.video/"
-#define ForumsURL "https://radarr.video/discord"
+#define ForumsURL "https://forums.radarr.video/"
 #define AppExeName "Radarr.exe"
 #define BaseVersion GetEnv('MAJORVERSION')
 #define BuildNumber GetEnv('MINORVERSION')
 #define BuildVersion GetEnv('RADARRVERSION')
+#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}\Radarr
+DefaultDirName={commonappdata}\Radarr\bin
 DisableDirPage=yes
 DefaultGroupName={#AppName}
 DisableProgramGroupPage=yes
-OutputBaseFilename=Radarr.{#BuildVersion}.{#Runtime}
+OutputBaseFilename=Radarr.{#BranchName}.{#BuildVersion}.windows.{#Framework}
 SolidCompression=yes
 AppCopyright=Creative Commons 3.0 License
 AllowUNCPath=False
-UninstallDisplayIcon={app}\bin\Radarr.exe
+UninstallDisplayIcon={app}\Radarr.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}\Radarr\Radarr.exe"; DestDir: "{app}\bin"; Flags: ignoreversion
-Source: "..\_artifacts\{#Runtime}\{#Framework}\Radarr\*"; Excludes: "Radarr.Update"; DestDir: "{app}\bin"; Flags: ignoreversion recursesubdirs createallsubdirs
+Source: "..\_artifacts\{#Runtime}\{#Framework}\Radarr\Radarr.exe"; DestDir: "{app}"; Flags: ignoreversion
+Source: "..\_artifacts\{#Runtime}\{#Framework}\Radarr\*"; Excludes: "Radarr.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\Radarr.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}\Radarr.exe"; WorkingDir: "{app}"; Tasks: startupShortcut
 
 [InstallDelete]
-Name: "{app}\bin"; Type: filesandordirs
+Name: "{app}"; Type: filesandordirs
 
 [Run]
-Filename: "{app}\bin\Radarr.Console.exe"; StatusMsg: "Removing previous Windows Service"; Parameters: "/u /exitimmediately"; Flags: runhidden waituntilterminated;
-Filename: "{app}\bin\Radarr.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\Radarr.Console.exe"; StatusMsg: "Installing Windows Service"; Parameters: "/i /exitimmediately"; Flags: runhidden waituntilterminated; Tasks: windowsService
-Filename: "{app}\bin\Radarr.exe"; Description: "Open Radarr Web UI"; Flags: postinstall skipifsilent nowait; Tasks: windowsService;
-Filename: "{app}\bin\Radarr.exe"; Description: "Start Radarr"; Flags: postinstall skipifsilent nowait; Tasks: startupShortcut none;
+Filename: "{app}\Radarr.Console.exe"; StatusMsg: "Removing previous Windows Service"; Parameters: "/u /exitimmediately"; Flags: runhidden waituntilterminated;
+Filename: "{app}\Radarr.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}\Radarr.Console.exe"; StatusMsg: "Installing Windows Service"; Parameters: "/i /exitimmediately"; Flags: runhidden waituntilterminated; Tasks: windowsService
+Filename: "{app}\Radarr.exe"; Description: "Open Radarr Web UI"; Flags: postinstall skipifsilent nowait; Tasks: windowsService;
+Filename: "{app}\Radarr.exe"; Description: "Start Radarr"; Flags: postinstall skipifsilent nowait; Tasks: startupShortcut none;
 
 [UninstallRun]
-Filename: "{app}\bin\radarr.console.exe"; Parameters: "/u"; Flags: waituntilterminated skipifdoesntexist
+Filename: "{app}\radarr.console.exe"; Parameters: "/u"; Flags: waituntilterminated skipifdoesntexist
 
 [Code]
 function PrepareToInstall(var NeedsRestart: Boolean): String;

src/NzbDrone.Common/Cloud/RadarrCloudRequestBuilder.cs

@@ -20,7 +20,7 @@ namespace NzbDrone.Common.Cloud
                 .SetHeader("Authorization", $"Bearer {AuthToken}")
                 .CreateFactory();
 
-            RadarrMetadata = new HttpRequestBuilder("https://api.radarr.video/v1/{route}")
+            RadarrMetadata = new HttpRequestBuilder("https://radarrapi.servarr.com/v1/{route}")
                 .CreateFactory();
         }
 

src/NzbDrone.Common/Extensions/StringExtensions.cs

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

src/NzbDrone.Common/Http/BasicNetworkCredential.cs

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

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

@@ -4,9 +4,9 @@ using System.Net;
 using System.Net.Http;
 using System.Net.Security;
 using System.Net.Sockets;
-using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
+using NLog;
 using NzbDrone.Common.Cache;
 using NzbDrone.Common.Extensions;
 using NzbDrone.Common.Http.Proxy;
@@ -26,7 +26,6 @@ namespace NzbDrone.Common.Http.Dispatchers
         private readonly ICertificateValidationService _certificateValidationService;
         private readonly IUserAgentBuilder _userAgentBuilder;
         private readonly ICached<System.Net.Http.HttpClient> _httpClientCache;
-        private readonly ICached<CredentialCache> _credentialCache;
 
         public ManagedHttpDispatcher(IHttpProxySettingsProvider proxySettingsProvider,
             ICreateManagedWebProxy createManagedWebProxy,
@@ -40,7 +39,6 @@ namespace NzbDrone.Common.Http.Dispatchers
             _userAgentBuilder = userAgentBuilder;
 
             _httpClientCache = cacheManager.GetCache<System.Net.Http.HttpClient>(typeof(ManagedHttpDispatcher));
-            _credentialCache = cacheManager.GetCache<CredentialCache>(typeof(ManagedHttpDispatcher), "credentialcache");
         }
 
         public HttpResponse GetResponse(HttpRequest request, CookieContainer cookies)
@@ -66,26 +64,6 @@ namespace NzbDrone.Common.Http.Dispatchers
                 cts.CancelAfter(TimeSpan.FromSeconds(100));
             }
 
-            if (request.Credentials != null)
-            {
-                if (request.Credentials is BasicNetworkCredential bc)
-                {
-                    // Manually set header to avoid initial challenge response
-                    var authInfo = bc.UserName + ":" + bc.Password;
-                    authInfo = Convert.ToBase64String(Encoding.GetEncoding("ISO-8859-1").GetBytes(authInfo));
-                    requestMessage.Headers.Add("Authorization", "Basic " + authInfo);
-                }
-                else if (request.Credentials is NetworkCredential nc)
-                {
-                    var creds = GetCredentialCache();
-                    foreach (var authtype in new[] { "Basic", "Digest" })
-                    {
-                        creds.Remove((Uri)request.Url, authtype);
-                        creds.Add((Uri)request.Url, authtype, nc);
-                    }
-                }
-            }
-
             if (request.ContentData != null)
             {
                 requestMessage.Content = new ByteArrayContent(request.ContentData);
@@ -142,8 +120,6 @@ namespace NzbDrone.Common.Http.Dispatchers
                 AutomaticDecompression = DecompressionMethods.GZip | DecompressionMethods.Brotli,
                 UseCookies = false, // sic - we don't want to use a shared cookie container
                 AllowAutoRedirect = false,
-                Credentials = GetCredentialCache(),
-                PreAuthenticate = true,
                 MaxConnectionsPerServer = 12,
                 ConnectCallback = onConnect,
                 SslOptions = new SslClientAuthenticationOptions
@@ -228,11 +204,6 @@ namespace NzbDrone.Common.Http.Dispatchers
             headers.Add(header, value);
         }
 
-        private CredentialCache GetCredentialCache()
-        {
-            return _credentialCache.Get("credentialCache", () => new CredentialCache());
-        }
-
         private static async ValueTask<Stream> onConnect(SocketsHttpConnectionContext context, CancellationToken cancellationToken)
         {
             // Until .NET supports an implementation of Happy Eyeballs (https://tools.ietf.org/html/rfc8305#section-2), let's make IPv4 fallback work in a simple way.

src/NzbDrone.Common/Http/HttpRequest.cs

@@ -38,7 +38,6 @@ namespace NzbDrone.Common.Http
         public HttpHeader Headers { get; set; }
         public byte[] ContentData { get; set; }
         public string ContentSummary { get; set; }
-        public ICredentials Credentials { get; set; }
         public bool SuppressHttpError { get; set; }
         public IEnumerable<HttpStatusCode> SuppressHttpErrorStatusCodes { get; set; }
         public bool UseSimplifiedUserAgent { get; set; }
@@ -90,5 +89,12 @@ namespace NzbDrone.Common.Http
             var encoding = HttpHeader.GetEncodingFromContentType(Headers.ContentType);
             ContentData = encoding.GetBytes(data);
         }
+
+        public void AddBasicAuthentication(string username, string password)
+        {
+            var authInfo = Convert.ToBase64String(Encoding.GetEncoding("ISO-8859-1").GetBytes($"{username}:{password}"));
+
+            Headers.Set("Authorization", "Basic " + authInfo);
+        }
     }
 }

src/NzbDrone.Common/Http/HttpRequestBuilder.cs

@@ -26,9 +26,10 @@ namespace NzbDrone.Common.Http
         public bool ConnectionKeepAlive { get; set; }
         public TimeSpan RateLimit { get; set; }
         public bool LogResponseContent { get; set; }
-        public ICredentials NetworkCredential { get; set; }
+        public NetworkCredential NetworkCredential { get; set; }
         public Dictionary<string, string> Cookies { get; private set; }
         public List<HttpFormData> FormData { get; private set; }
+
         public Action<HttpRequest> PostProcess { get; set; }
 
         public HttpRequestBuilder(string baseUrl)
@@ -108,7 +109,13 @@ namespace NzbDrone.Common.Http
             request.ConnectionKeepAlive = ConnectionKeepAlive;
             request.RateLimit = RateLimit;
             request.LogResponseContent = LogResponseContent;
-            request.Credentials = NetworkCredential;
+
+            if (NetworkCredential != null)
+            {
+                var authInfo = NetworkCredential.UserName + ":" + NetworkCredential.Password;
+                authInfo = Convert.ToBase64String(Encoding.GetEncoding("ISO-8859-1").GetBytes(authInfo));
+                request.Headers.Set("Authorization", "Basic " + authInfo);
+            }
 
             foreach (var header in Headers)
             {

src/NzbDrone.Common/Http/XmlRpcRequestBuilder.cs

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

src/NzbDrone.Common/Instrumentation/NzbDroneLogger.cs

@@ -71,7 +71,7 @@ namespace NzbDrone.Common.Instrumentation
             else
             {
                 dsn = RuntimeInfo.IsProduction
-                    ? "https://26668106d708406b9ddf5a2bda34fcbb@sentry.servarr.com/9"
+                    ? "https://39b572f7f3f04899b2c3254c7ac126d0@sentry.servarr.com/9"
                     : "https://998b4673d4c849ccb5277b5966ed5bc2@sentry.servarr.com/10";
             }
 

src/NzbDrone.Common/Instrumentation/Sentry/SentryTarget.cs

@@ -136,7 +136,6 @@ namespace NzbDrone.Common.Instrumentation.Sentry
 
                 scope.SetTag("culture", Thread.CurrentThread.CurrentCulture.Name);
                 scope.SetTag("branch", BuildInfo.Branch);
-                scope.SetTag("runtime_identifier", System.Runtime.InteropServices.RuntimeInformation.RuntimeIdentifier);
             });
         }
 

src/NzbDrone.Common/Radarr.Common.csproj

@@ -12,7 +12,7 @@
     <PackageReference Include="NLog.Extensions.Logging" Version="1.7.4" />
     <PackageReference Include="Sentry" Version="3.11.1" />
     <PackageReference Include="SharpZipLib" Version="1.3.3" />
-    <PackageReference Include="System.Text.Json" Version="6.0.1" />
+    <PackageReference Include="System.Text.Json" Version="6.0.0" />
     <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/HealthCheck/Checks/IndexerJackettAllCheckFixture.cs

@@ -1,74 +0,0 @@
-using System;
-using System.Collections.Generic;
-using Moq;
-using NUnit.Framework;
-using NzbDrone.Core.HealthCheck.Checks;
-using NzbDrone.Core.Indexers;
-using NzbDrone.Core.Indexers.Torznab;
-using NzbDrone.Core.Localization;
-using NzbDrone.Core.Test.Framework;
-
-namespace NzbDrone.Core.Test.HealthCheck.Checks
-{
-    [TestFixture]
-    public class IndexerJackettAllCheckFixture : CoreTest<IndexerJackettAllCheck>
-    {
-        private List<IndexerDefinition> _indexers = new List<IndexerDefinition>();
-        private IndexerDefinition _definition;
-
-        [SetUp]
-        public void SetUp()
-        {
-            Mocker.GetMock<IIndexerFactory>()
-                  .Setup(v => v.All())
-                  .Returns(_indexers);
-
-            Mocker.GetMock<ILocalizationService>()
-                  .Setup(s => s.GetLocalizedString(It.IsAny<string>()))
-                  .Returns("Some Warning Message");
-        }
-
-        private void GivenIndexer(string baseUrl, string apiPath)
-        {
-            var torznabSettings = new TorznabSettings
-            {
-                BaseUrl = baseUrl,
-                ApiPath = apiPath
-            };
-
-            _definition = new IndexerDefinition
-            {
-                Name = "Indexer",
-                ConfigContract = "TorznabSettings",
-                Settings = torznabSettings
-            };
-
-            _indexers.Add(_definition);
-        }
-
-        [Test]
-        public void should_not_return_error_when_no_indexers()
-        {
-            Subject.Check().ShouldBeOk();
-        }
-
-        [TestCase("http://localhost:9117/", "api")]
-        public void should_not_return_error_when_no_jackett_all_indexers(string baseUrl, string apiPath)
-        {
-            GivenIndexer(baseUrl, apiPath);
-
-            Subject.Check().ShouldBeOk();
-        }
-
-        [TestCase("http://localhost:9117/torznab/all/api", "api")]
-        [TestCase("http://localhost:9117/api/v2.0/indexers/all/results/torznab", "api")]
-        [TestCase("http://localhost:9117/", "/torznab/all/api")]
-        [TestCase("http://localhost:9117/", "/api/v2.0/indexers/all/results/torznab")]
-        public void should_return_warning_if_any_jackett_all_indexer_exists(string baseUrl, string apiPath)
-        {
-            GivenIndexer(baseUrl, apiPath);
-
-            Subject.Check().ShouldBeWarning();
-        }
-    }
-}

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

@@ -176,7 +176,7 @@ namespace NzbDrone.Core.Test.HealthCheck.Checks
         public void should_return_ok_on_movie_imported_event()
         {
             GivenFolderExists(_downloadRootPath);
-            var importEvent = new MovieImportedEvent(new LocalMovie(), new MovieFile(), new List<MovieFile>(), true, new DownloadClientItem());
+            var importEvent = new MovieImportedEvent(new LocalMovie(), new MovieFile(), true, new DownloadClientItem(), _downloadItem.DownloadId);
 
             Subject.Check(importEvent).ShouldBeOk();
         }

src/NzbDrone.Core.Test/HistoryTests/HistoryServiceFixture.cs

@@ -91,7 +91,7 @@ namespace NzbDrone.Core.Test.HistoryTests
                 DownloadId = "abcd"
             };
 
-            Subject.Handle(new MovieImportedEvent(localMovie, movieFile, new List<MovieFile>(), true, downloadClientItem));
+            Subject.Handle(new MovieImportedEvent(localMovie, movieFile, true, downloadClientItem, "abcd"));
 
             Mocker.GetMock<IHistoryRepository>()
                 .Verify(v => v.Insert(It.Is<MovieHistory>(h => h.SourceTitle == Path.GetFileNameWithoutExtension(localMovie.Path))));

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

@@ -1,10 +1,7 @@
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using System.Net.Http;
-using FizzWare.NBuilder;
 using FluentAssertions;
-using FluentValidation.Results;
 using Moq;
 using NUnit.Framework;
 using NzbDrone.Common.Http;
@@ -13,7 +10,6 @@ using NzbDrone.Core.Indexers.Newznab;
 using NzbDrone.Core.Indexers.Torznab;
 using NzbDrone.Core.Parser.Model;
 using NzbDrone.Core.Test.Framework;
-using NzbDrone.Core.Validation;
 
 namespace NzbDrone.Core.Test.IndexerTests.TorznabTests
 {
@@ -35,11 +31,7 @@ namespace NzbDrone.Core.Test.IndexerTests.TorznabTests
                 }
             };
 
-            _caps = new NewznabCapabilities
-            {
-                Categories = Builder<NewznabCategory>.CreateListOfSize(1).All().With(t => t.Id = 1).Build().ToList()
-            };
-
+            _caps = new NewznabCapabilities();
             Mocker.GetMock<INewznabCapabilitiesProvider>()
                 .Setup(v => v.GetCapabilities(It.IsAny<NewznabSettings>()))
                 .Returns(_caps);
@@ -142,50 +134,5 @@ namespace NzbDrone.Core.Test.IndexerTests.TorznabTests
 
             Subject.PageSize.Should().Be(25);
         }
-
-        [TestCase("http://localhost:9117/", "/api")]
-        public void url_and_api_not_jackett_all(string baseUrl, string apiPath)
-        {
-            var setting = new TorznabSettings()
-            {
-                BaseUrl = baseUrl,
-                ApiPath = apiPath
-            };
-
-            setting.Validate().IsValid.Should().BeTrue();
-        }
-
-        [TestCase("http://localhost:9117/torznab/all/api")]
-        [TestCase("http://localhost:9117/api/v2.0/indexers/all/results/torznab")]
-        public void jackett_all_url_should_not_validate(string baseUrl)
-        {
-            var recentFeed = ReadAllText(@"Files/Indexers/Torznab/torznab_tpb.xml");
-            (Subject.Definition.Settings as TorznabSettings).BaseUrl = baseUrl;
-
-            Mocker.GetMock<IHttpClient>()
-                .Setup(o => o.Execute(It.Is<HttpRequest>(v => v.Method == HttpMethod.Get)))
-                .Returns<HttpRequest>(r => new HttpResponse(r, new HttpHeader(), recentFeed));
-
-            var result = new NzbDroneValidationResult(Subject.Test());
-            result.IsValid.Should().BeTrue();
-            result.HasWarnings.Should().BeTrue();
-        }
-
-        [TestCase("/torznab/all/api")]
-        [TestCase("/api/v2.0/indexers/all/results/torznab")]
-        public void jackett_all_api_should_not_validate(string apiPath)
-        {
-            var recentFeed = ReadAllText(@"Files/Indexers/Torznab/torznab_tpb.xml");
-
-            Mocker.GetMock<IHttpClient>()
-                  .Setup(o => o.Execute(It.Is<HttpRequest>(v => v.Method == HttpMethod.Get)))
-                  .Returns<HttpRequest>(r => new HttpResponse(r, new HttpHeader(), recentFeed));
-
-            (Subject.Definition.Settings as TorznabSettings).ApiPath = apiPath;
-
-            var result = new NzbDroneValidationResult(Subject.Test());
-            result.IsValid.Should().BeTrue();
-            result.HasWarnings.Should().BeTrue();
-        }
     }
 }

src/NzbDrone.Core.Test/MediaFiles/MediaInfo/MediaInfoFormatterTests/FormatVideoCodecFixture.cs

@@ -10,33 +10,31 @@ namespace NzbDrone.Core.Test.MediaFiles.MediaInfo.MediaInfoFormatterTests
     {
         [TestCase("mpeg2video, ", "Droned.S01E02.1080i.HDTV.DD5.1.MPEG2-NTb", "MPEG2")]
         [TestCase("mpeg2video, ", "", "MPEG2")]
-        [TestCase("mpeg1video, ", "The.Series.S13E04.INTERNAL-ANiVCD.mpg", "MPEG")]
-        [TestCase("vc1, WVC1", "T.N.S04E18.720p.WEB-DL", "VC1")]
+        [TestCase("mpeg1video, ", "The.Simpsons.S13E04.INTERNAL-ANiVCD.mpg", "MPEG")]
+        [TestCase("vc1, WVC1", "B.N.S04E18.720p.WEB-DL", "VC1")]
         [TestCase("vc1, V_MS/VFW/FOURCC/WVC1", "", "VC1")]
-        [TestCase("vc1, WMV3", "Series Title S09E13 The Radarr's RevengeHDTV.XviD-2HD.avi", "VC1")]
-        [TestCase("h264, V.MPEG4/ISO/AVC", "Series.2015.S03E08.720p.iP.WEBRip.AAC2.0.H264-BTW", "h264")]
-        [TestCase("h264, V_MPEG4/ISO/AVC", "Serie.2019.S01E03.1080p.RTE.WEB-DL.AAC2.0.x264-RTN", "x264")]
+        [TestCase("vc1, WMV3", "It's Always Sunny S07E13 The Gang's RevengeHDTV.XviD-2HD.avi", "VC1")]
+        [TestCase("h264, V.MPEG4/ISO/AVC", "pd.2015.S03E08.720p.iP.WEBRip.AAC2.0.H264-BTW", "h264")]
+        [TestCase("h264, V_MPEG4/ISO/AVC", "Resistance.2019.S01E03.1080p.RTE.WEB-DL.AAC2.0.x264-RTN", "x264")]
         [TestCase("wmv1, WMV1", "Droned.wmv", "WMV")]
         [TestCase("wmv2, WMV2", "Droned.wmv", "WMV")]
         [TestCase("mpeg4, XVID", "", "XviD")]
-        [TestCase("mpeg4, DIVX", "", "DivX")]
-        [TestCase("mpeg4, divx", "", "DivX")]
         [TestCase("mpeg4, DIV3", "spsm.dvdrip.divx.avi'.", "DivX")]
-        [TestCase("msmpeg4, DIV3", "Movie the Title (1976) 360p MPEG Audio.avi", "DivX")]
-        [TestCase("msmpeg4v2, DIV3", "Movie the Title (1976) 360p MPEG Audio.avi", "DivX")]
-        [TestCase("msmpeg4v3, DIV3", "Movie the Title (1976) 360p MPEG Audio.avi", "DivX")]
+        [TestCase("msmpeg4, DIV3", "Exit the Dragon, Enter the Tiger (1976) 360p MPEG Audio.avi", "DivX")]
+        [TestCase("msmpeg4v2, DIV3", "Exit the Dragon, Enter the Tiger (1976) 360p MPEG Audio.avi", "DivX")]
+        [TestCase("msmpeg4v3, DIV3", "Exit the Dragon, Enter the Tiger (1976) 360p MPEG Audio.avi", "DivX")]
         [TestCase("vp6, 4", "Top Gear - S12E01 - Lorries - SD TV.flv", "VP6")]
-        [TestCase("vp7, VP70", "Movie the Title.avi", "VP7")]
-        [TestCase("vp8, V_VP8", "Movie the Title.mkv", "VP8")]
-        [TestCase("vp9, V_VP9", "Series the Title Ep3x11 - YouTube.webm", "VP9")]
-        [TestCase("h264, x264", "Series the Title - S04E05 - Stanley Hotel SDTV.avi", "x264")]
-        [TestCase("hevc, V_MPEGH/ISO/HEVC", "Series the Title S11E12 The Radarr Metric 1080p 10bit AMZN WEB-DL", "h265")]
+        [TestCase("vp7, VP70", "Sweet Seymour.avi", "VP7")]
+        [TestCase("vp8, V_VP8", "Dick.mkv", "VP8")]
+        [TestCase("vp9, V_VP9", "Roadkill Ep3x11 - YouTube.webm", "VP9")]
+        [TestCase("h264, x264", "Ghost Advent - S04E05 - Stanley Hotel SDTV.avi", "x264")]
+        [TestCase("hevc, V_MPEGH/ISO/HEVC", "The BBT S11E12 The Matrimonial Metric 1080p 10bit AMZN WEB-DL", "h265")]
         [TestCase("mpeg4, mp4v-20", "", "")]
-        [TestCase("mpeg4, XVID", "Series the Title.S06E07.Mountain.Radarr.DSR.XviD-KRS", "XviD")]
+        [TestCase("mpeg4, XVID", "American.Chopper.S06E07.Mountain.Creek.Bike.DSR.XviD-KRS", "XviD")]
         [TestCase("rpza, V_QUICKTIME", "Custom", "")]
         [TestCase("mpeg4, FMP4", "", "")]
         [TestCase("mpeg4, MP42", "", "")]
-        [TestCase("mpeg4, mp43", "Series the Title.S01E13.480p.WEB-DL.H.264-BTN-Custom", "")]
+        [TestCase("mpeg4, mp43", "Bubble.Guppies.S01E13.480p.WEB-DL.H.264-BTN-Custom", "")]
         public void should_format_video_format(string videoFormatPack, string sceneName, string expectedFormat)
         {
             var split = videoFormatPack.Split(new string[] { ", " }, System.StringSplitOptions.None);

src/NzbDrone.Core.Test/MediaFiles/MediaInfo/MediaInfoFormatterTests/FormatVideoDynamicRangeTypeFixture.cs

@@ -1,31 +0,0 @@
-using FluentAssertions;
-using NUnit.Framework;
-using NzbDrone.Core.MediaFiles.MediaInfo;
-using NzbDrone.Test.Common;
-
-namespace NzbDrone.Core.Test.MediaFiles.MediaInfo.MediaInfoFormatterTests
-{
-    [TestFixture]
-    public class FormatVideoDynamicRangeTypeFixture : TestBase
-    {
-        [TestCase(HdrFormat.None, "")]
-        [TestCase(HdrFormat.Hlg10, "HLG")]
-        [TestCase(HdrFormat.Pq10, "PQ")]
-        [TestCase(HdrFormat.Hdr10, "HDR10")]
-        [TestCase(HdrFormat.Hdr10Plus, "HDR10Plus")]
-        [TestCase(HdrFormat.DolbyVision, "DV")]
-        [TestCase(HdrFormat.DolbyVisionHdr10, "DV HDR10")]
-        [TestCase(HdrFormat.DolbyVisionHlg, "DV HLG")]
-        [TestCase(HdrFormat.DolbyVisionSdr, "DV SDR")]
-        public void should_format_video_dynamic_range_type(HdrFormat format, string expectedVideoDynamicRangeType)
-        {
-            var mediaInfo = new MediaInfoModel
-            {
-                VideoHdrFormat = format,
-                SchemaRevision = 9
-            };
-
-            MediaInfoFormatter.FormatVideoDynamicRangeType(mediaInfo).Should().Be(expectedVideoDynamicRangeType);
-        }
-    }
-}

src/NzbDrone.Core.Test/MediaFiles/MediaInfo/VideoFileInfoReaderFixture.cs

@@ -102,38 +102,24 @@ namespace NzbDrone.Core.Test.MediaFiles.MediaInfo
             info.VideoTransferCharacteristics.Should().Be("bt709");
         }
 
-        [TestCase(8, "", "", "", null, HdrFormat.None)]
-        [TestCase(10, "", "", "", null, HdrFormat.None)]
-        [TestCase(10, "bt709", "bt709", "", null, HdrFormat.None)]
-        [TestCase(8, "bt2020", "smpte2084", "", null, HdrFormat.None)]
-        [TestCase(10, "bt2020", "bt2020-10", "", null, HdrFormat.Hlg10)]
-        [TestCase(10, "bt2020", "arib-std-b67", "", null, HdrFormat.Hlg10)]
-        [TestCase(10, "bt2020", "smpte2084", "", null, HdrFormat.Pq10)]
-        [TestCase(10, "bt2020", "smpte2084", "FFMpegCore.SideData", null, HdrFormat.Pq10)]
-        [TestCase(10, "bt2020", "smpte2084", "FFMpegCore.MasteringDisplayMetadata", null, HdrFormat.Hdr10)]
-        [TestCase(10, "bt2020", "smpte2084", "FFMpegCore.ContentLightLevelMetadata", null, HdrFormat.Hdr10)]
-        [TestCase(10, "bt2020", "smpte2084", "FFMpegCore.HdrDynamicMetadataSpmte2094", null, HdrFormat.Hdr10Plus)]
-        [TestCase(10, "bt2020", "smpte2084", "FFMpegCore.DoviConfigurationRecordSideData", null, HdrFormat.DolbyVision)]
-        [TestCase(10, "bt2020", "smpte2084", "FFMpegCore.DoviConfigurationRecordSideData", 1, HdrFormat.DolbyVisionHdr10)]
-        [TestCase(10, "bt2020", "smpte2084", "FFMpegCore.DoviConfigurationRecordSideData", 2, HdrFormat.DolbyVisionSdr)]
-        [TestCase(10, "bt2020", "smpte2084", "FFMpegCore.DoviConfigurationRecordSideData", 4, HdrFormat.DolbyVisionHlg)]
-        public void should_detect_hdr_correctly(int bitDepth, string colourPrimaries, string transferFunction, string sideDataTypes, int? doviConfigId, HdrFormat expected)
+        [TestCase(8, "", "", "", HdrFormat.None)]
+        [TestCase(10, "", "", "", HdrFormat.None)]
+        [TestCase(10, "bt709", "bt709", "", HdrFormat.None)]
+        [TestCase(8, "bt2020", "smpte2084", "", HdrFormat.None)]
+        [TestCase(10, "bt2020", "bt2020-10", "", HdrFormat.Hlg10)]
+        [TestCase(10, "bt2020", "arib-std-b67", "", HdrFormat.Hlg10)]
+        [TestCase(10, "bt2020", "smpte2084", "", HdrFormat.Pq10)]
+        [TestCase(10, "bt2020", "smpte2084", "FFMpegCore.SideData", HdrFormat.Pq10)]
+        [TestCase(10, "bt2020", "smpte2084", "FFMpegCore.MasteringDisplayMetadata", HdrFormat.Hdr10)]
+        [TestCase(10, "bt2020", "smpte2084", "FFMpegCore.ContentLightLevelMetadata", HdrFormat.Hdr10)]
+        [TestCase(10, "bt2020", "smpte2084", "FFMpegCore.HdrDynamicMetadataSpmte2094", HdrFormat.Hdr10Plus)]
+        [TestCase(10, "bt2020", "smpte2084", "FFMpegCore.DoviConfigurationRecordSideData", HdrFormat.DolbyVision)]
+        public void should_detect_hdr_correctly(int bitDepth, string colourPrimaries, string transferFunction, string sideDataTypes, HdrFormat expected)
         {
             var assembly = Assembly.GetAssembly(typeof(FFProbe));
             var types = sideDataTypes.Split(",").Select(x => x.Trim()).ToList();
             var sideData = types.Where(x => x.IsNotNullOrWhiteSpace()).Select(x => assembly.CreateInstance(x)).Cast<SideData>().ToList();
 
-            if (doviConfigId.HasValue)
-            {
-                sideData.ForEach(x =>
-                {
-                    if (x.GetType().Name == "DoviConfigurationRecordSideData")
-                    {
-                        ((DoviConfigurationRecordSideData)x).DvBlSignalCompatibilityId = doviConfigId.Value;
-                    }
-                });
-            }
-
             var result = VideoFileInfoReader.GetHdrFormat(bitDepth, colourPrimaries, transferFunction, sideData);
 
             result.Should().Be(expected);

src/NzbDrone.Core.Test/MediaFiles/MovieImport/ImportDecisionMakerFixture.cs

@@ -68,12 +68,12 @@ namespace NzbDrone.Core.Test.MediaFiles.MovieImport
             {
                 Movie = _movie,
                 Quality = _quality,
-                Path = @"C:\Test\Unsorted\The.Movie.2018.DVDRip.XviD-OSiTV.avi"
+                Path = @"C:\Test\Unsorted\The.Office.2018.DVDRip.XviD-OSiTV.avi"
             };
 
             _fileInfo = new ParsedMovieInfo
             {
-                MovieTitles = new List<string> { "The Movie" },
+                MovieTitles = new List<string> { "The Office" },
                 Year = 2018,
                 Quality = _quality
             };
@@ -82,7 +82,7 @@ namespace NzbDrone.Core.Test.MediaFiles.MovieImport
                 .Setup(c => c.ParseMinimalPathMovieInfo(It.IsAny<string>()))
                 .Returns(_fileInfo);
 
-            GivenVideoFiles(new List<string> { @"C:\Test\Unsorted\The.Movie.2018.DVDRip.XviD-OSiTV.avi".AsOsAgnostic() });
+            GivenVideoFiles(new List<string> { @"C:\Test\Unsorted\The.Office.2018.DVDRip.XviD-OSiTV.avi".AsOsAgnostic() });
         }
 
         private void GivenSpecifications(params Mock<IImportDecisionEngineSpecification>[] mocks)
@@ -178,9 +178,9 @@ namespace NzbDrone.Core.Test.MediaFiles.MovieImport
 
             _videoFiles = new List<string>
                 {
-                    "The.Movie.2021.DVDRip.XviD-OSiTV",
-                    "The.Movie.2021.DVDRip.XviD-OSiTV",
-                    "The.Movie.2021.DVDRip.XviD-OSiTV"
+                    "The.Office.S03E115.DVDRip.XviD-OSiTV",
+                    "The.Office.S03E115.DVDRip.XviD-OSiTV",
+                    "The.Office.S03E115.DVDRip.XviD-OSiTV"
                 };
 
             GivenVideoFiles(_videoFiles);
@@ -222,7 +222,7 @@ namespace NzbDrone.Core.Test.MediaFiles.MovieImport
 
             _videoFiles = new List<string>
                 {
-                    "The.Movie.2021.DVDRip.XviD-OSiTV"
+                    "The.Office.S03E115.DVDRip.XviD-OSiTV"
                 };
 
             GivenVideoFiles(_videoFiles);

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

@@ -62,6 +62,10 @@ namespace NzbDrone.Core.Test.ParserTests
         [TestCase("G.I.Movie.Movie.2013.THEATRiCAL.COMPLETE.BLURAY-GLiMMER", "G.I. Movie Movie")]
         [TestCase("www.Torrenting.org - Movie.2008.720p.X264-DIMENSION", "Movie")]
         [TestCase("The.French.Movie.2013.720p.BluRay.x264 - ROUGH[PublicHD]", "The French Movie")]
+        [TestCase("Movie.Title.1984.2020", "Movie Title 1984")]
+        [TestCase("1929 (2020)", "1929")]
+        [TestCase("1929 2020", "1929")]
+
         public void should_parse_movie_title(string postTitle, string title)
         {
             Parser.Parser.ParseMovieTitle(postTitle).PrimaryMovieTitle.Should().Be(title);
@@ -79,6 +83,9 @@ namespace NzbDrone.Core.Test.ParserTests
         [TestCase("Life.Movie.2014.German.DL.PAL.DVDR-ETM", "Life Movie", "", 2014)]
         [TestCase("Joe.Movie.2.EXTENDED.EDITION.2015.German.DL.PAL.DVDR-ETM", "Joe Movie 2", "EXTENDED EDITION", 2015)]
         [TestCase("Movie.EXTENDED.2011.HDRip.AC3.German.XviD-POE", "Movie", "EXTENDED", 2011)]
+        [TestCase("Movie.Title.1984.2020", "Movie Title 1984", "", 2020)]
+        [TestCase("1929 (2020)", "1929", "", 2020)]
+        [TestCase("1929 2020", "1929", "", 2020)]
 
         //Special cases (see description)
         [TestCase("Movie.Klasse.von.1999.1990.German.720p.HDTV.x264-NORETAiL", "Movie Klasse von 1999", "", 1990, Description = "year in the title")]
@@ -106,62 +113,62 @@ namespace NzbDrone.Core.Test.ParserTests
             }
         }
 
-        [TestCase("L'hypothèse.du.movie.volé.AKA.The.Hypothesis.of.the.Movie.Title.1978.1080p.CINET.WEB-DL.AAC2.0.x264-Cinefeel.mkv",
+        [TestCase("L'hypothèse.du.tableau.volé.AKA.The.Hypothesis.of.the.Stolen.Painting.1978.1080p.CINET.WEB-DL.AAC2.0.x264-Cinefeel.mkv",
             new string[]
             {
-                "L'hypothèse du movie volé AKA The Hypothesis of the Movie Title",
-                "L'hypothèse du movie volé",
-                "The Hypothesis of the Movie Title"
+                "L'hypothèse du tableau volé AKA The Hypothesis of the Stolen Painting",
+                "L'hypothèse du tableau volé",
+                "The Hypothesis of the Stolen Painting"
             })]
-        [TestCase("Skjegg.AKA.Rox.Beard.1965.CD1.CRiTERiON.DVDRip.XviD-KG.avi",
+        [TestCase("Akahige.AKA.Red.Beard.1965.CD1.CRiTERiON.DVDRip.XviD-KG.avi",
             new string[]
             {
-                "Skjegg AKA Rox Beard",
-                "Skjegg",
-                "Rox Beard"
+                "Akahige AKA Red Beard",
+                "Akahige",
+                "Red Beard"
             })]
-        [TestCase("Kjeller.chitai.AKA.Basement.of.Shame.1956.1080p.BluRay.x264.FLAC.1.0.mkv",
+        [TestCase("Akasen.chitai.AKA.Street.of.Shame.1956.1080p.BluRay.x264.FLAC.1.0.mkv",
             new string[]
             {
-                "Kjeller chitai AKA Basement of Shame",
-                "Kjeller chitai",
-                "Basement of Shame"
+                "Akasen chitai AKA Street of Shame",
+                "Akasen chitai",
+                "Street of Shame"
             })]
-        [TestCase("Radarr.Under.Water.(aka.Beneath.the.Code.Freeze).1997.DVDRip.x264.CG-Grzechsin.mkv",
+        [TestCase("Time.Under.Fire.(aka.Beneath.the.Bermuda.Triangle).1997.DVDRip.x264.CG-Grzechsin.mkv",
             new string[]
             {
-                "Radarr Under Water (aka Beneath the Code Freeze)",
-                "Radarr Under Water",
-                "Beneath the Code Freeze"
+                "Time Under Fire (aka Beneath the Bermuda Triangle)",
+                "Time Under Fire",
+                "Beneath the Bermuda Triangle"
             })]
-        [TestCase("Radarr.prodavet. AKA.Radarr.Shift.2005.DVDRip.x264-HANDJOB.mkv",
+        [TestCase("Nochnoy.prodavet. AKA.Graveyard.Shift.2005.DVDRip.x264-HANDJOB.mkv",
             new string[]
             {
-                "Radarr prodavet  AKA Radarr Shift",
-                "Radarr prodavet",
-                "Radarr Shift"
+                "Nochnoy prodavet  AKA Graveyard Shift",
+                "Nochnoy prodavet",
+                "Graveyard Shift"
             })]
         [TestCase("AKA.2002.DVDRip.x264-HANDJOB.mkv",
             new string[]
             {
                 "AKA"
             })]
-        [TestCase("KillRoyWasHere.2000.BluRay.1080p.DTS.x264.dxva-EuReKA.mkv",
+        [TestCase("Unbreakable.2000.BluRay.1080p.DTS.x264.dxva-EuReKA.mkv",
             new string[]
             {
-                "KillRoyWasHere"
+                "Unbreakable"
             })]
-        [TestCase("Aka Rox (2008).avi",
+        [TestCase("Aka Ana (2008).avi",
             new string[]
             {
-                "Aka Rox"
+                "Aka Ana"
             })]
-        [TestCase("Return Earth to Normal 'em High aka World 2 (2022) 1080p.mp4",
+        [TestCase("Return to Return to Nuke 'em High aka Volume 2 (2018) 1080p.mp4",
             new string[]
             {
-                "Return Earth to Normal 'em High aka World 2",
-                "Return Earth to Normal 'em High",
-                "World 2"
+                "Return to Return to Nuke 'em High aka Volume 2",
+                "Return to Return to Nuke 'em High",
+                "Volume 2"
             })]
         public void should_parse_movie_alternative_titles(string postTitle, string[] parsedTitles)
         {
@@ -225,8 +232,8 @@ namespace NzbDrone.Core.Test.ParserTests
             parsed.Languages.Should().Contain(Language.English, "Added by the multi tag in the release name");
         }
 
-        [TestCase("That Italian Movie 2008 [tt1234567] 720p BluRay X264", "tt1234567")]
-        [TestCase("That Italian Movie 2008 [tt12345678] 720p BluRay X264", "tt12345678")]
+        [TestCase("The Italian Job 2008 [tt1234567] 720p BluRay X264", "tt1234567")]
+        [TestCase("The Italian Job 2008 [tt12345678] 720p BluRay X264", "tt12345678")]
         public void should_parse_imdb_in_title(string postTitle, string imdb)
         {
             var parsed = Parser.Parser.ParseMovieTitle(postTitle, true);

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

@@ -259,7 +259,6 @@ namespace NzbDrone.Core.Test.ParserTests
         [TestCase("Movie.Name.2011.1080p.UHD.BluRay.DD5.1.HDR.x265-CtrlHD.mkv", false)]
         [TestCase("Movie.Name.2016.German.DTS.DL.1080p.UHDBD.x265-TDO.mkv", false)]
         [TestCase("Movie.Name.2021.1080p.BDLight.x265-AVCDVD", false)]
-        [TestCase("Random.Title.2010.1080p.HD.DVD.AVC.DDP.5.1-GRouP", false)]
         public void should_parse_bluray1080p_quality(string title, bool proper)
         {
             ParseAndVerifyQuality(title, Source.BLURAY, proper, Resolution.R1080p);

src/NzbDrone.Core/Backup/Backup.cs

@@ -6,7 +6,6 @@ namespace NzbDrone.Core.Backup
     {
         public string Name { get; set; }
         public BackupType Type { get; set; }
-        public long Size { get; set; }
         public DateTime Time { get; set; }
     }
 }

src/NzbDrone.Core/Backup/BackupService.cs

@@ -107,7 +107,6 @@ namespace NzbDrone.Core.Backup
                     {
                         Name = Path.GetFileName(b),
                         Type = backupType,
-                        Size = _diskProvider.GetFileSize(b),
                         Time = _diskProvider.FileGetLastWrite(b)
                     }));
                 }

src/NzbDrone.Core/Datastore/Migration/206_multiple_ratings_support.cs

@@ -1,113 +0,0 @@
-using System.Collections.Generic;
-using System.Data;
-using System.Text.Json;
-using System.Text.Json.Serialization;
-using Dapper;
-using FluentMigrator;
-using NzbDrone.Core.Datastore.Migration.Framework;
-
-namespace NzbDrone.Core.Datastore.Migration
-{
-    [Migration(206)]
-    public class multiple_ratings_support : NzbDroneMigrationBase
-    {
-        private readonly JsonSerializerOptions _serializerSettings;
-
-        public multiple_ratings_support()
-        {
-            _serializerSettings = new JsonSerializerOptions
-            {
-                AllowTrailingCommas = true,
-                DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull,
-                PropertyNameCaseInsensitive = true,
-                DictionaryKeyPolicy = JsonNamingPolicy.CamelCase,
-                PropertyNamingPolicy = JsonNamingPolicy.CamelCase,
-                WriteIndented = true
-            };
-        }
-
-        protected override void MainDbUpgrade()
-        {
-            Execute.Sql("UPDATE CustomFilters SET Filters = Replace(Filters, 'ratings', 'tmdbRating') WHERE Type = 'discoverMovie';");
-            Execute.Sql("UPDATE CustomFilters SET Filters = Replace(Filters, 'ratings', 'tmdbRating') WHERE Type = 'movieIndex';");
-
-            Execute.WithConnection((conn, tran) => FixRatings(conn, tran, "Movies"));
-            Execute.WithConnection((conn, tran) => FixRatings(conn, tran, "ImportListMovies"));
-        }
-
-        private void FixRatings(IDbConnection conn, IDbTransaction tran, string table)
-        {
-            var rows = conn.Query<Movie205>($"SELECT Id, Ratings FROM {table}");
-
-            var corrected = new List<Movie206>();
-
-            foreach (var row in rows)
-            {
-                var newRatings = new Ratings206
-                {
-                    Tmdb = new RatingChild206
-                    {
-                        Votes = 0,
-                        Value = 0,
-                        Type = RatingType206.User
-                    }
-                };
-
-                if (row.Ratings != null)
-                {
-                    var oldRatings = JsonSerializer.Deserialize<Ratings205>(row.Ratings, _serializerSettings);
-
-                    newRatings.Tmdb.Votes = oldRatings.Votes;
-                    newRatings.Tmdb.Value = oldRatings.Value;
-                }
-
-                corrected.Add(new Movie206
-                {
-                    Id = row.Id,
-                    Ratings = JsonSerializer.Serialize(newRatings, _serializerSettings)
-                });
-            }
-
-            var updateSql = $"UPDATE {table} SET Ratings = @Ratings WHERE Id = @Id";
-            conn.Execute(updateSql, corrected, transaction: tran);
-        }
-
-        private class Movie205
-        {
-            public int Id { get; set; }
-            public string Ratings { get; set; }
-        }
-
-        private class Ratings205
-        {
-            public int Votes { get; set; }
-            public decimal Value { get; set; }
-        }
-
-        private class Movie206
-        {
-            public int Id { get; set; }
-            public string Ratings { get; set; }
-        }
-
-        private class Ratings206
-        {
-            public RatingChild206 Tmdb { get; set; }
-            public RatingChild206 Imdb { get; set; }
-            public RatingChild206 Metacritic { get; set; }
-            public RatingChild206 RottenTomatoes { get; set; }
-        }
-
-        private class RatingChild206
-        {
-            public int Votes { get; set; }
-            public decimal Value { get; set; }
-            public RatingType206 Type { get; set; }
-        }
-
-        private enum RatingType206
-        {
-            User
-        }
-    }
-}

src/NzbDrone.Core/Datastore/TableMapping.cs

@@ -179,7 +179,6 @@ namespace NzbDrone.Core.Datastore
             SqlMapper.AddTypeHandler(new EmbeddedDocumentConverter<List<string>>());
             SqlMapper.AddTypeHandler(new EmbeddedDocumentConverter<ParsedMovieInfo>(new QualityIntConverter(), new LanguageIntConverter()));
             SqlMapper.AddTypeHandler(new EmbeddedDocumentConverter<ReleaseInfo>());
-            SqlMapper.AddTypeHandler(new EmbeddedDocumentConverter<Ratings>());
             SqlMapper.AddTypeHandler(new EmbeddedDocumentConverter<List<MovieTranslation>>());
             SqlMapper.AddTypeHandler(new EmbeddedDocumentConverter<HashSet<int>>());
             SqlMapper.AddTypeHandler(new OsPathConverter());

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

@@ -2,6 +2,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
+using CookComputing.XmlRpc;
 using FluentValidation.Results;
 using NLog;
 using NzbDrone.Common.Disk;
@@ -90,7 +91,12 @@ namespace NzbDrone.Core.Download.Clients.Aria2
                 var downloadSpeed = long.Parse(torrent.DownloadSpeed);
 
                 var status = DownloadItemStatus.Failed;
-                var title = torrent.Bittorrent?.Name ?? "";
+                var title = "";
+
+                if (torrent.Bittorrent?.ContainsKey("info") == true && ((XmlRpcStruct)torrent.Bittorrent["info"]).ContainsKey("name"))
+                {
+                    title = ((XmlRpcStruct)torrent.Bittorrent["info"])["name"].ToString();
+                }
 
                 switch (torrent.Status)
                 {

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

@@ -1,161 +1,111 @@
-using System.Collections.Generic;
-using System.Linq;
-using System.Xml.Linq;
-using System.Xml.XPath;
-using NzbDrone.Core.Download.Extensions;
+using CookComputing.XmlRpc;
 
 namespace NzbDrone.Core.Download.Clients.Aria2
 {
-    public class Aria2Fault
-    {
-        public Aria2Fault(XElement element)
-        {
-            foreach (var e in element.XPathSelectElements("./value/struct/member"))
-            {
-                var name = e.ElementAsString("name");
-                if (name == "faultCode")
-                {
-                    FaultCode = e.Element("value").ElementAsInt("int");
-                }
-                else if (name == "faultString")
-                {
-                    FaultString = e.Element("value").GetStringValue();
-                }
-            }
-        }
-
-        public int FaultCode { get; set; }
-        public string FaultString { get; set; }
-    }
-
     public class Aria2Version
     {
-        public Aria2Version(XElement element)
-        {
-            foreach (var e in element.XPathSelectElements("./struct/member"))
-            {
-                if (e.ElementAsString("name") == "version")
-                {
-                    Version = e.Element("value").GetStringValue();
-                }
-            }
-        }
+        [XmlRpcMember("version")]
+        public string Version;
 
-        public string Version { get; set; }
+        [XmlRpcMember("enabledFeatures")]
+        public string[] EnabledFeatures;
+    }
+
+    public class Aria2Uri
+    {
+        [XmlRpcMember("status")]
+        public string Status;
+
+        [XmlRpcMember("uri")]
+        public string Uri;
     }
 
     public class Aria2File
     {
-        public Aria2File(XElement element)
-        {
-            foreach (var e in element.XPathSelectElements("./struct/member"))
-            {
-                var name = e.ElementAsString("name");
+        [XmlRpcMember("index")]
+        public string Index;
 
-                if (name == "path")
-                {
-                    Path = e.Element("value").GetStringValue();
-                }
-            }
-        }
+        [XmlRpcMember("length")]
+        public string Length;
 
-        public string Path { get; set; }
-    }
+        [XmlRpcMember("completedLength")]
+        public string CompletedLength;
 
-    public class Aria2Dict
-    {
-        public Aria2Dict(XElement element)
-        {
-            Dict = new Dictionary<string, string>();
+        [XmlRpcMember("path")]
+        public string Path;
 
-            foreach (var e in element.XPathSelectElements("./struct/member"))
-            {
-                Dict.Add(e.ElementAsString("name"), e.Element("value").GetStringValue());
-            }
-        }
+        [XmlRpcMember("selected")]
+        [XmlRpcMissingMapping(MappingAction.Ignore)]
+        public string Selected;
 
-        public Dictionary<string, string> Dict { get; set; }
-    }
-
-    public class Aria2Bittorrent
-    {
-        public Aria2Bittorrent(XElement element)
-        {
-            foreach (var e in element.Descendants("member"))
-            {
-                if (e.ElementAsString("name") == "name")
-                {
-                    Name = e.Element("value").GetStringValue();
-                }
-            }
-        }
-
-        public string Name;
+        [XmlRpcMember("uris")]
+        [XmlRpcMissingMapping(MappingAction.Ignore)]
+        public Aria2Uri[] Uris;
     }
 
     public class Aria2Status
     {
-        public Aria2Status(XElement element)
-        {
-            foreach (var e in element.XPathSelectElements("./struct/member"))
-            {
-                var name = e.ElementAsString("name");
+        [XmlRpcMember("bittorrent")]
+        [XmlRpcMissingMapping(MappingAction.Ignore)]
+        public XmlRpcStruct Bittorrent;
 
-                if (name == "bittorrent")
-                {
-                    Bittorrent = new Aria2Bittorrent(e.Element("value"));
-                }
-                else if (name == "infoHash")
-                {
-                    InfoHash = e.Element("value").GetStringValue();
-                }
-                else if (name == "completedLength")
-                {
-                    CompletedLength = e.Element("value").GetStringValue();
-                }
-                else if (name == "downloadSpeed")
-                {
-                    DownloadSpeed = e.Element("value").GetStringValue();
-                }
-                else if (name == "files")
-                {
-                    Files = e.XPathSelectElement("./value/array/data")
-                        .Elements()
-                        .Select(x => new Aria2File(x))
-                        .ToArray();
-                }
-                else if (name == "gid")
-                {
-                    Gid = e.Element("value").GetStringValue();
-                }
-                else if (name == "status")
-                {
-                    Status = e.Element("value").GetStringValue();
-                }
-                else if (name == "totalLength")
-                {
-                    TotalLength = e.Element("value").GetStringValue();
-                }
-                else if (name == "uploadLength")
-                {
-                    UploadLength = e.Element("value").GetStringValue();
-                }
-                else if (name == "errorMessage")
-                {
-                    ErrorMessage = e.Element("value").GetStringValue();
-                }
-            }
-        }
+        [XmlRpcMember("bitfield")]
+        [XmlRpcMissingMapping(MappingAction.Ignore)]
+        public string Bitfield;
 
-        public Aria2Bittorrent Bittorrent { get; set; }
-        public string InfoHash { get; set; }
-        public string CompletedLength { get; set; }
-        public string DownloadSpeed { get; set; }
-        public Aria2File[] Files { get; set; }
-        public string Gid { get; set; }
-        public string Status { get; set; }
-        public string TotalLength { get; set; }
-        public string UploadLength { get; set; }
-        public string ErrorMessage { get; set; }
+        [XmlRpcMember("infoHash")]
+        [XmlRpcMissingMapping(MappingAction.Ignore)]
+        public string InfoHash;
+
+        [XmlRpcMember("completedLength")]
+        [XmlRpcMissingMapping(MappingAction.Ignore)]
+        public string CompletedLength;
+
+        [XmlRpcMember("connections")]
+        [XmlRpcMissingMapping(MappingAction.Ignore)]
+        public string Connections;
+
+        [XmlRpcMember("dir")]
+        [XmlRpcMissingMapping(MappingAction.Ignore)]
+        public string Dir;
+
+        [XmlRpcMember("downloadSpeed")]
+        [XmlRpcMissingMapping(MappingAction.Ignore)]
+        public string DownloadSpeed;
+
+        [XmlRpcMember("files")]
+        [XmlRpcMissingMapping(MappingAction.Ignore)]
+        public Aria2File[] Files;
+
+        [XmlRpcMember("gid")]
+        public string Gid;
+
+        [XmlRpcMember("numPieces")]
+        [XmlRpcMissingMapping(MappingAction.Ignore)]
+        public string NumPieces;
+
+        [XmlRpcMember("pieceLength")]
+        [XmlRpcMissingMapping(MappingAction.Ignore)]
+        public string PieceLength;
+
+        [XmlRpcMember("status")]
+        [XmlRpcMissingMapping(MappingAction.Ignore)]
+        public string Status;
+
+        [XmlRpcMember("totalLength")]
+        [XmlRpcMissingMapping(MappingAction.Ignore)]
+        public string TotalLength;
+
+        [XmlRpcMember("uploadLength")]
+        [XmlRpcMissingMapping(MappingAction.Ignore)]
+        public string UploadLength;
+
+        [XmlRpcMember("uploadSpeed")]
+        [XmlRpcMissingMapping(MappingAction.Ignore)]
+        public string UploadSpeed;
+
+        [XmlRpcMember("errorMessage")]
+        [XmlRpcMissingMapping(MappingAction.Ignore)]
+        public string ErrorMessage;
     }
 }

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

@@ -1,9 +1,9 @@
+using System;
+using System.Collections;
 using System.Collections.Generic;
-using System.Linq;
-using System.Xml.Linq;
-using System.Xml.XPath;
-using NzbDrone.Common.Http;
-using NzbDrone.Core.Download.Extensions;
+using System.Net;
+using CookComputing.XmlRpc;
+using NLog;
 
 namespace NzbDrone.Core.Download.Clients.Aria2
 {
@@ -19,61 +19,103 @@ namespace NzbDrone.Core.Download.Clients.Aria2
         Aria2Status GetFromGID(Aria2Settings settings, string gid);
     }
 
+    public interface IAria2 : IXmlRpcProxy
+    {
+        [XmlRpcMethod("aria2.getVersion")]
+        Aria2Version GetVersion(string token);
+
+        [XmlRpcMethod("aria2.addUri")]
+        string AddUri(string token, string[] uri);
+
+        [XmlRpcMethod("aria2.addTorrent")]
+        string AddTorrent(string token, byte[] torrent);
+
+        [XmlRpcMethod("aria2.forceRemove")]
+        string Remove(string token, string gid);
+
+        [XmlRpcMethod("aria2.removeDownloadResult")]
+        string RemoveResult(string token, string gid);
+
+        [XmlRpcMethod("aria2.tellStatus")]
+        Aria2Status GetFromGid(string token, string gid);
+
+        [XmlRpcMethod("aria2.getGlobalOption")]
+        XmlRpcStruct GetGlobalOption(string token);
+
+        [XmlRpcMethod("aria2.tellActive")]
+        Aria2Status[] GetActive(string token);
+
+        [XmlRpcMethod("aria2.tellWaiting")]
+        Aria2Status[] GetWaiting(string token, int offset, int num);
+
+        [XmlRpcMethod("aria2.tellStopped")]
+        Aria2Status[] GetStopped(string token, int offset, int num);
+    }
+
     public class Aria2Proxy : IAria2Proxy
     {
-        private readonly IHttpClient _httpClient;
+        private readonly Logger _logger;
 
-        public Aria2Proxy(IHttpClient httpClient)
+        public Aria2Proxy(Logger logger)
         {
-            _httpClient = httpClient;
+            _logger = logger;
+        }
+
+        private string GetToken(Aria2Settings settings)
+        {
+            return $"token:{settings?.SecretToken}";
+        }
+
+        private string GetURL(Aria2Settings settings)
+        {
+            return $"http{(settings.UseSsl ? "s" : "")}://{settings.Host}:{settings.Port}{settings.RpcPath}";
         }
 
         public string GetVersion(Aria2Settings settings)
         {
-            var response = ExecuteRequest(settings, "aria2.getVersion", GetToken(settings));
+            _logger.Trace("> aria2.getVersion");
 
-            var element = response.XPathSelectElement("./methodResponse/params/param/value");
+            var client = BuildClient(settings);
+            var version = ExecuteRequest(() => client.GetVersion(GetToken(settings)));
 
-            var version = new Aria2Version(element);
+            _logger.Trace("< aria2.getVersion");
 
             return version.Version;
         }
 
         public Aria2Status GetFromGID(Aria2Settings settings, string gid)
         {
-            var response = ExecuteRequest(settings, "aria2.tellStatus", GetToken(settings), gid);
+            _logger.Trace("> aria2.tellStatus");
 
-            var element = response.XPathSelectElement("./methodResponse/params/param/value");
+            var client = BuildClient(settings);
+            var found = ExecuteRequest(() => client.GetFromGid(GetToken(settings), gid));
 
-            return new Aria2Status(element);
-        }
+            _logger.Trace("< aria2.tellStatus");
 
-        private List<Aria2Status> GetTorrentsMethod(Aria2Settings settings, string method, params object[] args)
-        {
-            var allArgs = new List<object> { GetToken(settings) };
-            if (args.Any())
-            {
-                allArgs.AddRange(args);
-            }
-
-            var response = ExecuteRequest(settings, method, allArgs.ToArray());
-
-            var element = response.XPathSelectElement("./methodResponse/params/param/value/array/data");
-
-            var torrents = element?.Elements()
-                               .Select(x => new Aria2Status(x))
-                               .ToList()
-                           ?? new List<Aria2Status>();
-            return torrents;
+            return found;
         }
 
         public List<Aria2Status> GetTorrents(Aria2Settings settings)
         {
-            var active = GetTorrentsMethod(settings, "aria2.tellActive");
+            _logger.Trace("> aria2.tellActive");
 
-            var waiting = GetTorrentsMethod(settings, "aria2.tellWaiting", 0, 10 * 1024);
+            var client = BuildClient(settings);
 
-            var stopped = GetTorrentsMethod(settings, "aria2.tellStopped", 0, 10 * 1024);
+            var active = ExecuteRequest(() => client.GetActive(GetToken(settings)));
+
+            _logger.Trace("< aria2.tellActive");
+
+            _logger.Trace("> aria2.tellWaiting");
+
+            var waiting = ExecuteRequest(() => client.GetWaiting(GetToken(settings), 0, 10 * 1024));
+
+            _logger.Trace("< aria2.tellWaiting");
+
+            _logger.Trace("> aria2.tellStopped");
+
+            var stopped = ExecuteRequest(() => client.GetStopped(GetToken(settings), 0, 10 * 1024));
+
+            _logger.Trace("< aria2.tellStopped");
 
             var items = new List<Aria2Status>();
 
@@ -86,79 +128,98 @@ namespace NzbDrone.Core.Download.Clients.Aria2
 
         public Dictionary<string, string> GetGlobals(Aria2Settings settings)
         {
-            var response = ExecuteRequest(settings, "aria2.getGlobalOption", GetToken(settings));
+            _logger.Trace("> aria2.getGlobalOption");
 
-            var element = response.XPathSelectElement("./methodResponse/params/param/value");
+            var client = BuildClient(settings);
+            var options = ExecuteRequest(() => client.GetGlobalOption(GetToken(settings)));
 
-            var result = new Aria2Dict(element);
+            _logger.Trace("< aria2.getGlobalOption");
 
-            return result.Dict;
+            var ret = new Dictionary<string, string>();
+
+            foreach (DictionaryEntry option in options)
+            {
+                ret.Add(option.Key.ToString(), option.Value?.ToString());
+            }
+
+            return ret;
         }
 
         public string AddMagnet(Aria2Settings settings, string magnet)
         {
-            var response = ExecuteRequest(settings, "aria2.addUri", GetToken(settings), new List<string> { magnet });
+            _logger.Trace("> aria2.addUri");
 
-            var gid = response.GetStringResponse();
+            var client = BuildClient(settings);
+            var gid = ExecuteRequest(() => client.AddUri(GetToken(settings), new[] { magnet }));
+
+            _logger.Trace("< aria2.addUri");
 
             return gid;
         }
 
         public string AddTorrent(Aria2Settings settings, byte[] torrent)
         {
-            var response = ExecuteRequest(settings, "aria2.addTorrent", GetToken(settings), torrent);
+            _logger.Trace("> aria2.addTorrent");
 
-            var gid = response.GetStringResponse();
+            var client = BuildClient(settings);
+            var gid = ExecuteRequest(() => client.AddTorrent(GetToken(settings), torrent));
+
+            _logger.Trace("< aria2.addTorrent");
 
             return gid;
         }
 
         public bool RemoveTorrent(Aria2Settings settings, string gid)
         {
-            var response = ExecuteRequest(settings, "aria2.forceRemove", GetToken(settings), gid);
+            _logger.Trace("> aria2.forceRemove");
 
-            var gidres = response.GetStringResponse();
+            var client = BuildClient(settings);
+            var gidres = ExecuteRequest(() => client.Remove(GetToken(settings), gid));
+
+            _logger.Trace("< aria2.forceRemove");
 
             return gid == gidres;
         }
 
         public bool RemoveCompletedTorrent(Aria2Settings settings, string gid)
         {
-            var response = ExecuteRequest(settings, "aria2.removeDownloadResult", GetToken(settings), gid);
+            _logger.Trace("> aria2.removeDownloadResult");
 
-            var result = response.GetStringResponse();
+            var client = BuildClient(settings);
+            var result = ExecuteRequest(() => client.RemoveResult(GetToken(settings), gid));
+
+            _logger.Trace("< aria2.removeDownloadResult");
 
             return result == "OK";
         }
 
-        private string GetToken(Aria2Settings settings)
+        private IAria2 BuildClient(Aria2Settings settings)
         {
-            return $"token:{settings?.SecretToken}";
+            var client = XmlRpcProxyGen.Create<IAria2>();
+            client.Url = GetURL(settings);
+
+            return client;
         }
 
-        private XDocument ExecuteRequest(Aria2Settings settings, string methodName, params object[] args)
+        private T ExecuteRequest<T>(Func<T> task)
         {
-            var requestBuilder = new XmlRpcRequestBuilder(settings.UseSsl, settings.Host, settings.Port, settings.RpcPath)
+            try
             {
-                LogResponseContent = true,
-            };
-
-            var request = requestBuilder.Call(methodName, args).Build();
-
-            var response = _httpClient.Execute(request);
-
-            var doc = XDocument.Parse(response.Content);
-
-            var faultElement = doc.XPathSelectElement("./methodResponse/fault");
-
-            if (faultElement != null)
-            {
-                var fault = new Aria2Fault(faultElement);
-
-                throw new DownloadClientException($"Aria2 returned error code {fault.FaultCode}: {fault.FaultString}");
+                return task();
             }
+            catch (XmlRpcServerException ex)
+            {
+                throw new DownloadClientException("Unable to connect to aria2, please check your settings", ex);
+            }
+            catch (WebException ex)
+            {
+                if (ex.Status == WebExceptionStatus.TrustFailure)
+                {
+                    throw new DownloadClientUnavailableException("Unable to connect to aria2, certificate validation failed.", ex);
+                }
 
-            return doc;
+                throw new DownloadClientUnavailableException("Unable to connect to aria2, please check your settings", ex);
+            }
         }
     }
 }

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

@@ -44,7 +44,7 @@ namespace NzbDrone.Core.Download.Clients.Deluge
         [FieldDefinition(4, Label = "Password", Type = FieldType.Password, Privacy = PrivacyLevel.Password)]
         public string Password { get; set; }
 
-        [FieldDefinition(5, Label = "Category", Type = FieldType.Textbox, HelpText = "Adding a category specific to Radarr avoids conflicts with unrelated non-Radarr downloads. Using a category is optional, but strongly recommended.")]
+        [FieldDefinition(5, Label = "Category", Type = FieldType.Textbox, HelpText = "Adding a category specific to Radarr avoids conflicts with unrelated downloads, but it's optional")]
         public string MovieCategory { get; set; }
 
         [FieldDefinition(6, Label = "Post-Import Category", Type = FieldType.Textbox, Advanced = true, HelpText = "Category for Radarr to set after it has imported the download. Radarr will not remove the torrent if seeding has finished. Leave blank to keep same category.")]

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

@@ -45,7 +45,7 @@ namespace NzbDrone.Core.Download.Clients.DownloadStation
         [FieldDefinition(4, Label = "Password", Type = FieldType.Password, Privacy = PrivacyLevel.Password)]
         public string Password { get; set; }
 
-        [FieldDefinition(5, Label = "Category", Type = FieldType.Textbox, HelpText = "Adding a category specific to Radarr avoids conflicts with unrelated non-Radarr downloads. Using a category is optional, but strongly recommended. Creates a [category] subdirectory in the output directory.")]
+        [FieldDefinition(5, Label = "Category", Type = FieldType.Textbox, HelpText = "Adding a category specific to Radarr avoids conflicts with unrelated downloads, but it's optional. Creates a [category] subdirectory in the output directory.")]
         public string TvCategory { get; set; }
 
         [FieldDefinition(6, Label = "Directory", Type = FieldType.Textbox, HelpText = "Optional shared folder to put downloads into, leave blank to use the default Download Station location")]

src/NzbDrone.Core/Download/Clients/DownloadStation/Responses/DiskStationError.cs

@@ -20,22 +20,16 @@ namespace NzbDrone.Core.Download.Clients.DownloadStation.Responses
                 { 104, "The requested version does not support the functionality" },
                 { 105, "The logged in session does not have permission" },
                 { 106, "Session timeout" },
-                { 107, "Session interrupted by duplicate login" },
-                { 119, "SID not found" }
+                { 107, "Session interrupted by duplicate login" }
             };
 
             AuthMessages = new Dictionary<int, string>
             {
                 { 400, "No such account or incorrect password" },
-                { 401, "Disabled account" },
-                { 402, "Denied permission" },
-                { 403, "2-step authentication code required" },
-                { 404, "Failed to authenticate 2-step authentication code" },
-                { 406, "Enforce to authenticate with 2-factor authentication code" },
-                { 407, "Blocked IP source" },
-                { 408, "Expired password cannot change" },
-                { 409, "Expired password" },
-                { 410, "Password must be changed" }
+                { 401, "Account disabled" },
+                { 402, "Permission denied" },
+                { 403, "2-step verification code required" },
+                { 404, "Failed to authenticate 2-step verification code" }
             };
 
             DownloadStationTaskMessages = new Dictionary<int, string>

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

@@ -4,7 +4,6 @@ using System.Linq;
 using FluentValidation.Results;
 using NLog;
 using NzbDrone.Common.Disk;
-using NzbDrone.Common.Extensions;
 using NzbDrone.Common.Http;
 using NzbDrone.Core.Configuration;
 using NzbDrone.Core.Download.Clients.Flood.Models;
@@ -234,17 +233,10 @@ namespace NzbDrone.Core.Download.Clients.Flood
 
         public override DownloadClientInfo GetStatus()
         {
-            var destDir = _proxy.GetClientSettings(Settings).DirectoryDefault;
-
-            if (Settings.Destination.IsNotNullOrWhiteSpace())
-            {
-                destDir = Settings.Destination;
-            }
-
             return new DownloadClientInfo
             {
                 IsLocalhost = Settings.Host == "127.0.0.1" || Settings.Host == "::1" || Settings.Host == "localhost",
-                OutputRootFolders = new List<OsPath> { _remotePathMappingService.RemapRemoteToLocal(Settings.Host, new OsPath(destDir)) }
+                OutputRootFolders = new List<OsPath> { _remotePathMappingService.RemapRemoteToLocal(Settings.Host, new OsPath(Settings.Destination)) }
             };
         }
 

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

@@ -19,7 +19,6 @@ namespace NzbDrone.Core.Download.Clients.Flood
         Dictionary<string, Torrent> GetTorrents(FloodSettings settings);
         List<string> GetTorrentContentPaths(string hash, FloodSettings settings);
         void SetTorrentsTags(string hash, IEnumerable<string> tags, FloodSettings settings);
-        FloodClientSettings GetClientSettings(FloodSettings settings);
     }
 
     public class FloodProxy : IFloodProxy
@@ -211,14 +210,5 @@ namespace NzbDrone.Core.Download.Clients.Flood
 
             HandleRequest(tagsRequest, settings);
         }
-
-        public FloodClientSettings GetClientSettings(FloodSettings settings)
-        {
-            var contentsRequest = BuildRequest(settings).Resource($"/client/settings").Build();
-
-            contentsRequest.Method = HttpMethod.Get;
-
-            return Json.Deserialize<FloodClientSettings>(HandleRequest(contentsRequest, settings).Content);
-        }
     }
 }

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

@@ -1,7 +0,0 @@
-namespace NzbDrone.Core.Download.Clients.Flood.Types
-{
-    public class FloodClientSettings
-    {
-        public string DirectoryDefault { get; set; }
-    }
-}

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

@@ -73,7 +73,7 @@ namespace NzbDrone.Core.Download.Clients.Hadouken
             baseUrl = HttpUri.CombinePath(baseUrl, "api");
             var requestBuilder = new JsonRpcRequestBuilder(baseUrl, method, parameters);
             requestBuilder.LogResponseContent = true;
-            requestBuilder.NetworkCredential = new BasicNetworkCredential(settings.Username, settings.Password);
+            requestBuilder.NetworkCredential = new NetworkCredential(settings.Username, settings.Password);
             requestBuilder.Headers.Add("Accept-Encoding", "gzip,deflate");
 
             var httpRequest = requestBuilder.Build();

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

@@ -48,7 +48,7 @@ namespace NzbDrone.Core.Download.Clients.NzbVortex
         [FieldDefinition(3, Label = "API Key", Type = FieldType.Textbox, Privacy = PrivacyLevel.ApiKey)]
         public string ApiKey { get; set; }
 
-        [FieldDefinition(4, Label = "Group", Type = FieldType.Textbox, HelpText = "Adding a category specific to Radarr avoids conflicts with unrelated non-Radarr downloads. Using a category is optional, but strongly recommended.")]
+        [FieldDefinition(4, Label = "Group", Type = FieldType.Textbox, HelpText = "Adding a category specific to Radarr avoids conflicts with unrelated downloads, but it's optional")]
         public string TvCategory { get; set; }
 
         [FieldDefinition(5, Label = "Recent Priority", Type = FieldType.Select, SelectOptions = typeof(NzbVortexPriority), HelpText = "Priority to use when grabbing movies that released within the last 21 days")]

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

@@ -229,7 +229,7 @@ namespace NzbDrone.Core.Download.Clients.Nzbget
 
             var requestBuilder = new JsonRpcRequestBuilder(baseUrl, method, parameters);
             requestBuilder.LogResponseContent = true;
-            requestBuilder.NetworkCredential = new BasicNetworkCredential(settings.Username, settings.Password);
+            requestBuilder.NetworkCredential = new NetworkCredential(settings.Username, settings.Password);
 
             var httpRequest = requestBuilder.Build();
 

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

@@ -54,7 +54,7 @@ namespace NzbDrone.Core.Download.Clients.Nzbget
         [FieldDefinition(5, Label = "Password", Type = FieldType.Password, Privacy = PrivacyLevel.Password)]
         public string Password { get; set; }
 
-        [FieldDefinition(6, Label = "Category", Type = FieldType.Textbox, HelpText = "Adding a category specific to Radarr avoids conflicts with unrelated non-Radarr downloads. Using a category is optional, but strongly recommended.")]
+        [FieldDefinition(6, Label = "Category", Type = FieldType.Textbox, HelpText = "Adding a category specific to Radarr avoids conflicts with unrelated downloads, but it's optional")]
         public string MovieCategory { get; set; }
 
         [FieldDefinition(7, Label = "Recent Priority", Type = FieldType.Select, SelectOptions = typeof(NzbgetPriority), HelpText = "Priority to use when grabbing movies that released within the last 21 days")]

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

@@ -368,7 +368,9 @@ namespace NzbDrone.Core.Download.Clients.QBittorrent
 
             if (Settings.MovieCategory.IsNotNullOrWhiteSpace() && version >= Version.Parse("2.0"))
             {
-                if (Proxy.GetLabels(Settings).TryGetValue(Settings.MovieCategory, out var label) && label.SavePath.IsNotNullOrWhiteSpace())
+                var label = Proxy.GetLabels(Settings)[Settings.MovieCategory];
+
+                if (label.SavePath.IsNotNullOrWhiteSpace())
                 {
                     var labelDir = new OsPath(label.SavePath);
 

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

@@ -293,7 +293,7 @@ namespace NzbDrone.Core.Download.Clients.QBittorrent
             var requestBuilder = new HttpRequestBuilder(settings.UseSsl, settings.Host, settings.Port, settings.UrlBase)
             {
                 LogResponseContent = true,
-                NetworkCredential = new BasicNetworkCredential(settings.Username, settings.Password)
+                NetworkCredential = new NetworkCredential(settings.Username, settings.Password)
             };
             return requestBuilder;
         }

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

@@ -335,7 +335,7 @@ namespace NzbDrone.Core.Download.Clients.QBittorrent
             var requestBuilder = new HttpRequestBuilder(settings.UseSsl, settings.Host, settings.Port, settings.UrlBase)
             {
                 LogResponseContent = true,
-                NetworkCredential = new BasicNetworkCredential(settings.Username, settings.Password)
+                NetworkCredential = new NetworkCredential(settings.Username, settings.Password)
             };
             return requestBuilder;
         }

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

@@ -48,7 +48,7 @@ namespace NzbDrone.Core.Download.Clients.QBittorrent
         [FieldDefinition(5, Label = "Password", Type = FieldType.Password, Privacy = PrivacyLevel.Password)]
         public string Password { get; set; }
 
-        [FieldDefinition(6, Label = "Category", Type = FieldType.Textbox, HelpText = "Adding a category specific to Radarr avoids conflicts with unrelated non-Radarr downloads. Using a category is optional, but strongly recommended.")]
+        [FieldDefinition(6, Label = "Category", Type = FieldType.Textbox, HelpText = "Adding a category specific to Radarr avoids conflicts with unrelated downloads, but it's optional")]
         public string MovieCategory { get; set; }
 
         [FieldDefinition(7, Label = "Post-Import Category", Type = FieldType.Textbox, Advanced = true, HelpText = "Category for Radarr to set after it has imported the download. Radarr will not remove the torrent if seeding has finished. Leave blank to keep same category.")]
@@ -60,7 +60,7 @@ namespace NzbDrone.Core.Download.Clients.QBittorrent
         [FieldDefinition(9, Label = "Older Priority", Type = FieldType.Select, SelectOptions = typeof(QBittorrentPriority), HelpText = "Priority to use when grabbing movies that were released over 14 days ago")]
         public int OlderMoviePriority { get; set; }
 
-        [FieldDefinition(10, Label = "Initial State", Type = FieldType.Select, SelectOptions = typeof(QBittorrentState), HelpText = "Initial state for torrents added to qBittorrent. Note that Forced Torrents do not abide by seed restrictions")]
+        [FieldDefinition(10, Label = "Initial State", Type = FieldType.Select, SelectOptions = typeof(QBittorrentState), HelpText = "Initial state for torrents added to qBittorrent")]
         public int InitialState { get; set; }
 
         public NzbDroneValidationResult Validate()

src/NzbDrone.Core/Download/Clients/Sabnzbd/SabnzbdSettings.cs

@@ -66,7 +66,7 @@ namespace NzbDrone.Core.Download.Clients.Sabnzbd
         [FieldDefinition(6, Label = "Password", Type = FieldType.Password, Privacy = PrivacyLevel.Password)]
         public string Password { get; set; }
 
-        [FieldDefinition(7, Label = "Category", Type = FieldType.Textbox, HelpText = "Adding a category specific to Radarr avoids conflicts with unrelated non-Radarr downloads. Using a category is optional, but strongly recommended.")]
+        [FieldDefinition(7, Label = "Category", Type = FieldType.Textbox, HelpText = "Adding a category specific to Radarr avoids conflicts with unrelated downloads, but it's optional")]
         public string MovieCategory { get; set; }
 
         [FieldDefinition(8, Label = "Recent Priority", Type = FieldType.Select, SelectOptions = typeof(SabnzbdPriority), HelpText = "Priority to use when grabbing movies that released within the last 21 days")]

src/NzbDrone.Core/Download/Clients/Transmission/TransmissionProxy.cs

@@ -200,7 +200,7 @@ namespace NzbDrone.Core.Download.Clients.Transmission
                 .Accept(HttpAccept.Json);
 
             requestBuilder.LogResponseContent = true;
-            requestBuilder.NetworkCredential = new BasicNetworkCredential(settings.Username, settings.Password);
+            requestBuilder.NetworkCredential = new NetworkCredential(settings.Username, settings.Password);
             requestBuilder.AllowAutoRedirect = false;
 
             return requestBuilder;

src/NzbDrone.Core/Download/Clients/Transmission/TransmissionSettings.cs

@@ -53,7 +53,7 @@ namespace NzbDrone.Core.Download.Clients.Transmission
         [FieldDefinition(5, Label = "Password", Type = FieldType.Password, Privacy = PrivacyLevel.Password)]
         public string Password { get; set; }
 
-        [FieldDefinition(6, Label = "Category", Type = FieldType.Textbox, HelpText = "Adding a category specific to Radarr avoids conflicts with unrelated non-Radarr downloads. Using a category is optional, but strongly recommended. Creates a [category] subdirectory in the output directory.")]
+        [FieldDefinition(6, Label = "Category", Type = FieldType.Textbox, HelpText = "Adding a category specific to Radarr avoids conflicts with unrelated downloads, but it's optional. Creates a [category] subdirectory in the output directory.")]
         public string MovieCategory { get; set; }
 
         [FieldDefinition(7, Label = "Directory", Type = FieldType.Textbox, Advanced = true, HelpText = "Optional location to put downloads in, leave blank to use the default Transmission location")]

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

@@ -127,12 +127,6 @@ namespace NzbDrone.Core.Download.Clients.RTorrent
                     continue;
                 }
 
-                // Ignore torrents with an empty path
-                if (torrent.Path.IsNullOrWhiteSpace())
-                {
-                    continue;
-                }
-
                 if (torrent.Path.StartsWith("."))
                 {
                     throw new DownloadClientException("Download paths must be absolute. Please specify variable \"directory\" in rTorrent.");

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

@@ -1,28 +0,0 @@
-using System.Xml.Linq;
-using System.Xml.XPath;
-using NzbDrone.Core.Download.Extensions;
-
-namespace NzbDrone.Core.Download.Clients.RTorrent
-{
-    public class RTorrentFault
-    {
-        public RTorrentFault(XElement element)
-        {
-            foreach (var e in element.XPathSelectElements("./value/struct/member"))
-            {
-                var name = e.ElementAsString("name");
-                if (name == "faultCode")
-                {
-                    FaultCode = e.Element("value").GetIntValue();
-                }
-                else if (name == "faultString")
-                {
-                    FaultString = e.Element("value").GetStringValue();
-                }
-            }
-        }
-
-        public int FaultCode { get; set; }
-        public string FaultString { get; set; }
-    }
-}

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

@@ -1,12 +1,10 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Net;
-using System.Xml.Linq;
-using System.Xml.XPath;
+using CookComputing.XmlRpc;
+using NLog;
 using NzbDrone.Common.Extensions;
-using NzbDrone.Common.Http;
-using NzbDrone.Core.Download.Extensions;
+using NzbDrone.Common.Serializer;
 
 namespace NzbDrone.Core.Download.Clients.RTorrent
 {
@@ -23,67 +21,125 @@ namespace NzbDrone.Core.Download.Clients.RTorrent
         void PushTorrentUniqueView(string hash, string view, RTorrentSettings settings);
     }
 
+    public interface IRTorrent : IXmlRpcProxy
+    {
+        [XmlRpcMethod("d.multicall2")]
+        object[] TorrentMulticall(params string[] parameters);
+
+        [XmlRpcMethod("load.normal")]
+        int LoadNormal(string target, string data, params string[] commands);
+
+        [XmlRpcMethod("load.start")]
+        int LoadStart(string target, string data, params string[] commands);
+
+        [XmlRpcMethod("load.raw")]
+        int LoadRaw(string target, byte[] data, params string[] commands);
+
+        [XmlRpcMethod("load.raw_start")]
+        int LoadRawStart(string target, byte[] data, params string[] commands);
+
+        [XmlRpcMethod("d.erase")]
+        int Remove(string hash);
+
+        [XmlRpcMethod("d.name")]
+        string GetName(string hash);
+
+        [XmlRpcMethod("d.custom1.set")]
+        string SetLabel(string hash, string label);
+
+        [XmlRpcMethod("d.views.push_back_unique")]
+        int PushUniqueView(string hash, string view);
+
+        [XmlRpcMethod("system.client_version")]
+        string GetVersion();
+    }
+
     public class RTorrentProxy : IRTorrentProxy
     {
-        private readonly IHttpClient _httpClient;
+        private readonly Logger _logger;
 
-        public RTorrentProxy(IHttpClient httpClient)
+        public RTorrentProxy(Logger logger)
         {
-            _httpClient = httpClient;
+            _logger = logger;
         }
 
         public string GetVersion(RTorrentSettings settings)
         {
-            var document = ExecuteRequest(settings, "system.client_version");
+            _logger.Debug("Executing remote method: system.client_version");
 
-            return document.Descendants("string").FirstOrDefault()?.Value ?? "0.0.0";
+            var client = BuildClient(settings);
+            var version = ExecuteRequest(() => client.GetVersion());
+
+            return version;
         }
 
         public List<RTorrentTorrent> GetTorrents(RTorrentSettings settings)
         {
-            var document = ExecuteRequest(settings,
-                "d.multicall2",
-                "",
-                "",
-                "d.name=", // string
-                "d.hash=", // string
-                "d.base_path=", // string
-                "d.custom1=", // string (label)
-                "d.size_bytes=", // long
-                "d.left_bytes=", // long
-                "d.down.rate=", // long (in bytes / s)
-                "d.ratio=", // long
-                "d.is_open=", // long
-                "d.is_active=", // long
-                "d.complete=", //long
-                "d.timestamp.finished="); // long (unix timestamp)
+            _logger.Debug("Executing remote method: d.multicall2");
 
-            var torrents = document.XPathSelectElement("./methodResponse/params/param/value/array/data")
-                               ?.Elements()
-                               .Select(x => new RTorrentTorrent(x))
-                               .ToList()
-                           ?? new List<RTorrentTorrent>();
+            var client = BuildClient(settings);
+            var ret = ExecuteRequest(() => client.TorrentMulticall(
+                    "",
+                    "",
+                    "d.name=", // string
+                    "d.hash=", // string
+                    "d.base_path=", // string
+                    "d.custom1=", // string (label)
+                    "d.size_bytes=", // long
+                    "d.left_bytes=", // long
+                    "d.down.rate=", // long (in bytes / s)
+                    "d.ratio=", // long
+                    "d.is_open=", // long
+                    "d.is_active=", // long
+                    "d.complete=", //long
+                    "d.timestamp.finished=")); // long (unix timestamp)
 
-            return torrents;
+            _logger.Trace(ret.ToJson());
+
+            var items = new List<RTorrentTorrent>();
+
+            foreach (object[] torrent in ret)
+            {
+                var labelDecoded = System.Web.HttpUtility.UrlDecode((string)torrent[3]);
+
+                var item = new RTorrentTorrent();
+                item.Name = (string)torrent[0];
+                item.Hash = (string)torrent[1];
+                item.Path = (string)torrent[2];
+                item.Category = labelDecoded;
+                item.TotalSize = (long)torrent[4];
+                item.RemainingSize = (long)torrent[5];
+                item.DownRate = (long)torrent[6];
+                item.Ratio = (long)torrent[7];
+                item.IsOpen = Convert.ToBoolean((long)torrent[8]);
+                item.IsActive = Convert.ToBoolean((long)torrent[9]);
+                item.IsFinished = Convert.ToBoolean((long)torrent[10]);
+                item.FinishedTime = (long)torrent[11];
+
+                items.Add(item);
+            }
+
+            return items;
         }
 
         public void AddTorrentFromUrl(string torrentUrl, string label, RTorrentPriority priority, string directory, RTorrentSettings settings)
         {
-            var args = new List<object> { "", torrentUrl };
-            args.AddRange(GetCommands(label, priority, directory));
-
-            XDocument response;
-
-            if (settings.AddStopped)
+            var client = BuildClient(settings);
+            var response = ExecuteRequest(() =>
             {
-                response = ExecuteRequest(settings, "load.normal", args.ToArray());
-            }
-            else
-            {
-                response = ExecuteRequest(settings, "load.start", args.ToArray());
-            }
+                if (settings.AddStopped)
+                {
+                    _logger.Debug("Executing remote method: load.normal");
+                    return client.LoadNormal("", torrentUrl, GetCommands(label, priority, directory));
+                }
+                else
+                {
+                    _logger.Debug("Executing remote method: load.start");
+                    return client.LoadStart("", torrentUrl, GetCommands(label, priority, directory));
+                }
+            });
 
-            if (response.GetIntResponse() != 0)
+            if (response != 0)
             {
                 throw new DownloadClientException("Could not add torrent: {0}.", torrentUrl);
             }
@@ -91,21 +147,22 @@ namespace NzbDrone.Core.Download.Clients.RTorrent
 
         public void AddTorrentFromFile(string fileName, byte[] fileContent, string label, RTorrentPriority priority, string directory, RTorrentSettings settings)
         {
-            var args = new List<object> { "", fileContent };
-            args.AddRange(GetCommands(label, priority, directory));
-
-            XDocument response;
-
-            if (settings.AddStopped)
+            var client = BuildClient(settings);
+            var response = ExecuteRequest(() =>
             {
-                response = ExecuteRequest(settings, "load.raw", args.ToArray());
-            }
-            else
-            {
-                response = ExecuteRequest(settings, "load.raw_start", args.ToArray());
-            }
+                if (settings.AddStopped)
+                {
+                    _logger.Debug("Executing remote method: load.raw");
+                    return client.LoadRaw("", fileContent, GetCommands(label, priority, directory));
+                }
+                else
+                {
+                    _logger.Debug("Executing remote method: load.raw_start");
+                    return client.LoadRawStart("", fileContent, GetCommands(label, priority, directory));
+                }
+            });
 
-            if (response.GetIntResponse() != 0)
+            if (response != 0)
             {
                 throw new DownloadClientException("Could not add torrent: {0}.", fileName);
             }
@@ -113,9 +170,12 @@ namespace NzbDrone.Core.Download.Clients.RTorrent
 
         public void SetTorrentLabel(string hash, string label, RTorrentSettings settings)
         {
-            var response = ExecuteRequest(settings, "d.custom1.set", hash, label);
+            _logger.Debug("Executing remote method: d.custom1.set");
 
-            if (response.GetStringResponse() != label)
+            var client = BuildClient(settings);
+            var response = ExecuteRequest(() => client.SetLabel(hash, label));
+
+            if (response != label)
             {
                 throw new DownloadClientException("Could not set label to {1} for torrent: {0}.", hash, label);
             }
@@ -123,9 +183,11 @@ namespace NzbDrone.Core.Download.Clients.RTorrent
 
         public void PushTorrentUniqueView(string hash, string view, RTorrentSettings settings)
         {
-            var response = ExecuteRequest(settings, "d.views.push_back_unique", hash, view);
+            _logger.Debug("Executing remote method: d.views.push_back_unique");
 
-            if (response.GetIntResponse() != 0)
+            var client = BuildClient(settings);
+            var response = ExecuteRequest(() => client.PushUniqueView(hash, view));
+            if (response != 0)
             {
                 throw new DownloadClientException("Could not push unique view {0} for torrent: {1}.", view, hash);
             }
@@ -133,9 +195,12 @@ namespace NzbDrone.Core.Download.Clients.RTorrent
 
         public void RemoveTorrent(string hash, RTorrentSettings settings)
         {
-            var response = ExecuteRequest(settings, "d.erase", hash);
+            _logger.Debug("Executing remote method: d.erase");
 
-            if (response.GetIntResponse() != 0)
+            var client = BuildClient(settings);
+            var response = ExecuteRequest(() => client.Remove(hash));
+
+            if (response != 0)
             {
                 throw new DownloadClientException("Could not remove torrent: {0}.", hash);
             }
@@ -143,10 +208,13 @@ namespace NzbDrone.Core.Download.Clients.RTorrent
 
         public bool HasHashTorrent(string hash, RTorrentSettings settings)
         {
+            _logger.Debug("Executing remote method: d.name");
+
+            var client = BuildClient(settings);
+
             try
             {
-                var response = ExecuteRequest(settings, "d.name", hash);
-                var name = response.GetStringResponse();
+                var name = ExecuteRequest(() => client.GetName(hash));
 
                 if (name.IsNullOrWhiteSpace())
                 {
@@ -185,34 +253,45 @@ namespace NzbDrone.Core.Download.Clients.RTorrent
             return result.ToArray();
         }
 
-        private XDocument ExecuteRequest(RTorrentSettings settings, string methodName, params object[] args)
+        private IRTorrent BuildClient(RTorrentSettings settings)
         {
-            var requestBuilder = new XmlRpcRequestBuilder(settings.UseSsl, settings.Host, settings.Port, settings.UrlBase)
-            {
-                LogResponseContent = true,
-            };
+            var client = XmlRpcProxyGen.Create<IRTorrent>();
+
+            client.Url = string.Format(@"{0}://{1}:{2}/{3}",
+                                    settings.UseSsl ? "https" : "http",
+                                    settings.Host,
+                                    settings.Port,
+                                    settings.UrlBase);
+
+            client.EnableCompression = true;
 
             if (!settings.Username.IsNullOrWhiteSpace())
             {
-                requestBuilder.NetworkCredential = new NetworkCredential(settings.Username, settings.Password);
+                client.Credentials = new NetworkCredential(settings.Username, settings.Password);
             }
 
-            var request = requestBuilder.Call(methodName, args).Build();
+            return client;
+        }
 
-            var response = _httpClient.Execute(request);
-
-            var doc = XDocument.Parse(response.Content);
-
-            var faultElement = doc.XPathSelectElement("./methodResponse/fault");
-
-            if (faultElement != null)
+        private T ExecuteRequest<T>(Func<T> task)
+        {
+            try
             {
-                var fault = new RTorrentFault(faultElement);
-
-                throw new DownloadClientException($"rTorrent returned error code {fault.FaultCode}: {fault.FaultString}");
+                return task();
             }
+            catch (XmlRpcServerException ex)
+            {
+                throw new DownloadClientException("Unable to connect to rTorrent, please check your settings", ex);
+            }
+            catch (WebException ex)
+            {
+                if (ex.Status == WebExceptionStatus.TrustFailure)
+                {
+                    throw new DownloadClientUnavailableException("Unable to connect to rTorrent, certificate validation failed.", ex);
+                }
 
-            return doc;
+                throw new DownloadClientUnavailableException("Unable to connect to rTorrent, please check your settings", ex);
+            }
         }
     }
 }

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

@@ -49,7 +49,7 @@ namespace NzbDrone.Core.Download.Clients.RTorrent
         [FieldDefinition(5, Label = "Password", Type = FieldType.Password, Privacy = PrivacyLevel.Password)]
         public string Password { get; set; }
 
-        [FieldDefinition(6, Label = "Category", Type = FieldType.Textbox, HelpText = "Adding a category specific to Radarr avoids conflicts with unrelated non-Radarr downloads. Using a category is optional, but strongly recommended.")]
+        [FieldDefinition(6, Label = "Category", Type = FieldType.Textbox, HelpText = "Adding a category specific to Radarr avoids conflicts with unrelated downloads, but it's optional.")]
         public string MovieCategory { get; set; }
 
         [FieldDefinition(7, Label = "Post-Import Category", Type = FieldType.Textbox, Advanced = true, HelpText = "Category for Radarr to set after it has imported the download. Radarr will not remove the torrent if seeding has finished. Leave blank to keep same category.")]
@@ -64,7 +64,7 @@ namespace NzbDrone.Core.Download.Clients.RTorrent
         [FieldDefinition(10, Label = "Older Priority", Type = FieldType.Select, SelectOptions = typeof(RTorrentPriority), HelpText = "Priority to use when grabbing movies that were released over 14 days ago")]
         public int OlderMoviePriority { get; set; }
 
-        [FieldDefinition(11, Label = "Add Stopped", Type = FieldType.Checkbox, HelpText = "Enabling will add torrents and magnets to ruTorrent in a stopped state. This may break magnet files.")]
+        [FieldDefinition(11, 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/Download/Clients/rTorrent/RTorrentTorrent.cs

@@ -1,35 +1,7 @@
-using System;
-using System.Linq;
-using System.Web;
-using System.Xml.Linq;
-using NzbDrone.Core.Download.Extensions;
-
-namespace NzbDrone.Core.Download.Clients.RTorrent
+namespace NzbDrone.Core.Download.Clients.RTorrent
 {
     public class RTorrentTorrent
     {
-        public RTorrentTorrent()
-        {
-        }
-
-        public RTorrentTorrent(XElement element)
-        {
-            var data = element.Descendants("value").ToList();
-
-            Name = data[0].GetStringValue();
-            Hash = data[1].GetStringValue();
-            Path = data[2].GetStringValue();
-            Category = HttpUtility.UrlDecode(data[3].GetStringValue());
-            TotalSize = data[4].GetLongValue();
-            RemainingSize = data[5].GetLongValue();
-            DownRate = data[6].GetLongValue();
-            Ratio = data[7].GetLongValue();
-            IsOpen = Convert.ToBoolean(data[8].GetLongValue());
-            IsActive = Convert.ToBoolean(data[9].GetLongValue());
-            IsFinished = Convert.ToBoolean(data[10].GetLongValue());
-            FinishedTime = data[11].GetLongValue();
-        }
-
         public string Name { get; set; }
         public string Hash { get; set; }
         public string Path { get; set; }

src/NzbDrone.Core/Download/Clients/uTorrent/UTorrentProxy.cs

@@ -196,7 +196,7 @@ namespace NzbDrone.Core.Download.Clients.UTorrent
                 .Accept(HttpAccept.Json);
 
             requestBuilder.LogResponseContent = true;
-            requestBuilder.NetworkCredential = new BasicNetworkCredential(settings.Username, settings.Password);
+            requestBuilder.NetworkCredential = new NetworkCredential(settings.Username, settings.Password);
 
             return requestBuilder;
         }

src/NzbDrone.Core/Download/Clients/uTorrent/UTorrentSettings.cs

@@ -46,10 +46,10 @@ namespace NzbDrone.Core.Download.Clients.UTorrent
         [FieldDefinition(5, Label = "Password", Type = FieldType.Password, Privacy = PrivacyLevel.Password)]
         public string Password { get; set; }
 
-        [FieldDefinition(6, Label = "Category", Type = FieldType.Textbox, HelpText = "Adding a category specific to Radarr avoids conflicts with unrelated non-Radarr downloads. Using a category is optional, but strongly recommended.")]
+        [FieldDefinition(6, Label = "Category", Type = FieldType.Textbox, HelpText = "Adding a category specific to Radarr avoids conflicts with unrelated downloads, but it's optional")]
         public string MovieCategory { get; set; }
 
-        [FieldDefinition(7, Label = "Post-Import Category", Type = FieldType.Textbox, Advanced = true, HelpText = "Category for Radarr to set after it has imported the download. Radarr will not remove the torrent if seeding has finished. Leave blank to keep same category.")]
+        [FieldDefinition(7, Label = "Post-Import Category", Type = FieldType.Textbox, Advanced = true, HelpText = "Category for Radarr to set after it has imported the download. Sonarr will not remove the torrent if seeding has finished. Leave blank to keep same category.")]
         public string MovieImportedCategory { get; set; }
 
         [FieldDefinition(8, Label = "Recent Priority", Type = FieldType.Select, SelectOptions = typeof(UTorrentPriority), HelpText = "Priority to use when grabbing movies that aired within the last 21 days")]

src/NzbDrone.Core/Download/Extensions/XmlExtensions.cs

@@ -1,55 +0,0 @@
-using System.Linq;
-using System.Xml.Linq;
-using System.Xml.XPath;
-
-namespace NzbDrone.Core.Download.Extensions
-{
-    internal static class XmlExtensions
-    {
-        public static string GetStringValue(this XElement element)
-        {
-            return element.ElementAsString("string");
-        }
-
-        public static long GetLongValue(this XElement element)
-        {
-            return element.ElementAsLong("i8");
-        }
-
-        public static int GetIntValue(this XElement element)
-        {
-            return element.ElementAsInt("i4");
-        }
-
-        public static string ElementAsString(this XElement element, XName name, bool trim = false)
-        {
-            var el = element.Element(name);
-
-            return string.IsNullOrWhiteSpace(el?.Value)
-                ? null
-                : (trim ? el.Value.Trim() : el.Value);
-        }
-
-        public static long ElementAsLong(this XElement element, XName name)
-        {
-            var el = element.Element(name);
-            return long.TryParse(el?.Value, out long value) ? value : default;
-        }
-
-        public static int ElementAsInt(this XElement element, XName name)
-        {
-            var el = element.Element(name);
-            return int.TryParse(el?.Value, out int value) ? value : default(int);
-        }
-
-        public static int GetIntResponse(this XDocument document)
-        {
-            return document.XPathSelectElement("./methodResponse/params/param/value").GetIntValue();
-        }
-
-        public static string GetStringResponse(this XDocument document)
-        {
-            return document.XPathSelectElement("./methodResponse/params/param/value").GetStringValue();
-        }
-    }
-}