Fixed: Autotagging Genres are case insensitive

(cherry picked from commit 87ecbf39c1c0cc8a3a3f4ee1d1878b34ea49f6b8)

Closes #9436

README.md

@@ -2,7 +2,7 @@
 
 [![Build Status](https://dev.azure.com/Radarr/Radarr/_apis/build/status/Radarr.Radarr?branchName=develop)](https://dev.azure.com/Radarr/Radarr/_build/latest?definitionId=1&branchName=develop)
 [![Translated](https://translate.servarr.com/widgets/servarr/-/radarr/svg-badge.svg)](https://translate.servarr.com/engage/radarr/?utm_source=widget)
-[![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/radarr.svg)](https://wiki.servarr.com/radarr/installation#docker)
+[![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/radarr.svg)](https://wiki.servarr.com/radarr/installation/docker)
 ![Github Downloads](https://img.shields.io/github/downloads/Radarr/Radarr/total.svg)
 [![Backers on Open Collective](https://opencollective.com/Radarr/backers/badge.svg)](#backers)
 [![Sponsors on Open Collective](https://opencollective.com/Radarr/sponsors/badge.svg)](#sponsors)

azure-pipelines.yml

@@ -9,7 +9,7 @@ variables:
   testsFolder: './_tests'
   yarnCacheFolder: $(Pipeline.Workspace)/.yarn
   nugetCacheFolder: $(Pipeline.Workspace)/.nuget/packages
-  majorVersion: '5.1.0'
+  majorVersion: '5.2.2'
   minorVersion: $[counter('minorVersion', 2000)]
   radarrVersion: '$(majorVersion).$(minorVersion)'
   buildName: '$(Build.SourceBranchName).$(radarrVersion)'

frontend/src/Activity/Blocklist/Blocklist.js

@@ -36,6 +36,7 @@ class Blocklist extends Component {
       lastToggled: null,
       selectedState: {},
       isConfirmRemoveModalOpen: false,
+      isConfirmClearModalOpen: false,
       items: props.items
     };
   }
@@ -90,6 +91,19 @@ class Blocklist extends Component {
     this.setState({ isConfirmRemoveModalOpen: false });
   };
 
+  onClearBlocklistPress = () => {
+    this.setState({ isConfirmClearModalOpen: true });
+  };
+
+  onClearBlocklistConfirmed = () => {
+    this.props.onClearBlocklistPress();
+    this.setState({ isConfirmClearModalOpen: false });
+  };
+
+  onConfirmClearModalClose = () => {
+    this.setState({ isConfirmClearModalOpen: false });
+  };
+
   //
   // Render
 
@@ -103,7 +117,6 @@ class Blocklist extends Component {
       totalRecords,
       isRemoving,
       isClearingBlocklistExecuting,
-      onClearBlocklistPress,
       ...otherProps
     } = this.props;
 
@@ -111,7 +124,8 @@ class Blocklist extends Component {
       allSelected,
       allUnselected,
       selectedState,
-      isConfirmRemoveModalOpen
+      isConfirmRemoveModalOpen,
+      isConfirmClearModalOpen
     } = this.state;
 
     const selectedIds = this.getSelectedIds();
@@ -131,8 +145,9 @@ class Blocklist extends Component {
             <PageToolbarButton
               label={translate('Clear')}
               iconName={icons.CLEAR}
+              isDisabled={!items.length}
               isSpinning={isClearingBlocklistExecuting}
-              onPress={onClearBlocklistPress}
+              onPress={this.onClearBlocklistPress}
             />
           </PageToolbarSection>
 
@@ -215,6 +230,16 @@ class Blocklist extends Component {
           onConfirm={this.onRemoveSelectedConfirmed}
           onCancel={this.onConfirmRemoveModalClose}
         />
+
+        <ConfirmModal
+          isOpen={isConfirmClearModalOpen}
+          kind={kinds.DANGER}
+          title={translate('ClearBlocklist')}
+          message={translate('ClearBlocklistMessageText')}
+          confirmLabel={translate('Clear')}
+          onConfirm={this.onClearBlocklistConfirmed}
+          onCancel={this.onConfirmClearModalClose}
+        />
       </PageContent>
     );
   }

frontend/src/Activity/History/History.js

@@ -14,6 +14,7 @@ import TableOptionsModalWrapper from 'Components/Table/TableOptions/TableOptions
 import TablePager from 'Components/Table/TablePager';
 import { align, icons, kinds } from 'Helpers/Props';
 import translate from 'Utilities/String/translate';
+import HistoryFilterModal from './HistoryFilterModal';
 import HistoryRowConnector from './HistoryRowConnector';
 
 class History extends Component {
@@ -33,6 +34,7 @@ class History extends Component {
       columns,
       selectedFilterKey,
       filters,
+      customFilters,
       totalRecords,
       onFilterSelect,
       onFirstPagePress,
@@ -70,7 +72,8 @@ class History extends Component {
               alignMenu={align.RIGHT}
               selectedFilterKey={selectedFilterKey}
               filters={filters}
-              customFilters={[]}
+              customFilters={customFilters}
+              filterModalConnectorComponent={HistoryFilterModal}
               onFilterSelect={onFilterSelect}
             />
           </PageToolbarSection>
@@ -144,8 +147,9 @@ History.propTypes = {
   moviesError: PropTypes.object,
   items: PropTypes.arrayOf(PropTypes.object).isRequired,
   columns: PropTypes.arrayOf(PropTypes.object).isRequired,
-  selectedFilterKey: PropTypes.string.isRequired,
+  selectedFilterKey: PropTypes.oneOfType([PropTypes.string, PropTypes.number]).isRequired,
   filters: PropTypes.arrayOf(PropTypes.object).isRequired,
+  customFilters: PropTypes.arrayOf(PropTypes.object).isRequired,
   totalRecords: PropTypes.number,
   onFilterSelect: PropTypes.func.isRequired,
   onFirstPagePress: PropTypes.func.isRequired

frontend/src/Activity/History/HistoryConnector.js

@@ -4,6 +4,7 @@ import { connect } from 'react-redux';
 import { createSelector } from 'reselect';
 import withCurrentPage from 'Components/withCurrentPage';
 import * as historyActions from 'Store/Actions/historyActions';
+import { createCustomFiltersSelector } from 'Store/Selectors/createClientSideCollectionSelector';
 import { registerPagePopulator, unregisterPagePopulator } from 'Utilities/pagePopulator';
 import History from './History';
 
@@ -11,11 +12,13 @@ function createMapStateToProps() {
   return createSelector(
     (state) => state.history,
     (state) => state.movies,
-    (history, movies) => {
+    createCustomFiltersSelector('history'),
+    (history, movies, customFilters) => {
       return {
         isMoviesFetching: movies.isFetching,
         isMoviesPopulated: movies.isPopulated,
         moviesError: movies.error,
+        customFilters,
         ...history
       };
     }

frontend/src/Activity/History/HistoryFilterModal.tsx

@@ -0,0 +1,54 @@
+import React, { useCallback } from 'react';
+import { useDispatch, useSelector } from 'react-redux';
+import { createSelector } from 'reselect';
+import AppState from 'App/State/AppState';
+import FilterModal from 'Components/Filter/FilterModal';
+import { setHistoryFilter } from 'Store/Actions/historyActions';
+
+function createHistorySelector() {
+  return createSelector(
+    (state: AppState) => state.history.items,
+    (queueItems) => {
+      return queueItems;
+    }
+  );
+}
+
+function createFilterBuilderPropsSelector() {
+  return createSelector(
+    (state: AppState) => state.history.filterBuilderProps,
+    (filterBuilderProps) => {
+      return filterBuilderProps;
+    }
+  );
+}
+
+interface HistoryFilterModalProps {
+  isOpen: boolean;
+}
+
+export default function HistoryFilterModal(props: HistoryFilterModalProps) {
+  const sectionItems = useSelector(createHistorySelector());
+  const filterBuilderProps = useSelector(createFilterBuilderPropsSelector());
+  const customFilterType = 'history';
+
+  const dispatch = useDispatch();
+
+  const dispatchSetFilter = useCallback(
+    (payload: unknown) => {
+      dispatch(setHistoryFilter(payload));
+    },
+    [dispatch]
+  );
+
+  return (
+    <FilterModal
+      // TODO: Don't spread all the props
+      {...props}
+      sectionItems={sectionItems}
+      filterBuilderProps={filterBuilderProps}
+      customFilterType={customFilterType}
+      dispatchSetFilter={dispatchSetFilter}
+    />
+  );
+}

frontend/src/Activity/Queue/Queue.js

@@ -3,6 +3,7 @@ import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import Alert from 'Components/Alert';
 import LoadingIndicator from 'Components/Loading/LoadingIndicator';
+import FilterMenu from 'Components/Menu/FilterMenu';
 import PageContent from 'Components/Page/PageContent';
 import PageContentBody from 'Components/Page/PageContentBody';
 import PageToolbar from 'Components/Page/Toolbar/PageToolbar';
@@ -21,6 +22,7 @@ import getSelectedIds from 'Utilities/Table/getSelectedIds';
 import removeOldSelectedState from 'Utilities/Table/removeOldSelectedState';
 import selectAll from 'Utilities/Table/selectAll';
 import toggleSelected from 'Utilities/Table/toggleSelected';
+import QueueFilterModal from './QueueFilterModal';
 import QueueOptionsConnector from './QueueOptionsConnector';
 import QueueRowConnector from './QueueRowConnector';
 import RemoveQueueItemsModal from './RemoveQueueItemsModal';
@@ -153,11 +155,16 @@ class Queue extends Component {
       isMoviesPopulated,
       moviesError,
       columns,
+      selectedFilterKey,
+      filters,
+      customFilters,
+      count,
       totalRecords,
       isGrabbing,
       isRemoving,
       isRefreshMonitoredDownloadsExecuting,
       onRefreshPress,
+      onFilterSelect,
       ...otherProps
     } = this.props;
 
@@ -220,6 +227,15 @@ class Queue extends Component {
                 iconName={icons.TABLE}
               />
             </TableOptionsModalWrapper>
+
+            <FilterMenu
+              alignMenu={align.RIGHT}
+              selectedFilterKey={selectedFilterKey}
+              filters={filters}
+              customFilters={customFilters}
+              filterModalConnectorComponent={QueueFilterModal}
+              onFilterSelect={onFilterSelect}
+            />
           </PageToolbarSection>
         </PageToolbar>
 
@@ -241,7 +257,11 @@ class Queue extends Component {
           {
             isAllPopulated && !hasError && !items.length ?
               <Alert kind={kinds.INFO}>
-                {translate('QueueIsEmpty')}
+                {
+                  selectedFilterKey !== 'all' && count > 0 ?
+                    translate('QueueFilterHasNoItems') :
+                    translate('QueueIsEmpty')
+                }
               </Alert> :
               null
           }
@@ -325,13 +345,22 @@ Queue.propTypes = {
   moviesError: PropTypes.object,
   items: PropTypes.arrayOf(PropTypes.object).isRequired,
   columns: PropTypes.arrayOf(PropTypes.object).isRequired,
+  selectedFilterKey: PropTypes.oneOfType([PropTypes.string, PropTypes.number]).isRequired,
+  filters: PropTypes.arrayOf(PropTypes.object).isRequired,
+  customFilters: PropTypes.arrayOf(PropTypes.object).isRequired,
+  count: PropTypes.number.isRequired,
   totalRecords: PropTypes.number,
   isGrabbing: PropTypes.bool.isRequired,
   isRemoving: PropTypes.bool.isRequired,
   isRefreshMonitoredDownloadsExecuting: PropTypes.bool.isRequired,
   onRefreshPress: PropTypes.func.isRequired,
   onGrabSelectedPress: PropTypes.func.isRequired,
-  onRemoveSelectedPress: PropTypes.func.isRequired
+  onRemoveSelectedPress: PropTypes.func.isRequired,
+  onFilterSelect: PropTypes.func.isRequired
+};
+
+Queue.defaultProps = {
+  count: 0
 };
 
 export default Queue;

frontend/src/Activity/Queue/QueueConnector.js

@@ -6,6 +6,7 @@ import * as commandNames from 'Commands/commandNames';
 import withCurrentPage from 'Components/withCurrentPage';
 import { executeCommand } from 'Store/Actions/commandActions';
 import * as queueActions from 'Store/Actions/queueActions';
+import { createCustomFiltersSelector } from 'Store/Selectors/createClientSideCollectionSelector';
 import createCommandExecutingSelector from 'Store/Selectors/createCommandExecutingSelector';
 import { registerPagePopulator, unregisterPagePopulator } from 'Utilities/pagePopulator';
 import Queue from './Queue';
@@ -15,12 +16,16 @@ function createMapStateToProps() {
     (state) => state.movies,
     (state) => state.queue.options,
     (state) => state.queue.paged,
+    (state) => state.queue.status.item,
+    createCustomFiltersSelector('queue'),
     createCommandExecutingSelector(commandNames.REFRESH_MONITORED_DOWNLOADS),
-    (movies, options, queue, isRefreshMonitoredDownloadsExecuting) => {
+    (movies, options, queue, status, customFilters, isRefreshMonitoredDownloadsExecuting) => {
       return {
+        count: options.includeUnknownMovieItems ? status.totalCount : status.count,
         isMoviesFetching: movies.isFetching,
         isMoviesPopulated: movies.isPopulated,
         moviesError: movies.error,
+        customFilters,
         isRefreshMonitoredDownloadsExecuting,
         ...options,
         ...queue
@@ -106,6 +111,10 @@ class QueueConnector extends Component {
     this.props.setQueueSort({ sortKey });
   };
 
+  onFilterSelect = (selectedFilterKey) => {
+    this.props.setQueueFilter({ selectedFilterKey });
+  };
+
   onTableOptionChange = (payload) => {
     this.props.setQueueTableOption(payload);
 
@@ -140,6 +149,7 @@ class QueueConnector extends Component {
         onLastPagePress={this.onLastPagePress}
         onPageSelect={this.onPageSelect}
         onSortPress={this.onSortPress}
+        onFilterSelect={this.onFilterSelect}
         onTableOptionChange={this.onTableOptionChange}
         onRefreshPress={this.onRefreshPress}
         onGrabSelectedPress={this.onGrabSelectedPress}
@@ -162,6 +172,7 @@ QueueConnector.propTypes = {
   gotoQueueLastPage: PropTypes.func.isRequired,
   gotoQueuePage: PropTypes.func.isRequired,
   setQueueSort: PropTypes.func.isRequired,
+  setQueueFilter: PropTypes.func.isRequired,
   setQueueTableOption: PropTypes.func.isRequired,
   clearQueue: PropTypes.func.isRequired,
   grabQueueItems: PropTypes.func.isRequired,

frontend/src/Activity/Queue/QueueDetails.js

@@ -81,4 +81,9 @@ QueueDetails.propTypes = {
   progressBar: PropTypes.node.isRequired
 };
 
+QueueDetails.defaultProps = {
+  trackedDownloadStatus: 'ok',
+  trackedDownloadState: 'downloading'
+};
+
 export default QueueDetails;

frontend/src/Activity/Queue/QueueFilterModal.tsx

@@ -0,0 +1,54 @@
+import React, { useCallback } from 'react';
+import { useDispatch, useSelector } from 'react-redux';
+import { createSelector } from 'reselect';
+import AppState from 'App/State/AppState';
+import FilterModal from 'Components/Filter/FilterModal';
+import { setQueueFilter } from 'Store/Actions/queueActions';
+
+function createQueueSelector() {
+  return createSelector(
+    (state: AppState) => state.queue.paged.items,
+    (queueItems) => {
+      return queueItems;
+    }
+  );
+}
+
+function createFilterBuilderPropsSelector() {
+  return createSelector(
+    (state: AppState) => state.queue.paged.filterBuilderProps,
+    (filterBuilderProps) => {
+      return filterBuilderProps;
+    }
+  );
+}
+
+interface QueueFilterModalProps {
+  isOpen: boolean;
+}
+
+export default function QueueFilterModal(props: QueueFilterModalProps) {
+  const sectionItems = useSelector(createQueueSelector());
+  const filterBuilderProps = useSelector(createFilterBuilderPropsSelector());
+  const customFilterType = 'queue';
+
+  const dispatch = useDispatch();
+
+  const dispatchSetFilter = useCallback(
+    (payload: unknown) => {
+      dispatch(setQueueFilter(payload));
+    },
+    [dispatch]
+  );
+
+  return (
+    <FilterModal
+      // TODO: Don't spread all the props
+      {...props}
+      sectionItems={sectionItems}
+      filterBuilderProps={filterBuilderProps}
+      customFilterType={customFilterType}
+      dispatchSetFilter={dispatchSetFilter}
+    />
+  );
+}

frontend/src/Activity/Queue/QueueStatusCell.js

@@ -2,7 +2,6 @@ import PropTypes from 'prop-types';
 import React from 'react';
 import TableRowCell from 'Components/Table/Cells/TableRowCell';
 import { tooltipPositions } from 'Helpers/Props';
-import translate from 'Utilities/String/translate';
 import QueueStatus from './QueueStatus';
 import styles from './QueueStatusCell.css';
 
@@ -41,8 +40,8 @@ QueueStatusCell.propTypes = {
 };
 
 QueueStatusCell.defaultProps = {
-  trackedDownloadStatus: translate('Ok'),
-  trackedDownloadState: translate('Downloading')
+  trackedDownloadStatus: 'ok',
+  trackedDownloadState: 'downloading'
 };
 
 export default QueueStatusCell;

frontend/src/Activity/Queue/TimeleftCell.js

@@ -1,6 +1,9 @@
 import PropTypes from 'prop-types';
 import React from 'react';
+import Icon from 'Components/Icon';
 import TableRowCell from 'Components/Table/Cells/TableRowCell';
+import Tooltip from 'Components/Tooltip/Tooltip';
+import { icons, kinds, tooltipPositions } from 'Helpers/Props';
 import formatTime from 'Utilities/Date/formatTime';
 import formatTimeSpan from 'Utilities/Date/formatTimeSpan';
 import getRelativeDate from 'Utilities/Date/getRelativeDate';
@@ -25,11 +28,13 @@ function TimeleftCell(props) {
     const time = formatTime(estimatedCompletionTime, timeFormat, { includeMinuteZero: true });
 
     return (
-      <TableRowCell
-        className={styles.timeleft}
-        title={translate('DelayingDownloadUntil', { date, time })}
-      >
-        -
+      <TableRowCell className={styles.timeleft}>
+        <Tooltip
+          anchor={<Icon name={icons.INFO} />}
+          tooltip={translate('DelayingDownloadUntil', { date, time })}
+          kind={kinds.INVERSE}
+          position={tooltipPositions.TOP}
+        />
       </TableRowCell>
     );
   }
@@ -39,11 +44,13 @@ function TimeleftCell(props) {
     const time = formatTime(estimatedCompletionTime, timeFormat, { includeMinuteZero: true });
 
     return (
-      <TableRowCell
-        className={styles.timeleft}
-        title={translate('RetryingDownloadOn', { date, time })}
-      >
-        -
+      <TableRowCell className={styles.timeleft}>
+        <Tooltip
+          anchor={<Icon name={icons.INFO} />}
+          tooltip={translate('RetryingDownloadOn', { date, time })}
+          kind={kinds.INVERSE}
+          position={tooltipPositions.TOP}
+        />
       </TableRowCell>
     );
   }

frontend/src/AddMovie/AddNewMovie/AddNewMovie.js

@@ -1,5 +1,6 @@
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
+import Alert from 'Components/Alert';
 import TextInput from 'Components/Form/TextInput';
 import Icon from 'Components/Icon';
 import Button from 'Components/Link/Button';
@@ -130,7 +131,12 @@ class AddNewMovie extends Component {
                 <div className={styles.helpText}>
                   {translate('FailedLoadingSearchResults')}
                 </div>
-                <div>{getErrorMessage(error)}</div>
+                <Alert kind={kinds.WARNING}>{getErrorMessage(error)}</Alert>
+                <div>
+                  <Link to="https://wiki.servarr.com/radarr/troubleshooting#invalid-response-received-from-tmdb">
+                    {translate('WhySearchesCouldBeFailing')}
+                  </Link>
+                </div>
               </div> : null
           }
 

frontend/src/AddMovie/AddNewMovie/AddNewMovieSearchResult.js

@@ -66,6 +66,7 @@ class AddNewMovieSearchResult extends Component {
       ratings,
       folder,
       images,
+      existingMovieId,
       isExistingMovie,
       isExclusionMovie,
       isSmallScreen,
@@ -74,8 +75,7 @@ class AddNewMovieSearchResult extends Component {
       monitored,
       hasFile,
       isAvailable,
-      queueStatus,
-      queueState,
+      movieFile,
       runtime,
       movieRuntimeFormat,
       certification
@@ -120,13 +120,13 @@ class AddNewMovieSearchResult extends Component {
                 {
                   isExistingMovie &&
                     <MovieIndexProgressBar
+                      movieId={existingMovieId}
+                      movieFile={movieFile}
                       monitored={monitored}
                       hasFile={hasFile}
                       status={status}
                       width={posterWidth}
                       detailedProgressBar={true}
-                      queueStatus={queueStatus}
-                      queueState={queueState}
                       isAvailable={isAvailable}
                     />
                 }
@@ -278,6 +278,7 @@ AddNewMovieSearchResult.propTypes = {
   ratings: PropTypes.object.isRequired,
   folder: PropTypes.string.isRequired,
   images: PropTypes.arrayOf(PropTypes.object).isRequired,
+  existingMovieId: PropTypes.number,
   isExistingMovie: PropTypes.bool.isRequired,
   isExclusionMovie: PropTypes.bool.isRequired,
   isSmallScreen: PropTypes.bool.isRequired,
@@ -286,9 +287,8 @@ AddNewMovieSearchResult.propTypes = {
   monitored: PropTypes.bool.isRequired,
   hasFile: PropTypes.bool.isRequired,
   isAvailable: PropTypes.bool.isRequired,
+  movieFile: PropTypes.object,
   colorImpairedMode: PropTypes.bool,
-  queueStatus: PropTypes.string,
-  queueState: PropTypes.string,
   runtime: PropTypes.number.isRequired,
   movieRuntimeFormat: PropTypes.string.isRequired,
   certification: PropTypes.string

frontend/src/AddMovie/AddNewMovie/AddNewMovieSearchResultConnector.js

@@ -10,17 +10,15 @@ function createMapStateToProps() {
     createExistingMovieSelector(),
     createExclusionMovieSelector(),
     createDimensionsSelector(),
-    (state) => state.queue.details.items,
     (state, { internalId }) => internalId,
-    (isExistingMovie, isExclusionMovie, dimensions, queueItems, internalId) => {
-      const firstQueueItem = queueItems.find((q) => q.movieId === internalId && internalId > 0);
-
+    (state) => state.settings.ui.item.movieRuntimeFormat,
+    (isExistingMovie, isExclusionMovie, dimensions, internalId, movieRuntimeFormat) => {
       return {
+        existingMovieId: internalId,
         isExistingMovie,
         isExclusionMovie,
         isSmallScreen: dimensions.isSmallScreen,
-        queueStatus: firstQueueItem ? firstQueueItem.status : null,
-        queueState: firstQueueItem ? firstQueueItem.trackedDownloadState : null
+        movieRuntimeFormat
       };
     }
   );

frontend/src/AddMovie/ImportMovie/SelectFolder/ImportMovieSelectFolderConnector.js

@@ -5,12 +5,13 @@ import React, { Component } from 'react';
 import { connect } from 'react-redux';
 import { createSelector } from 'reselect';
 import { addRootFolder, deleteRootFolder, fetchRootFolders } from 'Store/Actions/rootFolderActions';
+import createRootFoldersSelector from 'Store/Selectors/createRootFoldersSelector';
 import createSystemStatusSelector from 'Store/Selectors/createSystemStatusSelector';
 import ImportMovieSelectFolder from './ImportMovieSelectFolder';
 
 function createMapStateToProps() {
   return createSelector(
-    (state) => state.rootFolders,
+    createRootFoldersSelector(),
     createSystemStatusSelector(),
     (rootFolders, systemStatus) => {
       return {

frontend/src/App/AppUpdatedModalContent.js

@@ -65,12 +65,12 @@ function AppUpdatedModalContent(props) {
   return (
     <ModalContent onModalClose={onModalClose}>
       <ModalHeader>
-        {translate('AppUpdated', { appName: 'Radarr' })}
+        {translate('AppUpdated')}
       </ModalHeader>
 
       <ModalBody>
         <div>
-          <InlineMarkdown data={translate('AppUpdatedVersion', { appName: 'Radarr', version })} blockClassName={styles.version} />
+          <InlineMarkdown data={translate('AppUpdatedVersion', { version })} blockClassName={styles.version} />
         </div>
 
         {

frontend/src/App/ConnectionLostModal.js

@@ -28,11 +28,11 @@ function ConnectionLostModal(props) {
 
         <ModalBody>
           <div>
-            {translate('ConnectionLostToBackend', { appName: 'Radarr' })}
+            {translate('ConnectionLostToBackend')}
           </div>
 
           <div className={styles.automatic}>
-            {translate('ConnectionLostReconnect', { appName: 'Radarr' })}
+            {translate('ConnectionLostReconnect')}
           </div>
         </ModalBody>
         <ModalFooter>

frontend/src/App/State/AppSectionState.ts

@@ -1,4 +1,5 @@
 import SortDirection from 'Helpers/Props/SortDirection';
+import { FilterBuilderProp } from './AppState';
 
 export interface Error {
   responseJSON: {
@@ -20,6 +21,10 @@ export interface PagedAppSectionState {
   pageSize: number;
 }
 
+export interface AppSectionFilterState<T> {
+  filterBuilderProps: FilterBuilderProp<T>[];
+}
+
 export interface AppSectionSchemaState<T> {
   isSchemaFetching: boolean;
   isSchemaPopulated: boolean;

frontend/src/App/State/AppState.ts

@@ -1,6 +1,7 @@
 import InteractiveImportAppState from 'App/State/InteractiveImportAppState';
 import CalendarAppState from './CalendarAppState';
 import CommandAppState from './CommandAppState';
+import HistoryAppState from './HistoryAppState';
 import MovieCollectionAppState from './MovieCollectionAppState';
 import MovieFilesAppState from './MovieFilesAppState';
 import MoviesAppState, { MovieIndexAppState } from './MoviesAppState';
@@ -46,6 +47,7 @@ export interface CustomFilter {
 interface AppState {
   calendar: CalendarAppState;
   commands: CommandAppState;
+  history: HistoryAppState;
   interactiveImport: InteractiveImportAppState;
   movieCollections: MovieCollectionAppState;
   movieFiles: MovieFilesAppState;

frontend/src/App/State/CalendarAppState.ts

@@ -1,9 +1,10 @@
-import AppSectionState from 'App/State/AppSectionState';
+import AppSectionState, {
+  AppSectionFilterState,
+} from 'App/State/AppSectionState';
 import Movie from 'Movie/Movie';
-import { FilterBuilderProp } from './AppState';
 
-interface CalendarAppState extends AppSectionState<Movie> {
-  filterBuilderProps: FilterBuilderProp<Movie>[];
-}
+interface CalendarAppState
+  extends AppSectionState<Movie>,
+    AppSectionFilterState<Movie> {}
 
 export default CalendarAppState;

frontend/src/App/State/HistoryAppState.ts

@@ -0,0 +1,10 @@
+import AppSectionState, {
+  AppSectionFilterState,
+} from 'App/State/AppSectionState';
+import History from 'typings/History';
+
+interface HistoryAppState
+  extends AppSectionState<History>,
+    AppSectionFilterState<History> {}
+
+export default HistoryAppState;

frontend/src/App/State/QueueAppState.ts

@@ -1,41 +1,17 @@
-import ModelBase from 'App/ModelBase';
-import Language from 'Language/Language';
-import { QualityModel } from 'Quality/Quality';
-import CustomFormat from 'typings/CustomFormat';
-import AppSectionState, { AppSectionItemState, Error } from './AppSectionState';
-
-export interface StatusMessage {
-  title: string;
-  messages: string[];
-}
-
-export interface Queue extends ModelBase {
-  languages: Language[];
-  quality: QualityModel;
-  customFormats: CustomFormat[];
-  size: number;
-  title: string;
-  sizeleft: number;
-  timeleft: string;
-  estimatedCompletionTime: string;
-  status: string;
-  trackedDownloadStatus: string;
-  trackedDownloadState: string;
-  statusMessages: StatusMessage[];
-  errorMessage: string;
-  downloadId: string;
-  protocol: string;
-  downloadClient: string;
-  outputPath: string;
-  movieHasFile: boolean;
-  movieId?: number;
-}
+import Queue from 'typings/Queue';
+import AppSectionState, {
+  AppSectionFilterState,
+  AppSectionItemState,
+  Error,
+} from './AppSectionState';
 
 export interface QueueDetailsAppState extends AppSectionState<Queue> {
   params: unknown;
 }
 
-export interface QueuePagedAppState extends AppSectionState<Queue> {
+export interface QueuePagedAppState
+  extends AppSectionState<Queue>,
+    AppSectionFilterState<Queue> {
   isGrabbing: boolean;
   grabError: Error;
   isRemoving: boolean;

frontend/src/Calendar/CalendarFilterModal.tsx

@@ -23,13 +23,11 @@ function createFilterBuilderPropsSelector() {
   );
 }
 
-interface SeriesIndexFilterModalProps {
+interface CalendarFilterModalProps {
   isOpen: boolean;
 }
 
-export default function CalendarFilterModal(
-  props: SeriesIndexFilterModalProps
-) {
+export default function CalendarFilterModal(props: CalendarFilterModalProps) {
   const sectionItems = useSelector(createCalendarSelector());
   const filterBuilderProps = useSelector(createFilterBuilderPropsSelector());
   const customFilterType = 'calendar';

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

@@ -6,9 +6,12 @@ import { filterBuilderTypes, filterBuilderValueTypes, icons } from 'Helpers/Prop
 import BoolFilterBuilderRowValue from './BoolFilterBuilderRowValue';
 import DateFilterBuilderRowValue from './DateFilterBuilderRowValue';
 import FilterBuilderRowValueConnector from './FilterBuilderRowValueConnector';
+import HistoryEventTypeFilterBuilderRowValue from './HistoryEventTypeFilterBuilderRowValue';
 import ImportListFilterBuilderRowValueConnector from './ImportListFilterBuilderRowValueConnector';
 import IndexerFilterBuilderRowValueConnector from './IndexerFilterBuilderRowValueConnector';
+import LanguageFilterBuilderRowValue from './LanguageFilterBuilderRowValue';
 import MinimumAvailabilityFilterBuilderRowValue from './MinimumAvailabilityFilterBuilderRowValue';
+import MovieFilterBuilderRowValue from './MovieFilterBuilderRowValue';
 import ProtocolFilterBuilderRowValue from './ProtocolFilterBuilderRowValue';
 import QualityFilterBuilderRowValueConnector from './QualityFilterBuilderRowValueConnector';
 import QualityProfileFilterBuilderRowValueConnector from './QualityProfileFilterBuilderRowValueConnector';
@@ -58,9 +61,15 @@ function getRowValueConnector(selectedFilterBuilderProp) {
     case filterBuilderValueTypes.DATE:
       return DateFilterBuilderRowValue;
 
+    case filterBuilderValueTypes.HISTORY_EVENT_TYPE:
+      return HistoryEventTypeFilterBuilderRowValue;
+
     case filterBuilderValueTypes.INDEXER:
       return IndexerFilterBuilderRowValueConnector;
 
+    case filterBuilderValueTypes.LANGUAGE:
+      return LanguageFilterBuilderRowValue;
+
     case filterBuilderValueTypes.PROTOCOL:
       return ProtocolFilterBuilderRowValue;
 
@@ -70,6 +79,9 @@ function getRowValueConnector(selectedFilterBuilderProp) {
     case filterBuilderValueTypes.QUALITY_PROFILE:
       return QualityProfileFilterBuilderRowValueConnector;
 
+    case filterBuilderValueTypes.MOVIE:
+      return MovieFilterBuilderRowValue;
+
     case filterBuilderValueTypes.RELEASE_STATUS:
       return ReleaseStatusFilterBuilderRowValue;
 

frontend/src/Components/Filter/Builder/FilterBuilderRowValueProps.ts

@@ -0,0 +1,16 @@
+import { FilterBuilderProp } from 'App/State/AppState';
+
+interface FilterBuilderRowOnChangeProps {
+  name: string;
+  value: unknown[];
+}
+
+interface FilterBuilderRowValueProps {
+  filterType?: string;
+  filterValue: string | number | object | string[] | number[] | object[];
+  selectedFilterBuilderProp: FilterBuilderProp<unknown>;
+  sectionItem: unknown[];
+  onChange: (payload: FilterBuilderRowOnChangeProps) => void;
+}
+
+export default FilterBuilderRowValueProps;

frontend/src/Components/Filter/Builder/HistoryEventTypeFilterBuilderRowValue.tsx

@@ -0,0 +1,51 @@
+import React from 'react';
+import translate from 'Utilities/String/translate';
+import FilterBuilderRowValue from './FilterBuilderRowValue';
+import FilterBuilderRowValueProps from './FilterBuilderRowValueProps';
+
+const EVENT_TYPE_OPTIONS = [
+  {
+    id: 1,
+    get name() {
+      return translate('Grabbed');
+    },
+  },
+  {
+    id: 3,
+    get name() {
+      return translate('Imported');
+    },
+  },
+  {
+    id: 4,
+    get name() {
+      return translate('Failed');
+    },
+  },
+  {
+    id: 6,
+    get name() {
+      return translate('Deleted');
+    },
+  },
+  {
+    id: 8,
+    get name() {
+      return translate('Renamed');
+    },
+  },
+  {
+    id: 9,
+    get name() {
+      return translate('Ignored');
+    },
+  },
+];
+
+function HistoryEventTypeFilterBuilderRowValue(
+  props: FilterBuilderRowValueProps
+) {
+  return <FilterBuilderRowValue {...props} tagList={EVENT_TYPE_OPTIONS} />;
+}
+
+export default HistoryEventTypeFilterBuilderRowValue;

frontend/src/Components/Filter/Builder/LanguageFilterBuilderRowValue.tsx

@@ -0,0 +1,13 @@
+import React from 'react';
+import { useSelector } from 'react-redux';
+import createLanguagesSelector from 'Store/Selectors/createLanguagesSelector';
+import FilterBuilderRowValue from './FilterBuilderRowValue';
+import FilterBuilderRowValueProps from './FilterBuilderRowValueProps';
+
+function LanguageFilterBuilderRowValue(props: FilterBuilderRowValueProps) {
+  const { items } = useSelector(createLanguagesSelector());
+
+  return <FilterBuilderRowValue {...props} tagList={items} />;
+}
+
+export default LanguageFilterBuilderRowValue;

frontend/src/Components/Filter/Builder/MovieFilterBuilderRowValue.tsx

@@ -0,0 +1,19 @@
+import React from 'react';
+import { useSelector } from 'react-redux';
+import Movie from 'Movie/Movie';
+import createAllMoviesSelector from 'Store/Selectors/createAllMoviesSelector';
+import sortByName from 'Utilities/Array/sortByName';
+import FilterBuilderRowValue from './FilterBuilderRowValue';
+import FilterBuilderRowValueProps from './FilterBuilderRowValueProps';
+
+function MovieFilterBuilderRowValue(props: FilterBuilderRowValueProps) {
+  const allMovies: Movie[] = useSelector(createAllMoviesSelector());
+
+  const tagList = allMovies
+    .map((movie) => ({ id: movie.id, name: movie.title }))
+    .sort(sortByName);
+
+  return <FilterBuilderRowValue {...props} tagList={tagList} />;
+}
+
+export default MovieFilterBuilderRowValue;

frontend/src/Components/Form/RootFolderSelectInputConnector.js

@@ -3,6 +3,7 @@ import React, { Component } from 'react';
 import { connect } from 'react-redux';
 import { createSelector } from 'reselect';
 import { addRootFolder } from 'Store/Actions/rootFolderActions';
+import createRootFoldersSelector from 'Store/Selectors/createRootFoldersSelector';
 import translate from 'Utilities/String/translate';
 import RootFolderSelectInput from './RootFolderSelectInput';
 
@@ -10,7 +11,7 @@ const ADD_NEW_KEY = 'addNew';
 
 function createMapStateToProps() {
   return createSelector(
-    (state) => state.rootFolders,
+    createRootFoldersSelector(),
     (state, { value }) => value,
     (state, { includeMissingValue }) => includeMissingValue,
     (state, { includeNoChange }) => includeNoChange,

frontend/src/DiscoverMovie/DiscoverMovieConnector.js

@@ -78,7 +78,8 @@ function createMapDispatchToProps(dispatch, props) {
 
     onImportListSyncPress() {
       dispatch(executeCommand({
-        name: commandNames.IMPORT_LIST_SYNC
+        name: commandNames.IMPORT_LIST_SYNC,
+        commandFinished: this.dispatchFetchListMovies
       }));
     }
   };

frontend/src/FirstRun/AuthenticationRequiredModalContent.js

@@ -34,7 +34,8 @@ function AuthenticationRequiredModalContent(props) {
     authenticationMethod,
     authenticationRequired,
     username,
-    password
+    password,
+    passwordConfirmation
   } = settings;
 
   const authenticationEnabled = authenticationMethod && authenticationMethod.value !== 'none';
@@ -63,7 +64,7 @@ function AuthenticationRequiredModalContent(props) {
           className={styles.authRequiredAlert}
           kind={kinds.WARNING}
         >
-          {translate('AuthenticationRequiredWarning', { appName: 'Radarr' })}
+          {translate('AuthenticationRequiredWarning')}
         </Alert>
 
         {
@@ -76,7 +77,7 @@ function AuthenticationRequiredModalContent(props) {
                   type={inputTypes.SELECT}
                   name="authenticationMethod"
                   values={authenticationMethodOptions}
-                  helpText={translate('AuthenticationMethodHelpText', { appName: 'Radarr' })}
+                  helpText={translate('AuthenticationMethodHelpText')}
                   helpTextWarning={authenticationMethod.value === 'none' ? translate('AuthenticationMethodHelpTextWarning') : undefined}
                   helpLink="https://wiki.servarr.com/radarr/faq#forced-authentication"
                   onChange={onInputChange}
@@ -120,6 +121,18 @@ function AuthenticationRequiredModalContent(props) {
                   {...password}
                 />
               </FormGroup>
+
+              <FormGroup>
+                <FormLabel>{translate('PasswordConfirmation')}</FormLabel>
+
+                <FormInputGroup
+                  type={inputTypes.PASSWORD}
+                  name="passwordConfirmation"
+                  onChange={onInputChange}
+                  helpTextWarning={passwordConfirmation?.value ? undefined : translate('AuthenticationRequiredPasswordConfirmationHelpTextWarning')}
+                  {...passwordConfirmation}
+                />
+              </FormGroup>
             </div> :
             null
         }

frontend/src/Helpers/Props/filterBuilderValueTypes.js

@@ -2,10 +2,13 @@ export const BOOL = 'bool';
 export const BYTES = 'bytes';
 export const DATE = 'date';
 export const DEFAULT = 'default';
+export const HISTORY_EVENT_TYPE = 'historyEventType';
 export const INDEXER = 'indexer';
+export const LANGUAGE = 'language';
 export const PROTOCOL = 'protocol';
 export const QUALITY = 'quality';
 export const QUALITY_PROFILE = 'qualityProfile';
+export const MOVIE = 'movie';
 export const RELEASE_STATUS = 'releaseStatus';
 export const MINIMUM_AVAILABILITY = 'minimumAvailability';
 export const TAG = 'tag';

frontend/src/Movie/Details/MovieDetails.css

@@ -202,6 +202,12 @@
   .headerContent {
     padding: 15px;
   }
+
+  .title {
+    font-weight: 300;
+    font-size: 30px;
+    line-height: 30px;
+  }
 }
 
 @media only screen and (max-width: $breakpointLarge) {

frontend/src/Movie/Details/MovieDetails.js

@@ -286,7 +286,7 @@ class MovieDetails extends Component {
       onMonitorTogglePress,
       onRefreshPress,
       onSearchPress,
-      queueItems,
+      queueItem,
       movieRuntimeFormat
     } = this.props;
 
@@ -544,7 +544,7 @@ class MovieDetails extends Component {
                         hasMovieFiles={hasMovieFiles}
                         monitored={monitored}
                         isAvailable={isAvailable}
-                        queueItem={(queueItems.length > 0) ? queueItems[0] : null}
+                        queueItem={queueItem}
                       />
                     </span>
                   </InfoLabel>
@@ -830,7 +830,7 @@ MovieDetails.propTypes = {
   onRefreshPress: PropTypes.func.isRequired,
   onSearchPress: PropTypes.func.isRequired,
   onGoToMovie: PropTypes.func.isRequired,
-  queueItems: PropTypes.arrayOf(PropTypes.object),
+  queueItem: PropTypes.object,
   movieRuntimeFormat: PropTypes.string.isRequired
 };
 

frontend/src/Movie/Details/MovieDetailsConnector.js

@@ -145,6 +145,8 @@ function createMapStateToProps() {
         return acc;
       }, []);
 
+      const queueItem = queueItems.find((item) => item.movieId === movie.id);
+
       return {
         ...movie,
         alternateTitles,
@@ -165,7 +167,7 @@ function createMapStateToProps() {
         nextMovie,
         isSmallScreen: dimensions.isSmallScreen,
         isSidebarVisible,
-        queueItems,
+        queueItem,
         movieRuntimeFormat
       };
     }

frontend/src/Movie/Details/MovieStatusLabel.js

@@ -8,7 +8,6 @@ import translate from 'Utilities/String/translate';
 import styles from './MovieStatusLabel.css';
 
 function getMovieStatus(hasFile, isMonitored, isAvailable, queueItem = false) {
-
   if (queueItem) {
     const queueStatus = queueItem.status;
     const queueState = queueItem.trackedDownloadStatus;
@@ -116,8 +115,4 @@ MovieStatusLabel.propTypes = {
   colorImpairedMode: PropTypes.bool
 };
 
-MovieStatusLabel.defaultProps = {
-  title: ''
-};
-
 export default MovieStatusLabel;

frontend/src/Movie/Index/createMovieQueueDetailsSelector.ts

@@ -11,7 +11,10 @@ function createMovieQueueDetailsSelector(movieId: number) {
     (queueItems) => {
       return queueItems.reduce(
         (acc: MovieQueueDetails, item) => {
-          if (item.movieId !== movieId) {
+          if (
+            item.trackedDownloadState === 'imported' ||
+            item.movieId !== movieId
+          ) {
             return acc;
           }
 

frontend/src/Settings/General/SecuritySettings.js

@@ -124,6 +124,7 @@ class SecuritySettings extends Component {
       authenticationRequired,
       username,
       password,
+      passwordConfirmation,
       apiKey,
       certificateValidation
     } = settings;
@@ -139,8 +140,8 @@ class SecuritySettings extends Component {
             type={inputTypes.SELECT}
             name="authenticationMethod"
             values={authenticationMethodOptions}
-            helpText={translate('AuthenticationMethodHelpText', { appName: 'Radarr' })}
-            helpTextWarning={translate('AuthenticationRequiredWarning', { appName: 'Radarr' })}
+            helpText={translate('AuthenticationMethodHelpText')}
+            helpTextWarning={translate('AuthenticationRequiredWarning')}
             onChange={onInputChange}
             {...authenticationMethod}
           />
@@ -193,6 +194,21 @@ class SecuritySettings extends Component {
             null
         }
 
+        {
+          authenticationEnabled ?
+            <FormGroup>
+              <FormLabel>{translate('PasswordConfirmation')}</FormLabel>
+
+              <FormInputGroup
+                type={inputTypes.PASSWORD}
+                name="passwordConfirmation"
+                onChange={onInputChange}
+                {...passwordConfirmation}
+              />
+            </FormGroup> :
+            null
+        }
+
         <FormGroup>
           <FormLabel>{translate('ApiKey')}</FormLabel>
 

frontend/src/Settings/General/UpdateSettings.js

@@ -83,7 +83,7 @@ function UpdateSettings(props) {
                 type={inputTypes.CHECK}
                 name="updateAutomatically"
                 helpText={translate('UpdateAutomaticallyHelpText')}
-                helpTextWarning={updateMechanism.value === 'docker' ? translate('AutomaticUpdatesDisabledDocker', { appName: 'Radarr' }) : undefined}
+                helpTextWarning={updateMechanism.value === 'docker' ? translate('AutomaticUpdatesDisabledDocker') : undefined}
                 onChange={onInputChange}
                 {...updateAutomatically}
               />

frontend/src/Settings/ImportLists/ImportLists/ImportList.js

@@ -74,9 +74,15 @@ class ImportList extends Component {
         <div className={styles.enabled}>
 
           {
-            enabled &&
+            enabled ?
               <Label kind={kinds.SUCCESS}>
                 {translate('Enabled')}
+              </Label> :
+              <Label
+                kind={kinds.DISABLED}
+                outline={true}
+              >
+                {translate('Disabled')}
               </Label>
           }
 
@@ -86,16 +92,6 @@ class ImportList extends Component {
                 {translate('Auto')}
               </Label>
           }
-
-          {
-            !enabled && !enableAuto &&
-              <Label
-                kind={kinds.DISABLED}
-                outline={true}
-              >
-                {translate('Disabled')}
-              </Label>
-          }
         </div>
 
         <div className={styles.enabled}>

frontend/src/Settings/ImportLists/ImportLists/Manage/Edit/ManageImportListsEditModalContent.tsx

@@ -12,6 +12,7 @@ import translate from 'Utilities/String/translate';
 import styles from './ManageImportListsEditModalContent.css';
 
 interface SavePayload {
+  enabled?: boolean;
   enableAuto?: boolean;
   qualityProfileId?: number;
   rootFolderPath?: string;
@@ -25,7 +26,7 @@ interface ManageImportListsEditModalContentProps {
 
 const NO_CHANGE = 'noChange';
 
-const autoAddOptions = [
+const enableOptions = [
   {
     key: NO_CHANGE,
     get value() {
@@ -52,6 +53,7 @@ function ManageImportListsEditModalContent(
 ) {
   const { importListIds, onSavePress, onModalClose } = props;
 
+  const [enabled, setEnabled] = useState(NO_CHANGE);
   const [enableAuto, setEnableAuto] = useState(NO_CHANGE);
   const [qualityProfileId, setQualityProfileId] = useState<string | number>(
     NO_CHANGE
@@ -62,6 +64,11 @@ function ManageImportListsEditModalContent(
     let hasChanges = false;
     const payload: SavePayload = {};
 
+    if (enabled !== NO_CHANGE) {
+      hasChanges = true;
+      payload.enabled = enabled === 'enabled';
+    }
+
     if (enableAuto !== NO_CHANGE) {
       hasChanges = true;
       payload.enableAuto = enableAuto === 'enabled';
@@ -82,11 +89,21 @@ function ManageImportListsEditModalContent(
     }
 
     onModalClose();
-  }, [enableAuto, qualityProfileId, rootFolderPath, onSavePress, onModalClose]);
+  }, [
+    enabled,
+    enableAuto,
+    qualityProfileId,
+    rootFolderPath,
+    onSavePress,
+    onModalClose,
+  ]);
 
   const onInputChange = useCallback(
     ({ name, value }: { name: string; value: string }) => {
       switch (name) {
+        case 'enabled':
+          setEnabled(value);
+          break;
         case 'enableAuto':
           setEnableAuto(value);
           break;
@@ -110,6 +127,18 @@ function ManageImportListsEditModalContent(
       <ModalHeader>{translate('EditSelectedImportLists')}</ModalHeader>
 
       <ModalBody>
+        <FormGroup>
+          <FormLabel>{translate('Enabled')}</FormLabel>
+
+          <FormInputGroup
+            type={inputTypes.SELECT}
+            name="enabled"
+            value={enabled}
+            values={enableOptions}
+            onChange={onInputChange}
+          />
+        </FormGroup>
+
         <FormGroup>
           <FormLabel>{translate('AutomaticAdd')}</FormLabel>
 
@@ -117,7 +146,7 @@ function ManageImportListsEditModalContent(
             type={inputTypes.SELECT}
             name="enableAuto"
             value={enableAuto}
-            values={autoAddOptions}
+            values={enableOptions}
             onChange={onInputChange}
           />
         </FormGroup>

frontend/src/Settings/ImportLists/ImportLists/Manage/ManageImportListsModalContent.tsx

@@ -58,6 +58,12 @@ const COLUMNS = [
     isSortable: true,
     isVisible: true,
   },
+  {
+    name: 'enabled',
+    label: () => translate('Enabled'),
+    isSortable: true,
+    isVisible: true,
+  },
   {
     name: 'enableAuto',
     label: () => translate('AutomaticAdd'),

frontend/src/Settings/ImportLists/ImportLists/Manage/ManageImportListsModalRow.css

@@ -1,5 +1,6 @@
 .name,
 .tags,
+.enabled,
 .enableAuto,
 .qualityProfileId,
 .rootFolderPath,
@@ -7,4 +8,4 @@
   composes: cell from '~Components/Table/Cells/TableRowCell.css';
 
   word-break: break-all;
-}
+}

frontend/src/Settings/ImportLists/ImportLists/Manage/ManageImportListsModalRow.css.d.ts

@@ -2,6 +2,7 @@
 // Please do not change this file!
 interface CssExports {
   'enableAuto': string;
+  'enabled': string;
   'implementation': string;
   'name': string;
   'qualityProfileId': string;

frontend/src/Settings/ImportLists/ImportLists/Manage/ManageImportListsModalRow.tsx

@@ -7,6 +7,7 @@ import TableRow from 'Components/Table/TableRow';
 import TagListConnector from 'Components/TagListConnector';
 import { createQualityProfileSelectorForHook } from 'Store/Selectors/createQualityProfileSelector';
 import { SelectStateInputProps } from 'typings/props';
+import translate from 'Utilities/String/translate';
 import styles from './ManageImportListsModalRow.css';
 
 interface ManageImportListsModalRowProps {
@@ -16,6 +17,7 @@ interface ManageImportListsModalRowProps {
   qualityProfileId: number;
   implementation: string;
   tags: number[];
+  enabled: boolean;
   enableAuto: boolean;
   columns: Column[];
   isSelected?: boolean;
@@ -30,6 +32,7 @@ function ManageImportListsModalRow(props: ManageImportListsModalRowProps) {
     rootFolderPath,
     qualityProfileId,
     implementation,
+    enabled,
     enableAuto,
     tags,
     onSelectedChange,
@@ -63,15 +66,19 @@ function ManageImportListsModalRow(props: ManageImportListsModalRowProps) {
       </TableRowCell>
 
       <TableRowCell className={styles.qualityProfileId}>
-        {qualityProfile?.name ?? 'None'}
+        {qualityProfile?.name ?? translate('None')}
       </TableRowCell>
 
       <TableRowCell className={styles.rootFolderPath}>
         {rootFolderPath}
       </TableRowCell>
 
+      <TableRowCell className={styles.enabled}>
+        {enabled ? translate('Yes') : translate('No')}
+      </TableRowCell>
+
       <TableRowCell className={styles.enableAuto}>
-        {enableAuto ? 'Yes' : 'No'}
+        {enableAuto ? translate('Yes') : translate('No')}
       </TableRowCell>
 
       <TableRowCell className={styles.tags}>

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

@@ -6,6 +6,8 @@ import getSectionState from 'Utilities/State/getSectionState';
 import { set, updateServerSideCollection } from '../baseActions';
 
 function createFetchServerSideCollectionHandler(section, url, fetchDataAugmenter) {
+  const [baseSection] = section.split('.');
+
   return function(getState, payload, dispatch) {
     dispatch(set({ section, isFetching: true }));
 
@@ -25,10 +27,13 @@ function createFetchServerSideCollectionHandler(section, url, fetchDataAugmenter
 
     const {
       selectedFilterKey,
-      filters,
-      customFilters
+      filters
     } = sectionState;
 
+    const customFilters = getState().customFilters.items.filter((customFilter) => {
+      return customFilter.type === section || customFilter.type === baseSection;
+    });
+
     const selectedFilters = findSelectedFilters(selectedFilterKey, filters, customFilters);
 
     selectedFilters.forEach((filter) => {
@@ -37,7 +42,8 @@ function createFetchServerSideCollectionHandler(section, url, fetchDataAugmenter
 
     const promise = createAjaxRequest({
       url,
-      data
+      data,
+      traditional: true
     }).request;
 
     promise.done((response) => {

frontend/src/Store/Actions/calendarActions.js

@@ -49,8 +49,6 @@ export const defaultState = {
 
   selectedFilterKey: 'monitored',
 
-  customFilters: [],
-
   filters: [
     {
       key: 'all',

frontend/src/Store/Actions/discoverMovieActions.js

@@ -9,7 +9,7 @@ import getNewMovie from 'Utilities/Movie/getNewMovie';
 import getSectionState from 'Utilities/State/getSectionState';
 import updateSectionState from 'Utilities/State/updateSectionState';
 import translate from 'Utilities/String/translate';
-import { removeItem, set, updateItem } from './baseActions';
+import { removeItem, set, update, updateItem } from './baseActions';
 import createHandleActions from './Creators/createHandleActions';
 import createClearReducer from './Creators/Reducers/createClearReducer';
 import createSetClientSideCollectionFilterReducer from './Creators/Reducers/createSetClientSideCollectionFilterReducer';
@@ -507,11 +507,11 @@ export const actionHandlers = handleThunks({
     }).request;
 
     promise.done((data) => {
-      // set an Id so the selectors and updaters done blow up.
+      // set an ID so the selectors and updaters done blow up.
       data = data.map((movie) => ({ ...movie, id: movie.tmdbId }));
 
       dispatch(batchActions([
-        ...data.map((movie) => updateItem({ section, ...movie })),
+        update({ section, data }),
 
         set({
           section,

frontend/src/Store/Actions/historyActions.js

@@ -1,7 +1,7 @@
 import React from 'react';
 import { createAction } from 'redux-actions';
 import Icon from 'Components/Icon';
-import { filterTypes, icons, sortDirections } from 'Helpers/Props';
+import { filterBuilderTypes, filterBuilderValueTypes, filterTypes, icons, sortDirections } from 'Helpers/Props';
 import { createThunk, handleThunks } from 'Store/thunks';
 import createAjaxRequest from 'Utilities/createAjaxRequest';
 import serverSideCollectionHandlers from 'Utilities/serverSideCollectionHandlers';
@@ -177,6 +177,33 @@ export const defaultState = {
         }
       ]
     }
+  ],
+
+  filterBuilderProps: [
+    {
+      name: 'eventType',
+      label: () => translate('EventType'),
+      type: filterBuilderTypes.EQUAL,
+      valueType: filterBuilderValueTypes.HISTORY_EVENT_TYPE
+    },
+    {
+      name: 'movieIds',
+      label: () => translate('Movie'),
+      type: filterBuilderTypes.EQUAL,
+      valueType: filterBuilderValueTypes.MOVIE
+    },
+    {
+      name: 'quality',
+      label: () => translate('Quality'),
+      type: filterBuilderTypes.EQUAL,
+      valueType: filterBuilderValueTypes.QUALITY
+    },
+    {
+      name: 'languages',
+      label: () => translate('Languages'),
+      type: filterBuilderTypes.CONTAINS,
+      valueType: filterBuilderValueTypes.LANGUAGE
+    }
   ]
 
 };

frontend/src/Store/Actions/interactiveImportActions.js

@@ -28,8 +28,8 @@ export const defaultState = {
   isReprocessing: false,
   error: null,
   items: [],
-  sortKey: 'quality',
-  sortDirection: sortDirections.DESCENDING,
+  sortKey: 'relativePath',
+  sortDirection: sortDirections.ASCENDING,
   recentFolders: [],
   importMode: 'chooseImportMode',
   sortPredicates: {

frontend/src/Store/Actions/queueActions.js

@@ -4,7 +4,7 @@ import React from 'react';
 import { createAction } from 'redux-actions';
 import { batchActions } from 'redux-batched-actions';
 import Icon from 'Components/Icon';
-import { icons, sortDirections } from 'Helpers/Props';
+import { filterBuilderTypes, filterBuilderValueTypes, icons, sortDirections } from 'Helpers/Props';
 import { createThunk, handleThunks } from 'Store/thunks';
 import createAjaxRequest from 'Utilities/createAjaxRequest';
 import serverSideCollectionHandlers from 'Utilities/serverSideCollectionHandlers';
@@ -159,6 +159,43 @@ export const defaultState = {
         isVisible: true,
         isModifiable: false
       }
+    ],
+
+    selectedFilterKey: 'all',
+
+    filters: [
+      {
+        key: 'all',
+        label: 'All',
+        filters: []
+      }
+    ],
+
+    filterBuilderProps: [
+      {
+        name: 'movieIds',
+        label: () => translate('Movie'),
+        type: filterBuilderTypes.EQUAL,
+        valueType: filterBuilderValueTypes.MOVIE
+      },
+      {
+        name: 'quality',
+        label: () => translate('Quality'),
+        type: filterBuilderTypes.EQUAL,
+        valueType: filterBuilderValueTypes.QUALITY
+      },
+      {
+        name: 'languages',
+        label: () => translate('Languages'),
+        type: filterBuilderTypes.CONTAINS,
+        valueType: filterBuilderValueTypes.LANGUAGE
+      },
+      {
+        name: 'protocol',
+        label: () => translate('Protocol'),
+        type: filterBuilderTypes.EQUAL,
+        valueType: filterBuilderValueTypes.PROTOCOL
+      }
     ]
   },
   sortPredicates: {
@@ -173,7 +210,8 @@ export const persistState = [
   'queue.paged.pageSize',
   'queue.paged.sortKey',
   'queue.paged.sortDirection',
-  'queue.paged.columns'
+  'queue.paged.columns',
+  'queue.paged.selectedFilterKey'
 ];
 
 //
@@ -198,6 +236,7 @@ export const GOTO_NEXT_QUEUE_PAGE = 'queue/gotoQueueNextPage';
 export const GOTO_LAST_QUEUE_PAGE = 'queue/gotoQueueLastPage';
 export const GOTO_QUEUE_PAGE = 'queue/gotoQueuePage';
 export const SET_QUEUE_SORT = 'queue/setQueueSort';
+export const SET_QUEUE_FILTER = 'queue/setQueueFilter';
 export const SET_QUEUE_TABLE_OPTION = 'queue/setQueueTableOption';
 export const SET_QUEUE_OPTION = 'queue/setQueueOption';
 export const CLEAR_QUEUE = 'queue/clearQueue';
@@ -222,6 +261,7 @@ export const gotoQueueNextPage = createThunk(GOTO_NEXT_QUEUE_PAGE);
 export const gotoQueueLastPage = createThunk(GOTO_LAST_QUEUE_PAGE);
 export const gotoQueuePage = createThunk(GOTO_QUEUE_PAGE);
 export const setQueueSort = createThunk(SET_QUEUE_SORT);
+export const setQueueFilter = createThunk(SET_QUEUE_FILTER);
 export const setQueueTableOption = createAction(SET_QUEUE_TABLE_OPTION);
 export const setQueueOption = createAction(SET_QUEUE_OPTION);
 export const clearQueue = createAction(CLEAR_QUEUE);
@@ -268,7 +308,8 @@ export const actionHandlers = handleThunks({
       [serverSideCollectionHandlers.NEXT_PAGE]: GOTO_NEXT_QUEUE_PAGE,
       [serverSideCollectionHandlers.LAST_PAGE]: GOTO_LAST_QUEUE_PAGE,
       [serverSideCollectionHandlers.EXACT_PAGE]: GOTO_QUEUE_PAGE,
-      [serverSideCollectionHandlers.SORT]: SET_QUEUE_SORT
+      [serverSideCollectionHandlers.SORT]: SET_QUEUE_SORT,
+      [serverSideCollectionHandlers.FILTER]: SET_QUEUE_FILTER
     },
     fetchDataAugmenter
   ),

frontend/src/Styles/Themes/dark.js

@@ -70,7 +70,7 @@ module.exports = {
   // Toolbar
   toolbarColor: '#e1e2e3',
   toolbarBackgroundColor: '#262626',
-  toolbarMenuItemBackgroundColor: '#606060',
+  toolbarMenuItemBackgroundColor: '#303030',
   toolbarMenuItemHoverBackgroundColor: '#515151',
   toolbarLabelColor: '#e1e2e3',
 

frontend/src/System/Backup/BackupRow.js

@@ -116,6 +116,7 @@ class BackupRow extends Component {
 
         <TableRowCell className={styles.actions}>
           <IconButton
+            title={translate('RestoreBackup')}
             name={icons.RESTORE}
             onPress={this.onRestorePress}
           />
@@ -138,7 +139,9 @@ class BackupRow extends Component {
           isOpen={isConfirmDeleteModalOpen}
           kind={kinds.DANGER}
           title={translate('DeleteBackup')}
-          message={translate('DeleteBackupMessageText', { name })}
+          message={translate('DeleteBackupMessageText', {
+            name
+          })}
           confirmLabel={translate('Delete')}
           onConfirm={this.onConfirmDeletePress}
           onCancel={this.onConfirmDeleteModalClose}

frontend/src/System/Backup/Backups.js

@@ -109,7 +109,7 @@ class Backups extends Component {
           {
             !isFetching && !!error &&
               <Alert kind={kinds.DANGER}>
-                {translate('UnableToLoadBackups')}
+                {translate('BackupsLoadError')}
               </Alert>
           }
 

frontend/src/System/Backup/RestoreBackupModalContent.js

@@ -146,7 +146,9 @@ class RestoreBackupModalContent extends Component {
 
         <ModalBody>
           {
-            !!id && translate('WouldYouLikeToRestoreBackup', { name })
+            !!id && translate('WouldYouLikeToRestoreBackup', {
+              name
+            })
           }
 
           {

frontend/src/System/Logs/Files/LogFiles.js

@@ -1,8 +1,8 @@
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import Alert from 'Components/Alert';
-import Link from 'Components/Link/Link';
 import LoadingIndicator from 'Components/Loading/LoadingIndicator';
+import InlineMarkdown from 'Components/Markdown/InlineMarkdown';
 import PageContent from 'Components/Page/PageContent';
 import PageContentBody from 'Components/Page/PageContentBody';
 import PageToolbar from 'Components/Page/Toolbar/PageToolbar';
@@ -67,7 +67,7 @@ class LogFiles extends Component {
             />
 
             <PageToolbarButton
-              label={translate('Delete')}
+              label={translate('Clear')}
               iconName={icons.CLEAR}
               isSpinning={deleteFilesExecuting}
               onPress={onDeleteFilesPress}
@@ -77,13 +77,15 @@ class LogFiles extends Component {
         <PageContentBody>
           <Alert>
             <div>
-              Log files are located in: {location}
+              {translate('LogFilesLocation', {
+                location
+              })}
             </div>
 
             {
               currentLogView === 'Log Files' &&
                 <div>
-                  {translate('TheLogLevelDefault')} <Link to="/settings/general">{translate('GeneralSettings')}</Link>
+                  <InlineMarkdown data={translate('TheLogLevelDefault')} />
                 </div>
             }
           </Alert>

frontend/src/System/Logs/LogsNavMenu.js

@@ -4,6 +4,7 @@ import Menu from 'Components/Menu/Menu';
 import MenuButton from 'Components/Menu/MenuButton';
 import MenuContent from 'Components/Menu/MenuContent';
 import MenuItem from 'Components/Menu/MenuItem';
+import translate from 'Utilities/String/translate';
 
 class LogsNavMenu extends Component {
 
@@ -50,13 +51,13 @@ class LogsNavMenu extends Component {
           <MenuItem
             to={'/system/logs/files'}
           >
-            Log Files
+            {translate('LogFiles')}
           </MenuItem>
 
           <MenuItem
             to={'/system/logs/files/update'}
           >
-            Updater Log Files
+            {translate('UpdaterLogFiles')}
           </MenuItem>
         </MenuContent>
       </Menu>

frontend/src/System/Status/About/About.js

@@ -45,7 +45,14 @@ class About extends Component {
             packageVersion &&
               <DescriptionListItem
                 title={translate('PackageVersion')}
-                data={(packageAuthor ? <span> {packageVersion} {' by '} <InlineMarkdown data={packageAuthor} /> </span> : packageVersion)}
+                data={(packageAuthor ?
+                  <InlineMarkdown data={translate('PackageVersionInfo', {
+                    packageVersion,
+                    packageAuthor
+                  })}
+                  /> :
+                  packageVersion
+                )}
               />
           }
 

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

@@ -153,7 +153,7 @@ class Health extends Component {
         {
           !healthIssues &&
             <div className={styles.healthOk}>
-              {translate('HealthNoIssues')}
+              {translate('NoIssuesWithYourConfiguration')}
             </div>
         }
 

frontend/src/System/Status/MoreInfo/MoreInfo.js

@@ -26,7 +26,7 @@ class MoreInfo extends Component {
             {translate('Wiki')}
           </DescriptionListItemTitle>
           <DescriptionListItemDescription>
-            <Link to="https://wiki.servarr.com/radarr">{translate('Wiki')}</Link>
+            <Link to="https://wiki.servarr.com/radarr">wiki.servarr.com/radarr</Link>
           </DescriptionListItemDescription>
 
           <DescriptionListItemTitle>

frontend/src/System/Updates/Updates.js

@@ -44,7 +44,7 @@ class Updates extends Component {
     const hasUpdateToInstall = hasUpdates && _.some(items, { installable: true, latest: true });
     const noUpdateToInstall = hasUpdates && !hasUpdateToInstall;
 
-    const externalUpdaterPrefix = translate('UnableToUpdateRadarrDirectly');
+    const externalUpdaterPrefix = translate('UpdateRadarrDirectlyLoadError');
     const externalUpdaterMessages = {
       external: translate('ExternalUpdater'),
       apt: translate('AptUpdater'),
@@ -176,7 +176,7 @@ class Updates extends Component {
                                 kind={kinds.INVERSE}
                                 title={formatDateTime(update.installedOn, longDateFormat, timeFormat)}
                               >
-                                Previously Installed
+                                {translate('PreviouslyInstalled')}
                               </Label> :
                               null
                           }
@@ -213,14 +213,14 @@ class Updates extends Component {
           {
             !!updatesError &&
               <div>
-                Failed to fetch updates
+                {translate('FailedToFetchUpdates')}
               </div>
           }
 
           {
             !!generalSettingsError &&
               <div>
-                Failed to update settings
+                {translate('FailedToUpdateSettings')}
               </div>
           }
         </PageContentBody>

frontend/src/Utilities/String/translate.ts

@@ -25,20 +25,18 @@ export async function fetchTranslations(): Promise<boolean> {
 
 export default function translate(
   key: string,
-  tokens?: Record<string, string | number | boolean>
+  tokens: Record<string, string | number | boolean> = {}
 ) {
   const translation = translations[key] || key;
 
-  if (tokens) {
-    // Fallback to the old behaviour for translations not yet updated to use named tokens
-    Object.values(tokens).forEach((value, index) => {
-      tokens[index] = value;
-    });
+  tokens.appName = 'Radarr';
 
-    return translation.replace(/\{([a-z0-9]+?)\}/gi, (match, tokenMatch) =>
-      String(tokens[tokenMatch] ?? match)
-    );
-  }
+  // Fallback to the old behaviour for translations not yet updated to use named tokens
+  Object.values(tokens).forEach((value, index) => {
+    tokens[index] = value;
+  });
 
-  return translation;
+  return translation.replace(/\{([a-z0-9]+?)\}/gi, (match, tokenMatch) =>
+    String(tokens[tokenMatch] ?? match)
+  );
 }

frontend/src/typings/History.ts

@@ -0,0 +1,27 @@
+import Language from 'Language/Language';
+import { QualityModel } from 'Quality/Quality';
+import CustomFormat from './CustomFormat';
+
+export type HistoryEventType =
+  | 'grabbed'
+  | 'downloadFolderImported'
+  | 'downloadFailed'
+  | 'movieFileDeleted'
+  | 'movieFolderImported'
+  | 'movieFileRenamed'
+  | 'downloadIgnored';
+
+export default interface History {
+  movieId: number;
+  sourceTitle: string;
+  languages: Language[];
+  quality: QualityModel;
+  customFormats: CustomFormat[];
+  customFormatScore: number;
+  qualityCutoffNotMet: boolean;
+  date: string;
+  downloadId: string;
+  eventType: HistoryEventType;
+  data: unknown;
+  id: number;
+}

frontend/src/typings/ImportList.ts

@@ -12,6 +12,7 @@ export interface Field {
 
 interface ImportList extends ModelBase {
   enable: boolean;
+  enabled: boolean;
   enableAuto: boolean;
   qualityProfileId: number;
   rootFolderPath: string;

frontend/src/typings/Queue.ts

@@ -0,0 +1,43 @@
+import ModelBase from 'App/ModelBase';
+import Language from 'Language/Language';
+import { QualityModel } from 'Quality/Quality';
+import CustomFormat from 'typings/CustomFormat';
+
+export type QueueTrackedDownloadStatus = 'ok' | 'warning' | 'error';
+
+export type QueueTrackedDownloadState =
+  | 'downloading'
+  | 'importPending'
+  | 'importing'
+  | 'imported'
+  | 'failedPending'
+  | 'failed'
+  | 'ignored';
+
+export interface StatusMessage {
+  title: string;
+  messages: string[];
+}
+
+interface Queue extends ModelBase {
+  languages: Language[];
+  quality: QualityModel;
+  customFormats: CustomFormat[];
+  size: number;
+  title: string;
+  sizeleft: number;
+  timeleft: string;
+  estimatedCompletionTime: string;
+  status: string;
+  trackedDownloadStatus: QueueTrackedDownloadStatus;
+  trackedDownloadState: QueueTrackedDownloadState;
+  statusMessages: StatusMessage[];
+  errorMessage: string;
+  downloadId: string;
+  protocol: string;
+  downloadClient: string;
+  outputPath: string;
+  movieHasFile: boolean;
+  movieId?: number;
+}
+export default Queue;

src/NzbDrone.Common/Radarr.Common.csproj

@@ -16,7 +16,7 @@
     <PackageReference Include="SharpZipLib" Version="1.3.3" />
     <PackageReference Include="System.Text.Json" Version="6.0.8" />
     <PackageReference Include="System.ValueTuple" Version="4.5.0" />
-    <PackageReference Include="System.Data.SQLite.Core.Servarr" Version="1.0.118-22" />
+    <PackageReference Include="System.Data.SQLite.Core.Servarr" Version="1.0.115.5-18" />
     <PackageReference Include="System.Configuration.ConfigurationManager" Version="6.0.1" />
     <PackageReference Include="System.IO.FileSystem.AccessControl" Version="5.0.0" />
     <PackageReference Include="System.Runtime.Loader" Version="4.3.0" />

src/NzbDrone.Core.Test/DecisionEngineTests/RawDiskSpecificationFixture.cs

@@ -86,5 +86,13 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
             _remoteMovie.Release.Title = title;
             Subject.IsSatisfiedBy(_remoteMovie, null).Accepted.Should().BeFalse();
         }
+
+        [TestCase("Series Title EP50 USLT NTSC DVDRemux DD2.0")]
+        [TestCase("Series.Title.S01.NTSC.DVDRip.DD2.0.x264-PLAiD")]
+        public void should_return_true_if_dvdrip(string title)
+        {
+            _remoteMovie.Release.Title = title;
+            Subject.IsSatisfiedBy(_remoteMovie, null).Accepted.Should().BeTrue();
+        }
     }
 }

src/NzbDrone.Core.Test/IndexerTests/IndexerStatusServiceFixture.cs

@@ -68,5 +68,16 @@ namespace NzbDrone.Core.Test.IndexerTests
 
             VerifyNoUpdate();
         }
+
+        [Test]
+        public void should_not_record_failure_for_unknown_provider()
+        {
+            Subject.RecordFailure(0);
+
+            Mocker.GetMock<IIndexerStatusRepository>()
+                .Verify(v => v.FindByProviderId(1), Times.Never);
+
+            VerifyNoUpdate();
+        }
     }
 }

src/NzbDrone.Core.Test/Localization/LocalizationServiceFixture.cs

@@ -24,35 +24,28 @@ namespace NzbDrone.Core.Test.Localization
         [Test]
         public void should_get_string_in_dictionary_if_lang_exists_and_string_exists()
         {
-            var localizedString = Subject.GetLocalizedString("UiLanguage");
+            var localizedString = Subject.GetLocalizedString("UILanguage");
 
             localizedString.Should().Be("UI Language");
         }
 
         [Test]
-        public void should_get_string_in_default_language_dictionary_if_no_lang_country_code_exists_and_string_exists()
+        public void should_get_string_in_french()
         {
-            var localizedString = Subject.GetLocalizedString("UiLanguage", "fr_fr");
+            Mocker.GetMock<IConfigService>().Setup(m => m.UILanguage).Returns((int)Language.French);
+
+            var localizedString = Subject.GetLocalizedString("UILanguage");
 
             localizedString.Should().Be("Langue de l'IU");
 
-            ExceptionVerification.ExpectedErrors(1);
+            ExceptionVerification.ExpectedErrors(0);
         }
 
         [Test]
-        public void should_get_string_in_default_dictionary_if_no_lang_exists_and_string_exists()
+        public void should_get_string_in_default_dictionary_if_unknown_language_and_string_exists()
         {
-            var localizedString = Subject.GetLocalizedString("UiLanguage", "an");
-
-            localizedString.Should().Be("UI Language");
-
-            ExceptionVerification.ExpectedErrors(1);
-        }
-
-        [Test]
-        public void should_get_string_in_default_dictionary_if_lang_empty_and_string_exists()
-        {
-            var localizedString = Subject.GetLocalizedString("UiLanguage", "");
+            Mocker.GetMock<IConfigService>().Setup(m => m.UILanguage).Returns(0);
+            var localizedString = Subject.GetLocalizedString("UILanguage");
 
             localizedString.Should().Be("UI Language");
         }
@@ -60,7 +53,7 @@ namespace NzbDrone.Core.Test.Localization
         [Test]
         public void should_return_argument_if_string_doesnt_exists()
         {
-            var localizedString = Subject.GetLocalizedString("badString", "en");
+            var localizedString = Subject.GetLocalizedString("badString");
 
             localizedString.Should().Be("badString");
         }

src/NzbDrone.Core.Test/OrganizerTests/FileNameBuilderTests/MovieTitleFirstCharacterFixture.cs

@@ -37,6 +37,12 @@ namespace NzbDrone.Core.Test.OrganizerTests.FileNameBuilderTests
         [TestCase("The Mist", "M", "The Mist")]
         [TestCase("A", "A", "A")]
         [TestCase("30 Rock", "3", "30 Rock")]
+        [TestCase("The '80s Greatest", "8", "The '80s Greatest")]
+        [TestCase("좀비버스", "좀", "좀비버스")]
+        [TestCase("¡Mucha Lucha!", "M", "¡Mucha Lucha!")]
+        [TestCase(".hack", "H", "hack")]
+        [TestCase("Ütopya", "U", "Ütopya")]
+        [TestCase("Æon Flux", "A", "Æon Flux")]
         public void should_get_expected_folder_name_back(string title, string parent, string child)
         {
             _movie.Title = title;

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

@@ -219,6 +219,7 @@ namespace NzbDrone.Core.Test.ParserTests
         }
 
         [TestCase("Movie.Title.1994.Vietnamese.1080p.XviD-LOL")]
+        [TestCase("Movie.Title.1994.VIE.1080p.XviD-LOL")]
         public void should_parse_language_vietnamese(string postTitle)
         {
             var result = Parser.Parser.ParseMovieTitle(postTitle, true);

src/NzbDrone.Core.Test/Radarr.Core.Test.csproj

@@ -5,7 +5,7 @@
   <ItemGroup>
     <PackageReference Include="Dapper" Version="2.0.143" />
     <PackageReference Include="NBuilder" Version="6.1.0" />
-    <PackageReference Include="System.Data.SQLite.Core.Servarr" Version="1.0.118-22" />
+    <PackageReference Include="System.Data.SQLite.Core.Servarr" Version="1.0.115.5-18" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\NzbDrone.Test.Common\Radarr.Test.Common.csproj" />

src/NzbDrone.Core/Analytics/AnalyticsService.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Linq;
 using NzbDrone.Common.EnvironmentInfo;
 using NzbDrone.Core.Configuration;
@@ -30,7 +30,7 @@ namespace NzbDrone.Core.Analytics
         {
             get
             {
-                var lastRecord = _historyService.Paged(new PagingSpec<MovieHistory>() { Page = 0, PageSize = 1, SortKey = "date", SortDirection = SortDirection.Descending });
+                var lastRecord = _historyService.Paged(new PagingSpec<MovieHistory>() { Page = 0, PageSize = 1, SortKey = "date", SortDirection = SortDirection.Descending }, null, null);
                 var monthAgo = DateTime.UtcNow.AddMonths(-1);
 
                 return lastRecord.Records.Any(v => v.Date > monthAgo);

src/NzbDrone.Core/AutoTagging/Specifications/GenreSpecification.cs

@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using FluentValidation;
+using NzbDrone.Common.Extensions;
 using NzbDrone.Core.Annotations;
 using NzbDrone.Core.Movies;
 using NzbDrone.Core.Validation;
@@ -27,7 +28,7 @@ namespace NzbDrone.Core.AutoTagging.Specifications
 
         protected override bool IsSatisfiedByWithoutNegate(Movie movie)
         {
-            return movie.MovieMetadata.Value.Genres.Any(genre => Value.Contains(genre));
+            return movie?.MovieMetadata?.Value?.Genres.Any(genre => Value.ContainsIgnoreCase(genre)) ?? false;
         }
 
         public override NzbDroneValidationResult Validate()

src/NzbDrone.Core/Configuration/ConfigFileProvider.cs

@@ -323,6 +323,20 @@ namespace NzbDrone.Core.Configuration
             }
         }
 
+        public void MigrateConfigFile()
+        {
+            if (!File.Exists(_configFile))
+            {
+                return;
+            }
+
+            // If SSL is enabled and a cert hash is still in the config file disable SSL
+            if (EnableSsl && GetValue("SslCertHash", null).IsNotNullOrWhiteSpace())
+            {
+                SetValue("EnableSsl", false);
+            }
+        }
+
         private void DeleteOldValues()
         {
             var xDoc = LoadConfigFile();
@@ -394,6 +408,7 @@ namespace NzbDrone.Core.Configuration
 
         public void HandleAsync(ApplicationStartedEvent message)
         {
+            MigrateConfigFile();
             EnsureDefaultConfigFile();
             DeleteOldValues();
         }

src/NzbDrone.Core/CustomFormats/CustomFormatCalculationService.cs

@@ -162,7 +162,7 @@ namespace NzbDrone.Core.CustomFormats
                 }
             }
 
-            return matches;
+            return matches.OrderBy(x => x.Name).ToList();
         }
 
         private static List<CustomFormat> ParseCustomFormat(MovieFile movieFile, Movie movie, List<CustomFormat> allCustomFormats)

src/NzbDrone.Core/Datastore/BasicRepository.cs

@@ -407,7 +407,7 @@ namespace NzbDrone.Core.Datastore
             return pagingSpec;
         }
 
-        private void AddFilters(SqlBuilder builder, PagingSpec<TModel> pagingSpec)
+        protected void AddFilters(SqlBuilder builder, PagingSpec<TModel> pagingSpec)
         {
             var filters = pagingSpec.FilterExpressions;
 

src/NzbDrone.Core/Datastore/ConnectionStringFactory.cs

@@ -41,14 +41,16 @@ namespace NzbDrone.Core.Datastore
 
         private static string GetConnectionString(string dbPath)
         {
-            var connectionBuilder = new SQLiteConnectionStringBuilder();
-
-            connectionBuilder.DataSource = dbPath;
-            connectionBuilder.CacheSize = (int)-20000;
-            connectionBuilder.DateTimeKind = DateTimeKind.Utc;
-            connectionBuilder.JournalMode = OsInfo.IsOsx ? SQLiteJournalModeEnum.Truncate : SQLiteJournalModeEnum.Wal;
-            connectionBuilder.Pooling = true;
-            connectionBuilder.Version = 3;
+            var connectionBuilder = new SQLiteConnectionStringBuilder
+            {
+                DataSource = dbPath,
+                CacheSize = (int)-20000,
+                DateTimeKind = DateTimeKind.Utc,
+                JournalMode = OsInfo.IsOsx ? SQLiteJournalModeEnum.Truncate : SQLiteJournalModeEnum.Wal,
+                Pooling = true,
+                Version = 3,
+                BusyTimeout = 100
+            };
 
             if (OsInfo.IsOsx)
             {

src/NzbDrone.Core/DecisionEngine/Specifications/RawDiskSpecification.cs

@@ -13,7 +13,7 @@ namespace NzbDrone.Core.DecisionEngine.Specifications
                                                     {
                                                         new Regex(@"(?:dis[ck])(?:[-_. ]\d+[-_. ])(?:(?:(?:480|720|1080|2160)[ip]|)[-_. ])?(?:Blu\-?ray)", RegexOptions.Compiled | RegexOptions.IgnoreCase),
                                                         new Regex(@"(?:(?:480|720|1080|2160)[ip]|)[-_. ](?:full)[-_. ](?:Blu\-?ray)", RegexOptions.Compiled | RegexOptions.IgnoreCase),
-                                                        new Regex(@"(?:\d?x?M?DVD-?[R59])", RegexOptions.Compiled | RegexOptions.IgnoreCase)
+                                                        new Regex(@"(?:\d?x?M?DVD-?[R59])(?:[ ._]|$)", RegexOptions.Compiled | RegexOptions.IgnoreCase)
                                                     };
 
         private static readonly string[] _dvdContainerTypes = new[] { "vob", "iso" };

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

@@ -1,4 +1,5 @@
-using NLog;
+using System.Collections.Generic;
+using NLog;
 using NzbDrone.Core.Configuration;
 using NzbDrone.Core.Configuration.Events;
 using NzbDrone.Core.Lifecycle;
@@ -28,7 +29,7 @@ namespace NzbDrone.Core.HealthCheck.Checks
             {
                 _logger.Warn("Please update your API key to be at least {0} characters long. You can do this via settings or the config file", MinimumLength);
 
-                return new HealthCheck(GetType(), HealthCheckResult.Warning, string.Format(_localizationService.GetLocalizedString("ApiKeyValidationHealthCheckMessage"), MinimumLength), "#invalid-api-key");
+                return new HealthCheck(GetType(), HealthCheckResult.Warning, _localizationService.GetLocalizedString("ApiKeyValidationHealthCheckMessage", new Dictionary<string, object> { { "length", MinimumLength } }), "#invalid-api-key");
             }
 
             return new HealthCheck(GetType());

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

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using NLog;
 using NzbDrone.Core.Download;
@@ -42,8 +43,14 @@ namespace NzbDrone.Core.HealthCheck.Checks
                 {
                     _logger.Debug(ex, "Unable to communicate with {0}", downloadClient.Definition.Name);
 
-                    var message = string.Format(_localizationService.GetLocalizedString("DownloadClientCheckUnableToCommunicateMessage"), downloadClient.Definition.Name);
-                    return new HealthCheck(GetType(), HealthCheckResult.Error, $"{message} {ex.Message}", "#unable-to-communicate-with-download-client");
+                    return new HealthCheck(GetType(),
+                        HealthCheckResult.Error,
+                        _localizationService.GetLocalizedString("DownloadClientCheckUnableToCommunicateMessage", new Dictionary<string, object>
+                        {
+                            { "downloadClientName", downloadClient.Definition.Name },
+                            { "errorMessage", ex.Message }
+                        }),
+                        "#unable-to-communicate-with-download-client");
                 }
             }
 

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

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using NLog;
 using NzbDrone.Core.Datastore.Events;
 using NzbDrone.Core.Download;
@@ -44,7 +45,10 @@ namespace NzbDrone.Core.HealthCheck.Checks
                     {
                         return new HealthCheck(GetType(),
                             HealthCheckResult.Warning,
-                            string.Format(_localizationService.GetLocalizedString("DownloadClientRemovesCompletedDownloadsHealthCheckMessage"), clientName, "Radarr"),
+                            _localizationService.GetLocalizedString("DownloadClientRemovesCompletedDownloadsHealthCheckMessage", new Dictionary<string, object>
+                            {
+                                { "downloadClientName", clientName }
+                            }),
                             "#download-client-removes-completed-downloads");
                     }
                 }

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

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Net.Http;
 using NLog;
@@ -52,7 +53,14 @@ namespace NzbDrone.Core.HealthCheck.Checks
 
                     foreach (var folder in folders)
                     {
-                        return new HealthCheck(GetType(), HealthCheckResult.Warning, string.Format(_localizationService.GetLocalizedString("DownloadClientCheckDownloadingToRoot"), client.Definition.Name, folder.FullPath), "#downloads-in-root-folder");
+                        return new HealthCheck(GetType(),
+                            HealthCheckResult.Warning,
+                            _localizationService.GetLocalizedString("DownloadClientCheckDownloadingToRoot", new Dictionary<string, object>
+                            {
+                                { "downloadClientName", client.Definition.Name },
+                                { "path", folder.FullPath }
+                            }),
+                            "#downloads-in-root-folder");
                     }
                 }
                 catch (DownloadClientException ex)

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

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using NLog;
 using NzbDrone.Common.Extensions;
 using NzbDrone.Core.Datastore.Events;
@@ -43,7 +44,14 @@ namespace NzbDrone.Core.HealthCheck.Checks
 
                     if (status.SortingMode.IsNotNullOrWhiteSpace())
                     {
-                        return new HealthCheck(GetType(), HealthCheckResult.Warning, string.Format(_localizationService.GetLocalizedString("DownloadClientSortingCheckMessage"), clientName, status.SortingMode), "#download-folder-and-library-folder-not-different-folders");
+                        return new HealthCheck(GetType(),
+                            HealthCheckResult.Warning,
+                            _localizationService.GetLocalizedString("DownloadClientSortingCheckMessage", new Dictionary<string, object>
+                            {
+                                { "downloadClientName", clientName },
+                                { "sortingMode", status.SortingMode }
+                            }),
+                            "#download-folder-and-library-folder-not-different-folders");
                     }
                 }
                 catch (DownloadClientException ex)

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

@@ -1,3 +1,4 @@
+using System.Collections.Generic;
 using System.Linq;
 using NzbDrone.Common.Extensions;
 using NzbDrone.Core.Download;
@@ -40,7 +41,13 @@ namespace NzbDrone.Core.HealthCheck.Checks
                 return new HealthCheck(GetType(), HealthCheckResult.Error, _localizationService.GetLocalizedString("DownloadClientStatusCheckAllClientMessage"), "#download-clients-are-unavailable-due-to-failures");
             }
 
-            return new HealthCheck(GetType(), HealthCheckResult.Warning, string.Format(_localizationService.GetLocalizedString("DownloadClientStatusCheckSingleClientMessage"), string.Join(", ", backOffProviders.Select(v => v.Provider.Definition.Name))), "#download-clients-are-unavailable-due-to-failures");
+            return new HealthCheck(GetType(),
+                HealthCheckResult.Warning,
+                _localizationService.GetLocalizedString("DownloadClientStatusCheckSingleClientMessage", new Dictionary<string, object>
+                {
+                    { "downloadClientNames", string.Join(", ", backOffProviders.Select(v => v.Provider.Definition.Name)) }
+                }),
+                "#download-clients-are-unavailable-due-to-failures");
         }
     }
 }

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

@@ -54,11 +54,23 @@ namespace NzbDrone.Core.HealthCheck.Checks
                 if (missingRootFolders.Count == 1)
                 {
                     var missingRootFolder = missingRootFolders.First();
-                    return new HealthCheck(GetType(), HealthCheckResult.Error, string.Format(_localizationService.GetLocalizedString("ImportListMissingRoot"), FormatRootFolder(missingRootFolder.Key, missingRootFolder.Value)), "#import-list-missing-root-folder");
+
+                    return new HealthCheck(GetType(),
+                        HealthCheckResult.Error,
+                        _localizationService.GetLocalizedString("ImportListMissingRoot", new Dictionary<string, object>
+                        {
+                            { "rootFolderInfo", FormatRootFolder(missingRootFolder.Key, missingRootFolder.Value) }
+                        }),
+                        "#import-list-missing-root-folder");
                 }
 
-                var message = string.Format(_localizationService.GetLocalizedString("ImportListMultipleMissingRoots"), string.Join(" | ", missingRootFolders.Select(m => FormatRootFolder(m.Key, m.Value))));
-                return new HealthCheck(GetType(), HealthCheckResult.Error, message, "#import-list-missing-root-folder");
+                return new HealthCheck(GetType(),
+                    HealthCheckResult.Error,
+                    _localizationService.GetLocalizedString("ImportListMultipleMissingRoots", new Dictionary<string, object>
+                    {
+                        { "rootFoldersInfo", string.Join(" | ", missingRootFolders.Select(m => FormatRootFolder(m.Key, m.Value))) }
+                    }),
+                    "#import-list-missing-root-folder");
             }
 
             return new HealthCheck(GetType());

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

@@ -1,3 +1,4 @@
+using System.Collections.Generic;
 using System.Linq;
 using NzbDrone.Common.Extensions;
 using NzbDrone.Core.ImportLists;
@@ -40,7 +41,13 @@ namespace NzbDrone.Core.HealthCheck.Checks
                 return new HealthCheck(GetType(), HealthCheckResult.Error, _localizationService.GetLocalizedString("ImportListStatusCheckAllClientMessage"), "#lists-are-unavailable-due-to-failures");
             }
 
-            return new HealthCheck(GetType(), HealthCheckResult.Warning, string.Format(_localizationService.GetLocalizedString("ImportListStatusCheckSingleClientMessage"), string.Join(", ", backOffProviders.Select(v => v.ImportList.Definition.Name))), "#lists-are-unavailable-due-to-failures");
+            return new HealthCheck(GetType(),
+                HealthCheckResult.Warning,
+                _localizationService.GetLocalizedString("ImportListStatusCheckSingleClientMessage", new Dictionary<string, object>
+                {
+                    { "importListNames", string.Join(", ", backOffProviders.Select(v => v.ImportList.Definition.Name)) }
+                }),
+                "#import-lists-are-unavailable-due-to-failures");
         }
     }
 }

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

@@ -1,3 +1,4 @@
+using System.Collections.Generic;
 using System.Linq;
 using NzbDrone.Core.Download;
 using NzbDrone.Core.Indexers;
@@ -35,7 +36,10 @@ namespace NzbDrone.Core.HealthCheck.Checks
             {
                 return new HealthCheck(GetType(),
                     HealthCheckResult.Warning,
-                    string.Format(_localizationService.GetLocalizedString("IndexerDownloadClientHealthCheckMessage"), string.Join(", ", invalidIndexers.Select(v => v.Name).ToArray())),
+                    _localizationService.GetLocalizedString("IndexerDownloadClientHealthCheckMessage", new Dictionary<string, object>
+                    {
+                        { "indexerNames", string.Join(", ", invalidIndexers.Select(v => v.Name).ToArray()) }
+                    }),
                     "#invalid-indexer-download-client-setting");
             }
 

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

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using NzbDrone.Common.Extensions;
 using NzbDrone.Core.Indexers;
@@ -41,8 +42,10 @@ namespace NzbDrone.Core.HealthCheck.Checks
 
             return new HealthCheck(GetType(),
                 HealthCheckResult.Warning,
-                string.Format(_localizationService.GetLocalizedString("IndexerJackettAll"),
-                    string.Join(", ", jackettAllProviders.Select(i => i.Name))),
+                _localizationService.GetLocalizedString("IndexerJackettAll", new Dictionary<string, object>
+                {
+                    { "indexerNames", string.Join(", ", jackettAllProviders.Select(i => i.Name)) }
+                }),
                 "#jackett-all-endpoint-used");
         }
     }

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

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using NzbDrone.Common.Extensions;
 using NzbDrone.Core.Indexers;
@@ -50,8 +51,10 @@ namespace NzbDrone.Core.HealthCheck.Checks
 
             return new HealthCheck(GetType(),
                 HealthCheckResult.Warning,
-                string.Format(_localizationService.GetLocalizedString("IndexerLongTermStatusCheckSingleClientMessage"),
-                    string.Join(", ", backOffProviders.Select(v => v.Provider.Definition.Name))),
+                _localizationService.GetLocalizedString("IndexerLongTermStatusCheckSingleClientMessage", new Dictionary<string, object>
+                {
+                    { "indexerNames", string.Join(", ", backOffProviders.Select(v => v.Provider.Definition.Name)) }
+                }),
                 "#indexers-are-unavailable-due-to-failures");
         }
     }

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

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using NzbDrone.Common.Extensions;
 using NzbDrone.Core.Indexers;
@@ -48,8 +49,10 @@ namespace NzbDrone.Core.HealthCheck.Checks
 
             return new HealthCheck(GetType(),
                 HealthCheckResult.Warning,
-                string.Format(_localizationService.GetLocalizedString("IndexerStatusCheckSingleClientMessage"),
-                    string.Join(", ", backOffProviders.Select(v => v.Provider.Definition.Name))),
+                _localizationService.GetLocalizedString("IndexerStatusCheckSingleClientMessage", new Dictionary<string, object>
+                {
+                    { "indexerNames", string.Join(", ", backOffProviders.Select(v => v.Provider.Definition.Name)) }
+                }),
                 "#indexers-are-unavailable-due-to-failures");
         }
     }

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

@@ -1,3 +1,4 @@
+using System.Collections.Generic;
 using System.Linq;
 using NzbDrone.Common.Extensions;
 using NzbDrone.Core.Localization;
@@ -45,7 +46,10 @@ namespace NzbDrone.Core.HealthCheck.Checks
 
             return new HealthCheck(GetType(),
                 HealthCheckResult.Warning,
-                string.Format(_localizationService.GetLocalizedString("NotificationStatusSingleClientHealthCheckMessage"), string.Join(", ", backOffProviders.Select(v => v.Provider.Definition.Name))),
+                _localizationService.GetLocalizedString("NotificationStatusSingleClientHealthCheckMessage", new Dictionary<string, object>
+                {
+                    { "notificationNames", string.Join(", ", backOffProviders.Select(v => v.Provider.Definition.Name)) }
+                }),
                 "#notifications-are-unavailable-due-to-failures");
         }
     }

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

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Net;
 using NLog;
@@ -40,7 +41,13 @@ namespace NzbDrone.Core.HealthCheck.Checks
 
             if (!addresses.Any())
             {
-                return new HealthCheck(GetType(), HealthCheckResult.Error, string.Format(_localizationService.GetLocalizedString("ProxyCheckResolveIpMessage"), _configService.ProxyHostname), "#proxy-failed-resolve-ip");
+                return new HealthCheck(GetType(),
+                    HealthCheckResult.Error,
+                    _localizationService.GetLocalizedString("ProxyCheckResolveIpMessage", new Dictionary<string, object>
+                    {
+                        { "proxyHostName", _configService.ProxyHostname }
+                    }),
+                    "#proxy-failed-resolve-ip");
             }
 
             var request = _cloudRequestBuilder.Create()
@@ -55,13 +62,27 @@ namespace NzbDrone.Core.HealthCheck.Checks
                 if (response.StatusCode == HttpStatusCode.BadRequest)
                 {
                     _logger.Error("Proxy Health Check failed: {0}", response.StatusCode);
-                    return new HealthCheck(GetType(), HealthCheckResult.Error, string.Format(_localizationService.GetLocalizedString("ProxyCheckBadRequestMessage"), response.StatusCode), "#proxy-failed-test");
+
+                    return new HealthCheck(GetType(),
+                        HealthCheckResult.Error,
+                        _localizationService.GetLocalizedString("ProxyCheckBadRequestMessage", new Dictionary<string, object>
+                        {
+                            { "statusCode", response.StatusCode }
+                        }),
+                        "#proxy-failed-test");
                 }
             }
             catch (Exception ex)
             {
                 _logger.Error(ex, "Proxy Health Check failed");
-                return new HealthCheck(GetType(), HealthCheckResult.Error, string.Format(_localizationService.GetLocalizedString("ProxyCheckFailedToTestMessage"), request.Url), "#proxy-failed-test");
+
+                return new HealthCheck(GetType(),
+                    HealthCheckResult.Error,
+                    _localizationService.GetLocalizedString("ProxyCheckFailedToTestMessage", new Dictionary<string, object>
+                    {
+                        { "url", request.Url }
+                    }),
+                    "#proxy-failed-test");
             }
 
             return new HealthCheck(GetType());

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

@@ -1,3 +1,4 @@
+using System.Collections.Generic;
 using NzbDrone.Common.Disk;
 using NzbDrone.Common.Extensions;
 using NzbDrone.Core.Configuration;
@@ -31,7 +32,13 @@ namespace NzbDrone.Core.HealthCheck.Checks
 
             if (!_diskProvider.FolderWritable(recycleBin))
             {
-                return new HealthCheck(GetType(), HealthCheckResult.Error, string.Format(_localizationService.GetLocalizedString("RecycleBinUnableToWriteHealthCheck"), recycleBin), "#cannot-write-recycle-bin");
+                return new HealthCheck(GetType(),
+                    HealthCheckResult.Error,
+                    _localizationService.GetLocalizedString("RecycleBinUnableToWriteHealthCheck", new Dictionary<string, object>
+                    {
+                        { "path", recycleBin }
+                    }),
+                    "#cannot-write-recycle-bin");
             }
 
             return new HealthCheck(GetType());

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

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Net.Http;
 using NLog;
@@ -69,30 +70,92 @@ namespace NzbDrone.Core.HealthCheck.Checks
                         {
                             if (!status.IsLocalhost)
                             {
-                                return new HealthCheck(GetType(), HealthCheckResult.Error, string.Format(_localizationService.GetLocalizedString("RemotePathMappingCheckWrongOSPath"), client.Definition.Name, folder.FullPath, _osInfo.Name), "#bad-remote-path-mapping");
+                                return new HealthCheck(
+                                    GetType(),
+                                    HealthCheckResult.Error,
+                                    _localizationService.GetLocalizedString(
+                                        "RemotePathMappingCheckWrongOSPath", new Dictionary<string, object>
+                                        {
+                                            { "downloadClientName", client.Definition.Name },
+                                            { "path", folder.FullPath },
+                                            { "osName", _osInfo.Name }
+                                        }),
+                                    "#bad-remote-path-mapping");
                             }
 
                             if (_osInfo.IsDocker)
                             {
-                                return new HealthCheck(GetType(), HealthCheckResult.Error, string.Format(_localizationService.GetLocalizedString("RemotePathMappingCheckBadDockerPath"), client.Definition.Name, folder.FullPath, _osInfo.Name), "#docker-bad-remote-path-mapping");
+                                return new HealthCheck(
+                                    GetType(),
+                                    HealthCheckResult.Error,
+                                    _localizationService.GetLocalizedString(
+                                        "RemotePathMappingCheckBadDockerPath",
+                                        new Dictionary<string, object>
+                                        {
+                                            { "downloadClientName", client.Definition.Name },
+                                            { "path", folder.FullPath },
+                                            { "osName", _osInfo.Name }
+                                        }),
+                                    "#docker-bad-remote-path-mapping");
                             }
 
-                            return new HealthCheck(GetType(), HealthCheckResult.Error, string.Format(_localizationService.GetLocalizedString("RemotePathMappingCheckLocalWrongOSPath"), client.Definition.Name, folder.FullPath, _osInfo.Name), "#bad-download-client-settings");
+                            return new HealthCheck(
+                                GetType(),
+                                HealthCheckResult.Error,
+                                _localizationService.GetLocalizedString(
+                                    "RemotePathMappingCheckLocalWrongOSPath",
+                                    new Dictionary<string, object>
+                                    {
+                                        { "downloadClientName", client.Definition.Name },
+                                        { "path", folder.FullPath },
+                                        { "osName", _osInfo.Name }
+                                    }),
+                                "#bad-download-client-settings");
                         }
 
                         if (!_diskProvider.FolderExists(folder.FullPath))
                         {
                             if (_osInfo.IsDocker)
                             {
-                                return new HealthCheck(GetType(), HealthCheckResult.Error, string.Format(_localizationService.GetLocalizedString("RemotePathMappingCheckDockerFolderMissing"), client.Definition.Name, folder.FullPath), "#docker-bad-remote-path-mapping");
+                                return new HealthCheck(
+                                    GetType(),
+                                    HealthCheckResult.Error,
+                                    _localizationService.GetLocalizedString(
+                                        "RemotePathMappingCheckDockerFolderMissing",
+                                        new Dictionary<string, object>
+                                        {
+                                            { "downloadClientName", client.Definition.Name },
+                                            { "path", folder.FullPath }
+                                        }),
+                                    "#docker-bad-remote-path-mapping");
                             }
 
                             if (!status.IsLocalhost)
                             {
-                                return new HealthCheck(GetType(), HealthCheckResult.Error, string.Format(_localizationService.GetLocalizedString("RemotePathMappingCheckLocalFolderMissing"), client.Definition.Name, folder.FullPath), "#bad-remote-path-mapping");
+                                return new HealthCheck(
+                                    GetType(),
+                                    HealthCheckResult.Error,
+                                    _localizationService.GetLocalizedString(
+                                        "RemotePathMappingCheckLocalFolderMissing",
+                                        new Dictionary<string, object>
+                                        {
+                                            { "downloadClientName", client.Definition.Name },
+                                            { "path", folder.FullPath }
+                                        }),
+                                    "#bad-remote-path-mapping");
                             }
 
-                            return new HealthCheck(GetType(), HealthCheckResult.Error, string.Format(_localizationService.GetLocalizedString("RemotePathMappingCheckGenericPermissions"), client.Definition.Name, folder.FullPath), "#permissions-error");
+                            return new HealthCheck(
+                                GetType(),
+                                HealthCheckResult.Error,
+                                _localizationService.GetLocalizedString(
+                                    "RemotePathMappingCheckGenericPermissions",
+                                    new Dictionary<string, object>
+                                    {
+                                        { "downloadClientName", client.Definition.Name },
+                                        { "path", folder.FullPath }
+                                    }),
+                                "#permissions-error");
                         }
                     }
                 }
@@ -130,12 +193,28 @@ namespace NzbDrone.Core.HealthCheck.Checks
 
                     if (_diskProvider.FileExists(moviePath))
                     {
-                        return new HealthCheck(GetType(), HealthCheckResult.Error, string.Format(_localizationService.GetLocalizedString("RemotePathMappingCheckDownloadPermissions"), moviePath), "#permissions-error");
+                        return new HealthCheck(GetType(),
+                            HealthCheckResult.Error,
+                            _localizationService.GetLocalizedString(
+                                "RemotePathMappingCheckDownloadPermissions",
+                                new Dictionary<string, object>
+                                {
+                                    { "path", moviePath }
+                                }),
+                            "#permissions-error");
                     }
 
                     // If the file doesn't exist but MovieInfo is not null then the message is coming from
                     // ImportApprovedMovies and the file must have been removed part way through processing
-                    return new HealthCheck(GetType(), HealthCheckResult.Error, string.Format(_localizationService.GetLocalizedString("RemotePathMappingCheckFileRemoved"), moviePath), "#remote-path-file-removed");
+                    return new HealthCheck(GetType(),
+                        HealthCheckResult.Error,
+                        _localizationService.GetLocalizedString(
+                            "RemotePathMappingCheckFileRemoved",
+                            new Dictionary<string, object>
+                            {
+                                { "path", moviePath }
+                            }),
+                        "#remote-path-file-removed");
                 }
 
                 // If the previous case did not match then the failure occured in DownloadedMovieImportService,
@@ -157,42 +236,118 @@ namespace NzbDrone.Core.HealthCheck.Checks
                     // that the user realises something is wrong.
                     if (dlpath.IsNullOrWhiteSpace())
                     {
-                        return new HealthCheck(GetType(), HealthCheckResult.Error, _localizationService.GetLocalizedString("RemotePathMappingCheckImportFailed"), "#remote-path-import-failed");
+                        return new HealthCheck(
+                            GetType(),
+                            HealthCheckResult.Error,
+                            _localizationService.GetLocalizedString("RemotePathMappingCheckImportFailed"),
+                            "#remote-path-import-failed");
                     }
 
                     if (!dlpath.IsPathValid(PathValidationType.CurrentOs))
                     {
                         if (!status.IsLocalhost)
                         {
-                            return new HealthCheck(GetType(), HealthCheckResult.Error, string.Format(_localizationService.GetLocalizedString("RemotePathMappingCheckFilesWrongOSPath"), client.Definition.Name, dlpath, _osInfo.Name), "#bad-remote-path-mapping");
+                            return new HealthCheck(
+                                GetType(),
+                                HealthCheckResult.Error,
+                                _localizationService.GetLocalizedString(
+                                    "RemotePathMappingCheckFilesWrongOSPath",
+                                    new Dictionary<string, object>
+                                    {
+                                        { "downloadClientName", client.Definition.Name },
+                                        { "path", dlpath },
+                                        { "osName", _osInfo.Name }
+                                    }),
+                                "#bad-remote-path-mapping");
                         }
 
                         if (_osInfo.IsDocker)
                         {
-                            return new HealthCheck(GetType(), HealthCheckResult.Error, string.Format(_localizationService.GetLocalizedString("RemotePathMappingCheckFilesBadDockerPath"), client.Definition.Name, dlpath, _osInfo.Name), "#docker-bad-remote-path-mapping");
+                            return new HealthCheck(
+                                GetType(),
+                                HealthCheckResult.Error,
+                                _localizationService.GetLocalizedString(
+                                    "RemotePathMappingCheckFilesBadDockerPath",
+                                    new Dictionary<string, object>
+                                    {
+                                        { "downloadClientName", client.Definition.Name },
+                                        { "path", dlpath },
+                                        { "osName", _osInfo.Name }
+                                    }),
+                                "#docker-bad-remote-path-mapping");
                         }
 
-                        return new HealthCheck(GetType(), HealthCheckResult.Error, string.Format(_localizationService.GetLocalizedString("RemotePathMappingCheckFilesLocalWrongOSPath"), client.Definition.Name, dlpath, _osInfo.Name), "#bad-download-client-settings");
+                        return new HealthCheck(
+                            GetType(),
+                            HealthCheckResult.Error,
+                            _localizationService.GetLocalizedString(
+                                "RemotePathMappingCheckFilesLocalWrongOSPath",
+                                new Dictionary<string, object>
+                                {
+                                    { "downloadClientName", client.Definition.Name },
+                                    { "path", dlpath },
+                                    { "osName", _osInfo.Name }
+                                }),
+                            "#bad-download-client-settings");
                     }
 
                     if (_diskProvider.FolderExists(dlpath))
                     {
-                        return new HealthCheck(GetType(), HealthCheckResult.Error, string.Format(_localizationService.GetLocalizedString("RemotePathMappingCheckFolderPermissions"), dlpath), "#permissions-error");
+                        return new HealthCheck(
+                            GetType(),
+                            HealthCheckResult.Error,
+                            _localizationService.GetLocalizedString(
+                                "RemotePathMappingCheckFolderPermissions",
+                                new Dictionary<string, object>
+                                {
+                                    { "path", dlpath }
+                                }),
+                            "#permissions-error");
                     }
 
                     // if it's a remote client/docker, likely missing path mappings
                     if (_osInfo.IsDocker)
                     {
-                        return new HealthCheck(GetType(), HealthCheckResult.Error, string.Format(_localizationService.GetLocalizedString("RemotePathMappingCheckFolderPermissions"), client.Definition.Name, dlpath), "#docker-bad-remote-path-mapping");
+                        return new HealthCheck(
+                            GetType(),
+                            HealthCheckResult.Error,
+                            _localizationService.GetLocalizedString(
+                                "RemotePathMappingCheckFolderPermissions",
+                                new Dictionary<string, object>
+                                {
+                                    { "downloadClientName", client.Definition.Name },
+                                    { "path", dlpath }
+                                }),
+                            "#docker-bad-remote-path-mapping");
                     }
 
                     if (!status.IsLocalhost)
                     {
-                        return new HealthCheck(GetType(), HealthCheckResult.Error, string.Format(_localizationService.GetLocalizedString("RemotePathMappingCheckRemoteDownloadClient"), client.Definition.Name, dlpath), "#bad-remote-path-mapping");
+                        return new HealthCheck(
+                            GetType(),
+                            HealthCheckResult.Error,
+                            _localizationService.GetLocalizedString(
+                                "RemotePathMappingCheckRemoteDownloadClient",
+                                new Dictionary<string, object>
+                                {
+                                    { "downloadClientName", client.Definition.Name },
+                                    { "path", dlpath },
+                                    { "osName", _osInfo.Name }
+                                }), "#bad-remote-path-mapping");
                     }
 
                     // path mappings shouldn't be needed locally so probably a permissions issue
-                    return new HealthCheck(GetType(), HealthCheckResult.Error, string.Format(_localizationService.GetLocalizedString("RemotePathMappingCheckFilesGenericPermissions"), client.Definition.Name, dlpath), "#permissions-error");
+                    return new HealthCheck(
+                        GetType(),
+                        HealthCheckResult.Error,
+                        _localizationService.GetLocalizedString(
+                            "RemotePathMappingCheckFilesGenericPermissions",
+                            new Dictionary<string, object>
+                            {
+                                { "downloadClientName", client.Definition.Name },
+                                { "path", dlpath }
+                            }),
+                        "#permissions-error");
                 }
                 catch (DownloadClientException ex)
                 {

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

@@ -1,3 +1,4 @@
+using System.Collections.Generic;
 using System.Linq;
 using NzbDrone.Common.Extensions;
 using NzbDrone.Core.Localization;
@@ -7,7 +8,7 @@ using NzbDrone.Core.Movies.Events;
 namespace NzbDrone.Core.HealthCheck.Checks
 {
     [CheckOn(typeof(MovieUpdatedEvent))]
-    [CheckOn(typeof(MoviesDeletedEvent), CheckOnCondition.FailedOnly)]
+    [CheckOn(typeof(MoviesDeletedEvent))]
     [CheckOn(typeof(MovieRefreshCompleteEvent))]
     public class RemovedMovieCheck : HealthCheckBase, ICheckOnCondition<MovieUpdatedEvent>, ICheckOnCondition<MoviesDeletedEvent>
     {
@@ -32,10 +33,22 @@ namespace NzbDrone.Core.HealthCheck.Checks
 
             if (deletedMovie.Count == 1)
             {
-                return new HealthCheck(GetType(), HealthCheckResult.Error, string.Format(_localizationService.GetLocalizedString("RemovedMovieCheckSingleMessage"), movieText), "#movie-was-removed-from-tmdb");
+                return new HealthCheck(GetType(),
+                    HealthCheckResult.Error,
+                    _localizationService.GetLocalizedString("RemovedMovieCheckSingleMessage", new Dictionary<string, object>
+                    {
+                        { "movie", movieText }
+                    }),
+                    "#movie-was-removed-from-tmdb");
             }
 
-            return new HealthCheck(GetType(), HealthCheckResult.Error, string.Format(_localizationService.GetLocalizedString("RemovedMovieCheckMultipleMessage"), movieText), "#movie-was-removed-from-tmdb");
+            return new HealthCheck(GetType(),
+                HealthCheckResult.Error,
+                _localizationService.GetLocalizedString("RemovedMovieCheckMultipleMessage", new Dictionary<string, object>
+                {
+                    { "movies", movieText }
+                }),
+                "#movie-was-removed-from-tmdb");
         }
 
         public bool ShouldCheckOnEvent(MoviesDeletedEvent message)

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

@@ -1,3 +1,4 @@
+using System.Collections.Generic;
 using System.Linq;
 using NzbDrone.Common.Disk;
 using NzbDrone.Common.Extensions;
@@ -40,11 +41,26 @@ namespace NzbDrone.Core.HealthCheck.Checks
             {
                 if (missingRootFolders.Count == 1)
                 {
-                    return new HealthCheck(GetType(), HealthCheckResult.Error, string.Format(_localizationService.GetLocalizedString("RootFolderCheckSingleMessage"), missingRootFolders.First()), "#missing-root-folder");
+                    return new HealthCheck(GetType(),
+                        HealthCheckResult.Error,
+                        _localizationService.GetLocalizedString(
+                            "RootFolderCheckSingleMessage",
+                            new Dictionary<string, object>
+                            {
+                                { "rootFolderPath", missingRootFolders.First() }
+                            }),
+                        "#missing-root-folder");
                 }
 
-                var message = string.Format(_localizationService.GetLocalizedString("RootFolderCheckMultipleMessage"), string.Join(" | ", missingRootFolders));
-                return new HealthCheck(GetType(), HealthCheckResult.Error, message, "#missing-root-folder");
+                return new HealthCheck(GetType(),
+                    HealthCheckResult.Error,
+                    _localizationService.GetLocalizedString(
+                        "RootFolderCheckMultipleMessage",
+                        new Dictionary<string, object>
+                        {
+                            { "rootFolderPaths", string.Join(" | ", missingRootFolders) }
+                        }),
+                    "#missing-root-folder");
             }
 
             return new HealthCheck(GetType());

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

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.IO;
 using NzbDrone.Common.Disk;
 using NzbDrone.Common.EnvironmentInfo;
@@ -47,7 +48,12 @@ namespace NzbDrone.Core.HealthCheck.Checks
                 {
                     return new HealthCheck(GetType(),
                         HealthCheckResult.Error,
-                        string.Format(_localizationService.GetLocalizedString("UpdateCheckStartupTranslocationMessage"), startupFolder),
+                        _localizationService.GetLocalizedString(
+                            "UpdateCheckStartupTranslocationMessage",
+                            new Dictionary<string, object>
+                            {
+                                { "startupFolder", startupFolder }
+                            }),
                         "#cannot-install-update-because-startup-folder-is-in-an-app-translocation-folder.");
                 }
 
@@ -55,7 +61,13 @@ namespace NzbDrone.Core.HealthCheck.Checks
                 {
                     return new HealthCheck(GetType(),
                         HealthCheckResult.Error,
-                        string.Format(_localizationService.GetLocalizedString("UpdateCheckStartupNotWritableMessage"), startupFolder, Environment.UserName),
+                        _localizationService.GetLocalizedString(
+                            "UpdateCheckStartupNotWritableMessage",
+                            new Dictionary<string, object>
+                            {
+                                { "startupFolder", startupFolder },
+                                { "userName", Environment.UserName }
+                            }),
                         "#cannot-install-update-because-startup-folder-is-not-writable-by-the-user");
                 }
 
@@ -63,7 +75,13 @@ namespace NzbDrone.Core.HealthCheck.Checks
                 {
                     return new HealthCheck(GetType(),
                         HealthCheckResult.Error,
-                        string.Format(_localizationService.GetLocalizedString("UpdateCheckUINotWritableMessage"), uiFolder, Environment.UserName),
+                        _localizationService.GetLocalizedString(
+                            "UpdateCheckUINotWritableMessage",
+                            new Dictionary<string, object>
+                            {
+                                { "uiFolder", uiFolder },
+                                { "userName", Environment.UserName }
+                            }),
                         "#cannot-install-update-because-ui-folder-is-not-writable-by-the-user");
                 }
             }

src/NzbDrone.Core/History/HistoryRepository.cs

@@ -19,6 +19,7 @@ namespace NzbDrone.Core.History
         void DeleteForMovies(List<int> movieIds);
         MovieHistory MostRecentForMovie(int movieId);
         List<MovieHistory> Since(DateTime date, MovieHistoryEventType? eventType);
+        PagingSpec<MovieHistory> GetPaged(PagingSpec<MovieHistory> pagingSpec, int[] languages, int[] qualities);
     }
 
     public class HistoryRepository : BasicRepository<MovieHistory>, IHistoryRepository
@@ -74,19 +75,6 @@ namespace NzbDrone.Core.History
             Delete(c => movieIds.Contains(c.MovieId));
         }
 
-        protected override SqlBuilder PagedBuilder() => new SqlBuilder(_database.DatabaseType)
-            .Join<MovieHistory, Movie>((h, m) => h.MovieId == m.Id)
-            .Join<Movie, QualityProfile>((m, p) => m.QualityProfileId == p.Id)
-            .LeftJoin<Movie, MovieMetadata>((m, mm) => m.MovieMetadataId == mm.Id);
-
-        protected override IEnumerable<MovieHistory> PagedQuery(SqlBuilder sql) =>
-            _database.QueryJoined<MovieHistory, Movie, QualityProfile>(sql, (hist, movie, profile) =>
-                    {
-                        hist.Movie = movie;
-                        hist.Movie.QualityProfile = profile;
-                        return hist;
-                    });
-
         public MovieHistory MostRecentForMovie(int movieId)
         {
             return Query(x => x.MovieId == movieId).MaxBy(h => h.Date);
@@ -106,5 +94,77 @@ namespace NzbDrone.Core.History
 
             return PagedQuery(builder).OrderBy(h => h.Date).ToList();
         }
+
+        public PagingSpec<MovieHistory> GetPaged(PagingSpec<MovieHistory> pagingSpec, int[] languages, int[] qualities)
+        {
+            pagingSpec.Records = GetPagedRecords(PagedBuilder(pagingSpec, languages, qualities), pagingSpec, PagedQuery);
+
+            var countTemplate = $"SELECT COUNT(*) FROM (SELECT /**select**/ FROM \"{TableMapping.Mapper.TableNameMapping(typeof(MovieHistory))}\" /**join**/ /**innerjoin**/ /**leftjoin**/ /**where**/ /**groupby**/ /**having**/) AS \"Inner\"";
+            pagingSpec.TotalRecords = GetPagedRecordCount(PagedBuilder(pagingSpec, languages, qualities).Select(typeof(MovieHistory)), pagingSpec, countTemplate);
+
+            return pagingSpec;
+        }
+
+        private SqlBuilder PagedBuilder(PagingSpec<MovieHistory> pagingSpec, int[] languages, int[] qualities)
+        {
+            var builder = Builder()
+                .Join<MovieHistory, Movie>((h, m) => h.MovieId == m.Id)
+                .Join<Movie, QualityProfile>((m, p) => m.QualityProfileId == p.Id)
+                .LeftJoin<Movie, MovieMetadata>((m, mm) => m.MovieMetadataId == mm.Id);
+
+            AddFilters(builder, pagingSpec);
+
+            if (languages is { Length: > 0 })
+            {
+                builder.Where($"({BuildLanguageWhereClause(languages)})");
+            }
+
+            if (qualities is { Length: > 0 })
+            {
+                builder.Where($"({BuildQualityWhereClause(qualities)})");
+            }
+
+            return builder;
+        }
+
+        protected override IEnumerable<MovieHistory> PagedQuery(SqlBuilder builder) =>
+            _database.QueryJoined<MovieHistory, Movie, QualityProfile>(builder, (hist, movie, profile) =>
+            {
+                hist.Movie = movie;
+                hist.Movie.QualityProfile = profile;
+                return hist;
+            });
+
+        private string BuildLanguageWhereClause(int[] languages)
+        {
+            var clauses = new List<string>();
+
+            foreach (var language in languages)
+            {
+                // There are 4 different types of values we should see:
+                // - Not the last value in the array
+                // - When it's the last value in the array and on different OSes
+                // - When it was converted from a single language
+
+                clauses.Add($"\"{TableMapping.Mapper.TableNameMapping(typeof(MovieHistory))}\".\"Languages\" LIKE '[% {language},%]'");
+                clauses.Add($"\"{TableMapping.Mapper.TableNameMapping(typeof(MovieHistory))}\".\"Languages\" LIKE '[% {language}' || CHAR(13) || '%]'");
+                clauses.Add($"\"{TableMapping.Mapper.TableNameMapping(typeof(MovieHistory))}\".\"Languages\" LIKE '[% {language}' || CHAR(10) || '%]'");
+                clauses.Add($"\"{TableMapping.Mapper.TableNameMapping(typeof(MovieHistory))}\".\"Languages\" LIKE '[{language}]'");
+            }
+
+            return $"({string.Join(" OR ", clauses)})";
+        }
+
+        private string BuildQualityWhereClause(int[] qualities)
+        {
+            var clauses = new List<string>();
+
+            foreach (var quality in qualities)
+            {
+                clauses.Add($"\"{TableMapping.Mapper.TableNameMapping(typeof(MovieHistory))}\".\"Quality\" LIKE '%_quality_: {quality},%'");
+            }
+
+            return $"({string.Join(" OR ", clauses)})";
+        }
     }
 }