Fixed: Use movie file from state for status label in add search results

Add SizeOnDisk and HasFile to MovieResource
Rename episode to movie
2026-04-18 21:35:51 -04:00 · 2024-01-18 01:33:50 +02:00 · 2024-01-17 06:25:50 +02:00 · 2024-01-17 05:21:25 +02:00 · 2024-01-17 01:15:57 +02:00 · 2024-01-17 01:13:21 +02:00
309 changed files with 4963 additions and 2519 deletions
@@ -9,15 +9,15 @@ variables:
  testsFolder: './_tests'
  yarnCacheFolder: $(Pipeline.Workspace)/.yarn
  nugetCacheFolder: $(Pipeline.Workspace)/.nuget/packages
-  majorVersion: '5.2.3'
+  majorVersion: '5.3.2'
  minorVersion: $[counter('minorVersion', 2000)]
  radarrVersion: '$(majorVersion).$(minorVersion)'
  buildName: '$(Build.SourceBranchName).$(radarrVersion)'
  sentryOrg: 'servarr'
  sentryUrl: 'https://sentry.servarr.com'
-  dotnetVersion: '6.0.413'
+  dotnetVersion: '6.0.417'
  nodeVersion: '16.X'
-  innoVersion: '6.2.0'
+  innoVersion: '6.2.2'
  windowsImage: 'windows-2022'
  linuxImage: 'ubuntu-20.04'
  macImage: 'macOS-11'
@@ -1242,6 +1242,7 @@ stages:
  - stage: Report_Out
    dependsOn:
    - Analyze
+    - Installer
    - Unit_Test
    - Integration
    - Automation
@@ -254,7 +254,7 @@ InstallInno()
    ProgressStart "Installing portable Inno Setup"
    
    rm -rf _inno
-    curl -s --output innosetup.exe "https://files.jrsoftware.org/is/6/innosetup-${INNOVERSION:-6.2.0}.exe"
+    curl -s --output innosetup.exe "https://files.jrsoftware.org/is/6/innosetup-${INNOVERSION:-6.2.2}.exe"
    mkdir _inno
    ./innosetup.exe //portable=1 //silent //currentuser //dir=.\\_inno
    rm innosetup.exe
@@ -6,7 +6,7 @@ import { icons, kinds } from 'Helpers/Props';
 import translate from 'Utilities/String/translate';
 import styles from './HistoryEventTypeCell.css';

-function getIconName(eventType) {
+function getIconName(eventType, data) {
  switch (eventType) {
    case 'grabbed':
      return icons.DOWNLOADING;
@@ -17,7 +17,7 @@ function getIconName(eventType) {
    case 'downloadFailed':
      return icons.DOWNLOADING;
    case 'movieFileDeleted':
-      return icons.DELETE;
+      return data.reason === 'MissingFromDisk' ? icons.FILE_MISSING : icons.DELETE;
    case 'movieFileRenamed':
      return icons.ORGANIZE;
    case 'downloadIgnored':
@@ -47,7 +47,7 @@ function getTooltip(eventType, data) {
    case 'downloadFailed':
      return translate('MovieDownloadFailedTooltip');
    case 'movieFileDeleted':
-      return translate('MovieFileDeletedTooltip');
+      return data.reason === 'MissingFromDisk' ? translate('MovieFileMissingTooltip') : translate('MovieFileDeletedTooltip');
    case 'movieFileRenamed':
      return translate('MovieFileRenamedTooltip');
    case 'downloadIgnored':
@@ -58,7 +58,7 @@ function getTooltip(eventType, data) {
 }

 function HistoryEventTypeCell({ eventType, data }) {
-  const iconName = getIconName(eventType);
+  const iconName = getIconName(eventType, data);
  const iconKind = getIconKind(eventType);
  const tooltip = getTooltip(eventType, data);

@@ -4,7 +4,7 @@ import ProtocolLabel from 'Activity/Queue/ProtocolLabel';
 import IconButton from 'Components/Link/IconButton';
 import SpinnerIconButton from 'Components/Link/SpinnerIconButton';
 import ProgressBar from 'Components/ProgressBar';
-// import RelativeDateCellConnector from 'Components/Table/Cells/RelativeDateCellConnector';
+import RelativeDateCellConnector from 'Components/Table/Cells/RelativeDateCellConnector';
 import TableRowCell from 'Components/Table/Cells/TableRowCell';
 import TableSelectCell from 'Components/Table/Cells/TableSelectCell';
 import TableRow from 'Components/Table/TableRow';
@@ -97,6 +97,7 @@ class QueueRow extends Component {
      outputPath,
      downloadClient,
      estimatedCompletionTime,
+      added,
      timeleft,
      size,
      sizeleft,
@@ -315,6 +316,15 @@ class QueueRow extends Component {
              );
            }

+            if (name === 'added') {
+              return (
+                <RelativeDateCellConnector
+                  key={name}
+                  date={added}
+                />
+              );
+            }
+
            if (name === 'actions') {
              return (
                <TableRowCell
@@ -393,6 +403,7 @@ QueueRow.propTypes = {
  outputPath: PropTypes.string,
  downloadClient: PropTypes.string,
  estimatedCompletionTime: PropTypes.string,
+  added: PropTypes.string,
  timeleft: PropTypes.string,
  size: PropTypes.number,
  year: PropTypes.number,
@@ -3,10 +3,13 @@ import React, { Component } from 'react';
 import { connect } from 'react-redux';
 import { createSelector } from 'reselect';
 import { clearAddMovie, lookupMovie } from 'Store/Actions/addMovieActions';
+import { clearMovieFiles, fetchMovieFiles } from 'Store/Actions/movieFileActions';
 import { clearQueueDetails, fetchQueueDetails } from 'Store/Actions/queueActions';
 import { fetchRootFolders } from 'Store/Actions/rootFolderActions';
 import { fetchImportExclusions } from 'Store/Actions/Settings/importExclusions';
 import createUISettingsSelector from 'Store/Selectors/createUISettingsSelector';
+import hasDifferentItems from 'Utilities/Object/hasDifferentItems';
+import selectUniqueIds from 'Utilities/Object/selectUniqueIds';
 import parseUrl from 'Utilities/String/parseUrl';
 import AddNewMovie from './AddNewMovie';

@@ -35,7 +38,9 @@ const mapDispatchToProps = {
  fetchRootFolders,
  fetchImportExclusions,
  fetchQueueDetails,
-  clearQueueDetails
+  clearQueueDetails,
+  fetchMovieFiles,
+  clearMovieFiles
 };

 class AddNewMovieConnector extends Component {
@@ -55,6 +60,20 @@ class AddNewMovieConnector extends Component {
    this.props.fetchQueueDetails();
  }

+  componentDidUpdate(prevProps) {
+    const {
+      items
+    } = this.props;
+
+    if (hasDifferentItems(prevProps.items, items)) {
+      const movieIds = selectUniqueIds(items, 'internalId');
+
+      if (movieIds.length) {
+        movieIds.map((movieId) => this.props.fetchMovieFiles({ movieId }));
+      }
+    }
+  }
+
  componentWillUnmount() {
    if (this._movieLookupTimeout) {
      clearTimeout(this._movieLookupTimeout);
@@ -62,6 +81,7 @@ class AddNewMovieConnector extends Component {

    this.props.clearAddMovie();
    this.props.clearQueueDetails();
+    this.props.clearMovieFiles();
  }

  //
@@ -107,12 +127,15 @@ class AddNewMovieConnector extends Component {

 AddNewMovieConnector.propTypes = {
  term: PropTypes.string,
+  items: PropTypes.arrayOf(PropTypes.object).isRequired,
  lookupMovie: PropTypes.func.isRequired,
  clearAddMovie: PropTypes.func.isRequired,
  fetchRootFolders: PropTypes.func.isRequired,
  fetchImportExclusions: PropTypes.func.isRequired,
  fetchQueueDetails: PropTypes.func.isRequired,
-  clearQueueDetails: PropTypes.func.isRequired
+  clearQueueDetails: PropTypes.func.isRequired,
+  fetchMovieFiles: PropTypes.func.isRequired,
+  clearMovieFiles: PropTypes.func.isRequired
 };

 export default connect(createMapStateToProps, mapDispatchToProps)(AddNewMovieConnector);
@@ -85,8 +85,13 @@
  margin-top: 20px;
 }

+.studio,
+.genres {
+  margin-left: 5px;
+}
+
 .links {
-  margin-left: 8px;
+  margin-left: 5px;
  pointer-events: all;
 }

@@ -5,6 +5,7 @@ interface CssExports {
  'certification': string;
  'content': string;
  'exclusionIcon': string;
+  'genres': string;
  'icons': string;
  'links': string;
  'overlay': string;
@@ -14,6 +15,7 @@ interface CssExports {
  'runtime': string;
  'searchResult': string;
  'statusContainer': string;
+  'studio': string;
  'title': string;
  'titleContainer': string;
  'titleRow': string;
@@ -1,6 +1,7 @@
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import Icon from 'Components/Icon';
+import ImdbRating from 'Components/ImdbRating';
 import Label from 'Components/Label';
 import Link from 'Components/Link/Link';
 import TmdbRating from 'Components/TmdbRating';
@@ -61,6 +62,7 @@ class AddNewMovieSearchResult extends Component {
      titleSlug,
      year,
      studio,
+      genres,
      status,
      overview,
      ratings,
@@ -76,6 +78,7 @@ class AddNewMovieSearchResult extends Component {
      hasFile,
      isAvailable,
      movieFile,
+      queueItem,
      runtime,
      movieRuntimeFormat,
      certification
@@ -197,13 +200,46 @@ class AddNewMovieSearchResult extends Component {
                />
              </Label>

+              {
+                ratings.imdb ?
+                  <Label size={sizes.LARGE}>
+                    <ImdbRating
+                      ratings={ratings}
+                      iconSize={13}
+                    />
+                  </Label> :
+                  null
+              }
+
              {
                !!studio &&
                  <Label size={sizes.LARGE}>
-                    {studio}
+                    <Icon
+                      name={icons.STUDIO}
+                      size={13}
+                    />
+
+                    <span className={styles.studio}>
+                      {studio}
+                    </span>
                  </Label>
              }

+              {
+                genres.length > 0 ?
+                  <Label size={sizes.LARGE}>
+                    <Icon
+                      name={icons.GENRE}
+                      size={13}
+                    />
+
+                    <span className={styles.genres}>
+                      {genres.slice(0, 3).join(', ')}
+                    </span>
+                  </Label> :
+                  null
+              }
+
              <Tooltip
                anchor={
                  <Label
@@ -215,15 +251,15 @@ class AddNewMovieSearchResult extends Component {
                    />

                    <span className={styles.links}>
-                      Links
+                      {translate('Links')}
                    </span>
                  </Label>
                }
                tooltip={
                  <MovieDetailsLinks
                    tmdbId={tmdbId}
-                    youTubeTrailerId={youTubeTrailerId}
                    imdbId={imdbId}
+                    youTubeTrailerId={youTubeTrailerId}
                  />
                }
                canFlip={true}
@@ -237,6 +273,7 @@ class AddNewMovieSearchResult extends Component {
                    hasMovieFiles={hasFile}
                    monitored={monitored}
                    isAvailable={isAvailable}
+                    queueItem={queueItem}
                    id={id}
                    useLabel={true}
                    colorImpairedMode={colorImpairedMode}
@@ -273,6 +310,7 @@ AddNewMovieSearchResult.propTypes = {
  titleSlug: PropTypes.string.isRequired,
  year: PropTypes.number.isRequired,
  studio: PropTypes.string,
+  genres: PropTypes.arrayOf(PropTypes.string),
  status: PropTypes.string.isRequired,
  overview: PropTypes.string,
  ratings: PropTypes.object.isRequired,
@@ -283,15 +321,19 @@ AddNewMovieSearchResult.propTypes = {
  isExclusionMovie: PropTypes.bool.isRequired,
  isSmallScreen: PropTypes.bool.isRequired,
  id: PropTypes.number,
-  queueItems: PropTypes.arrayOf(PropTypes.object),
  monitored: PropTypes.bool.isRequired,
  hasFile: PropTypes.bool.isRequired,
  isAvailable: PropTypes.bool.isRequired,
  movieFile: PropTypes.object,
+  queueItem: PropTypes.object,
  colorImpairedMode: PropTypes.bool,
  runtime: PropTypes.number.isRequired,
  movieRuntimeFormat: PropTypes.string.isRequired,
  certification: PropTypes.string
 };

+AddNewMovieSearchResult.defaultProps = {
+  genres: []
+};
+
 export default AddNewMovieSearchResult;
@@ -10,14 +10,22 @@ function createMapStateToProps() {
    createExistingMovieSelector(),
    createExclusionMovieSelector(),
    createDimensionsSelector(),
+    (state) => state.queue.details.items,
+    (state) => state.movieFiles.items,
    (state, { internalId }) => internalId,
    (state) => state.settings.ui.item.movieRuntimeFormat,
-    (isExistingMovie, isExclusionMovie, dimensions, internalId, movieRuntimeFormat) => {
+    (isExistingMovie, isExclusionMovie, dimensions, queueItems, movieFiles, internalId, movieRuntimeFormat) => {
+      const queueItem = queueItems.find((item) => internalId > 0 && item.movieId === internalId);
+      const movieFile = movieFiles.find((item) => internalId > 0 && item.movieId === internalId);
+
      return {
        existingMovieId: internalId,
        isExistingMovie,
        isExclusionMovie,
        isSmallScreen: dimensions.isSmallScreen,
+        queueItem,
+        movieFile,
+        hasFile: !!movieFile,
        movieRuntimeFormat
      };
    }
@@ -32,7 +32,7 @@
 .contentContainer {
  z-index: $popperZIndex;
  margin-top: 4px;
-  /* 400px container witdh with 8px padding on each side */
+  /* 400px container width with 8px padding on each side */
  width: 384px;
 }

@@ -148,7 +148,7 @@ class ImportMovieSelectFolder extends Component {
                      className={styles.addErrorAlert}
                      kind={kinds.DANGER}
                    >
-                      {translate('UnableToAddRootFolder')}
+                      {translate('AddRootFolderError')}

                      <ul>
                        {
@@ -44,7 +44,16 @@ export interface CustomFilter {
  filers: PropertyFilter[];
 }

+export interface AppSectionState {
+  dimensions: {
+    isSmallScreen: boolean;
+    width: number;
+    height: number;
+  };
+}
+
 interface AppState {
+  app: AppSectionState;
  calendar: CalendarAppState;
  commands: CommandAppState;
  history: HistoryAppState;
@@ -55,7 +55,7 @@ class CalendarConnector extends Component {
      gotoCalendarToday
    } = this.props;

-    registerPagePopulator(this.repopulate);
+    registerPagePopulator(this.repopulate, ['movieFileUpdated', 'movieFileDeleted']);

    if (useCurrentPage) {
      fetchCalendar();
@@ -6,6 +6,7 @@ import * as commandNames from 'Commands/commandNames';
 import withScrollPosition from 'Components/withScrollPosition';
 import { executeCommand } from 'Store/Actions/commandActions';
 import { saveMovieCollections, setMovieCollectionsFilter, setMovieCollectionsSort } from 'Store/Actions/movieCollectionActions';
+import { clearQueueDetails, fetchQueueDetails } from 'Store/Actions/queueActions';
 import { fetchRootFolders } from 'Store/Actions/rootFolderActions';
 import scrollPositions from 'Store/scrollPositions';
 import createCollectionClientSideCollectionItemsSelector from 'Store/Selectors/createCollectionClientSideCollectionItemsSelector';
@@ -38,6 +39,12 @@ function createMapDispatchToProps(dispatch, props) {
    dispatchFetchRootFolders() {
      dispatch(fetchRootFolders());
    },
+    dispatchFetchQueueDetails() {
+      dispatch(fetchQueueDetails());
+    },
+    dispatchClearQueueDetails() {
+      dispatch(clearQueueDetails());
+    },
    onUpdateSelectedPress(payload) {
      dispatch(saveMovieCollections(payload));
    },
@@ -63,10 +70,12 @@ class CollectionConnector extends Component {
  componentDidMount() {
    registerPagePopulator(this.repopulate);
    this.props.dispatchFetchRootFolders();
+    this.props.dispatchFetchQueueDetails();
  }

  componentWillUnmount() {
    unregisterPagePopulator(this.repopulate);
+    this.props.dispatchClearQueueDetails();
  }

  //
@@ -99,7 +108,9 @@ CollectionConnector.propTypes = {
  isSmallScreen: PropTypes.bool.isRequired,
  view: PropTypes.string.isRequired,
  onUpdateSelectedPress: PropTypes.func.isRequired,
-  dispatchFetchRootFolders: PropTypes.func.isRequired
+  dispatchFetchRootFolders: PropTypes.func.isRequired,
+  dispatchFetchQueueDetails: PropTypes.func.isRequired,
+  dispatchClearQueueDetails: PropTypes.func.isRequired
 };

 export default withScrollPosition(
@@ -70,6 +70,7 @@ class CollectionMovie extends Component {
      hasFile,
      folder,
      isAvailable,
+      movieFile,
      isExistingMovie,
      posterWidth,
      posterHeight,
@@ -131,6 +132,8 @@ class CollectionMovie extends Component {
                id ?
                  <div className={styles.overlayStatus}>
                    <MovieIndexProgressBar
+                      movieId={id}
+                      movieFile={movieFile}
                      monitored={monitored}
                      hasFile={hasFile}
                      status={status}
@@ -180,6 +183,7 @@ CollectionMovie.propTypes = {
  hasFile: PropTypes.bool,
  folder: PropTypes.string,
  isAvailable: PropTypes.bool,
+  movieFile: PropTypes.object,
  images: PropTypes.arrayOf(PropTypes.object).isRequired,
  posterWidth: PropTypes.number.isRequired,
  posterHeight: PropTypes.number.isRequired,
@@ -74,11 +74,7 @@ CollectionMovieLabel.propTypes = {

 CollectionMovieLabel.defaultProps = {
  isSaving: false,
-  statistics: {
-    episodeFileCount: 0,
-    totalEpisodeCount: 0,
-    percentOfEpisodes: 0
-  }
+  statistics: {}
 };

 export default CollectionMovieLabel;
@@ -30,22 +30,24 @@ function CustomFiltersModalContent(props) {

      <ModalBody>
        {
-          customFilters.map((customFilter) => {
-            return (
-              <CustomFilter
-                key={customFilter.id}
-                id={customFilter.id}
-                label={customFilter.label}
-                filters={customFilter.filters}
-                selectedFilterKey={selectedFilterKey}
-                isDeleting={isDeleting}
-                deleteError={deleteError}
-                dispatchSetFilter={dispatchSetFilter}
-                dispatchDeleteCustomFilter={dispatchDeleteCustomFilter}
-                onEditPress={onEditCustomFilter}
-              />
-            );
-          })
+          customFilters
+            .sort((a, b) => a.label.localeCompare(b.label))
+            .map((customFilter) => {
+              return (
+                <CustomFilter
+                  key={customFilter.id}
+                  id={customFilter.id}
+                  label={customFilter.label}
+                  filters={customFilter.filters}
+                  selectedFilterKey={selectedFilterKey}
+                  isDeleting={isDeleting}
+                  deleteError={deleteError}
+                  dispatchSetFilter={dispatchSetFilter}
+                  dispatchDeleteCustomFilter={dispatchDeleteCustomFilter}
+                  onEditPress={onEditCustomFilter}
+                />
+              );
+            })
        }

        <div className={styles.addButtonContainer}>
@@ -40,18 +40,26 @@ class FilterMenuContent extends Component {
        }

        {
-          customFilters.map((filter) => {
-            return (
-              <FilterMenuItem
-                key={filter.id}
-                filterKey={filter.id}
-                selectedFilterKey={selectedFilterKey}
-                onPress={onFilterSelect}
-              >
-                {filter.label}
-              </FilterMenuItem>
-            );
-          })
+          customFilters.length > 0 ?
+            <MenuItemSeparator /> :
+            null
+        }
+
+        {
+          customFilters
+            .sort((a, b) => a.label.localeCompare(b.label))
+            .map((filter) => {
+              return (
+                <FilterMenuItem
+                  key={filter.id}
+                  filterKey={filter.id}
+                  selectedFilterKey={selectedFilterKey}
+                  onPress={onFilterSelect}
+                >
+                  {filter.label}
+                </FilterMenuItem>
+              );
+            })
        }

        {
@@ -167,7 +167,7 @@ class SignalRConnector extends Component {
    const resource = body.resource;
    const status = resource.status;

-    // Both sucessful and failed commands need to be
+    // Both successful and failed commands need to be
    // completed, otherwise they spin until they timeout.

    if (status === 'completed' || status === 'failed') {
@@ -187,6 +187,8 @@ class SignalRConnector extends Component {
      repopulatePage('movieFileUpdated');
    } else if (body.action === 'deleted') {
      this.props.dispatchRemoveItem({ section, id: body.resource.id });
+
+      repopulatePage('movieFileDeleted');
    }
  };

@@ -15,5 +15,5 @@
    "start_url": "../../../../",
    "theme_color": "#3a3f51",
    "background_color": "#3a3f51",
-    "display": "standalone"
+    "display": "minimal-ui"
 }
@@ -0,0 +1,120 @@
+import createAjaxRequest from 'Utilities/createAjaxRequest';
+
+// This file contains some helpers for power users in a browser console
+
+let hasWarned = false;
+
+function checkActivationWarning() {
+  if (!hasWarned) {
+    console.log('Activated RadarrApi console helpers.');
+    console.warn('Be warned: There will be no further confirmation checks.');
+    hasWarned = true;
+  }
+}
+
+function attachAsyncActions(promise) {
+  promise.filter = function() {
+    const args = arguments;
+    const res = this.then((d) => d.filter(...args));
+    attachAsyncActions(res);
+    return res;
+  };
+
+  promise.map = function() {
+    const args = arguments;
+    const res = this.then((d) => d.map(...args));
+    attachAsyncActions(res);
+    return res;
+  };
+
+  promise.all = function() {
+    const res = this.then((d) => Promise.all(d));
+    attachAsyncActions(res);
+    return res;
+  };
+
+  promise.forEach = function(action) {
+    const res = this.then((d) => Promise.all(d.map(action)));
+    attachAsyncActions(res);
+    return res;
+  };
+}
+
+class ResourceApi {
+  constructor(api, url) {
+    this.api = api;
+    this.url = url;
+  }
+
+  single(id) {
+    return this.api.fetch(`${this.url}/${id}`);
+  }
+
+  all() {
+    return this.api.fetch(this.url);
+  }
+
+  filter(pred) {
+    return this.all().filter(pred);
+  }
+
+  update(resource) {
+    return this.api.fetch(`${this.url}/${resource.id}`, { method: 'PUT', data: resource });
+  }
+
+  delete(resource) {
+    if (typeof resource === 'object' && resource !== null && resource.id) {
+      resource = resource.id;
+    }
+
+    if (!resource || !Number.isInteger(resource)) {
+      throw Error('Invalid resource', resource);
+    }
+
+    return this.api.fetch(`${this.url}/${resource}`, { method: 'DELETE' });
+  }
+
+  fetch(url, options) {
+    return this.api.fetch(`${this.url}${url}`, options);
+  }
+}
+
+class ConsoleApi {
+  constructor() {
+    this.movie = new ResourceApi(this, '/movie');
+  }
+
+  resource(url) {
+    return new ResourceApi(this, url);
+  }
+
+  fetch(url, options) {
+    checkActivationWarning();
+
+    options = options || {};
+
+    const req = {
+      url,
+      method: options.method || 'GET'
+    };
+
+    if (options.data) {
+      req.dataType = 'json';
+      req.data = JSON.stringify(options.data);
+    }
+
+    const promise = createAjaxRequest(req).request;
+
+    promise.fail((xhr) => {
+      console.error(`Failed to fetch ${url}`, xhr);
+    });
+
+    attachAsyncActions(promise);
+
+    return promise;
+  }
+}
+
+window.RadarrApi = new ConsoleApi();
+
+export default ConsoleApi;
@@ -68,6 +68,19 @@ $hoverScale: 1.05;
  color: var(--white);
 }

+.existing {
+  position: absolute;
+  top: 0;
+  left: 0;
+  z-index: 1;
+  width: 0;
+  height: 0;
+  border-width: 25px 25px 0 0;
+  border-style: solid;
+  border-color: #37bc9b transparent transparent;
+  color: var(--white);
+}
+
 .controls {
  position: absolute;
  bottom: 10px;
@@ -7,6 +7,7 @@ interface CssExports {
  'controls': string;
  'editorSelect': string;
  'excluded': string;
+  'existing': string;
  'externalLinks': string;
  'link': string;
  'overlayTitle': string;
@@ -159,6 +159,14 @@ class DiscoverMoviePoster extends Component {
              />
          }

+          {
+            isExisting &&
+              <div
+                className={styles.existing}
+                title={translate('Existing')}
+              />
+          }
+
          <Link
            className={styles.link}
            style={elementStyle}
@@ -59,6 +59,7 @@ import {
  faEye as fasEye,
  faFastBackward as fasFastBackward,
  faFastForward as fasFastForward,
+  faFileCircleQuestion as fasFileCircleQuestion,
  faFileExport as fasFileExport,
  faFileInvoice as farFileInvoice,
  faFilm as fasFilm,
@@ -159,6 +160,7 @@ export const EXPORT = fasFileExport;
 export const EXTERNAL_LINK = fasExternalLinkAlt;
 export const FATAL = fasTimesCircle;
 export const FILE = farFile;
+export const FILE_MISSING = fasFileCircleQuestion;
 export const FILM = fasFilm;
 export const FILTER = fasFilter;
 export const FLAG = fasFlag;
@@ -22,6 +22,10 @@
  composes: cell from '~Components/Table/Cells/TableRowCell.css';
 }

+.quality {
+  white-space: nowrap;
+}
+
 .languages {
  width: 100px;
 }
@@ -266,7 +266,7 @@ function InteractiveSearchRow(props: InteractiveSearchRowProps) {
      </TableRowCell>

      <TableRowCell className={styles.quality}>
-        <MovieQuality quality={quality} />
+        <MovieQuality quality={quality} showRevision={true} />
      </TableRowCell>

      <TableRowCell className={styles.customFormatScore}>
@@ -50,12 +50,16 @@ class DeleteMovieModalContent extends Component {
      title,
      path,
      hasFile,
+      statistics,
      deleteOptions,
-      sizeOnDisk,
      onModalClose,
      onDeleteOptionChange
    } = this.props;

+    const {
+      sizeOnDisk = 0
+    } = statistics;
+
    const deleteFiles = this.state.deleteFiles;
    const addImportExclusion = deleteOptions.addImportExclusion;

@@ -151,12 +155,16 @@ class DeleteMovieModalContent extends Component {
 DeleteMovieModalContent.propTypes = {
  title: PropTypes.string.isRequired,
  path: PropTypes.string.isRequired,
+  statistics: PropTypes.object.isRequired,
  hasFile: PropTypes.bool.isRequired,
-  sizeOnDisk: PropTypes.number.isRequired,
  deleteOptions: PropTypes.object.isRequired,
  onDeleteOptionChange: PropTypes.func.isRequired,
  onDeletePress: PropTypes.func.isRequired,
  onModalClose: PropTypes.func.isRequired
 };

+DeleteMovieModalContent.defaultProps = {
+  statistics: {}
+};
+
 export default DeleteMovieModalContent;
@@ -5,6 +5,29 @@ import { createSelector } from 'reselect';
 import MovieCreditPosters from '../MovieCreditPosters';
 import MovieCrewPoster from './MovieCrewPoster';

+function crewSort(a, b) {
+  const jobOrder = ['Director', 'Writer', 'Producer', 'Executive Producer', 'Director of Photography'];
+
+  const indexA = jobOrder.indexOf(a.job);
+  const indexB = jobOrder.indexOf(b.job);
+
+  if (indexA === -1 && indexB === -1) {
+    return 0;
+  } else if (indexA === -1) {
+    return 1;
+  } else if (indexB === -1) {
+    return -1;
+  }
+
+  if (indexA < indexB) {
+    return -1;
+  } else if (indexA > indexB) {
+    return 1;
+  }
+
+  return 0;
+}
+
 function createMapStateToProps() {
  return createSelector(
    (state) => state.movieCredits.items,
@@ -17,8 +40,10 @@ function createMapStateToProps() {
        return acc;
      }, []);

+      const sortedCrew = crew.sort(crewSort);
+
      return {
-        items: _.uniqBy(crew, 'personName')
+        items: _.uniqBy(sortedCrew, 'personName')
      };
    }
  );
@@ -9,3 +9,9 @@
 .container {
  padding: 10px;
 }
+
+.sliderContainer {
+  --swiper-navigation-color: var(--white);
+
+  display: block;
+}
@@ -4,6 +4,7 @@ interface CssExports {
  'container': string;
  'grid': string;
  'movie': string;
+  'sliderContainer': string;
 }
 export const cssExports: CssExports;
 export default cssExports;
@@ -14,24 +14,6 @@ import 'swiper/css/navigation';
 const columnPadding = parseInt(dimensions.movieIndexColumnPadding);
 const columnPaddingSmallScreen = parseInt(dimensions.movieIndexColumnPaddingSmallScreen);

-const additionalColumnCount = {
-  small: 3,
-  medium: 2,
-  large: 1
-};
-
-function calculateColumnWidth(width, posterSize, isSmallScreen) {
-  const maxiumColumnWidth = isSmallScreen ? 172 : 182;
-  const columns = Math.floor(width / maxiumColumnWidth);
-  const remainder = width % maxiumColumnWidth;
-
-  if (remainder === 0 && posterSize === 'large') {
-    return maxiumColumnWidth;
-  }
-
-  return Math.floor(width / (columns + additionalColumnCount[posterSize]));
-}
-
 function calculateRowHeight(posterHeight, isSmallScreen) {
  const titleHeight = 19;
  const characterHeight = 19;
@@ -46,10 +28,6 @@ function calculateRowHeight(posterHeight, isSmallScreen) {
  return heights.reduce((acc, height) => acc + height, 0);
 }

-function calculatePosterHeight(posterWidth) {
-  return Math.ceil((250 / 170) * posterWidth);
-}
-
 class MovieCreditPosters extends Component {

  //
@@ -66,39 +44,16 @@ class MovieCreditPosters extends Component {
      posterHeight: 238,
      rowHeight: calculateRowHeight(238, props.isSmallScreen)
    };
-
-    this._isInitialized = false;
  }

-  //
-  // Control
-
-  calculateGrid = (width = this.state.width, isSmallScreen) => {
-
-    const padding = isSmallScreen ? columnPaddingSmallScreen : columnPadding;
-    const columnWidth = calculateColumnWidth(width, 'small', isSmallScreen);
-    const columnCount = Math.max(Math.floor(width / columnWidth), 1);
-    const posterWidth = columnWidth - padding;
-    const posterHeight = calculatePosterHeight(posterWidth);
-    const rowHeight = calculateRowHeight(posterHeight, isSmallScreen);
-
-    this.setState({
-      width,
-      columnWidth,
-      columnCount,
-      posterWidth,
-      posterHeight,
-      rowHeight
-    });
-  };
-
  //
  // Render

  render() {
    const {
      items,
-      itemComponent
+      itemComponent,
+      isSmallScreen
    } = this.props;

    const {
@@ -113,14 +68,13 @@ class MovieCreditPosters extends Component {
        <Swiper
          slidesPerView='auto'
          spaceBetween={10}
-          slidesPerGroup={3}
+          slidesPerGroup={isSmallScreen ? 1 : 3}
+          navigation={true}
          loop={false}
          loopFillGroupWithBlank={true}
          className="mySwiper"
          modules={[Navigation]}
          onInit={(swiper) => {
-            swiper.params.navigation.prevEl = this._swiperPrevRef;
-            swiper.params.navigation.nextEl = this._swiperNextRef;
            swiper.navigation.init();
            swiper.navigation.update();
          }}
@@ -238,7 +238,7 @@ class MovieDetails extends Component {
      certification,
      ratings,
      path,
-      sizeOnDisk,
+      statistics,
      qualityProfileId,
      monitored,
      studio,
@@ -267,6 +267,10 @@ class MovieDetails extends Component {
      movieRuntimeFormat
    } = this.props;

+    const {
+      sizeOnDisk = 0
+    } = statistics;
+
    const {
      isOrganizeModalOpen,
      isEditMovieModalOpen,
@@ -320,8 +324,8 @@ class MovieDetails extends Component {
            />

            <PageToolbarButton
-              label={translate('ManualImport')}
-              iconName={icons.INTERACTIVE}
+              label={translate('ManageFiles')}
+              iconName={icons.MOVIE_FILE}
              onPress={this.onInteractiveImportPress}
            />

@@ -704,6 +708,7 @@ class MovieDetails extends Component {
          <InteractiveImportModal
            isOpen={isInteractiveImportModalOpen}
            movieId={id}
+            modalTitle={translate('ManageFiles')}
            folder={path}
            allowMovieChange={false}
            showFilterExistingFiles={true}
@@ -733,7 +738,7 @@ MovieDetails.propTypes = {
  certification: PropTypes.string,
  ratings: PropTypes.object.isRequired,
  path: PropTypes.string.isRequired,
-  sizeOnDisk: PropTypes.number.isRequired,
+  statistics: PropTypes.object.isRequired,
  qualityProfileId: PropTypes.number.isRequired,
  monitored: PropTypes.bool.isRequired,
  status: PropTypes.string.isRequired,
@@ -772,9 +777,9 @@ MovieDetails.propTypes = {

 MovieDetails.defaultProps = {
  genres: [],
+  statistics: {},
  tags: [],
-  isSaving: false,
-  sizeOnDisk: 0
+  isSaving: false
 };

 export default MovieDetails;
@@ -33,14 +33,11 @@ const selectMovieFiles = createSelector(

    const hasMovieFiles = !!items.length;

-    const sizeOnDisk = items.map((item) => item.size).reduce((prev, curr) => prev + curr, 0);
-
    return {
      isMovieFilesFetching: isFetching,
      isMovieFilesPopulated: isPopulated,
      movieFilesError: error,
-      hasMovieFiles,
-      sizeOnDisk
+      hasMovieFiles
    };
  }
 );
@@ -104,8 +101,7 @@ function createMapStateToProps() {
        isMovieFilesFetching,
        isMovieFilesPopulated,
        movieFilesError,
-        hasMovieFiles,
-        sizeOnDisk
+        hasMovieFiles
      } = movieFiles;

      const {
@@ -161,7 +157,6 @@ function createMapStateToProps() {
        movieCreditsError,
        extraFilesError,
        hasMovieFiles,
-        sizeOnDisk,
        previousMovie,
        nextMovie,
        isSmallScreen: dimensions.isSmallScreen,
@@ -6,31 +6,43 @@ import MovieTitlesTableContent from './MovieTitlesTableContent';

 function createMapStateToProps() {
  return createSelector(
+    (state, { movieId }) => movieId,
    (state) => state.movies,
-    (movies) => {
-      return movies;
+    (movieId, movies) => {
+      const {
+        isFetching,
+        isPopulated,
+        error,
+        items
+      } = movies;
+
+      const alternateTitles = items.find((m) => m.id === movieId)?.alternateTitles;
+
+      return {
+        isFetching,
+        isPopulated,
+        error,
+        alternateTitles
+      };
    }
  );
 }

-const mapDispatchToProps = {
-//  fetchMovies
-};
-
 class MovieTitlesTableContentConnector extends Component {

  //
  // Render

  render() {
-    const movie = this.props.items.filter((obj) => {
-      return obj.id === this.props.movieId;
-    });
+    const {
+      alternateTitles,
+      ...otherProps
+    } = this.props;

    return (
      <MovieTitlesTableContent
-        {...this.props}
-        items={movie[0].alternateTitles}
+        {...otherProps}
+        items={alternateTitles}
      />
    );
  }
@@ -38,7 +50,11 @@ class MovieTitlesTableContentConnector extends Component {

 MovieTitlesTableContentConnector.propTypes = {
  movieId: PropTypes.number.isRequired,
-  items: PropTypes.arrayOf(PropTypes.object).isRequired
+  alternateTitles: PropTypes.arrayOf(PropTypes.object).isRequired
 };

-export default connect(createMapStateToProps, mapDispatchToProps)(MovieTitlesTableContentConnector);
+MovieTitlesTableContentConnector.defaultProps = {
+  alternateTitles: []
+};
+
+export default connect(createMapStateToProps)(MovieTitlesTableContentConnector);
@@ -56,7 +56,6 @@ const columns = [
  },
  {
    name: 'actions',
-    label: () => translate('Actions'),
    isVisible: true
  }
 ];
@@ -7,8 +7,7 @@ import ConfirmModal from 'Components/Modal/ConfirmModal';
 import RelativeDateCellConnector from 'Components/Table/Cells/RelativeDateCellConnector';
 import TableRowCell from 'Components/Table/Cells/TableRowCell';
 import TableRow from 'Components/Table/TableRow';
-import Tooltip from 'Components/Tooltip/Tooltip';
-import { icons, kinds, tooltipPositions } from 'Helpers/Props';
+import { icons, kinds } from 'Helpers/Props';
 import MovieFormats from 'Movie/MovieFormats';
 import MovieLanguage from 'Movie/MovieLanguage';
 import MovieQuality from 'Movie/MovieQuality';
@@ -103,20 +102,11 @@ class MovieHistoryRow extends Component {
        </TableRowCell>

        <TableRowCell>
-          <MovieFormats
-            formats={customFormats}
-          />
+          <MovieFormats formats={customFormats} />
        </TableRowCell>

        <TableRowCell className={styles.customFormatScore}>
-          <Tooltip
-            anchor={formatCustomFormatScore(
-              customFormatScore,
-              customFormats.length
-            )}
-            tooltip={<MovieFormats formats={customFormats} />}
-            position={tooltipPositions.TOP}
-          />
+          {formatCustomFormatScore(customFormatScore, customFormats.length)}
        </TableRowCell>

        <RelativeDateCellConnector
@@ -134,6 +124,7 @@ class MovieHistoryRow extends Component {
              <IconButton
                title={translate('MarkAsFailed')}
                name={icons.REMOVE}
+                size={14}
                onPress={this.onMarkAsFailedPress}
              />
          }
@@ -17,13 +17,13 @@ function createUnoptimizedSelector() {
    createClientSideCollectionSelector('movies', 'movieIndex'),
    (movies: MoviesAppState) => {
      return movies.items.map((m) => {
-        const { monitored, status, hasFile, sizeOnDisk } = m;
+        const { monitored, status, hasFile, statistics } = m;

        return {
          monitored,
          status,
          hasFile,
-          sizeOnDisk,
+          statistics,
        };
      });
    }
@@ -44,16 +44,20 @@ export default function MovieIndexFooter() {
  let monitored = 0;
  let totalFileSize = 0;

-  movies.forEach((s) => {
-    if (s.hasFile) {
+  movies.forEach((m) => {
+    const { statistics = { sizeOnDisk: 0 } } = m;
+
+    const { sizeOnDisk = 0 } = statistics;
+
+    if (m.hasFile) {
      movieFiles += 1;
    }

-    if (s.monitored) {
+    if (m.monitored) {
      monitored++;
    }

-    totalFileSize += s.sizeOnDisk;
+    totalFileSize += sizeOnDisk;
  });

  return (
@@ -1,11 +1,12 @@
-import React, { useCallback, useMemo } from 'react';
+import React, { useCallback, useMemo, useState } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
 import { useSelect } from 'App/SelectContext';
 import ClientSideCollectionAppState from 'App/State/ClientSideCollectionAppState';
 import MoviesAppState, { MovieIndexAppState } from 'App/State/MoviesAppState';
 import { MOVIE_SEARCH } from 'Commands/commandNames';
+import ConfirmModal from 'Components/Modal/ConfirmModal';
 import PageToolbarButton from 'Components/Page/Toolbar/PageToolbarButton';
-import { icons } from 'Helpers/Props';
+import { icons, kinds } from 'Helpers/Props';
 import { executeCommand } from 'Store/Actions/commandActions';
 import createCommandExecutingSelector from 'Store/Selectors/createCommandExecutingSelector';
 import createMovieClientSideCollectionItemsSelector from 'Store/Selectors/createMovieClientSideCollectionItemsSelector';
@@ -21,11 +22,12 @@ function MovieIndexSearchButton(props: MovieIndexSearchButtonProps) {
  const isSearching = useSelector(createCommandExecutingSelector(MOVIE_SEARCH));
  const {
    items,
-    totalItems,
  }: MoviesAppState & MovieIndexAppState & ClientSideCollectionAppState =
    useSelector(createMovieClientSideCollectionItemsSelector('movieIndex'));

  const dispatch = useDispatch();
+  const [isConfirmModalOpen, setIsConfirmModalOpen] = useState(false);
+
  const { isSelectMode, selectedFilterKey } = props;
  const [selectState] = useSelect();
  const { selectedState } = selectState;
@@ -50,6 +52,8 @@ function MovieIndexSearchButton(props: MovieIndexSearchButtonProps) {
      : translate('SearchAll');

  const onPress = useCallback(() => {
+    setIsConfirmModalOpen(false);
+
    dispatch(
      executeCommand({
        name: MOVIE_SEARCH,
@@ -58,14 +62,36 @@ function MovieIndexSearchButton(props: MovieIndexSearchButtonProps) {
    );
  }, [dispatch, moviesToSearch]);

+  const onConfirmPress = useCallback(() => {
+    setIsConfirmModalOpen(true);
+  }, [setIsConfirmModalOpen]);
+
+  const onConfirmModalClose = useCallback(() => {
+    setIsConfirmModalOpen(false);
+  }, [setIsConfirmModalOpen]);
+
  return (
-    <PageToolbarButton
-      label={isSelectMode ? searchSelectLabel : searchIndexLabel}
-      isSpinning={isSearching}
-      isDisabled={!totalItems}
-      iconName={icons.SEARCH}
-      onPress={onPress}
-    />
+    <>
+      <PageToolbarButton
+        label={isSelectMode ? searchSelectLabel : searchIndexLabel}
+        isSpinning={isSearching}
+        isDisabled={!items.length}
+        iconName={icons.SEARCH}
+        onPress={moviesToSearch.length > 5 ? onConfirmPress : onPress}
+      />
+
+      <ConfirmModal
+        isOpen={isConfirmModalOpen}
+        kind={kinds.DANGER}
+        title={isSelectMode ? searchSelectLabel : searchIndexLabel}
+        message={translate('SearchMoviesConfirmationMessageText', {
+          count: moviesToSearch.length,
+        })}
+        confirmLabel={isSelectMode ? searchSelectLabel : searchIndexLabel}
+        onConfirm={onPress}
+        onCancel={onConfirmModalClose}
+      />
+    </>
  );
 }

@@ -13,6 +13,7 @@ import MovieDetailsLinks from 'Movie/Details/MovieDetailsLinks';
 import EditMovieModalConnector from 'Movie/Edit/EditMovieModalConnector';
 import MovieIndexProgressBar from 'Movie/Index/ProgressBar/MovieIndexProgressBar';
 import MovieIndexPosterSelect from 'Movie/Index/Select/MovieIndexPosterSelect';
+import { Statistics } from 'Movie/Movie';
 import MoviePoster from 'Movie/MoviePoster';
 import { executeCommand } from 'Store/Actions/commandActions';
 import dimensions from 'Styles/Variables/dimensions';
@@ -66,17 +67,19 @@ function MovieIndexOverview(props: MovieIndexOverviewProps) {
    status,
    path,
    overview,
+    statistics = {} as Statistics,
    images,
    hasFile,
    isAvailable,
    tmdbId,
    imdbId,
    studio,
-    sizeOnDisk,
    added,
    youTubeTrailerId,
  } = movie;

+  const { sizeOnDisk = 0 } = statistics;
+
  const dispatch = useDispatch();
  const [isEditMovieModalOpen, setIsEditMovieModalOpen] = useState(false);
  const [isDeleteMovieModalOpen, setIsDeleteMovieModalOpen] = useState(false);
@@ -16,6 +16,7 @@ import MovieDetailsLinks from 'Movie/Details/MovieDetailsLinks';
 import EditMovieModalConnector from 'Movie/Edit/EditMovieModalConnector';
 import MovieIndexProgressBar from 'Movie/Index/ProgressBar/MovieIndexProgressBar';
 import MovieIndexPosterSelect from 'Movie/Index/Select/MovieIndexPosterSelect';
+import { Statistics } from 'Movie/Movie';
 import MoviePoster from 'Movie/MoviePoster';
 import { executeCommand } from 'Store/Actions/commandActions';
 import createUISettingsSelector from 'Store/Selectors/createUISettingsSelector';
@@ -75,12 +76,14 @@ function MovieIndexPoster(props: MovieIndexPosterProps) {
    path,
    movieFile,
    ratings,
-    sizeOnDisk,
+    statistics = {} as Statistics,
    certification,
    originalTitle,
    originalLanguage,
  } = movie;

+  const { sizeOnDisk = 0 } = statistics;
+
  const dispatch = useDispatch();
  const [hasPosterError, setHasPosterError] = useState(false);
  const [isEditMovieModalOpen, setIsEditMovieModalOpen] = useState(false);
@@ -256,13 +256,18 @@ export default function MovieIndexPosters(props: MovieIndexPostersProps) {
    if (current) {
      const width = current.clientWidth;
      const padding = bodyPadding - 5;
+      const finalWidth = width - padding * 2;
+
+      if (Math.abs(size.width - finalWidth) < 20 || size.width === finalWidth) {
+        return;
+      }

      setSize({
-        width: width - padding * 2,
+        width: finalWidth,
        height: window.innerHeight,
      });
    }
-  }, [isSmallScreen, scrollerRef, bounds]);
+  }, [isSmallScreen, size, scrollerRef, bounds]);

  useEffect(() => {
    const currentScrollerRef = scrollerRef.current as HTMLElement;
@@ -38,6 +38,7 @@
  flex: 1 0 125px;
 }

+.releaseGroups,
 .inCinemas,
 .physicalRelease,
 .digitalRelease,
@@ -20,6 +20,7 @@ interface CssExports {
  'physicalRelease': string;
  'popularity': string;
  'qualityProfileId': string;
+  'releaseGroups': string;
  'rottenTomatoesRating': string;
  'runtime': string;
  'sizeOnDisk': string;
@@ -19,6 +19,7 @@ import DeleteMovieModal from 'Movie/Delete/DeleteMovieModal';
 import MovieDetailsLinks from 'Movie/Details/MovieDetailsLinks';
 import EditMovieModalConnector from 'Movie/Edit/EditMovieModalConnector';
 import createMovieIndexItemSelector from 'Movie/Index/createMovieIndexItemSelector';
+import { Statistics } from 'Movie/Movie';
 import MoviePopularityIndex from 'Movie/MoviePopularityIndex';
 import MovieTitleLink from 'Movie/MovieTitleLink';
 import { executeCommand } from 'Store/Actions/commandActions';
@@ -26,7 +27,7 @@ import createUISettingsSelector from 'Store/Selectors/createUISettingsSelector';
 import { SelectStateInputProps } from 'typings/props';
 import formatRuntime from 'Utilities/Date/formatRuntime';
 import formatBytes from 'Utilities/Number/formatBytes';
-import titleCase from 'Utilities/String/titleCase';
+import firstCharToUpper from 'Utilities/String/firstCharToUpper';
 import translate from 'Utilities/String/translate';
 import MovieIndexProgressBar from '../ProgressBar/MovieIndexProgressBar';
 import MovieStatusCell from './MovieStatusCell';
@@ -60,6 +61,7 @@ function MovieIndexRow(props: MovieIndexRowProps) {
    originalLanguage,
    originalTitle,
    added,
+    statistics = {} as Statistics,
    year,
    inCinemas,
    digitalRelease,
@@ -67,7 +69,6 @@ function MovieIndexRow(props: MovieIndexRowProps) {
    runtime,
    minimumAvailability,
    path,
-    sizeOnDisk,
    genres = [],
    ratings,
    popularity,
@@ -82,6 +83,8 @@ function MovieIndexRow(props: MovieIndexRowProps) {
    isSaving = false,
  } = movie;

+  const { sizeOnDisk = 0, releaseGroups = [] } = statistics;
+
  const dispatch = useDispatch();
  const [isEditMovieModalOpen, setIsEditMovieModalOpen] = useState(false);
  const [isDeleteMovieModalOpen, setIsDeleteMovieModalOpen] = useState(false);
@@ -286,7 +289,7 @@ function MovieIndexRow(props: MovieIndexRowProps) {
        if (name === 'minimumAvailability') {
          return (
            <VirtualTableRowCell key={name} className={styles[name]}>
-              {titleCase(minimumAvailability)}
+              {translate(firstCharToUpper(minimumAvailability))}
            </VirtualTableRowCell>
          );
        }
@@ -380,6 +383,20 @@ function MovieIndexRow(props: MovieIndexRowProps) {
          );
        }

+        if (name === 'releaseGroups') {
+          const joinedReleaseGroups = releaseGroups.join(', ');
+          const truncatedReleaseGroups =
+            releaseGroups.length > 3
+              ? `${releaseGroups.slice(0, 3).join(', ')}...`
+              : joinedReleaseGroups;
+
+          return (
+            <VirtualTableRowCell key={name} className={styles[name]}>
+              <span title={joinedReleaseGroups}>{truncatedReleaseGroups}</span>
+            </VirtualTableRowCell>
+          );
+        }
+
        if (name === 'tags') {
          return (
            <VirtualTableRowCell key={name} className={styles[name]}>
@@ -31,6 +31,7 @@
  flex: 1 0 125px;
 }

+.releaseGroups,
 .inCinemas,
 .physicalRelease,
 .digitalRelease,
@@ -17,6 +17,7 @@ interface CssExports {
  'physicalRelease': string;
  'popularity': string;
  'qualityProfileId': string;
+  'releaseGroups': string;
  'rottenTomatoesRating': string;
  'runtime': string;
  'sizeOnDisk': string;
@@ -12,6 +12,12 @@ export interface Collection {
  title: string;
 }

+export interface Statistics {
+  movieFileCount: number;
+  releaseGroups: string[];
+  sizeOnDisk: number;
+}
+
 export interface Ratings {
  imdb: object;
  tmdb: object;
@@ -42,11 +48,11 @@ interface Movie extends ModelBase {
  runtime: number;
  minimumAvailability: string;
  path: string;
-  sizeOnDisk: number;
  genres: string[];
  ratings: Ratings;
  popularity: number;
  certification: string;
+  statistics: Statistics;
  tags: number[];
  images: Image[];
  movieFile: MovieFile;
@@ -3,6 +3,7 @@ import React from 'react';
 import Label from 'Components/Label';
 import { kinds } from 'Helpers/Props';
 import formatBytes from 'Utilities/Number/formatBytes';
+import translate from 'Utilities/String/translate';

 function getTooltip(title, quality, size, isMonitored, isCutoffNotMet) {
  const revision = quality.revision;
@@ -28,6 +29,36 @@ function getTooltip(title, quality, size, isMonitored, isCutoffNotMet) {
  return title;
 }

+function revisionLabel(className, quality, showRevision) {
+  if (!showRevision) {
+    return;
+  }
+
+  if (quality.revision.isRepack) {
+    return (
+      <Label
+        className={className}
+        kind={kinds.PRIMARY}
+        title={translate('Repack')}
+      >
+        R
+      </Label>
+    );
+  }
+
+  if (quality.revision.version && quality.revision.version > 1) {
+    return (
+      <Label
+        className={className}
+        kind={kinds.PRIMARY}
+        title={translate('Proper')}
+      >
+        P
+      </Label>
+    );
+  }
+}
+
 function MovieQuality(props) {
  const {
    className,
@@ -35,7 +66,8 @@ function MovieQuality(props) {
    quality,
    size,
    isMonitored,
-    isCutoffNotMet
+    isCutoffNotMet,
+    showRevision
  } = props;

  let kind = kinds.DEFAULT;
@@ -50,13 +82,15 @@ function MovieQuality(props) {
  }

  return (
-    <Label
-      className={className}
-      kind={kind}
-      title={getTooltip(title, quality, size, isMonitored, isCutoffNotMet)}
-    >
-      {quality.quality.name}
-    </Label>
+    <span>
+      <Label
+        className={className}
+        kind={kind}
+        title={getTooltip(title, quality, size, isMonitored, isCutoffNotMet)}
+      >
+        {quality.quality.name}
+      </Label>{revisionLabel(className, quality, showRevision)}
+    </span>
  );
 }

@@ -66,12 +100,14 @@ MovieQuality.propTypes = {
  quality: PropTypes.object.isRequired,
  size: PropTypes.number,
  isMonitored: PropTypes.bool,
-  isCutoffNotMet: PropTypes.bool
+  isCutoffNotMet: PropTypes.bool,
+  showRevision: PropTypes.bool
 };

 MovieQuality.defaultProps = {
  title: '',
-  isMonitored: true
+  isMonitored: true,
+  showRevision: false
 };

 export default MovieQuality;
@@ -1,82 +0,0 @@
-import PropTypes from 'prop-types';
-import React from 'react';
-import Label from 'Components/Label';
-import IconButton from 'Components/Link/IconButton';
-import Link from 'Components/Link/Link';
-import TableRowCell from 'Components/Table/Cells/TableRowCell';
-import TableRow from 'Components/Table/TableRow';
-import { icons, kinds } from 'Helpers/Props';
-import formatBytes from 'Utilities/Number/formatBytes';
-import translate from 'Utilities/String/translate';
-import styles from './RootFolderRow.css';
-
-function RootFolderRow(props) {
-  const {
-    id,
-    path,
-    accessible,
-    freeSpace,
-    unmappedFolders,
-    onDeletePress
-  } = props;
-
-  const isUnavailable = !accessible;
-
-  return (
-    <TableRow>
-      <TableRowCell>
-        {
-          isUnavailable ?
-            <div className={styles.unavailablePath}>
-              {path}
-
-              <Label
-                className={styles.unavailableLabel}
-                kind={kinds.DANGER}
-              >
-                {translate('Unavailable')}
-              </Label>
-            </div> :
-
-            <Link
-              className={styles.link}
-              to={`/add/import/${id}`}
-            >
-              {path}
-            </Link>
-        }
-      </TableRowCell>
-
-      <TableRowCell className={styles.freeSpace}>
-        {(isUnavailable || isNaN(freeSpace)) ? '-' : formatBytes(freeSpace)}
-      </TableRowCell>
-
-      <TableRowCell className={styles.unmappedFolders}>
-        {isUnavailable ? '-' : unmappedFolders.length}
-      </TableRowCell>
-
-      <TableRowCell className={styles.actions}>
-        <IconButton
-          title={translate('RemoveRootFolder')}
-          name={icons.REMOVE}
-          onPress={onDeletePress}
-        />
-      </TableRowCell>
-    </TableRow>
-  );
-}
-
-RootFolderRow.propTypes = {
-  id: PropTypes.number.isRequired,
-  path: PropTypes.string.isRequired,
-  accessible: PropTypes.bool.isRequired,
-  freeSpace: PropTypes.number,
-  unmappedFolders: PropTypes.arrayOf(PropTypes.object).isRequired,
-  onDeletePress: PropTypes.func.isRequired
-};
-
-RootFolderRow.defaultProps = {
-  unmappedFolders: []
-};
-
-export default RootFolderRow;
@@ -1,92 +0,0 @@
-import PropTypes from 'prop-types';
-import React from 'react';
-import Alert from 'Components/Alert';
-import LoadingIndicator from 'Components/Loading/LoadingIndicator';
-import Table from 'Components/Table/Table';
-import TableBody from 'Components/Table/TableBody';
-import { kinds } from 'Helpers/Props';
-import translate from 'Utilities/String/translate';
-import RootFolderRowConnector from './RootFolderRowConnector';
-
-const rootFolderColumns = [
-  {
-    name: 'path',
-    get label() {
-      return translate('Path');
-    },
-    isVisible: true
-  },
-  {
-    name: 'freeSpace',
-    get label() {
-      return translate('FreeSpace');
-    },
-    isVisible: true
-  },
-  {
-    name: 'unmappedFolders',
-    get label() {
-      return translate('UnmappedFolders');
-    },
-    isVisible: true
-  },
-  {
-    name: 'actions',
-    isVisible: true
-  }
-];
-
-function RootFolders(props) {
-  const {
-    isFetching,
-    isPopulated,
-    error,
-    items
-  } = props;
-
-  if (isFetching && !isPopulated) {
-    return (
-      <LoadingIndicator />
-    );
-  }
-
-  if (!isFetching && !!error) {
-    return (
-      <Alert kind={kinds.DANGER}>
-        {translate('UnableToLoadRootFolders')}
-      </Alert>
-    );
-  }
-
-  return (
-    <Table
-      columns={rootFolderColumns}
-    >
-      <TableBody>
-        {
-          items.map((rootFolder) => {
-            return (
-              <RootFolderRowConnector
-                key={rootFolder.id}
-                id={rootFolder.id}
-                path={rootFolder.path}
-                accessible={rootFolder.accessible}
-                freeSpace={rootFolder.freeSpace}
-                unmappedFolders={rootFolder.unmappedFolders}
-              />
-            );
-          })
-        }
-      </TableBody>
-    </Table>
-  );
-}
-
-RootFolders.propTypes = {
-  isFetching: PropTypes.bool.isRequired,
-  isPopulated: PropTypes.bool.isRequired,
-  error: PropTypes.object,
-  items: PropTypes.arrayOf(PropTypes.object).isRequired
-};
-
-export default RootFolders;
@@ -49,7 +49,7 @@ function RootFolders() {

  if (!isFetching && !!error) {
    return (
-      <Alert kind={kinds.DANGER}>{translate('UnableToLoadRootFolders')}</Alert>
+      <Alert kind={kinds.DANGER}>{translate('RootFoldersLoadError')}</Alert>
    );
  }

@@ -152,7 +152,7 @@ class CustomFormat extends Component {
          isOpen={this.state.isDeleteCustomFormatModalOpen}
          kind={kinds.DANGER}
          title={translate('DeleteCustomFormat')}
-          message={translate('DeleteCustomFormatMessageText', { name })}
+          message={translate('DeleteCustomFormatMessageText', { customFormatName: name })}
          confirmLabel={translate('Delete')}
          isSpinning={isDeleting}
          onConfirm={this.onConfirmDeleteCustomFormat}
@@ -133,7 +133,7 @@ class EditDownloadClientModalContent extends Component {
                  <FormInputGroup
                    type={inputTypes.NUMBER}
                    name="priority"
-                    helpText={translate('PriorityHelpText')}
+                    helpText={translate('DownloadClientPriorityHelpText')}
                    min={1}
                    max={50}
                    {...priority}
@@ -14,9 +14,11 @@ import Table from 'Components/Table/Table';
 import TableBody from 'Components/Table/TableBody';
 import useSelectState from 'Helpers/Hooks/useSelectState';
 import { kinds } from 'Helpers/Props';
+import SortDirection from 'Helpers/Props/SortDirection';
 import {
  bulkDeleteDownloadClients,
  bulkEditDownloadClients,
+  setManageDownloadClientsSort,
 } from 'Store/Actions/settingsActions';
 import createClientSideCollectionSelector from 'Store/Selectors/createClientSideCollectionSelector';
 import { SelectStateInputProps } from 'typings/props';
@@ -80,6 +82,8 @@ const COLUMNS = [

 interface ManageDownloadClientsModalContentProps {
  onModalClose(): void;
+  sortKey?: string;
+  sortDirection?: SortDirection;
 }

 function ManageDownloadClientsModalContent(
@@ -94,6 +98,8 @@ function ManageDownloadClientsModalContent(
    isSaving,
    error,
    items,
+    sortKey,
+    sortDirection,
  }: DownloadClientAppState = useSelector(
    createClientSideCollectionSelector('settings.downloadClients')
  );
@@ -114,6 +120,13 @@ function ManageDownloadClientsModalContent(

  const selectedCount = selectedIds.length;

+  const onSortPress = useCallback(
+    (value: string) => {
+      dispatch(setManageDownloadClientsSort({ sortKey: value }));
+    },
+    [dispatch]
+  );
+
  const onDeletePress = useCallback(() => {
    setIsDeleteModalOpen(true);
  }, [setIsDeleteModalOpen]);
@@ -219,6 +232,9 @@ function ManageDownloadClientsModalContent(
            allSelected={allSelected}
            allUnselected={allUnselected}
            onSelectAllChange={onSelectAllChange}
+            sortKey={sortKey}
+            sortDirection={sortDirection}
+            onSortPress={onSortPress}
          >
            <TableBody>
              {items.map((item) => {
@@ -15,6 +15,7 @@ interface SavePayload {
  enabled?: boolean;
  enableAuto?: boolean;
  qualityProfileId?: number;
+  minimumAvailability?: string;
  rootFolderPath?: string;
 }

@@ -58,6 +59,7 @@ function ManageImportListsEditModalContent(
  const [qualityProfileId, setQualityProfileId] = useState<string | number>(
    NO_CHANGE
  );
+  const [minimumAvailability, setMinimumAvailability] = useState(NO_CHANGE);
  const [rootFolderPath, setRootFolderPath] = useState(NO_CHANGE);

  const save = useCallback(() => {
@@ -79,6 +81,11 @@ function ManageImportListsEditModalContent(
      payload.qualityProfileId = qualityProfileId as number;
    }

+    if (minimumAvailability !== NO_CHANGE) {
+      hasChanges = true;
+      payload.minimumAvailability = minimumAvailability as string;
+    }
+
    if (rootFolderPath !== NO_CHANGE) {
      hasChanges = true;
      payload.rootFolderPath = rootFolderPath;
@@ -93,6 +100,7 @@ function ManageImportListsEditModalContent(
    enabled,
    enableAuto,
    qualityProfileId,
+    minimumAvailability,
    rootFolderPath,
    onSavePress,
    onModalClose,
@@ -110,6 +118,9 @@ function ManageImportListsEditModalContent(
        case 'qualityProfileId':
          setQualityProfileId(value);
          break;
+        case 'minimumAvailability':
+          setMinimumAvailability(value);
+          break;
        case 'rootFolderPath':
          setRootFolderPath(value);
          break;
@@ -164,6 +175,19 @@ function ManageImportListsEditModalContent(
          />
        </FormGroup>

+        <FormGroup>
+          <FormLabel>{translate('MinimumAvailability')}</FormLabel>
+
+          <FormInputGroup
+            type={inputTypes.AVAILABILITY_SELECT}
+            name="minimumAvailability"
+            value={minimumAvailability}
+            includeNoChange={true}
+            includeNoChangeDisabled={false}
+            onChange={onInputChange}
+          />
+        </FormGroup>
+
        <FormGroup>
          <FormLabel>{translate('RootFolder')}</FormLabel>

@@ -1,5 +1,6 @@
 import React from 'react';
 import Modal from 'Components/Modal/Modal';
+import { sizes } from 'Helpers/Props';
 import ManageImportListsModalContent from './ManageImportListsModalContent';

 interface ManageImportListsModalProps {
@@ -11,7 +12,7 @@ function ManageImportListsModal(props: ManageImportListsModalProps) {
  const { isOpen, onModalClose } = props;

  return (
-    <Modal isOpen={isOpen} onModalClose={onModalClose}>
+    <Modal isOpen={isOpen} size={sizes.EXTRA_LARGE} onModalClose={onModalClose}>
      <ManageImportListsModalContent onModalClose={onModalClose} />
    </Modal>
  );
@@ -52,6 +52,12 @@ const COLUMNS = [
    isSortable: true,
    isVisible: true,
  },
+  {
+    name: 'minimumAvailability',
+    label: () => translate('MinimumAvailability'),
+    isSortable: true,
+    isVisible: true,
+  },
  {
    name: 'rootFolderPath',
    label: () => translate('RootFolder'),
@@ -2,6 +2,7 @@
 .tags,
 .enabled,
 .enableAuto,
+.minimumAvailability,
 .qualityProfileId,
 .rootFolderPath,
 .implementation {
@@ -4,6 +4,7 @@ interface CssExports {
  'enableAuto': string;
  'enabled': string;
  'implementation': string;
+  'minimumAvailability': string;
  'name': string;
  'qualityProfileId': string;
  'rootFolderPath': string;
@@ -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 firstCharToUpper from 'Utilities/String/firstCharToUpper';
 import translate from 'Utilities/String/translate';
 import styles from './ManageImportListsModalRow.css';

@@ -15,6 +16,7 @@ interface ManageImportListsModalRowProps {
  name: string;
  rootFolderPath: string;
  qualityProfileId: number;
+  minimumAvailability: string;
  implementation: string;
  tags: number[];
  enabled: boolean;
@@ -30,6 +32,7 @@ function ManageImportListsModalRow(props: ManageImportListsModalRowProps) {
    isSelected,
    name,
    rootFolderPath,
+    minimumAvailability,
    qualityProfileId,
    implementation,
    enabled,
@@ -69,6 +72,10 @@ function ManageImportListsModalRow(props: ManageImportListsModalRowProps) {
        {qualityProfile?.name ?? translate('None')}
      </TableRowCell>

+      <TableRowCell className={styles.minimumAvailability}>
+        {translate(firstCharToUpper(minimumAvailability))}
+      </TableRowCell>
+
      <TableRowCell className={styles.rootFolderPath}>
        {rootFolderPath}
      </TableRowCell>
@@ -14,9 +14,11 @@ import Table from 'Components/Table/Table';
 import TableBody from 'Components/Table/TableBody';
 import useSelectState from 'Helpers/Hooks/useSelectState';
 import { kinds } from 'Helpers/Props';
+import SortDirection from 'Helpers/Props/SortDirection';
 import {
  bulkDeleteIndexers,
  bulkEditIndexers,
+  setManageIndexersSort,
 } from 'Store/Actions/settingsActions';
 import createClientSideCollectionSelector from 'Store/Selectors/createClientSideCollectionSelector';
 import { SelectStateInputProps } from 'typings/props';
@@ -80,6 +82,8 @@ const COLUMNS = [

 interface ManageIndexersModalContentProps {
  onModalClose(): void;
+  sortKey?: string;
+  sortDirection?: SortDirection;
 }

 function ManageIndexersModalContent(props: ManageIndexersModalContentProps) {
@@ -92,6 +96,8 @@ function ManageIndexersModalContent(props: ManageIndexersModalContentProps) {
    isSaving,
    error,
    items,
+    sortKey,
+    sortDirection,
  }: IndexerAppState = useSelector(
    createClientSideCollectionSelector('settings.indexers')
  );
@@ -112,6 +118,13 @@ function ManageIndexersModalContent(props: ManageIndexersModalContentProps) {

  const selectedCount = selectedIds.length;

+  const onSortPress = useCallback(
+    (value: string) => {
+      dispatch(setManageIndexersSort({ sortKey: value }));
+    },
+    [dispatch]
+  );
+
  const onDeletePress = useCallback(() => {
    setIsDeleteModalOpen(true);
  }, [setIsDeleteModalOpen]);
@@ -214,6 +227,9 @@ function ManageIndexersModalContent(props: ManageIndexersModalContentProps) {
            allSelected={allSelected}
            allUnselected={allUnselected}
            onSelectAllChange={onSelectAllChange}
+            sortKey={sortKey}
+            sortDirection={sortDirection}
+            onSortPress={onSortPress}
          >
            <TableBody>
              {items.map((item) => {
@@ -1,72 +0,0 @@
-import PropTypes from 'prop-types';
-import React, { Component } from 'react';
-import FileBrowserModal from 'Components/FileBrowser/FileBrowserModal';
-import Icon from 'Components/Icon';
-import Button from 'Components/Link/Button';
-import { icons, kinds, sizes } from 'Helpers/Props';
-import translate from 'Utilities/String/translate';
-import styles from './AddRootFolder.css';
-
-class AddRootFolder extends Component {
-
-  //
-  // Lifecycle
-
-  constructor(props, context) {
-    super(props, context);
-
-    this.state = {
-      isAddNewRootFolderModalOpen: false
-    };
-  }
-
-  //
-  // Lifecycle
-
-  onAddNewRootFolderPress = () => {
-    this.setState({ isAddNewRootFolderModalOpen: true });
-  };
-
-  onNewRootFolderSelect = ({ value }) => {
-    this.props.onNewRootFolderSelect(value);
-  };
-
-  onAddRootFolderModalClose = () => {
-    this.setState({ isAddNewRootFolderModalOpen: false });
-  };
-
-  //
-  // Render
-
-  render() {
-    return (
-      <div className={styles.addRootFolderButtonContainer}>
-        <Button
-          kind={kinds.PRIMARY}
-          size={sizes.LARGE}
-          onPress={this.onAddNewRootFolderPress}
-        >
-          <Icon
-            className={styles.importButtonIcon}
-            name={icons.DRIVE}
-          />
-          {translate('AddRootFolder')}
-        </Button>
-
-        <FileBrowserModal
-          isOpen={this.state.isAddNewRootFolderModalOpen}
-          name="rootFolderPath"
-          value=""
-          onChange={this.onNewRootFolderSelect}
-          onModalClose={this.onAddRootFolderModalClose}
-        />
-      </div>
-    );
-  }
-}
-
-AddRootFolder.propTypes = {
-  onNewRootFolderSelect: PropTypes.func.isRequired
-};
-
-export default AddRootFolder;
@@ -1,14 +1,18 @@
 import React, { useCallback, useState } from 'react';
-import { useDispatch } from 'react-redux';
+import { useDispatch, useSelector } from 'react-redux';
+import Alert from 'Components/Alert';
 import FileBrowserModal from 'Components/FileBrowser/FileBrowserModal';
 import Icon from 'Components/Icon';
 import Button from 'Components/Link/Button';
 import { icons, kinds, sizes } from 'Helpers/Props';
 import { addRootFolder } from 'Store/Actions/rootFolderActions';
+import createRootFoldersSelector from 'Store/Selectors/createRootFoldersSelector';
 import translate from 'Utilities/String/translate';
 import styles from './AddRootFolder.css';

 function AddRootFolder() {
+  const { isSaving, saveError } = useSelector(createRootFoldersSelector());
+
  const dispatch = useDispatch();

  const [isAddNewRootFolderModalOpen, setIsAddNewRootFolderModalOpen] =
@@ -30,24 +34,42 @@ function AddRootFolder() {
  }, [setIsAddNewRootFolderModalOpen]);

  return (
-    <div className={styles.addRootFolderButtonContainer}>
-      <Button
-        kind={kinds.PRIMARY}
-        size={sizes.LARGE}
-        onPress={onAddNewRootFolderPress}
-      >
-        <Icon className={styles.importButtonIcon} name={icons.DRIVE} />
-        {translate('AddRootFolder')}
-      </Button>
+    <>
+      {!isSaving && saveError ? (
+        <Alert kind={kinds.DANGER}>
+          {translate('AddRootFolderError')}

-      <FileBrowserModal
-        isOpen={isAddNewRootFolderModalOpen}
-        name="rootFolderPath"
-        value=""
-        onChange={onNewRootFolderSelect}
-        onModalClose={onAddRootFolderModalClose}
-      />
-    </div>
+          <ul>
+            {Array.isArray(saveError.responseJSON) ? (
+              saveError.responseJSON.map((e, index) => {
+                return <li key={index}>{e.errorMessage}</li>;
+              })
+            ) : (
+              <li>{JSON.stringify(saveError.responseJSON)}</li>
+            )}
+          </ul>
+        </Alert>
+      ) : null}
+
+      <div className={styles.addRootFolderButtonContainer}>
+        <Button
+          kind={kinds.PRIMARY}
+          size={sizes.LARGE}
+          onPress={onAddNewRootFolderPress}
+        >
+          <Icon className={styles.importButtonIcon} name={icons.DRIVE} />
+          {translate('AddRootFolder')}
+        </Button>
+
+        <FileBrowserModal
+          isOpen={isAddNewRootFolderModalOpen}
+          name="rootFolderPath"
+          value=""
+          onChange={onNewRootFolderSelect}
+          onModalClose={onAddRootFolderModalClose}
+        />
+      </div>
+    </>
  );
 }

@@ -1,4 +1,5 @@
 import { createAction } from 'redux-actions';
+import { sortDirections } from 'Helpers/Props';
 import createBulkEditItemHandler from 'Store/Actions/Creators/createBulkEditItemHandler';
 import createBulkRemoveItemHandler from 'Store/Actions/Creators/createBulkRemoveItemHandler';
 import createFetchHandler from 'Store/Actions/Creators/createFetchHandler';
@@ -7,6 +8,7 @@ import createRemoveItemHandler from 'Store/Actions/Creators/createRemoveItemHand
 import createSaveProviderHandler, { createCancelSaveProviderHandler } from 'Store/Actions/Creators/createSaveProviderHandler';
 import createTestAllProvidersHandler from 'Store/Actions/Creators/createTestAllProvidersHandler';
 import createTestProviderHandler, { createCancelTestProviderHandler } from 'Store/Actions/Creators/createTestProviderHandler';
+import createSetClientSideCollectionSortReducer from 'Store/Actions/Creators/Reducers/createSetClientSideCollectionSortReducer';
 import createSetProviderFieldValueReducer from 'Store/Actions/Creators/Reducers/createSetProviderFieldValueReducer';
 import createSetSettingValueReducer from 'Store/Actions/Creators/Reducers/createSetSettingValueReducer';
 import { createThunk } from 'Store/thunks';
@@ -31,9 +33,9 @@ export const DELETE_DOWNLOAD_CLIENT = 'settings/downloadClients/deleteDownloadCl
 export const TEST_DOWNLOAD_CLIENT = 'settings/downloadClients/testDownloadClient';
 export const CANCEL_TEST_DOWNLOAD_CLIENT = 'settings/downloadClients/cancelTestDownloadClient';
 export const TEST_ALL_DOWNLOAD_CLIENTS = 'settings/downloadClients/testAllDownloadClients';
-
-export const BULK_DELETE_DOWNLOAD_CLIENTS = 'settings/downloadClients/bulkDeleteDownloadClients';
 export const BULK_EDIT_DOWNLOAD_CLIENTS = 'settings/downloadClients/bulkEditDownloadClients';
+export const BULK_DELETE_DOWNLOAD_CLIENTS = 'settings/downloadClients/bulkDeleteDownloadClients';
+export const SET_MANAGE_DOWNLOAD_CLIENTS_SORT = 'settings/downloadClients/setManageDownloadClientsSort';

 //
 // Action Creators
@@ -48,9 +50,9 @@ export const deleteDownloadClient = createThunk(DELETE_DOWNLOAD_CLIENT);
 export const testDownloadClient = createThunk(TEST_DOWNLOAD_CLIENT);
 export const cancelTestDownloadClient = createThunk(CANCEL_TEST_DOWNLOAD_CLIENT);
 export const testAllDownloadClients = createThunk(TEST_ALL_DOWNLOAD_CLIENTS);
-
-export const bulkDeleteDownloadClients = createThunk(BULK_DELETE_DOWNLOAD_CLIENTS);
 export const bulkEditDownloadClients = createThunk(BULK_EDIT_DOWNLOAD_CLIENTS);
+export const bulkDeleteDownloadClients = createThunk(BULK_DELETE_DOWNLOAD_CLIENTS);
+export const setManageDownloadClientsSort = createAction(SET_MANAGE_DOWNLOAD_CLIENTS_SORT);

 export const setDownloadClientValue = createAction(SET_DOWNLOAD_CLIENT_VALUE, (payload) => {
  return {
@@ -90,7 +92,9 @@ export default {
    isTesting: false,
    isTestingAll: false,
    items: [],
-    pendingChanges: {}
+    pendingChanges: {},
+    sortKey: 'name',
+    sortDirection: sortDirections.DESCENDING
  },

  //
@@ -124,7 +128,10 @@ export default {

        return selectedSchema;
      });
-    }
+    },
+
+    [SET_MANAGE_DOWNLOAD_CLIENTS_SORT]: createSetClientSideCollectionSortReducer(section)
+
  }

 };
@@ -1,4 +1,5 @@
 import { createAction } from 'redux-actions';
+import { sortDirections } from 'Helpers/Props';
 import createBulkEditItemHandler from 'Store/Actions/Creators/createBulkEditItemHandler';
 import createBulkRemoveItemHandler from 'Store/Actions/Creators/createBulkRemoveItemHandler';
 import createFetchHandler from 'Store/Actions/Creators/createFetchHandler';
@@ -7,6 +8,7 @@ import createRemoveItemHandler from 'Store/Actions/Creators/createRemoveItemHand
 import createSaveProviderHandler, { createCancelSaveProviderHandler } from 'Store/Actions/Creators/createSaveProviderHandler';
 import createTestAllProvidersHandler from 'Store/Actions/Creators/createTestAllProvidersHandler';
 import createTestProviderHandler, { createCancelTestProviderHandler } from 'Store/Actions/Creators/createTestProviderHandler';
+import createSetClientSideCollectionSortReducer from 'Store/Actions/Creators/Reducers/createSetClientSideCollectionSortReducer';
 import createSetProviderFieldValueReducer from 'Store/Actions/Creators/Reducers/createSetProviderFieldValueReducer';
 import createSetSettingValueReducer from 'Store/Actions/Creators/Reducers/createSetSettingValueReducer';
 import { createThunk } from 'Store/thunks';
@@ -35,9 +37,9 @@ export const DELETE_INDEXER = 'settings/indexers/deleteIndexer';
 export const TEST_INDEXER = 'settings/indexers/testIndexer';
 export const CANCEL_TEST_INDEXER = 'settings/indexers/cancelTestIndexer';
 export const TEST_ALL_INDEXERS = 'settings/indexers/testAllIndexers';
-
-export const BULK_DELETE_INDEXERS = 'settings/indexers/bulkDeleteIndexers';
 export const BULK_EDIT_INDEXERS = 'settings/indexers/bulkEditIndexers';
+export const BULK_DELETE_INDEXERS = 'settings/indexers/bulkDeleteIndexers';
+export const SET_MANAGE_INDEXERS_SORT = 'settings/indexers/setManageIndexersSort';

 //
 // Action Creators
@@ -53,9 +55,9 @@ export const deleteIndexer = createThunk(DELETE_INDEXER);
 export const testIndexer = createThunk(TEST_INDEXER);
 export const cancelTestIndexer = createThunk(CANCEL_TEST_INDEXER);
 export const testAllIndexers = createThunk(TEST_ALL_INDEXERS);
-
-export const bulkDeleteIndexers = createThunk(BULK_DELETE_INDEXERS);
 export const bulkEditIndexers = createThunk(BULK_EDIT_INDEXERS);
+export const bulkDeleteIndexers = createThunk(BULK_DELETE_INDEXERS);
+export const setManageIndexersSort = createAction(SET_MANAGE_INDEXERS_SORT);

 export const setIndexerValue = createAction(SET_INDEXER_VALUE, (payload) => {
  return {
@@ -95,7 +97,9 @@ export default {
    isTesting: false,
    isTestingAll: false,
    items: [],
-    pendingChanges: {}
+    pendingChanges: {},
+    sortKey: 'name',
+    sortDirection: sortDirections.DESCENDING
  },

  //
@@ -157,7 +161,10 @@ export default {
      };

      return updateSectionState(state, section, newState);
-    }
+    },
+
+    [SET_MANAGE_INDEXERS_SORT]: createSetClientSideCollectionSortReducer(section)
+
  }

 };
@@ -130,7 +130,10 @@ export const actionHandlers = handleThunks({

    promise.done((data) => {
      const updatedItem = _.cloneDeep(data);
+      updatedItem.internalId = updatedItem.id;
      updatedItem.id = updatedItem.tmdbId;
+      delete updatedItem.images;
+
      const actions = [
        updateItem({ section: 'movies', ...data }),
        updateItem({ section: 'addMovie', ...updatedItem }),
@@ -128,6 +128,22 @@ export const filterPredicates = {
    return predicate(originalLanguage ? originalLanguage.name : '', filterValue);
  },

+  releaseGroups: function(item, filterValue, type) {
+    const predicate = filterTypePredicates[type];
+    const { statistics = {} } = item;
+    const { releaseGroups = [] } = statistics;
+
+    return predicate(releaseGroups, filterValue);
+  },
+
+  sizeOnDisk: function(item, filterValue, type) {
+    const predicate = filterTypePredicates[type];
+    const { statistics = {} } = item;
+    const sizeOnDisk = statistics && statistics.sizeOnDisk ? statistics.sizeOnDisk : 0;
+
+    return predicate(sizeOnDisk, filterValue);
+  },
+
  inCinemas: function(item, filterValue, type) {
    return dateFilterPredicate(item.inCinemas, filterValue, type);
  },
@@ -290,6 +306,12 @@ export const sortPredicates = {
    }

    return Number.MAX_VALUE;
+  },
+
+  sizeOnDisk: function(item) {
+    const { statistics = {} } = item;
+
+    return statistics.sizeOnDisk || 0;
  }
 };

@@ -206,10 +206,16 @@ export const defaultState = {
      isSortable: true,
      isVisible: false
    },
+    {
+      name: 'releaseGroups',
+      label: () => translate('ReleaseGroup'),
+      isSortable: true,
+      isVisible: false
+    },
    {
      name: 'tags',
      label: () => translate('Tags'),
-      isSortable: false,
+      isSortable: true,
      isVisible: false
    },
    {
@@ -241,6 +247,17 @@ export const defaultState = {
      return originalLanguage.name;
    },

+    releaseGroups: function(item) {
+      const { statistics = {} } = item;
+      const { releaseGroups = [] } = statistics;
+
+      return releaseGroups.length ?
+        releaseGroups
+          .map((group) => group.toLowerCase())
+          .sort((a, b) => a.localeCompare(b)) :
+        undefined;
+    },
+
    imdbRating: function(item) {
      const { ratings = {} } = item;

@@ -313,6 +330,28 @@ export const defaultState = {
        return collectionList.sort(sortByName);
      }
    },
+    {
+      name: 'releaseGroups',
+      label: () => translate('ReleaseGroups'),
+      type: filterBuilderTypes.ARRAY,
+      optionsSelector: function(items) {
+        const groupList = items.reduce((acc, movie) => {
+          const { statistics = {} } = movie;
+          const { releaseGroups = [] } = statistics;
+
+          releaseGroups.forEach((releaseGroup) => {
+            acc.push({
+              id: releaseGroup,
+              name: releaseGroup
+            });
+          });
+
+          return acc;
+        }, []);
+
+        return groupList.sort(sortByName);
+      }
+    },
    {
      name: 'status',
      label: () => translate('ReleaseStatus'),
@@ -147,6 +147,12 @@ export const defaultState = {
        isSortable: true,
        isVisible: true
      },
+      {
+        name: 'added',
+        label: () => translate('Added'),
+        isSortable: true,
+        isVisible: false
+      },
      {
        name: 'progress',
        label: () => translate('Progress'),
@@ -1,8 +1,9 @@
 import { createSelector } from 'reselect';
+import AppState from 'App/State/AppState';

 function createDimensionsSelector() {
  return createSelector(
-    (state) => state.app.dimensions,
+    (state: AppState) => state.app.dimensions,
    (dimensions) => {
      return dimensions;
    }
@@ -4,6 +4,8 @@ import { render } from 'react-dom';
 import createAppStore from 'Store/createAppStore';
 import App from './App/App';

+import 'Diag/ConsoleApi';
+
 export async function bootstrap() {
  const history = createBrowserHistory();
  const store = createAppStore(history);
@@ -15,6 +15,7 @@ interface ImportList extends ModelBase {
  enabled: boolean;
  enableAuto: boolean;
  qualityProfileId: number;
+  minimumAvailability: string;
  rootFolderPath: string;
  name: string;
  fields: Field[];
@@ -28,6 +28,7 @@ interface Queue extends ModelBase {
  sizeleft: number;
  timeleft: string;
  estimatedCompletionTime: string;
+  added?: string;
  status: string;
  trackedDownloadStatus: QueueTrackedDownloadStatus;
  trackedDownloadState: QueueTrackedDownloadState;
@@ -28,7 +28,7 @@
    "@fortawesome/free-solid-svg-icons": "6.4.0",
    "@fortawesome/react-fontawesome": "0.2.0",
    "@juggle/resize-observer": "3.4.0",
-    "@microsoft/signalr": "6.0.21",
+    "@microsoft/signalr": "6.0.25",
    "@sentry/browser": "7.51.2",
    "@sentry/integrations": "7.51.2",
    "@types/node": "18.16.8",
@@ -1,6 +1,9 @@
+using System.Collections.Generic;
 using FluentAssertions;
+using Moq;
 using NUnit.Framework;
 using NzbDrone.Core.Annotations;
+using NzbDrone.Core.Localization;
 using NzbDrone.Test.Common;
 using Radarr.Http.ClientSchema;

@@ -9,6 +12,16 @@ namespace NzbDrone.Api.Test.ClientSchemaTests
    [TestFixture]
    public class SchemaBuilderFixture : TestBase
    {
+        [SetUp]
+        public void Setup()
+        {
+            Mocker.GetMock<ILocalizationService>()
+                .Setup(s => s.GetLocalizedString(It.IsAny<string>(), It.IsAny<Dictionary<string, object>>()))
+                .Returns<string, Dictionary<string, object>>((s, d) => s);
+
+            SchemaBuilder.Initialize(Mocker.Container);
+        }
+
        [Test]
        public void should_return_field_for_every_property()
        {
@@ -47,7 +47,7 @@ namespace NzbDrone.Common.Test.Http
            // Use mirrors for tests that use two hosts
            var candidates = new[] { "httpbin1.servarr.com" };

-            // httpbin.org is broken right now, occassionally redirecting to https if it's unavailable.
+            // httpbin.org is broken right now, occasionally redirecting to https if it's unavailable.
            _httpBinHost = mainHost;
            _httpBinHosts = candidates.Where(IsTestSiteAvailable).ToArray();

@@ -129,6 +129,16 @@ namespace NzbDrone.Common.Test.Http
            response.Content.Should().NotBeNullOrWhiteSpace();
        }

+        [Test]
+        public void should_throw_timeout_request()
+        {
+            var request = new HttpRequest($"https://{_httpBinHost}/delay/10");
+
+            request.RequestTimeout = new TimeSpan(0, 0, 5);
+
+            Assert.ThrowsAsync<WebException>(async () => await Subject.ExecuteAsync(request));
+        }
+
        [Test]
        public async Task should_execute_https_get()
        {
@@ -67,7 +67,7 @@ namespace NzbDrone.Common.EnvironmentInfo
            }
            catch (Exception ex)
            {
-                _logger.Warn(ex, "Coudn't set app folder permission");
+                _logger.Warn(ex, "Couldn't set app folder permission");
            }
        }

@@ -102,31 +102,38 @@ namespace NzbDrone.Common.Http.Dispatchers

            var httpClient = GetClient(request.Url);

-            using var responseMessage = await httpClient.SendAsync(requestMessage, HttpCompletionOption.ResponseHeadersRead, cts.Token);
+            try
            {
-                byte[] data = null;
-
-                try
+                using var responseMessage = await httpClient.SendAsync(requestMessage, HttpCompletionOption.ResponseHeadersRead, cts.Token);
                {
-                    if (request.ResponseStream != null && responseMessage.StatusCode == HttpStatusCode.OK)
+                    byte[] data = null;
+
+                    try
                    {
-                        await responseMessage.Content.CopyToAsync(request.ResponseStream, null, cts.Token);
+                        if (request.ResponseStream != null && responseMessage.StatusCode == HttpStatusCode.OK)
+                        {
+                            await responseMessage.Content.CopyToAsync(request.ResponseStream, null, cts.Token);
+                        }
+                        else
+                        {
+                            data = await responseMessage.Content.ReadAsByteArrayAsync(cts.Token);
+                        }
                    }
-                    else
+                    catch (Exception ex)
                    {
-                        data = await responseMessage.Content.ReadAsByteArrayAsync(cts.Token);
+                        throw new WebException("Failed to read complete http response", ex, WebExceptionStatus.ReceiveFailure, null);
                    }
+
+                    var headers = responseMessage.Headers.ToNameValueCollection();
+
+                    headers.Add(responseMessage.Content.Headers.ToNameValueCollection());
+
+                    return new HttpResponse(request, new HttpHeader(headers), data, responseMessage.StatusCode, responseMessage.Version);
                }
-                catch (Exception ex)
-                {
-                    throw new WebException("Failed to read complete http response", ex, WebExceptionStatus.ReceiveFailure, null);
-                }
-
-                var headers = responseMessage.Headers.ToNameValueCollection();
-
-                headers.Add(responseMessage.Content.Headers.ToNameValueCollection());
-
-                return new HttpResponse(request, new HttpHeader(headers), data, responseMessage.StatusCode, responseMessage.Version);
+            }
+            catch (OperationCanceledException ex) when (cts.IsCancellationRequested)
+            {
+                throw new WebException("Http request timed out", ex.InnerException, WebExceptionStatus.Timeout, null);
            }
        }

@@ -92,6 +92,10 @@ namespace NzbDrone.Common.Http
            {
                data = new XElement("base64", Convert.ToBase64String(bytes));
            }
+            else if (value is Dictionary<string, string> d)
+            {
+                data = new XElement("struct", d.Select(p => new XElement("member", new XElement("name", p.Key), new XElement("value", p.Value))));
+            }
            else
            {
                throw new InvalidOperationException($"Unhandled argument type {value.GetType().Name}");
@@ -123,7 +123,7 @@ namespace NzbDrone.Common.Instrumentation.Sentry
            _debounce = new SentryDebounce();

            // initialize to true and reconfigure later
-            // Otherwise it will default to false and any errors occuring
+            // Otherwise it will default to false and any errors occurring
            // before config file gets read will not be filtered
            FilterEvents = true;
            SentryEnabled = true;
@@ -260,7 +260,7 @@ namespace NzbDrone.Common.OAuth
        }

        /// <summary>
-        /// Creates a request elements concatentation value to send with a request.
+        /// Creates a request elements concatenation value to send with a request.
        /// This is also known as the signature base.
        /// </summary>
        /// <seealso href="http://oauth.net/core/1.0#rfc.section.9.1.3"/>
@@ -4,17 +4,17 @@
    <DefineConstants Condition="'$(RuntimeIdentifier)' == 'linux-musl-x64' or '$(RuntimeIdentifier)' == 'linux-musl-arm64'">ISMUSL</DefineConstants>
  </PropertyGroup>
  <ItemGroup>
-    <PackageReference Include="DryIoc.dll" Version="5.4.1" />
+    <PackageReference Include="DryIoc.dll" Version="5.4.3" />
    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.1" />
    <PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="6.0.2" />
    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
    <PackageReference Include="NLog" Version="5.2.3" />
    <PackageReference Include="NLog.Extensions.Logging" Version="5.3.3" />
-    <PackageReference Include="Npgsql" Version="7.0.4" />
+    <PackageReference Include="Npgsql" Version="7.0.6" />
    <PackageReference Include="Sentry" Version="3.23.1" />
    <PackageReference Include="NLog.Targets.Syslog" Version="7.0.0" />
    <PackageReference Include="SharpZipLib" Version="1.3.3" />
-    <PackageReference Include="System.Text.Json" Version="6.0.8" />
+    <PackageReference Include="System.Text.Json" Version="6.0.9" />
    <PackageReference Include="System.ValueTuple" Version="4.5.0" />
    <PackageReference Include="System.Data.SQLite.Core.Servarr" Version="1.0.115.5-18" />
    <PackageReference Include="System.Configuration.ConfigurationManager" Version="6.0.1" />
@@ -215,7 +215,7 @@ namespace NzbDrone.Common

            if (dacls.Contains(authenticatedUsersDacl))
            {
-                // Permssions already set
+                // Permissions already set
                return;
            }

@@ -543,6 +543,52 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.SabnzbdTests
            result.HasWarnings.Should().BeTrue();
        }

+        [Test]
+        public void should_test_success_if_sorters_are_empty()
+        {
+            _config.Misc.enable_tv_sorting = false;
+            _config.Misc.tv_categories = null;
+            _config.Sorters = new List<SabnzbdSorter>();
+
+            var result = new NzbDroneValidationResult(Subject.Test());
+
+            result.IsValid.Should().BeTrue();
+        }
+
+        [Test]
+        public void should_test_failed_if_sorter_is_enabled_for_non_tv_category()
+        {
+            _config.Misc.enable_tv_sorting = false;
+            _config.Misc.tv_categories = null;
+            _config.Sorters = Builder<SabnzbdSorter>.CreateListOfSize(1)
+                .All()
+                .With(s => s.is_active = true)
+                .With(s => s.sort_cats = new List<string> { "movie-custom" })
+                .Build()
+                .ToList();
+
+            var result = new NzbDroneValidationResult(Subject.Test());
+
+            result.IsValid.Should().BeTrue();
+        }
+
+        [Test]
+        public void should_test_failed_if_sorter_is_enabled_for_tv_category()
+        {
+            _config.Misc.enable_tv_sorting = false;
+            _config.Misc.tv_categories = null;
+            _config.Sorters = Builder<SabnzbdSorter>.CreateListOfSize(1)
+                .All()
+                .With(s => s.is_active = true)
+                .With(s => s.sort_cats = new List<string> { "movie" })
+                .Build()
+                .ToList();
+
+            var result = new NzbDroneValidationResult(Subject.Test());
+
+            result.IsValid.Should().BeFalse();
+        }
+
        [Test]
        public void should_test_success_if_tv_sorting_disabled()
        {
@@ -4,6 +4,7 @@ using NUnit.Framework;
 using NzbDrone.Core.Housekeeping.Housekeepers;
 using NzbDrone.Core.ImportLists;
 using NzbDrone.Core.ImportLists.ImportListMovies;
+using NzbDrone.Core.Movies;
 using NzbDrone.Core.Test.Framework;

 namespace NzbDrone.Core.Test.Housekeeping.Housekeepers
@@ -42,8 +43,13 @@ namespace NzbDrone.Core.Test.Housekeeping.Housekeepers
        {
            GivenImportList();

+            var movieMetadata = Builder<MovieMetadata>.CreateNew().BuildNew();
+
+            Db.Insert(movieMetadata);
+
            var status = Builder<ImportListMovie>.CreateNew()
                                                 .With(h => h.ListId = _importList.Id)
+                                                 .With(b => b.MovieMetadataId = movieMetadata.Id)
                                                 .BuildNew();
            Db.Insert(status);

@@ -33,7 +33,7 @@ namespace NzbDrone.Core.Test.IndexerTests.FileListTests

            Mocker.GetMock<IHttpClient>()
                .Setup(o => o.ExecuteAsync(It.Is<HttpRequest>(v => v.Method == HttpMethod.Get)))
-                .Returns<HttpRequest>(r => Task.FromResult(new HttpResponse(r, new HttpHeader(), recentFeed)));
+                .Returns<HttpRequest>(r => Task.FromResult(new HttpResponse(r, new HttpHeader { { "Content-Type", "application/json" } }, recentFeed)));

            var releases = await Subject.FetchRecent();

@@ -0,0 +1,49 @@
+using System.Collections.Generic;
+using System.Linq;
+using FluentAssertions;
+using Moq;
+using NLog;
+using NUnit.Framework;
+using NzbDrone.Common.Http;
+using NzbDrone.Core.Configuration;
+using NzbDrone.Core.Indexers;
+using NzbDrone.Core.Languages;
+using NzbDrone.Core.Parser;
+using NzbDrone.Core.Parser.Model;
+using NzbDrone.Core.Test.Framework;
+
+namespace NzbDrone.Core.Test.IndexerTests;
+
+[TestFixture]
+public class IndexerBaseFixture : CoreTest<IndexerBase<TestIndexerSettings>>
+{
+    private TestIndexer _indexer;
+
+    [SetUp]
+    public void Setup()
+    {
+        _indexer = new TestIndexer(new Mock<IHttpClient>().Object,
+            new Mock<IIndexerStatusService>().Object,
+            new Mock<IConfigService>().Object,
+            new Mock<IParsingService>().Object,
+            new Mock<Logger>().Object)
+        {
+            Definition = new IndexerDefinition
+            {
+                Settings = new TestIndexerSettings
+                {
+                    MultiLanguages = new List<int> { Language.German.Id, Language.English.Id }
+                }
+            }
+        };
+    }
+
+    [TestCase("The.Movie.Name.2016.Multi.DTS.720p.BluRay.x264-RlsGrp")]
+    public void should_parse_multi_language(string postTitle)
+    {
+        var result = _indexer.CleanupReleases(new ReleaseInfo[] { new () { Title = postTitle, Languages = new List<Language>() } });
+        result.Single().Languages.Count.Should().Be(2);
+        result.Single().Languages.Should().Contain(Language.German);
+        result.Single().Languages.Should().Contain(Language.English);
+    }
+}
@@ -1,8 +1,10 @@
-using NLog;
+using System.Collections.Generic;
+using NLog;
 using NzbDrone.Common.Http;
 using NzbDrone.Core.Configuration;
 using NzbDrone.Core.Indexers;
 using NzbDrone.Core.Parser;
+using NzbDrone.Core.Parser.Model;

 namespace NzbDrone.Core.Test.IndexerTests
 {
@@ -31,5 +33,10 @@ namespace NzbDrone.Core.Test.IndexerTests
        {
            return _parser;
        }
+
+        public new IList<ReleaseInfo> CleanupReleases(IEnumerable<ReleaseInfo> releases)
+        {
+            return base.CleanupReleases(releases);
+        }
    }
 }
@@ -156,7 +156,7 @@ namespace NzbDrone.Core.Test.MediaFiles.DiskScanServiceTests
            Subject.Scan(_movie);

            Mocker.GetMock<IDiskProvider>()
-                  .Verify(v => v.GetFiles(It.IsAny<string>(), It.IsAny<bool>()), Times.Once());
+                  .Verify(v => v.GetFiles(It.IsAny<string>(), It.IsAny<bool>()), Times.Exactly(2));

            Mocker.GetMock<IMakeImportDecision>()
                  .Verify(v => v.GetImportDecisions(It.Is<List<string>>(l => l.Count == 1), _movie, false), Times.Once());
@@ -15,6 +15,7 @@ namespace NzbDrone.Core.Test.MediaFiles.MediaInfo.MediaInfoFormatterTests
        [TestCase(HdrFormat.Hdr10Plus, "HDR10Plus")]
        [TestCase(HdrFormat.DolbyVision, "DV")]
        [TestCase(HdrFormat.DolbyVisionHdr10, "DV HDR10")]
+        [TestCase(HdrFormat.DolbyVisionHdr10Plus, "DV HDR10Plus")]
        [TestCase(HdrFormat.DolbyVisionHlg, "DV HLG")]
        [TestCase(HdrFormat.DolbyVisionSdr, "DV SDR")]
        public void should_format_video_dynamic_range_type(HdrFormat format, string expectedVideoDynamicRangeType)
@@ -1,4 +1,5 @@
-using System.IO;
+using System.Collections.Generic;
+using System.IO;
 using FizzWare.NBuilder;
 using FluentAssertions;
 using Moq;
@@ -71,7 +72,7 @@ namespace NzbDrone.Core.Test.MediaFiles.MediaInfo
            GivenFileExists();
            GivenSuccessfulScan();

-            Subject.Handle(new MovieScannedEvent(_movie));
+            Subject.Handle(new MovieScannedEvent(_movie, new List<string>()));

            Mocker.GetMock<IVideoFileInfoReader>()
                  .Verify(v => v.GetMediaInfo(Path.Combine(_movie.Path, "media.mkv")), Times.Exactly(2));
@@ -97,7 +98,7 @@ namespace NzbDrone.Core.Test.MediaFiles.MediaInfo
            GivenFileExists();
            GivenSuccessfulScan();

-            Subject.Handle(new MovieScannedEvent(_movie));
+            Subject.Handle(new MovieScannedEvent(_movie, new List<string>()));

            Mocker.GetMock<IVideoFileInfoReader>()
                  .Verify(v => v.GetMediaInfo(Path.Combine(_movie.Path, "media.mkv")), Times.Exactly(2));
@@ -123,7 +124,7 @@ namespace NzbDrone.Core.Test.MediaFiles.MediaInfo
            GivenFileExists();
            GivenSuccessfulScan();

-            Subject.Handle(new MovieScannedEvent(_movie));
+            Subject.Handle(new MovieScannedEvent(_movie, new List<string>()));

            Mocker.GetMock<IVideoFileInfoReader>()
                  .Verify(v => v.GetMediaInfo(Path.Combine(_movie.Path, "media.mkv")), Times.Exactly(3));
@@ -146,7 +147,7 @@ namespace NzbDrone.Core.Test.MediaFiles.MediaInfo

            GivenSuccessfulScan();

-            Subject.Handle(new MovieScannedEvent(_movie));
+            Subject.Handle(new MovieScannedEvent(_movie, new List<string>()));

            Mocker.GetMock<IVideoFileInfoReader>()
                  .Verify(v => v.GetMediaInfo("media.mkv"), Times.Never());
@@ -173,7 +174,7 @@ namespace NzbDrone.Core.Test.MediaFiles.MediaInfo
            GivenSuccessfulScan();
            GivenFailedScan(Path.Combine(_movie.Path, "media2.mkv"));

-            Subject.Handle(new MovieScannedEvent(_movie));
+            Subject.Handle(new MovieScannedEvent(_movie, new List<string>()));

            Mocker.GetMock<IVideoFileInfoReader>()
                  .Verify(v => v.GetMediaInfo(Path.Combine(_movie.Path, "media.mkv")), Times.Exactly(1));
@@ -203,7 +204,7 @@ namespace NzbDrone.Core.Test.MediaFiles.MediaInfo
            GivenFileExists();
            GivenSuccessfulScan();

-            Subject.Handle(new MovieScannedEvent(_movie));
+            Subject.Handle(new MovieScannedEvent(_movie, new List<string>()));

            Mocker.GetMock<IVideoFileInfoReader>()
                .Verify(v => v.GetMediaInfo(It.IsAny<string>()), Times.Never());
@@ -116,6 +116,8 @@ namespace NzbDrone.Core.Test.MediaFiles.MediaInfo
        [TestCase(10, "bt2020", "smpte2084", "FFMpegCore.HdrDynamicMetadataSpmte2094", null, HdrFormat.Hdr10Plus)]
        [TestCase(10, "bt2020", "smpte2084", "FFMpegCore.DoviConfigurationRecordSideData", null, HdrFormat.DolbyVision)]
        [TestCase(10, "bt2020", "smpte2084", "FFMpegCore.DoviConfigurationRecordSideData", 1, HdrFormat.DolbyVisionHdr10)]
+        [TestCase(10, "bt2020", "smpte2084", "FFMpegCore.DoviConfigurationRecordSideData,FFMpegCore.HdrDynamicMetadataSpmte2094", 1, HdrFormat.DolbyVisionHdr10Plus)]
+        [TestCase(10, "bt2020", "smpte2084", "FFMpegCore.DoviConfigurationRecordSideData,FFMpegCore.HdrDynamicMetadataSpmte2094", 6, HdrFormat.DolbyVisionHdr10Plus)]
        [TestCase(10, "bt2020", "smpte2084", "FFMpegCore.DoviConfigurationRecordSideData", 2, HdrFormat.DolbyVisionSdr)]
        [TestCase(10, "bt2020", "smpte2084", "FFMpegCore.DoviConfigurationRecordSideData", 4, HdrFormat.DolbyVisionHlg)]
        public void should_detect_hdr_correctly(int bitDepth, string colourPrimaries, string transferFunction, string sideDataTypes, int? doviConfigId, HdrFormat expected)
@@ -48,13 +48,14 @@ namespace NzbDrone.Core.Test.NotificationTests
            Subject.Definition = _traktDefinition;
        }

-        private void GiventValidMediaInfo(Quality quality, string audioChannels, string audioFormat, string scanType)
+        private void GiventValidMediaInfo(Quality quality, string audioChannels, string audioFormat, string scanType, HdrFormat hdrFormat = HdrFormat.None)
        {
            _downloadMessage.MovieFile.MediaInfo = new MediaInfoModel
            {
                AudioChannelPositions = audioChannels,
                AudioFormat = audioFormat,
-                ScanType = scanType
+                ScanType = scanType,
+                VideoHdrFormat = hdrFormat
            };

            _downloadMessage.MovieFile.Quality.Quality = quality;
@@ -72,7 +73,7 @@ namespace NzbDrone.Core.Test.NotificationTests
        [Test]
        public void should_add_collection_movie_if_valid_mediainfo()
        {
-            GiventValidMediaInfo(Quality.Bluray1080p, "5.1", "DTS", "Progressive");
+            GiventValidMediaInfo(Quality.Bluray2160p, "5.1", "DTS", "Progressive", HdrFormat.DolbyVisionHdr10);

            Subject.OnDownload(_downloadMessage);

@@ -80,15 +81,16 @@ namespace NzbDrone.Core.Test.NotificationTests
                  .Verify(v => v.AddToCollection(It.Is<TraktCollectMoviesResource>(t =>
                    t.Movies.First().Audio == "dts" &&
                    t.Movies.First().AudioChannels == "5.1" &&
-                    t.Movies.First().Resolution == "hd_1080p" &&
-                    t.Movies.First().MediaType == "bluray"),
+                    t.Movies.First().Resolution == "uhd_4k" &&
+                    t.Movies.First().MediaType == "bluray" &&
+                    t.Movies.First().Hdr == "hdr10"),
                  It.IsAny<string>()), Times.Once());
        }

        [Test]
        public void should_format_audio_channels_to_one_decimal_when_adding_collection_movie()
        {
-            GiventValidMediaInfo(Quality.Bluray1080p, "2.0", "DTS", "Progressive");
+            GiventValidMediaInfo(Quality.Bluray2160p, "2.0", "DTS", "Progressive", HdrFormat.DolbyVisionHdr10);

            Subject.OnDownload(_downloadMessage);

@@ -96,8 +98,9 @@ namespace NzbDrone.Core.Test.NotificationTests
                  .Verify(v => v.AddToCollection(It.Is<TraktCollectMoviesResource>(t =>
                    t.Movies.First().Audio == "dts" &&
                    t.Movies.First().AudioChannels == "2.0" &&
-                    t.Movies.First().Resolution == "hd_1080p" &&
-                    t.Movies.First().MediaType == "bluray"),
+                    t.Movies.First().Resolution == "uhd_4k" &&
+                    t.Movies.First().MediaType == "bluray" &&
+                    t.Movies.First().Hdr == "hdr10"),
                  It.IsAny<string>()), Times.Once());
        }
    }
@@ -140,6 +140,8 @@ namespace NzbDrone.Core.Test.ParserTests
        }

        [TestCase("Movie.Title.1994.Russian.1080p.XviD-LOL")]
+        [TestCase("Movie.Title.2020.WEB-DLRip.AVC.AC3.EN.RU.ENSub.RUSub-LOL")]
+        [TestCase("Movie Title (2020) WEB-DL (720p) Rus-Eng")]
        public void should_parse_language_russian(string postTitle)
        {
            var result = Parser.Parser.ParseMovieTitle(postTitle, true);
@@ -300,6 +302,7 @@ namespace NzbDrone.Core.Test.ParserTests
        }

        [TestCase("Movie.Title.1994.Hebrew.1080p.XviD-LOL")]
+        [TestCase("Movie.Title.1994.1080p.BluRay.HebDubbed.Also.English.x264-P2P")]
        public void should_parse_language_hebrew(string postTitle)
        {
            var result = Parser.Parser.ParseMovieTitle(postTitle, true);
@@ -387,6 +390,8 @@ namespace NzbDrone.Core.Test.ParserTests
        [TestCase("Movie.Title.2022.lv.WEBRip.XviD-LOL")]
        [TestCase("Movie.Title.2022.LATVIAN.WEBRip.XviD-LOL")]
        [TestCase("Movie.Title.2022.Latvian.WEBRip.XviD-LOL")]
+        [TestCase("Movie.Title.2022.1080p.WEB-DL.DDP5.1.Atmos.H.264.Lat.Eng")]
+        [TestCase("Movie.Title.2022.1080p.WEB-DL.LAV.RUS-NPPK")]
        public void should_parse_language_latvian(string postTitle)
        {
            var result = Parser.Parser.ParseMovieTitle(postTitle);
@@ -429,5 +434,35 @@ namespace NzbDrone.Core.Test.ParserTests
            var result = LanguageParser.ParseSubtitleLanguage(fileName);
            result.Should().Be(Language.Unknown);
        }
+
+        [TestCase("The.Movie.Name.2016.German.DTS.DL.720p.BluRay.x264-RlsGrp")]
+        public void should_add_original_language_to_german_release_with_dl_tag(string postTitle)
+        {
+            var result = Parser.Parser.ParseMovieTitle(postTitle);
+            result.Languages.Count.Should().Be(2);
+            result.Languages.Should().Contain(Language.German);
+            result.Languages.Should().Contain(Language.Original);
+        }
+
+        [TestCase("The.Movie.Name.2016.GERMAN.WEB-DL.h264-RlsGrp")]
+        [TestCase("The.Movie.Name.2016.GERMAN.WEB.DL.h264-RlsGrp")]
+        [TestCase("The Movie Name 2016 GERMAN WEB DL h264-RlsGrp")]
+        [TestCase("The.Movie.Name.2016.GERMAN.WEBDL.h264-RlsGrp")]
+        public void should_not_add_original_language_to_german_release_when_title_contains_web_dl(string postTitle)
+        {
+            var result = Parser.Parser.ParseMovieTitle(postTitle);
+            result.Languages.Count.Should().Be(1);
+            result.Languages.Should().Contain(Language.German);
+        }
+
+        [TestCase("The.Movie.Name.2023.German.ML.EAC3.720p.NF.WEB.H264-RlsGrp")]
+        public void should_add_original_language_and_english_to_german_release_with_ml_tag(string postTitle)
+        {
+            var result = Parser.Parser.ParseMovieTitle(postTitle);
+            result.Languages.Count.Should().Be(3);
+            result.Languages.Should().Contain(Language.German);
+            result.Languages.Should().Contain(Language.Original);
+            result.Languages.Should().Contain(Language.English);
+        }
    }
 }
@@ -62,6 +62,7 @@ namespace NzbDrone.Core.Test.ParserTests
        [TestCase("G.I.Movie.Movie.2013.THEATRiCAL.COMPLETE.BLURAY-GLiMMER", "G.I. Movie Movie")]
        [TestCase("www.Torrenting.org - Movie.2008.720p.X264-DIMENSION", "Movie")]
        [TestCase("The.French.Movie.2013.720p.BluRay.x264 - ROUGH[PublicHD]", "The French Movie")]
+        [TestCase("The.Good.German.2006.720p.BluRay.x264-RlsGrp", "The Good German", Description = "Hardcoded to exclude from German regex")]
        public void should_parse_movie_title(string postTitle, string title)
        {
            Parser.Parser.ParseMovieTitle(postTitle).PrimaryMovieTitle.Should().Be(title);
@@ -124,6 +125,7 @@ namespace NzbDrone.Core.Test.ParserTests
        [TestCase("Die.fantastische.Reise.des.Dr.Dolittle.2020.German.DL.LD.1080p.WEBRip.x264-PRD", "Die fantastische Reise des Dr. Dolittle", "", 2020, Description = "dot after dr")]
        [TestCase("Der.Film.deines.Lebens.German.2011.PAL.DVDR-ETM", "Der Film deines Lebens", "", 2011, Description = "year at wrong position")]
        [TestCase("Kick.Ass.2.2013.German.DTS.DL.720p.BluRay.x264-Pate_", "Kick Ass 2", "", 2013, Description = "underscore at the end")]
+        [TestCase("The.Good.German.2006.GERMAN.720p.HDTV.x264-RLsGrp", "The Good German", "", 2006, Description = "German in the title")]
        public void should_parse_german_movie(string postTitle, string title, string edition, int year)
        {
            var movie = Parser.Parser.ParseMovieTitle(postTitle);
@@ -238,6 +240,10 @@ namespace NzbDrone.Core.Test.ParserTests

        [TestCase("The.Italian.Movie.2025.720p.BluRay.X264-AMIABLE")]
        [TestCase("The.French.Movie.2013.720p.BluRay.x264 - ROUGH[PublicHD]")]
+        [TestCase("The.German.Doctor.2013.LIMITED.DVDRip.x264-RedBlade", Description = "When German is not followed by a year or a SCENE word it is not matched")]
+        [TestCase("The.Good.German.2006.720p.HDTV.x264-TVP", Description = "The Good German is hardcoded not to match")]
+        [TestCase("German.Lancers.2019.720p.BluRay.x264-UNiVERSUM", Description = "German at the beginning is never matched")]
+        [TestCase("The.German.2019.720p.BluRay.x264-UNiVERSUM", Description = "The German is hardcoded not to match")]
        public void should_not_parse_wrong_language_in_title(string postTitle)
        {
            var parsed = Parser.Parser.ParseMovieTitle(postTitle, true);
@@ -245,22 +251,6 @@ namespace NzbDrone.Core.Test.ParserTests
            parsed.Languages.First().Should().Be(Language.Unknown);
        }

-        [TestCase("The.Movie.Name.2016.German.DTS.DL.720p.BluRay.x264-MULTiPLEX")]
-        public void should_not_parse_multi_language_in_releasegroup(string postTitle)
-        {
-            var parsed = Parser.Parser.ParseMovieTitle(postTitle, true);
-            parsed.Languages.Count.Should().Be(1);
-            parsed.Languages.First().Should().Be(Language.German);
-        }
-
-        [TestCase("The.Movie.Name.2016.German.Multi.DTS.DL.720p.BluRay.x264-MULTiPLEX")]
-        public void should_parse_multi_language(string postTitle)
-        {
-            var parsed = Parser.Parser.ParseMovieTitle(postTitle, true);
-            parsed.Languages.Count.Should().Be(1);
-            parsed.Languages.Should().Contain(Language.German);
-        }
-
        [TestCase("Movie.Title.2016.1080p.KORSUB.WEBRip.x264.AAC2.0-RADARR", "KORSUB")]
        [TestCase("Movie.Title.2016.1080p.KORSUBS.WEBRip.x264.AAC2.0-RADARR", "KORSUBS")]
        [TestCase("Movie Title 2017 HC 720p HDRiP DD5 1 x264-LEGi0N", "Generic Hardcoded Subs")]
@@ -41,6 +41,23 @@ namespace NzbDrone.Core.Annotations
        public string Hint { get; set; }
    }

+    [AttributeUsage(AttributeTargets.Property, AllowMultiple = true)]
+    public class FieldTokenAttribute : Attribute
+    {
+        public FieldTokenAttribute(TokenField field, string label = "", string token = "", object value = null)
+        {
+            Label = label;
+            Field = field;
+            Token = token;
+            Value = value?.ToString();
+        }
+
+        public string Label { get; set; }
+        public TokenField Field { get; set; }
+        public string Token { get; set; }
+        public string Value { get; set; }
+    }
+
    public class FieldSelectOption
    {
        public int Value { get; set; }
@@ -84,4 +101,11 @@ namespace NzbDrone.Core.Annotations
        ApiKey,
        UserName
    }
+
+    public enum TokenField
+    {
+        Label,
+        HelpText,
+        HelpTextWarning
+    }
 }
@@ -15,6 +15,7 @@ namespace NzbDrone.Core.Blocklisting
    public interface IBlocklistService
    {
        bool Blocklisted(int movieId, ReleaseInfo release);
+        bool BlocklistedTorrentHash(int movieId, string hash);
        PagingSpec<Blocklist> Paged(PagingSpec<Blocklist> pagingSpec);
        List<Blocklist> GetByMovieId(int movieId);
        void Block(RemoteMovie remoteMovie, string message);
@@ -37,30 +38,34 @@ namespace NzbDrone.Core.Blocklisting

        public bool Blocklisted(int movieId, ReleaseInfo release)
        {
-            var blocklistedByTitle = _blocklistRepository.BlocklistedByTitle(movieId, release.Title);
-
            if (release.DownloadProtocol == DownloadProtocol.Torrent)
            {
-                var torrentInfo = release as TorrentInfo;
-
-                if (torrentInfo == null)
+                if (release is not TorrentInfo torrentInfo)
                {
                    return false;
                }

-                if (torrentInfo.InfoHash.IsNullOrWhiteSpace())
+                if (torrentInfo.InfoHash.IsNotNullOrWhiteSpace())
                {
-                    return blocklistedByTitle.Where(b => b.Protocol == DownloadProtocol.Torrent)
-                                             .Any(b => SameTorrent(b, torrentInfo));
+                    var blocklistedByTorrentInfohash = _blocklistRepository.BlocklistedByTorrentInfoHash(movieId, torrentInfo.InfoHash);
+
+                    return blocklistedByTorrentInfohash.Any(b => SameTorrent(b, torrentInfo));
                }

-                var blocklistedByTorrentInfohash = _blocklistRepository.BlocklistedByTorrentInfoHash(movieId, torrentInfo.InfoHash);
-
-                return blocklistedByTorrentInfohash.Any(b => SameTorrent(b, torrentInfo));
+                return _blocklistRepository.BlocklistedByTitle(movieId, release.Title)
+                    .Where(b => b.Protocol == DownloadProtocol.Torrent)
+                    .Any(b => SameTorrent(b, torrentInfo));
            }

-            return blocklistedByTitle.Where(b => b.Protocol == DownloadProtocol.Usenet)
-                                     .Any(b => SameNzb(b, release));
+            return _blocklistRepository.BlocklistedByTitle(movieId, release.Title)
+                .Where(b => b.Protocol == DownloadProtocol.Usenet)
+                .Any(b => SameNzb(b, release));
+        }
+
+        public bool BlocklistedTorrentHash(int movieId, string hash)
+        {
+            return _blocklistRepository.BlocklistedByTorrentInfoHash(movieId, hash).Any(b =>
+                b.TorrentInfoHash.Equals(hash, StringComparison.InvariantCultureIgnoreCase));
        }

        public PagingSpec<Blocklist> Paged(PagingSpec<Blocklist> pagingSpec)
@@ -330,8 +330,8 @@ namespace NzbDrone.Core.Configuration
                return;
            }

-            // If SSL is enabled and a cert hash is still in the config file disable SSL
-            if (EnableSsl && GetValue("SslCertHash", null).IsNotNullOrWhiteSpace())
+            // If SSL is enabled and a cert hash is still in the config file or cert path is empty disable SSL
+            if (EnableSsl && (GetValue("SslCertHash", null).IsNotNullOrWhiteSpace() || SslCertPath.IsNullOrWhiteSpace()))
            {
                SetValue("EnableSsl", false);
            }
@@ -0,0 +1,41 @@
+using FluentValidation;
+using NzbDrone.Core.Annotations;
+using NzbDrone.Core.Validation;
+
+namespace NzbDrone.Core.CustomFormats
+{
+    public class YearSpecificationValidator : AbstractValidator<YearSpecification>
+    {
+        public YearSpecificationValidator()
+        {
+            RuleFor(c => c.Min).NotEmpty().GreaterThan(0);
+            RuleFor(c => c.Max).NotEmpty().GreaterThanOrEqualTo(c => c.Min);
+        }
+    }
+
+    public class YearSpecification : CustomFormatSpecificationBase
+    {
+        private static readonly YearSpecificationValidator Validator = new ();
+
+        public override int Order => 10;
+        public override string ImplementationName => "Year";
+
+        [FieldDefinition(1, Label = "Minimum Year", Type = FieldType.Number)]
+        public int Min { get; set; }
+
+        [FieldDefinition(2, Label = "Maximum Year", Type = FieldType.Number)]
+        public int Max { get; set; }
+
+        protected override bool IsSatisfiedByWithoutNegate(CustomFormatInput input)
+        {
+            var year = input.MovieInfo?.Year ?? input.Movie?.MovieMetadata?.Value?.Year;
+
+            return year >= Min && year <= Max;
+        }
+
+        public override NzbDroneValidationResult Validate()
+        {
+            return new NzbDroneValidationResult(Validator.Validate(this));
+        }
+    }
+}
--- a/Show More
+++ b/Show More