New: Ignore 'Other' subfolder when scanning disk

Closes #9718

(cherry picked from commit e1c6722aad1e35a1e2371bc47f399b57e4f96f27)

azure-pipelines.yml

@@ -9,7 +9,7 @@ variables:
   testsFolder: './_tests'
   yarnCacheFolder: $(Pipeline.Workspace)/.yarn
   nugetCacheFolder: $(Pipeline.Workspace)/.nuget/packages
-  majorVersion: '5.3.0'
+  majorVersion: '5.3.5'
   minorVersion: $[counter('minorVersion', 2000)]
   radarrVersion: '$(majorVersion).$(minorVersion)'
   buildName: '$(Build.SourceBranchName).$(radarrVersion)'
@@ -17,7 +17,7 @@ variables:
   sentryUrl: 'https://sentry.servarr.com'
   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

build.sh

@@ -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

frontend/babel.config.js

@@ -2,6 +2,8 @@ const loose = true;
 
 module.exports = {
   plugins: [
+    '@babel/plugin-transform-logical-assignment-operators',
+
     // Stage 1
     '@babel/plugin-proposal-export-default-from',
     ['@babel/plugin-transform-optional-chaining', { loose }],

frontend/src/Activity/History/HistoryEventTypeCell.js

@@ -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);
 

frontend/src/Activity/Queue/Queue.js

@@ -25,7 +25,7 @@ import toggleSelected from 'Utilities/Table/toggleSelected';
 import QueueFilterModal from './QueueFilterModal';
 import QueueOptionsConnector from './QueueOptionsConnector';
 import QueueRowConnector from './QueueRowConnector';
-import RemoveQueueItemsModal from './RemoveQueueItemsModal';
+import RemoveQueueItemModal from './RemoveQueueItemModal';
 
 class Queue extends Component {
 
@@ -307,9 +307,16 @@ class Queue extends Component {
           }
         </PageContentBody>
 
-        <RemoveQueueItemsModal
+        <RemoveQueueItemModal
           isOpen={isConfirmRemoveModalOpen}
           selectedCount={selectedCount}
+          canChangeCategory={isConfirmRemoveModalOpen && (
+            selectedIds.every((id) => {
+              const item = items.find((i) => i.id === id);
+
+              return !!(item && item.downloadClientHasPostImportCategory);
+            })
+          )}
           canIgnore={isConfirmRemoveModalOpen && (
             selectedIds.every((id) => {
               const item = items.find((i) => i.id === id);
@@ -317,7 +324,7 @@ class Queue extends Component {
               return !!(item && item.movieId);
             })
           )}
-          allPending={isConfirmRemoveModalOpen && (
+          pending={isConfirmRemoveModalOpen && (
             selectedIds.every((id) => {
               const item = items.find((i) => i.id === id);
 

frontend/src/Activity/Queue/QueueRow.js

@@ -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';
@@ -96,7 +96,9 @@ class QueueRow extends Component {
       indexer,
       outputPath,
       downloadClient,
+      downloadClientHasPostImportCategory,
       estimatedCompletionTime,
+      added,
       timeleft,
       size,
       sizeleft,
@@ -315,6 +317,15 @@ class QueueRow extends Component {
               );
             }
 
+            if (name === 'added') {
+              return (
+                <RelativeDateCellConnector
+                  key={name}
+                  date={added}
+                />
+              );
+            }
+
             if (name === 'actions') {
               return (
                 <TableRowCell
@@ -363,6 +374,7 @@ class QueueRow extends Component {
         <RemoveQueueItemModal
           isOpen={isRemoveQueueItemModalOpen}
           sourceTitle={title}
+          canChangeCategory={!!downloadClientHasPostImportCategory}
           canIgnore={!!movie}
           isPending={isPending}
           onRemovePress={this.onRemoveQueueItemModalConfirmed}
@@ -392,7 +404,9 @@ QueueRow.propTypes = {
   indexer: PropTypes.string,
   outputPath: PropTypes.string,
   downloadClient: PropTypes.string,
+  downloadClientHasPostImportCategory: PropTypes.bool,
   estimatedCompletionTime: PropTypes.string,
+  added: PropTypes.string,
   timeleft: PropTypes.string,
   size: PropTypes.number,
   year: PropTypes.number,

frontend/src/Activity/Queue/RemoveQueueItemModal.js

@@ -1,171 +0,0 @@
-import PropTypes from 'prop-types';
-import React, { Component } from 'react';
-import FormGroup from 'Components/Form/FormGroup';
-import FormInputGroup from 'Components/Form/FormInputGroup';
-import FormLabel from 'Components/Form/FormLabel';
-import Button from 'Components/Link/Button';
-import Modal from 'Components/Modal/Modal';
-import ModalBody from 'Components/Modal/ModalBody';
-import ModalContent from 'Components/Modal/ModalContent';
-import ModalFooter from 'Components/Modal/ModalFooter';
-import ModalHeader from 'Components/Modal/ModalHeader';
-import { inputTypes, kinds, sizes } from 'Helpers/Props';
-import translate from 'Utilities/String/translate';
-
-class RemoveQueueItemModal extends Component {
-
-  //
-  // Lifecycle
-
-  constructor(props, context) {
-    super(props, context);
-
-    this.state = {
-      remove: true,
-      blocklist: false,
-      skipRedownload: false
-    };
-  }
-
-  //
-  // Control
-
-  resetState = function() {
-    this.setState({
-      remove: true,
-      blocklist: false,
-      skipRedownload: false
-    });
-  };
-
-  //
-  // Listeners
-
-  onRemoveChange = ({ value }) => {
-    this.setState({ remove: value });
-  };
-
-  onBlocklistChange = ({ value }) => {
-    this.setState({ blocklist: value });
-  };
-
-  onSkipRedownloadChange = ({ value }) => {
-    this.setState({ skipRedownload: value });
-  };
-
-  onRemoveConfirmed = () => {
-    const state = this.state;
-
-    this.resetState();
-    this.props.onRemovePress(state);
-  };
-
-  onModalClose = () => {
-    this.resetState();
-    this.props.onModalClose();
-  };
-
-  //
-  // Render
-
-  render() {
-    const {
-      isOpen,
-      sourceTitle,
-      canIgnore,
-      isPending
-    } = this.props;
-
-    const { remove, blocklist, skipRedownload } = this.state;
-
-    return (
-      <Modal
-        isOpen={isOpen}
-        size={sizes.MEDIUM}
-        onModalClose={this.onModalClose}
-      >
-        <ModalContent
-          onModalClose={this.onModalClose}
-        >
-          <ModalHeader>
-            {translate('RemoveQueueItem', { sourceTitle })}
-          </ModalHeader>
-
-          <ModalBody>
-            <div>
-              {translate('RemoveQueueItemConfirmation', { sourceTitle })}
-            </div>
-
-            {
-              isPending ?
-                null :
-                <FormGroup>
-                  <FormLabel>{translate('RemoveFromDownloadClient')}</FormLabel>
-
-                  <FormInputGroup
-                    type={inputTypes.CHECK}
-                    name="remove"
-                    value={remove}
-                    helpTextWarning={translate('RemoveFromDownloadClientHelpTextWarning')}
-                    isDisabled={!canIgnore}
-                    onChange={this.onRemoveChange}
-                  />
-                </FormGroup>
-            }
-
-            <FormGroup>
-              <FormLabel>{translate('BlocklistRelease')}</FormLabel>
-
-              <FormInputGroup
-                type={inputTypes.CHECK}
-                name="blocklist"
-                value={blocklist}
-                helpText={translate('BlocklistReleaseHelpText')}
-                onChange={this.onBlocklistChange}
-              />
-            </FormGroup>
-
-            {
-              blocklist ?
-                <FormGroup>
-                  <FormLabel>{translate('SkipRedownload')}</FormLabel>
-                  <FormInputGroup
-                    type={inputTypes.CHECK}
-                    name="skipRedownload"
-                    value={skipRedownload}
-                    helpText={translate('SkipRedownloadHelpText')}
-                    onChange={this.onSkipRedownloadChange}
-                  />
-                </FormGroup> :
-                null
-            }
-          </ModalBody>
-
-          <ModalFooter>
-            <Button onPress={this.onModalClose}>
-              {translate('Close')}
-            </Button>
-
-            <Button
-              kind={kinds.DANGER}
-              onPress={this.onRemoveConfirmed}
-            >
-              {translate('Remove')}
-            </Button>
-          </ModalFooter>
-        </ModalContent>
-      </Modal>
-    );
-  }
-}
-
-RemoveQueueItemModal.propTypes = {
-  isOpen: PropTypes.bool.isRequired,
-  sourceTitle: PropTypes.string.isRequired,
-  canIgnore: PropTypes.bool.isRequired,
-  isPending: PropTypes.bool.isRequired,
-  onRemovePress: PropTypes.func.isRequired,
-  onModalClose: PropTypes.func.isRequired
-};
-
-export default RemoveQueueItemModal;

frontend/src/Activity/Queue/RemoveQueueItemModal.tsx

@@ -0,0 +1,230 @@
+import React, { useCallback, useMemo, useState } from 'react';
+import FormGroup from 'Components/Form/FormGroup';
+import FormInputGroup from 'Components/Form/FormInputGroup';
+import FormLabel from 'Components/Form/FormLabel';
+import Button from 'Components/Link/Button';
+import Modal from 'Components/Modal/Modal';
+import ModalBody from 'Components/Modal/ModalBody';
+import ModalContent from 'Components/Modal/ModalContent';
+import ModalFooter from 'Components/Modal/ModalFooter';
+import ModalHeader from 'Components/Modal/ModalHeader';
+import { inputTypes, kinds, sizes } from 'Helpers/Props';
+import translate from 'Utilities/String/translate';
+import styles from './RemoveQueueItemModal.css';
+
+interface RemovePressProps {
+  remove: boolean;
+  changeCategory: boolean;
+  blocklist: boolean;
+  skipRedownload: boolean;
+}
+
+interface RemoveQueueItemModalProps {
+  isOpen: boolean;
+  sourceTitle: string;
+  canChangeCategory: boolean;
+  canIgnore: boolean;
+  isPending: boolean;
+  selectedCount?: number;
+  onRemovePress(props: RemovePressProps): void;
+  onModalClose: () => void;
+}
+
+type RemovalMethod = 'removeFromClient' | 'changeCategory' | 'ignore';
+type BlocklistMethod =
+  | 'doNotBlocklist'
+  | 'blocklistAndSearch'
+  | 'blocklistOnly';
+
+function RemoveQueueItemModal(props: RemoveQueueItemModalProps) {
+  const {
+    isOpen,
+    sourceTitle,
+    canIgnore,
+    canChangeCategory,
+    isPending,
+    selectedCount,
+    onRemovePress,
+    onModalClose,
+  } = props;
+
+  const multipleSelected = selectedCount && selectedCount > 1;
+
+  const [removalMethod, setRemovalMethod] =
+    useState<RemovalMethod>('removeFromClient');
+  const [blocklistMethod, setBlocklistMethod] =
+    useState<BlocklistMethod>('doNotBlocklist');
+
+  const { title, message } = useMemo(() => {
+    if (!selectedCount) {
+      return {
+        title: translate('RemoveQueueItem', { sourceTitle }),
+        message: translate('RemoveQueueItemConfirmation', { sourceTitle }),
+      };
+    }
+
+    if (selectedCount === 1) {
+      return {
+        title: translate('RemoveSelectedItem'),
+        message: translate('RemoveSelectedItemQueueMessageText'),
+      };
+    }
+
+    return {
+      title: translate('RemoveSelectedItems'),
+      message: translate('RemoveSelectedItemsQueueMessageText', {
+        selectedCount,
+      }),
+    };
+  }, [sourceTitle, selectedCount]);
+
+  const removalMethodOptions = useMemo(() => {
+    return [
+      {
+        key: 'removeFromClient',
+        value: translate('RemoveFromDownloadClient'),
+        hint: multipleSelected
+          ? translate('RemoveMultipleFromDownloadClientHint')
+          : translate('RemoveFromDownloadClientHint'),
+      },
+      {
+        key: 'changeCategory',
+        value: translate('ChangeCategory'),
+        isDisabled: !canChangeCategory,
+        hint: multipleSelected
+          ? translate('ChangeCategoryMultipleHint')
+          : translate('ChangeCategoryHint'),
+      },
+      {
+        key: 'ignore',
+        value: multipleSelected
+          ? translate('IgnoreDownloads')
+          : translate('IgnoreDownload'),
+        isDisabled: !canIgnore,
+        hint: multipleSelected
+          ? translate('IgnoreDownloadsHint')
+          : translate('IgnoreDownloadHint'),
+      },
+    ];
+  }, [canChangeCategory, canIgnore, multipleSelected]);
+
+  const blocklistMethodOptions = useMemo(() => {
+    return [
+      {
+        key: 'doNotBlocklist',
+        value: translate('DoNotBlocklist'),
+        hint: translate('DoNotBlocklistHint'),
+      },
+      {
+        key: 'blocklistAndSearch',
+        value: translate('BlocklistAndSearch'),
+        hint: multipleSelected
+          ? translate('BlocklistAndSearchMultipleHint')
+          : translate('BlocklistAndSearchHint'),
+      },
+      {
+        key: 'blocklistOnly',
+        value: translate('BlocklistOnly'),
+        hint: multipleSelected
+          ? translate('BlocklistMultipleOnlyHint')
+          : translate('BlocklistOnlyHint'),
+      },
+    ];
+  }, [multipleSelected]);
+
+  const handleRemovalMethodChange = useCallback(
+    ({ value }: { value: RemovalMethod }) => {
+      setRemovalMethod(value);
+    },
+    [setRemovalMethod]
+  );
+
+  const handleBlocklistMethodChange = useCallback(
+    ({ value }: { value: BlocklistMethod }) => {
+      setBlocklistMethod(value);
+    },
+    [setBlocklistMethod]
+  );
+
+  const handleConfirmRemove = useCallback(() => {
+    onRemovePress({
+      remove: removalMethod === 'removeFromClient',
+      changeCategory: removalMethod === 'changeCategory',
+      blocklist: blocklistMethod !== 'doNotBlocklist',
+      skipRedownload: blocklistMethod === 'blocklistOnly',
+    });
+
+    setRemovalMethod('removeFromClient');
+    setBlocklistMethod('doNotBlocklist');
+  }, [
+    removalMethod,
+    blocklistMethod,
+    setRemovalMethod,
+    setBlocklistMethod,
+    onRemovePress,
+  ]);
+
+  const handleModalClose = useCallback(() => {
+    setRemovalMethod('removeFromClient');
+    setBlocklistMethod('doNotBlocklist');
+
+    onModalClose();
+  }, [setRemovalMethod, setBlocklistMethod, onModalClose]);
+
+  return (
+    <Modal isOpen={isOpen} size={sizes.MEDIUM} onModalClose={handleModalClose}>
+      <ModalContent onModalClose={handleModalClose}>
+        <ModalHeader>{title}</ModalHeader>
+
+        <ModalBody>
+          <div className={styles.message}>{message}</div>
+
+          {isPending ? null : (
+            <FormGroup>
+              <FormLabel>{translate('RemoveQueueItemRemovalMethod')}</FormLabel>
+
+              <FormInputGroup
+                type={inputTypes.SELECT}
+                name="removalMethod"
+                value={removalMethod}
+                values={removalMethodOptions}
+                isDisabled={!canChangeCategory && !canIgnore}
+                helpTextWarning={translate(
+                  'RemoveQueueItemRemovalMethodHelpTextWarning'
+                )}
+                onChange={handleRemovalMethodChange}
+              />
+            </FormGroup>
+          )}
+
+          <FormGroup>
+            <FormLabel>
+              {multipleSelected
+                ? translate('BlocklistReleases')
+                : translate('BlocklistRelease')}
+            </FormLabel>
+
+            <FormInputGroup
+              type={inputTypes.SELECT}
+              name="blocklistMethod"
+              value={blocklistMethod}
+              values={blocklistMethodOptions}
+              helpText={translate('BlocklistReleaseHelpText')}
+              onChange={handleBlocklistMethodChange}
+            />
+          </FormGroup>
+        </ModalBody>
+
+        <ModalFooter>
+          <Button onPress={handleModalClose}>{translate('Close')}</Button>
+
+          <Button kind={kinds.DANGER} onPress={handleConfirmRemove}>
+            {translate('Remove')}
+          </Button>
+        </ModalFooter>
+      </ModalContent>
+    </Modal>
+  );
+}
+
+export default RemoveQueueItemModal;

frontend/src/Activity/Queue/RemoveQueueItemsModal.js

@@ -1,174 +0,0 @@
-import PropTypes from 'prop-types';
-import React, { Component } from 'react';
-import FormGroup from 'Components/Form/FormGroup';
-import FormInputGroup from 'Components/Form/FormInputGroup';
-import FormLabel from 'Components/Form/FormLabel';
-import Button from 'Components/Link/Button';
-import Modal from 'Components/Modal/Modal';
-import ModalBody from 'Components/Modal/ModalBody';
-import ModalContent from 'Components/Modal/ModalContent';
-import ModalFooter from 'Components/Modal/ModalFooter';
-import ModalHeader from 'Components/Modal/ModalHeader';
-import { inputTypes, kinds, sizes } from 'Helpers/Props';
-import translate from 'Utilities/String/translate';
-import styles from './RemoveQueueItemsModal.css';
-
-class RemoveQueueItemsModal extends Component {
-
-  //
-  // Lifecycle
-
-  constructor(props, context) {
-    super(props, context);
-
-    this.state = {
-      remove: true,
-      blocklist: false,
-      skipRedownload: false
-    };
-  }
-
-  //
-  // Control
-
-  resetState = function() {
-    this.setState({
-      remove: true,
-      blocklist: false,
-      skipRedownload: false
-    });
-  };
-
-  //
-  // Listeners
-
-  onRemoveChange = ({ value }) => {
-    this.setState({ remove: value });
-  };
-
-  onBlocklistChange = ({ value }) => {
-    this.setState({ blocklist: value });
-  };
-
-  onSkipRedownloadChange = ({ value }) => {
-    this.setState({ skipRedownload: value });
-  };
-
-  onRemoveConfirmed = () => {
-    const state = this.state;
-
-    this.resetState();
-    this.props.onRemovePress(state);
-  };
-
-  onModalClose = () => {
-    this.resetState();
-    this.props.onModalClose();
-  };
-
-  //
-  // Render
-
-  render() {
-    const {
-      isOpen,
-      selectedCount,
-      canIgnore,
-      allPending
-    } = this.props;
-
-    const { remove, blocklist, skipRedownload } = this.state;
-
-    return (
-      <Modal
-        isOpen={isOpen}
-        size={sizes.MEDIUM}
-        onModalClose={this.onModalClose}
-      >
-        <ModalContent
-          onModalClose={this.onModalClose}
-        >
-          <ModalHeader>
-            {selectedCount > 1 ? translate('RemoveSelectedItems') : translate('RemoveSelectedItem')}
-          </ModalHeader>
-
-          <ModalBody>
-            <div className={styles.message}>
-              {selectedCount > 1 ? translate('RemoveSelectedItemsQueueMessageText', { selectedCount }) : translate('RemoveSelectedItemQueueMessageText')}
-            </div>
-
-            {
-              allPending ?
-                null :
-                <FormGroup>
-                  <FormLabel>{translate('RemoveFromDownloadClient')}</FormLabel>
-
-                  <FormInputGroup
-                    type={inputTypes.CHECK}
-                    name="remove"
-                    value={remove}
-                    helpTextWarning={translate('RemoveHelpTextWarning')}
-                    isDisabled={!canIgnore}
-                    onChange={this.onRemoveChange}
-                  />
-                </FormGroup>
-            }
-
-            <FormGroup>
-              <FormLabel>
-                {selectedCount > 1 ? translate('BlocklistReleases') : translate('BlocklistRelease')}
-              </FormLabel>
-
-              <FormInputGroup
-                type={inputTypes.CHECK}
-                name="blocklist"
-                value={blocklist}
-                helpText={translate('BlocklistReleaseHelpText')}
-                onChange={this.onBlocklistChange}
-              />
-            </FormGroup>
-
-            {
-              blocklist ?
-                <FormGroup>
-                  <FormLabel>{translate('SkipRedownload')}</FormLabel>
-                  <FormInputGroup
-                    type={inputTypes.CHECK}
-                    name="skipRedownload"
-                    value={skipRedownload}
-                    helpText={translate('SkipRedownloadHelpText')}
-                    onChange={this.onSkipRedownloadChange}
-                  />
-                </FormGroup> :
-                null
-            }
-          </ModalBody>
-
-          <ModalFooter>
-            <Button onPress={this.onModalClose}>
-              {translate('Close')}
-            </Button>
-
-            <Button
-              kind={kinds.DANGER}
-              onPress={this.onRemoveConfirmed}
-            >
-              {translate('Remove')}
-            </Button>
-          </ModalFooter>
-        </ModalContent>
-      </Modal>
-    );
-  }
-}
-
-RemoveQueueItemsModal.propTypes = {
-  isOpen: PropTypes.bool.isRequired,
-  selectedCount: PropTypes.number.isRequired,
-  canIgnore: PropTypes.bool.isRequired,
-  allPending: PropTypes.bool.isRequired,
-  onRemovePress: PropTypes.func.isRequired,
-  onModalClose: PropTypes.func.isRequired
-};
-
-export default RemoveQueueItemsModal;

frontend/src/AddMovie/AddNewMovie/AddNewMovieConnector.js

@@ -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) {
+        this.props.fetchMovieFiles({ movieId: movieIds });
+      }
+    }
+  }
+
   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);

frontend/src/AddMovie/AddNewMovie/AddNewMovieSearchResult.js

@@ -75,7 +75,6 @@ class AddNewMovieSearchResult extends Component {
       colorImpairedMode,
       id,
       monitored,
-      hasFile,
       isAvailable,
       movieFile,
       queueItem,
@@ -88,6 +87,8 @@ class AddNewMovieSearchResult extends Component {
       isNewAddMovieModalOpen
     } = this.state;
 
+    const hasMovieFile = !!movieFile;
+
     const linkProps = isExistingMovie ? { to: `/movie/${titleSlug}` } : { onPress: this.onPress };
     const posterWidth = 167;
     const posterHeight = 250;
@@ -126,7 +127,7 @@ class AddNewMovieSearchResult extends Component {
                       movieId={existingMovieId}
                       movieFile={movieFile}
                       monitored={monitored}
-                      hasFile={hasFile}
+                      hasFile={hasMovieFile}
                       status={status}
                       width={posterWidth}
                       detailedProgressBar={true}
@@ -270,7 +271,7 @@ class AddNewMovieSearchResult extends Component {
               {
                 isExistingMovie && isSmallScreen &&
                   <MovieStatusLabel
-                    hasMovieFiles={hasFile}
+                    hasMovieFiles={hasMovieFile}
                     monitored={monitored}
                     isAvailable={isAvailable}
                     queueItem={queueItem}
@@ -322,7 +323,6 @@ AddNewMovieSearchResult.propTypes = {
   isSmallScreen: PropTypes.bool.isRequired,
   id: PropTypes.number,
   monitored: PropTypes.bool.isRequired,
-  hasFile: PropTypes.bool.isRequired,
   isAvailable: PropTypes.bool.isRequired,
   movieFile: PropTypes.object,
   queueItem: PropTypes.object,

frontend/src/AddMovie/AddNewMovie/AddNewMovieSearchResultConnector.js

@@ -11,10 +11,12 @@ function createMapStateToProps() {
     createExclusionMovieSelector(),
     createDimensionsSelector(),
     (state) => state.queue.details.items,
+    (state) => state.movieFiles.items,
     (state, { internalId }) => internalId,
     (state) => state.settings.ui.item.movieRuntimeFormat,
-    (isExistingMovie, isExclusionMovie, dimensions, queueItems, 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,
@@ -22,6 +24,7 @@ function createMapStateToProps() {
         isExclusionMovie,
         isSmallScreen: dimensions.isSmallScreen,
         queueItem,
+        movieFile,
         movieRuntimeFormat
       };
     }

frontend/src/AddMovie/ImportMovie/Import/ImportMovieRow.js

@@ -10,6 +10,7 @@ import styles from './ImportMovieRow.css';
 function ImportMovieRow(props) {
   const {
     id,
+    relativePath,
     monitor,
     qualityProfileId,
     minimumAvailability,
@@ -31,7 +32,7 @@ function ImportMovieRow(props) {
       />
 
       <VirtualTableRowCell className={styles.folder}>
-        {id}
+        {relativePath}
       </VirtualTableRowCell>
 
       <VirtualTableRowCell className={styles.movie}>
@@ -73,6 +74,7 @@ function ImportMovieRow(props) {
 
 ImportMovieRow.propTypes = {
   id: PropTypes.string.isRequired,
+  relativePath: PropTypes.string.isRequired,
   monitor: PropTypes.string.isRequired,
   qualityProfileId: PropTypes.number.isRequired,
   minimumAvailability: PropTypes.string.isRequired,

frontend/src/AddMovie/ImportMovie/Import/ImportMovieTable.js

@@ -30,7 +30,7 @@ class ImportMovieTable extends Component {
     unmappedFolders.forEach((unmappedFolder) => {
       const id = unmappedFolder.name;
 
-      onMovieLookup(id, unmappedFolder.path);
+      onMovieLookup(id, unmappedFolder.path, unmappedFolder.relativePath);
 
       onSetImportMovieValue({
         id,

frontend/src/AddMovie/ImportMovie/Import/ImportMovieTableConnector.js

@@ -25,10 +25,11 @@ function createMapStateToProps() {
 
 function createMapDispatchToProps(dispatch, props) {
   return {
-    onMovieLookup(name, path) {
+    onMovieLookup(name, path, relativePath) {
       dispatch(queueLookupMovie({
         name,
         path,
+        relativePath,
         term: name
       }));
     },

frontend/src/App/State/AppState.ts

@@ -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;

frontend/src/Calendar/Agenda/AgendaEvent.js

@@ -147,7 +147,7 @@ class AgendaEvent extends Component {
                   className={styles.statusIcon}
                   name={icons.MOVIE_FILE}
                   kind={kinds.WARNING}
-                  title={translate('QualityCutoffHasNotBeenMet')}
+                  title={translate('QualityCutoffNotMet')}
                 />
             }
           </div>

frontend/src/Calendar/Calendar.js

@@ -33,9 +33,7 @@ class Calendar extends Component {
 
         {
           !isFetching && !!error &&
-            <Alert kind={kinds.DANGER}>
-              {translate('UnableToLoadTheCalendar')}
-            </Alert>
+            <Alert kind={kinds.DANGER}>{translate('CalendarLoadError')}</Alert>
         }
 
         {

frontend/src/Calendar/CalendarPage.js

@@ -104,7 +104,7 @@ class CalendarPage extends Component {
         <PageToolbar>
           <PageToolbarSection>
             <PageToolbarButton
-              label={translate('iCalLink')}
+              label={translate('ICalLink')}
               iconName={icons.CALENDAR}
               onPress={this.onGetCalendarLinkPress}
             />
@@ -112,7 +112,7 @@ class CalendarPage extends Component {
             <PageToolbarSeparator />
 
             <PageToolbarButton
-              label={translate('RSSSync')}
+              label={translate('RssSync')}
               iconName={icons.RSS}
               isSpinning={isRssSyncExecuting}
               onPress={onRssSyncPress}
@@ -180,7 +180,7 @@ class CalendarPage extends Component {
 
           {
             !movieError && movieIsPopulated && !hasMovie &&
-              <NoMovie />
+              <NoMovie totalItems={0} />
           }
 
           {

frontend/src/Calendar/Events/CalendarEvent.css

@@ -48,6 +48,10 @@ $fullColorGradient: rgba(244, 245, 246, 0.2);
 .statusContainer {
   display: flex;
   align-items: center;
+
+  &:global(.fullColor) {
+    filter: var(--calendarFullColorFilter)
+  }
 }
 
 .statusIcon {

frontend/src/Calendar/Events/CalendarEvent.js

@@ -76,12 +76,18 @@ class CalendarEvent extends Component {
               {title}
             </div>
 
-            <div className={styles.statusContainer}>
+            <div
+              className={classNames(
+                styles.statusContainer,
+                fullColorEvents && 'fullColor'
+              )}
+            >
               {
                 queueItem ?
                   <span className={styles.statusIcon}>
                     <CalendarEventQueueDetails
                       {...queueItem}
+                      fullColorEvents={fullColorEvents}
                     />
                   </span> :
                   null
@@ -98,12 +104,14 @@ class CalendarEvent extends Component {
               }
 
               {
-                showCutoffUnmetIcon && !!movieFile && movieFile.qualityCutoffNotMet ?
+                showCutoffUnmetIcon &&
+                !!movieFile &&
+                movieFile.qualityCutoffNotMet ?
                   <Icon
                     className={styles.statusIcon}
                     name={icons.MOVIE_FILE}
                     kind={kinds.WARNING}
-                    title={translate('QualityCutoffHasNotBeenMet')}
+                    title={translate('QualityCutoffNotMet')}
                   /> :
                   null
               }

frontend/src/Calendar/Header/CalendarHeader.js

@@ -126,7 +126,7 @@ class CalendarHeader extends Component {
               isDisabled={view === calendarViews.AGENDA}
               onPress={onTodayPress}
             >
-              Today
+              {translate('Today')}
             </Button>
           </div>
 

frontend/src/Calendar/Legend/Legend.js

@@ -20,10 +20,11 @@ function Legend(props) {
   if (showCutoffUnmetIcon) {
     iconsToShow.push(
       <LegendIconItem
-        name={translate('CutoffUnmet')}
+        name={translate('CutoffNotMet')}
         icon={icons.MOVIE_FILE}
-        kind={fullColorEvents ? kinds.DEFAULT : kinds.WARNING}
-        tooltip={translate('QualityOrLangCutoffHasNotBeenMet')}
+        kind={kinds.WARNING}
+        fullColorEvents={fullColorEvents}
+        tooltip={translate('QualityCutoffNotMet')}
       />
     );
   }

frontend/src/Calendar/Legend/LegendIconItem.css

@@ -4,4 +4,8 @@
 
 .icon {
   margin-right: 5px;
+
+  &:global(.fullColorEvents) {
+    filter: var(--calendarFullColorFilter)
+  }
 }

frontend/src/Calendar/Legend/LegendIconItem.js

@@ -1,3 +1,4 @@
+import classNames from 'classnames';
 import PropTypes from 'prop-types';
 import React from 'react';
 import Icon from 'Components/Icon';
@@ -6,9 +7,9 @@ import styles from './LegendIconItem.css';
 function LegendIconItem(props) {
   const {
     name,
+    fullColorEvents,
     icon,
     kind,
-    darken,
     tooltip
   } = props;
 
@@ -18,9 +19,11 @@ function LegendIconItem(props) {
       title={tooltip}
     >
       <Icon
-        className={styles.icon}
+        className={classNames(
+          styles.icon,
+          fullColorEvents && 'fullColorEvents'
+        )}
         name={icon}
-        darken={darken}
         kind={kind}
       />
 
@@ -31,14 +34,10 @@ function LegendIconItem(props) {
 
 LegendIconItem.propTypes = {
   name: PropTypes.string.isRequired,
+  fullColorEvents: PropTypes.bool.isRequired,
   icon: PropTypes.object.isRequired,
   kind: PropTypes.string.isRequired,
-  darken: PropTypes.bool.isRequired,
   tooltip: PropTypes.string.isRequired
 };
 
-LegendIconItem.defaultProps = {
-  darken: false
-};
-
 export default LegendIconItem;

frontend/src/Calendar/Options/CalendarOptionsModalContent.js

@@ -135,7 +135,7 @@ class CalendarOptionsModalContent extends Component {
                   type={inputTypes.CHECK}
                   name="showCutoffUnmetIcon"
                   value={showCutoffUnmetIcon}
-                  helpText={translate('ShowCutoffUnmetIconHelpText')}
+                  helpText={translate('IconForCutoffUnmetHelpText')}
                   onChange={this.onOptionInputChange}
                 />
               </FormGroup>
@@ -177,7 +177,7 @@ class CalendarOptionsModalContent extends Component {
                   values={weekColumnOptions}
                   value={calendarWeekColumnHeader}
                   onChange={this.onGlobalInputChange}
-                  helpText={translate('SettingsWeekColumnHeaderHelpText')}
+                  helpText={translate('WeekColumnHeaderHelpText')}
                 />
               </FormGroup>
 

frontend/src/Calendar/iCal/CalendarLinkModalContent.js

@@ -109,7 +109,7 @@ class CalendarLinkModalContent extends Component {
     return (
       <ModalContent onModalClose={onModalClose}>
         <ModalHeader>
-          {translate('RadarrCalendarFeed')}
+          {translate('CalendarFeed')}
         </ModalHeader>
 
         <ModalBody>
@@ -121,19 +121,19 @@ class CalendarLinkModalContent extends Component {
                 type={inputTypes.CHECK}
                 name="unmonitored"
                 value={unmonitored}
-                helpText={translate('UnmonitoredHelpText')}
+                helpText={translate('ICalIncludeUnmonitoredMoviesHelpText')}
                 onChange={this.onInputChange}
               />
             </FormGroup>
 
             <FormGroup>
-              <FormLabel>{translate('ShowAsAllDayEvents')}</FormLabel>
+              <FormLabel>{translate('ICalShowAsAllDayEvents')}</FormLabel>
 
               <FormInputGroup
                 type={inputTypes.CHECK}
                 name="asAllDay"
                 value={asAllDay}
-                helpText={translate('AsAllDayHelpText')}
+                helpText={translate('ICalShowAsAllDayEventsHelpText')}
                 onChange={this.onInputChange}
               />
             </FormGroup>
@@ -145,7 +145,7 @@ class CalendarLinkModalContent extends Component {
                 type={inputTypes.TAG}
                 name="tags"
                 value={tags}
-                helpText={translate('TagsHelpText')}
+                helpText={translate('ICalTagsMoviesHelpText')}
                 onChange={this.onInputChange}
               />
             </FormGroup>
@@ -160,7 +160,7 @@ class CalendarLinkModalContent extends Component {
                 name="iCalHttpUrl"
                 value={iCalHttpUrl}
                 readOnly={true}
-                helpText={translate('ICalHttpUrlHelpText')}
+                helpText={translate('ICalFeedHelpText')}
                 buttons={[
                   <ClipboardButton
                     key="copy"

frontend/src/Collection/CollectionFooter.js

@@ -14,6 +14,50 @@ import styles from './CollectionFooter.css';
 
 const NO_CHANGE = 'noChange';
 
+const monitoredOptions = [
+  {
+    key: NO_CHANGE,
+    get value() {
+      return translate('NoChange');
+    },
+    disabled: true
+  },
+  {
+    key: 'monitored',
+    get value() {
+      return translate('Monitored');
+    }
+  },
+  {
+    key: 'unmonitored',
+    get value() {
+      return translate('Unmonitored');
+    }
+  }
+];
+
+const searchOnAddOptions = [
+  {
+    key: NO_CHANGE,
+    get value() {
+      return translate('NoChange');
+    },
+    disabled: true
+  },
+  {
+    key: 'yes',
+    get value() {
+      return translate('Yes');
+    }
+  },
+  {
+    key: 'no',
+    get value() {
+      return translate('No');
+    }
+  }
+];
+
 class CollectionFooter extends Component {
 
   //
@@ -23,12 +67,12 @@ class CollectionFooter extends Component {
     super(props, context);
 
     this.state = {
-      monitor: NO_CHANGE,
       monitored: NO_CHANGE,
+      monitor: NO_CHANGE,
       qualityProfileId: NO_CHANGE,
       minimumAvailability: NO_CHANGE,
       rootFolderPath: NO_CHANGE,
-      destinationRootFolder: null
+      searchOnAdd: NO_CHANGE
     };
   }
 
@@ -44,8 +88,9 @@ class CollectionFooter extends Component {
         monitored: NO_CHANGE,
         monitor: NO_CHANGE,
         qualityProfileId: NO_CHANGE,
+        minimumAvailability: NO_CHANGE,
         rootFolderPath: NO_CHANGE,
-        minimumAvailability: NO_CHANGE
+        searchOnAdd: NO_CHANGE
       });
     }
 
@@ -63,11 +108,12 @@ class CollectionFooter extends Component {
 
   onUpdateSelectedPress = () => {
     const {
-      monitor,
       monitored,
+      monitor,
       qualityProfileId,
       minimumAvailability,
-      rootFolderPath
+      rootFolderPath,
+      searchOnAdd
     } = this.state;
 
     const changes = {};
@@ -92,6 +138,10 @@ class CollectionFooter extends Component {
       changes.rootFolderPath = rootFolderPath;
     }
 
+    if (searchOnAdd !== NO_CHANGE) {
+      changes.searchOnAdd = searchOnAdd === 'yes';
+    }
+
     this.props.onUpdateSelectedPress(changes);
   };
 
@@ -109,15 +159,10 @@ class CollectionFooter extends Component {
       monitor,
       qualityProfileId,
       minimumAvailability,
-      rootFolderPath
+      rootFolderPath,
+      searchOnAdd
     } = this.state;
 
-    const monitoredOptions = [
-      { key: NO_CHANGE, value: translate('NoChange'), disabled: true },
-      { key: 'monitored', value: translate('Monitored') },
-      { key: 'unmonitored', value: translate('Unmonitored') }
-    ];
-
     const selectedCount = selectedIds.length;
 
     return (
@@ -125,7 +170,7 @@ class CollectionFooter extends Component {
         <div className={styles.inputContainer}>
           <CollectionFooterLabel
             label={translate('MonitorCollection')}
-            isSaving={isSaving}
+            isSaving={isSaving && monitored !== NO_CHANGE}
           />
 
           <SelectInput
@@ -140,7 +185,7 @@ class CollectionFooter extends Component {
         <div className={styles.inputContainer}>
           <CollectionFooterLabel
             label={translate('MonitorMovies')}
-            isSaving={isSaving}
+            isSaving={isSaving && monitor !== NO_CHANGE}
           />
 
           <SelectInput
@@ -198,10 +243,25 @@ class CollectionFooter extends Component {
           />
         </div>
 
+        <div className={styles.inputContainer}>
+          <CollectionFooterLabel
+            label={translate('SearchMoviesOnAdd')}
+            isSaving={isSaving && searchOnAdd !== NO_CHANGE}
+          />
+
+          <SelectInput
+            name="searchOnAdd"
+            value={searchOnAdd}
+            values={searchOnAddOptions}
+            isDisabled={!selectedCount}
+            onChange={this.onInputChange}
+          />
+        </div>
+
         <div className={styles.buttonContainer}>
           <div className={styles.buttonContainerContent}>
             <CollectionFooterLabel
-              label={translate('CollectionsSelectedInterp', [selectedCount])}
+              label={translate('CountCollectionsSelected', { count: selectedCount })}
               isSaving={false}
             />
 

frontend/src/Collection/Overview/CollectionMovieLabel.js

@@ -74,11 +74,7 @@ CollectionMovieLabel.propTypes = {
 
 CollectionMovieLabel.defaultProps = {
   isSaving: false,
-  statistics: {
-    episodeFileCount: 0,
-    totalEpisodeCount: 0,
-    percentOfEpisodes: 0
-  }
+  statistics: {}
 };
 
 export default CollectionMovieLabel;

frontend/src/Components/Filter/CustomFilters/CustomFiltersModalContent.js

@@ -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}>

frontend/src/Components/Form/FormInputGroup.js

@@ -267,6 +267,7 @@ FormInputGroup.propTypes = {
   name: PropTypes.string.isRequired,
   value: PropTypes.any,
   values: PropTypes.arrayOf(PropTypes.any),
+  isDisabled: PropTypes.bool,
   type: PropTypes.string.isRequired,
   kind: PropTypes.oneOf(kinds.all),
   min: PropTypes.number,

frontend/src/Components/Icon.css

@@ -12,18 +12,10 @@
 
 .info {
   color: var(--infoColor);
-
-  &:global(.darken) {
-    color: color(var(--infoColor) shade(30%));
-  }
 }
 
 .pink {
   color: var(--pink);
-
-  &:global(.darken) {
-    color: color(var(--pink) shade(30%));
-  }
 }
 
 .success {

frontend/src/Components/Icon.js

@@ -18,7 +18,6 @@ class Icon extends PureComponent {
       kind,
       size,
       title,
-      darken,
       isSpinning,
       ...otherProps
     } = this.props;
@@ -27,8 +26,7 @@ class Icon extends PureComponent {
       <FontAwesomeIcon
         className={classNames(
           className,
-          styles[kind],
-          darken && 'darken'
+          styles[kind]
         )}
         icon={name}
         spin={isSpinning}
@@ -61,7 +59,6 @@ Icon.propTypes = {
   kind: PropTypes.string.isRequired,
   size: PropTypes.number.isRequired,
   title: PropTypes.oneOfType([PropTypes.string, PropTypes.func]),
-  darken: PropTypes.bool.isRequired,
   isSpinning: PropTypes.bool.isRequired,
   fixedWidth: PropTypes.bool.isRequired
 };
@@ -69,7 +66,6 @@ Icon.propTypes = {
 Icon.defaultProps = {
   kind: kinds.DEFAULT,
   size: 14,
-  darken: false,
   isSpinning: false,
   fixedWidth: false
 };

frontend/src/Components/ImportListList.js

@@ -19,7 +19,7 @@ function ImportListList({ lists, importListList }) {
           return (
             <Label
               key={list.id}
-              kind={kinds.INFO}
+              kind={kinds.SUCCESS}
               size={sizes.MEDIUM}
             >
               {list.name}

frontend/src/Components/Menu/FilterMenuContent.js

@@ -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>
+              );
+            })
         }
 
         {

frontend/src/Components/Page/Sidebar/PageSidebar.js

@@ -101,7 +101,7 @@ const links = [
         to: '/settings/downloadclients'
       },
       {
-        title: () => translate('Lists'),
+        title: () => translate('ImportLists'),
         to: '/settings/importlists'
       },
       {
@@ -121,7 +121,7 @@ const links = [
         to: '/settings/general'
       },
       {
-        title: () => translate('UI'),
+        title: () => translate('Ui'),
         to: '/settings/ui'
       }
     ]

frontend/src/DiscoverMovie/DiscoverMovie.js

@@ -329,10 +329,7 @@ class DiscoverMovie extends Component {
                 null
             }
 
-            {
-              (view === 'posters' || view === 'overview') &&
-                <PageToolbarSeparator />
-            }
+            <PageToolbarSeparator />
 
             <DiscoverMovieViewMenu
               view={view}

frontend/src/DiscoverMovie/Overview/DiscoverMovieOverview.js

@@ -97,6 +97,8 @@ class DiscoverMovieOverview extends Component {
       isExisting,
       isExcluded,
       isRecommendation,
+      isPopular,
+      isTrending,
       isSelected,
       overviewOptions,
       ...otherProps
@@ -214,6 +216,26 @@ class DiscoverMovieOverview extends Component {
                   null
               }
 
+              {
+                isPopular ?
+                  <Label
+                    kind={kinds.INFO}
+                  >
+                    {translate('Popular')}
+                  </Label> :
+                  null
+              }
+
+              {
+                isTrending ?
+                  <Label
+                    kind={kinds.INFO}
+                  >
+                    {translate('Trending')}
+                  </Label> :
+                  null
+              }
+
               <ImportListListConnector
                 lists={lists}
               />
@@ -283,6 +305,8 @@ DiscoverMovieOverview.propTypes = {
   isExisting: PropTypes.bool.isRequired,
   isExcluded: PropTypes.bool.isRequired,
   isRecommendation: PropTypes.bool.isRequired,
+  isPopular: PropTypes.bool.isRequired,
+  isTrending: PropTypes.bool.isRequired,
   isSelected: PropTypes.bool,
   lists: PropTypes.arrayOf(PropTypes.number).isRequired,
   onSelectedChange: PropTypes.func.isRequired

frontend/src/DiscoverMovie/Table/DiscoverMovieHeader.css

@@ -57,10 +57,12 @@
   flex: 0 0 115px;
 }
 
+.isTrending,
+.isPopular,
 .isRecommendation {
   composes: headerCell from '~Components/Table/VirtualTableHeaderCell.css';
 
-  flex: 0 0 50px;
+  flex: 0 0 30px;
 }
 
 .actions {

frontend/src/DiscoverMovie/Table/DiscoverMovieHeader.css.d.ts

@@ -7,7 +7,9 @@ interface CssExports {
   'digitalRelease': string;
   'genres': string;
   'inCinemas': string;
+  'isPopular': string;
   'isRecommendation': string;
+  'isTrending': string;
   'lists': string;
   'originalLanguage': string;
   'physicalRelease': string;

frontend/src/DiscoverMovie/Table/DiscoverMovieHeader.js

@@ -103,6 +103,40 @@ class DiscoverMovieHeader extends Component {
               );
             }
 
+            if (name === 'isTrending') {
+              return (
+                <VirtualTableHeaderCell
+                  key={name}
+                  className={styles[name]}
+                  name={name}
+                  isSortable={true}
+                  {...otherProps}
+                >
+                  <Icon
+                    name={icons.TRENDING}
+                    size={12}
+                  />
+                </VirtualTableHeaderCell>
+              );
+            }
+
+            if (name === 'isPopular') {
+              return (
+                <VirtualTableHeaderCell
+                  key={name}
+                  className={styles[name]}
+                  name={name}
+                  isSortable={true}
+                  {...otherProps}
+                >
+                  <Icon
+                    name={icons.POPULAR}
+                    size={12}
+                  />
+                </VirtualTableHeaderCell>
+              );
+            }
+
             return (
               <VirtualTableHeaderCell
                 key={name}

frontend/src/DiscoverMovie/Table/DiscoverMovieRow.css

@@ -76,10 +76,12 @@
   flex: 1 0 110px;
 }
 
+.isTrending,
+.isPopular,
 .isRecommendation {
   composes: cell;
 
-  flex: 0 0 50px;
+  flex: 0 0 30px;
 }
 
 .actions {
@@ -95,6 +97,11 @@
   margin-top: 0;
 }
 
+.statusIcon {
+  width: 20px !important;
+  text-align: center;
+}
+
 .externalLinks {
   margin-right: 0.5em;
 }

frontend/src/DiscoverMovie/Table/DiscoverMovieRow.css.d.ts

@@ -12,7 +12,9 @@ interface CssExports {
   'externalLinks': string;
   'genres': string;
   'inCinemas': string;
+  'isPopular': string;
   'isRecommendation': string;
+  'isTrending': string;
   'lists': string;
   'originalLanguage': string;
   'physicalRelease': string;
@@ -21,6 +23,7 @@ interface CssExports {
   'runtime': string;
   'sortTitle': string;
   'status': string;
+  'statusIcon': string;
   'studio': string;
 }
 export const cssExports: CssExports;

frontend/src/DiscoverMovie/Table/DiscoverMovieRow.js

@@ -82,6 +82,8 @@ class DiscoverMovieRow extends Component {
       isExisting,
       isExcluded,
       isRecommendation,
+      isTrending,
+      isPopular,
       isSelected,
       lists,
       onSelectedChange
@@ -305,6 +307,7 @@ class DiscoverMovieRow extends Component {
                   {
                     isRecommendation ?
                       <Icon
+                        className={styles.statusIcon}
                         name={icons.RECOMMENDED}
                         size={12}
                         title={translate('MovieIsRecommend')}
@@ -315,6 +318,46 @@ class DiscoverMovieRow extends Component {
               );
             }
 
+            if (name === 'isTrending') {
+              return (
+                <VirtualTableRowCell
+                  key={name}
+                  className={styles[name]}
+                >
+                  {
+                    isTrending ?
+                      <Icon
+                        className={styles.statusIcon}
+                        name={icons.TRENDING}
+                        size={12}
+                        title={translate('MovieIsTrending')}
+                      /> :
+                      null
+                  }
+                </VirtualTableRowCell>
+              );
+            }
+
+            if (name === 'isPopular') {
+              return (
+                <VirtualTableRowCell
+                  key={name}
+                  className={styles[name]}
+                >
+                  {
+                    isPopular ?
+                      <Icon
+                        className={styles.statusIcon}
+                        name={icons.POPULAR}
+                        size={12}
+                        title={translate('MovieIsPopular')}
+                      /> :
+                      null
+                  }
+                </VirtualTableRowCell>
+              );
+            }
+
             if (name === 'actions') {
               return (
                 <VirtualTableRowCell
@@ -404,6 +447,8 @@ DiscoverMovieRow.propTypes = {
   isExcluded: PropTypes.bool.isRequired,
   isSelected: PropTypes.bool,
   isRecommendation: PropTypes.bool.isRequired,
+  isPopular: PropTypes.bool.isRequired,
+  isTrending: PropTypes.bool.isRequired,
   lists: PropTypes.arrayOf(PropTypes.number).isRequired,
   onSelectedChange: PropTypes.func.isRequired
 };

frontend/src/Helpers/Props/icons.js

@@ -23,6 +23,7 @@ import {
 import {
   faArrowCircleLeft as fasArrowCircleLeft,
   faArrowCircleRight as fasArrowCircleRight,
+  faArrowTrendUp as fasArrowTrendUp,
   faAsterisk as fasAsterisk,
   faBackward as fasBackward,
   faBan as fasBan,
@@ -59,6 +60,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 +161,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;
@@ -231,6 +234,7 @@ export const TAGS = fasTags;
 export const TBA = fasQuestionCircle;
 export const TEST = fasVial;
 export const TRANSLATE = fasLanguage;
+export const TRENDING = fasArrowTrendUp;
 export const UNGROUP = farObjectUngroup;
 export const UNKNOWN = fasQuestion;
 export const UNMONITORED = farBookmark;

frontend/src/InteractiveImport/Interactive/InteractiveImportModalContent.tsx

@@ -242,25 +242,6 @@ function InteractiveImportModalContent(
   const [interactiveImportErrorMessage, setInteractiveImportErrorMessage] =
     useState<string | null>(null);
   const [selectState, setSelectState] = useSelectState();
-  const [bulkSelectOptions, setBulkSelectOptions] = useState([
-    {
-      key: 'select',
-      value: translate('SelectDropdown'),
-      disabled: true,
-    },
-    {
-      key: 'quality',
-      value: translate('SelectQuality'),
-    },
-    {
-      key: 'releaseGroup',
-      value: translate('SelectReleaseGroup'),
-    },
-    {
-      key: 'language',
-      value: translate('SelectLanguage'),
-    },
-  ]);
   const { allSelected, allUnselected, selectedState } = selectState;
   const previousIsDeleting = usePrevious(isDeleting);
   const dispatch = useDispatch();
@@ -283,19 +264,39 @@ function InteractiveImportModalContent(
     return getSelectedIds(selectedState);
   }, [selectedState]);
 
+  const bulkSelectOptions = useMemo(() => {
+    const options = [
+      {
+        key: 'select',
+        value: translate('SelectDropdown'),
+        disabled: true,
+      },
+      {
+        key: 'quality',
+        value: translate('SelectQuality'),
+      },
+      {
+        key: 'releaseGroup',
+        value: translate('SelectReleaseGroup'),
+      },
+      {
+        key: 'language',
+        value: translate('SelectLanguage'),
+      },
+    ];
+
+    if (allowMovieChange) {
+      options.splice(1, 0, {
+        key: 'movie',
+        value: translate('SelectMovie'),
+      });
+    }
+
+    return options;
+  }, [allowMovieChange]);
+
   useEffect(
     () => {
-      if (allowMovieChange) {
-        const newBulkSelectOptions = [...bulkSelectOptions];
-
-        newBulkSelectOptions.splice(1, 0, {
-          key: 'movie',
-          value: translate('SelectMovie'),
-        });
-
-        setBulkSelectOptions(newBulkSelectOptions);
-      }
-
       if (initialSortKey) {
         const sortProps: { sortKey: string; sortDirection?: string } = {
           sortKey: initialSortKey,

frontend/src/InteractiveSearch/InteractiveSearch.js

@@ -88,13 +88,6 @@ const columns = [
     isSortable: true,
     isVisible: true
   },
-  {
-    name: 'releaseWeight',
-    label: React.createElement(Icon, { name: icons.DOWNLOAD }),
-    isSortable: true,
-    fixedSortDirection: sortDirections.ASCENDING,
-    isVisible: true
-  },
   {
     name: 'rejections',
     label: React.createElement(Icon, {
@@ -104,6 +97,13 @@ const columns = [
     isSortable: true,
     fixedSortDirection: sortDirections.ASCENDING,
     isVisible: true
+  },
+  {
+    name: 'releaseWeight',
+    label: React.createElement(Icon, { name: icons.DOWNLOAD }),
+    isSortable: true,
+    fixedSortDirection: sortDirections.ASCENDING,
+    isVisible: true
   }
 ];
 

frontend/src/Movie/Delete/DeleteMovieModalContent.js

@@ -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;

frontend/src/Movie/Details/Credits/Cast/MovieCastPoster.js

@@ -1,8 +1,14 @@
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
+import Icon from 'Components/Icon';
+import Label from 'Components/Label';
+import Link from 'Components/Link/Link';
 import MonitorToggleButton from 'Components/MonitorToggleButton';
+import Popover from 'Components/Tooltip/Popover';
+import { icons, kinds, sizes } from 'Helpers/Props';
 import MovieHeadshot from 'Movie/MovieHeadshot';
 import EditImportListModalConnector from 'Settings/ImportLists/ImportLists/EditImportListModalConnector';
+import translate from 'Utilities/String/translate';
 import styles from '../MovieCreditPoster.css';
 
 class MovieCastPoster extends Component {
@@ -52,6 +58,7 @@ class MovieCastPoster extends Component {
 
   render() {
     const {
+      tmdbId,
       personName,
       character,
       images,
@@ -83,15 +90,35 @@ class MovieCastPoster extends Component {
         style={contentStyle}
       >
         <div className={styles.posterContainer}>
-          <div className={styles.controls}>
+          <div className={styles.toggleMonitoredContainer}>
             <MonitorToggleButton
-              className={styles.action}
+              className={styles.monitorToggleButton}
               monitored={monitored}
               size={20}
               onPress={importListId > 0 ? this.onEditImportListPress : this.onAddImportListPress}
             />
           </div>
 
+          <Label className={styles.controls}>
+            <span className={styles.externalLinks}>
+              <Popover
+                anchor={<Icon name={icons.EXTERNAL_LINK} size={12} />}
+                title={translate('Links')}
+                body={
+                  <Link to={`https://www.themoviedb.org/person/${tmdbId}`}>
+                    <Label
+                      className={styles.externalLinkLabel}
+                      kind={kinds.INFO}
+                      size={sizes.LARGE}
+                    >
+                      {translate('TMDb')}
+                    </Label>
+                  </Link>
+                }
+              />
+            </span>
+          </Label>
+
           <div
             style={elementStyle}
           >

frontend/src/Movie/Details/Credits/Crew/MovieCrewPoster.js

@@ -1,8 +1,14 @@
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
+import Icon from 'Components/Icon';
+import Label from 'Components/Label';
+import Link from 'Components/Link/Link';
 import MonitorToggleButton from 'Components/MonitorToggleButton';
+import Popover from 'Components/Tooltip/Popover';
+import { icons, kinds, sizes } from 'Helpers/Props';
 import MovieHeadshot from 'Movie/MovieHeadshot';
 import EditImportListModalConnector from 'Settings/ImportLists/ImportLists/EditImportListModalConnector';
+import translate from 'Utilities/String/translate';
 import styles from '../MovieCreditPoster.css';
 
 class MovieCrewPoster extends Component {
@@ -52,6 +58,7 @@ class MovieCrewPoster extends Component {
 
   render() {
     const {
+      tmdbId,
       personName,
       job,
       images,
@@ -83,15 +90,35 @@ class MovieCrewPoster extends Component {
         style={contentStyle}
       >
         <div className={styles.posterContainer}>
-          <div className={styles.controls}>
+          <div className={styles.toggleMonitoredContainer}>
             <MonitorToggleButton
-              className={styles.action}
+              className={styles.monitorToggleButton}
               monitored={monitored}
               size={20}
               onPress={importListId > 0 ? this.onEditImportListPress : this.onAddImportListPress}
             />
           </div>
 
+          <Label className={styles.controls}>
+            <span className={styles.externalLinks}>
+              <Popover
+                anchor={<Icon name={icons.EXTERNAL_LINK} size={12} />}
+                title={translate('Links')}
+                body={
+                  <Link to={`https://www.themoviedb.org/person/${tmdbId}`}>
+                    <Label
+                      className={styles.externalLinkLabel}
+                      kind={kinds.INFO}
+                      size={sizes.LARGE}
+                    >
+                      {translate('TMDb')}
+                    </Label>
+                  </Link>
+                }
+              />
+            </span>
+          </Label>
+
           <div
             style={elementStyle}
           >

frontend/src/Movie/Details/Credits/MovieCreditPoster.css

@@ -1,13 +1,17 @@
 $hoverScale: 1.05;
 
 .content {
-  border-radius: '5px';
   transition: all 200ms ease-in;
 
   &:hover {
     z-index: 2;
     box-shadow: 0 0 12px var(--black);
     transition: all 200ms ease-in;
+
+    .controls {
+      opacity: 0.9;
+      transition: opacity 200ms linear 150ms;
+    }
   }
 }
 
@@ -44,13 +48,13 @@ $hoverScale: 1.05;
   font-size: $smallFontSize;
 }
 
-.controls {
+.toggleMonitoredContainer {
   position: absolute;
   top: 10px;
   z-index: 3;
 }
 
-.action {
+.monitorToggleButton {
   composes: toggleButton from '~Components/MonitorToggleButton.css';
 
   width: 25px;
@@ -61,8 +65,39 @@ $hoverScale: 1.05;
   }
 }
 
+.controls {
+  position: absolute;
+  bottom: 10px;
+  left: 10px;
+  z-index: 3;
+  border-radius: 4px;
+  background-color: #707070;
+  color: var(--white);
+  font-size: $smallFontSize;
+  opacity: 0;
+  transition: opacity 0;
+}
+
+.action {
+  composes: button from '~Components/Link/IconButton.css';
+
+  &:hover {
+    color: var(--iconButtonHoverLightColor);
+  }
+}
+
 @media only screen and (max-width: $breakpointSmall) {
   .container {
     padding: 5px;
   }
 }
+
+.externalLinks {
+  margin: 0 2px;
+}
+
+.externalLinkLabel {
+  composes: label from '~Components/Label.css';
+
+  cursor: pointer;
+}

frontend/src/Movie/Details/Credits/MovieCreditPoster.css.d.ts

@@ -5,10 +5,14 @@ interface CssExports {
   'container': string;
   'content': string;
   'controls': string;
+  'externalLinkLabel': string;
+  'externalLinks': string;
+  'monitorToggleButton': string;
   'overlayTitle': string;
   'poster': string;
   'posterContainer': string;
   'title': string;
+  'toggleMonitoredContainer': string;
 }
 export const cssExports: CssExports;
 export default cssExports;

frontend/src/Movie/Details/Credits/MovieCreditPosters.js

@@ -52,7 +52,8 @@ class MovieCreditPosters extends Component {
   render() {
     const {
       items,
-      itemComponent
+      itemComponent,
+      isSmallScreen
     } = this.props;
 
     const {
@@ -67,7 +68,7 @@ class MovieCreditPosters extends Component {
         <Swiper
           slidesPerView='auto'
           spaceBetween={10}
-          slidesPerGroup={3}
+          slidesPerGroup={isSmallScreen ? 1 : 3}
           navigation={true}
           loop={false}
           loopFillGroupWithBlank={true}

frontend/src/Movie/Details/MovieDetails.js

@@ -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,
@@ -734,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,
@@ -773,9 +777,9 @@ MovieDetails.propTypes = {
 
 MovieDetails.defaultProps = {
   genres: [],
+  statistics: {},
   tags: [],
-  isSaving: false,
-  sizeOnDisk: 0
+  isSaving: false
 };
 
 export default MovieDetails;

frontend/src/Movie/Details/MovieDetailsLinks.css

@@ -3,6 +3,7 @@
 }
 
 .link {
+  display: inline-block;
   white-space: nowrap;
 }
 

frontend/src/Movie/Index/MovieIndex.tsx

@@ -235,7 +235,7 @@ const MovieIndex = withScrollPosition((props: MovieIndexProps) => {
             />
 
             <PageToolbarButton
-              label={translate('RSSSync')}
+              label={translate('RssSync')}
               iconName={icons.RSS}
               isSpinning={isRssSyncExecuting}
               isDisabled={hasNoMovie}

frontend/src/Movie/Index/MovieIndexFooter.tsx

@@ -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 (

frontend/src/Movie/Index/Overview/MovieIndexOverview.tsx

@@ -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);

frontend/src/Movie/Index/Posters/MovieIndexPoster.tsx

@@ -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);

frontend/src/Movie/Index/Posters/MovieIndexPosters.tsx

@@ -244,11 +244,15 @@ export default function MovieIndexPosters(props: MovieIndexPostersProps) {
 
     if (isSmallScreen) {
       const padding = bodyPaddingSmallScreen - 5;
+      const width = window.innerWidth - padding * 2;
+      const height = window.innerHeight;
 
-      setSize({
-        width: window.innerWidth - padding * 2,
-        height: window.innerHeight,
-      });
+      if (width !== size.width || height !== size.height) {
+        setSize({
+          width,
+          height,
+        });
+      }
 
       return;
     }
@@ -256,13 +260,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;

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

@@ -38,6 +38,7 @@
   flex: 1 0 125px;
 }
 
+.releaseGroups,
 .inCinemas,
 .physicalRelease,
 .digitalRelease,

frontend/src/Movie/Index/Table/MovieIndexRow.css.d.ts

@@ -20,6 +20,7 @@ interface CssExports {
   'physicalRelease': string;
   'popularity': string;
   'qualityProfileId': string;
+  'releaseGroups': string;
   'rottenTomatoesRating': string;
   'runtime': string;
   'sizeOnDisk': string;

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

@@ -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';
@@ -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);
@@ -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]}>

frontend/src/Movie/Index/Table/MovieIndexTableHeader.css

@@ -31,6 +31,7 @@
   flex: 1 0 125px;
 }
 
+.releaseGroups,
 .inCinemas,
 .physicalRelease,
 .digitalRelease,

frontend/src/Movie/Index/Table/MovieIndexTableHeader.css.d.ts

@@ -17,6 +17,7 @@ interface CssExports {
   'physicalRelease': string;
   'popularity': string;
   'qualityProfileId': string;
+  'releaseGroups': string;
   'rottenTomatoesRating': string;
   'runtime': string;
   'sizeOnDisk': string;

frontend/src/Movie/Movie.ts

@@ -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;

frontend/src/MovieFile/Editor/MovieFileEditorRow.css

@@ -45,7 +45,8 @@
   width: 165px;
 }
 
-.releaseGroup {
+.releaseGroup,
+.dateAdded {
   composes: cell from '~Components/Table/Cells/TableRowCell.css';
 
   width: 120px;

frontend/src/MovieFile/Editor/MovieFileEditorRow.css.d.ts

@@ -6,6 +6,7 @@ interface CssExports {
   'audio': string;
   'audioLanguages': string;
   'customFormatScore': string;
+  'dateAdded': string;
   'download': string;
   'formats': string;
   'language': string;

frontend/src/MovieFile/Editor/MovieFileEditorRow.js

@@ -2,6 +2,7 @@ import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import IconButton from 'Components/Link/IconButton';
 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';
@@ -82,6 +83,7 @@ class MovieFileEditorRow extends Component {
       customFormats,
       customFormatScore,
       languages,
+      dateAdded,
       columns
     } = this.props;
 
@@ -287,6 +289,16 @@ class MovieFileEditorRow extends Component {
               );
             }
 
+            if (name === 'dateAdded') {
+              return (
+                <RelativeDateCellConnector
+                  key={name}
+                  className={styles.dateAdded}
+                  date={dateAdded}
+                />
+              );
+            }
+
             if (name === 'actions') {
               return (
                 <TableRowCell key={name} className={styles.actions}>
@@ -354,6 +366,7 @@ MovieFileEditorRow.propTypes = {
   qualityCutoffNotMet: PropTypes.bool.isRequired,
   languages: PropTypes.arrayOf(PropTypes.object).isRequired,
   mediaInfo: PropTypes.object,
+  dateAdded: PropTypes.string,
   columns: PropTypes.arrayOf(PropTypes.object).isRequired,
   onDeletePress: PropTypes.func.isRequired
 };

frontend/src/MovieFile/Editor/MovieFileEditorTableContent.js

@@ -2,6 +2,8 @@ import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import Table from 'Components/Table/Table';
 import TableBody from 'Components/Table/TableBody';
+import { sortDirections } from 'Helpers/Props';
+import translate from 'Utilities/String/translate';
 import MovieFileEditorRow from './MovieFileEditorRow';
 import styles from './MovieFileEditorTableContent.css';
 
@@ -14,6 +16,9 @@ class MovieFileEditorTableContent extends Component {
     const {
       items,
       columns,
+      sortKey,
+      sortDirection,
+      onSortPress,
       onTableOptionChange
     } = this.props;
 
@@ -22,7 +27,7 @@ class MovieFileEditorTableContent extends Component {
         {
           !items.length &&
             <div className={styles.blankpad}>
-              No movie files to manage.
+              {translate('NoMovieFilesToManage')}
             </div>
         }
 
@@ -30,6 +35,9 @@ class MovieFileEditorTableContent extends Component {
           !!items.length &&
             <Table
               columns={columns}
+              sortKey={sortKey}
+              sortDirection={sortDirection}
+              onSortPress={onSortPress}
               onTableOptionChange={onTableOptionChange}
             >
               <TableBody>
@@ -59,7 +67,10 @@ MovieFileEditorTableContent.propTypes = {
   isDeleting: PropTypes.bool.isRequired,
   items: PropTypes.arrayOf(PropTypes.object).isRequired,
   columns: PropTypes.arrayOf(PropTypes.object).isRequired,
+  sortKey: PropTypes.string.isRequired,
+  sortDirection: PropTypes.oneOf(sortDirections.all),
   onTableOptionChange: PropTypes.func.isRequired,
+  onSortPress: PropTypes.func.isRequired,
   onDeletePress: PropTypes.func.isRequired
 };
 

frontend/src/MovieFile/Editor/MovieFileEditorTableContentConnector.js

@@ -2,8 +2,9 @@ import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import { connect } from 'react-redux';
 import { createSelector } from 'reselect';
-import { deleteMovieFile, setMovieFilesTableOption, updateMovieFiles } from 'Store/Actions/movieFileActions';
+import { deleteMovieFile, setMovieFilesSort, setMovieFilesTableOption } from 'Store/Actions/movieFileActions';
 import { fetchLanguages, fetchQualityProfileSchema } from 'Store/Actions/settingsActions';
+import createClientSideCollectionSelector from 'Store/Selectors/createClientSideCollectionSelector';
 import createMovieSelector from 'Store/Selectors/createMovieSelector';
 import getQualities from 'Utilities/Quality/getQualities';
 import MovieFileEditorTableContent from './MovieFileEditorTableContent';
@@ -11,7 +12,7 @@ import MovieFileEditorTableContent from './MovieFileEditorTableContent';
 function createMapStateToProps() {
   return createSelector(
     (state, { movieId }) => movieId,
-    (state) => state.movieFiles,
+    createClientSideCollectionSelector('movieFiles'),
     (state) => state.settings.languages,
     (state) => state.settings.qualityProfiles,
     createMovieSelector(),
@@ -23,13 +24,13 @@ function createMapStateToProps() {
     ) => {
       const languages = languageProfiles.items;
       const qualities = getQualities(qualityProfiles.schema.items);
-      const filesForMovie = movieFiles.items.filter((obj) => {
-        return obj.movieId === movieId;
-      });
+      const filesForMovie = movieFiles.items.filter((file) => file.movieId === movieId);
 
       return {
         items: filesForMovie,
         columns: movieFiles.columns,
+        sortKey: movieFiles.sortKey,
+        sortDirection: movieFiles.sortDirection,
         isDeleting: movieFiles.isDeleting,
         isSaving: movieFiles.isSaving,
         error: null,
@@ -40,31 +41,13 @@ function createMapStateToProps() {
   );
 }
 
-function createMapDispatchToProps(dispatch, props) {
-  return {
-    dispatchFetchQualityProfileSchema(name, path) {
-      dispatch(fetchQualityProfileSchema());
-    },
-
-    dispatchFetchLanguages(name, path) {
-      dispatch(fetchLanguages());
-    },
-
-    dispatchUpdateMovieFiles(updateProps) {
-      dispatch(updateMovieFiles(updateProps));
-    },
-
-    onTableOptionChange(payload) {
-      dispatch(setMovieFilesTableOption(payload));
-    },
-
-    onDeletePress(movieFileId) {
-      dispatch(deleteMovieFile({
-        id: movieFileId
-      }));
-    }
-  };
-}
+const mapDispatchToProps = {
+  fetchQualityProfileSchema,
+  fetchLanguages,
+  deleteMovieFile,
+  setMovieFilesTableOption,
+  setMovieFilesSort
+};
 
 class MovieFileEditorTableContentConnector extends Component {
 
@@ -72,24 +55,40 @@ class MovieFileEditorTableContentConnector extends Component {
   // Lifecycle
 
   componentDidMount() {
-    this.props.dispatchFetchLanguages();
-    this.props.dispatchFetchQualityProfileSchema();
+    this.props.fetchLanguages();
+    this.props.fetchQualityProfileSchema();
   }
 
+  //
+  // Listeners
+
+  onDeletePress = (movieFileId) => {
+    this.props.deleteMovieFile({
+      id: movieFileId
+    });
+  };
+
+  onTableOptionChange = (payload) => {
+    this.props.setMovieFilesTableOption(payload);
+  };
+
+  onSortPress = (sortKey, sortDirection) => {
+    this.props.setMovieFilesSort({
+      sortKey,
+      sortDirection
+    });
+  };
+
   //
   // Render
 
   render() {
-    const {
-      dispatchFetchLanguages,
-      dispatchFetchQualityProfileSchema,
-      dispatchUpdateMovieFiles,
-      ...otherProps
-    } = this.props;
-
     return (
       <MovieFileEditorTableContent
-        {...otherProps}
+        {...this.props}
+        onDeletePress={this.onDeletePress}
+        onTableOptionChange={this.onTableOptionChange}
+        onSortPress={this.onSortPress}
       />
     );
   }
@@ -99,9 +98,11 @@ MovieFileEditorTableContentConnector.propTypes = {
   movieId: PropTypes.number.isRequired,
   languages: PropTypes.arrayOf(PropTypes.object).isRequired,
   qualities: PropTypes.arrayOf(PropTypes.object).isRequired,
-  dispatchFetchLanguages: PropTypes.func.isRequired,
-  dispatchFetchQualityProfileSchema: PropTypes.func.isRequired,
-  dispatchUpdateMovieFiles: PropTypes.func.isRequired
+  fetchLanguages: PropTypes.func.isRequired,
+  fetchQualityProfileSchema: PropTypes.func.isRequired,
+  deleteMovieFile: PropTypes.func.isRequired,
+  setMovieFilesTableOption: PropTypes.func.isRequired,
+  setMovieFilesSort: PropTypes.func.isRequired
 };
 
-export default connect(createMapStateToProps, createMapDispatchToProps)(MovieFileEditorTableContentConnector);
+export default connect(createMapStateToProps, mapDispatchToProps)(MovieFileEditorTableContentConnector);

frontend/src/MovieFile/Extras/ExtraFileTableContent.js

@@ -46,7 +46,7 @@ class ExtraFileTableContent extends Component {
         {
           !items.length &&
             <div className={styles.blankpad}>
-              No extra files to manage.
+              {translate('NoExtraFilesToManage')}
             </div>
         }
 

frontend/src/MovieFile/Extras/ExtraFileTableContentConnector.js

@@ -14,9 +14,7 @@ function createMapStateToProps() {
       movieId,
       extraFiles
     ) => {
-      const filesForMovie = extraFiles.items.filter((obj) => {
-        return obj.movieId === movieId;
-      });
+      const filesForMovie = extraFiles.items.filter((file) => file.movieId === movieId);
 
       return {
         items: filesForMovie,
@@ -26,11 +24,6 @@ function createMapStateToProps() {
   );
 }
 
-function createMapDispatchToProps(dispatch, props) {
-  return {
-  };
-}
-
 class ExtraFileTableContentConnector extends Component {
 
   //
@@ -53,4 +46,4 @@ ExtraFileTableContentConnector.propTypes = {
   movieId: PropTypes.number.isRequired
 };
 
-export default connect(createMapStateToProps, createMapDispatchToProps)(ExtraFileTableContentConnector);
+export default connect(createMapStateToProps, null)(ExtraFileTableContentConnector);

frontend/src/Settings/CustomFormats/CustomFormatSettingsPage.tsx

@@ -6,11 +6,12 @@ import PageContentBody from 'Components/Page/PageContentBody';
 import PageToolbarSeparator from 'Components/Page/Toolbar/PageToolbarSeparator';
 import ParseToolbarButton from 'Parse/ParseToolbarButton';
 import SettingsToolbarConnector from 'Settings/SettingsToolbarConnector';
+import translate from 'Utilities/String/translate';
 import CustomFormatsConnector from './CustomFormats/CustomFormatsConnector';
 
 function CustomFormatSettingsPage() {
   return (
-    <PageContent title="Custom Format Settings">
+    <PageContent title={translate('CustomFormatsSettings')}>
       <SettingsToolbarConnector
         // eslint-disable-next-line @typescript-eslint/ban-ts-comment
         // @ts-ignore

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

@@ -61,7 +61,7 @@ class CustomFormats extends Component {
     return (
       <FieldSet legend={translate('CustomFormats')}>
         <PageSectionContent
-          errorMessage={translate('UnableToLoadCustomFormats')}
+          errorMessage={translate('CustomFormatsLoadError')}
           {...otherProps}c={true}
         >
           <div className={styles.customFormats}>

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

@@ -1,5 +1,6 @@
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
+import Alert from 'Components/Alert';
 import Card from 'Components/Card';
 import FieldSet from 'Components/FieldSet';
 import Form from 'Components/Form/Form';
@@ -112,9 +113,9 @@ class EditCustomFormatModalContent extends Component {
 
             {
               !isFetching && !!error &&
-                <div>
-                  {translate('UnableToAddANewCustomFormatPleaseTryAgain')}
-                </div>
+                <Alert kind={kinds.DANGER}>
+                  {translate('AddCustomFormatError')}
+                </Alert>
             }
 
             {

frontend/src/Settings/CustomFormats/CustomFormats/ExportCustomFormatModalContent.js

@@ -43,7 +43,7 @@ class ExportCustomFormatModalContent extends Component {
             {
               !isFetching && !!error &&
                 <Alert kind={kinds.DANGER}>
-                  {translate('UnableToLoadCustomFormats')}
+                  {translate('CustomFormatsLoadError')}
                 </Alert>
             }
 

frontend/src/Settings/CustomFormats/CustomFormats/ImportCustomFormatModalContent.js

@@ -97,7 +97,7 @@ class ImportCustomFormatModalContent extends Component {
             {
               !isFetching && !!error &&
                 <Alert kind={kinds.DANGER}>
-                  {translate('UnableToLoadCustomFormats')}
+                  {translate('CustomFormatsLoadError')}
                 </Alert>
             }
 

frontend/src/Settings/CustomFormats/CustomFormats/ImportCustomFormatModalContentConnector.js

@@ -89,7 +89,9 @@ class ImportCustomFormatModalContentConnector extends Component {
     const selectedImplementation = _.find(this.props.specificationSchema, { implementation: spec.implementation });
 
     if (!selectedImplementation) {
-      throw new Error(translate('CustomFormatUnknownCondition', [spec.implementation]));
+      throw new Error(translate('CustomFormatUnknownCondition', {
+        implementation: spec.implementation
+      }));
     }
 
     this.props.selectCustomFormatSpecificationSchema({ implementation: spec.implementation });
@@ -109,7 +111,10 @@ class ImportCustomFormatModalContentConnector extends Component {
     for (const [key, value] of Object.entries(fields)) {
       const field = _.find(schema.fields, { name: key });
       if (!field) {
-        throw new Error(translate('CustomFormatUnknownConditionOption', [key, schema.implementationName]));
+        throw new Error(translate('CustomFormatUnknownConditionOption', {
+          key,
+          implementation: schema.implementationName
+        }));
       }
 
       this.props.setCustomFormatSpecificationFieldValue({ name: key, value });

frontend/src/Settings/CustomFormats/CustomFormats/Specifications/AddSpecificationModalContent.js

@@ -43,7 +43,7 @@ class AddSpecificationModalContent extends Component {
           {
             !isSchemaFetching && !!schemaError &&
               <div>
-                {translate('UnableToAddANewConditionPleaseTryAgain')}
+                {translate('AddConditionError')}
               </div>
           }
 
@@ -53,10 +53,10 @@ class AddSpecificationModalContent extends Component {
 
                 <Alert kind={kinds.INFO}>
                   <div>
-                    {translate('RadarrSupportsCustomConditionsAgainstTheReleasePropertiesBelow')}
+                    {translate('SupportedCustomConditions')}
                   </div>
                   <div>
-                    {translate('VisitGithubCustomFormatsAphrodite')}
+                    {translate('VisitTheWikiForMoreDetails')}
                     <Link to="https://wiki.servarr.com/radarr/settings#custom-formats-2">{translate('Wiki')}</Link>
                   </div>
                 </Alert>

frontend/src/Settings/CustomFormats/CustomFormats/Specifications/EditSpecificationModalContent.js

@@ -7,8 +7,8 @@ import FormInputGroup from 'Components/Form/FormInputGroup';
 import FormLabel from 'Components/Form/FormLabel';
 import ProviderFieldFormGroup from 'Components/Form/ProviderFieldFormGroup';
 import Button from 'Components/Link/Button';
-import Link from 'Components/Link/Link';
 import SpinnerErrorButton from 'Components/Link/SpinnerErrorButton';
+import InlineMarkdown from 'Components/Markdown/InlineMarkdown';
 import ModalBody from 'Components/Modal/ModalBody';
 import ModalContent from 'Components/Modal/ModalContent';
 import ModalFooter from 'Components/Modal/ModalFooter';
@@ -49,15 +49,16 @@ function EditSpecificationModalContent(props) {
           {...otherProps}
         >
           {
-            fields && fields.some((x) => x.label === 'Regular Expression') &&
+            fields && fields.some((x) => x.label === translate('CustomFormatsSpecificationRegularExpression')) &&
               <Alert kind={kinds.INFO}>
                 <div>
-                  <div dangerouslySetInnerHTML={{ __html: translate('ThisConditionMatchesUsingRegularExpressions', ['<code>\\^$.|?*+()[{</code>', '<code>\\</code>']) }} />
-                  {translate('MoreDetails')} <Link to="https://www.regular-expressions.info/tutorial.html">{translate('LinkHere')}</Link>
+                  <InlineMarkdown data={translate('ConditionUsingRegularExpressions')} />
                 </div>
                 <div>
-                  {translate('RegularExpressionsCanBeTested')}
-                  <Link to="http://regexstorm.net/tester">{translate('LinkHere')}</Link>
+                  <InlineMarkdown data={translate('RegularExpressionsTutorialLink')} />
+                </div>
+                <div>
+                  <InlineMarkdown data={translate('RegularExpressionsCanBeTested')} />
                 </div>
               </Alert>
           }
@@ -99,7 +100,7 @@ function EditSpecificationModalContent(props) {
               type={inputTypes.CHECK}
               name="negate"
               {...negate}
-              helpText={translate('NegateHelpText', [implementationName])}
+              helpText={translate('NegateHelpText', { implementationName })}
               onChange={onInputChange}
             />
           </FormGroup>
@@ -113,7 +114,7 @@ function EditSpecificationModalContent(props) {
               type={inputTypes.CHECK}
               name="required"
               {...required}
-              helpText={translate('RequiredHelpText', [implementationName, implementationName])}
+              helpText={translate('RequiredHelpText', { implementationName })}
               onChange={onInputChange}
             />
           </FormGroup>

frontend/src/Settings/DownloadClients/DownloadClients/AddDownloadClientModalContent.js

@@ -43,9 +43,9 @@ class AddDownloadClientModalContent extends Component {
 
           {
             !isSchemaFetching && !!schemaError &&
-              <div>
-                {translate('UnableToAddANewDownloadClientPleaseTryAgain')}
-              </div>
+              <Alert kind={kinds.DANGER}>
+                {translate('AddDownloadClientError')}
+              </Alert>
           }
 
           {
@@ -54,10 +54,10 @@ class AddDownloadClientModalContent extends Component {
 
                 <Alert kind={kinds.INFO}>
                   <div>
-                    {translate('RadarrSupportsAnyDownloadClient')}
+                    {translate('SupportedDownloadClients')}
                   </div>
                   <div>
-                    {translate('ForMoreInformationOnTheIndividualDownloadClients')}
+                    {translate('SupportedDownloadClientsMoreInfo')}
                   </div>
                 </Alert>
 

frontend/src/Settings/DownloadClients/DownloadClients/EditDownloadClientModalContent.js

@@ -69,9 +69,9 @@ class EditDownloadClientModalContent extends Component {
 
           {
             !isFetching && !!error &&
-              <div>
-                {translate('UnableToAddANewDownloadClientPleaseTryAgain')}
-              </div>
+              <Alert kind={kinds.DANGER}>
+                {translate('AddDownloadClientError')}
+              </Alert>
           }
 
           {
@@ -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}
@@ -147,7 +147,7 @@ class EditDownloadClientModalContent extends Component {
                   <FormInputGroup
                     type={inputTypes.TAG}
                     name="tags"
-                    helpText={translate('DownloadClientTagHelpText')}
+                    helpText={translate('DownloadClientMovieTagHelpText')}
                     {...tags}
                     onChange={onInputChange}
                   />
@@ -184,7 +184,6 @@ class EditDownloadClientModalContent extends Component {
                       </FormGroup>
                   }
                 </FieldSet>
-
               </Form>
           }
         </ModalBody>

frontend/src/Settings/DownloadClients/Options/DownloadClientOptions.js

@@ -30,7 +30,7 @@ function DownloadClientOptions(props) {
       {
         !isFetching && error &&
           <Alert kind={kinds.DANGER}>
-            {translate('UnableToLoadDownloadClientOptions')}
+            {translate('DownloadClientOptionsLoadError')}
           </Alert>
       }
 
@@ -38,6 +38,7 @@ function DownloadClientOptions(props) {
         hasSettings && !isFetching && !error && advancedSettings &&
           <div>
             <FieldSet legend={translate('CompletedDownloadHandling')}>
+
               <Form>
                 <FormGroup
                   advancedSettings={advancedSettings}

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

@@ -1,5 +1,6 @@
 import PropTypes from 'prop-types';
 import React from 'react';
+import Alert from 'Components/Alert';
 import Form from 'Components/Form/Form';
 import FormGroup from 'Components/Form/FormGroup';
 import FormInputGroup from 'Components/Form/FormInputGroup';
@@ -52,9 +53,9 @@ function EditRemotePathMappingModalContent(props) {
 
         {
           !isFetching && !!error &&
-            <div>
-              {translate('UnableToAddANewRemotePathMappingPleaseTryAgain')}
-            </div>
+            <Alert kind={kinds.DANGER}>
+              {translate('AddRemotePathMappingError')}
+            </Alert>
         }
 
         {
@@ -66,7 +67,7 @@ function EditRemotePathMappingModalContent(props) {
                 <FormInputGroup
                   type={inputTypes.SELECT}
                   name="host"
-                  helpText={translate('SettingsRemotePathMappingHostHelpText')}
+                  helpText={translate('RemotePathMappingHostHelpText')}
                   {...host}
                   values={downloadClientHosts}
                   onChange={onInputChange}
@@ -74,24 +75,24 @@ function EditRemotePathMappingModalContent(props) {
               </FormGroup>
 
               <FormGroup>
-                <FormLabel>{translate('SettingsRemotePathMappingRemotePath')}</FormLabel>
+                <FormLabel>{translate('RemotePath')}</FormLabel>
 
                 <FormInputGroup
                   type={inputTypes.TEXT}
                   name="remotePath"
-                  helpText={translate('SettingsRemotePathMappingRemotePathHelpText')}
+                  helpText={translate('RemotePathMappingRemotePathHelpText')}
                   {...remotePath}
                   onChange={onInputChange}
                 />
               </FormGroup>
 
               <FormGroup>
-                <FormLabel>{translate('SettingsRemotePathMappingLocalPath')}</FormLabel>
+                <FormLabel>{translate('LocalPath')}</FormLabel>
 
                 <FormInputGroup
                   type={inputTypes.PATH}
                   name="localPath"
-                  helpText={translate('SettingsRemotePathMappingLocalPathHelpText')}
+                  helpText={translate('RemotePathMappingLocalPathHelpText')}
                   {...localPath}
                   onChange={onInputChange}
                 />

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

@@ -49,12 +49,12 @@ class RemotePathMappings extends Component {
     return (
       <FieldSet legend={translate('RemotePathMappings')}>
         <PageSectionContent
-          errorMessage={translate('UnableToLoadRemotePathMappings')}
+          errorMessage={translate('RemotePathMappingsLoadError')}
           {...otherProps}
         >
 
           <Alert kind={kinds.INFO}>
-            <InlineMarkdown data={translate('RemotePathMappingsInfo', { app: 'Radarr', wikiLink: 'https://wiki.servarr.com/radarr/settings#remote-path-mappings' })} />
+            <InlineMarkdown data={translate('RemotePathMappingsInfo', { wikiLink: 'https://wiki.servarr.com/radarr/settings#remote-path-mappings' })} />
           </Alert>
 
           <div className={styles.remotePathMappingsHeader}>

frontend/src/Settings/General/GeneralSettings.js

@@ -22,6 +22,7 @@ const requiresRestartKeys = [
   'bindAddress',
   'port',
   'urlBase',
+  'instanceName',
   'enableSsl',
   'sslPort',
   'sslCertPath',
@@ -125,7 +126,7 @@ class GeneralSettings extends Component {
           {
             !isFetching && error &&
               <Alert kind={kinds.DANGER}>
-                {translate('UnableToLoadGeneralSettings')}
+                {translate('GeneralSettingsLoadError')}
               </Alert>
           }
 
@@ -186,10 +187,8 @@ class GeneralSettings extends Component {
           isOpen={this.state.isRestartRequiredModalOpen}
           kind={kinds.DANGER}
           title={translate('RestartRadarr')}
-          message={
-            `Radarr requires a restart to apply changes, do you want to restart now? ${isWindowsService ? 'Depending which user is running the Radarr service you may need to restart Radarr as admin once before the service will start automatically.' : ''}`
-          }
-          cancelLabel={translate('IllRestartLater')}
+          message={`${translate('RestartRequiredToApplyChanges')} ${isWindowsService ? translate('RestartRequiredWindowsService') : ''}`}
+          cancelLabel={translate('RestartLater')}
           confirmLabel={translate('RestartNow')}
           onConfirm={this.onConfirmRestart}
           onCancel={this.onCloseRestartRequiredModalOpen}

frontend/src/Settings/General/HostSettings.js

@@ -63,7 +63,7 @@ function HostSettings(props) {
       </FormGroup>
 
       <FormGroup>
-        <FormLabel>{translate('URLBase')}</FormLabel>
+        <FormLabel>{translate('UrlBase')}</FormLabel>
 
         <FormInputGroup
           type={inputTypes.TEXT}
@@ -111,7 +111,7 @@ function HostSettings(props) {
         isAdvanced={true}
         size={sizes.MEDIUM}
       >
-        <FormLabel>{translate('EnableSSL')}</FormLabel>
+        <FormLabel>{translate('EnableSsl')}</FormLabel>
 
         <FormInputGroup
           type={inputTypes.CHECK}
@@ -128,7 +128,7 @@ function HostSettings(props) {
             advancedSettings={advancedSettings}
             isAdvanced={true}
           >
-            <FormLabel>{translate('SSLPort')}</FormLabel>
+            <FormLabel>{translate('SslPort')}</FormLabel>
 
             <FormInputGroup
               type={inputTypes.NUMBER}
@@ -149,12 +149,12 @@ function HostSettings(props) {
             advancedSettings={advancedSettings}
             isAdvanced={true}
           >
-            <FormLabel>{translate('SSLCertPath')}</FormLabel>
+            <FormLabel>{translate('SslCertPath')}</FormLabel>
 
             <FormInputGroup
               type={inputTypes.TEXT}
               name="sslCertPath"
-              helpText={translate('SSLCertPathHelpText')}
+              helpText={translate('SslCertPathHelpText')}
               helpTextWarning={translate('RestartRequiredHelpTextWarning')}
               onChange={onInputChange}
               {...sslCertPath}
@@ -169,12 +169,12 @@ function HostSettings(props) {
             advancedSettings={advancedSettings}
             isAdvanced={true}
           >
-            <FormLabel>{translate('SSLCertPassword')}</FormLabel>
+            <FormLabel>{translate('SslCertPassword')}</FormLabel>
 
             <FormInputGroup
               type={inputTypes.PASSWORD}
               name="sslCertPassword"
-              helpText={translate('SSLCertPasswordHelpText')}
+              helpText={translate('SslCertPasswordHelpText')}
               helpTextWarning={translate('RestartRequiredHelpTextWarning')}
               onChange={onInputChange}
               {...sslCertPassword}
@@ -184,18 +184,19 @@ function HostSettings(props) {
       }
 
       {
-        isWindows && mode !== 'service' &&
+        isWindows && mode !== 'service' ?
           <FormGroup size={sizes.MEDIUM}>
             <FormLabel>{translate('OpenBrowserOnStart')}</FormLabel>
 
             <FormInputGroup
               type={inputTypes.CHECK}
               name="launchBrowser"
-              helpText={translate('LaunchBrowserHelpText')}
+              helpText={translate('OpenBrowserOnStartHelpText')}
               onChange={onInputChange}
               {...launchBrowser}
             />
-          </FormGroup>
+          </FormGroup> :
+          null
       }
 
     </FieldSet>

frontend/src/Settings/General/ProxySettings.js

@@ -25,9 +25,18 @@ function ProxySettings(props) {
   } = settings;
 
   const proxyTypeOptions = [
-    { key: 'http', value: translate('HttpHttps') },
-    { key: 'socks4', value: translate('Socks4') },
-    { key: 'socks5', value: translate('Socks5') }
+    {
+      key: 'http',
+      value: translate('HttpHttps')
+    },
+    {
+      key: 'socks4',
+      value: translate('Socks4')
+    },
+    {
+      key: 'socks5',
+      value: translate('Socks5')
+    }
   ];
 
   return (

frontend/src/Settings/General/UpdateSettings.js

@@ -70,7 +70,8 @@ function UpdateSettings(props) {
       </FormGroup>
 
       {
-        !isWindows &&
+        isWindows ?
+          null :
           <div>
             <FormGroup
               advancedSettings={advancedSettings}

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

@@ -1,5 +1,6 @@
 import PropTypes from 'prop-types';
 import React from 'react';
+import Alert from 'Components/Alert';
 import Form from 'Components/Form/Form';
 import FormGroup from 'Components/Form/FormGroup';
 import FormInputGroup from 'Components/Form/FormInputGroup';
@@ -39,7 +40,7 @@ function EditImportListExclusionModalContent(props) {
   return (
     <ModalContent onModalClose={onModalClose}>
       <ModalHeader>
-        {id ? translate('EditListExclusion') : translate('AddListExclusion')}
+        {id ? translate('EditImportListExclusion') : translate('AddImportListExclusion')}
       </ModalHeader>
 
       <ModalBody className={styles.body}>
@@ -50,9 +51,9 @@ function EditImportListExclusionModalContent(props) {
 
         {
           !isFetching && !!error &&
-            <div>
-              {translate('UnableToAddANewListExclusionPleaseTryAgain')}
-            </div>
+            <Alert kind={kinds.DANGER}>
+              {translate('AddImportListExclusionError')}
+            </Alert>
         }
 
         {

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

@@ -10,7 +10,7 @@
 .movieTitle {
   @add-mixin truncate;
 
-  flex: 0 0 600px;
+  flex: 0 1 600px;
 }
 
 .tmdbId,

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

@@ -67,7 +67,7 @@ class ImportListExclusion extends Component {
         )}
       >
         <div className={styles.tmdbId}>{tmdbId}</div>
-        <div className={styles.movieTitle}>{movieTitle}</div>
+        <div className={styles.movieTitle} title={movieTitle}>{movieTitle}</div>
         <div className={styles.movieYear}>{movieYear}</div>
 
         <div className={styles.actions}>

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

@@ -5,7 +5,7 @@
 }
 
 .title {
-  flex: 0 0 600px;
+  flex: 0 1 600px;
 }
 
 .tmdbId,

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

@@ -45,14 +45,14 @@ class ImportListExclusions extends Component {
     } = this.props;
 
     return (
-      <FieldSet legend={translate('ListExclusions')}>
+      <FieldSet legend={translate('ImportListExclusions')}>
         <PageSectionContent
-          errorMessage={translate('UnableToLoadListExclusions')}
+          errorMessage={translate('ImportListExclusionsLoadError')}
           {...otherProps}
         >
           <div className={styles.importListExclusionsHeader}>
             <div className={styles.tmdbId}>
-              TMDb Id
+              {translate('TMDBId')}
             </div>
             <div className={styles.title}>
               {translate('Title')}

frontend/src/Settings/ImportLists/ImportListSettings.js

@@ -70,7 +70,7 @@ class ImportListSettings extends Component {
     } = this.state;
 
     return (
-      <PageContent title={translate('ListSettings')}>
+      <PageContent title={translate('ImportListSettings')}>
         <SettingsToolbarConnector
           isSaving={isSaving}
           hasPendingChanges={hasPendingChanges}

frontend/src/Settings/ImportLists/ImportLists/AddImportListModalContent.js

@@ -37,42 +37,46 @@ class AddImportListModalContent extends Component {
 
         <ModalBody>
           {
-            isSchemaFetching &&
-              <LoadingIndicator />
+            isSchemaFetching ?
+              <LoadingIndicator /> :
+              null
           }
 
           {
-            !isSchemaFetching && !!schemaError &&
-              <div>
-                {translate('UnableToAddANewListPleaseTryAgain')}
-              </div>
+            !isSchemaFetching && !!schemaError ?
+              <Alert kind={kinds.DANGER}>
+                {translate('AddListError')}
+              </Alert> :
+              null
           }
 
           {
-            isSchemaPopulated && !schemaError &&
+            isSchemaPopulated && !schemaError ?
               <div>
 
                 <Alert kind={kinds.INFO}>
                   <div>
-                    {translate('RadarrSupportsAnyRSSMovieListsAsWellAsTheOneStatedBelow')}
+                    {translate('SupportedListsMovie')}
                   </div>
                   <div>
-                    {translate('ForMoreInformationOnTheIndividualImportListsClinkOnTheInfoButtons')}
+                    {translate('SupportedListsMoreInfo')}
                   </div>
                 </Alert>
-
                 {
                   Object.keys(listGroups).map((key) => {
                     return (
-                      <FieldSet legend={`${titleCase(key)} List`} key={key}>
+                      <FieldSet key={key} legend={translate('TypeOfList', {
+                        typeOfList: titleCase(key)
+                      })}
+                      >
                         <div className={styles.importLists}>
                           {
-                            listGroups[key].map((importList) => {
+                            listGroups[key].map((list) => {
                               return (
                                 <AddImportListItem
-                                  key={importList.implementation}
-                                  implementation={importList.implementation}
-                                  {...importList}
+                                  key={list.implementation}
+                                  implementation={list.implementation}
+                                  {...list}
                                   onImportListSelect={onImportListSelect}
                                 />
                               );
@@ -83,7 +87,8 @@ class AddImportListModalContent extends Component {
                     );
                   })
                 }
-              </div>
+              </div> :
+              null
           }
         </ModalBody>
         <ModalFooter>

frontend/src/Settings/ImportLists/ImportLists/EditImportListModalContent.js

@@ -67,10 +67,11 @@ function EditImportListModalContent(props) {
         }
 
         {
-          !isFetching && (!!error || !!rootFolderError) &&
-            <div>
-              {translate('UnableToAddANewListPleaseTryAgain')}
-            </div>
+          !isFetching && (!!error || !!rootFolderError) ?
+            <Alert kind={kinds.DANGER}>
+              {translate('AddListError')}
+            </Alert> :
+            null
         }
 
         {
@@ -92,7 +93,9 @@ function EditImportListModalContent(props) {
                 kind={kinds.INFO}
                 className={styles.message}
               >
-                {translate('ListWillRefreshEveryInterp', [formatShortTimeSpan(minRefreshInterval.value)])}
+                {translate('ListWillRefreshEveryInterval', {
+                  refreshInterval: formatShortTimeSpan(minRefreshInterval.value)
+                })}
               </Alert>
 
               <FormGroup>
@@ -112,7 +115,7 @@ function EditImportListModalContent(props) {
                 <FormInputGroup
                   type={inputTypes.CHECK}
                   name="enabled"
-                  helpText={translate('EnabledHelpText')}
+                  helpText={translate('ListEnabledHelpText')}
                   {...enabled}
                   onChange={onInputChange}
                 />
@@ -124,7 +127,7 @@ function EditImportListModalContent(props) {
                 <FormInputGroup
                   type={inputTypes.CHECK}
                   name="enableAuto"
-                  helpText={translate('EnableAutoHelpText')}
+                  helpText={translate('EnableAutomaticAddMovieHelpText')}
                   {...enableAuto}
                   onChange={onInputChange}
                 />
@@ -136,7 +139,7 @@ function EditImportListModalContent(props) {
                 <FormInputGroup
                   type={inputTypes.MOVIE_MONITORED_SELECT}
                   name="monitor"
-                  helpText={translate('ShouldMonitorHelpText')}
+                  helpText={translate('ListMonitorMovieHelpText')}
                   {...monitor}
                   onChange={onInputChange}
                 />
@@ -148,7 +151,7 @@ function EditImportListModalContent(props) {
                 <FormInputGroup
                   type={inputTypes.CHECK}
                   name="searchOnAdd"
-                  helpText={translate('SearchOnAddHelpText')}
+                  helpText={translate('ListSearchOnAddMovieHelpText')}
                   {...searchOnAdd}
                   onChange={onInputChange}
                 />
@@ -170,6 +173,7 @@ function EditImportListModalContent(props) {
                 <FormInputGroup
                   type={inputTypes.QUALITY_PROFILE_SELECT}
                   name="qualityProfileId"
+                  helpText={translate('ListQualityProfileHelpText')}
                   {...qualityProfileId}
                   onChange={onInputChange}
                 />
@@ -181,6 +185,7 @@ function EditImportListModalContent(props) {
                 <FormInputGroup
                   type={inputTypes.ROOT_FOLDER_SELECT}
                   name="rootFolderPath"
+                  helpText={translate('ListRootFolderHelpText')}
                   {...rootFolderPath}
                   includeMissingValue={true}
                   onChange={onInputChange}