Fixed: Report certificate validation failures when configuring Plex Media Server connection

Closes #6797

(cherry picked from commit ec62884649f7af5f0a29346741754590e6de99ce)

frontend/src/Activity/Blocklist/Blocklist.js

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

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

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

frontend/src/AddMovie/AddNewMovie/AddNewMovie.js

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

frontend/src/AddMovie/AddNewMovie/AddNewMovieSearchResult.js

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

frontend/src/Calendar/Events/CalendarEvent.js

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

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

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

frontend/src/Components/Form/AvailabilitySelectInput.js

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

frontend/src/Components/Form/DownloadClientSelectInputConnector.js

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

frontend/src/Components/Form/FormInputGroup.js

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

frontend/src/Components/HeartRating.css

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

frontend/src/Components/ImdbRating.css

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

frontend/src/Components/RottenTomatoRating.css

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

frontend/src/Components/RottenTomatoRating.js

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

frontend/src/Components/TmdbRating.css

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

frontend/src/Components/TmdbRating.js

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

frontend/src/DiscoverMovie/Overview/DiscoverMovieOverviewInfo.js

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

frontend/src/DiscoverMovie/Posters/DiscoverMoviePosterInfo.js

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

frontend/src/DiscoverMovie/Table/DiscoverMovieRow.js

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

frontend/src/Helpers/Props/inputTypes.js

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

frontend/src/InteractiveImport/Interactive/InteractiveImportModalContent.js

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

frontend/src/InteractiveImport/Interactive/InteractiveImportModalContentConnector.js

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

frontend/src/InteractiveImport/Interactive/InteractiveImportRow.js

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

frontend/src/InteractiveImport/Language/SelectLanguageModalContent.js

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

frontend/src/InteractiveImport/ReleaseGroup/SelectReleaseGroupModal.js

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

frontend/src/InteractiveImport/ReleaseGroup/SelectReleaseGroupModalContent.js

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

frontend/src/InteractiveImport/ReleaseGroup/SelectReleaseGroupModalContentConnector.js

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

frontend/src/Movie/Delete/DeleteMovieModalContent.js

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

frontend/src/Movie/Details/MovieDetails.css

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

frontend/src/Movie/Details/MovieDetails.js

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

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

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

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

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

frontend/src/Movie/MovieStatus.js

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

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

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

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

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

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

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

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

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

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

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

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

@@ -13,9 +13,9 @@ import ModalFooter from 'Components/Modal/ModalFooter';
 import ModalHeader from 'Components/Modal/ModalHeader';
 import { inputTypes, kinds } from 'Helpers/Props';
 import translate from 'Utilities/String/translate';
-import styles from './EditImportExclusionModalContent.css';
+import styles from './EditImportListExclusionModalContent.css';
 
-function EditImportExclusionModalContent(props) {
+function EditImportListExclusionModalContent(props) {
   const {
     id,
     isFetching,
@@ -130,7 +130,7 @@ function EditImportExclusionModalContent(props) {
   );
 }
 
-EditImportExclusionModalContent.propTypes = {
+EditImportListExclusionModalContent.propTypes = {
   id: PropTypes.number,
   isFetching: PropTypes.bool.isRequired,
   error: PropTypes.object,
@@ -143,4 +143,4 @@ EditImportExclusionModalContent.propTypes = {
   onDeleteImportExclusionPress: PropTypes.func
 };
 
-export default EditImportExclusionModalContent;
+export default EditImportListExclusionModalContent;

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

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

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

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

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

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

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

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

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

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

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

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

frontend/src/Settings/ImportLists/ImportListSettings.js

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -14,7 +14,6 @@ function createRemoveItemHandler(section, url) {
 
     const ajaxOptions = {
       url: `${url}/${id}?${$.param(queryParams, true)}`,
-      dataType: 'text',
       method: 'DELETE'
     };
 

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

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

frontend/src/Store/Actions/discoverMovieActions.js

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

frontend/src/Store/Actions/interactiveImportActions.js

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

frontend/src/Store/Actions/movieActions.js

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

frontend/src/Store/Actions/movieIndexActions.js

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

frontend/src/Store/Actions/queueActions.js

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

frontend/src/Store/Middleware/createSentryMiddleware.js

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

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

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

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

@@ -146,7 +146,7 @@ namespace NzbDrone.Common.Test.Http
             var request = new HttpRequest($"https://expired.badssl.com");
 
             Assert.Throws<HttpRequestException>(() => Subject.Execute(request));
-            ExceptionVerification.ExpectedErrors(2);
+            ExceptionVerification.ExpectedErrors(1);
         }
 
         [Test]

src/NzbDrone.Common/EnvironmentInfo/RuntimeInfo.cs

@@ -14,7 +14,7 @@ namespace NzbDrone.Common.EnvironmentInfo
         private readonly Logger _logger;
         private readonly DateTime _startTime = DateTime.UtcNow;
 
-        public RuntimeInfo(IHostLifetime hostLifetime, Logger logger)
+        public RuntimeInfo(Logger logger, IHostLifetime hostLifetime = null)
         {
             _logger = logger;
 

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

@@ -26,20 +26,17 @@ namespace NzbDrone.Common.Http.Dispatchers
         private readonly ICertificateValidationService _certificateValidationService;
         private readonly IUserAgentBuilder _userAgentBuilder;
         private readonly ICached<System.Net.Http.HttpClient> _httpClientCache;
-        private readonly Logger _logger;
 
         public ManagedHttpDispatcher(IHttpProxySettingsProvider proxySettingsProvider,
             ICreateManagedWebProxy createManagedWebProxy,
             ICertificateValidationService certificateValidationService,
             IUserAgentBuilder userAgentBuilder,
-            ICacheManager cacheManager,
-            Logger logger)
+            ICacheManager cacheManager)
         {
             _proxySettingsProvider = proxySettingsProvider;
             _createManagedWebProxy = createManagedWebProxy;
             _certificateValidationService = certificateValidationService;
             _userAgentBuilder = userAgentBuilder;
-            _logger = logger;
 
             _httpClientCache = cacheManager.GetCache<System.Net.Http.HttpClient>(typeof(ManagedHttpDispatcher));
         }
@@ -79,49 +76,32 @@ namespace NzbDrone.Common.Http.Dispatchers
 
             var httpClient = GetClient(request.Url);
 
-            HttpResponseMessage responseMessage;
-
-            try
+            using var responseMessage = httpClient.Send(requestMessage, HttpCompletionOption.ResponseHeadersRead, cts.Token);
             {
-                responseMessage = httpClient.Send(requestMessage, cts.Token);
-            }
-            catch (HttpRequestException e)
-            {
-                _logger.Error(e, "HttpClient error");
-                throw;
-            }
+                byte[] data = null;
 
-            byte[] data = null;
-
-            using (var responseStream = responseMessage.Content.ReadAsStream())
-            {
-                if (responseStream != null && responseStream != Stream.Null)
+                try
                 {
-                    try
+                    if (request.ResponseStream != null && responseMessage.StatusCode == HttpStatusCode.OK)
                     {
-                        if (request.ResponseStream != null && responseMessage.StatusCode == HttpStatusCode.OK)
-                        {
-                            // A target ResponseStream was specified, write to that instead.
-                            // But only on the OK status code, since we don't want to write failures and redirects.
-                            responseStream.CopyTo(request.ResponseStream);
-                        }
-                        else
-                        {
-                            data = responseStream.ToBytes();
-                        }
+                        responseMessage.Content.CopyTo(request.ResponseStream, null, cts.Token);
                     }
-                    catch (Exception ex)
+                    else
                     {
-                        throw new WebException("Failed to read complete http response", ex, WebExceptionStatus.ReceiveFailure, null);
+                        data = responseMessage.Content.ReadAsByteArrayAsync(cts.Token).GetAwaiter().GetResult();
                     }
                 }
+                catch (Exception ex)
+                {
+                    throw new WebException("Failed to read complete http response", ex, WebExceptionStatus.ReceiveFailure, null);
+                }
+
+                var headers = responseMessage.Headers.ToNameValueCollection();
+
+                headers.Add(responseMessage.Content.Headers.ToNameValueCollection());
+
+                return new HttpResponse(request, new HttpHeader(headers), data, responseMessage.StatusCode);
             }
-
-            var headers = responseMessage.Headers.ToNameValueCollection();
-
-            headers.Add(responseMessage.Content.Headers.ToNameValueCollection());
-
-            return new HttpResponse(request, new HttpHeader(headers), data, responseMessage.StatusCode);
         }
 
         protected virtual System.Net.Http.HttpClient GetClient(HttpUri uri)

src/NzbDrone.Common/Instrumentation/NzbDroneLogger.cs

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

src/NzbDrone.Core.Test/Datastore/Migration/201_migrate_discord_from_slackFixture.cs

@@ -0,0 +1,71 @@
+using System.Linq;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using FluentAssertions;
+using NUnit.Framework;
+using NzbDrone.Common.Serializer;
+using NzbDrone.Core.Datastore.Migration;
+using NzbDrone.Core.Test.Framework;
+
+namespace NzbDrone.Core.Test.Datastore.Migration
+{
+    [TestFixture]
+    public class migrate_discord_from_slackFixture : MigrationTest<migrate_discord_from_slack>
+    {
+        private readonly JsonSerializerOptions _serializerSettings;
+
+        public migrate_discord_from_slackFixture()
+        {
+            _serializerSettings = new JsonSerializerOptions
+            {
+                AllowTrailingCommas = true,
+                DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingDefault,
+                PropertyNameCaseInsensitive = true,
+                DictionaryKeyPolicy = JsonNamingPolicy.CamelCase,
+                PropertyNamingPolicy = JsonNamingPolicy.CamelCase,
+                WriteIndented = true
+            };
+
+            _serializerSettings.Converters.Add(new JsonStringEnumConverter(JsonNamingPolicy.CamelCase, true));
+        }
+
+        [Test]
+        public void should_replace_old_url()
+        {
+            var webhookUrl = "https://discord.com/api/webhooks/922499153416847361/f9CAcD5i_E_-0AoPfMVa8igVK8h271HpJDbd6euUrPh9KonWlMCziLOSMmD-2SQ4CHmX/slack";
+            var db = WithMigrationTestDb(c =>
+            {
+                c.Insert.IntoTable("Notifications").Row(new
+                {
+                    Name = "SlackDiscord",
+                    Implementation = "Slack",
+                    Settings = new SlackNotificationSettings201
+                    {
+                        Icon = "TestURL",
+                        Username = "TestUsername",
+                        WebHookUrl = webhookUrl
+                    }.ToJson(),
+                    ConfigContract = "SlackSettings",
+                    OnGrab = true,
+                    OnDownload = true,
+                    OnUpgrade = true,
+                    OnRename = true,
+                    OnHealthIssue = true,
+                    OnMovieDelete = true,
+                    OnMovieFileDelete = true,
+                    OnMovieFileDeleteForUpgrade = true,
+                    IncludeHealthWarnings = true
+                });
+            });
+
+            var items = db.Query<NotificationEntity201>("SELECT Id,ConfigContract,Implementation,Name,Settings FROM Notifications");
+
+            items.Should().HaveCount(1);
+            items.First().ConfigContract.Should().Be("DiscordSettings");
+            var settings = JsonSerializer.Deserialize<DiscordNotificationSettings201>(items.First().Settings, _serializerSettings);
+            settings.Avatar.Should().Be("TestURL");
+            settings.Username.Should().Be("TestUsername");
+            settings.WebHookUrl.Should().Be(webhookUrl.Replace("/slack", ""));
+        }
+    }
+}

src/NzbDrone.Core.Test/Datastore/Migration/202_remove_predbFixture.cs

@@ -0,0 +1,91 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using FluentAssertions;
+using Newtonsoft.Json.Linq;
+using NUnit.Framework;
+using NzbDrone.Common.Serializer;
+using NzbDrone.Core.Datastore.Migration;
+using NzbDrone.Core.Test.Framework;
+
+namespace NzbDrone.Core.Test.Datastore.Migration
+{
+    [TestFixture]
+    public class remove_predbFixture : MigrationTest<remove_predb>
+    {
+        [Test]
+        public void should_change_min_avail_from_predb_on_list()
+        {
+            var db = WithMigrationTestDb(c =>
+            {
+                c.Insert.IntoTable("ImportLists").Row(new
+                {
+                    Enabled = 1,
+                    EnableAuto = 1,
+                    RootFolderPath = "D:\\Movies",
+                    ProfileId = 1,
+                    MinimumAvailability = 4,
+                    ShouldMonitor = 1,
+                    Name = "IMDB List",
+                    Implementation = "RadarrLists",
+                    Settings = new RadarrListSettings169
+                    {
+                        APIURL = "https://api.radarr.video/v2",
+                        Path = "/imdb/list?listId=ls000199717",
+                    }.ToJson(),
+                    ConfigContract = "RadarrSettings"
+                });
+            });
+
+            var items = db.Query<ListDefinition201>("SELECT Id, MinimumAvailability FROM ImportLists");
+
+            items.Should().HaveCount(1);
+            items.First().MinimumAvailability.Should().Be(3);
+        }
+
+        [Test]
+        public void should_change_min_avail_from_predb_on_movie()
+        {
+            var db = WithMigrationTestDb(c =>
+            {
+                c.Insert.IntoTable("Movies").Row(new
+                {
+                    Monitored = true,
+                    Title = "Title",
+                    CleanTitle = "CleanTitle",
+                    Status = 3,
+                    MinimumAvailability = 4,
+                    Images = new[] { new { CoverType = "Poster" } }.ToJson(),
+                    Recommendations = new[] { 1 }.ToJson(),
+                    HasPreDBEntry = false,
+                    Runtime = 90,
+                    OriginalLanguage = 1,
+                    ProfileId = 1,
+                    MovieFileId = 0,
+                    Path = string.Format("/Movies/{0}", "Title"),
+                    TitleSlug = 123456,
+                    TmdbId = 132456,
+                    Added = DateTime.UtcNow,
+                    LastInfoSync = DateTime.UtcNow,
+                });
+            });
+
+            var items = db.Query<Movie201>("SELECT Id, MinimumAvailability FROM Movies");
+
+            items.Should().HaveCount(1);
+            items.First().MinimumAvailability.Should().Be(3);
+        }
+    }
+
+    public class ListDefinition201
+    {
+        public int Id { get; set; }
+        public int MinimumAvailability { get; set; }
+    }
+
+    public class Movie201
+    {
+        public int Id { get; set; }
+        public int MinimumAvailability { get; set; }
+    }
+}

src/NzbDrone.Core.Test/Datastore/SqliteSchemaDumperTests/SqliteSchemaDumperFixture.cs

@@ -1,4 +1,4 @@
-using System.Data;
+using System.Data;
 using System.Linq;
 using FluentAssertions;
 using NUnit.Framework;
@@ -38,6 +38,7 @@ namespace NzbDrone.Core.Test.Datastore.SqliteSchemaDumperTests
             result.Name.Should().Be(tableName);
             result.Columns.Count.Should().Be(1);
             result.Columns.First().Name.Should().Be(columnName);
+            result.Columns.First().IsIdentity.Should().BeTrue();
         }
 
         [TestCase(@"CREATE INDEX TestIndex ON TestTable (MyId)", "TestIndex", "TestTable", "MyId")]

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

@@ -1,10 +1,11 @@
-using System;
+using System;
 using System.Collections.Generic;
 using FizzWare.NBuilder;
 using FluentAssertions;
 using Moq;
 using NUnit.Framework;
 using NzbDrone.Core.Download;
+using NzbDrone.Core.Download.Clients;
 using NzbDrone.Core.Indexers;
 using NzbDrone.Core.Test.Framework;
 
@@ -67,6 +68,17 @@ namespace NzbDrone.Core.Test.Download
             return mock;
         }
 
+        private void WithTorrentIndexer(int downloadClientId)
+        {
+            Mocker.GetMock<IIndexerFactory>()
+                .Setup(v => v.Find(It.IsAny<int>()))
+                .Returns(Builder<IndexerDefinition>
+                    .CreateNew()
+                    .With(v => v.Id = _nextId++)
+                    .With(v => v.DownloadClientId = downloadClientId)
+                    .Build());
+        }
+
         private void GivenBlockedClient(int id)
         {
             _blockedProviders.Add(new DownloadClientStatus
@@ -223,5 +235,39 @@ namespace NzbDrone.Core.Test.Download
             client3.Definition.Id.Should().Be(2);
             client4.Definition.Id.Should().Be(3);
         }
+
+        [Test]
+        public void should_always_choose_indexer_client()
+        {
+            WithUsenetClient();
+            WithTorrentClient();
+            WithTorrentClient();
+            WithTorrentClient();
+            WithTorrentIndexer(3);
+
+            var client1 = Subject.GetDownloadClient(DownloadProtocol.Torrent, 1);
+            var client2 = Subject.GetDownloadClient(DownloadProtocol.Torrent, 1);
+            var client3 = Subject.GetDownloadClient(DownloadProtocol.Torrent, 1);
+            var client4 = Subject.GetDownloadClient(DownloadProtocol.Torrent, 1);
+            var client5 = Subject.GetDownloadClient(DownloadProtocol.Torrent, 1);
+
+            client1.Definition.Id.Should().Be(3);
+            client2.Definition.Id.Should().Be(3);
+            client3.Definition.Id.Should().Be(3);
+            client4.Definition.Id.Should().Be(3);
+            client5.Definition.Id.Should().Be(3);
+        }
+
+        [Test]
+        public void should_fail_to_choose_client_when_indexer_reference_does_not_exist()
+        {
+            WithUsenetClient();
+            WithTorrentClient();
+            WithTorrentClient();
+            WithTorrentClient();
+            WithTorrentIndexer(5);
+
+            Assert.Throws<DownloadClientUnavailableException>(() => Subject.GetDownloadClient(DownloadProtocol.Torrent, 1));
+        }
     }
 }

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

@@ -31,8 +31,8 @@ namespace NzbDrone.Core.Test.Download
                 .Returns(_downloadClients);
 
             Mocker.GetMock<IProvideDownloadClient>()
-                .Setup(v => v.GetDownloadClient(It.IsAny<DownloadProtocol>()))
-                .Returns<DownloadProtocol>(v => _downloadClients.FirstOrDefault(d => d.Protocol == v));
+                .Setup(v => v.GetDownloadClient(It.IsAny<DownloadProtocol>(), It.IsAny<int>()))
+                .Returns<DownloadProtocol, int>((v, i) => _downloadClients.FirstOrDefault(d => d.Protocol == v));
 
             var releaseInfo = Builder<ReleaseInfo>.CreateNew()
                 .With(v => v.DownloadProtocol = DownloadProtocol.Usenet)

src/NzbDrone.Core.Test/Framework/CoreTest.cs

@@ -27,7 +27,7 @@ namespace NzbDrone.Core.Test.Framework
             Mocker.SetConstant<IHttpProxySettingsProvider>(new HttpProxySettingsProvider(Mocker.Resolve<ConfigService>()));
             Mocker.SetConstant<ICreateManagedWebProxy>(new ManagedWebProxyFactory(Mocker.Resolve<CacheManager>()));
             Mocker.SetConstant<ICertificateValidationService>(new X509CertificateValidationService(Mocker.Resolve<ConfigService>(), TestLogger));
-            Mocker.SetConstant<IHttpDispatcher>(new ManagedHttpDispatcher(Mocker.Resolve<IHttpProxySettingsProvider>(), Mocker.Resolve<ICreateManagedWebProxy>(), Mocker.Resolve<ICertificateValidationService>(), Mocker.Resolve<UserAgentBuilder>(), Mocker.Resolve<CacheManager>(), TestLogger));
+            Mocker.SetConstant<IHttpDispatcher>(new ManagedHttpDispatcher(Mocker.Resolve<IHttpProxySettingsProvider>(), Mocker.Resolve<ICreateManagedWebProxy>(), Mocker.Resolve<ICertificateValidationService>(), Mocker.Resolve<UserAgentBuilder>(), Mocker.Resolve<CacheManager>()));
             Mocker.SetConstant<IHttpClient>(new HttpClient(Array.Empty<IHttpRequestInterceptor>(), Mocker.Resolve<CacheManager>(), Mocker.Resolve<RateLimitService>(), Mocker.Resolve<IHttpDispatcher>(), TestLogger));
             Mocker.SetConstant<IRadarrCloudRequestBuilder>(new RadarrCloudRequestBuilder());
         }

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

@@ -0,0 +1,74 @@
+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/HealthCheckServiceFixture.cs

@@ -19,6 +19,10 @@ namespace NzbDrone.Core.Test.HealthCheck
 
             Mocker.SetConstant<IEnumerable<IProvideHealthCheck>>(new[] { _healthCheck });
             Mocker.SetConstant<ICacheManager>(Mocker.Resolve<CacheManager>());
+
+            Mocker.GetMock<IServerSideNotificationService>()
+                .Setup(v => v.GetServerChecks())
+                .Returns(new List<Core.HealthCheck.HealthCheck>());
         }
 
         [Test]

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

@@ -204,5 +204,48 @@ namespace NzbDrone.Core.Test.IndexerTests.NewznabTests
             pageTier2.Url.Query.Should().NotContain("imdbid=0076759");
             pageTier2.Url.Query.Should().Contain("q=");
         }
+
+        [Test]
+        public void should_encode_raw_title()
+        {
+            _capabilities.SupportedMovieSearchParameters = new[] { "q" };
+            _capabilities.TextSearchEngine = "raw";
+
+            MovieSearchCriteria movieRawSearchCriteria = new MovieSearchCriteria
+            {
+                Movie = new Movies.Movie { Title = "Some Movie & Title: Words", Year = 2021, TmdbId = 123 },
+                SceneTitles = new List<string> { "Some Movie & Title: Words" }
+            };
+
+            var results = Subject.GetSearchRequests(movieRawSearchCriteria);
+
+            var page = results.GetTier(0).First().First();
+
+            page.Url.Query.Should().Contain("q=Some%20Movie%20%26%20Title%3A%20Words");
+            page.Url.Query.Should().NotContain(" & ");
+            page.Url.Query.Should().Contain("%26");
+        }
+
+        [Test]
+        public void should_use_clean_title_and_encode()
+        {
+            _capabilities.SupportedMovieSearchParameters = new[] { "q" };
+            _capabilities.TextSearchEngine = "sphinx";
+
+            MovieSearchCriteria movieRawSearchCriteria = new MovieSearchCriteria
+            {
+                Movie = new Movies.Movie { Title = "Some Movie & Title: Words", Year = 2021, TmdbId = 123 },
+                SceneTitles = new List<string> { "Some Movie & Title: Words" }
+            };
+
+            var results = Subject.GetSearchRequests(movieRawSearchCriteria);
+
+            var page = results.GetTier(0).First().First();
+
+            page.Url.Query.Should().Contain("q=Some%20Movie%20and%20Title%20Words%202021");
+            page.Url.Query.Should().Contain("and");
+            page.Url.Query.Should().NotContain(" & ");
+            page.Url.Query.Should().NotContain("%26");
+        }
     }
 }

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

@@ -1,7 +1,10 @@
 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;
@@ -10,6 +13,7 @@ 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
 {
@@ -31,7 +35,11 @@ namespace NzbDrone.Core.Test.IndexerTests.TorznabTests
                 }
             };
 
-            _caps = new NewznabCapabilities();
+            _caps = new NewznabCapabilities
+            {
+                Categories = Builder<NewznabCategory>.CreateListOfSize(1).All().With(t => t.Id = 1).Build().ToList()
+            };
+
             Mocker.GetMock<INewznabCapabilitiesProvider>()
                 .Setup(v => v.GetCapabilities(It.IsAny<NewznabSettings>()))
                 .Returns(_caps);
@@ -134,5 +142,50 @@ 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/Languages/LanguageFixture.cs

@@ -43,7 +43,10 @@ namespace NzbDrone.Core.Test.Languages
                 new object[] { 28, Language.Thai },
                 new object[] { 29, Language.Bulgarian },
                 new object[] { 30, Language.PortugueseBR },
-                new object[] { 31, Language.Arabic }
+                new object[] { 31, Language.Arabic },
+                new object[] { 32, Language.Ukrainian },
+                new object[] { 33, Language.Persian },
+                new object[] { 34, Language.Bengali },
             };
 
         public static object[] ToIntCases =
@@ -81,7 +84,10 @@ namespace NzbDrone.Core.Test.Languages
                 new object[] { Language.Thai, 28 },
                 new object[] { Language.Bulgarian, 29 },
                 new object[] { Language.PortugueseBR, 30 },
-                new object[] { Language.Arabic, 31 }
+                new object[] { Language.Arabic, 31 },
+                new object[] { Language.Ukrainian, 32 },
+                new object[] { Language.Persian, 33 },
+                new object[] { Language.Bengali, 34 },
             };
 
         [Test]

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

@@ -20,6 +20,9 @@ namespace NzbDrone.Core.Test.MediaFiles.MediaInfo.MediaInfoFormatterTests
         [TestCase("wmv2, WMV2", "Droned.wmv", "WMV")]
         [TestCase("mpeg4, XVID", "", "XviD")]
         [TestCase("mpeg4, DIV3", "spsm.dvdrip.divx.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", "Sweet Seymour.avi", "VP7")]
         [TestCase("vp8, V_VP8", "Dick.mkv", "VP8")]

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

@@ -0,0 +1,31 @@
+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,24 +102,38 @@ namespace NzbDrone.Core.Test.MediaFiles.MediaInfo
             info.VideoTransferCharacteristics.Should().Be("bt709");
         }
 
-        [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)
+        [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)
         {
             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/NotificationTests/NotificationBaseFixture.cs

@@ -78,6 +78,11 @@ namespace NzbDrone.Core.Test.NotificationTests
             {
                 TestLogger.Info("OnHealthIssue was called");
             }
+
+            public override void OnApplicationUpdate(ApplicationUpdateMessage updateMessage)
+            {
+                TestLogger.Info("OnApplicationUpdate was called");
+            }
         }
 
         private class TestNotificationWithNoEvents : NotificationBase<TestSetting>
@@ -116,6 +121,7 @@ namespace NzbDrone.Core.Test.NotificationTests
             notification.SupportsOnMovieFileDelete.Should().BeTrue();
             notification.SupportsOnMovieFileDeleteForUpgrade.Should().BeTrue();
             notification.SupportsOnHealthIssue.Should().BeTrue();
+            notification.SupportsOnApplicationUpdate.Should().BeTrue();
         }
 
         [Test]
@@ -131,6 +137,7 @@ namespace NzbDrone.Core.Test.NotificationTests
             notification.SupportsOnMovieFileDelete.Should().BeFalse();
             notification.SupportsOnMovieFileDeleteForUpgrade.Should().BeFalse();
             notification.SupportsOnHealthIssue.Should().BeFalse();
+            notification.SupportsOnApplicationUpdate.Should().BeFalse();
         }
     }
 }

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

@@ -51,15 +51,6 @@ namespace NzbDrone.Core.Test.ParserTests
             result.Languages.Should().Contain(Language.English);
         }
 
-        [TestCase("Movie.Title.1982.Ger.Eng.AC3.DL.BDRip.x264-iNCEPTiON")]
-        public void should_parse_language_english_german(string postTitle)
-        {
-            var result = Parser.Parser.ParseMovieTitle(postTitle, true);
-
-            result.Languages.Should().Contain(Language.German);
-            result.Languages.Should().Contain(Language.English);
-        }
-
         [TestCase("Movie.Title.1994.Spanish.1080p.XviD-LOL")]
         [TestCase("Movie Title (2020)[BDRemux AVC 1080p][E-AC3 DD Plus 5.1 Castellano-Inglés Subs]")]
         [TestCase("Movie Title (2020) [UHDRemux2160p HDR][DTS-HD MA 5.1 AC3 5.1 Castellano - True-HD 7.1 Atmos Inglés Subs]")]
@@ -72,6 +63,7 @@ namespace NzbDrone.Core.Test.ParserTests
         }
 
         [TestCase("Movie.Title.1994.German.1080p.XviD-LOL")]
+        [TestCase("Movie.Title.2016.Ger.Dub.AAC.1080p.WebDL.x264-TKP21")]
         public void should_parse_language_german(string postTitle)
         {
             var result = Parser.Parser.ParseMovieTitle(postTitle, true);
@@ -161,6 +153,7 @@ namespace NzbDrone.Core.Test.ParserTests
 
         [TestCase("Movie.Title.1994.Bulgarian.1080p.XviD-LOL")]
         [TestCase("Movie.Title.1994.BGAUDIO.1080p.XviD-LOL")]
+        [TestCase("Movie.Title.1994.BG.AUDIO.1080p.XviD-LOL")]
         public void should_parse_language_bulgarian(string postTitle)
         {
             var result = Parser.Parser.ParseMovieTitle(postTitle, true);
@@ -314,6 +307,40 @@ namespace NzbDrone.Core.Test.ParserTests
             result.Languages.Should().BeEquivalentTo(Language.Arabic);
         }
 
+        [TestCase("Movie.Title [1989, BDRip] MVO + DVO + UKR (MVO) + Sub")]
+        [TestCase("Movie.Title (2006) BDRemux 1080p 2xUkr | Sub Ukr")]
+        [TestCase("Movie.Title [1984, BDRip 720p] MVO + MVO + Dub + AVO + 3xUkr")]
+        [TestCase("Movie.Title.2019.UKRAINIAN.WEBRip.x264-VXT")]
+        public void should_parse_language_ukrainian(string postTitle)
+        {
+            var result = Parser.Parser.ParseMovieTitle(postTitle, true);
+
+            result.Languages.Should().BeEquivalentTo(Language.Ukrainian);
+        }
+
+        [TestCase("Movie.Title [1937, BDRip 1080p] Dub UKR/Eng + Sub rus")]
+        [TestCase("Movie.Title.[2003.BDRemux.1080p].Dub.MVO.(2xUkr/Fra).Sub.(Rus/Fra)")]
+        public void should_parse_language_ukrainian_multi(string postTitle)
+        {
+            var result = Parser.Parser.ParseMovieTitle(postTitle, true);
+
+            result.Languages.Should().Contain(Language.Ukrainian);
+        }
+
+        [TestCase("Movie.Title.2019.PERSIAN.WEBRip.x264-VXT")]
+        public void should_parse_language_persian(string postTitle)
+        {
+            var result = Parser.Parser.ParseMovieTitle(postTitle);
+            result.Languages.Should().BeEquivalentTo(Language.Persian);
+        }
+
+        [TestCase("Movie.Title.2019.BENGALI.WEBRip.x264-VXT")]
+        public void should_parse_language_bengali(string postTitle)
+        {
+            var result = Parser.Parser.ParseMovieTitle(postTitle);
+            result.Languages.Should().BeEquivalentTo(Language.Bengali);
+        }
+
         [TestCase("Movie.Title.en.sub")]
         [TestCase("Movie Title.eng.sub")]
         [TestCase("Movie.Title.eng.forced.sub")]

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

@@ -23,6 +23,7 @@ namespace NzbDrone.Core.Test.ParserTests
          * Superman.-.The.Man.of.Steel.1994-06.34.hybrid.DreamGirl-Novus-HD
          * Superman.-.The.Man.of.Steel.1994-05.33.hybrid.DreamGirl-Novus-HD
          * Constantine S1-E1-WEB-DL-1080p-NZBgeek
+         * [TestCase("Valana la Movie FRENCH BluRay 720p 2016 kjhlj", "Valana la Movie")]  Removed 2021-12-19 as this / the regex for this was breaking all movies w/ french in title
          */
 
         [Test]
@@ -49,7 +50,6 @@ namespace NzbDrone.Core.Test.ParserTests
         [TestCase("Movie.The.Final.Chapter.2016", "Movie The Final Chapter")]
         [TestCase("Der.Movie.James.German.Bluray.FuckYou.Pso.Why.cant.you.follow.scene.rules.1998", "Der Movie James")]
         [TestCase("Movie.German.DL.AC3.Dubbed..BluRay.x264-PsO", "Movie")]
-        [TestCase("Valana la Movie FRENCH BluRay 720p 2016 kjhlj", "Valana la Movie")]
         [TestCase("Valana la Movie TRUEFRENCH BluRay 720p 2016 kjhlj", "Valana la Movie")]
         [TestCase("Mission Movie: Rogue Movie (2015)<29>[XviD - Ita Ac3 - SoftSub Ita]azione, spionaggio, thriller *Prima Visione* Team mulnic Tom Cruise", "Mission Movie Rogue Movie")]
         [TestCase("Movie.Movie.2000.FRENCH..BluRay.-AiRLiNE", "Movie Movie")]
@@ -61,6 +61,7 @@ namespace NzbDrone.Core.Test.ParserTests
         [TestCase("World.Movie.Z.2.EXTENDED.2013.German.DL.1080p.BluRay.AVC-XANOR", "World Movie Z 2")]
         [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")]
         public void should_parse_movie_title(string postTitle, string title)
         {
             Parser.Parser.ParseMovieTitle(postTitle).PrimaryMovieTitle.Should().Be(title);
@@ -199,6 +200,7 @@ namespace NzbDrone.Core.Test.ParserTests
         }
 
         [TestCase("The.Italian.Movie.2025.720p.BluRay.X264-AMIABLE")]
+        [TestCase("The.French.Movie.2013.720p.BluRay.x264 - ROUGH[PublicHD]")]
         public void should_not_parse_wrong_language_in_title(string postTitle)
         {
             var parsed = Parser.Parser.ParseMovieTitle(postTitle, true);

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

@@ -119,6 +119,7 @@ namespace NzbDrone.Core.Test.ParserTests
         [TestCase("Movie.Name.S01E08.Tourmaline.Nepal.720p.HDTV.x264-DHD", false)]
         [TestCase("Movie.Name.US.S12E17.HR.WS.PDTV.X264-DIMENSION", false)]
         [TestCase("Movie.Name.The.Lost.Pilots.Movie.HR.WS.PDTV.x264-DHD", false)]
+        [TestCase("Movie.Name.The.Lost.Pilots.Movie.HR.WS.PDTV.x264-DHD-Remux.mkv", false)]
         public void should_parse_hdtv720p_quality(string title, bool proper)
         {
             ParseAndVerifyQuality(title, Source.TV, proper, Resolution.R720p);
@@ -186,6 +187,7 @@ namespace NzbDrone.Core.Test.ParserTests
         [TestCase("[HorribleSubs] Movie Title! 2018 [Web][MKV][h264][1080p][AAC 2.0][Softsubs (HorribleSubs)]", false)]
         [TestCase("Movie.Title.2020.MULTi.1080p.WEB.H264-ALLDAYiN (S:285/L:11)", false)]
         [TestCase("Movie Title (2020) MULTi WEB 1080p x264-JiHEFF (S:317/L:28)", false)]
+        [TestCase("Movie.Titles.2020.1080p.NF.WEB.DD2.0.x264-SNEAkY", false)]
         public void should_parse_webdl1080p_quality(string title, bool proper)
         {
             ParseAndVerifyQuality(title, Source.WEBDL, proper, Resolution.R1080p);
@@ -256,6 +258,7 @@ namespace NzbDrone.Core.Test.ParserTests
         [TestCase("Movie Name 2005 1080p UHD BluRay DD+7.1 x264-LoRD.mkv", false)]
         [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)]
         public void should_parse_bluray1080p_quality(string title, bool proper)
         {
             ParseAndVerifyQuality(title, Source.BLURAY, proper, Resolution.R1080p);
@@ -272,6 +275,8 @@ namespace NzbDrone.Core.Test.ParserTests
         [TestCase("Movie.Title.2019.2160p.MBLURAY.x264-MBLURAYFANS.mkv", false)]
         [TestCase("Movie.Title.2017.2160p.MBluRay.x264-TREBLE.mkv", false)]
         [TestCase("Movie.Name.2020.German.UHDBD.2160p.HDR10.HEVC.EAC3.DL-pmHD.mkv", false)]
+        [TestCase("Movie.Title.2014.2160p.UHD.BluRay.X265-IAMABLE.mkv", false)]
+        [TestCase("Movie.Title.2014.2160p.BDRip.AAC.7.1.HDR10.x265.10bit-Markll", false)]
         public void should_parse_bluray2160p_quality(string title, bool proper)
         {
             ParseAndVerifyQuality(title, Source.BLURAY, proper, Resolution.R2160p);
@@ -425,6 +430,8 @@ namespace NzbDrone.Core.Test.ParserTests
         [TestCase("Movie.Title.2016.1080p.KORSUBS.WEBRip.x264.AAC2.0-RADARR", "KORSUBS")]
         [TestCase("Movie Title 2017 HC 720p HDRiP DD5 1 x264-LEGi0N", "Generic Hardcoded Subs")]
         [TestCase("Movie.Title.2017.720p.SUBBED.HDRip.V2.XViD-26k.avi", "Generic Hardcoded Subs")]
+        [TestCase("Movie Title! 2018 [Web][MKV][h264][480p][AAC 2.0][Softsubs]", null)]
+        [TestCase("Movie Title! 2019 [HorribleSubs][Web][MKV][h264][848x480][AAC 2.0][Softsubs(HorribleSubs)]", null)]
         public void should_parse_hardcoded_subs(string postTitle, string sub)
         {
             QualityParser.ParseQuality(postTitle).HardcodedSubs.Should().Be(sub);

src/NzbDrone.Core.Test/UpdateTests/UpdatePackageProviderFixture.cs

@@ -27,7 +27,6 @@ namespace NzbDrone.Core.Test.UpdateTests
         [Test]
         public void finds_update_when_version_lower()
         {
-            NotBsd();
             UseRealHttp();
             Subject.GetLatestUpdate("develop", new Version(3, 0)).Should().NotBeNull();
         }
@@ -43,8 +42,6 @@ namespace NzbDrone.Core.Test.UpdateTests
         [Test]
         public void should_get_recent_updates()
         {
-            NotBsd();
-
             const string branch = "nightly";
             UseRealHttp();
             var recent = Subject.GetRecentUpdates(branch, new Version(3, 0), null);

src/NzbDrone.Core/Datastore/BasicRepository.cs

@@ -17,6 +17,7 @@ namespace NzbDrone.Core.Datastore
         IEnumerable<TModel> All();
         int Count();
         TModel Get(int id);
+        TModel Find(int id);
         TModel Insert(TModel model);
         TModel Update(TModel model);
         TModel Upsert(TModel model);
@@ -99,6 +100,13 @@ namespace NzbDrone.Core.Datastore
             return model;
         }
 
+        public TModel Find(int id)
+        {
+            var model = Query(c => c.Id == id).SingleOrDefault();
+
+            return model;
+        }
+
         public IEnumerable<TModel> Get(IEnumerable<int> ids)
         {
             if (!ids.Any())

src/NzbDrone.Core/Datastore/Migration/133_add_minimumavailability.cs

@@ -1,4 +1,4 @@
-using FluentMigrator;
+using FluentMigrator;
 
 //using FluentMigrator.Expressions;
 using NzbDrone.Core.Datastore.Migration.Framework;
@@ -13,12 +13,12 @@ namespace NzbDrone.Core.Datastore.Migration
         {
             if (!Schema.Schema("dbo").Table("NetImport").Column("MinimumAvailability").Exists())
             {
-                Alter.Table("NetImport").AddColumn("MinimumAvailability").AsInt32().WithDefaultValue(MovieStatusType.PreDB);
+                Alter.Table("NetImport").AddColumn("MinimumAvailability").AsInt32().WithDefaultValue(MovieStatusType.Released);
             }
 
             if (!Schema.Schema("dbo").Table("Movies").Column("MinimumAvailability").Exists())
             {
-                Alter.Table("Movies").AddColumn("MinimumAvailability").AsInt32().WithDefaultValue(MovieStatusType.PreDB);
+                Alter.Table("Movies").AddColumn("MinimumAvailability").AsInt32().WithDefaultValue(MovieStatusType.Released);
             }
         }
     }

src/NzbDrone.Core/Datastore/Migration/177_language_improvements.cs

@@ -47,7 +47,7 @@ namespace NzbDrone.Core.Datastore.Migration
 
             //Manual SQL, Fluent Migrator doesn't support multi-column unique contraint on table creation, SQLite doesn't support adding it after creation
             Execute.Sql("CREATE TABLE MovieTranslations(" +
-                "Id INTEGER PRIMARY KEY, " +
+                "Id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, " +
                 "MovieId INTEGER NOT NULL, " +
                 "Title TEXT, " +
                 "CleanTitle TEXT, " +

src/NzbDrone.Core/Datastore/Migration/201_migrate_discord_from_slack.cs

@@ -0,0 +1,101 @@
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+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(201)]
+    public class migrate_discord_from_slack : NzbDroneMigrationBase
+    {
+        private readonly JsonSerializerOptions _serializerSettings;
+
+        public migrate_discord_from_slack()
+        {
+            _serializerSettings = new JsonSerializerOptions
+            {
+                AllowTrailingCommas = true,
+                DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingDefault,
+                PropertyNameCaseInsensitive = true,
+                DictionaryKeyPolicy = JsonNamingPolicy.CamelCase,
+                PropertyNamingPolicy = JsonNamingPolicy.CamelCase,
+                WriteIndented = true
+            };
+
+            _serializerSettings.Converters.Add(new JsonStringEnumConverter(JsonNamingPolicy.CamelCase, true));
+        }
+
+        protected override void MainDbUpgrade()
+        {
+            Execute.WithConnection(MigrateDiscordFromSlack);
+        }
+
+        private void MigrateDiscordFromSlack(IDbConnection conn, IDbTransaction tran)
+        {
+            var notificationRows = conn.Query<NotificationEntity201>($"SELECT Id,ConfigContract,Implementation,Name,Settings FROM Notifications WHERE Implementation = 'Slack'");
+
+            var discordSlackNotifications = notificationRows.Where(n => JsonSerializer.Deserialize<SlackNotificationSettings201>(n.Settings, _serializerSettings).WebHookUrl.Contains("discord"));
+
+            if (!discordSlackNotifications.Any())
+            {
+                return;
+            }
+
+            foreach (NotificationEntity201 notification in discordSlackNotifications)
+            {
+                SlackNotificationSettings201 settings = JsonSerializer.Deserialize<SlackNotificationSettings201>(notification.Settings, _serializerSettings);
+                DiscordNotificationSettings201 discordSettings = new DiscordNotificationSettings201
+                {
+                    Avatar = settings.Icon,
+                    GrabFields = new List<int> { 0, 1, 2, 3, 5, 6, 7, 8, 9 },
+                    ImportFields = new List<int> { 0, 1, 2, 3, 4, 6, 7, 8, 9, 10, 11, 12 },
+                    Username = settings.Username,
+                    WebHookUrl = settings.WebHookUrl.Replace("/slack", "")
+                };
+
+                notification.ConfigContract = "DiscordSettings";
+                notification.Implementation = "Discord";
+                notification.Name = $"{notification.Name}-Slack_Migrated";
+                notification.Settings = JsonSerializer.Serialize(discordSettings, _serializerSettings);
+            }
+
+            var updateSql = "UPDATE Notifications SET ConfigContract = @ConfigContract, " +
+                "Implementation = @Implementation, " +
+                "Name = @Name, " +
+                "Settings = @Settings " +
+                "WHERE Id = @Id";
+
+            conn.Execute(updateSql, discordSlackNotifications, transaction: tran);
+        }
+    }
+
+    public class NotificationEntity201
+    {
+        public int Id { get; set; }
+        public string ConfigContract { get; set; }
+        public string Implementation { get; set; }
+        public string Name { get; set; }
+        public string Settings { get; set; }
+    }
+
+    public class SlackNotificationSettings201
+    {
+        public string Channel { get; set; }
+        public string Icon { get; set; }
+        public string Username { get; set; }
+        public string WebHookUrl { get; set; }
+    }
+
+    public class DiscordNotificationSettings201
+    {
+        public string Avatar { get; set; }
+        public string Username { get; set; }
+        public string WebHookUrl { get; set; }
+        public IEnumerable<int> GrabFields { get; set; }
+        public IEnumerable<int> ImportFields { get; set; }
+    }
+}

src/NzbDrone.Core/Datastore/Migration/202_remove_predb.cs

@@ -0,0 +1,23 @@
+using FluentMigrator;
+using NzbDrone.Core.Datastore.Migration.Framework;
+
+namespace NzbDrone.Core.Datastore.Migration
+{
+    [Migration(202)]
+    public class remove_predb : NzbDroneMigrationBase
+    {
+        protected override void MainDbUpgrade()
+        {
+            //Set PreDb entries to Released
+            Update.Table("Movies").Set(new { MinimumAvailability = 3 }).Where(new { MinimumAvailability = 4 });
+            Update.Table("ImportLists").Set(new { MinimumAvailability = 3 }).Where(new { MinimumAvailability = 4 });
+
+            //Should never be set, but just in case
+            Update.Table("Movies").Set(new { Status = 3 }).Where(new { Status = 4 });
+            Update.Table("ImportListMovies").Set(new { Status = 3 }).Where(new { Status = 4 });
+
+            //Remove unused column
+            Delete.Column("HasPreDBEntry").FromTable("Movies");
+        }
+    }
+}

src/NzbDrone.Core/Datastore/Migration/203_add_on_update_to_notifications.cs

@@ -0,0 +1,14 @@
+using FluentMigrator;
+using NzbDrone.Core.Datastore.Migration.Framework;
+
+namespace NzbDrone.Core.Datastore.Migration
+{
+    [Migration(203)]
+    public class add_on_update_to_notifications : NzbDroneMigrationBase
+    {
+        protected override void MainDbUpgrade()
+        {
+            Alter.Table("Notifications").AddColumn("OnApplicationUpdate").AsBoolean().WithDefaultValue(0);
+        }
+    }
+}

src/NzbDrone.Core/Datastore/Migration/204_ensure_identity_on_id_columns.cs

@@ -0,0 +1,27 @@
+using FluentMigrator;
+using NzbDrone.Core.Datastore.Migration.Framework;
+
+namespace NzbDrone.Core.Datastore.Migration
+{
+    [Migration(204)]
+    public class ensure_identity_on_id_columns : NzbDroneMigrationBase
+    {
+        protected override void MainDbUpgrade()
+        {
+            //Purge Commands before reworking tables
+            Delete.FromTable("Commands").AllRows();
+
+            Alter.Column("Id").OnTable("Movies").AsInt32().PrimaryKey().Identity();
+            Alter.Column("Id").OnTable("MovieTranslations").AsInt32().PrimaryKey().Identity();
+            Alter.Column("Id").OnTable("Commands").AsInt32().PrimaryKey().Identity();
+            Alter.Column("Id").OnTable("Credits").AsInt32().PrimaryKey().Identity();
+            Alter.Column("Id").OnTable("Profiles").AsInt32().PrimaryKey().Identity();
+            Alter.Column("Id").OnTable("PendingReleases").AsInt32().PrimaryKey().Identity();
+            Alter.Column("Id").OnTable("NamingConfig").AsInt32().PrimaryKey().Identity();
+            Alter.Column("Id").OnTable("History").AsInt32().PrimaryKey().Identity();
+            Alter.Column("Id").OnTable("Blocklist").AsInt32().PrimaryKey().Identity();
+            Alter.Column("Id").OnTable("MovieFiles").AsInt32().PrimaryKey().Identity();
+            Alter.Column("Id").OnTable("CustomFormats").AsInt32().PrimaryKey().Identity();
+        }
+    }
+}

src/NzbDrone.Core/Datastore/Migration/205_download_client_per_indexer.cs

@@ -0,0 +1,14 @@
+using FluentMigrator;
+using NzbDrone.Core.Datastore.Migration.Framework;
+
+namespace NzbDrone.Core.Datastore.Migration
+{
+    [Migration(205)]
+    public class download_client_per_indexer : NzbDroneMigrationBase
+    {
+        protected override void MainDbUpgrade()
+        {
+            Alter.Table("Indexers").AddColumn("DownloadClientId").AsInt32().WithDefaultValue(0);
+        }
+    }
+}

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

@@ -0,0 +1,107 @@
+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.Never,
+                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 oldRatings = JsonSerializer.Deserialize<Ratings205>(row.Ratings, _serializerSettings);
+
+                var newRatings = new Ratings206
+                {
+                    Tmdb = new RatingChild206
+                    {
+                        Votes = oldRatings.Votes,
+                        Value = oldRatings.Value,
+                        Type = RatingType206.User
+                    }
+                };
+
+                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/Migration/Framework/SqliteSchemaDumper.cs

@@ -1,5 +1,6 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Data;
+using System.Linq;
 using FluentMigrator.Model;
 using FluentMigrator.Runner.Processors.SQLite;
 
@@ -66,6 +67,24 @@ namespace NzbDrone.Core.Datastore.Migration.Framework
 
                 if (columnReader.Read() == SqliteSyntaxReader.TokenType.StringToken)
                 {
+                    if (columnReader.ValueToUpper == "PRIMARY")
+                    {
+                        columnReader.SkipTillToken(SqliteSyntaxReader.TokenType.ListStart);
+                        if (columnReader.Read() == SqliteSyntaxReader.TokenType.Identifier)
+                        {
+                            var pk = table.Columns.First(v => v.Name == columnReader.Value);
+                            pk.IsPrimaryKey = true;
+                            pk.IsNullable = true;
+                            pk.IsUnique = true;
+                            if (columnReader.Buffer.ToUpperInvariant().Contains("AUTOINCREMENT"))
+                            {
+                                pk.IsIdentity = true;
+                            }
+
+                            continue;
+                        }
+                    }
+
                     if (columnReader.ValueToUpper == "CONSTRAINT" ||
                         columnReader.ValueToUpper == "PRIMARY" || columnReader.ValueToUpper == "UNIQUE" ||
                         columnReader.ValueToUpper == "CHECK" || columnReader.ValueToUpper == "FOREIGN")

src/NzbDrone.Core/Datastore/TableMapping.cs

@@ -89,7 +89,8 @@ namespace NzbDrone.Core.Datastore
                   .Ignore(i => i.SupportsOnMovieDelete)
                   .Ignore(i => i.SupportsOnMovieFileDelete)
                   .Ignore(i => i.SupportsOnMovieFileDeleteForUpgrade)
-                  .Ignore(i => i.SupportsOnHealthIssue);
+                  .Ignore(i => i.SupportsOnHealthIssue)
+                  .Ignore(i => i.SupportsOnApplicationUpdate);
 
             Mapper.Entity<MetadataDefinition>("Metadata").RegisterModel()
                   .Ignore(x => x.ImplementationName)
@@ -178,6 +179,7 @@ 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/Deluge/Deluge.cs

@@ -265,12 +265,12 @@ namespace NzbDrone.Core.Download.Clients.Deluge
                     case WebExceptionStatus.ConnectionClosed:
                         return new NzbDroneValidationFailure("UseSsl", "Verify SSL settings")
                         {
-                            DetailedDescription = "Please verify your SSL configuration on both Deluge and NzbDrone."
+                            DetailedDescription = "Please verify your SSL configuration on both Deluge and Radarr."
                         };
                     case WebExceptionStatus.SecureChannelFailure:
                         return new NzbDroneValidationFailure("UseSsl", "Unable to connect through SSL")
                         {
-                            DetailedDescription = "Drone is unable to connect to Deluge using SSL. This problem could be computer related. Please try to configure both drone and Deluge to not use SSL."
+                            DetailedDescription = "Drone is unable to connect to Deluge using SSL. This problem could be computer related. Please try to configure both Radarr and Deluge to not use SSL."
                         };
                     default:
                         return new NzbDroneValidationFailure(string.Empty, "Unknown exception: " + ex.Message);

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

@@ -118,14 +118,17 @@ namespace NzbDrone.Core.Download.Clients.DownloadStation
             try
             {
                 var serialNumber = _serialNumberProvider.GetSerialNumber(Settings);
-                var sharedFolder = GetDownloadDirectory() ?? GetDefaultDir();
-                var outputPath = new OsPath($"/{sharedFolder.TrimStart('/')}");
-                var path = _sharedFolderResolver.RemapToFullPath(outputPath, Settings, serialNumber);
+
+                // Download station returns the path without the leading `/`, but the leading
+                // slash is required to get the full path back from download station.
+                var path = new OsPath($"/{GetDownloadDirectory()}");
+
+                var fullPath = _sharedFolderResolver.RemapToFullPath(path, Settings, serialNumber);
 
                 return new DownloadClientInfo
                 {
                     IsLocalhost = Settings.Host == "127.0.0.1" || Settings.Host == "localhost",
-                    OutputRootFolders = new List<OsPath> { _remotePathMappingService.RemapRemoteToLocal(Settings.Host, path) }
+                    OutputRootFolders = new List<OsPath> { _remotePathMappingService.RemapRemoteToLocal(Settings.Host, fullPath) }
                 };
             }
             catch (DownloadClientException e)