Multiple Translations updated by Weblate

ignore-downstream

Co-authored-by: Dream <seth.gecko.rr@gmail.com>
Translate-URL: https://translate.servarr.com/projects/servarr/radarr/ru/
Translation: Servarr/Radarr

.devcontainer/Radarr.code-workspace

@@ -0,0 +1,13 @@
+// This file is used to open the backend and frontend in the same workspace, which is necessary as
+// the frontend has vscode settings that are distinct from the backend
+{
+  "folders": [
+    {
+      "path": ".."
+    },
+    {
+      "path": "../frontend"
+    }
+  ],
+  "settings": {}
+}

.devcontainer/devcontainer.json

@@ -0,0 +1,19 @@
+// For format details, see https://aka.ms/devcontainer.json. For config options, see the
+// README at: https://github.com/devcontainers/templates/tree/main/src/dotnet
+{
+  "name": "Radarr",
+  "image": "mcr.microsoft.com/devcontainers/dotnet:1-6.0",
+  "features": {
+    "ghcr.io/devcontainers/features/node:1": {
+      "nodeGypDependencies": true,
+      "version": "16",
+      "nvmVersion": "latest"
+    }
+  },
+  "forwardPorts": [7878],
+  "customizations": {
+    "vscode": {
+      "extensions": ["esbenp.prettier-vscode"]
+    }
+  }
+}

.github/dependabot.yml

@@ -0,0 +1,12 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for more information:
+# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+# https://containers.dev/guide/dependabot
+
+version: 2
+updates:
+ - package-ecosystem: "devcontainers"
+   directory: "/"
+   schedule:
+     interval: weekly

.gitignore

@@ -126,6 +126,7 @@ coverage*.xml
 coverage*.json
 setup/Output/
 *.~is
+.mono
 
 # VS outout folders
 bin

.vscode/extensions.json

@@ -0,0 +1,7 @@
+{
+  "recommendations": [
+    "esbenp.prettier-vscode",
+    "ms-dotnettools.csdevkit",
+    "ms-vscode-remote.remote-containers"
+  ]
+}

.vscode/launch.json

@@ -0,0 +1,26 @@
+{
+  "version": "0.2.0",
+  "configurations": [
+    {
+      // Use IntelliSense to find out which attributes exist for C# debugging
+      // Use hover for the description of the existing attributes
+      // For further information visit https://github.com/dotnet/vscode-csharp/blob/main/debugger-launchjson.md
+      "name": "Run Radarr",
+      "type": "coreclr",
+      "request": "launch",
+      "preLaunchTask": "build dotnet",
+      // If you have changed target frameworks, make sure to update the program path.
+      "program": "${workspaceFolder}/_output/net6.0/Radarr",
+      "args": [],
+      "cwd": "${workspaceFolder}",
+      // For more information about the 'console' field, see https://aka.ms/VSCode-CS-LaunchJson-Console
+      "console": "integratedTerminal",
+      "stopAtEntry": false
+    },
+    {
+      "name": ".NET Core Attach",
+      "type": "coreclr",
+      "request": "attach"
+    }
+  ]
+}

.vscode/tasks.json

@@ -0,0 +1,44 @@
+{
+  "version": "2.0.0",
+  "tasks": [
+    {
+      "label": "build dotnet",
+      "command": "dotnet",
+      "type": "process",
+      "args": [
+        "msbuild",
+        "-restore",
+        "${workspaceFolder}/src/Radarr.sln",
+        "-p:GenerateFullPaths=true",
+        "-p:Configuration=Debug",
+        "-p:Platform=Posix",
+        "-consoleloggerparameters:NoSummary;ForceNoAlign"
+      ],
+      "problemMatcher": "$msCompile"
+    },
+    {
+      "label": "publish",
+      "command": "dotnet",
+      "type": "process",
+      "args": [
+        "publish",
+        "${workspaceFolder}/src/Radarr.sln",
+        "-property:GenerateFullPaths=true",
+        "-consoleloggerparameters:NoSummary;ForceNoAlign"
+      ],
+      "problemMatcher": "$msCompile"
+    },
+    {
+      "label": "watch",
+      "command": "dotnet",
+      "type": "process",
+      "args": [
+        "watch",
+        "run",
+        "--project",
+        "${workspaceFolder}/src/Radarr.sln"
+      ],
+      "problemMatcher": "$msCompile"
+    }
+  ]
+}

azure-pipelines.yml

@@ -9,18 +9,18 @@ variables:
   testsFolder: './_tests'
   yarnCacheFolder: $(Pipeline.Workspace)/.yarn
   nugetCacheFolder: $(Pipeline.Workspace)/.nuget/packages
-  majorVersion: '5.4.3'
+  majorVersion: '5.8.3'
   minorVersion: $[counter('minorVersion', 2000)]
   radarrVersion: '$(majorVersion).$(minorVersion)'
   buildName: '$(Build.SourceBranchName).$(radarrVersion)'
   sentryOrg: 'servarr'
   sentryUrl: 'https://sentry.servarr.com'
-  dotnetVersion: '6.0.417'
+  dotnetVersion: '6.0.424'
   nodeVersion: '20.X'
   innoVersion: '6.2.2'
   windowsImage: 'windows-2022'
   linuxImage: 'ubuntu-20.04'
-  macImage: 'macOS-11'
+  macImage: 'macOS-12'
 
 trigger:
   branches:
@@ -166,10 +166,10 @@ stages:
       pool:
         vmImage: $(imageName)
       steps:
-      - task: NodeTool@0
+      - task: UseNode@1
         displayName: Set Node.js version
         inputs:
-          versionSpec: $(nodeVersion)
+          version: $(nodeVersion)
       - checkout: self
         submodules: true
         fetchDepth: 1
@@ -1089,10 +1089,10 @@ stages:
       pool:
         vmImage: $(imageName)
       steps:
-      - task: NodeTool@0
+      - task: UseNode@1
         displayName: Set Node.js version
         inputs:
-          versionSpec: $(nodeVersion)
+          version: $(nodeVersion)
       - checkout: self
         submodules: true
         fetchDepth: 1
@@ -1116,7 +1116,7 @@ stages:
         vmImage: ${{ variables.windowsImage }}
       steps:
       - checkout: self # Need history for Sonar analysis
-      - task: SonarCloudPrepare@1
+      - task: SonarCloudPrepare@2
         env:
           SONAR_SCANNER_OPTS: ''
         inputs:
@@ -1128,7 +1128,7 @@ stages:
           cliProjectName: 'RadarrUI'
           cliProjectVersion: '$(radarrVersion)'
           cliSources: './frontend'
-      - task: SonarCloudAnalyze@1
+      - task: SonarCloudAnalyze@2
       
     - job: Api_Docs
       displayName: API Docs
@@ -1205,7 +1205,7 @@ stages:
         submodules: true
       - powershell: Set-Service SCardSvr -StartupType Manual
         displayName: Enable Windows Test Service
-      - task: SonarCloudPrepare@1
+      - task: SonarCloudPrepare@2
         condition: eq(variables['System.PullRequest.IsFork'], 'False')
         inputs:
           SonarCloud: 'SonarCloud'
@@ -1223,21 +1223,16 @@ stages:
           ./build.sh --backend -f net6.0 -r win-x64
           TEST_DIR=_tests/net6.0/win-x64/publish/ ./test.sh Windows Unit Coverage
         displayName: Coverage Unit Tests
-      - task: SonarCloudAnalyze@1
+      - task: SonarCloudAnalyze@2
         condition: eq(variables['System.PullRequest.IsFork'], 'False')
         displayName: Publish SonarCloud Results
-      - task: reportgenerator@4
+      - task: reportgenerator@5
         displayName: Generate Coverage Report
         inputs:
           reports: '$(Build.SourcesDirectory)/CoverageResults/**/coverage.opencover.xml'
           targetdir: '$(Build.SourcesDirectory)/CoverageResults/combined'
           reporttypes: 'HtmlInline_AzurePipelines;Cobertura;Badges'
-      - task: PublishCodeCoverageResults@1
+          publishCodeCoverageResults: true
-        displayName: Publish Coverage Report
-        inputs:
-          codeCoverageTool: 'cobertura'
-          summaryFileLocation: './CoverageResults/combined/Cobertura.xml'
-          reportDirectory: './CoverageResults/combined/'
 
   - stage: Report_Out
     dependsOn:

docs.sh

@@ -21,15 +21,21 @@ slnFile=src/Radarr.sln
 
 platform=Posix
 
+if [ "$PLATFORM" = "Windows" ]; then
+  application=Radarr.Console.dll
+else
+  application=Radarr.dll
+fi
+
 dotnet clean $slnFile -c Debug
 dotnet clean $slnFile -c Release
 
 dotnet msbuild -restore $slnFile -p:Configuration=Debug -p:Platform=$platform -p:RuntimeIdentifiers=$RUNTIME -t:PublishAllRids
 
 dotnet new tool-manifest
-dotnet tool install --version 6.5.0 Swashbuckle.AspNetCore.Cli
+dotnet tool install --version 6.6.2 Swashbuckle.AspNetCore.Cli
 
-dotnet tool run swagger tofile --output ./src/Radarr.Api.V3/openapi.json "$outputFolder/net6.0/$RUNTIME/radarr.console.dll" v3 &
+dotnet tool run swagger tofile --output ./src/Radarr.Api.V3/openapi.json "$outputFolder/net6.0/$RUNTIME/$application" v3 &
 
 sleep 45
 

frontend/src/Activity/Blocklist/Blocklist.js

@@ -2,6 +2,7 @@ import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import Alert from 'Components/Alert';
 import LoadingIndicator from 'Components/Loading/LoadingIndicator';
+import FilterMenu from 'Components/Menu/FilterMenu';
 import ConfirmModal from 'Components/Modal/ConfirmModal';
 import PageContent from 'Components/Page/PageContent';
 import PageContentBody from 'Components/Page/PageContentBody';
@@ -20,6 +21,7 @@ import getSelectedIds from 'Utilities/Table/getSelectedIds';
 import removeOldSelectedState from 'Utilities/Table/removeOldSelectedState';
 import selectAll from 'Utilities/Table/selectAll';
 import toggleSelected from 'Utilities/Table/toggleSelected';
+import BlocklistFilterModal from './BlocklistFilterModal';
 import BlocklistRowConnector from './BlocklistRowConnector';
 
 class Blocklist extends Component {
@@ -114,9 +116,13 @@ class Blocklist extends Component {
       error,
       items,
       columns,
+      selectedFilterKey,
+      filters,
+      customFilters,
       totalRecords,
       isRemoving,
       isClearingBlocklistExecuting,
+      onFilterSelect,
       ...otherProps
     } = this.props;
 
@@ -161,6 +167,15 @@ class Blocklist extends Component {
                 iconName={icons.TABLE}
               />
             </TableOptionsModalWrapper>
+
+            <FilterMenu
+              alignMenu={align.RIGHT}
+              selectedFilterKey={selectedFilterKey}
+              filters={filters}
+              customFilters={customFilters}
+              filterModalConnectorComponent={BlocklistFilterModal}
+              onFilterSelect={onFilterSelect}
+            />
           </PageToolbarSection>
         </PageToolbar>
 
@@ -180,7 +195,11 @@ class Blocklist extends Component {
           {
             isPopulated && !error && !items.length &&
               <Alert kind={kinds.INFO}>
-                {translate('NoHistoryBlocklist')}
+                {
+                  selectedFilterKey === 'all' ?
+                    translate('NoHistoryBlocklist') :
+                    translate('BlocklistFilterHasNoItems')
+                }
               </Alert>
           }
 
@@ -251,11 +270,15 @@ Blocklist.propTypes = {
   error: PropTypes.object,
   items: PropTypes.arrayOf(PropTypes.object).isRequired,
   columns: PropTypes.arrayOf(PropTypes.object).isRequired,
+  selectedFilterKey: PropTypes.oneOfType([PropTypes.string, PropTypes.number]).isRequired,
+  filters: PropTypes.arrayOf(PropTypes.object).isRequired,
+  customFilters: PropTypes.arrayOf(PropTypes.object).isRequired,
   totalRecords: PropTypes.number,
   isRemoving: PropTypes.bool.isRequired,
   isClearingBlocklistExecuting: PropTypes.bool.isRequired,
   onRemoveSelected: PropTypes.func.isRequired,
-  onClearBlocklistPress: PropTypes.func.isRequired
+  onClearBlocklistPress: PropTypes.func.isRequired,
+  onFilterSelect: PropTypes.func.isRequired
 };
 
 export default Blocklist;

frontend/src/Activity/Blocklist/BlocklistConnector.js

@@ -6,6 +6,7 @@ import * as commandNames from 'Commands/commandNames';
 import withCurrentPage from 'Components/withCurrentPage';
 import * as blocklistActions from 'Store/Actions/blocklistActions';
 import { executeCommand } from 'Store/Actions/commandActions';
+import { createCustomFiltersSelector } from 'Store/Selectors/createClientSideCollectionSelector';
 import createCommandExecutingSelector from 'Store/Selectors/createCommandExecutingSelector';
 import { registerPagePopulator, unregisterPagePopulator } from 'Utilities/pagePopulator';
 import Blocklist from './Blocklist';
@@ -13,10 +14,12 @@ import Blocklist from './Blocklist';
 function createMapStateToProps() {
   return createSelector(
     (state) => state.blocklist,
+    createCustomFiltersSelector('blocklist'),
     createCommandExecutingSelector(commandNames.CLEAR_BLOCKLIST),
-    (blocklist, isClearingBlocklistExecuting) => {
+    (blocklist, customFilters, isClearingBlocklistExecuting) => {
       return {
         isClearingBlocklistExecuting,
+        customFilters,
         ...blocklist
       };
     }
@@ -97,6 +100,14 @@ class BlocklistConnector extends Component {
     this.props.setBlocklistSort({ sortKey });
   };
 
+  onFilterSelect = (selectedFilterKey) => {
+    this.props.setBlocklistFilter({ selectedFilterKey });
+  };
+
+  onClearBlocklistPress = () => {
+    this.props.executeCommand({ name: commandNames.CLEAR_BLOCKLIST });
+  };
+
   onTableOptionChange = (payload) => {
     this.props.setBlocklistTableOption(payload);
 
@@ -105,10 +116,6 @@ class BlocklistConnector extends Component {
     }
   };
 
-  onClearBlocklistPress = () => {
-    this.props.executeCommand({ name: commandNames.CLEAR_BLOCKLIST });
-  };
-
   //
   // Render
 
@@ -122,6 +129,7 @@ class BlocklistConnector extends Component {
         onPageSelect={this.onPageSelect}
         onRemoveSelected={this.onRemoveSelected}
         onSortPress={this.onSortPress}
+        onFilterSelect={this.onFilterSelect}
         onTableOptionChange={this.onTableOptionChange}
         onClearBlocklistPress={this.onClearBlocklistPress}
         {...this.props}
@@ -142,6 +150,7 @@ BlocklistConnector.propTypes = {
   gotoBlocklistPage: PropTypes.func.isRequired,
   removeBlocklistItems: PropTypes.func.isRequired,
   setBlocklistSort: PropTypes.func.isRequired,
+  setBlocklistFilter: PropTypes.func.isRequired,
   setBlocklistTableOption: PropTypes.func.isRequired,
   clearBlocklist: PropTypes.func.isRequired,
   executeCommand: PropTypes.func.isRequired

frontend/src/Activity/Blocklist/BlocklistFilterModal.tsx

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

frontend/src/Activity/Queue/Queue.js

@@ -219,6 +219,7 @@ class Queue extends Component {
           >
             <TableOptionsModalWrapper
               columns={columns}
+              maxPageSize={200}
               {...otherProps}
               optionsComponent={QueueOptionsConnector}
             >

frontend/src/Activity/Queue/QueueStatus.js

@@ -70,6 +70,11 @@ function QueueStatus(props) {
     iconName = icons.DOWNLOADED;
     title = translate('Downloaded');
 
+    if (trackedDownloadState === 'importBlocked') {
+      title += ` - ${translate('UnableToImportAutomatically')}`;
+      iconKind = kinds.WARNING;
+    }
+
     if (trackedDownloadState === 'importPending') {
       title += ` - ${translate('WaitingToImport')}`;
       iconKind = kinds.PURPLE;

frontend/src/Activity/Queue/RemoveQueueItemModal.tsx

@@ -118,6 +118,7 @@ function RemoveQueueItemModal(props: RemoveQueueItemModalProps) {
       {
         key: 'blocklistAndSearch',
         value: translate('BlocklistAndSearch'),
+        isDisabled: isPending,
         hint: multipleSelected
           ? translate('BlocklistAndSearchMultipleHint')
           : translate('BlocklistAndSearchHint'),
@@ -130,7 +131,7 @@ function RemoveQueueItemModal(props: RemoveQueueItemModalProps) {
           : translate('BlocklistOnlyHint'),
       },
     ];
-  }, [multipleSelected]);
+  }, [isPending, multipleSelected]);
 
   const handleRemovalMethodChange = useCallback(
     ({ value }: { value: RemovalMethod }) => {

frontend/src/App/App.js

@@ -12,11 +12,10 @@ function App({ store, history }) {
     <DocumentTitle title={window.Radarr.instanceName}>
       <Provider store={store}>
         <ConnectedRouter history={history}>
-          <ApplyTheme>
+          <ApplyTheme />
-            <PageConnector>
+          <PageConnector>
-              <AppRoutes app={App} />
+            <AppRoutes app={App} />
-            </PageConnector>
+          </PageConnector>
-          </ApplyTheme>
         </ConnectedRouter>
       </Provider>
     </DocumentTitle>

frontend/src/App/AppRoutes.js

@@ -33,6 +33,8 @@ import Status from 'System/Status/Status';
 import Tasks from 'System/Tasks/Tasks';
 import UpdatesConnector from 'System/Updates/UpdatesConnector';
 import getPathWithUrlBase from 'Utilities/getPathWithUrlBase';
+import CutoffUnmetConnector from 'Wanted/CutoffUnmet/CutoffUnmetConnector';
+import MissingConnector from 'Wanted/Missing/MissingConnector';
 
 function AppRoutes(props) {
   const {
@@ -121,6 +123,20 @@ function AppRoutes(props) {
         component={BlocklistConnector}
       />
 
+      {/*
+        Wanted
+      */}
+
+      <Route
+        path="/wanted/missing"
+        component={MissingConnector}
+      />
+
+      <Route
+        path="/wanted/cutoffunmet"
+        component={CutoffUnmetConnector}
+      />
+
       {/*
         Settings
       */}

frontend/src/App/ApplyTheme.js

@@ -1,49 +0,0 @@
-import PropTypes from 'prop-types';
-import React, { Fragment, useCallback, useEffect } from 'react';
-import { connect } from 'react-redux';
-import { createSelector } from 'reselect';
-import themes from 'Styles/Themes';
-
-function createMapStateToProps() {
-  return createSelector(
-    (state) => state.settings.ui.item.theme || window.Radarr.theme,
-    (
-      theme
-    ) => {
-      return {
-        theme
-      };
-    }
-  );
-}
-
-function ApplyTheme({ theme, children }) {
-  // Update the CSS Variables
-  const updateCSSVariables = useCallback(() => {
-    const arrayOfVariableKeys = Object.keys(themes[theme]);
-    const arrayOfVariableValues = Object.values(themes[theme]);
-
-    // Loop through each array key and set the CSS Variables
-    arrayOfVariableKeys.forEach((cssVariableKey, index) => {
-      // Based on our snippet from MDN
-      document.documentElement.style.setProperty(
-        `--${cssVariableKey}`,
-        arrayOfVariableValues[index]
-      );
-    });
-  }, [theme]);
-
-  // On Component Mount and Component Update
-  useEffect(() => {
-    updateCSSVariables(theme);
-  }, [updateCSSVariables, theme]);
-
-  return <Fragment>{children}</Fragment>;
-}
-
-ApplyTheme.propTypes = {
-  theme: PropTypes.string.isRequired,
-  children: PropTypes.object.isRequired
-};
-
-export default connect(createMapStateToProps)(ApplyTheme);

frontend/src/App/ApplyTheme.tsx

@@ -0,0 +1,37 @@
+import React, { Fragment, ReactNode, useCallback, useEffect } from 'react';
+import { useSelector } from 'react-redux';
+import { createSelector } from 'reselect';
+import themes from 'Styles/Themes';
+import AppState from './State/AppState';
+
+interface ApplyThemeProps {
+  children: ReactNode;
+}
+
+function createThemeSelector() {
+  return createSelector(
+    (state: AppState) => state.settings.ui.item.theme || window.Radarr.theme,
+    (theme) => {
+      return theme;
+    }
+  );
+}
+
+function ApplyTheme({ children }: ApplyThemeProps) {
+  const theme = useSelector(createThemeSelector());
+
+  const updateCSSVariables = useCallback(() => {
+    Object.entries(themes[theme]).forEach(([key, value]) => {
+      document.documentElement.style.setProperty(`--${key}`, value);
+    });
+  }, [theme]);
+
+  // On Component Mount and Component Update
+  useEffect(() => {
+    updateCSSVariables();
+  }, [updateCSSVariables, theme]);
+
+  return <Fragment>{children}</Fragment>;
+}
+
+export default ApplyTheme;

frontend/src/App/State/AppState.ts

@@ -1,4 +1,5 @@
 import InteractiveImportAppState from 'App/State/InteractiveImportAppState';
+import BlocklistAppState from './BlocklistAppState';
 import CalendarAppState from './CalendarAppState';
 import CommandAppState from './CommandAppState';
 import HistoryAppState from './HistoryAppState';
@@ -54,6 +55,7 @@ export interface AppSectionState {
 
 interface AppState {
   app: AppSectionState;
+  blocklist: BlocklistAppState;
   calendar: CalendarAppState;
   commands: CommandAppState;
   history: HistoryAppState;

frontend/src/App/State/BlocklistAppState.ts

@@ -0,0 +1,8 @@
+import Blocklist from 'typings/Blocklist';
+import AppSectionState, { AppSectionFilterState } from './AppSectionState';
+
+interface BlocklistAppState
+  extends AppSectionState<Blocklist>,
+    AppSectionFilterState<Blocklist> {}
+
+export default BlocklistAppState;

frontend/src/App/State/MoviesAppState.ts

@@ -25,6 +25,7 @@ export interface MovieIndexAppState {
     showTmdbRating: boolean;
     showImdbRating: boolean;
     showRottenTomatoesRating: boolean;
+    showTags: boolean;
     showSearchAction: boolean;
   };
 
@@ -37,6 +38,7 @@ export interface MovieIndexAppState {
     showAdded: boolean;
     showPath: boolean;
     showSizeOnDisk: boolean;
+    showTags: boolean;
     showSearchAction: boolean;
   };
 

frontend/src/Collection/Overview/CollectionMovie.css

@@ -115,3 +115,16 @@ $hoverScale: 1.05;
     color: var(--iconButtonHoverLightColor);
   }
 }
+
+.excluded {
+  position: absolute;
+  top: 0;
+  right: 0;
+  z-index: 1;
+  width: 0;
+  height: 0;
+  border-width: 0 25px 25px 0;
+  border-style: solid;
+  border-color: transparent var(--dangerColor) transparent transparent;
+  color: var(--white);
+}

frontend/src/Collection/Overview/CollectionMovie.css.d.ts

@@ -6,6 +6,7 @@ interface CssExports {
   'content': string;
   'controls': string;
   'editorSelect': string;
+  'excluded': string;
   'externalLinks': string;
   'link': string;
   'monitorToggleButton': string;

frontend/src/Collection/Overview/CollectionMovie.js

@@ -5,6 +5,7 @@ import MonitorToggleButton from 'Components/MonitorToggleButton';
 import EditMovieModalConnector from 'Movie/Edit/EditMovieModalConnector';
 import MovieIndexProgressBar from 'Movie/Index/ProgressBar/MovieIndexProgressBar';
 import MoviePoster from 'Movie/MoviePoster';
+import translate from 'Utilities/String/translate';
 import AddNewCollectionMovieModal from './../AddNewCollectionMovieModal';
 import styles from './CollectionMovie.css';
 
@@ -72,6 +73,7 @@ class CollectionMovie extends Component {
       isAvailable,
       movieFile,
       isExistingMovie,
+      isExcluded,
       posterWidth,
       posterHeight,
       detailedProgressBar,
@@ -107,6 +109,15 @@ class CollectionMovie extends Component {
               </div>
           }
 
+          {
+            isExcluded ?
+              <div
+                className={styles.excluded}
+                title={translate('Excluded')}
+              /> :
+              null
+          }
+
           <Link
             className={styles.link}
             style={elementStyle}
@@ -189,6 +200,7 @@ CollectionMovie.propTypes = {
   posterHeight: PropTypes.number.isRequired,
   detailedProgressBar: PropTypes.bool.isRequired,
   isExistingMovie: PropTypes.bool,
+  isExcluded: PropTypes.bool,
   tmdbId: PropTypes.number.isRequired,
   imdbId: PropTypes.string,
   youTubeTrailerId: PropTypes.string,

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

@@ -3,6 +3,7 @@ import React, { Component } from 'react';
 import SelectInput from 'Components/Form/SelectInput';
 import IconButton from 'Components/Link/IconButton';
 import { filterBuilderTypes, filterBuilderValueTypes, icons } from 'Helpers/Props';
+import sortByProp from 'Utilities/Array/sortByProp';
 import BoolFilterBuilderRowValue from './BoolFilterBuilderRowValue';
 import DateFilterBuilderRowValue from './DateFilterBuilderRowValue';
 import FilterBuilderRowValueConnector from './FilterBuilderRowValueConnector';
@@ -228,7 +229,7 @@ class FilterBuilderRow extends Component {
         key: name,
         value: typeof label === 'function' ? label() : label
       };
-    }).sort((a, b) => a.value.localeCompare(b.value));
+    }).sort(sortByProp('value'));
 
     const ValueComponent = getRowValueConnector(selectedFilterBuilderProp);
 

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

@@ -3,7 +3,7 @@ import { connect } from 'react-redux';
 import { createSelector } from 'reselect';
 import { filterBuilderTypes } from 'Helpers/Props';
 import * as filterTypes from 'Helpers/Props/filterTypes';
-import sortByName from 'Utilities/Array/sortByName';
+import sortByProp from 'Utilities/Array/sortByProp';
 import FilterBuilderRowValue from './FilterBuilderRowValue';
 
 function createTagListSelector() {
@@ -38,7 +38,7 @@ function createTagListSelector() {
           }
 
           return acc;
-        }, []).sort(sortByName);
+        }, []).sort(sortByProp('name'));
       }
 
       return _.uniqBy(items, 'id');

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

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

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

@@ -5,6 +5,7 @@ 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 sortByProp from 'Utilities/Array/sortByProp';
 import translate from 'Utilities/String/translate';
 import CustomFilter from './CustomFilter';
 import styles from './CustomFiltersModalContent.css';
@@ -31,7 +32,7 @@ function CustomFiltersModalContent(props) {
       <ModalBody>
         {
           customFilters
-            .sort((a, b) => a.label.localeCompare(b.label))
+            .sort((a, b) => sortByProp(a, b, 'label'))
             .map((customFilter) => {
               return (
                 <CustomFilter

frontend/src/Components/Form/DownloadClientSelectInputConnector.js

@@ -4,7 +4,8 @@ import React, { Component } from 'react';
 import { connect } from 'react-redux';
 import { createSelector } from 'reselect';
 import { fetchDownloadClients } from 'Store/Actions/settingsActions';
-import sortByName from 'Utilities/Array/sortByName';
+import sortByProp from 'Utilities/Array/sortByProp';
+import translate from 'Utilities/String/translate';
 import EnhancedSelectInput from './EnhancedSelectInput';
 
 function createMapStateToProps() {
@@ -22,7 +23,7 @@ function createMapStateToProps() {
 
       const filteredItems = items.filter((item) => item.protocol === protocolFilter);
 
-      const values = _.map(filteredItems.sort(sortByName), (downloadClient) => {
+      const values = _.map(filteredItems.sort(sortByProp('name')), (downloadClient) => {
         return {
           key: downloadClient.id,
           value: downloadClient.name,
@@ -33,7 +34,7 @@ function createMapStateToProps() {
       if (includeAny) {
         values.unshift({
           key: 0,
-          value: '(Any)'
+          value: `(${translate('Any')})`
         });
       }
 

frontend/src/Components/Form/EnhancedSelectInput.js

@@ -271,26 +271,32 @@ class EnhancedSelectInput extends Component {
     this.setState({ isOpen: !this.state.isOpen });
   };
 
-  onSelect = (value) => {
+  onSelect = (newValue) => {
-    if (Array.isArray(this.props.value)) {
+    const { name, value, values, onChange } = this.props;
-      let newValue = null;
+    const additionalProperties = values.find((v) => v.key === newValue)?.additionalProperties;
-      const index = this.props.value.indexOf(value);
+
+    if (Array.isArray(value)) {
+      let arrayValue = null;
+      const index = value.indexOf(newValue);
+
       if (index === -1) {
-        newValue = this.props.values.map((v) => v.key).filter((v) => (v === value) || this.props.value.includes(v));
+        arrayValue = values.map((v) => v.key).filter((v) => (v === newValue) || value.includes(v));
       } else {
-        newValue = [...this.props.value];
+        arrayValue = [...value];
-        newValue.splice(index, 1);
+        arrayValue.splice(index, 1);
       }
-      this.props.onChange({
+      onChange({
-        name: this.props.name,
+        name,
-        value: newValue
+        value: arrayValue,
+        additionalProperties
       });
     } else {
       this.setState({ isOpen: false });
 
-      this.props.onChange({
+      onChange({
-        name: this.props.name,
+        name,
-        value
+        value: newValue,
+        additionalProperties
       });
     }
   };
@@ -485,7 +491,7 @@ class EnhancedSelectInput extends Component {
                             values.map((v, index) => {
                               const hasParent = v.parentKey !== undefined;
                               const depth = hasParent ? 1 : 0;
-                              const parentSelected = hasParent && value.includes(v.parentKey);
+                              const parentSelected = hasParent && Array.isArray(value) && value.includes(v.parentKey);
                               return (
                                 <OptionComponent
                                   key={v.key}

frontend/src/Components/Form/EnhancedSelectInputConnector.js

@@ -9,7 +9,8 @@ import EnhancedSelectInput from './EnhancedSelectInput';
 const importantFieldNames = [
   'baseUrl',
   'apiPath',
-  'apiKey'
+  'apiKey',
+  'authToken'
 ];
 
 function getProviderDataKey(providerData) {
@@ -34,7 +35,9 @@ function getSelectOptions(items) {
       key: option.value,
       value: option.name,
       hint: option.hint,
-      parentKey: option.parentValue
+      parentKey: option.parentValue,
+      isDisabled: option.isDisabled,
+      additionalProperties: option.additionalProperties
     };
   });
 }
@@ -147,7 +150,7 @@ EnhancedSelectInputConnector.propTypes = {
   provider: PropTypes.string.isRequired,
   providerData: PropTypes.object.isRequired,
   name: PropTypes.string.isRequired,
-  value: PropTypes.arrayOf(PropTypes.oneOfType([PropTypes.number, PropTypes.string])).isRequired,
+  value: PropTypes.oneOfType([PropTypes.string, PropTypes.number, PropTypes.arrayOf(PropTypes.string), PropTypes.arrayOf(PropTypes.number)]).isRequired,
   values: PropTypes.arrayOf(PropTypes.object).isRequired,
   selectOptionsProviderAction: PropTypes.string,
   onChange: PropTypes.func.isRequired,

frontend/src/Components/Form/FormInputGroup.js

@@ -17,6 +17,7 @@ import IndexerSelectInputConnector from './IndexerSelectInputConnector';
 import KeyValueListInput from './KeyValueListInput';
 import LanguageSelectInputConnector from './LanguageSelectInputConnector';
 import MovieMonitoredSelectInput from './MovieMonitoredSelectInput';
+import MovieTagInput from './MovieTagInput';
 import NumberInput from './NumberInput';
 import OAuthInputConnector from './OAuthInputConnector';
 import PasswordInput from './PasswordInput';
@@ -89,6 +90,10 @@ function getComponent(type) {
 
     case inputTypes.DYNAMIC_SELECT:
       return EnhancedSelectInputConnector;
+
+    case inputTypes.MOVIE_TAG:
+      return MovieTagInput;
+
     case inputTypes.TAG:
       return TagInputConnector;
 

frontend/src/Components/Form/IndexerSelectInputConnector.js

@@ -3,7 +3,7 @@ import React, { Component } from 'react';
 import { connect } from 'react-redux';
 import { createSelector } from 'reselect';
 import { fetchIndexers } from 'Store/Actions/settingsActions';
-import sortByName from 'Utilities/Array/sortByName';
+import sortByProp from 'Utilities/Array/sortByProp';
 import EnhancedSelectInput from './EnhancedSelectInput';
 
 function createMapStateToProps() {
@@ -18,7 +18,7 @@ function createMapStateToProps() {
         items
       } = indexers;
 
-      const values = items.sort(sortByName).map((indexer) => ({
+      const values = items.sort(sortByProp('name')).map((indexer) => ({
         key: indexer.id,
         value: indexer.name
       }));

frontend/src/Components/Form/MovieTagInput.tsx

@@ -0,0 +1,53 @@
+import React, { useCallback } from 'react';
+import TagInputConnector from './TagInputConnector';
+
+interface MovieTagInputProps {
+  name: string;
+  value: number | number[];
+  onChange: ({
+    name,
+    value,
+  }: {
+    name: string;
+    value: number | number[];
+  }) => void;
+}
+
+export default function MovieTagInput(props: MovieTagInputProps) {
+  const { value, onChange, ...otherProps } = props;
+  const isArray = Array.isArray(value);
+
+  const handleChange = useCallback(
+    ({ name, value: newValue }: { name: string; value: number[] }) => {
+      if (isArray) {
+        onChange({ name, value: newValue });
+      } else {
+        onChange({
+          name,
+          value: newValue.length ? newValue[newValue.length - 1] : 0,
+        });
+      }
+    },
+    [isArray, onChange]
+  );
+
+  let finalValue: number[] = [];
+
+  if (isArray) {
+    finalValue = value;
+  } else if (value === 0) {
+    finalValue = [];
+  } else {
+    finalValue = [value];
+  }
+
+  return (
+    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+    // @ts-ignore 2786 'TagInputConnector' isn't typed yet
+    <TagInputConnector
+      {...otherProps}
+      value={finalValue}
+      onChange={handleChange}
+    />
+  );
+}

frontend/src/Components/Form/PasswordInput.css

@@ -1,5 +0,0 @@
-.input {
-  composes: input from '~Components/Form/TextInput.css';
-
-  font-family: $passwordFamily;
-}

frontend/src/Components/Form/PasswordInput.js

@@ -1,7 +1,5 @@
-import PropTypes from 'prop-types';
 import React from 'react';
 import TextInput from './TextInput';
-import styles from './PasswordInput.css';
 
 // Prevent a user from copying (or cutting) the password from the input
 function onCopy(e) {
@@ -13,17 +11,14 @@ function PasswordInput(props) {
   return (
     <TextInput
       {...props}
+      type="password"
       onCopy={onCopy}
     />
   );
 }
 
 PasswordInput.propTypes = {
-  className: PropTypes.string.isRequired
+  ...TextInput.props
-};
-
-PasswordInput.defaultProps = {
-  className: styles.input
 };
 
 export default PasswordInput;

frontend/src/Components/Form/ProviderFieldFormGroup.js

@@ -27,6 +27,8 @@ function getType({ type, selectOptionsProviderAction }) {
         return inputTypes.DYNAMIC_SELECT;
       }
       return inputTypes.SELECT;
+    case 'movieTag':
+      return inputTypes.MOVIE_TAG;
     case 'tag':
       return inputTypes.TEXT_TAG;
     case 'tagSelect':

frontend/src/Components/Form/QualityProfileSelectInputConnector.js

@@ -4,13 +4,13 @@ import React, { Component } from 'react';
 import { connect } from 'react-redux';
 import { createSelector } from 'reselect';
 import createSortedSectionSelector from 'Store/Selectors/createSortedSectionSelector';
-import sortByName from 'Utilities/Array/sortByName';
+import sortByProp from 'Utilities/Array/sortByProp';
 import translate from 'Utilities/String/translate';
 import EnhancedSelectInput from './EnhancedSelectInput';
 
 function createMapStateToProps() {
   return createSelector(
-    createSortedSectionSelector('settings.qualityProfiles', sortByName),
+    createSortedSectionSelector('settings.qualityProfiles', sortByProp('name')),
     (state, { includeNoChange }) => includeNoChange,
     (state, { includeNoChangeDisabled }) => includeNoChangeDisabled,
     (state, { includeMixed }) => includeMixed,

frontend/src/Components/Menu/FilterMenuContent.js

@@ -1,5 +1,6 @@
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
+import sortByProp from 'Utilities/Array/sortByProp';
 import translate from 'Utilities/String/translate';
 import FilterMenuItem from './FilterMenuItem';
 import MenuContent from './MenuContent';
@@ -47,7 +48,7 @@ class FilterMenuContent extends Component {
 
         {
           customFilters
-            .sort((a, b) => a.label.localeCompare(b.label))
+            .sort(sortByProp('label'))
             .map((filter) => {
               return (
                 <FilterMenuItem

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

@@ -71,6 +71,22 @@ const links = [
     ]
   },
 
+  {
+    iconName: icons.WARNING,
+    title: () => translate('Wanted'),
+    to: '/wanted/missing',
+    children: [
+      {
+        title: () => translate('Missing'),
+        to: '/wanted/missing'
+      },
+      {
+        title: () => translate('CutoffUnmet'),
+        to: '/wanted/cutoffunmet'
+      }
+    ]
+  },
+
   {
     iconName: icons.SETTINGS,
     title: () => translate('Settings'),

frontend/src/Components/SignalRConnector.js

@@ -244,6 +244,26 @@ class SignalRConnector extends Component {
     this.props.dispatchSetVersion({ version });
   };
 
+  handleWantedCutoff = (body) => {
+    if (body.action === 'updated') {
+      this.props.dispatchUpdateItem({
+        section: 'wanted.cutoffUnmet',
+        updateOnly: true,
+        ...body.resource
+      });
+    }
+  };
+
+  handleWantedMissing = (body) => {
+    if (body.action === 'updated') {
+      this.props.dispatchUpdateItem({
+        section: 'wanted.missing',
+        updateOnly: true,
+        ...body.resource
+      });
+    }
+  };
+
   handleSystemTask = () => {
     this.props.dispatchFetchCommands();
   };

frontend/src/Components/Table/TableOptions/TableOptionsModal.js

@@ -49,11 +49,12 @@ class TableOptionsModal extends Component {
 
   onPageSizeChange = ({ value }) => {
     let pageSizeError = null;
+    const maxPageSize = this.props.maxPageSize ?? 250;
 
     if (value < 5) {
       pageSizeError = translate('TablePageSizeMinimum', { minimumValue: '5' });
-    } else if (value > 250) {
+    } else if (value > maxPageSize) {
-      pageSizeError = translate('TablePageSizeMaximum', { maximumValue: '250' });
+      pageSizeError = translate('TablePageSizeMaximum', { maximumValue: `${maxPageSize}` });
     } else {
       this.props.onTableOptionChange({ pageSize: value });
     }
@@ -248,6 +249,7 @@ TableOptionsModal.propTypes = {
   isOpen: PropTypes.bool.isRequired,
   columns: PropTypes.arrayOf(PropTypes.object).isRequired,
   pageSize: PropTypes.number,
+  maxPageSize: PropTypes.number,
   canModifyColumns: PropTypes.bool.isRequired,
   optionsComponent: PropTypes.elementType,
   onTableOptionChange: PropTypes.func.isRequired,

frontend/src/Components/TagList.js

@@ -1,6 +1,7 @@
 import PropTypes from 'prop-types';
 import React from 'react';
 import { kinds } from 'Helpers/Props';
+import sortByProp from 'Utilities/Array/sortByProp';
 import Label from './Label';
 import styles from './TagList.css';
 
@@ -8,7 +9,7 @@ function TagList({ tags, tagList }) {
   const sortedTags = tags
     .map((tagId) => tagList.find((tag) => tag.id === tagId))
     .filter((tag) => !!tag)
-    .sort((a, b) => a.label.localeCompare(b.label));
+    .sort(sortByProp('label'));
 
   return (
     <div className={styles.tags}>

frontend/src/Content/Fonts/fonts.css

@@ -25,14 +25,3 @@
   font-family: 'Ubuntu Mono';
   src: url('UbuntuMono-Regular.eot?#iefix&v=1.3.0') format('embedded-opentype'), url('UbuntuMono-Regular.woff?v=1.3.0') format('woff'), url('UbuntuMono-Regular.ttf?v=1.3.0') format('truetype');
 }
-
-/*
- * text-security-disc
- */
-
-@font-face {
-  font-weight: normal;
-  font-style: normal;
-  font-family: 'text-security-disc';
-  src: url('text-security-disc.woff?v=1.3.0') format('woff'), url('text-security-disc.ttf?v=1.3.0') format('truetype');
-}

frontend/src/Content/Images/Icons/manifest.json

@@ -15,5 +15,5 @@
     "start_url": "../../../../",
     "theme_color": "#3a3f51",
     "background_color": "#3a3f51",
-    "display": "minimal-ui"
+    "display": "standalone"
 }

frontend/src/DiscoverMovie/DiscoverMovie.js

@@ -75,9 +75,19 @@ class DiscoverMovie extends Component {
     const {
       items,
       sortKey,
-      sortDirection
+      sortDirection,
+      includeRecommendations,
+      includeTrending,
+      includePopular
     } = this.props;
 
+    if (includeRecommendations !== prevProps.includeRecommendations ||
+      includeTrending !== prevProps.includeTrending ||
+      includePopular !== prevProps.includePopular
+    ) {
+      this.props.dispatchFetchListMovies();
+    }
+
     if (sortKey !== prevProps.sortKey ||
         sortDirection !== prevProps.sortDirection ||
         hasDifferentItemsOrOrder(prevProps.items, items)
@@ -443,6 +453,9 @@ DiscoverMovie.propTypes = {
   sortKey: PropTypes.string,
   sortDirection: PropTypes.oneOf(sortDirections.all),
   view: PropTypes.string.isRequired,
+  includeRecommendations: PropTypes.bool.isRequired,
+  includeTrending: PropTypes.bool.isRequired,
+  includePopular: PropTypes.bool.isRequired,
   isSyncingLists: PropTypes.bool.isRequired,
   isSmallScreen: PropTypes.bool.isRequired,
   onSortSelect: PropTypes.func.isRequired,
@@ -451,7 +464,8 @@ DiscoverMovie.propTypes = {
   onScroll: PropTypes.func.isRequired,
   onAddMoviesPress: PropTypes.func.isRequired,
   onExcludeMoviesPress: PropTypes.func.isRequired,
-  onImportListSyncPress: PropTypes.func.isRequired
+  onImportListSyncPress: PropTypes.func.isRequired,
+  dispatchFetchListMovies: PropTypes.func.isRequired
 };
 
 export default DiscoverMovie;

frontend/src/DiscoverMovie/DiscoverMovieConnector.js

@@ -17,15 +17,18 @@ import DiscoverMovie from './DiscoverMovie';
 
 function createMapStateToProps() {
   return createSelector(
+    (state) => state.discoverMovie,
     createDiscoverMovieClientSideCollectionItemsSelector('discoverMovie'),
     createCommandExecutingSelector(commandNames.IMPORT_LIST_SYNC),
     createDimensionsSelector(),
     (
+      discoverMovie,
       movies,
       isSyncingLists,
       dimensionsState
     ) => {
       return {
+        ...discoverMovie.options,
         ...movies,
         isSyncingLists,
         isSmallScreen: dimensionsState.isSmallScreen

frontend/src/DiscoverMovie/Overview/Options/DiscoverMovieOverviewOptionsModalContent.js

@@ -49,7 +49,9 @@ class DiscoverMovieOverviewOptionsModalContent extends Component {
       showRatings: props.showRatings,
       showYear: props.showYear,
       showGenres: props.showGenres,
-      includeRecommendations: props.includeRecommendations
+      includeRecommendations: props.includeRecommendations,
+      includeTrending: props.includeTrending,
+      includePopular: props.includePopular
     };
   }
 
@@ -61,7 +63,9 @@ class DiscoverMovieOverviewOptionsModalContent extends Component {
       showRatings,
       showCertification,
       showGenres,
-      includeRecommendations
+      includeRecommendations,
+      includeTrending,
+      includePopular
     } = this.props;
 
     const state = {};
@@ -94,6 +98,14 @@ class DiscoverMovieOverviewOptionsModalContent extends Component {
       state.includeRecommendations = includeRecommendations;
     }
 
+    if (includeTrending !== prevProps.includeTrending) {
+      state.includeTrending = includeTrending;
+    }
+
+    if (includePopular !== prevProps.includePopular) {
+      state.includePopular = includePopular;
+    }
+
     if (!_.isEmpty(state)) {
       this.setState(state);
     }
@@ -135,19 +147,22 @@ class DiscoverMovieOverviewOptionsModalContent extends Component {
       showRatings,
       showYear,
       showGenres,
-      includeRecommendations
+      includeRecommendations,
+      includeTrending,
+      includePopular
     } = this.state;
 
     return (
       <ModalContent onModalClose={onModalClose}>
         <ModalHeader>
-          Overview Options
+          {translate('OverviewOptions')}
         </ModalHeader>
 
         <ModalBody>
           <Form>
             <FormGroup>
               <FormLabel>{translate('IncludeRadarrRecommendations')}</FormLabel>
+
               <FormInputGroup
                 type={inputTypes.CHECK}
                 name="includeRecommendations"
@@ -157,6 +172,30 @@ class DiscoverMovieOverviewOptionsModalContent extends Component {
               />
             </FormGroup>
 
+            <FormGroup>
+              <FormLabel>{translate('IncludeTrending')}</FormLabel>
+
+              <FormInputGroup
+                type={inputTypes.CHECK}
+                name="includeTrending"
+                value={includeTrending}
+                helpText={translate('IncludeTrendingMoviesHelpText')}
+                onChange={this.onChangeOption}
+              />
+            </FormGroup>
+
+            <FormGroup>
+              <FormLabel>{translate('IncludePopular')}</FormLabel>
+
+              <FormInputGroup
+                type={inputTypes.CHECK}
+                name="includePopular"
+                value={includePopular}
+                helpText={translate('IncludePopularMoviesHelpText')}
+                onChange={this.onChangeOption}
+              />
+            </FormGroup>
+
             <FormGroup>
               <FormLabel>{translate('PosterSize')}</FormLabel>
 
@@ -246,6 +285,8 @@ DiscoverMovieOverviewOptionsModalContent.propTypes = {
   showCertification: PropTypes.bool.isRequired,
   showGenres: PropTypes.bool.isRequired,
   includeRecommendations: PropTypes.bool.isRequired,
+  includeTrending: PropTypes.bool.isRequired,
+  includePopular: PropTypes.bool.isRequired,
   onChangeOverviewOption: PropTypes.func.isRequired,
   onChangeOption: PropTypes.func.isRequired,
   onModalClose: PropTypes.func.isRequired

frontend/src/DiscoverMovie/Posters/DiscoverMoviePosterInfo.js

@@ -3,7 +3,7 @@ import React from 'react';
 import Icon from 'Components/Icon';
 import TmdbRating from 'Components/TmdbRating';
 import { icons } from 'Helpers/Props';
-import { getMovieStatusDetails } from 'Movie/MovieStatus';
+import getMovieStatusDetails from 'Movie/getMovieStatusDetails';
 import formatRuntime from 'Utilities/Date/formatRuntime';
 import getRelativeDate from 'Utilities/Date/getRelativeDate';
 import translate from 'Utilities/String/translate';

frontend/src/DiscoverMovie/Posters/Options/DiscoverMoviePosterOptionsModalContent.js

@@ -45,7 +45,9 @@ class DiscoverMoviePosterOptionsModalContent extends Component {
     this.state = {
       size: props.size,
       showTitle: props.showTitle,
-      includeRecommendations: props.includeRecommendations
+      includeRecommendations: props.includeRecommendations,
+      includeTrending: props.includeTrending,
+      includePopular: props.includePopular
     };
   }
 
@@ -53,7 +55,9 @@ class DiscoverMoviePosterOptionsModalContent extends Component {
     const {
       size,
       showTitle,
-      includeRecommendations
+      includeRecommendations,
+      includeTrending,
+      includePopular
     } = this.props;
 
     const state = {};
@@ -70,6 +74,14 @@ class DiscoverMoviePosterOptionsModalContent extends Component {
       state.includeRecommendations = includeRecommendations;
     }
 
+    if (includeTrending !== prevProps.includeTrending) {
+      state.includeTrending = includeTrending;
+    }
+
+    if (includePopular !== prevProps.includePopular) {
+      state.includePopular = includePopular;
+    }
+
     if (!_.isEmpty(state)) {
       this.setState(state);
     }
@@ -107,13 +119,15 @@ class DiscoverMoviePosterOptionsModalContent extends Component {
     const {
       size,
       showTitle,
-      includeRecommendations
+      includeRecommendations,
+      includeTrending,
+      includePopular
     } = this.state;
 
     return (
       <ModalContent onModalClose={onModalClose}>
         <ModalHeader>
-          Poster Options
+          {translate('PosterOptions')}
         </ModalHeader>
 
         <ModalBody>
@@ -130,6 +144,30 @@ class DiscoverMoviePosterOptionsModalContent extends Component {
               />
             </FormGroup>
 
+            <FormGroup>
+              <FormLabel>{translate('IncludeTrending')}</FormLabel>
+
+              <FormInputGroup
+                type={inputTypes.CHECK}
+                name="includeTrending"
+                value={includeTrending}
+                helpText={translate('IncludeTrendingMoviesHelpText')}
+                onChange={this.onChangeOption}
+              />
+            </FormGroup>
+
+            <FormGroup>
+              <FormLabel>{translate('IncludePopular')}</FormLabel>
+
+              <FormInputGroup
+                type={inputTypes.CHECK}
+                name="includePopular"
+                value={includePopular}
+                helpText={translate('IncludePopularMoviesHelpText')}
+                onChange={this.onChangeOption}
+              />
+            </FormGroup>
+
             <FormGroup>
               <FormLabel>{translate('PosterSize')}</FormLabel>
 
@@ -172,6 +210,8 @@ DiscoverMoviePosterOptionsModalContent.propTypes = {
   size: PropTypes.string.isRequired,
   showTitle: PropTypes.bool.isRequired,
   includeRecommendations: PropTypes.bool.isRequired,
+  includeTrending: PropTypes.bool.isRequired,
+  includePopular: PropTypes.bool.isRequired,
   onChangePosterOption: PropTypes.func.isRequired,
   onChangeOption: PropTypes.func.isRequired,
   onModalClose: PropTypes.func.isRequired

frontend/src/DiscoverMovie/Table/DiscoverMovieTableOptions.js

@@ -15,17 +15,29 @@ class DiscoverMovieTableOptions extends Component {
     super(props, context);
 
     this.state = {
-      includeRecommendations: props.includeRecommendations
+      includeRecommendations: props.includeRecommendations,
+      includeTrending: props.includeTrending,
+      includePopular: props.includePopular
     };
   }
 
   componentDidUpdate(prevProps) {
-    const { includeRecommendations } = this.props;
+    const {
+      includeRecommendations,
+      includeTrending,
+      includePopular
+    } = this.props;
 
     if (includeRecommendations !== prevProps.includeRecommendations) {
-      this.setState({
+      this.setState({ includeRecommendations });
-        includeRecommendations
+    }
-      });
+
+    if (includeTrending !== prevProps.includeTrending) {
+      this.setState({ includeTrending });
+    }
+
+    if (includePopular !== prevProps.includePopular) {
+      this.setState({ includePopular });
     }
   }
 
@@ -47,27 +59,57 @@ class DiscoverMovieTableOptions extends Component {
 
   render() {
     const {
-      includeRecommendations
+      includeRecommendations,
+      includeTrending,
+      includePopular
     } = this.state;
 
     return (
-      <FormGroup>
+      <>
-        <FormLabel>{translate('IncludeRadarrRecommendations')}</FormLabel>
+        <FormGroup>
+          <FormLabel>{translate('IncludeRadarrRecommendations')}</FormLabel>
 
-        <FormInputGroup
+          <FormInputGroup
-          type={inputTypes.CHECK}
+            type={inputTypes.CHECK}
-          name="includeRecommendations"
+            name="includeRecommendations"
-          value={includeRecommendations}
+            value={includeRecommendations}
-          helpText={translate('IncludeRecommendationsHelpText')}
+            helpText={translate('IncludeRecommendationsHelpText')}
-          onChange={this.onChangeOption}
+            onChange={this.onChangeOption}
-        />
+          />
-      </FormGroup>
+        </FormGroup>
+
+        <FormGroup>
+          <FormLabel>{translate('IncludeTrending')}</FormLabel>
+
+          <FormInputGroup
+            type={inputTypes.CHECK}
+            name="includeTrending"
+            value={includeTrending}
+            helpText={translate('IncludeTrendingMoviesHelpText')}
+            onChange={this.onChangeOption}
+          />
+        </FormGroup>
+
+        <FormGroup>
+          <FormLabel>{translate('IncludePopular')}</FormLabel>
+
+          <FormInputGroup
+            type={inputTypes.CHECK}
+            name="includePopular"
+            value={includePopular}
+            helpText={translate('IncludePopularMoviesHelpText')}
+            onChange={this.onChangeOption}
+          />
+        </FormGroup>
+      </>
     );
   }
 }
 
 DiscoverMovieTableOptions.propTypes = {
   includeRecommendations: PropTypes.bool.isRequired,
+  includeTrending: PropTypes.bool.isRequired,
+  includePopular: PropTypes.bool.isRequired,
   onChangeOption: PropTypes.func.isRequired
 };
 

frontend/src/DiscoverMovie/Table/ListMovieStatusCell.js

@@ -2,7 +2,7 @@ import PropTypes from 'prop-types';
 import React from 'react';
 import Icon from 'Components/Icon';
 import VirtualTableRowCell from 'Components/Table/Cells/TableRowCell';
-import { getMovieStatusDetails } from 'Movie/MovieStatus';
+import getMovieStatusDetails from 'Movie/getMovieStatusDetails';
 import styles from './ListMovieStatusCell.css';
 
 function ListMovieStatusCell(props) {

frontend/src/Helpers/Props/inputTypes.js

@@ -17,6 +17,7 @@ export const INDEXER_FLAGS_SELECT = 'indexerFlagsSelect';
 export const LANGUAGE_SELECT = 'languageSelect';
 export const DOWNLOAD_CLIENT_SELECT = 'downloadClientSelect';
 export const SELECT = 'select';
+export const MOVIE_TAG = 'movieTag';
 export const DYNAMIC_SELECT = 'dynamicSelect';
 export const TAG = 'tag';
 export const TEXT = 'text';
@@ -45,6 +46,7 @@ export const all = [
   INDEXER_FLAGS_SELECT,
   LANGUAGE_SELECT,
   SELECT,
+  MOVIE_TAG,
   DYNAMIC_SELECT,
   TAG,
   TEXT,

frontend/src/InteractiveImport/Interactive/InteractiveImportRow.tsx

@@ -104,7 +104,7 @@ function InteractiveImportRow(props: InteractiveImportRowProps) {
 
   useEffect(
     () => {
-      if (allowMovieChange && movie && quality && languages) {
+      if (allowMovieChange && movie && quality && languages && size > 0) {
         onSelectedChange({
           id,
           hasMovieFileId: !!movieFileId,

frontend/src/InteractiveImport/Movie/SelectMovieModalContent.tsx

@@ -21,6 +21,7 @@ import { scrollDirections } from 'Helpers/Props';
 import Movie from 'Movie/Movie';
 import createAllMoviesSelector from 'Store/Selectors/createAllMoviesSelector';
 import dimensions from 'Styles/Variables/dimensions';
+import sortByProp from 'Utilities/Array/sortByProp';
 import translate from 'Utilities/String/translate';
 import SelectMovieModalTableHeader from './SelectMovieModalTableHeader';
 import SelectMovieRow from './SelectMovieRow';
@@ -162,9 +163,7 @@ function SelectMovieModalContent(props: SelectMovieModalContentProps) {
   );
 
   const items = useMemo(() => {
-    const sorted = [...allMovies].sort((a, b) =>
+    const sorted = [...allMovies].sort(sortByProp('sortTitle'));
-      a.sortTitle.localeCompare(b.sortTitle)
-    );
 
     return sorted.filter(
       (item) =>

frontend/src/Movie/Delete/DeleteMovieModalContent.css

@@ -6,7 +6,17 @@
   margin-right: 8px;
 }
 
+.folderPath {
+  font-weight: bold;
+  font-family: var(--defaultFontFamily);
+}
+
 .deleteFilesMessage {
   margin-top: 20px;
   color: var(--dangerColor);
+
+  .deleteCount {
+    margin-top: 20px;
+    color: var(--warningColor);
+  }
 }

frontend/src/Movie/Delete/DeleteMovieModalContent.css.d.ts

@@ -1,7 +1,9 @@
 // This file is automatically generated.
 // Please do not change this file!
 interface CssExports {
+  'deleteCount': string;
   'deleteFilesMessage': string;
+  'folderPath': string;
   'pathContainer': string;
   'pathIcon': string;
 }

frontend/src/Movie/Delete/DeleteMovieModalContent.js

@@ -5,6 +5,7 @@ import FormInputGroup from 'Components/Form/FormInputGroup';
 import FormLabel from 'Components/Form/FormLabel';
 import Icon from 'Components/Icon';
 import Button from 'Components/Link/Button';
+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,34 +50,26 @@ class DeleteMovieModalContent extends Component {
     const {
       title,
       path,
-      hasFile,
+      statistics = {},
-      statistics,
       deleteOptions,
       onModalClose,
       onDeleteOptionChange
     } = this.props;
 
     const {
+      movieFileCount = 0,
       sizeOnDisk = 0
     } = statistics;
 
     const deleteFiles = this.state.deleteFiles;
     const addImportExclusion = deleteOptions.addImportExclusion;
 
-    let deleteFilesLabel = hasFile ? translate('DeleteFileLabel', [1]) : translate('DeleteFilesLabel', [0]);
-    let deleteFilesHelpText = translate('DeleteFilesHelpText');
-
-    if (!hasFile) {
-      deleteFilesLabel = translate('DeleteMovieFolderLabel');
-      deleteFilesHelpText = translate('DeleteMovieFolderHelpText');
-    }
-
     return (
       <ModalContent
         onModalClose={onModalClose}
       >
         <ModalHeader>
-          {translate('DeleteHeader', [title])}
+          {translate('DeleteHeader', { title })}
         </ModalHeader>
 
         <ModalBody>
@@ -105,32 +98,32 @@ class DeleteMovieModalContent extends Component {
           </FormGroup>
 
           <FormGroup>
-            <FormLabel>{deleteFilesLabel}</FormLabel>
+            <FormLabel>{movieFileCount === 0 ? translate('DeleteMovieFolder') : translate('DeleteMovieFiles', { movieFileCount })}</FormLabel>
 
             <FormInputGroup
               type={inputTypes.CHECK}
               name="deleteFiles"
               value={deleteFiles}
-              helpText={deleteFilesHelpText}
+              helpText={movieFileCount === 0 ? translate('DeleteMovieFolderHelpText') : translate('DeleteMovieFilesHelpText')}
               kind={kinds.DANGER}
               onChange={this.onDeleteFilesChange}
             />
           </FormGroup>
 
           {
-            deleteFiles &&
+            deleteFiles ?
               <div className={styles.deleteFilesMessage}>
-                <div>
+                <div><InlineMarkdown data={translate('DeleteMovieFolderConfirmation', { path })} blockClassName={styles.folderPath} /></div>
-                  {translate('DeleteTheMovieFolder', { path })}
-                </div>
 
                 {
-                  !!hasFile &&
+                  movieFileCount ?
-                    <div>
+                    <div className={styles.deleteCount}>
-                      {hasFile} {translate('MovieFilesTotaling')} {formatBytes(sizeOnDisk)}
+                      {translate('DeleteMovieFolderMovieCount', { movieFileCount, size: formatBytes(sizeOnDisk) })}
-                    </div>
+                    </div> :
+                    null
                 }
-              </div>
+              </div> :
+              null
           }
 
         </ModalBody>

frontend/src/Movie/Details/MovieDetails.js

@@ -1,4 +1,3 @@
-import _ from 'lodash';
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import TextTruncate from 'react-text-truncate';
@@ -51,7 +50,8 @@ const defaultFontSize = parseInt(fonts.defaultFontSize);
 const lineHeight = parseFloat(fonts.lineHeight);
 
 function getFanartUrl(images) {
-  return _.find(images, { coverType: 'fanart' })?.url;
+  const image = images.find((img) => img.coverType === 'fanart');
+  return image?.url ?? image?.remoteUrl;
 }
 
 class MovieDetails extends Component {
@@ -285,8 +285,10 @@ class MovieDetails extends Component {
     const fanartUrl = getFanartUrl(images);
     const marqueeWidth = isSmallScreen ? titleWidth : (titleWidth - 150);
 
+    const pageTitle = `${title}${year > 0 ? ` (${year})` : ''}`;
+
     return (
-      <PageContent title={title}>
+      <PageContent title={pageTitle}>
         <PageToolbar>
           <PageToolbarSection>
             <PageToolbarButton
@@ -368,7 +370,7 @@ class MovieDetails extends Component {
               <MoviePoster
                 className={styles.poster}
                 images={images}
-                size={250}
+                size={500}
                 lazy={false}
               />
 

frontend/src/Movie/Details/MovieReleaseDates.tsx

@@ -8,18 +8,29 @@ import translate from 'Utilities/String/translate';
 import styles from './MovieReleaseDates.css';
 
 interface MovieReleaseDatesProps {
-  inCinemas: string;
+  inCinemas?: string;
-  physicalRelease: string;
+  digitalRelease?: string;
-  digitalRelease: string;
+  physicalRelease?: string;
 }
 
 function MovieReleaseDates(props: MovieReleaseDatesProps) {
-  const { inCinemas, physicalRelease, digitalRelease } = props;
+  const { inCinemas, digitalRelease, physicalRelease } = props;
 
   const { showRelativeDates, shortDateFormat, timeFormat } = useSelector(
     createUISettingsSelector()
   );
 
+  if (!inCinemas && !physicalRelease && !digitalRelease) {
+    return (
+      <div>
+        <div className={styles.dateIcon}>
+          <Icon name={icons.MISSING} />
+        </div>
+        {translate('NoMovieReleaseDatesAvailable')}
+      </div>
+    );
+  }
+
   return (
     <div>
       {inCinemas ? (

frontend/src/Movie/Details/MovieTagsConnector.js

@@ -2,6 +2,7 @@ import { connect } from 'react-redux';
 import { createSelector } from 'reselect';
 import createMovieSelector from 'Store/Selectors/createMovieSelector';
 import createTagsSelector from 'Store/Selectors/createTagsSelector';
+import sortByProp from 'Utilities/Array/sortByProp';
 import MovieTags from './MovieTags';
 
 function createMapStateToProps() {
@@ -12,8 +13,8 @@ function createMapStateToProps() {
       const tags = movie.tags
         .map((tagId) => tagList.find((tag) => tag.id === tagId))
         .filter((tag) => !!tag)
-        .map((tag) => tag.label)
+        .sort(sortByProp('label'))
-        .sort((a, b) => a.localeCompare(b));
+        .map((tag) => tag.label);
 
       return {
         tags

frontend/src/Movie/History/MovieHistoryModal.js

@@ -15,7 +15,7 @@ function MovieHistoryModal(props) {
     <Modal
       isOpen={isOpen}
       onModalClose={onModalClose}
-      size={sizes.EXTRA_LARGE}
+      size={sizes.EXTRA_EXTRA_LARGE}
     >
       <MovieHistoryModalContentConnector
         {...otherProps}

frontend/src/Movie/History/MovieHistoryRow.js

@@ -4,13 +4,13 @@ import HistoryDetailsModal from 'Activity/History/Details/HistoryDetailsModal';
 import HistoryEventTypeCell from 'Activity/History/HistoryEventTypeCell';
 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 { icons, kinds } from 'Helpers/Props';
 import MovieFormats from 'Movie/MovieFormats';
 import MovieLanguage from 'Movie/MovieLanguage';
 import MovieQuality from 'Movie/MovieQuality';
+import formatDateTime from 'Utilities/Date/formatDateTime';
 import formatCustomFormatScore from 'Utilities/Number/formatCustomFormatScore';
 import translate from 'Utilities/String/translate';
 import styles from './MovieHistoryRow.css';
@@ -109,9 +109,9 @@ class MovieHistoryRow extends Component {
           {formatCustomFormatScore(customFormatScore, customFormats.length)}
         </TableRowCell>
 
-        <RelativeDateCellConnector
+        <TableRowCell>
-          date={date}
+          {formatDateTime(date, shortDateFormat, timeFormat, { includeSeconds: true })}
-        />
+        </TableRowCell>
 
         <TableRowCell className={styles.actions}>
           <IconButton

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

@@ -189,6 +189,15 @@ function MovieIndexSortMenu(props: MovieIndexSortMenuProps) {
         >
           {translate('OriginalLanguage')}
         </SortMenuItem>
+
+        <SortMenuItem
+          name="tags"
+          sortKey={sortKey}
+          sortDirection={sortDirection}
+          onPress={onSortSelect}
+        >
+          {translate('Tags')}
+        </SortMenuItem>
       </MenuContent>
     </SortMenu>
   );

frontend/src/Movie/Index/MovieIndex.tsx

@@ -44,6 +44,7 @@ import MovieIndexViewMenu from './Menus/MovieIndexViewMenu';
 import MovieIndexFooter from './MovieIndexFooter';
 import MovieIndexRefreshMovieButton from './MovieIndexRefreshMovieButton';
 import MovieIndexSearchButton from './MovieIndexSearchButton';
+import MovieIndexSearchMenuItem from './MovieIndexSearchMenuItem';
 import MovieIndexOverviews from './Overview/MovieIndexOverviews';
 import MovieIndexOverviewOptionsModal from './Overview/Options/MovieIndexOverviewOptionsModal';
 import MovieIndexPosters from './Posters/MovieIndexPosters';
@@ -247,6 +248,7 @@ const MovieIndex = withScrollPosition((props: MovieIndexProps) => {
             <MovieIndexSearchButton
               isSelectMode={isSelectMode}
               selectedFilterKey={selectedFilterKey}
+              overflowComponent={MovieIndexSearchMenuItem}
             />
 
             <PageToolbarButton

frontend/src/Movie/Index/MovieIndexSearchButton.tsx

@@ -16,6 +16,7 @@ import getSelectedIds from 'Utilities/Table/getSelectedIds';
 interface MovieIndexSearchButtonProps {
   isSelectMode: boolean;
   selectedFilterKey: string;
+  overflowComponent: React.FunctionComponent<never>;
 }
 
 function MovieIndexSearchButton(props: MovieIndexSearchButtonProps) {

frontend/src/Movie/Index/MovieIndexSearchMenuItem.tsx

@@ -0,0 +1,72 @@
+import React, { useCallback, useMemo } from 'react';
+import { useDispatch, useSelector } from 'react-redux';
+import { useSelect } from 'App/SelectContext';
+import ClientSideCollectionAppState from 'App/State/ClientSideCollectionAppState';
+import MoviesAppState, { MovieIndexAppState } from 'App/State/MoviesAppState';
+import { MOVIE_SEARCH } from 'Commands/commandNames';
+import PageToolbarOverflowMenuItem from 'Components/Page/Toolbar/PageToolbarOverflowMenuItem';
+import { icons } from 'Helpers/Props';
+import { executeCommand } from 'Store/Actions/commandActions';
+import createCommandExecutingSelector from 'Store/Selectors/createCommandExecutingSelector';
+import createMovieClientSideCollectionItemsSelector from 'Store/Selectors/createMovieClientSideCollectionItemsSelector';
+import translate from 'Utilities/String/translate';
+import getSelectedIds from 'Utilities/Table/getSelectedIds';
+
+interface MovieIndexSearchMenuItemProps {
+  isSelectMode: boolean;
+  selectedFilterKey: string;
+}
+
+function MovieIndexSearchMenuItem(props: MovieIndexSearchMenuItemProps) {
+  const isSearching = useSelector(createCommandExecutingSelector(MOVIE_SEARCH));
+  const {
+    items,
+  }: MoviesAppState & MovieIndexAppState & ClientSideCollectionAppState =
+    useSelector(createMovieClientSideCollectionItemsSelector('movieIndex'));
+
+  const dispatch = useDispatch();
+
+  const { isSelectMode, selectedFilterKey } = props;
+  const [selectState] = useSelect();
+  const { selectedState } = selectState;
+
+  const selectedMovieIds = useMemo(() => {
+    return getSelectedIds(selectedState);
+  }, [selectedState]);
+
+  const moviesToSearch =
+    isSelectMode && selectedMovieIds.length > 0
+      ? selectedMovieIds
+      : items.map((m) => m.id);
+
+  const searchIndexLabel =
+    selectedFilterKey === 'all'
+      ? translate('SearchAll')
+      : translate('SearchFiltered');
+
+  const searchSelectLabel =
+    selectedMovieIds.length > 0
+      ? translate('SearchSelected')
+      : translate('SearchAll');
+
+  const onPress = useCallback(() => {
+    dispatch(
+      executeCommand({
+        name: MOVIE_SEARCH,
+        movieIds: moviesToSearch,
+      })
+    );
+  }, [dispatch, moviesToSearch]);
+
+  return (
+    <PageToolbarOverflowMenuItem
+      label={isSelectMode ? searchSelectLabel : searchIndexLabel}
+      isSpinning={isSearching}
+      isDisabled={!items.length}
+      iconName={icons.SEARCH}
+      onPress={onPress}
+    />
+  );
+}
+
+export default MovieIndexSearchMenuItem;

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

@@ -80,14 +80,26 @@ $hoverScale: 1.05;
   flex: 1 0 auto;
 }
 
+.overviewContainer {
+  display: flex;
+  justify-content: space-between;
+  flex: 0 1 1000px;
+  flex-direction: column;
+}
+
 .overview {
   composes: link;
 
-  flex: 0 1 1000px;
   overflow: hidden;
   min-height: 0;
 }
 
+.tags {
+  display: flex;
+  justify-content: space-around;
+  overflow: hidden;
+}
+
 @media only screen and (max-width: $breakpointSmall) {
   .overview {
     display: none;

frontend/src/Movie/Index/Overview/MovieIndexOverview.css.d.ts

@@ -10,9 +10,11 @@ interface CssExports {
   'info': string;
   'link': string;
   'overview': string;
+  'overviewContainer': string;
   'poster': string;
   'posterContainer': string;
   'queue': string;
+  'tags': string;
   'title': string;
   'titleRow': string;
 }

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

@@ -6,6 +6,7 @@ import Icon from 'Components/Icon';
 import IconButton from 'Components/Link/IconButton';
 import Link from 'Components/Link/Link';
 import SpinnerIconButton from 'Components/Link/SpinnerIconButton';
+import TagListConnector from 'Components/TagListConnector';
 import Popover from 'Components/Tooltip/Popover';
 import { icons } from 'Helpers/Props';
 import DeleteMovieModal from 'Movie/Delete/DeleteMovieModal';
@@ -69,6 +70,7 @@ function MovieIndexOverview(props: MovieIndexOverviewProps) {
     overview,
     statistics = {} as Statistics,
     images,
+    tags,
     hasFile,
     isAvailable,
     tmdbId,
@@ -212,15 +214,22 @@ function MovieIndexOverview(props: MovieIndexOverviewProps) {
           </div>
 
           <div className={styles.details}>
-            <Link className={styles.overview} to={link}>
+            <div className={styles.overviewContainer}>
-              <TextTruncate
+              <Link className={styles.overview} to={link}>
-                line={Math.floor(
+                <TextTruncate
-                  overviewHeight / (defaultFontSize * lineHeight)
+                  line={Math.floor(
-                )}
+                    overviewHeight / (defaultFontSize * lineHeight)
-                text={overview}
+                  )}
-              />
+                  text={overview}
-            </Link>
+                />
+              </Link>
 
+              {overviewOptions.showTags ? (
+                <div className={styles.tags}>
+                  <TagListConnector tags={tags} />
+                </div>
+              ) : null}
+            </div>
             <MovieIndexOverviewInfo
               height={overviewHeight}
               monitored={monitored}

frontend/src/Movie/Index/Overview/Options/MovieIndexOverviewOptionsModalContent.tsx

@@ -53,6 +53,7 @@ function MovieIndexOverviewOptionsModalContent(
     showAdded,
     showPath,
     showSizeOnDisk,
+    showTags,
     showSearchAction,
   } = useSelector(selectOverviewOptions);
 
@@ -161,6 +162,17 @@ function MovieIndexOverviewOptionsModalContent(
             />
           </FormGroup>
 
+          <FormGroup>
+            <FormLabel>{translate('ShowTags')}</FormLabel>
+
+            <FormInputGroup
+              type={inputTypes.CHECK}
+              name="showTags"
+              value={showTags}
+              onChange={onOverviewOptionChange}
+            />
+          </FormGroup>
+
           <FormGroup>
             <FormLabel>{translate('ShowSearch')}</FormLabel>
 

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

@@ -75,6 +75,20 @@ $hoverScale: 1.05;
   }
 }
 
+.tags {
+  display: flex;
+  align-items: center;
+  justify-content: space-around;
+  padding: 0 3px;
+  height: 21px;
+  background-color: var(--movieBackgroundColor);
+}
+
+.tagsList {
+  display: flex;
+  overflow: hidden;
+}
+
 .ended {
   position: absolute;
   top: 0;

frontend/src/Movie/Index/Posters/MovieIndexPoster.css.d.ts

@@ -13,6 +13,8 @@ interface CssExports {
   'overlayTitle': string;
   'poster': string;
   'posterContainer': string;
+  'tags': string;
+  'tagsList': string;
   'title': string;
 }
 export const cssExports: CssExports;

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

@@ -8,6 +8,7 @@ import IconButton from 'Components/Link/IconButton';
 import Link from 'Components/Link/Link';
 import SpinnerIconButton from 'Components/Link/SpinnerIconButton';
 import RottenTomatoRating from 'Components/RottenTomatoRating';
+import TagListConnector from 'Components/TagListConnector';
 import TmdbRating from 'Components/TmdbRating';
 import Popover from 'Components/Tooltip/Popover';
 import { icons } from 'Helpers/Props';
@@ -51,6 +52,7 @@ function MovieIndexPoster(props: MovieIndexPosterProps) {
     showTmdbRating,
     showImdbRating,
     showRottenTomatoesRating,
+    showTags,
     showSearchAction,
   } = useSelector(selectPosterOptions);
 
@@ -80,6 +82,7 @@ function MovieIndexPoster(props: MovieIndexPosterProps) {
     certification,
     originalTitle,
     originalLanguage,
+    tags = [],
   } = movie;
 
   const { sizeOnDisk = 0 } = statistics;
@@ -284,6 +287,14 @@ function MovieIndexPoster(props: MovieIndexPosterProps) {
         </div>
       ) : null}
 
+      {showTags && tags.length ? (
+        <div className={styles.tags}>
+          <div className={styles.tagsList}>
+            <TagListConnector tags={tags} />
+          </div>
+        </div>
+      ) : null}
+
       <MovieIndexPosterInfo
         studio={studio}
         qualityProfile={qualityProfile}
@@ -306,9 +317,11 @@ function MovieIndexPoster(props: MovieIndexPosterProps) {
         certification={certification}
         originalTitle={originalTitle}
         originalLanguage={originalLanguage}
+        tags={tags}
         showTmdbRating={showTmdbRating}
         showImdbRating={showImdbRating}
         showRottenTomatoesRating={showRottenTomatoesRating}
+        showTags={showTags}
       />
 
       <EditMovieModalConnector

frontend/src/Movie/Index/Posters/MovieIndexPosterInfo.css

@@ -9,3 +9,11 @@
 
   composes: info;
 }
+
+.tags {
+  composes: tags from '~./MovieIndexPoster.css';
+}
+
+.tagsList {
+  composes: tagsList from '~./MovieIndexPoster.css';
+}

frontend/src/Movie/Index/Posters/MovieIndexPosterInfo.css.d.ts

@@ -2,6 +2,8 @@
 // Please do not change this file!
 interface CssExports {
   'info': string;
+  'tags': string;
+  'tagsList': string;
   'title': string;
 }
 export const cssExports: CssExports;

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

@@ -2,6 +2,7 @@ import React from 'react';
 import Icon from 'Components/Icon';
 import ImdbRating from 'Components/ImdbRating';
 import RottenTomatoRating from 'Components/RottenTomatoRating';
+import TagListConnector from 'Components/TagListConnector';
 import TmdbRating from 'Components/TmdbRating';
 import { icons } from 'Helpers/Props';
 import Language from 'Language/Language';
@@ -28,6 +29,7 @@ interface MovieIndexPosterInfoProps {
   originalTitle: string;
   originalLanguage: Language;
   sizeOnDisk?: number;
+  tags: number[];
   sortKey: string;
   showRelativeDates: boolean;
   showCinemaRelease: boolean;
@@ -38,6 +40,7 @@ interface MovieIndexPosterInfoProps {
   showTmdbRating: boolean;
   showImdbRating: boolean;
   showRottenTomatoesRating: boolean;
+  showTags: boolean;
 }
 
 function MovieIndexPosterInfo(props: MovieIndexPosterInfoProps) {
@@ -56,6 +59,7 @@ function MovieIndexPosterInfo(props: MovieIndexPosterInfoProps) {
     originalTitle,
     originalLanguage,
     sizeOnDisk,
+    tags = [],
     sortKey,
     showRelativeDates,
     showCinemaRelease,
@@ -66,6 +70,7 @@ function MovieIndexPosterInfo(props: MovieIndexPosterInfoProps) {
     showTmdbRating,
     showImdbRating,
     showRottenTomatoesRating,
+    showTags,
   } = props;
 
   if (sortKey === 'studio' && studio) {
@@ -199,6 +204,16 @@ function MovieIndexPosterInfo(props: MovieIndexPosterInfoProps) {
     );
   }
 
+  if (!showTags && sortKey === 'tags' && tags.length) {
+    return (
+      <div className={styles.tags}>
+        <div className={styles.tagsList}>
+          <TagListConnector tags={tags} />
+        </div>
+      </div>
+    );
+  }
+
   if (sortKey === 'path') {
     return (
       <div className={styles.info} title={translate('Path')}>

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

@@ -148,6 +148,7 @@ export default function MovieIndexPosters(props: MovieIndexPostersProps) {
       showTmdbRating,
       showImdbRating,
       showRottenTomatoesRating,
+      showTags,
     } = posterOptions;
 
     const nextAiringHeight = 19;
@@ -191,6 +192,10 @@ export default function MovieIndexPosters(props: MovieIndexPostersProps) {
       heights.push(19);
     }
 
+    if (showTags) {
+      heights.push(21);
+    }
+
     switch (sortKey) {
       case 'studio':
       case 'added':
@@ -232,6 +237,11 @@ export default function MovieIndexPosters(props: MovieIndexPostersProps) {
           heights.push(19);
         }
         break;
+      case 'tags':
+        if (!showTags) {
+          heights.push(21);
+        }
+        break;
       default:
       // No need to add a height of 0
     }

frontend/src/Movie/Index/Posters/Options/MovieIndexPosterOptionsModalContent.tsx

@@ -57,6 +57,7 @@ function MovieIndexPosterOptionsModalContent(
     showTmdbRating,
     showImdbRating,
     showRottenTomatoesRating,
+    showTags,
     showSearchAction,
   } = posterOptions;
 
@@ -195,6 +196,18 @@ function MovieIndexPosterOptionsModalContent(
             />
           </FormGroup>
 
+          <FormGroup>
+            <FormLabel>{translate('ShowTags')}</FormLabel>
+
+            <FormInputGroup
+              type={inputTypes.CHECK}
+              name="showTags"
+              value={showTags}
+              helpText={translate('ShowTagsHelpText')}
+              onChange={onPosterOptionChange}
+            />
+          </FormGroup>
+
           <FormGroup>
             <FormLabel>{translate('ShowSearch')}</FormLabel>
 

frontend/src/Movie/Index/Select/Delete/DeleteMovieModalContent.css

@@ -10,4 +10,15 @@
 .path {
   margin-left: 5px;
   color: var(--dangerColor);
+  font-weight: bold;
+}
+
+.statistics {
+  margin-left: 5px;
+  color: var(--warningColor);
+}
+
+.deleteFilesMessage {
+  margin-top: 20px;
+  color: var(--warningColor);
 }

frontend/src/Movie/Index/Select/Delete/DeleteMovieModalContent.css.d.ts

@@ -1,9 +1,11 @@
 // This file is automatically generated.
 // Please do not change this file!
 interface CssExports {
+  'deleteFilesMessage': string;
   'message': string;
   'path': string;
   'pathContainer': string;
+  'statistics': string;
 }
 export const cssExports: CssExports;
 export default cssExports;

frontend/src/Movie/Index/Select/Delete/DeleteMovieModalContent.tsx

@@ -16,6 +16,7 @@ import Movie from 'Movie/Movie';
 import { bulkDeleteMovie, setDeleteOption } from 'Store/Actions/movieActions';
 import createAllMoviesSelector from 'Store/Selectors/createAllMoviesSelector';
 import { CheckInputChanged } from 'typings/inputs';
+import formatBytes from 'Utilities/Number/formatBytes';
 import translate from 'Utilities/String/translate';
 import styles from './DeleteMovieModalContent.css';
 
@@ -85,9 +86,30 @@ function DeleteMovieModalContent(props: DeleteMovieModalContentProps) {
     onModalClose,
   ]);
 
+  const { totalMovieFileCount, totalSizeOnDisk } = useMemo(() => {
+    return movies.reduce(
+      (acc, { statistics = {} }) => {
+        const { movieFileCount = 0, sizeOnDisk = 0 } = statistics;
+
+        acc.totalMovieFileCount += movieFileCount;
+        acc.totalSizeOnDisk += sizeOnDisk;
+
+        return acc;
+      },
+      {
+        totalMovieFileCount: 0,
+        totalSizeOnDisk: 0,
+      }
+    );
+  }, [movies]);
+
   return (
     <ModalContent onModalClose={onModalClose}>
-      <ModalHeader>{translate('DeleteSelectedMovie')}</ModalHeader>
+      <ModalHeader>
+        {movies.length > 1
+          ? translate('DeleteSelectedMovies')
+          : translate('DeleteSelectedMovie')}
+      </ModalHeader>
 
       <ModalBody>
         <div>
@@ -104,17 +126,21 @@ function DeleteMovieModalContent(props: DeleteMovieModalContentProps) {
           </FormGroup>
 
           <FormGroup>
-            <FormLabel>{`Delete Movie Folder${
+            <FormLabel>
-              movies.length > 1 ? 's' : ''
+              {movies.length > 1
-            }`}</FormLabel>
+                ? translate('DeleteMovieFolders')
+                : translate('DeleteMovieFolder')}
+            </FormLabel>
 
             <FormInputGroup
               type={inputTypes.CHECK}
               name="deleteFiles"
               value={deleteFiles}
-              helpText={`Delete Movie Folder${
+              helpText={
-                movies.length > 1 ? 's' : ''
+                movies.length > 1
-              } and all contents`}
+                  ? translate('DeleteMovieFoldersHelpText')
+                  : translate('DeleteMovieFolderHelpText')
+              }
               kind={kinds.DANGER}
               onChange={onDeleteFilesChange}
             />
@@ -122,26 +148,54 @@ function DeleteMovieModalContent(props: DeleteMovieModalContentProps) {
         </div>
 
         <div className={styles.message}>
-          {`Are you sure you want to delete ${movies.length} selected movie(s)${
+          {deleteFiles
-            deleteFiles ? ' and all contents' : ''
+            ? translate('DeleteMovieFolderCountWithFilesConfirmation', {
-          }?`}
+                count: movies.length,
+              })
+            : translate('DeleteMovieFolderCountConfirmation', {
+                count: movies.length,
+              })}
         </div>
 
         <ul>
-          {movies.map((s) => {
+          {movies.map(({ title, path, statistics = {} }) => {
+            const { movieFileCount = 0, sizeOnDisk = 0 } = statistics;
+
             return (
-              <li key={s.title}>
+              <li key={title}>
-                <span>{s.title}</span>
+                <span>{title}</span>
 
                 {deleteFiles && (
-                  <span className={styles.pathContainer}>
+                  <span>
-                    -<span className={styles.path}>{s.path}</span>
+                    <span className={styles.pathContainer}>
+                      -<span className={styles.path}>{path}</span>
+                    </span>
+
+                    {!!movieFileCount && (
+                      <span className={styles.statistics}>
+                        (
+                        {translate('DeleteMovieFolderMovieCount', {
+                          movieFileCount,
+                          size: formatBytes(sizeOnDisk),
+                        })}
+                        )
+                      </span>
+                    )}
                   </span>
                 )}
               </li>
             );
           })}
         </ul>
+
+        {deleteFiles && !!totalMovieFileCount ? (
+          <div className={styles.deleteFilesMessage}>
+            {translate('DeleteMovieFolderMovieCount', {
+              movieFileCount: totalMovieFileCount,
+              size: formatBytes(totalSizeOnDisk),
+            })}
+          </div>
+        ) : null}
       </ModalBody>
 
       <ModalFooter>

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

@@ -4,7 +4,7 @@ import Icon from 'Components/Icon';
 import MonitorToggleButton from 'Components/MonitorToggleButton';
 import VirtualTableRowCell from 'Components/Table/Cells/TableRowCell';
 import { icons } from 'Helpers/Props';
-import { getMovieStatusDetails } from 'Movie/MovieStatus';
+import getMovieStatusDetails from 'Movie/getMovieStatusDetails';
 import { toggleMovieMonitored } from 'Store/Actions/movieActions';
 import translate from 'Utilities/String/translate';
 import styles from './MovieStatusCell.css';

frontend/src/Movie/MovieSearchCell.css

@@ -0,0 +1,6 @@
+.movieSearchCell {
+  composes: cell from '~Components/Table/Cells/TableRowCell.css';
+
+  width: 70px;
+  white-space: nowrap;
+}

frontend/src/Movie/MovieSearchCell.css.d.ts

@@ -0,0 +1,7 @@
+// This file is automatically generated.
+// Please do not change this file!
+interface CssExports {
+  'movieSearchCell': string;
+}
+export const cssExports: CssExports;
+export default cssExports;

frontend/src/Movie/MovieSearchCell.js

@@ -0,0 +1,81 @@
+import PropTypes from 'prop-types';
+import React, { Component } from 'react';
+import IconButton from 'Components/Link/IconButton';
+import SpinnerIconButton from 'Components/Link/SpinnerIconButton';
+import TableRowCell from 'Components/Table/Cells/TableRowCell';
+import { icons } from 'Helpers/Props';
+import translate from 'Utilities/String/translate';
+import MovieInteractiveSearchModalConnector from './Search/MovieInteractiveSearchModalConnector';
+import styles from './MovieSearchCell.css';
+
+class MovieSearchCell extends Component {
+
+  //
+  // Lifecycle
+
+  constructor(props, context) {
+    super(props, context);
+
+    this.state = {
+      isInteractiveSearchModalOpen: false
+    };
+  }
+
+  //
+  // Listeners
+
+  onManualSearchPress = () => {
+    this.setState({ isInteractiveSearchModalOpen: true });
+  };
+
+  onInteractiveSearchModalClose = () => {
+    this.setState({ isInteractiveSearchModalOpen: false });
+  };
+
+  //
+  // Render
+
+  render() {
+    const {
+      movieId,
+      movieTitle,
+      isSearching,
+      onSearchPress,
+      ...otherProps
+    } = this.props;
+
+    return (
+      <TableRowCell className={styles.movieSearchCell}>
+        <SpinnerIconButton
+          name={icons.SEARCH}
+          isSpinning={isSearching}
+          onPress={onSearchPress}
+          title={translate('AutomaticSearch')}
+        />
+
+        <IconButton
+          name={icons.INTERACTIVE}
+          onPress={this.onManualSearchPress}
+          title={translate('InteractiveSearch')}
+        />
+
+        <MovieInteractiveSearchModalConnector
+          isOpen={this.state.isInteractiveSearchModalOpen}
+          movieId={movieId}
+          movieTitle={movieTitle}
+          onModalClose={this.onInteractiveSearchModalClose}
+          {...otherProps}
+        />
+      </TableRowCell>
+    );
+  }
+}
+
+MovieSearchCell.propTypes = {
+  movieId: PropTypes.number.isRequired,
+  movieTitle: PropTypes.string.isRequired,
+  isSearching: PropTypes.bool.isRequired,
+  onSearchPress: PropTypes.func.isRequired
+};
+
+export default MovieSearchCell;

frontend/src/Movie/MovieSearchCellConnector.js

@@ -0,0 +1,48 @@
+import { connect } from 'react-redux';
+import { createSelector } from 'reselect';
+import * as commandNames from 'Commands/commandNames';
+import MovieSearchCell from 'Movie/MovieSearchCell';
+import { executeCommand } from 'Store/Actions/commandActions';
+import createCommandsSelector from 'Store/Selectors/createCommandsSelector';
+import createMovieSelector from 'Store/Selectors/createMovieSelector';
+import { isCommandExecuting } from 'Utilities/Command';
+
+function createMapStateToProps() {
+  return createSelector(
+    (state, { movieId }) => movieId,
+    createMovieSelector(),
+    createCommandsSelector(),
+    (movieId, movie, commands) => {
+      const isSearching = commands.some((command) => {
+        const movieSearch = command.name === commandNames.MOVIE_SEARCH;
+
+        if (!movieSearch) {
+          return false;
+        }
+
+        return (
+          isCommandExecuting(command) &&
+          command.body.movieIds.indexOf(movieId) > -1
+        );
+      });
+
+      return {
+        movieMonitored: movie.monitored,
+        isSearching
+      };
+    }
+  );
+}
+
+function createMapDispatchToProps(dispatch, props) {
+  return {
+    onSearchPress(name, path) {
+      dispatch(executeCommand({
+        name: commandNames.MOVIE_SEARCH,
+        movieIds: [props.movieId]
+      }));
+    }
+  };
+}
+
+export default connect(createMapStateToProps, createMapDispatchToProps)(MovieSearchCell);

frontend/src/Movie/MovieStatus.css

@@ -0,0 +1,4 @@
+.center {
+  display: flex;
+  justify-content: center;
+}

frontend/src/Movie/MovieStatus.css.d.ts

@@ -1,7 +1,7 @@
 // This file is automatically generated.
 // Please do not change this file!
 interface CssExports {
-  'input': string;
+  'center': string;
 }
 export const cssExports: CssExports;
 export default cssExports;

frontend/src/Movie/MovieStatus.js

@@ -1,33 +1,115 @@
-import { icons } from 'Helpers/Props';
+import PropTypes from 'prop-types';
+import React from 'react';
+import QueueDetails from 'Activity/Queue/QueueDetails';
+import Icon from 'Components/Icon';
+import ProgressBar from 'Components/ProgressBar';
+import { icons, kinds, sizes } from 'Helpers/Props';
 import translate from 'Utilities/String/translate';
+import MovieQuality from './MovieQuality';
+import styles from './MovieStatus.css';
 
-export function getMovieStatusDetails(status) {
+function MovieStatus(props) {
+  const {
+    isAvailable,
+    monitored,
+    grabbed,
+    queueItem,
+    movieFile
+  } = props;
 
-  let statusDetails = {
+  const hasMovieFile = !!movieFile;
-    icon: icons.ANNOUNCED,
+  const isQueued = !!queueItem;
-    title: translate('Announced'),
-    message: translate('AnnouncedMsg')
-  };
 
-  if (status === 'deleted') {
+  if (isQueued) {
-    statusDetails = {
+    const {
-      icon: icons.MOVIE_DELETED,
+      sizeleft,
-      title: translate('Deleted'),
+      size
-      message: translate('DeletedMsg')
+    } = queueItem;
-    };
+
-  } else if (status === 'inCinemas') {
+    const progress = size ? (100 - sizeleft / size * 100) : 0;
-    statusDetails = {
+
-      icon: icons.IN_CINEMAS,
+    return (
-      title: translate('InCinemas'),
+      <div className={styles.center}>
-      message: translate('InCinemasMsg')
+        <QueueDetails
-    };
+          {...queueItem}
-  } else if (status === 'released') {
+          progressBar={
-    statusDetails = {
+            <ProgressBar
-      icon: icons.MOVIE_FILE,
+              progress={progress}
-      title: translate('Released'),
+              kind={kinds.PURPLE}
-      message: translate('ReleasedMsg')
+              size={sizes.MEDIUM}
-    };
+            />
+          }
+        />
+      </div>
+    );
   }
 
-  return statusDetails;
+  if (grabbed) {
+    return (
+      <div className={styles.center}>
+        <Icon
+          name={icons.DOWNLOADING}
+          title={translate('MovieIsDownloading')}
+        />
+      </div>
+    );
+  }
+
+  if (hasMovieFile) {
+    const quality = movieFile.quality;
+    const isCutoffNotMet = movieFile.qualityCutoffNotMet;
+
+    return (
+      <div className={styles.center}>
+        <MovieQuality
+          quality={quality}
+          size={movieFile.size}
+          isCutoffNotMet={isCutoffNotMet}
+          title={translate('MovieDownloaded')}
+        />
+      </div>
+    );
+  }
+
+  if (!monitored) {
+    return (
+      <div className={styles.center}>
+        <Icon
+          name={icons.UNMONITORED}
+          kind={kinds.DISABLED}
+          title={translate('MovieIsNotMonitored')}
+        />
+      </div>
+    );
+  }
+
+  if (isAvailable) {
+    return (
+      <div className={styles.center}>
+        <Icon
+          name={icons.MISSING}
+          title={translate('MovieMissingFromDisk')}
+        />
+      </div>
+    );
+  }
+
+  return (
+    <div className={styles.center}>
+      <Icon
+        name={icons.NOT_AIRED}
+        title={translate('MovieIsNotAvailable')}
+      />
+    </div>
+  );
 }
+
+MovieStatus.propTypes = {
+  isAvailable: PropTypes.bool.isRequired,
+  monitored: PropTypes.bool.isRequired,
+  grabbed: PropTypes.bool,
+  queueItem: PropTypes.object,
+  movieFile: PropTypes.object
+};
+
+export default MovieStatus;

frontend/src/Movie/MovieStatusConnector.js

@@ -0,0 +1,50 @@
+import _ from 'lodash';
+import PropTypes from 'prop-types';
+import React, { Component } from 'react';
+import { connect } from 'react-redux';
+import { createSelector } from 'reselect';
+import MovieStatus from 'Movie/MovieStatus';
+import createMovieFileSelector from 'Store/Selectors/createMovieFileSelector';
+import { createMovieByEntitySelector } from 'Store/Selectors/createMovieSelector';
+import createQueueItemSelector from 'Store/Selectors/createQueueItemSelector';
+
+function createMapStateToProps() {
+  return createSelector(
+    createMovieByEntitySelector(),
+    createQueueItemSelector(),
+    createMovieFileSelector(),
+    (movie, queueItem, movieFile) => {
+      const result = _.pick(movie, [
+        'isAvailable',
+        'monitored',
+        'grabbed'
+      ]);
+
+      result.queueItem = queueItem;
+      result.movieFile = movieFile;
+
+      return result;
+    }
+  );
+}
+
+class MovieStatusConnector extends Component {
+
+  //
+  // Render
+
+  render() {
+    return (
+      <MovieStatus
+        {...this.props}
+      />
+    );
+  }
+}
+
+MovieStatusConnector.propTypes = {
+  movieId: PropTypes.number.isRequired,
+  movieFileId: PropTypes.number.isRequired
+};
+
+export default connect(createMapStateToProps, null)(MovieStatusConnector);

frontend/src/Movie/Search/MovieInteractiveSearchModal.js

@@ -8,6 +8,7 @@ function MovieInteractiveSearchModal(props) {
   const {
     isOpen,
     movieId,
+    movieTitle,
     onModalClose
   } = props;
 
@@ -20,6 +21,7 @@ function MovieInteractiveSearchModal(props) {
     >
       <MovieInteractiveSearchModalContent
         movieId={movieId}
+        movieTitle={movieTitle}
         onModalClose={onModalClose}
       />
     </Modal>
@@ -29,6 +31,7 @@ function MovieInteractiveSearchModal(props) {
 MovieInteractiveSearchModal.propTypes = {
   isOpen: PropTypes.bool.isRequired,
   movieId: PropTypes.number.isRequired,
+  movieTitle: PropTypes.string,
   onModalClose: PropTypes.func.isRequired
 };
 

frontend/src/Movie/Search/MovieInteractiveSearchModalContent.js

@@ -12,13 +12,17 @@ import translate from 'Utilities/String/translate';
 function MovieInteractiveSearchModalContent(props) {
   const {
     movieId,
+    movieTitle,
     onModalClose
   } = props;
 
   return (
     <ModalContent onModalClose={onModalClose}>
       <ModalHeader>
-        {translate('InteractiveSearchModalHeader')}
+        {movieTitle === undefined ?
+          translate('InteractiveSearchModalHeader') :
+          translate('InteractiveSearchModalHeaderTitle', { title: movieTitle })
+        }
       </ModalHeader>
 
       <ModalBody scrollDirection={scrollDirections.BOTH}>
@@ -38,6 +42,7 @@ function MovieInteractiveSearchModalContent(props) {
 
 MovieInteractiveSearchModalContent.propTypes = {
   movieId: PropTypes.number.isRequired,
+  movieTitle: PropTypes.string,
   onModalClose: PropTypes.func.isRequired
 };
 

frontend/src/Movie/getMovieStatusDetails.js

@@ -0,0 +1,32 @@
+import { icons } from 'Helpers/Props';
+import translate from 'Utilities/String/translate';
+
+export default function getMovieStatusDetails(status) {
+  let statusDetails = {
+    icon: icons.ANNOUNCED,
+    title: translate('Announced'),
+    message: translate('AnnouncedMsg')
+  };
+
+  if (status === 'deleted') {
+    statusDetails = {
+      icon: icons.MOVIE_DELETED,
+      title: translate('Deleted'),
+      message: translate('DeletedMsg')
+    };
+  } else if (status === 'inCinemas') {
+    statusDetails = {
+      icon: icons.IN_CINEMAS,
+      title: translate('InCinemas'),
+      message: translate('InCinemasMsg')
+    };
+  } else if (status === 'released') {
+    statusDetails = {
+      icon: icons.MOVIE_FILE,
+      title: translate('Released'),
+      message: translate('ReleasedMsg')
+    };
+  }
+
+  return statusDetails;
+}

frontend/src/Movie/movieEntities.js

@@ -1,9 +1,13 @@
 export const CALENDAR = 'calendar';
 export const MOVIES = 'movies';
 export const INTERACTIVE_IMPORT = 'interactiveImport.movies';
+export const WANTED_CUTOFF_UNMET = 'wanted.cutoffUnmet';
+export const WANTED_MISSING = 'wanted.missing';
 
 export default {
   CALENDAR,
   MOVIES,
-  INTERACTIVE_IMPORT
+  INTERACTIVE_IMPORT,
+  WANTED_CUTOFF_UNMET,
+  WANTED_MISSING
 };

frontend/src/MovieFile/MovieFileLanguageConnector.js

@@ -8,7 +8,7 @@ function createMapStateToProps() {
     createMovieFileSelector(),
     (movieFile) => {
       return {
-        language: movieFile ? movieFile.language : undefined
+        languages: movieFile ? movieFile.languages : undefined
       };
     }
   );

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

@@ -4,12 +4,12 @@ import { connect } from 'react-redux';
 import { createSelector } from 'reselect';
 import { cloneCustomFormat, deleteCustomFormat, fetchCustomFormats } from 'Store/Actions/settingsActions';
 import createSortedSectionSelector from 'Store/Selectors/createSortedSectionSelector';
-import sortByName from 'Utilities/Array/sortByName';
+import sortByProp from 'Utilities/Array/sortByProp';
 import CustomFormats from './CustomFormats';
 
 function createMapStateToProps() {
   return createSelector(
-    createSortedSectionSelector('settings.customFormats', sortByName),
+    createSortedSectionSelector('settings.customFormats', sortByProp('name')),
     (customFormats) => customFormats
   );
 }