Fixed: Truncate custom format card tags

(cherry picked from commit fe476a319e1768a929e326e87a54b10bc5e4f402)

.github/FUNDING.yml

@@ -1,6 +1,6 @@
 # These are supported funding model platforms
 
-github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+github: radarr
 patreon: # Replace with a single Patreon username
 open_collective: radarr
 ko_fi: # Replace with a single Ko-fi username

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -5,9 +5,9 @@ body:
 - type: checkboxes
   attributes:
     label: Is there an existing issue for this?
-    description: Please search to see if an issue already exists for the bug you encountered.
+    description: Please search to see if an open or closed issue already exists for the bug you encountered. If a bug exists and is closed note that it may only be fixed in an unstable branch. 
     options:
-    - label: I have searched the existing issues
+    - label: I have searched the existing open and closed issues
       required: true
 - type: textarea
   attributes:
@@ -42,12 +42,14 @@ body:
         - **Docker Install**: Yes
         - **Using Reverse Proxy**: No
         - **Browser**: Firefox 90 (If UI related)
+        - **Database**: Sqlite 3.36.0
     value: |
         - OS: 
-        - Radarr:
-        - Docker Install:
-        - Using Reverse Proxy:
-        - Browser:
+        - Radarr: 
+        - Docker Install: 
+        - Using Reverse Proxy: 
+        - Browser: 
+        - Database: 
     render: markdown
   validations:
     required: true

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -5,9 +5,9 @@ body:
 - type: checkboxes
   attributes:
     label: Is there an existing issue for this?
-    description: Please search to see if an issue already exists for the feature you are requesting.
+    description: Please search to see if an open or closed issue already exists for the feature you are requesting. If a request exists and is closed note that it may only be fixed in an unstable branch.
     options:
-    - label: I have searched the existing issues
+    - label: I have searched the existing open and closed issues
       required: true
 - type: textarea
   attributes:

.github/workflows/azuresync.yml

@@ -7,8 +7,12 @@ on:
 
 concurrency: azuresync-${{ github.event.issue.number }}
 
+permissions: {}
 jobs:
   alert:
+    permissions:
+      issues: write # to update issue body
+
     runs-on: ubuntu-latest
     steps:
       - uses: danhellem/github-actions-issue-to-work-item@master

.github/workflows/lock.yml

@@ -5,8 +5,13 @@ on:
   schedule:
     - cron: '0 0 * * *'
 
+permissions: {}
 jobs:
   lock:
+    permissions:
+      issues: write # to lock issues (dessant/lock-threads)
+      pull-requests: write # to lock PRs (dessant/lock-threads)
+
     runs-on: ubuntu-latest
     steps:
       - uses: dessant/lock-threads@v2

.github/workflows/support.yml

@@ -4,8 +4,12 @@ on:
   issues:
     types: [labeled, unlabeled, reopened]
 
+permissions: {}
 jobs:
   support:
+    permissions:
+      issues: write # to modify issues
+
     runs-on: ubuntu-latest
     steps:
       - uses: dessant/support-requests@v2

CODE_OF_CONDUCT.md

@@ -0,0 +1,132 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+We as members, contributors, and leaders pledge to make participation in our
+community a harassment-free experience for everyone, regardless of age, body
+size, visible or invisible disability, ethnicity, sex characteristics, gender
+identity and expression, level of experience, education, socio-economic status,
+nationality, personal appearance, race, caste, color, religion, or sexual
+identity and orientation.
+
+We pledge to act and interact in ways that contribute to an open, welcoming,
+diverse, inclusive, and healthy community.
+
+## Our Standards
+
+Examples of behavior that contributes to a positive environment for our
+community include:
+
+* Demonstrating empathy and kindness toward other people
+* Being respectful of differing opinions, viewpoints, and experiences
+* Giving and gracefully accepting constructive feedback
+* Accepting responsibility and apologizing to those affected by our mistakes,
+  and learning from the experience
+* Focusing on what is best not just for us as individuals, but for the overall
+  community
+
+Examples of unacceptable behavior include:
+
+* The use of sexualized language or imagery, and sexual attention or advances of
+  any kind
+* Trolling, insulting or derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or email address,
+  without their explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Enforcement Responsibilities
+
+Community leaders are responsible for clarifying and enforcing our standards of
+acceptable behavior and will take appropriate and fair corrective action in
+response to any behavior that they deem inappropriate, threatening, offensive,
+or harmful.
+
+Community leaders have the right and responsibility to remove, edit, or reject
+comments, commits, code, wiki edits, issues, and other contributions that are
+not aligned to this Code of Conduct, and will communicate reasons for moderation
+decisions when appropriate.
+
+## Scope
+
+This Code of Conduct applies within all community spaces, and also applies when
+an individual is officially representing the community in public spaces.
+Examples of representing our community include using an official e-mail address,
+posting via an official social media account, or acting as an appointed
+representative at an online or offline event.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported to the community leaders responsible for enforcement at
+<development@radarr.video>.
+All complaints will be reviewed and investigated promptly and fairly.
+
+All community leaders are obligated to respect the privacy and security of the
+reporter of any incident.
+
+## Enforcement Guidelines
+
+Community leaders will follow these Community Impact Guidelines in determining
+the consequences for any action they deem in violation of this Code of Conduct:
+
+### 1. Correction
+
+**Community Impact**: Use of inappropriate language or other behavior deemed
+unprofessional or unwelcome in the community.
+
+**Consequence**: A private, written warning from community leaders, providing
+clarity around the nature of the violation and an explanation of why the
+behavior was inappropriate. A public apology may be requested.
+
+### 2. Warning
+
+**Community Impact**: A violation through a single incident or series of
+actions.
+
+**Consequence**: A warning with consequences for continued behavior. No
+interaction with the people involved, including unsolicited interaction with
+those enforcing the Code of Conduct, for a specified period of time. This
+includes avoiding interactions in community spaces as well as external channels
+like social media. Violating these terms may lead to a temporary or permanent
+ban.
+
+### 3. Temporary Ban
+
+**Community Impact**: A serious violation of community standards, including
+sustained inappropriate behavior.
+
+**Consequence**: A temporary ban from any sort of interaction or public
+communication with the community for a specified period of time. No public or
+private interaction with the people involved, including unsolicited interaction
+with those enforcing the Code of Conduct, is allowed during this period.
+Violating these terms may lead to a permanent ban.
+
+### 4. Permanent Ban
+
+**Community Impact**: Demonstrating a pattern of violation of community
+standards, including sustained inappropriate behavior, harassment of an
+individual, or aggression toward or disparagement of classes of individuals.
+
+**Consequence**: A permanent ban from any sort of public interaction within the
+community.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage],
+version 2.1, available at
+[https://www.contributor-covenant.org/version/2/1/code_of_conduct.html][v2.1].
+
+Community Impact Guidelines were inspired by
+[Mozilla's code of conduct enforcement ladder][Mozilla CoC].
+
+For answers to common questions about this code of conduct, see the FAQ at
+[https://www.contributor-covenant.org/faq][FAQ]. Translations are available at
+[https://www.contributor-covenant.org/translations][translations].
+
+[homepage]: https://www.contributor-covenant.org
+[v2.1]: https://www.contributor-covenant.org/version/2/1/code_of_conduct.html
+[Mozilla CoC]: https://github.com/mozilla/diversity
+[FAQ]: https://www.contributor-covenant.org/faq
+[translations]: https://www.contributor-covenant.org/translations

azure-pipelines.yml

@@ -9,7 +9,7 @@ variables:
   testsFolder: './_tests'
   yarnCacheFolder: $(Pipeline.Workspace)/.yarn
   nugetCacheFolder: $(Pipeline.Workspace)/.nuget/packages
-  majorVersion: '4.2.2'
+  majorVersion: '4.3.1'
   minorVersion: $[counter('minorVersion', 2000)]
   radarrVersion: '$(majorVersion).$(minorVersion)'
   buildName: '$(Build.SourceBranchName).$(radarrVersion)'
@@ -761,7 +761,7 @@ stages:
         inputs:
           buildType: 'current'
           artifactName: Packages
-          itemPattern: '/$(pattern)'
+          itemPattern: '**/$(pattern)'
           targetPath: $(Build.ArtifactStagingDirectory)
       - bash: |
           mkdir -p ${BUILD_ARTIFACTSTAGINGDIRECTORY}/bin
@@ -1143,4 +1143,5 @@ stages:
             SYSTEM_ACCESSTOKEN: $(System.AccessToken)
             DISCORDCHANNELID: $(discordChannelId)
             DISCORDWEBHOOKKEY: $(discordWebhookKey)
+            DISCORDTHREADID: $(discordThreadId)
 

frontend/build/webpack.config.js

@@ -223,7 +223,6 @@ module.exports = (env) => {
             {
               loader: 'url-loader',
               options: {
-                limit: 24096,
                 mimetype: 'application/font-woff',
                 emitFile: false,
                 name: 'Content/Fonts/[name].[ext]'
@@ -233,12 +232,11 @@ module.exports = (env) => {
         },
 
         {
-          test: /\.(ttf|eot|eot?#iefix|gif|svg)(\?v=[0-9]\.[0-9]\.[0-9])?$/,
+          test: /\.(ttf|eot|eot?#iefix|svg)(\?v=[0-9]\.[0-9]\.[0-9])?$/,
           use: [
             {
               loader: 'file-loader',
               options: {
-                limit: 24096,
                 emitFile: false,
                 name: 'Content/Fonts/[name].[ext]'
               }

frontend/src/Activity/History/HistoryRow.css

@@ -10,6 +10,12 @@
   width: 80px;
 }
 
+.customFormatScore {
+  composes: cell from '~Components/Table/Cells/TableRowCell.css';
+
+  width: 55px;
+}
+
 .releaseGroup {
   composes: cell from '~Components/Table/Cells/TableRowCell.css';
 

frontend/src/Activity/History/HistoryRow.js

@@ -9,6 +9,7 @@ import MovieFormats from 'Movie/MovieFormats';
 import MovieLanguage from 'Movie/MovieLanguage';
 import MovieQuality from 'Movie/MovieQuality';
 import MovieTitleLink from 'Movie/MovieTitleLink';
+import formatCustomFormatScore from 'Utilities/Number/formatCustomFormatScore';
 import HistoryDetailsModal from './Details/HistoryDetailsModal';
 import HistoryEventTypeCell from './HistoryEventTypeCell';
 import styles from './HistoryRow.css';
@@ -168,6 +169,17 @@ class HistoryRow extends Component {
               );
             }
 
+            if (name === 'customFormatScore') {
+              return (
+                <TableRowCell
+                  key={name}
+                  className={styles.customFormatScore}
+                >
+                  {formatCustomFormatScore(data.customFormatScore)}
+                </TableRowCell>
+              );
+            }
+
             if (name === 'releaseGroup') {
               return (
                 <TableRowCell

frontend/src/Collection/Edit/EditCollectionModalContent.js

@@ -115,7 +115,7 @@ class EditCollectionModalContent extends Component {
                 </FormGroup>
 
                 <FormGroup>
-                  <FormLabel>{translate('Folder')}</FormLabel>
+                  <FormLabel>{translate('RootFolder')}</FormLabel>
 
                   <FormInputGroup
                     type={inputTypes.ROOT_FOLDER_SELECT}

frontend/src/Collection/Overview/CollectionOverview.js

@@ -1,7 +1,8 @@
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
-import Slider from 'react-slick';
 import TextTruncate from 'react-text-truncate';
+import { Navigation } from 'swiper';
+import { Swiper, SwiperSlide } from 'swiper/react';
 import EditCollectionModalConnector from 'Collection/Edit/EditCollectionModalConnector';
 import CheckInput from 'Components/Form/CheckInput';
 import Icon from 'Components/Icon';
@@ -17,8 +18,9 @@ import CollectionMovieConnector from './CollectionMovieConnector';
 import CollectionMovieLabelConnector from './CollectionMovieLabelConnector';
 import styles from './CollectionOverview.css';
 
-import 'slick-carousel/slick/slick.css';
-import 'slick-carousel/slick/slick-theme.css';
+// Import Swiper styles
+import 'swiper/css';
+import 'swiper/css/navigation';
 
 const columnPadding = parseInt(dimensions.movieIndexColumnPadding);
 const columnPaddingSmallScreen = parseInt(dimensions.movieIndexColumnPaddingSmallScreen);
@@ -52,8 +54,12 @@ class CollectionOverview extends Component {
   //
   // Control
 
-  setSliderRef = (ref) => {
-    this.setState({ slider: ref });
+  setSliderPrevRef = (ref) => {
+    this._swiperPrevRef = ref;
+  };
+
+  setSliderNextRef = (ref) => {
+    this._swiperNextRef = ref;
   };
 
   //
@@ -120,15 +126,6 @@ class CollectionOverview extends Component {
     const contentHeight = getContentHeight(rowHeight, isSmallScreen);
     const overviewHeight = contentHeight - titleRowHeight - posterHeight;
 
-    const sliderSettings = {
-      arrows: false,
-      dots: false,
-      infinite: false,
-      slidesToShow: 1,
-      slidesToScroll: 1,
-      variableWidth: true
-    };
-
     return (
       <div className={styles.container}>
         <div className={styles.content}>
@@ -166,19 +163,21 @@ class CollectionOverview extends Component {
               {
                 showPosters &&
                   <div className={styles.navigationButtons}>
-                    <IconButton
-                      name={icons.ARROW_LEFT}
-                      title={translate('ScrollMovies')}
-                      onPress={this.state.slider?.slickPrev}
-                      size={20}
-                    />
+                    <span ref={this.setSliderPrevRef}>
+                      <IconButton
+                        name={icons.ARROW_LEFT}
+                        title={translate('ScrollMovies')}
+                        size={20}
+                      />
+                    </span>
 
-                    <IconButton
-                      name={icons.ARROW_RIGHT}
-                      title={translate('ScrollMovies')}
-                      onPress={this.state.slider?.slickNext}
-                      size={20}
-                    />
+                    <span ref={this.setSliderNextRef}>
+                      <IconButton
+                        name={icons.ARROW_RIGHT}
+                        title={translate('ScrollMovies')}
+                        size={20}
+                      />
+                    </span>
                   </div>
               }
 
@@ -270,9 +269,23 @@ class CollectionOverview extends Component {
             {
               showPosters ?
                 <div className={styles.sliderContainer}>
-                  <Slider ref={this.setSliderRef} {...sliderSettings}>
+                  <Swiper
+                    slidesPerView='auto'
+                    spaceBetween={10}
+                    slidesPerGroup={3}
+                    loop={false}
+                    loopFillGroupWithBlank={true}
+                    className="mySwiper"
+                    modules={[Navigation]}
+                    onInit={(swiper) => {
+                      swiper.params.navigation.prevEl = this._swiperPrevRef;
+                      swiper.params.navigation.nextEl = this._swiperNextRef;
+                      swiper.navigation.init();
+                      swiper.navigation.update();
+                    }}
+                  >
                     {movies.map((movie) => (
-                      <div className={styles.movie} key={movie.tmdbId}>
+                      <SwiperSlide key={movie.tmdbId} style={{ width: posterWidth }}>
                         <CollectionMovieConnector
                           key={movie.tmdbId}
                           posterWidth={posterWidth}
@@ -281,9 +294,9 @@ class CollectionOverview extends Component {
                           collectionId={id}
                           {...movie}
                         />
-                      </div>
+                      </SwiperSlide>
                     ))}
-                  </Slider>
+                  </Swiper>
                 </div> :
                 <div className={styles.labelsContainer}>
                   {movies.map((movie) => (

frontend/src/Components/Page/PageJumpBar.css

@@ -1,4 +1,5 @@
 .jumpBar {
+  z-index: $pageJumpBarZIndex;
   display: flex;
   align-content: stretch;
   align-items: stretch;

frontend/src/Components/Page/Toolbar/PageToolbarButton.css

@@ -2,7 +2,8 @@
   composes: link from '~Components/Link/Link.css';
 
   padding-top: 4px;
-  width: $toolbarButtonWidth;
+  min-width: $toolbarButtonWidth;
+  width: min-content;
   text-align: center;
 
   &:hover {

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

@@ -192,7 +192,7 @@ class TableOptionsModal extends Component {
                                       <TableOptionsColumnDragSource
                                         key={name}
                                         name={name}
-                                        label={label || columnLabel}
+                                        label={columnLabel || label}
                                         isVisible={isVisible}
                                         isModifiable={true}
                                         index={index}
@@ -210,7 +210,7 @@ class TableOptionsModal extends Component {
                                     <TableOptionsColumn
                                       key={name}
                                       name={name}
-                                      label={label || columnLabel}
+                                      label={columnLabel || label}
                                       isVisible={isVisible}
                                       index={index}
                                       isModifiable={false}

frontend/src/Helpers/Props/icons.js

@@ -22,6 +22,7 @@ import {
 import {
   faArrowCircleLeft as fasArrowCircleLeft,
   faArrowCircleRight as fasArrowCircleRight,
+  faAsterisk as fasAsterisk,
   faBackward as fasBackward,
   faBan as fasBan,
   faBars as fasBars,
@@ -154,6 +155,7 @@ export const FILE = farFile;
 export const FILM = fasFilm;
 export const FILTER = fasFilter;
 export const FLAG = fasFlag;
+export const FOOTNOTE = fasAsterisk;
 export const FOLDER = farFolder;
 export const FOLDER_OPEN = fasFolderOpen;
 export const GENRE = fasTheaterMasks;

frontend/src/InteractiveImport/ReleaseGroup/SelectReleaseGroupModalContent.css

@@ -0,0 +1,7 @@
+.modalBody {
+  composes: modalBody from '~Components/Modal/ModalBody.css';
+
+  display: flex;
+  flex: 1 1 auto;
+  flex-direction: column;
+}

frontend/src/InteractiveImport/ReleaseGroup/SelectReleaseGroupModalContent.js

@@ -9,8 +9,9 @@ import ModalBody from 'Components/Modal/ModalBody';
 import ModalContent from 'Components/Modal/ModalContent';
 import ModalFooter from 'Components/Modal/ModalFooter';
 import ModalHeader from 'Components/Modal/ModalHeader';
-import { inputTypes, kinds } from 'Helpers/Props';
+import { inputTypes, kinds, scrollDirections } from 'Helpers/Props';
 import translate from 'Utilities/String/translate';
+import styles from './SelectReleaseGroupModalContent.css';
 
 class SelectReleaseGroupModalContent extends Component {
 
@@ -58,7 +59,10 @@ class SelectReleaseGroupModalContent extends Component {
           {translate('ManualImportSetReleaseGroup')}
         </ModalHeader>
 
-        <ModalBody>
+        <ModalBody
+          className={styles.modalBody}
+          scrollDirection={scrollDirections.NONE}
+        >
           <Form>
             <FormGroup>
               <FormLabel>{translate('ReleaseGroup')}</FormLabel>
@@ -67,6 +71,7 @@ class SelectReleaseGroupModalContent extends Component {
                 type={inputTypes.TEXT}
                 name="releaseGroup"
                 value={releaseGroup}
+                autoFocus={true}
                 onChange={this.onReleaseGroupChange}
               />
             </FormGroup>

frontend/src/Movie/History/MovieHistoryRow.js

@@ -11,6 +11,7 @@ import { icons, kinds } from 'Helpers/Props';
 import MovieFormats from 'Movie/MovieFormats';
 import MovieLanguage from 'Movie/MovieLanguage';
 import MovieQuality from 'Movie/MovieQuality';
+import formatCustomFormatScore from 'Utilities/Number/formatCustomFormatScore';
 import translate from 'Utilities/String/translate';
 import styles from './MovieHistoryRow.css';
 
@@ -104,6 +105,10 @@ class MovieHistoryRow extends Component {
           />
         </TableRowCell>
 
+        <TableRowCell key={name}>
+          {formatCustomFormatScore(data.customFormatScore)}
+        </TableRowCell>
+
         <RelativeDateCellConnector
           date={date}
         />

frontend/src/Movie/History/MovieHistoryTableContent.js

@@ -1,5 +1,6 @@
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
+import Icon from 'Components/Icon';
 import IconButton from 'Components/Link/IconButton';
 import LoadingIndicator from 'Components/Loading/LoadingIndicator';
 import Table from 'Components/Table/Table';
@@ -35,6 +36,15 @@ const columns = [
     isSortable: false,
     isVisible: true
   },
+  {
+    name: 'customFormatScore',
+    label: React.createElement(Icon, {
+      name: icons.SCORE,
+      title: 'Custom format score'
+    }),
+    isSortable: true,
+    isVisible: true
+  },
   {
     name: 'date',
     label: translate('Date'),

frontend/src/Settings/CustomFormats/CustomFormats/CustomFormat.css

@@ -36,3 +36,9 @@
   margin: 0;
   border: none;
 }
+
+.label {
+  composes: label from '~Components/Label.css';
+
+  max-width: 100%;
+}

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

@@ -1,5 +1,6 @@
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
+import MiddleTruncate from 'react-middle-truncate';
 import Card from 'Components/Card';
 import Label from 'Components/Label';
 import IconButton from 'Components/Link/IconButton';
@@ -124,10 +125,15 @@ class CustomFormat extends Component {
 
               return (
                 <Label
+                  className={styles.label}
                   key={index}
                   kind={kind}
                 >
-                  {item.name}
+                  <MiddleTruncate
+                    text={item.name}
+                    start={10}
+                    end={14}
+                  />
                 </Label>
               );
             })

frontend/src/Settings/General/HostSettings.js

@@ -21,6 +21,7 @@ function HostSettings(props) {
     port,
     urlBase,
     instanceName,
+    applicationUrl,
     enableSsl,
     sslPort,
     sslCertPath,
@@ -90,6 +91,21 @@ function HostSettings(props) {
         />
       </FormGroup>
 
+      <FormGroup
+        advancedSettings={advancedSettings}
+        isAdvanced={true}
+      >
+        <FormLabel>{translate('ApplicationURL')}</FormLabel>
+
+        <FormInputGroup
+          type={inputTypes.TEXT}
+          name="applicationUrl"
+          helpText={translate('ApplicationUrlHelpText')}
+          onChange={onInputChange}
+          {...applicationUrl}
+        />
+      </FormGroup>
+
       <FormGroup
         advancedSettings={advancedSettings}
         isAdvanced={true}

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

@@ -166,7 +166,7 @@ function EditImportListModalContent(props) {
               </FormGroup>
 
               <FormGroup>
-                <FormLabel>{translate('Folder')}</FormLabel>
+                <FormLabel>{translate('RootFolder')}</FormLabel>
 
                 <FormInputGroup
                   type={inputTypes.ROOT_FOLDER_SELECT}

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

@@ -16,3 +16,20 @@
   margin-left: 10px;
   width: 200px;
 }
+
+.footNote {
+  display: flex;
+  color: $helpTextColor;
+
+  .icon {
+    margin-top: 3px;
+    margin-right: 5px;
+    padding: 2px;
+  }
+
+  code {
+    padding: 0 1px;
+    border: 1px solid $borderColor;
+    background-color: #f7f7f7;
+  }
+}

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

@@ -3,17 +3,94 @@ import React, { Component } from 'react';
 import FieldSet from 'Components/FieldSet';
 import SelectInput from 'Components/Form/SelectInput';
 import TextInput from 'Components/Form/TextInput';
+import Icon from 'Components/Icon';
 import Button from 'Components/Link/Button';
 import Modal from 'Components/Modal/Modal';
 import ModalBody from 'Components/Modal/ModalBody';
 import ModalContent from 'Components/Modal/ModalContent';
 import ModalFooter from 'Components/Modal/ModalFooter';
 import ModalHeader from 'Components/Modal/ModalHeader';
-import { sizes } from 'Helpers/Props';
+import { icons, sizes } from 'Helpers/Props';
 import translate from 'Utilities/String/translate';
 import NamingOption from './NamingOption';
 import styles from './NamingModal.css';
 
+const separatorOptions = [
+  { key: ' ', value: 'Space ( )' },
+  { key: '.', value: 'Period (.)' },
+  { key: '_', value: 'Underscore (_)' },
+  { key: '-', value: 'Dash (-)' }
+];
+
+const caseOptions = [
+  { key: 'title', value: translate('DefaultCase') },
+  { key: 'lower', value: translate('LowerCase') },
+  { key: 'upper', value: translate('UpperCase') }
+];
+
+const fileNameTokens = [
+  {
+    token: '{Movie Title} - {Quality Full}',
+    example: 'Movie Title (2010) - HDTV-720p Proper'
+  }
+];
+
+const movieTokens = [
+  { token: '{Movie Title}', example: 'Movie\'s Title' },
+  { token: '{Movie Title:DE}', example: 'Titel des Films' },
+  { token: '{Movie CleanTitle}', example: 'Movies Title' },
+  { token: '{Movie TitleThe}', example: 'Movie\'s Title, The' },
+  { token: '{Movie OriginalTitle}', example: 'Τίτλος ταινίας' },
+  { token: '{Movie CleanOriginalTitle}', example: 'Τίτλος ταινίας' },
+  { token: '{Movie TitleFirstCharacter}', example: 'M' },
+  { token: '{Movie Collection}', example: 'The Movie Collection' },
+  { token: '{Movie Certification}', example: 'R' },
+  { token: '{Release Year}', example: '2009' }
+];
+
+const movieIdTokens = [
+  { token: '{ImdbId}', example: 'tt12345' },
+  { token: '{TmdbId}', example: '123456' }
+];
+
+const qualityTokens = [
+  { token: '{Quality Full}', example: 'HDTV-720p Proper' },
+  { token: '{Quality Title}', example: 'HDTV-720p' }
+];
+
+const mediaInfoTokens = [
+  { token: '{MediaInfo Simple}', example: 'x264 DTS' },
+  { token: '{MediaInfo Full}', example: 'x264 DTS [EN+DE]', footNote: 1 },
+
+  { token: '{MediaInfo AudioCodec}', example: 'DTS' },
+  { token: '{MediaInfo AudioChannels}', example: '5.1' },
+  { token: '{MediaInfo AudioLanguages}', example: '[EN+DE]', footNote: 1 },
+  { token: '{MediaInfo SubtitleLanguages}', example: '[DE]', footNote: 1 },
+
+  { token: '{MediaInfo VideoCodec}', example: 'x264' },
+  { token: '{MediaInfo VideoBitDepth}', example: '10' },
+  { token: '{MediaInfo VideoDynamicRange}', example: 'HDR' },
+  { token: '{MediaInfo VideoDynamicRangeType}', example: 'DV HDR10' },
+  { token: '{MediaInfo 3D}', example: '3D' }
+];
+
+const releaseGroupTokens = [
+  { token: '{Release Group}', example: 'Rls Grp' }
+];
+
+const editionTokens = [
+  { token: '{Edition Tags}', example: 'IMAX' }
+];
+
+const customFormatTokens = [
+  { token: '{Custom Formats}', example: 'Surround Sound x264' }
+];
+
+const originalTokens = [
+  { token: '{Original Title}', example: 'Movie.Title.HDTV.x264-EVOLVE' },
+  { token: '{Original Filename}', example: 'movie title hdtv.x264-Evolve' }
+];
+
 class NamingModal extends Component {
 
   //
@@ -94,81 +171,6 @@ class NamingModal extends Component {
       case: tokenCase
     } = this.state;
 
-    const separatorOptions = [
-      { key: ' ', value: 'Space ( )' },
-      { key: '.', value: 'Period (.)' },
-      { key: '_', value: 'Underscore (_)' },
-      { key: '-', value: 'Dash (-)' }
-    ];
-
-    const caseOptions = [
-      { key: 'title', value: translate('DefaultCase') },
-      { key: 'lower', value: translate('LowerCase') },
-      { key: 'upper', value: translate('UpperCase') }
-    ];
-
-    const fileNameTokens = [
-      {
-        token: '{Movie Title} - {Quality Full}',
-        example: 'Movie Title (2010) - HDTV-720p Proper'
-      }
-    ];
-
-    const movieTokens = [
-      { token: '{Movie Title}', example: 'Movie\'s Title' },
-      { token: '{Movie Title:DE}', example: 'Titel des Films' },
-      { token: '{Movie CleanTitle}', example: 'Movies Title' },
-      { token: '{Movie TitleThe}', example: 'Movie\'s Title, The' },
-      { token: '{Movie OriginalTitle}', example: 'Τίτλος ταινίας' },
-      { token: '{Movie CleanOriginalTitle}', example: 'Τίτλος ταινίας' },
-      { token: '{Movie TitleFirstCharacter}', example: 'M' },
-      { token: '{Movie Collection}', example: 'The Movie Collection' },
-      { token: '{Movie Certification}', example: 'R' },
-      { token: '{Release Year}', example: '2009' }
-    ];
-
-    const movieIdTokens = [
-      { token: '{ImdbId}', example: 'tt12345' },
-      { token: '{TmdbId}', example: '123456' }
-    ];
-
-    const qualityTokens = [
-      { token: '{Quality Full}', example: 'HDTV-720p Proper' },
-      { token: '{Quality Title}', example: 'HDTV-720p' }
-    ];
-
-    const mediaInfoTokens = [
-      { token: '{MediaInfo Simple}', example: 'x264 DTS' },
-      { token: '{MediaInfo Full}', example: 'x264 DTS [EN+DE]' },
-
-      { token: '{MediaInfo AudioCodec}', example: 'DTS' },
-      { token: '{MediaInfo AudioChannels}', example: '5.1' },
-      { token: '{MediaInfo AudioLanguages}', example: '[EN+DE]' },
-      { token: '{MediaInfo SubtitleLanguages}', example: '[DE]' },
-
-      { token: '{MediaInfo VideoCodec}', example: 'x264' },
-      { token: '{MediaInfo VideoBitDepth}', example: '10' },
-      { token: '{MediaInfo VideoDynamicRange}', example: 'HDR' },
-      { token: '{MediaInfo VideoDynamicRangeType}', example: 'DV HDR10' }
-    ];
-
-    const releaseGroupTokens = [
-      { token: '{Release Group}', example: 'Rls Grp' }
-    ];
-
-    const editionTokens = [
-      { token: '{Edition Tags}', example: 'IMAX' }
-    ];
-
-    const customFormatTokens = [
-      { token: '{Custom Formats}', example: 'Surround Sound x264' }
-    ];
-
-    const originalTokens = [
-      { token: '{Original Title}', example: 'Movie.Title.HDTV.x264-EVOLVE' },
-      { token: '{Original Filename}', example: 'movie title hdtv.x264-Evolve' }
-    ];
-
     return (
       <Modal
         isOpen={isOpen}
@@ -297,7 +299,7 @@ class NamingModal extends Component {
                   <FieldSet legend={translate('MediaInfo')}>
                     <div className={styles.groups}>
                       {
-                        mediaInfoTokens.map(({ token, example }) => {
+                        mediaInfoTokens.map(({ token, example, footNote }) => {
                           return (
                             <NamingOption
                               key={token}
@@ -305,6 +307,7 @@ class NamingModal extends Component {
                               value={value}
                               token={token}
                               example={example}
+                              footNote={footNote}
                               tokenSeparator={tokenSeparator}
                               tokenCase={tokenCase}
                               onPress={this.onOptionPress}
@@ -314,6 +317,14 @@ class NamingModal extends Component {
                         )
                       }
                     </div>
+
+                    <div className={styles.footNote}>
+                      <Icon className={styles.icon} name={icons.FOOTNOTE} />
+                      <div>
+                        MediaInfo Full/AudioLanguages/SubtitleLanguages support a <code>:EN+DE</code> suffix allowing you to filter the languages included in the filename. Use <code>-DE</code> to exclude specific languages.
+                        Appending <code>+</code> (eg <code>:EN+</code>) will output <code>[EN]</code>/<code>[EN+--]</code>/<code>[--]</code> depending on excluded languages. For example <code>{'{'}MediaInfo Full:EN+DE{'}'}</code>.
+                      </div>
+                    </div>
                   </FieldSet>
 
                   <FieldSet legend={translate('ReleaseGroup')}>

frontend/src/Settings/MediaManagement/Naming/NamingOption.css

@@ -35,9 +35,15 @@
   display: flex;
   align-items: center;
   align-self: stretch;
+  justify-content: space-between;
   flex: 0 0 50%;
   padding: 6px 16px;
   background-color: #ddd;
+
+  .footNote {
+    padding: 2px;
+    color: #aaa;
+  }
 }
 
 .lower {

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

@@ -1,8 +1,9 @@
 import classNames from 'classnames';
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
+import Icon from 'Components/Icon';
 import Link from 'Components/Link/Link';
-import { sizes } from 'Helpers/Props';
+import { icons, sizes } from 'Helpers/Props';
 import styles from './NamingOption.css';
 
 class NamingOption extends Component {
@@ -39,6 +40,7 @@ class NamingOption extends Component {
       token,
       tokenSeparator,
       example,
+      footNote,
       tokenCase,
       isFullFilename,
       size
@@ -60,6 +62,11 @@ class NamingOption extends Component {
 
         <div className={styles.example}>
           {example.replace(/ /g, tokenSeparator)}
+
+          {
+            footNote !== 0 &&
+              <Icon className={styles.footNote} name={icons.FOOTNOTE} />
+          }
         </div>
       </Link>
     );
@@ -69,6 +76,7 @@ class NamingOption extends Component {
 NamingOption.propTypes = {
   token: PropTypes.string.isRequired,
   example: PropTypes.string.isRequired,
+  footNote: PropTypes.number.isRequired,
   tokenSeparator: PropTypes.string.isRequired,
   tokenCase: PropTypes.string.isRequired,
   isFullFilename: PropTypes.bool.isRequired,
@@ -77,6 +85,7 @@ NamingOption.propTypes = {
 };
 
 NamingOption.defaultProps = {
+  footNote: 0,
   size: sizes.SMALL,
   isFullFilename: false
 };

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

@@ -85,7 +85,7 @@ class DelayProfile extends Component {
       connectDragSource
     } = this.props;
 
-    let preferred = titleCase(preferredProtocol);
+    let preferred = `Prefer ${titleCase(preferredProtocol)}`;
 
     if (!enableUsenet) {
       preferred = translate('OnlyTorrent');

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

@@ -83,7 +83,7 @@ class DelayProfiles extends Component {
               <div>
                 <div className={styles.delayProfilesHeader}>
                   <div className={styles.column}>
-                    {translate('Protocol')}
+                    {translate('PreferredProtocol')}
                   </div>
                   <div className={styles.column}>
                     {translate('UsenetDelay')}

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

@@ -17,6 +17,13 @@ import { boolSettingShape, numberSettingShape, tagSettingShape } from 'Helpers/P
 import translate from 'Utilities/String/translate';
 import styles from './EditDelayProfileModalContent.css';
 
+const protocolOptions = [
+  { key: 'preferUsenet', value: translate('PreferUsenet') },
+  { key: 'preferTorrent', value: translate('PreferTorrent') },
+  { key: 'onlyUsenet', value: translate('OnlyUsenet') },
+  { key: 'onlyTorrent', value: translate('OnlyTorrent') }
+];
+
 function EditDelayProfileModalContent(props) {
   const {
     id,
@@ -26,7 +33,6 @@ function EditDelayProfileModalContent(props) {
     saveError,
     item,
     protocol,
-    protocolOptions,
     onInputChange,
     onProtocolChange,
     onSavePress,
@@ -52,22 +58,24 @@ function EditDelayProfileModalContent(props) {
 
       <ModalBody>
         {
-          isFetching &&
-            <LoadingIndicator />
+          isFetching ?
+            <LoadingIndicator /> :
+            null
         }
 
         {
-          !isFetching && !!error &&
+          !isFetching && !!error ?
             <div>
               {translate('UnableToAddANewQualityProfilePleaseTryAgain')}
-            </div>
+            </div> :
+            null
         }
 
         {
-          !isFetching && !error &&
+          !isFetching && !error ?
             <Form {...otherProps}>
               <FormGroup>
-                <FormLabel>{translate('Protocol')}</FormLabel>
+                <FormLabel>{translate('PreferredProtocol')}</FormLabel>
 
                 <FormInputGroup
                   type={inputTypes.SELECT}
@@ -143,19 +151,21 @@ function EditDelayProfileModalContent(props) {
                     />
                   </FormGroup>
               }
-            </Form>
+            </Form> :
+            null
         }
       </ModalBody>
       <ModalFooter>
         {
-          id && id > 1 &&
+          id && id > 1 ?
             <Button
               className={styles.deleteButton}
               kind={kinds.DANGER}
               onPress={onDeleteDelayProfilePress}
             >
               {translate('Delete')}
-            </Button>
+            </Button> :
+            null
         }
 
         <Button
@@ -193,7 +203,6 @@ EditDelayProfileModalContent.propTypes = {
   saveError: PropTypes.object,
   item: PropTypes.shape(delayProfileShape).isRequired,
   protocol: PropTypes.string.isRequired,
-  protocolOptions: PropTypes.arrayOf(PropTypes.object).isRequired,
   onInputChange: PropTypes.func.isRequired,
   onProtocolChange: PropTypes.func.isRequired,
   onSavePress: PropTypes.func.isRequired,

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

@@ -5,7 +5,6 @@ import { connect } from 'react-redux';
 import { createSelector } from 'reselect';
 import { saveDelayProfile, setDelayProfileValue } from 'Store/Actions/settingsActions';
 import selectSettings from 'Store/Selectors/selectSettings';
-import translate from 'Utilities/String/translate';
 import EditDelayProfileModalContent from './EditDelayProfileModalContent';
 
 const newDelayProfile = {
@@ -17,13 +16,6 @@ const newDelayProfile = {
   tags: []
 };
 
-const protocolOptions = [
-  { key: 'preferUsenet', value: translate('PreferUsenet') },
-  { key: 'preferTorrent', value: translate('PreferTorrent') },
-  { key: 'onlyUsenet', value: translate('OnlyUsenet') },
-  { key: 'onlyTorrent', value: translate('OnlyTorrent') }
-];
-
 function createDelayProfileSelector() {
   return createSelector(
     (state, { id }) => id,
@@ -79,7 +71,6 @@ function createMapStateToProps() {
 
       return {
         protocol,
-        protocolOptions,
         ...delayProfile
       };
     }

frontend/src/Store/Actions/discoverMovieActions.js

@@ -262,10 +262,10 @@ export const defaultState = {
       type: filterBuilderTypes.ARRAY,
       optionsSelector: function(items) {
         const collectionList = items.reduce((acc, movie) => {
-          if (movie.collection) {
+          if (movie.collection && movie.collection.title) {
             acc.push({
-              id: movie.collection.name,
-              name: movie.collection.name
+              id: movie.collection.title,
+              name: movie.collection.title
             });
           }
 

frontend/src/Store/Actions/historyActions.js

@@ -1,5 +1,7 @@
+import React from 'react';
 import { createAction } from 'redux-actions';
-import { filterTypes, sortDirections } from 'Helpers/Props';
+import Icon from 'Components/Icon';
+import { filterTypes, icons, sortDirections } from 'Helpers/Props';
 import { createThunk, handleThunks } from 'Store/thunks';
 import createAjaxRequest from 'Utilities/createAjaxRequest';
 import serverSideCollectionHandlers from 'Utilities/serverSideCollectionHandlers';
@@ -84,6 +86,15 @@ export const defaultState = {
       label: translate('SourceTitle'),
       isVisible: false
     },
+    {
+      name: 'customFormatScore',
+      columnLabel: translate('CustomFormatScore'),
+      label: React.createElement(Icon, {
+        name: icons.SCORE,
+        title: 'Custom format score'
+      }),
+      isVisible: false
+    },
     {
       name: 'details',
       columnLabel: translate('Details'),

frontend/src/Store/Actions/interactiveImportActions.js

@@ -4,6 +4,7 @@ import { batchActions } from 'redux-batched-actions';
 import { sortDirections } from 'Helpers/Props';
 import { createThunk, handleThunks } from 'Store/thunks';
 import createAjaxRequest from 'Utilities/createAjaxRequest';
+import naturalExpansion from 'Utilities/String/naturalExpansion';
 import { set, update, updateItem } from './baseActions';
 import createHandleActions from './Creators/createHandleActions';
 import createSetClientSideCollectionSortReducer from './Creators/Reducers/createSetClientSideCollectionSortReducer';
@@ -35,7 +36,7 @@ export const defaultState = {
     relativePath: function(item, direction) {
       const relativePath = item.relativePath;
 
-      return relativePath.toLowerCase();
+      return naturalExpansion(relativePath.toLowerCase());
     },
 
     movie: function(item, direction) {

frontend/src/Store/Actions/movieActions.js

@@ -116,7 +116,7 @@ export const filterPredicates = {
     const predicate = filterTypePredicates[type];
     const { collection } = item;
 
-    return predicate(collection ? collection.title : '', filterValue);
+    return predicate(collection && collection.title ? collection.title : '', filterValue);
   },
 
   originalLanguage: function(item, filterValue, type) {

frontend/src/Store/Actions/movieIndexActions.js

@@ -227,7 +227,7 @@ export const defaultState = {
     collection: function(item) {
       const { collection ={} } = item;
 
-      return collection.name;
+      return collection.title;
     },
 
     originalLanguage: function(item) {
@@ -339,7 +339,7 @@ export const defaultState = {
       type: filterBuilderTypes.ARRAY,
       optionsSelector: function(items) {
         const collectionList = items.reduce((acc, movie) => {
-          if (movie.collection) {
+          if (movie.collection && movie.collection.title) {
             acc.push({
               id: movie.collection.title,
               name: movie.collection.title

frontend/src/Styles/Variables/zIndexes.js

@@ -1,4 +1,5 @@
 module.exports = {
+  pageJumpBarZIndex: 10,
   modalZIndex: 1000,
   popperZIndex: 2000
 };

frontend/src/Utilities/Number/formatCustomFormatScore.js

@@ -0,0 +1,16 @@
+
+function formatCustomFormatScore(input) {
+  const score = Number(input);
+
+  if (score > 0) {
+    return `+${score}`;
+  }
+
+  if (score < 0) {
+    return score;
+  }
+
+  return '';
+}
+
+export default formatCustomFormatScore;

frontend/src/Utilities/String/naturalExpansion.js

@@ -0,0 +1,11 @@
+const regex = /\d+/g;
+
+function naturalExpansion(input) {
+  if (!input) {
+    return '';
+  }
+
+  return input.replace(regex, (n) => n.padStart(8, '0'));
+}
+
+export default naturalExpansion;

frontend/src/Utilities/String/titleCase.js

@@ -1,9 +1,11 @@
+const regex = /\b\w+/g;
+
 function titleCase(input) {
   if (!input) {
     return '';
   }
 
-  return input.replace(/\b\w+/g, (match) => {
+  return input.replace(regex, (match) => {
     return match.charAt(0).toUpperCase() + match.substr(1).toLowerCase();
   });
 }

package.json

@@ -45,7 +45,7 @@
     "jquery": "3.6.0",
     "lodash": "4.17.21",
     "mobile-detect": "1.4.5",
-    "moment": "2.29.2",
+    "moment": "2.29.4",
     "mousetrap": "1.6.5",
     "normalize.css": "8.0.1",
     "prop-types": "15.7.2",
@@ -62,8 +62,7 @@
     "react-document-title": "2.0.3",
     "react-dom": "17.0.2",
     "react-focus-lock": "2.5.0",
-    "react-slick": "0.28.1",
-    "slick-carousel": "1.8.1",
+    "swiper": "8.3.2",
     "react-google-recaptcha": "2.1.0",
     "react-lazyload": "3.2.0",
     "react-measure": "1.4.7",

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

@@ -212,6 +212,7 @@ namespace NzbDrone.Common.Test.Http
         }
 
         [Test]
+        [Platform(Exclude = "MacOsX", Reason = "Azure agent update prevents brotli on OSX")]
         public void should_execute_get_using_brotli()
         {
             var request = new HttpRequest($"https://{_httpBinHost}/brotli");

src/NzbDrone.Common.Test/InstrumentationTests/CleanseLogMessageFixture.cs

@@ -64,6 +64,7 @@ namespace NzbDrone.Common.Test.InstrumentationTests
         [TestCase("https://notifiarr.com/notifier.php: api=1234530f-422f-4aac-b6b3-01233210aaaa&radarr_health_issue_message=Download")]
         [TestCase("/readarr/signalr/messages/negotiate?access_token=1234530f422f4aacb6b301233210aaaa&negotiateVersion=1")]
         [TestCase(@"[Info] MigrationController: *** Migrating Database=radarr-main;Host=postgres14;Username=mySecret;Password=mySecret;Port=5432;Enlist=False ***")]
+        [TestCase(@"[Info] MigrationController: *** Migrating Database=radarr-main;Host=postgres14;Username=mySecret;Password=mySecret;Port=5432;token=mySecret;Enlist=False&username=mySecret;mypassword=mySecret;mypass=shouldkeep1;test_token=mySecret;password=123%@%_@!#^#@;use_password=mySecret;get_token=shouldkeep2;usetoken=shouldkeep3;passwrd=mySecret;")]
 
         // Announce URLs (passkeys) Magnet & Tracker
         [TestCase(@"magnet_uri"":""magnet:?xt=urn:btih:9pr04sgkillroyimaveql2tyu8xyui&dn=&tr=https%3a%2f%2fxxx.yyy%2f9pr04sg601233210imaveql2tyu8xyui%2fannounce""}")]
@@ -79,14 +80,33 @@ namespace NzbDrone.Common.Test.InstrumentationTests
         // Notifiarr
         [TestCase(@"https://xxx.yyy/api/v1/notification/radarr/9pr04sg6-0123-3210-imav-eql2tyu8xyui")]
 
+        // Discord
+        [TestCase(@"https://discord.com/api/webhooks/mySecret")]
+        [TestCase(@"https://discord.com/api/webhooks/mySecret/01233210")]
+
         public void should_clean_message(string message)
         {
             var cleansedMessage = CleanseLogMessage.Cleanse(message);
 
             cleansedMessage.Should().NotContain("mySecret");
+            cleansedMessage.Should().NotContain("123%@%_@!#^#@");
             cleansedMessage.Should().NotContain("01233210");
         }
 
+        [TestCase(@"[Info] MigrationController: *** Migrating Database=radarr-main;Host=postgres14;Username=mySecret;Password=mySecret;Port=5432;token=mySecret;Enlist=False&username=mySecret;mypassword=mySecret;mypass=shouldkeep1;test_token=mySecret;password=123%@%_@!#^#@;use_password=mySecret;get_token=shouldkeep2;usetoken=shouldkeep3;passwrd=mySecret;")]
+        public void should_keep_message(string message)
+        {
+            var cleansedMessage = CleanseLogMessage.Cleanse(message);
+
+            cleansedMessage.Should().NotContain("mySecret");
+            cleansedMessage.Should().NotContain("123%@%_@!#^#@");
+            cleansedMessage.Should().NotContain("01233210");
+
+            cleansedMessage.Should().Contain("shouldkeep1");
+            cleansedMessage.Should().Contain("shouldkeep2");
+            cleansedMessage.Should().Contain("shouldkeep3");
+        }
+
         [TestCase(@"Some message (from 32.2.3.5 user agent)")]
         [TestCase(@"Auth-Invalidated ip 32.2.3.5")]
         [TestCase(@"Auth-Success ip 32.2.3.5")]

src/NzbDrone.Common.Test/InstrumentationTests/SentryTargetFixture.cs

@@ -18,8 +18,10 @@ namespace NzbDrone.Common.Test.InstrumentationTests
         private static LogLevel[] SentryLevels = LogLevel.AllLevels.Where(x => x >= LogLevel.Error).ToArray();
         private static LogLevel[] OtherLevels = AllLevels.Except(SentryLevels).ToArray();
 
+        // TODO: SQLiteException filtering tests don't work on linux-86 and alpine customer Azure agents due to sqlite library not being loaded up, pass local
         private static Exception[] FilteredExceptions = new Exception[]
         {
+            // new SQLiteException(SQLiteErrorCode.Locked, "database is locked"),
             new UnauthorizedAccessException(),
             new AggregateException(new Exception[]
             {
@@ -30,6 +32,7 @@ namespace NzbDrone.Common.Test.InstrumentationTests
 
         private static Exception[] NonFilteredExceptions = new Exception[]
         {
+            // new SQLiteException(SQLiteErrorCode.Error, "it's borked"),
             new AggregateException(new Exception[]
             {
                 new UnauthorizedAccessException(),

src/NzbDrone.Common.Test/PathExtensionFixture.cs

@@ -278,7 +278,7 @@ namespace NzbDrone.Common.Test
         [Test]
         public void GetUpdateClientExePath()
         {
-            GetIAppDirectoryInfo().GetUpdateClientExePath(PlatformType.DotNet).Should().BeEquivalentTo(@"C:\Temp\radarr_update\Radarr.Update.exe".AsOsAgnostic());
+            GetIAppDirectoryInfo().GetUpdateClientExePath().Should().BeEquivalentTo(@"C:\Temp\radarr_update\Radarr.Update".AsOsAgnostic().ProcessNameToExe());
         }
 
         [Test]

src/NzbDrone.Common/Disk/DiskProviderBase.cs

@@ -264,6 +264,11 @@ namespace NzbDrone.Common.Disk
 
         protected virtual void MoveFileInternal(string source, string destination)
         {
+            if (File.Exists(destination))
+            {
+                throw new FileAlreadyExistsException("File already exists", destination);
+            }
+
             File.Move(source, destination);
         }
 

src/NzbDrone.Common/Disk/FileAlreadyExistsException.cs

@@ -0,0 +1,15 @@
+using System;
+
+namespace NzbDrone.Common.Disk
+{
+    public class FileAlreadyExistsException : Exception
+    {
+        public string Filename { get; set; }
+
+        public FileAlreadyExistsException(string message, string filename)
+            : base(message)
+        {
+            Filename = filename;
+        }
+    }
+}

src/NzbDrone.Common/EnvironmentInfo/PlatformInfo.cs

@@ -2,13 +2,6 @@ using System;
 
 namespace NzbDrone.Common.EnvironmentInfo
 {
-    public enum PlatformType
-    {
-        DotNet = 0,
-        Mono = 1,
-        NetCore = 2
-    }
-
     public interface IPlatformInfo
     {
         Version Version { get; }
@@ -16,31 +9,18 @@ namespace NzbDrone.Common.EnvironmentInfo
 
     public class PlatformInfo : IPlatformInfo
     {
-        private static PlatformType _platform;
         private static Version _version;
 
         static PlatformInfo()
         {
-            _platform = PlatformType.NetCore;
             _version = Environment.Version;
         }
 
-        public static PlatformType Platform => _platform;
-        public static bool IsDotNet => Platform == PlatformType.DotNet;
-        public static bool IsNetCore => Platform == PlatformType.NetCore;
-
         public static string PlatformName
         {
             get
             {
-                if (IsDotNet)
-                {
-                    return ".NET";
-                }
-                else
-                {
-                    return ".NET Core";
-                }
+                return ".NET";
             }
         }
 

src/NzbDrone.Common/Extensions/PathExtensions.cs

@@ -267,9 +267,9 @@ namespace NzbDrone.Common.Extensions
             return substring.Substring(0, lastSeparatorIndex);
         }
 
-        public static string ProcessNameToExe(this string processName, PlatformType runtime)
+        public static string ProcessNameToExe(this string processName)
         {
-            if (OsInfo.IsWindows || runtime != PlatformType.NetCore)
+            if (OsInfo.IsWindows)
             {
                 processName += ".exe";
             }
@@ -277,11 +277,6 @@ namespace NzbDrone.Common.Extensions
             return processName;
         }
 
-        public static string ProcessNameToExe(this string processName)
-        {
-            return processName.ProcessNameToExe(PlatformInfo.Platform);
-        }
-
         public static string GetAppDataPath(this IAppFolderInfo appFolderInfo)
         {
             return appFolderInfo.AppDataFolder;
@@ -352,9 +347,9 @@ namespace NzbDrone.Common.Extensions
             return Path.Combine(GetUpdatePackageFolder(appFolderInfo), UPDATE_CLIENT_FOLDER_NAME);
         }
 
-        public static string GetUpdateClientExePath(this IAppFolderInfo appFolderInfo, PlatformType runtime)
+        public static string GetUpdateClientExePath(this IAppFolderInfo appFolderInfo)
         {
-            return Path.Combine(GetUpdateSandboxFolder(appFolderInfo), UPDATE_CLIENT_EXE_NAME).ProcessNameToExe(runtime);
+            return Path.Combine(GetUpdateSandboxFolder(appFolderInfo), UPDATE_CLIENT_EXE_NAME).ProcessNameToExe();
         }
 
         public static string GetDatabase(this IAppFolderInfo appFolderInfo)

src/NzbDrone.Common/Http/HttpResponse.cs

@@ -55,7 +55,8 @@ namespace NzbDrone.Common.Http
                                        StatusCode == HttpStatusCode.Found ||
                                        StatusCode == HttpStatusCode.TemporaryRedirect ||
                                        StatusCode == HttpStatusCode.RedirectMethod ||
-                                       StatusCode == HttpStatusCode.SeeOther;
+                                       StatusCode == HttpStatusCode.SeeOther ||
+                                       StatusCode == HttpStatusCode.PermanentRedirect;
 
         public string[] GetCookieHeaders()
         {

src/NzbDrone.Common/Instrumentation/CleanseLogMessage.cs

@@ -18,7 +18,7 @@ namespace NzbDrone.Common.Instrumentation
                 new Regex(@"iptorrents\.com/[/a-z0-9?&;]*?(?:[?&;](u|tp)=(?<secret>[^&=;]+?))+(?= |;|&|$)", RegexOptions.Compiled | RegexOptions.IgnoreCase),
                 new Regex(@"/fetch/[a-z0-9]{32}/(?<secret>[a-z0-9]{32})", RegexOptions.Compiled),
                 new Regex(@"getnzb.*?(?<=\?|&)(r)=(?<secret>[^&=]+?)(?= |&|$)", RegexOptions.Compiled | RegexOptions.IgnoreCase),
-                new Regex(@"\b[^;=]*?(_?(?<!use|get_)token|username|passwo?rd)=(?<secret>[^&=]+?)(?= |&|$|;)", RegexOptions.Compiled | RegexOptions.IgnoreCase),
+                new Regex(@"\b(\w*)?(_?(?<!use|get_)token|username|passwo?rd)=(?<secret>[^&=]+?)(?= |&|$|;)", RegexOptions.Compiled | RegexOptions.IgnoreCase),
 
                 // Trackers Announce Keys; Designed for Qbit Json; should work for all in theory
                 new Regex(@"announce(\.php)?(/|%2f|%3fpasskey%3d)(?<secret>[a-z0-9]{16,})|(?<secret>[a-z0-9]{16,})(/|%2f)announce"),
@@ -50,7 +50,10 @@ namespace NzbDrone.Common.Instrumentation
                 new Regex(@"(?<=\?|&)(X-Plex-Client-Identifier|X-Plex-Token)=(?<secret>[^&=]+?)(?= |&|$)", RegexOptions.Compiled | RegexOptions.IgnoreCase),
 
                 // Notifiarr
-                new Regex(@"api/v[0-9]/notification/radarr/(?<secret>[\w-]+)", RegexOptions.Compiled | RegexOptions.IgnoreCase)
+                new Regex(@"api/v[0-9]/notification/radarr/(?<secret>[\w-]+)", RegexOptions.Compiled | RegexOptions.IgnoreCase),
+
+                // Discord
+                new Regex(@"discord.com/api/webhooks/((?<secret>[\w-]+)/)?(?<secret>[\w-]+)", RegexOptions.Compiled | RegexOptions.IgnoreCase)
             };
 
         private static readonly Regex CleanseRemoteIPRegex = new Regex(@"(?:Auth-\w+(?<!Failure|Unauthorized) ip|from) (\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})", RegexOptions.Compiled);

src/NzbDrone.Common/Instrumentation/Sentry/SentryTarget.cs

@@ -248,7 +248,7 @@ namespace NzbDrone.Common.Instrumentation.Sentry
                         var isSentry = true;
 
                         var sqlEx = ex as SQLiteException;
-                        if (sqlEx != null && !FilteredSQLiteErrors.Contains(sqlEx.ResultCode))
+                        if (sqlEx != null && FilteredSQLiteErrors.Contains(sqlEx.ResultCode))
                         {
                             isSentry = false;
                         }

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

@@ -1,6 +1,8 @@
-using FizzWare.NBuilder;
+using System;
+using FizzWare.NBuilder;
 using FluentAssertions;
 using NUnit.Framework;
+using NzbDrone.Core.Configuration;
 using NzbDrone.Core.DecisionEngine.Specifications;
 using NzbDrone.Core.MediaFiles;
 using NzbDrone.Core.Movies;
@@ -168,5 +170,80 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
                    .Should()
                    .BeFalse();
         }
+
+        [Test]
+        public void should_return_false_when_repack_but_auto_download_repack_is_false()
+        {
+            Mocker.GetMock<IConfigService>()
+                  .Setup(s => s.DownloadPropersAndRepacks)
+                  .Returns(ProperDownloadTypes.DoNotUpgrade);
+
+            _parsedMovieInfo.Quality.Revision.IsRepack = true;
+            _movie.MovieFileId = 1;
+            _movie.MovieFile = Builder<MovieFile>.CreateNew()
+                                                 .With(e => e.Quality = new QualityModel(Quality.SDTV))
+                                                 .With(e => e.ReleaseGroup = "Radarr")
+                                                 .Build();
+
+            var remoteMovie = Builder<RemoteMovie>.CreateNew()
+                                                      .With(e => e.ParsedMovieInfo = _parsedMovieInfo)
+                                                      .With(e => e.Movie = _movie)
+                                                      .Build();
+
+            Subject.IsSatisfiedBy(remoteMovie, null)
+                   .Accepted
+                   .Should()
+                   .BeFalse();
+        }
+
+        [Test]
+        public void should_return_true_when_repack_but_auto_download_repack_is_true()
+        {
+            Mocker.GetMock<IConfigService>()
+                  .Setup(s => s.DownloadPropersAndRepacks)
+                  .Returns(ProperDownloadTypes.PreferAndUpgrade);
+
+            _parsedMovieInfo.Quality.Revision.IsRepack = true;
+            _movie.MovieFileId = 1;
+            _movie.MovieFile = Builder<MovieFile>.CreateNew()
+                                                 .With(e => e.Quality = new QualityModel(Quality.SDTV))
+                                                 .With(e => e.ReleaseGroup = "Radarr")
+                                                 .Build();
+
+            var remoteMovie = Builder<RemoteMovie>.CreateNew()
+                                                      .With(e => e.ParsedMovieInfo = _parsedMovieInfo)
+                                                      .With(e => e.Movie = _movie)
+                                                      .Build();
+
+            Subject.IsSatisfiedBy(remoteMovie, null)
+                   .Accepted
+                   .Should()
+                   .BeTrue();
+        }
+
+        [Test]
+        public void should_return_true_when_repacks_are_not_preferred()
+        {
+            Mocker.GetMock<IConfigService>()
+                  .Setup(s => s.DownloadPropersAndRepacks)
+                  .Returns(ProperDownloadTypes.DoNotPrefer);
+
+            _parsedMovieInfo.Quality.Revision.IsRepack = true;
+            _movie.MovieFileId = 1;
+            _movie.MovieFile = Builder<MovieFile>.CreateNew()
+                                                 .With(e => e.Quality = new QualityModel(Quality.SDTV))
+                                                 .With(e => e.ReleaseGroup = "Radarr")
+                                                 .Build();
+
+            var remoteMovie = Builder<RemoteMovie>.CreateNew()
+                                                      .With(e => e.ParsedMovieInfo = _parsedMovieInfo)
+                                                      .With(e => e.Movie = _movie)
+                                                      .Build();
+
+            Subject.IsSatisfiedBy(remoteMovie, null)
+                   .Accepted
+                   .Should()
+                   .BeTrue();
+        }
     }
 }

src/NzbDrone.Core.Test/Extras/ExtraServiceFixture.cs

@@ -0,0 +1,245 @@
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using FizzWare.NBuilder;
+using Moq;
+using NUnit.Framework;
+using NzbDrone.Common.Disk;
+using NzbDrone.Common.Extensions;
+using NzbDrone.Core.Configuration;
+using NzbDrone.Core.Extras;
+using NzbDrone.Core.Extras.Files;
+using NzbDrone.Core.MediaFiles;
+using NzbDrone.Core.Movies;
+using NzbDrone.Core.Parser.Model;
+using NzbDrone.Core.Test.Framework;
+using NzbDrone.Test.Common;
+
+namespace NzbDrone.Core.Test.Extras
+{
+    [TestFixture]
+    public class ExtraServiceFixture : CoreTest<ExtraService>
+    {
+        private Movie _movie;
+        private MovieFile _movieFile;
+        private LocalMovie _localMovie;
+
+        private string _movieFolder;
+        private string _releaseFolder;
+
+        private Mock<IManageExtraFiles> _subtitleService;
+        private Mock<IManageExtraFiles> _otherExtraService;
+
+        [SetUp]
+        public void Setup()
+        {
+            _movieFolder = @"C:\Test\Movies\Movie Title".AsOsAgnostic();
+            _releaseFolder = @"C:\Test\Unsorted TV\Movie.Title.2022".AsOsAgnostic();
+
+            _movie = Builder<Movie>.CreateNew()
+                                     .With(s => s.Path = _movieFolder)
+                                     .Build();
+
+            _movieFile = Builder<MovieFile>.CreateNew()
+                                               .With(f => f.Path = Path.Combine(_movie.Path, "Movie Title - 2022.mkv").AsOsAgnostic())
+                                               .With(f => f.RelativePath = @"Movie Title - 2022.mkv".AsOsAgnostic())
+                                               .Build();
+
+            _localMovie = Builder<LocalMovie>.CreateNew()
+                                                 .With(l => l.Movie = _movie)
+                                                 .With(l => l.Path = Path.Combine(_releaseFolder, "Movie.Title.2022.mkv").AsOsAgnostic())
+                                                 .Build();
+
+            _subtitleService = new Mock<IManageExtraFiles>();
+            _subtitleService.SetupGet(s => s.Order).Returns(0);
+            _subtitleService.Setup(s => s.CanImportFile(It.IsAny<LocalMovie>(), It.IsAny<MovieFile>(), It.IsAny<string>(), It.IsAny<string>(), It.IsAny<bool>()))
+                .Returns(false);
+            _subtitleService.Setup(s => s.CanImportFile(It.IsAny<LocalMovie>(), It.IsAny<MovieFile>(), It.IsAny<string>(), ".srt", It.IsAny<bool>()))
+                .Returns(true);
+
+            _otherExtraService = new Mock<IManageExtraFiles>();
+            _otherExtraService.SetupGet(s => s.Order).Returns(1);
+            _otherExtraService.Setup(s => s.CanImportFile(It.IsAny<LocalMovie>(), It.IsAny<MovieFile>(), It.IsAny<string>(), It.IsAny<string>(), It.IsAny<bool>()))
+                .Returns(true);
+
+            Mocker.SetConstant<IEnumerable<IManageExtraFiles>>(new[]
+            {
+                _subtitleService.Object,
+                _otherExtraService.Object
+            });
+
+            Mocker.GetMock<IDiskProvider>().Setup(s => s.FolderExists(It.IsAny<string>()))
+                  .Returns(false);
+
+            Mocker.GetMock<IDiskProvider>().Setup(s => s.GetParentFolder(It.IsAny<string>()))
+                  .Returns((string path) => Directory.GetParent(path).FullName);
+
+            WithExistingFolder(_movie.Path);
+            WithExistingFile(_movieFile.Path);
+            WithExistingFile(_localMovie.Path);
+
+            Mocker.GetMock<IConfigService>().Setup(v => v.ImportExtraFiles).Returns(true);
+            Mocker.GetMock<IConfigService>().Setup(v => v.ExtraFileExtensions).Returns("nfo,srt");
+        }
+
+        private void WithExistingFolder(string path, bool exists = true)
+        {
+            var dir = Path.GetDirectoryName(path);
+
+            if (exists && dir.IsNotNullOrWhiteSpace())
+            {
+                WithExistingFolder(dir);
+            }
+
+            Mocker.GetMock<IDiskProvider>().Setup(v => v.FolderExists(path)).Returns(exists);
+        }
+
+        private void WithExistingFile(string path, bool exists = true, int size = 1000)
+        {
+            var dir = Path.GetDirectoryName(path);
+
+            if (exists && dir.IsNotNullOrWhiteSpace())
+            {
+                WithExistingFolder(dir);
+            }
+
+            Mocker.GetMock<IDiskProvider>().Setup(v => v.FileExists(path)).Returns(exists);
+            Mocker.GetMock<IDiskProvider>().Setup(v => v.GetFileSize(path)).Returns(size);
+        }
+
+        private void WithExistingFiles(List<string> files)
+        {
+            foreach (string file in files)
+            {
+                WithExistingFile(file);
+            }
+
+            Mocker.GetMock<IDiskProvider>().Setup(s => s.GetFiles(_releaseFolder, It.IsAny<SearchOption>()))
+                  .Returns(files.ToArray());
+        }
+
+        [Test]
+        public void should_not_pass_file_if_import_disabled()
+        {
+            Mocker.GetMock<IConfigService>().Setup(v => v.ImportExtraFiles).Returns(false);
+
+            var nfofile = Path.Combine(_releaseFolder, "Movie.Title.2022.nfo").AsOsAgnostic();
+
+            var files = new List<string>
+            {
+                _localMovie.Path,
+                nfofile
+            };
+
+            WithExistingFiles(files);
+
+            Subject.ImportMovie(_localMovie, _movieFile, true);
+
+            _subtitleService.Verify(v => v.CanImportFile(_localMovie, _movieFile, It.IsAny<string>(), It.IsAny<string>(), true), Times.Never());
+            _otherExtraService.Verify(v => v.CanImportFile(_localMovie, _movieFile, It.IsAny<string>(), It.IsAny<string>(), true), Times.Never());
+        }
+
+        [Test]
+        [TestCase("Movie Title - 2022.sub")]
+        [TestCase("Movie Title - 2022.ass")]
+        public void should_not_pass_unwanted_file(string filePath)
+        {
+            Mocker.GetMock<IConfigService>().Setup(v => v.ImportExtraFiles).Returns(false);
+
+            var nfofile = Path.Combine(_releaseFolder, filePath).AsOsAgnostic();
+
+            var files = new List<string>
+            {
+                _localMovie.Path,
+                nfofile
+            };
+
+            WithExistingFiles(files);
+
+            Subject.ImportMovie(_localMovie, _movieFile, true);
+
+            _subtitleService.Verify(v => v.CanImportFile(_localMovie, _movieFile, It.IsAny<string>(), It.IsAny<string>(), true), Times.Never());
+            _otherExtraService.Verify(v => v.CanImportFile(_localMovie, _movieFile, It.IsAny<string>(), It.IsAny<string>(), true), Times.Never());
+        }
+
+        [Test]
+        public void should_pass_subtitle_file_to_subtitle_service()
+        {
+            var subtitleFile = Path.Combine(_releaseFolder, "Movie.Title.2022.en.srt").AsOsAgnostic();
+
+            var files = new List<string>
+            {
+                _localMovie.Path,
+                subtitleFile
+            };
+
+            WithExistingFiles(files);
+
+            Subject.ImportMovie(_localMovie, _movieFile, true);
+
+            _subtitleService.Verify(v => v.ImportFiles(_localMovie, _movieFile, new List<string> { subtitleFile }, true), Times.Once());
+            _otherExtraService.Verify(v => v.ImportFiles(_localMovie, _movieFile, new List<string> { subtitleFile }, true), Times.Never());
+        }
+
+        [Test]
+        public void should_pass_nfo_file_to_other_service()
+        {
+            var nfofile = Path.Combine(_releaseFolder, "Movie.Title.2022.nfo").AsOsAgnostic();
+
+            var files = new List<string>
+            {
+                _localMovie.Path,
+                nfofile
+            };
+
+            WithExistingFiles(files);
+
+            Subject.ImportMovie(_localMovie, _movieFile, true);
+
+            _subtitleService.Verify(v => v.ImportFiles(_localMovie, _movieFile, new List<string> { nfofile }, true), Times.Never());
+            _otherExtraService.Verify(v => v.ImportFiles(_localMovie, _movieFile, new List<string> { nfofile }, true), Times.Once());
+        }
+
+        [Test]
+        public void should_search_subtitles_when_importing_from_job_folder()
+        {
+            _localMovie.FolderMovieInfo = new ParsedMovieInfo();
+
+            var subtitleFile = Path.Combine(_releaseFolder, "Movie.Title.2022.en.srt").AsOsAgnostic();
+
+            var files = new List<string>
+            {
+                _localMovie.Path,
+                subtitleFile
+            };
+
+            WithExistingFiles(files);
+
+            Subject.ImportMovie(_localMovie, _movieFile, true);
+
+            Mocker.GetMock<IDiskProvider>().Verify(v => v.GetFiles(_releaseFolder, SearchOption.AllDirectories), Times.Once);
+            Mocker.GetMock<IDiskProvider>().Verify(v => v.GetFiles(_releaseFolder, SearchOption.TopDirectoryOnly), Times.Never);
+        }
+
+        [Test]
+        public void should_not_search_subtitles_when_not_importing_from_job_folder()
+        {
+            _localMovie.FolderMovieInfo = null;
+
+            var subtitleFile = Path.Combine(_releaseFolder, "Movie.Title.2022.en.srt").AsOsAgnostic();
+
+            var files = new List<string>
+            {
+                _localMovie.Path,
+                subtitleFile
+            };
+
+            WithExistingFiles(files);
+
+            Subject.ImportMovie(_localMovie, _movieFile, true);
+
+            Mocker.GetMock<IDiskProvider>().Verify(v => v.GetFiles(_releaseFolder, SearchOption.AllDirectories), Times.Never);
+            Mocker.GetMock<IDiskProvider>().Verify(v => v.GetFiles(_releaseFolder, SearchOption.TopDirectoryOnly), Times.Once);
+        }
+    }
+}

src/NzbDrone.Core.Test/Extras/Others/OtherExtraServiceFixture.cs

@@ -0,0 +1,84 @@
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using FizzWare.NBuilder;
+using FluentAssertions;
+using NUnit.Framework;
+using NzbDrone.Common.Extensions;
+using NzbDrone.Core.Extras.Others;
+using NzbDrone.Core.MediaFiles;
+using NzbDrone.Core.Movies;
+using NzbDrone.Core.Parser.Model;
+using NzbDrone.Core.Test.Framework;
+using NzbDrone.Test.Common;
+
+namespace NzbDrone.Core.Test.Extras.Others
+{
+    [TestFixture]
+    public class OtherExtraServiceFixture : CoreTest<OtherExtraService>
+    {
+        private Movie _movie;
+        private MovieFile _movieFile;
+        private LocalMovie _localMovie;
+
+        private string _movieFolder;
+        private string _releaseFolder;
+
+        [SetUp]
+        public void Setup()
+        {
+            _movieFolder = @"C:\Test\Movies\Movie Title".AsOsAgnostic();
+            _releaseFolder = @"C:\Test\Unsorted Movies\Movie.Title.2022".AsOsAgnostic();
+
+            _movie = Builder<Movie>.CreateNew()
+                                     .With(s => s.Path = _movieFolder)
+                                     .Build();
+
+            _movieFile = Builder<MovieFile>.CreateNew()
+                                               .With(f => f.Path = Path.Combine(_movie.Path, "Movie Title - 2022.mkv").AsOsAgnostic())
+                                               .With(f => f.RelativePath = @"Movie Title - 2022.mkv")
+                                               .Build();
+
+            _localMovie = Builder<LocalMovie>.CreateNew()
+                                                 .With(l => l.Movie = _movie)
+                                                 .With(l => l.Path = Path.Combine(_releaseFolder, "Movie.Title.2022.mkv").AsOsAgnostic())
+                                                 .With(l => l.FileMovieInfo = new ParsedMovieInfo
+                                                 {
+                                                     MovieTitles = new List<string> { "Movie Title" },
+                                                     Year = 2022
+                                                 })
+                                                 .Build();
+        }
+
+        [Test]
+        [TestCase("Movie Title - 2022.nfo", "Movie Title - 2022.nfo")]
+        [TestCase("Movie.Title.2022.nfo", "Movie Title - 2022.nfo")]
+        [TestCase("Movie Title 2022.nfo", "Movie Title - 2022.nfo")]
+        [TestCase("Movie_Title_2022.nfo", "Movie Title - 2022.nfo")]
+        [TestCase(@"Movie.Title.2022\thumb.jpg", "Movie Title - 2022.jpg")]
+        public void should_import_matching_file(string filePath, string expectedOutputPath)
+        {
+            var files = new List<string> { Path.Combine(_releaseFolder, filePath).AsOsAgnostic() };
+
+            var results = Subject.ImportFiles(_localMovie, _movieFile, files, true).ToList();
+
+            results.Count().Should().Be(1);
+
+            results[0].RelativePath.AsOsAgnostic().PathEquals(expectedOutputPath.AsOsAgnostic()).Should().Be(true);
+        }
+
+        [Test]
+        public void should_not_import_multiple_nfo_files()
+        {
+            var files = new List<string>
+            {
+                Path.Combine(_releaseFolder, "Movie.Title.2022.nfo").AsOsAgnostic(),
+                Path.Combine(_releaseFolder, "Movie_Title_2022.nfo").AsOsAgnostic(),
+            };
+
+            var results = Subject.ImportFiles(_localMovie, _movieFile, files, true).ToList();
+
+            results.Count().Should().Be(1);
+        }
+    }
+}

src/NzbDrone.Core.Test/Extras/Subtitles/SubtitleServiceFixture.cs

@@ -0,0 +1,179 @@
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using FizzWare.NBuilder;
+using FluentAssertions;
+using Moq;
+using NUnit.Framework;
+using NzbDrone.Common.Disk;
+using NzbDrone.Common.Extensions;
+using NzbDrone.Core.Extras.Subtitles;
+using NzbDrone.Core.MediaFiles;
+using NzbDrone.Core.MediaFiles.MovieImport;
+using NzbDrone.Core.Movies;
+using NzbDrone.Core.Parser.Model;
+using NzbDrone.Core.Test.Framework;
+using NzbDrone.Test.Common;
+
+namespace NzbDrone.Core.Test.Extras.Subtitles
+{
+    [TestFixture]
+    public class SubtitleServiceFixture : CoreTest<SubtitleService>
+    {
+        private Movie _movie;
+        private MovieFile _movieFile;
+        private LocalMovie _localMovie;
+
+        private string _MovieFolder;
+        private string _releaseFolder;
+
+        [SetUp]
+        public void Setup()
+        {
+            _MovieFolder = @"C:\Test\Movies\Movie Title".AsOsAgnostic();
+            _releaseFolder = @"C:\Test\Unsorted Movies\Movie.Title.2022".AsOsAgnostic();
+
+            _movie = Builder<Movie>.CreateNew()
+                                     .With(s => s.Path = _MovieFolder)
+                                     .Build();
+
+            _movieFile = Builder<MovieFile>.CreateNew()
+                                               .With(f => f.Path = Path.Combine(_movie.Path, "Movie Title - 2022.mkv").AsOsAgnostic())
+                                               .With(f => f.RelativePath = @"Movie Title - 2022.mkv".AsOsAgnostic())
+                                               .Build();
+
+            _localMovie = Builder<LocalMovie>.CreateNew()
+                                                 .With(l => l.Movie = _movie)
+                                                 .With(l => l.Path = Path.Combine(_releaseFolder, "Movie.Title.2022.mkv").AsOsAgnostic())
+                                                 .With(l => l.FileMovieInfo = new ParsedMovieInfo
+                                                 {
+                                                     MovieTitles = new List<string> { "Movie Title" },
+                                                     Year = 2022
+                                                 })
+                                                 .Build();
+
+            Mocker.GetMock<IDiskProvider>().Setup(s => s.GetParentFolder(It.IsAny<string>()))
+                  .Returns((string path) => Directory.GetParent(path).FullName);
+
+            Mocker.GetMock<IDetectSample>().Setup(s => s.IsSample(It.IsAny<MovieMetadata>(), It.IsAny<string>()))
+                  .Returns(DetectSampleResult.NotSample);
+        }
+
+        [Test]
+        [TestCase("Movie.Title.2022.en.nfo")]
+        public void should_not_import_non_subtitle_file(string filePath)
+        {
+            var files = new List<string> { Path.Combine(_releaseFolder, filePath).AsOsAgnostic() };
+
+            var results = Subject.ImportFiles(_localMovie, _movieFile, files, true).ToList();
+
+            results.Count().Should().Be(0);
+        }
+
+        [Test]
+        [TestCase("Movie Title - 2022.srt", "Movie Title - 2022.srt")]
+        [TestCase("Movie.Title.2022.en.srt", "Movie Title - 2022.en.srt")]
+        [TestCase("Movie.Title.2022.english.srt", "Movie Title - 2022.en.srt")]
+        [TestCase("Movie Title 2022_en_sdh_forced.srt", "Movie Title - 2022.en.sdh.forced.srt")]
+        [TestCase("Movie_Title_2022 en.srt", "Movie Title - 2022.en.srt")]
+        [TestCase(@"Subs\Movie.Title.2022\2_en.srt", "Movie Title - 2022.en.srt")]
+        [TestCase("sub.srt", "Movie Title - 2022.srt")]
+        public void should_import_matching_subtitle_file(string filePath, string expectedOutputPath)
+        {
+            var files = new List<string> { Path.Combine(_releaseFolder, filePath).AsOsAgnostic() };
+
+            var results = Subject.ImportFiles(_localMovie, _movieFile, files, true).ToList();
+
+            results.Count().Should().Be(1);
+
+            results[0].RelativePath.AsOsAgnostic().PathEquals(expectedOutputPath.AsOsAgnostic()).Should().Be(true);
+        }
+
+        [Test]
+        public void should_import_multiple_subtitle_files_per_language()
+        {
+            var files = new List<string>
+            {
+                Path.Combine(_releaseFolder, "Movie.Title.2022.en.srt").AsOsAgnostic(),
+                Path.Combine(_releaseFolder, "Movie.Title.2022.eng.srt").AsOsAgnostic(),
+                Path.Combine(_releaseFolder, "Subs", "Movie_Title_2022_en_forced.srt").AsOsAgnostic(),
+                Path.Combine(_releaseFolder, "Subs", "Movie.Title.2022", "2_fr.srt").AsOsAgnostic()
+            };
+
+            var expectedOutputs = new string[]
+            {
+                "Movie Title - 2022.1.en.srt",
+                "Movie Title - 2022.2.en.srt",
+                "Movie Title - 2022.en.forced.srt",
+                "Movie Title - 2022.fr.srt",
+            };
+
+            var results = Subject.ImportFiles(_localMovie, _movieFile, files, true).ToList();
+
+            results.Count().Should().Be(expectedOutputs.Length);
+
+            for (int i = 0; i < expectedOutputs.Length; i++)
+            {
+                results[i].RelativePath.AsOsAgnostic().PathEquals(expectedOutputs[i].AsOsAgnostic()).Should().Be(true);
+            }
+        }
+
+        [Test]
+        public void should_import_multiple_subtitle_files_per_language_with_tags()
+        {
+            var files = new List<string>
+            {
+                Path.Combine(_releaseFolder, "Movie.Title.2022.en.forced.cc.srt").AsOsAgnostic(),
+                Path.Combine(_releaseFolder, "Movie.Title.2022.other.en.forced.cc.srt").AsOsAgnostic(),
+                Path.Combine(_releaseFolder, "Movie.Title.2022.en.forced.sdh.srt").AsOsAgnostic(),
+                Path.Combine(_releaseFolder, "Movie.Title.2022.en.forced.default.srt").AsOsAgnostic(),
+            };
+
+            var expectedOutputs = new[]
+            {
+                "Movie Title - 2022.1.en.forced.cc.srt",
+                "Movie Title - 2022.2.en.forced.cc.srt",
+                "Movie Title - 2022.en.forced.sdh.srt",
+                "Movie Title - 2022.en.forced.default.srt"
+            };
+
+            var results = Subject.ImportFiles(_localMovie, _movieFile, files, true).ToList();
+
+            results.Count().Should().Be(expectedOutputs.Length);
+
+            for (int i = 0; i < expectedOutputs.Length; i++)
+            {
+                results[i].RelativePath.AsOsAgnostic().PathEquals(expectedOutputs[i].AsOsAgnostic()).Should().Be(true);
+            }
+        }
+
+        [Test]
+        [TestCase(@"Subs\2_en.srt", "Movie Title - 2022.en.srt")]
+        public void should_import_unmatching_subtitle_file_if_only_episode(string filePath, string expectedOutputPath)
+        {
+            var subtitleFile = Path.Combine(_releaseFolder, filePath).AsOsAgnostic();
+
+            var sampleFile = Path.Combine(_movie.Path, "Movie Title - 2022.sample.mkv").AsOsAgnostic();
+
+            var videoFiles = new string[]
+            {
+                _localMovie.Path,
+                sampleFile
+            };
+
+            Mocker.GetMock<IDiskProvider>().Setup(s => s.GetFiles(It.IsAny<string>(), SearchOption.AllDirectories))
+                  .Returns(videoFiles);
+
+            Mocker.GetMock<IDetectSample>().Setup(s => s.IsSample(It.IsAny<MovieMetadata>(), sampleFile))
+                  .Returns(DetectSampleResult.Sample);
+
+            var results = Subject.ImportFiles(_localMovie, _movieFile, new List<string> { subtitleFile }, true).ToList();
+
+            results.Count().Should().Be(1);
+
+            results[0].RelativePath.AsOsAgnostic().PathEquals(expectedOutputPath.AsOsAgnostic()).Should().Be(true);
+
+            ExceptionVerification.ExpectedWarns(1);
+        }
+    }
+}

src/NzbDrone.Core.Test/Languages/LanguageFixture.cs

@@ -47,6 +47,8 @@ namespace NzbDrone.Core.Test.Languages
                 new object[] { 32, Language.Ukrainian },
                 new object[] { 33, Language.Persian },
                 new object[] { 34, Language.Bengali },
+                new object[] { 35, Language.Slovak },
+                new object[] { 36, Language.Latvian },
             };
 
         public static object[] ToIntCases =
@@ -88,6 +90,8 @@ namespace NzbDrone.Core.Test.Languages
                 new object[] { Language.Ukrainian, 32 },
                 new object[] { Language.Persian, 33 },
                 new object[] { Language.Bengali, 34 },
+                new object[] { Language.Slovak, 35 },
+                new object[] { Language.Latvian, 36 },
             };
 
         [Test]

src/NzbDrone.Core.Test/MediaFiles/MovieImport/Aggregation/Aggregators/AggregateLanguageFixture.cs

@@ -70,7 +70,7 @@ namespace NzbDrone.Core.Test.MediaFiles.MovieImport.Aggregation.Aggregators
         [Test]
         public void should_return_default_if_no_info_is_known()
         {
-            var result = Subject.Aggregate(_localMovie, null, false);
+            var result = Subject.Aggregate(_localMovie, null);
 
             result.Languages.Should().Contain(_movie.MovieMetadata.Value.OriginalLanguage);
         }
@@ -83,7 +83,7 @@ namespace NzbDrone.Core.Test.MediaFiles.MovieImport.Aggregation.Aggregators
                             null,
                             null);
 
-            Subject.Aggregate(_localMovie, null, false).Languages.Should().Equal(new List<Language> { Language.French });
+            Subject.Aggregate(_localMovie, null).Languages.Should().Equal(new List<Language> { Language.French });
         }
 
         [Test]
@@ -94,7 +94,7 @@ namespace NzbDrone.Core.Test.MediaFiles.MovieImport.Aggregation.Aggregators
                             null,
                             null);
 
-            var aggregation = Subject.Aggregate(_localMovie, null, false);
+            var aggregation = Subject.Aggregate(_localMovie, null);
 
             aggregation.Languages.Should().Equal(new List<Language> { Language.German });
         }
@@ -107,7 +107,7 @@ namespace NzbDrone.Core.Test.MediaFiles.MovieImport.Aggregation.Aggregators
                             new List<Language> { Language.Spanish },
                             null);
 
-            Subject.Aggregate(_localMovie, null, false).Languages.Should().Equal(new List<Language> { Language.Spanish });
+            Subject.Aggregate(_localMovie, null).Languages.Should().Equal(new List<Language> { Language.Spanish });
         }
 
         [Test]
@@ -118,7 +118,7 @@ namespace NzbDrone.Core.Test.MediaFiles.MovieImport.Aggregation.Aggregators
                             new List<Language> { Language.Unknown },
                             null);
 
-            Subject.Aggregate(_localMovie, null, false).Languages.Should().Equal(new List<Language> { Language.French, Language.German });
+            Subject.Aggregate(_localMovie, null).Languages.Should().Equal(new List<Language> { Language.French, Language.German });
         }
 
         [Test]
@@ -129,7 +129,7 @@ namespace NzbDrone.Core.Test.MediaFiles.MovieImport.Aggregation.Aggregators
                             new List<Language> { Language.Unknown },
                             new List<Language> { Language.Japanese, Language.English });
 
-            Subject.Aggregate(_localMovie, null, false).Languages.Should().Equal(new List<Language> { Language.Japanese, Language.English });
+            Subject.Aggregate(_localMovie, null).Languages.Should().Equal(new List<Language> { Language.Japanese, Language.English });
         }
 
         [Test]
@@ -140,7 +140,7 @@ namespace NzbDrone.Core.Test.MediaFiles.MovieImport.Aggregation.Aggregators
                             new List<Language> { Language.Unknown },
                             new List<Language> { Language.Unknown });
 
-            Subject.Aggregate(_localMovie, null, false).Languages.Should().Equal(new List<Language> { Language.French, Language.German });
+            Subject.Aggregate(_localMovie, null).Languages.Should().Equal(new List<Language> { Language.French, Language.German });
         }
     }
 }

src/NzbDrone.Core.Test/MediaFiles/MovieImport/Aggregation/Aggregators/AggregateQualityFixture.cs

@@ -60,7 +60,7 @@ namespace NzbDrone.Core.Test.MediaFiles.MovieImport.Aggregation.Aggregators
 
             GivenAugmenters(_fileExtensionAugmenter, nullMock);
 
-            var result = Subject.Aggregate(new LocalMovie(), null, false);
+            var result = Subject.Aggregate(new LocalMovie(), null);
 
             result.Quality.SourceDetectionSource.Should().Be(QualityDetectionSource.Extension);
             result.Quality.ResolutionDetectionSource.Should().Be(QualityDetectionSource.Extension);
@@ -72,7 +72,7 @@ namespace NzbDrone.Core.Test.MediaFiles.MovieImport.Aggregation.Aggregators
         {
             GivenAugmenters(_fileExtensionAugmenter, _nameAugmenter);
 
-            var result = Subject.Aggregate(new LocalMovie(), null, false);
+            var result = Subject.Aggregate(new LocalMovie(), null);
 
             result.Quality.SourceDetectionSource.Should().Be(QualityDetectionSource.Name);
             result.Quality.ResolutionDetectionSource.Should().Be(QualityDetectionSource.Name);
@@ -84,7 +84,7 @@ namespace NzbDrone.Core.Test.MediaFiles.MovieImport.Aggregation.Aggregators
         {
             GivenAugmenters(_fileExtensionAugmenter, _mediaInfoAugmenter);
 
-            var result = Subject.Aggregate(new LocalMovie(), null, false);
+            var result = Subject.Aggregate(new LocalMovie(), null);
 
             result.Quality.SourceDetectionSource.Should().Be(QualityDetectionSource.Extension);
             result.Quality.ResolutionDetectionSource.Should().Be(QualityDetectionSource.MediaInfo);
@@ -96,7 +96,7 @@ namespace NzbDrone.Core.Test.MediaFiles.MovieImport.Aggregation.Aggregators
         {
             GivenAugmenters(_nameAugmenter, _mediaInfoAugmenter);
 
-            var result = Subject.Aggregate(new LocalMovie(), null, false);
+            var result = Subject.Aggregate(new LocalMovie(), null);
 
             result.Quality.SourceDetectionSource.Should().Be(QualityDetectionSource.Name);
             result.Quality.ResolutionDetectionSource.Should().Be(QualityDetectionSource.MediaInfo);
@@ -108,7 +108,7 @@ namespace NzbDrone.Core.Test.MediaFiles.MovieImport.Aggregation.Aggregators
         {
             GivenAugmenters(_nameAugmenter, _releaseNameAugmenter);
 
-            var result = Subject.Aggregate(new LocalMovie(), new DownloadClientItem(), false);
+            var result = Subject.Aggregate(new LocalMovie(), new DownloadClientItem());
 
             result.Quality.SourceDetectionSource.Should().Be(QualityDetectionSource.Name);
             result.Quality.ResolutionDetectionSource.Should().Be(QualityDetectionSource.Name);
@@ -120,7 +120,7 @@ namespace NzbDrone.Core.Test.MediaFiles.MovieImport.Aggregation.Aggregators
         {
             GivenAugmenters(_nameAugmenter, _releaseNameAugmenter);
 
-            var result = Subject.Aggregate(new LocalMovie(), new DownloadClientItem(), false);
+            var result = Subject.Aggregate(new LocalMovie(), new DownloadClientItem());
 
             result.Quality.Revision.Version.Should().Be(1);
             result.Quality.RevisionDetectionSource.Should().Be(QualityDetectionSource.Unknown);
@@ -134,7 +134,7 @@ namespace NzbDrone.Core.Test.MediaFiles.MovieImport.Aggregation.Aggregators
 
             GivenAugmenters(_nameAugmenter, _releaseNameAugmenter);
 
-            var result = Subject.Aggregate(new LocalMovie(), new DownloadClientItem(), false);
+            var result = Subject.Aggregate(new LocalMovie(), new DownloadClientItem());
 
             result.Quality.Revision.Version.Should().Be(2);
             result.Quality.RevisionDetectionSource.Should().Be(QualityDetectionSource.Name);
@@ -148,7 +148,7 @@ namespace NzbDrone.Core.Test.MediaFiles.MovieImport.Aggregation.Aggregators
 
             GivenAugmenters(_nameAugmenter, _releaseNameAugmenter);
 
-            var result = Subject.Aggregate(new LocalMovie(), new DownloadClientItem(), false);
+            var result = Subject.Aggregate(new LocalMovie(), new DownloadClientItem());
 
             result.Quality.Revision.Version.Should().Be(0);
             result.Quality.RevisionDetectionSource.Should().Be(QualityDetectionSource.Name);
@@ -165,7 +165,7 @@ namespace NzbDrone.Core.Test.MediaFiles.MovieImport.Aggregation.Aggregators
 
             GivenAugmenters(_nameAugmenter, _releaseNameAugmenter);
 
-            var result = Subject.Aggregate(new LocalMovie(), new DownloadClientItem(), false);
+            var result = Subject.Aggregate(new LocalMovie(), new DownloadClientItem());
 
             result.Quality.Revision.Version.Should().Be(2);
             result.Quality.RevisionDetectionSource.Should().Be(QualityDetectionSource.Name);

src/NzbDrone.Core.Test/MediaFiles/MovieImport/Aggregation/Aggregators/AggregateReleaseGroupFixture.cs

@@ -35,7 +35,7 @@ namespace NzbDrone.Core.Test.MediaFiles.MovieImport.Aggregation.Aggregators
                 Movie = _movie
             };
 
-            Subject.Aggregate(localMovie, null, false);
+            Subject.Aggregate(localMovie, null);
 
             localMovie.ReleaseGroup.Should().Be("Viva");
         }
@@ -55,7 +55,7 @@ namespace NzbDrone.Core.Test.MediaFiles.MovieImport.Aggregation.Aggregators
                 Movie = _movie
             };
 
-            Subject.Aggregate(localMovie, null, false);
+            Subject.Aggregate(localMovie, null);
 
             localMovie.ReleaseGroup.Should().Be("Drone");
         }
@@ -75,7 +75,7 @@ namespace NzbDrone.Core.Test.MediaFiles.MovieImport.Aggregation.Aggregators
                 Movie = _movie
             };
 
-            Subject.Aggregate(localMovie, null, false);
+            Subject.Aggregate(localMovie, null);
 
             localMovie.ReleaseGroup.Should().Be("Wizzy");
         }
@@ -95,7 +95,7 @@ namespace NzbDrone.Core.Test.MediaFiles.MovieImport.Aggregation.Aggregators
                 Movie = _movie
             };
 
-            Subject.Aggregate(localMovie, null, false);
+            Subject.Aggregate(localMovie, null);
 
             localMovie.ReleaseGroup.Should().Be("FraMeSToR");
         }
@@ -115,7 +115,7 @@ namespace NzbDrone.Core.Test.MediaFiles.MovieImport.Aggregation.Aggregators
                 Movie = _movie
             };
 
-            Subject.Aggregate(localMovie, null, false);
+            Subject.Aggregate(localMovie, null);
 
             localMovie.ReleaseGroup.Should().Be("FraMeSToR");
         }

src/NzbDrone.Core.Test/MediaFiles/MovieImport/GetSceneNameFixture.cs

@@ -0,0 +1,153 @@
+using System.Collections.Generic;
+using System.IO;
+using FizzWare.NBuilder;
+using FluentAssertions;
+using Moq;
+using NUnit.Framework;
+using NzbDrone.Core.MediaFiles;
+using NzbDrone.Core.MediaFiles.MovieImport;
+using NzbDrone.Core.Movies;
+using NzbDrone.Core.Parser.Model;
+using NzbDrone.Core.Profiles;
+using NzbDrone.Core.Qualities;
+using NzbDrone.Core.Test.Framework;
+using NzbDrone.Test.Common;
+
+namespace NzbDrone.Core.Test.MediaFiles.MovieImport
+{
+    [TestFixture]
+    public class GetSceneNameFixture : CoreTest
+    {
+        private LocalMovie _localMovie;
+        private string _movieName = "movie.title.2022.dvdrip.x264-ingot";
+
+        [SetUp]
+        public void Setup()
+        {
+            var movie = Builder<Movie>.CreateNew()
+                                        .With(e => e.Profile = new Profile { Items = Qualities.QualityFixture.GetDefaultQualities() })
+                                        .With(s => s.Path = @"C:\Test\Movies\Movie Title".AsOsAgnostic())
+                                        .Build();
+
+            _localMovie = new LocalMovie
+            {
+                Movie = movie,
+                Path = Path.Combine(movie.Path, "Movie Title - 2022 - Episode Title.mkv"),
+                Quality = new QualityModel(Quality.Bluray720p),
+                ReleaseGroup = "DRONE"
+            };
+        }
+
+        private void GivenExistingFileOnDisk()
+        {
+            Mocker.GetMock<IMediaFileService>()
+                  .Setup(s => s.GetFilesWithRelativePath(It.IsAny<int>(), It.IsAny<string>()))
+                  .Returns(new List<MovieFile>());
+        }
+
+        [Test]
+        public void should_use_download_client_item_title_as_scene_name()
+        {
+            _localMovie.DownloadClientMovieInfo = new ParsedMovieInfo
+            {
+                ReleaseTitle = _movieName
+            };
+
+            SceneNameCalculator.GetSceneName(_localMovie).Should()
+                               .Be(_movieName);
+        }
+
+        [Test]
+        public void should_not_use_download_client_item_title_as_scene_name_if_there_are_other_video_files()
+        {
+            _localMovie.OtherVideoFiles = true;
+            _localMovie.DownloadClientMovieInfo = new ParsedMovieInfo
+            {
+                ReleaseTitle = _movieName
+            };
+
+            _localMovie.Path = Path.Combine(@"C:\Test\Unsorted Movies", _movieName)
+                                     .AsOsAgnostic();
+
+            SceneNameCalculator.GetSceneName(_localMovie).Should()
+                               .BeNull();
+        }
+
+        [Test]
+        public void should_use_file_name_as_scenename_only_if_it_looks_like_scenename()
+        {
+            _localMovie.Path = Path.Combine(@"C:\Test\Unsorted Movies", _movieName + ".mkv")
+                                     .AsOsAgnostic();
+
+            SceneNameCalculator.GetSceneName(_localMovie).Should()
+                               .Be(_movieName);
+        }
+
+        [Test]
+        public void should_not_use_file_name_as_scenename_if_it_doesnt_look_like_scenename()
+        {
+            _localMovie.Path = Path.Combine(@"C:\Test\Unsorted Movies", _movieName, "aaaaa.mkv")
+                                     .AsOsAgnostic();
+
+            SceneNameCalculator.GetSceneName(_localMovie).Should()
+                               .BeNull();
+        }
+
+        [Test]
+        public void should_use_folder_name_as_scenename_only_if_it_looks_like_scenename()
+        {
+            _localMovie.FolderMovieInfo = new ParsedMovieInfo
+            {
+                ReleaseTitle = _movieName
+            };
+
+            SceneNameCalculator.GetSceneName(_localMovie).Should()
+                               .Be(_movieName);
+        }
+
+        [Test]
+        public void should_not_use_folder_name_as_scenename_if_it_doesnt_look_like_scenename()
+        {
+            _localMovie.Path = Path.Combine(@"C:\Test\Unsorted Movies", _movieName, "aaaaa.mkv")
+                                     .AsOsAgnostic();
+
+            _localMovie.FolderMovieInfo = new ParsedMovieInfo
+            {
+                ReleaseTitle = "aaaaa"
+            };
+
+            SceneNameCalculator.GetSceneName(_localMovie).Should()
+                               .BeNull();
+        }
+
+        [Test]
+        public void should_not_use_folder_name_as_scenename_if_there_are_other_video_files()
+        {
+            _localMovie.OtherVideoFiles = true;
+            _localMovie.Path = Path.Combine(@"C:\Test\Unsorted Movies", _movieName, "aaaaa.mkv")
+                                     .AsOsAgnostic();
+
+            _localMovie.FolderMovieInfo = new ParsedMovieInfo
+            {
+                ReleaseTitle = _movieName
+            };
+
+            SceneNameCalculator.GetSceneName(_localMovie).Should()
+                               .BeNull();
+        }
+
+        [TestCase(".mkv")]
+        [TestCase(".par2")]
+        [TestCase(".nzb")]
+        public void should_remove_extension_from_nzb_title_for_scene_name(string extension)
+        {
+            _localMovie.DownloadClientMovieInfo = new ParsedMovieInfo
+            {
+                ReleaseTitle = _movieName + extension
+            };
+
+            SceneNameCalculator.GetSceneName(_localMovie).Should()
+                               .Be(_movieName);
+        }
+    }
+}

src/NzbDrone.Core.Test/MediaFiles/MovieImport/ImportApprovedMoviesFixture.cs

@@ -159,84 +159,6 @@ namespace NzbDrone.Core.Test.MediaFiles.MovieImport
                           Times.Never());
         }
 
-        [Test]
-        public void should_use_nzb_title_as_scene_name()
-        {
-            GivenNewDownload();
-            _downloadClientItem.Title = "malcolm.in.the.middle.2015.dvdrip.xvid-ingot";
-
-            Subject.Import(new List<ImportDecision> { _approvedDecisions.First() }, true, _downloadClientItem);
-
-            Mocker.GetMock<IMediaFileService>().Verify(v => v.Add(It.Is<MovieFile>(c => c.SceneName == _downloadClientItem.Title)));
-        }
-
-        [TestCase(".mkv")]
-        [TestCase(".par2")]
-        [TestCase(".nzb")]
-        public void should_remove_extension_from_nzb_title_for_scene_name(string extension)
-        {
-            GivenNewDownload();
-            var title = "malcolm.in.the.middle.2015.dvdrip.xvid-ingot";
-
-            _downloadClientItem.Title = title + extension;
-
-            Subject.Import(new List<ImportDecision> { _approvedDecisions.First() }, true, _downloadClientItem);
-
-            Mocker.GetMock<IMediaFileService>().Verify(v => v.Add(It.Is<MovieFile>(c => c.SceneName == title)));
-        }
-
-        [Test]
-        public void should_use_file_name_as_scenename_only_if_it_looks_like_scenename()
-        {
-            GivenNewDownload();
-            _approvedDecisions.First().LocalMovie.Path = Path.Combine(_downloadClientItem.OutputPath.ToString(), "movie.title.2018.dvdrip.xvid-ingot.mkv");
-
-            Subject.Import(new List<ImportDecision> { _approvedDecisions.First() }, true);
-
-            Mocker.GetMock<IMediaFileService>().Verify(v => v.Add(It.Is<MovieFile>(c => c.SceneName == "movie.title.2018.dvdrip.xvid-ingot")));
-        }
-
-        [Test]
-        public void should_not_use_file_name_as_scenename_if_it_doesnt_looks_like_scenename()
-        {
-            GivenNewDownload();
-            _approvedDecisions.First().LocalMovie.Path = Path.Combine(_downloadClientItem.OutputPath.ToString(), "aaaaa.mkv");
-
-            Subject.Import(new List<ImportDecision> { _approvedDecisions.First() }, true);
-
-            Mocker.GetMock<IMediaFileService>().Verify(v => v.Add(It.Is<MovieFile>(c => c.SceneName == null)));
-        }
-
-        [Test]
-        public void should_use_folder_name_as_scenename_only_if_it_looks_like_scenename()
-        {
-            GivenNewDownload();
-            _approvedDecisions.First().LocalMovie.Path = Path.Combine(_downloadClientItem.OutputPath.ToString(), "aaaaa.mkv");
-            _approvedDecisions.First().LocalMovie.FolderMovieInfo = new ParsedMovieInfo
-            {
-                ReleaseTitle = "movie.title.2018.dvdrip.xvid-ingot"
-            };
-
-            Subject.Import(new List<ImportDecision> { _approvedDecisions.First() }, true);
-
-            Mocker.GetMock<IMediaFileService>().Verify(v => v.Add(It.Is<MovieFile>(c => c.SceneName == "movie.title.2018.dvdrip.xvid-ingot")));
-        }
-
-        [Test]
-        public void should_not_use_folder_name_as_scenename_if_it_doesnt_looks_like_scenename()
-        {
-            GivenNewDownload();
-            _approvedDecisions.First().LocalMovie.Path = Path.Combine(_downloadClientItem.OutputPath.ToString(), "aaaaa.mkv");
-            _approvedDecisions.First().LocalMovie.FolderMovieInfo = new ParsedMovieInfo
-            {
-                ReleaseTitle = "aaaaa.mkv"
-            };
-
-            Subject.Import(new List<ImportDecision> { _approvedDecisions.First() }, true);
-
-            Mocker.GetMock<IMediaFileService>().Verify(v => v.Add(It.Is<MovieFile>(c => c.SceneName == null)));
-        }
-
         [Test]
         public void should_import_larger_files_first()
         {
@@ -411,5 +333,18 @@ namespace NzbDrone.Core.Test.MediaFiles.MovieImport
 
             Mocker.GetMock<IMediaFileService>().Verify(v => v.Add(It.Is<MovieFile>(c => c.OriginalFilePath == $"subfolder\\{name}.mkv".AsOsAgnostic())));
         }
+
+        [Test]
+        public void should_include_scene_name_with_new_downloads()
+        {
+            var firstDecision = _approvedDecisions.First();
+            firstDecision.LocalMovie.SceneName = "Movie.Title.2022.dvdrip-DRONE";
+
+            Subject.Import(new List<ImportDecision> { _approvedDecisions.First() }, true);
+
+            Mocker.GetMock<IUpgradeMediaFiles>()
+                  .Verify(v => v.UpgradeMovieFile(It.Is<MovieFile>(e => e.SceneName == firstDecision.LocalMovie.SceneName), _approvedDecisions.First().LocalMovie, false),
+                      Times.Once());
+        }
     }
 }

src/NzbDrone.Core.Test/MediaFiles/MovieImport/ImportDecisionMakerFixture.cs

@@ -102,8 +102,8 @@ namespace NzbDrone.Core.Test.MediaFiles.MovieImport
         private void GivenAugmentationSuccess()
         {
             Mocker.GetMock<IAggregationService>()
-                  .Setup(s => s.Augment(It.IsAny<LocalMovie>(), It.IsAny<DownloadClientItem>(), It.IsAny<bool>()))
-                  .Callback<LocalMovie, DownloadClientItem, bool>((localMovie, downloadClientItem, otherFiles) =>
+                  .Setup(s => s.Augment(It.IsAny<LocalMovie>(), It.IsAny<DownloadClientItem>()))
+                  .Callback<LocalMovie, DownloadClientItem>((localMovie, downloadClientItem) =>
                   {
                       localMovie.Movie = _localMovie.Movie;
                   });
@@ -173,7 +173,7 @@ namespace NzbDrone.Core.Test.MediaFiles.MovieImport
             GivenSpecifications(_pass1);
 
             Mocker.GetMock<IAggregationService>()
-                  .Setup(c => c.Augment(It.IsAny<LocalMovie>(), It.IsAny<DownloadClientItem>(), It.IsAny<bool>()))
+                  .Setup(c => c.Augment(It.IsAny<LocalMovie>(), It.IsAny<DownloadClientItem>()))
                   .Throws<TestException>();
 
             _videoFiles = new List<string>
@@ -188,7 +188,7 @@ namespace NzbDrone.Core.Test.MediaFiles.MovieImport
             Subject.GetImportDecisions(_videoFiles, _movie);
 
             Mocker.GetMock<IAggregationService>()
-                  .Verify(c => c.Augment(It.IsAny<LocalMovie>(), It.IsAny<DownloadClientItem>(), It.IsAny<bool>()), Times.Exactly(_videoFiles.Count));
+                  .Verify(c => c.Augment(It.IsAny<LocalMovie>(), It.IsAny<DownloadClientItem>()), Times.Exactly(_videoFiles.Count));
 
             ExceptionVerification.ExpectedErrors(3);
         }
@@ -209,7 +209,7 @@ namespace NzbDrone.Core.Test.MediaFiles.MovieImport
             var fileNames = _videoFiles.Select(System.IO.Path.GetFileName);
 
             Mocker.GetMock<IAggregationService>()
-                  .Setup(c => c.Augment(It.IsAny<LocalMovie>(), It.IsAny<DownloadClientItem>(), It.IsAny<bool>()))
+                  .Setup(c => c.Augment(It.IsAny<LocalMovie>(), It.IsAny<DownloadClientItem>()))
                   .Throws<TestException>();
         }
 
@@ -217,7 +217,7 @@ namespace NzbDrone.Core.Test.MediaFiles.MovieImport
         public void should_return_a_decision_when_exception_is_caught()
         {
             Mocker.GetMock<IAggregationService>()
-                  .Setup(c => c.Augment(It.IsAny<LocalMovie>(), It.IsAny<DownloadClientItem>(), It.IsAny<bool>()))
+                  .Setup(c => c.Augment(It.IsAny<LocalMovie>(), It.IsAny<DownloadClientItem>()))
                   .Throws<TestException>();
 
             _videoFiles = new List<string>

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

@@ -20,9 +20,7 @@ using NzbDrone.Core.Test.Framework;
 
 namespace NzbDrone.Core.Test.OrganizerTests.FileNameBuilderTests
 {
-    [Platform(Exclude = "Win")]
     [TestFixture]
-
     public class FileNameBuilderFixture : CoreTest<FileNameBuilder>
     {
         private Movie _movie;
@@ -427,7 +425,6 @@ namespace NzbDrone.Core.Test.OrganizerTests.FileNameBuilderTests
                    .Should().Be("South.Park.H264.DTS.[EN+ES+IT]");
         }
 
-        [Ignore("not currently supported")]
         [Test]
         public void should_format_mediainfo_3d_properly()
         {
@@ -671,6 +668,27 @@ namespace NzbDrone.Core.Test.OrganizerTests.FileNameBuilderTests
                    .Should().Be(expected);
         }
 
+        [TestCase("eng/deu", "", "[EN+DE]")]
+        [TestCase("eng/nld/deu", "", "[EN+NL+DE]")]
+        [TestCase("eng/deu", ":DE", "[DE]")]
+        [TestCase("eng/nld/deu", ":EN+NL", "[EN+NL]")]
+        [TestCase("eng/nld/deu", ":NL+EN", "[NL+EN]")]
+        [TestCase("eng/nld/deu", ":-NL", "[EN+DE]")]
+        [TestCase("eng/nld/deu", ":DE+", "[DE+-]")]
+        [TestCase("eng/nld/deu", ":DE+NO.", "[DE].")]
+        [TestCase("eng/nld/deu", ":-EN-", "[NL+DE]-")]
+        public void should_format_subtitle_languages_all(string subtitleLanguages, string format, string expected)
+        {
+            _movieFile.ReleaseGroup = null;
+
+            GivenMediaInfoModel(subtitles: subtitleLanguages);
+
+            _namingConfig.StandardMovieFormat = "{MediaInfo SubtitleLanguages" + format + "}End";
+
+            Subject.BuildFileName(_movie, _movieFile)
+                   .Should().Be(expected + "End");
+        }
+
         [TestCase(HdrFormat.None, "South.Park")]
         [TestCase(HdrFormat.Hlg10, "South.Park.HDR")]
         [TestCase(HdrFormat.Hdr10, "South.Park.HDR")]

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

@@ -0,0 +1,23 @@
+using FluentAssertions;
+using NUnit.Framework;
+using NzbDrone.Core.Parser;
+using NzbDrone.Core.Test.Framework;
+
+namespace NzbDrone.Core.Test.ParserTests
+{
+    [TestFixture]
+    public class AnimeVersionFixture : CoreTest
+    {
+        [TestCase("Anime Title - 2018 - (BD 1080p HEVC FLAC) [Dual Audio] [Group]", 1)]
+        [TestCase("Anime Title - 2018v2 - (BD 1080p HEVC FLAC) [Dual Audio] [Group]", 2)]
+        [TestCase("Anime Title - 2018 v2 - (BD 1080p HEVC FLAC) [Dual Audio] [Group]", 2)]
+        [TestCase("[SubsPlease] Anime Title - 01 (1080p) [B1F227CF]", 1)]
+        [TestCase("[SubsPlease] Anime Title - 01v2 (1080p) [B1F227CF]", 2)]
+        [TestCase("[SubsPlease] Anime Title - 01 v2 (1080p) [B1F227CF]", 2)]
+        public void should_be_able_to_parse_repack(string title, int version)
+        {
+            var result = QualityParser.ParseQuality(title);
+            result.Revision.Version.Should().Be(version);
+        }
+    }
+}

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

@@ -27,6 +27,22 @@ namespace NzbDrone.Core.Test.ParserTests
             result.Languages.Should().BeEquivalentTo(Language.Unknown);
         }
 
+        [TestCase("Movie Title - 2022.en.sub")]
+        [TestCase("Movie Title - 2022.EN.sub")]
+        [TestCase("Movie Title - 2022.eng.sub")]
+        [TestCase("Movie Title - 2022.ENG.sub")]
+        [TestCase("Movie Title - 2022.English.sub")]
+        [TestCase("Movie Title - 2022.english.sub")]
+        [TestCase("Movie Title - 2022.en.cc.sub")]
+        [TestCase("Movie Title - 2022.en.sdh.sub")]
+        [TestCase("Movie Title - 2022.en.forced.sub")]
+        [TestCase("Movie Title - 2022.en.sdh.forced.sub")]
+        public void should_parse_subtitle_language_english(string fileName)
+        {
+            var result = LanguageParser.ParseSubtitleLanguage(fileName);
+            result.Should().Be(Language.English);
+        }
+
         [TestCase("Movie.Title.1994.French.1080p.XviD-LOL")]
         [TestCase("Movie Title : Other Title 2011 AVC.1080p.Blu-ray HD.VOSTFR.VFF")]
         [TestCase("Movie Title - Other Title 2011 Bluray 4k HDR HEVC AC3 VFF")]
@@ -55,6 +71,8 @@ namespace NzbDrone.Core.Test.ParserTests
         [TestCase("Movie Title (2020)[BDRemux AVC 1080p][E-AC3 DD Plus 5.1 Castellano-Inglés Subs]")]
         [TestCase("Movie Title (2020) [UHDRemux2160p HDR][DTS-HD MA 5.1 AC3 5.1 Castellano - True-HD 7.1 Atmos Inglés Subs]")]
         [TestCase("Movie Title (2016) [UHDRemux 2160p SDR] [Castellano DD 5.1 - Inglés DTS-HD MA 5.1 Subs]")]
+        [TestCase("Movie Title 2022 [HDTV 720p][Cap.101][AC3 5.1 Castellano][www.pctnew.ORG]")]
+        [TestCase("Movie Title 2022 [HDTV 720p][Cap.206][AC3 5.1 Español Castellano]")]
         public void should_parse_language_spanish(string postTitle)
         {
             var result = Parser.Parser.ParseMovieTitle(postTitle, true);
@@ -352,6 +370,16 @@ namespace NzbDrone.Core.Test.ParserTests
             result.Languages.Should().BeEquivalentTo(Language.Slovak);
         }
 
+        [TestCase("Movie.Title.2022.LV.WEBRip.XviD-LOL")]
+        [TestCase("Movie.Title.2022.lv.WEBRip.XviD-LOL")]
+        [TestCase("Movie.Title.2022.LATVIAN.WEBRip.XviD-LOL")]
+        [TestCase("Movie.Title.2022.Latvian.WEBRip.XviD-LOL")]
+        public void should_parse_language_latvian(string postTitle)
+        {
+            var result = Parser.Parser.ParseMovieTitle(postTitle);
+            result.Languages.Should().BeEquivalentTo(Language.Latvian);
+        }
+
         [TestCase("Movie.Title.en.sub")]
         [TestCase("Movie Title.eng.sub")]
         [TestCase("Movie.Title.eng.forced.sub")]

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

@@ -37,16 +37,13 @@ namespace NzbDrone.Core.Test.ParserTests
         [TestCase("or")]
         [TestCase("an")]
         [TestCase("of")]
-        public void should_remove_common_words(string word)
+        public void should_remove_common_words_from_middle_of_title(string word)
         {
             var dirtyFormat = new[]
                             {
                                 "word.{0}.word",
                                 "word {0} word",
-                                "word-{0}-word",
-                                "word.word.{0}",
-                                "word-word-{0}",
-                                "word-word {0}",
+                                "word-{0}-word"
                             };
 
             foreach (var s in dirtyFormat)
@@ -56,6 +53,27 @@ namespace NzbDrone.Core.Test.ParserTests
             }
         }
 
+        [TestCase("the")]
+        [TestCase("and")]
+        [TestCase("or")]
+        [TestCase("an")]
+        [TestCase("of")]
+        public void should_not_remove_common_words_from_end_of_title(string word)
+        {
+            var dirtyFormat = new[]
+                              {
+                                  "word.word.{0}",
+                                  "word-word-{0}",
+                                  "word-word {0}"
+                              };
+
+            foreach (var s in dirtyFormat)
+            {
+                var dirty = string.Format(s, word);
+                dirty.CleanMovieTitle().Should().Be("wordword" + word.ToLower());
+            }
+        }
+
         [Test]
         public void should_remove_a_from_middle_of_title()
         {

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

@@ -46,6 +46,7 @@ namespace NzbDrone.Core.Test.ParserTests
         [TestCase("A.I.Artificial.Movie.(2001)", "A.I. Artificial Movie")]
         [TestCase("A.Movie.Name.(1998)", "A Movie Name")]
         [TestCase("www.Torrenting.com - Movie.2008.720p.X264-DIMENSION", "Movie")]
+        [TestCase("www.5MovieRulz.tc - Movie (2000) Malayalam HQ HDRip - x264 - AAC - 700MB.mkv", "Movie")]
         [TestCase("Movie: The Movie World 2013", "Movie: The Movie World")]
         [TestCase("Movie.The.Final.Chapter.2016", "Movie The Final Chapter")]
         [TestCase("Der.Movie.James.German.Bluray.FuckYou.Pso.Why.cant.you.follow.scene.rules.1998", "Der Movie James")]

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

@@ -198,6 +198,8 @@ namespace NzbDrone.Core.Test.ParserTests
         [TestCase("Movie Title (2020) MULTi WEB 1080p x264-JiHEFF (S:317/L:28)", false)]
         [TestCase("Movie.Titles.2020.1080p.NF.WEB.DD2.0.x264-SNEAkY", false)]
         [TestCase("The.Movie.2022.NORDiC.1080p.DV.HDR.WEB.H 265-NiDHUG", false)]
+        [TestCase("Movie Title 2018 [WEB 1080p HEVC Opus] [Netaro]", false)]
+        [TestCase("Movie Title 2018 (WEB 1080p HEVC Opus) [Netaro]", false)]
         public void should_parse_webdl1080p_quality(string title, bool proper)
         {
             ParseAndVerifyQuality(title, Source.WEBDL, proper, Resolution.R1080p);
@@ -206,6 +208,7 @@ namespace NzbDrone.Core.Test.ParserTests
         [TestCase("Movie.Name.S04E01.iNTERNAL.1080p.WEBRip.x264-QRUS", false)]
         [TestCase("Movie.Name.1x04.ITA.1080p.WEBMux.x264-NovaRip", false)]
         [TestCase("Movie.Name.2019.S02E07.Chapter.15.The.Believer.4Kto1080p.DSNYP.Webrip.x265.10bit.EAC3.5.1.Atmos.GokiTAoE", false)]
+        [TestCase("Movie.Title.2019.1080p.AMZN.WEB-Rip.DDP.5.1.HEVC", false)]
         public void should_parse_webrip1080p_quality(string title, bool proper)
         {
             ParseAndVerifyQuality(title, Source.WEBRIP, proper, Resolution.R1080p);
@@ -314,6 +317,8 @@ namespace NzbDrone.Core.Test.ParserTests
         [TestCase("Movie.Title.M.2008.USA.BluRay.Remux.1080p.MPEG-2.DD.5.1-TDD")]
         [TestCase("Movie.Title.2018.1080p.BluRay.REMUX.MPEG-2.DTS-HD.MA.5.1-EPSiLON")]
         [TestCase("Movie.Title.II.2003.4K.BluRay.Remux.1080p.AVC.DTS-HD.MA.5.1-BMF")]
+        [TestCase("Movie Title 2022 (BDRemux 1080p HEVC FLAC) [Netaro]")]
+        [TestCase("[Vodes] Movie Title - Other Title (2020) [BDRemux 1080p HEVC Dual-Audio]")]
         public void should_parse_remux1080p_quality(string title)
         {
             ParseAndVerifyQuality(title, Source.BLURAY, false, Resolution.R1080p, Modifier.REMUX);

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

@@ -50,6 +50,8 @@ namespace NzbDrone.Core.Test.ParserTests
         [TestCase("The.Movie.Title.2013.720p.BluRay.x264-ROUGH [PublicHD]", "ROUGH")]
         [TestCase("Some.Really.Bad.Movie.Title.[2021].1080p.WEB-HDRip.Dual.Audio.[Hindi.[Clean]. .English].x264.AAC.DD.2.0.By.Full4Movies.mkv-xpost", null)]
         [TestCase("The.Movie.Title.2013.1080p.10bit.AMZN.WEB-DL.DDP5.1.HEVC-Vyndros", "Vyndros")]
+        [TestCase("Movie.Name.2022.1080p.BluRay.x264-[YTS.AG]", "YTS.AG")]
+        [TestCase("Movie.Title.2019.1080p.AMZN.WEB-Rip.DDP.5.1.HEVC", null)]
         public void should_parse_expected_release_group(string title, string expected)
         {
             Parser.Parser.ParseReleaseGroup(title).Should().Be(expected);
@@ -104,6 +106,7 @@ namespace NzbDrone.Core.Test.ParserTests
         [TestCase("Movie Title (2009) (2160p PMTP WEB-DL Hybrid H265 DV HDR10+ DDP Atmos 5.1 English - HONE)", "HONE")]
         [TestCase("Why.Cant.You.Use.Normal.Characters.2021.2160p.UHD.HDR10+.BluRay.TrueHD.Atmos.7.1.x265-ZØNEHD", "ZØNEHD")]
         [TestCase("Movie.Should.Not.Use.Dots.2022.1080p.BluRay.x265.10bit.Tigole", "Tigole")]
+        [TestCase("Movie.Title.2005.2160p.UHD.BluRay.TrueHD 7.1.Atmos.x265 - HQMUX", "HQMUX")]
         public void should_parse_exception_release_group(string title, string expected)
         {
             Parser.Parser.ParseReleaseGroup(title).Should().Be(expected);

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

@@ -69,7 +69,7 @@ namespace NzbDrone.Core.Test.UpdateTests
                   .Returns(true);
 
             Mocker.GetMock<IDiskProvider>()
-                  .Setup(v => v.FileExists(It.Is<string>(s => s.EndsWith("Radarr.Update.exe"))))
+                  .Setup(v => v.FileExists(It.Is<string>(s => s.EndsWith("Radarr.Update".ProcessNameToExe()))))
                   .Returns(true);
 
             _sandboxFolder = Mocker.GetMock<IAppFolderInfo>().Object.GetUpdateSandboxFolder();
@@ -165,7 +165,7 @@ namespace NzbDrone.Core.Test.UpdateTests
         public void should_return_with_warning_if_updater_doesnt_exists()
         {
             Mocker.GetMock<IDiskProvider>()
-                  .Setup(v => v.FileExists(It.Is<string>(s => s.EndsWith("Radarr.Update.exe"))))
+                  .Setup(v => v.FileExists(It.Is<string>(s => s.EndsWith("Radarr.Update".ProcessNameToExe()))))
                   .Returns(false);
 
             Subject.Execute(new ApplicationUpdateCommand());

src/NzbDrone.Core/Configuration/ConfigService.cs

@@ -428,6 +428,8 @@ namespace NzbDrone.Core.Configuration
         public CertificateValidationType CertificateValidation =>
             GetValueEnum("CertificateValidation", CertificateValidationType.Enabled);
 
+        public string ApplicationUrl => GetValue("ApplicationUrl", string.Empty);
+
         private string GetValue(string key)
         {
             return GetValue(key, string.Empty);

src/NzbDrone.Core/Configuration/IConfigService.cs

@@ -104,5 +104,6 @@ namespace NzbDrone.Core.Configuration
         int BackupRetention { get; }
 
         CertificateValidationType CertificateValidation { get; }
+        string ApplicationUrl { get; }
     }
 }

src/NzbDrone.Core/CustomFormats/Specifications/RegexSpecificationBase.cs

@@ -21,7 +21,7 @@ namespace NzbDrone.Core.CustomFormats
         protected Regex _regex;
         protected string _raw;
 
-        [FieldDefinition(1, Label = "Regular Expression")]
+        [FieldDefinition(1, Label = "Regular Expression", HelpText = "Custom Format RegEx is Case Insensitive")]
         public string Value
         {
             get => _raw;

src/NzbDrone.Core/Datastore/DbFactory.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Data.Common;
 using System.Data.SQLite;
+using System.Net.Sockets;
 using NLog;
 using Npgsql;
 using NzbDrone.Common.Disk;
@@ -124,6 +125,37 @@ namespace NzbDrone.Core.Datastore
 
                 throw new CorruptDatabaseException("Database file: {0} is corrupt, restore from backup if available. See: https://wiki.servarr.com/radarr/faq#i-am-getting-an-error-database-disk-image-is-malformed", e, fileName);
             }
+            catch (NpgsqlException e)
+            {
+                if (e.InnerException is SocketException)
+                {
+                    var retryCount = 3;
+
+                    while (true)
+                    {
+                        Logger.Error(e, "Failure to connect to Postgres DB, {0} retries remaining", retryCount);
+
+                        try
+                        {
+                            _migrationController.Migrate(connectionString, migrationContext);
+                        }
+                        catch (Exception ex)
+                        {
+                            if (--retryCount > 0)
+                            {
+                                System.Threading.Thread.Sleep(5000);
+                                continue;
+                            }
+
+                            throw new RadarrStartupException(ex, "Error creating main database");
+                        }
+                    }
+                }
+                else
+                {
+                    throw new RadarrStartupException(e, "Error creating main database");
+                }
+            }
             catch (Exception e)
             {
                 throw new RadarrStartupException(e, "Error creating main database");

src/NzbDrone.Core/Datastore/Migration/214_add_language_tags_to_subtitle_files.cs

@@ -0,0 +1,14 @@
+using FluentMigrator;
+using NzbDrone.Core.Datastore.Migration.Framework;
+
+namespace NzbDrone.Core.Datastore.Migration
+{
+    [Migration(214)]
+    public class add_language_tags_to_subtitle_files : NzbDroneMigrationBase
+    {
+        protected override void MainDbUpgrade()
+        {
+            Alter.Table("SubtitleFiles").AddColumn("LanguageTags").AsString().Nullable();
+        }
+    }
+}

src/NzbDrone.Core/DecisionEngine/DownloadDecisionMaker.cs

@@ -70,6 +70,7 @@ namespace NzbDrone.Core.DecisionEngine
             {
                 DownloadDecision decision = null;
                 _logger.ProgressTrace("Processing release {0}/{1}", reportNumber, reports.Count);
+                _logger.Debug("Processing release '{0}' from '{1}'", report.Title, report.Indexer);
 
                 try
                 {

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

@@ -1,19 +1,23 @@
-using System;
+using System;
 using NLog;
 using NzbDrone.Common.Extensions;
+using NzbDrone.Core.Configuration;
 using NzbDrone.Core.IndexerSearch.Definitions;
 using NzbDrone.Core.Parser.Model;
+using NzbDrone.Core.Qualities;
 
 namespace NzbDrone.Core.DecisionEngine.Specifications
 {
     public class RepackSpecification : IDecisionEngineSpecification
     {
         private readonly UpgradableSpecification _upgradableSpecification;
+        private readonly IConfigService _configService;
         private readonly Logger _logger;
 
-        public RepackSpecification(UpgradableSpecification upgradableSpecification, Logger logger)
+        public RepackSpecification(UpgradableSpecification upgradableSpecification, IConfigService configService, Logger logger)
         {
             _upgradableSpecification = upgradableSpecification;
+            _configService = configService;
             _logger = logger;
         }
 
@@ -22,11 +26,19 @@ namespace NzbDrone.Core.DecisionEngine.Specifications
 
         public Decision IsSatisfiedBy(RemoteMovie subject, SearchCriteriaBase searchCriteria)
         {
+            var downloadPropersAndRepacks = _configService.DownloadPropersAndRepacks;
+
             if (!subject.ParsedMovieInfo.Quality.Revision.IsRepack)
             {
                 return Decision.Accept();
             }
 
+            if (downloadPropersAndRepacks == ProperDownloadTypes.DoNotPrefer)
+            {
+                _logger.Debug("Repacks are not preferred, skipping check");
+                return Decision.Accept();
+            }
+
             if (subject.Movie.MovieFileId != 0)
             {
                 var file = subject.Movie.MovieFile;
@@ -36,6 +48,12 @@ namespace NzbDrone.Core.DecisionEngine.Specifications
                     var releaseGroup = subject.ParsedMovieInfo.ReleaseGroup;
                     var fileReleaseGroup = file.ReleaseGroup;
 
+                    if (downloadPropersAndRepacks == ProperDownloadTypes.DoNotUpgrade)
+                    {
+                        _logger.Debug("Auto downloading of repacks is disabled");
+                        return Decision.Reject("Repack downloading is disabled");
+                    }
+
                     if (fileReleaseGroup.IsNullOrWhiteSpace())
                     {
                         return Decision.Reject("Unable to determine release group for the existing file");

src/NzbDrone.Core/Download/Clients/rTorrent/RTorrent.cs

@@ -110,7 +110,7 @@ namespace NzbDrone.Core.Download.Clients.RTorrent
 
         public override string Name => "rTorrent";
 
-        public override ProviderMessage Message => new ProviderMessage($"Radarr will handle automatic removal of torrents based on the current seed criteria in Settings->Indexers. After importing it will also set \"{_imported_view}\" as an rTorrent view, which can be used in rTorrent scripts to customize behavior.", ProviderMessageType.Info);
+        public override ProviderMessage Message => new ProviderMessage($"rTorrent will not pause torrents when they meet the seed criteria. Radarr will handle automatic removal of torrents based on the current seed criteria in Settings->Indexers only when Remove Completed is enabled.  After importing it will also set \"{_imported_view}\" as an rTorrent view, which can be used in rTorrent scripts to customize behavior.", ProviderMessageType.Info);
 
         public override IEnumerable<DownloadClientItem> GetItems()
         {

src/NzbDrone.Core/Download/Clients/rTorrent/RTorrentSettings.cs

@@ -37,10 +37,10 @@ namespace NzbDrone.Core.Download.Clients.RTorrent
         [FieldDefinition(1, Label = "Port", Type = FieldType.Textbox)]
         public int Port { get; set; }
 
-        [FieldDefinition(2, Label = "Use SSL", Type = FieldType.Checkbox, HelpText = "Use secure connection when connecting to ruTorrent")]
+        [FieldDefinition(2, Label = "Use SSL", Type = FieldType.Checkbox, HelpText = "Use secure connection when connecting to rTorrent")]
         public bool UseSsl { get; set; }
 
-        [FieldDefinition(3, Label = "Url Path", Type = FieldType.Textbox, HelpText = "Path to the XMLRPC endpoint, see http(s)://[host]:[port]/[urlPath]. When using ruTorrent this usually is RPC2 or (path to ruTorrent)/plugins/rpc/rpc.php")]
+        [FieldDefinition(3, Label = "Url Path", Type = FieldType.Textbox, HelpText = "Path to the XMLRPC endpoint, see http(s)://[host]:[port]/[urlPath]. This is usually RPC2 or [path to ruTorrent]/plugins/rpc/rpc.php when using ruTorrent.")]
         public string UrlBase { get; set; }
 
         [FieldDefinition(4, Label = "Username", Type = FieldType.Textbox, Privacy = PrivacyLevel.UserName)]
@@ -64,7 +64,7 @@ namespace NzbDrone.Core.Download.Clients.RTorrent
         [FieldDefinition(10, Label = "Older Priority", Type = FieldType.Select, SelectOptions = typeof(RTorrentPriority), HelpText = "Priority to use when grabbing movies that were released over 14 days ago")]
         public int OlderMoviePriority { get; set; }
 
-        [FieldDefinition(11, Label = "Add Stopped", Type = FieldType.Checkbox, HelpText = "Enabling will add torrents and magnets to ruTorrent in a stopped state. This may break magnet files.")]
+        [FieldDefinition(11, Label = "Add Stopped", Type = FieldType.Checkbox, HelpText = "Enabling will add torrents and magnets to rTorrent in a stopped state. This may break magnet files.")]
         public bool AddStopped { get; set; }
 
         public NzbDroneValidationResult Validate()

src/NzbDrone.Core/Download/DownloadService.cs

@@ -109,7 +109,7 @@ namespace NzbDrone.Core.Download
                 movieGrabbedEvent.DownloadId = downloadClientId;
             }
 
-            _logger.ProgressInfo("Report sent to {0}. {1}", downloadClient.Definition.Name, downloadTitle);
+            _logger.ProgressInfo("Report sent to {0} from indexer {1}. {2}", downloadClient.Definition.Name, remoteMovie.Release.Indexer, downloadTitle);
             _eventAggregator.PublishEvent(movieGrabbedEvent);
         }
     }

src/NzbDrone.Core/Extras/ExistingExtraFileService.cs

@@ -3,7 +3,6 @@ using System.IO;
 using System.Linq;
 using NLog;
 using NzbDrone.Common.Disk;
-using NzbDrone.Core.Extras.Files;
 using NzbDrone.Core.MediaFiles;
 using NzbDrone.Core.MediaFiles.Events;
 using NzbDrone.Core.Messaging.Events;
@@ -31,7 +30,6 @@ namespace NzbDrone.Core.Extras
         public void Handle(MovieScannedEvent message)
         {
             var movie = message.Movie;
-            var extraFiles = new List<ExtraFile>();
 
             if (!_diskProvider.FolderExists(movie.Path))
             {
@@ -43,17 +41,16 @@ namespace NzbDrone.Core.Extras
             var filesOnDisk = _diskScanService.GetNonVideoFiles(movie.Path);
             var possibleExtraFiles = _diskScanService.FilterPaths(movie.Path, filesOnDisk, false);
 
-            var filteredFiles = possibleExtraFiles;
             var importedFiles = new List<string>();
 
             foreach (var existingExtraFileImporter in _existingExtraFileImporters)
             {
-                var imported = existingExtraFileImporter.ProcessFiles(movie, filteredFiles, importedFiles);
+                var imported = existingExtraFileImporter.ProcessFiles(movie, possibleExtraFiles, importedFiles);
 
                 importedFiles.AddRange(imported.Select(f => Path.Combine(movie.Path, f.RelativePath)));
             }
 
-            _logger.Info("Found {0} extra files", extraFiles.Count);
+            _logger.Info("Found {0} possible extra files, imported {1} files.", possibleExtraFiles.Count, importedFiles.Count);
         }
     }
 }

src/NzbDrone.Core/Extras/ExtraService.cs

@@ -31,7 +31,6 @@ namespace NzbDrone.Core.Extras
         private readonly IDiskProvider _diskProvider;
         private readonly IConfigService _configService;
         private readonly List<IManageExtraFiles> _extraFileManagers;
-        private readonly Logger _logger;
 
         public ExtraService(IMediaFileService mediaFileService,
                             IMovieService movieService,
@@ -45,7 +44,6 @@ namespace NzbDrone.Core.Extras
             _diskProvider = diskProvider;
             _configService = configService;
             _extraFileManagers = extraFileManagers.OrderBy(e => e.Order).ToList();
-            _logger = logger;
         }
 
         public void ImportMovie(LocalMovie localMovie, MovieFile movieFile, bool isReadOnly)
@@ -62,61 +60,42 @@ namespace NzbDrone.Core.Extras
                 return;
             }
 
-            var sourcePath = localMovie.Path;
-            var sourceFolder = _diskProvider.GetParentFolder(sourcePath);
-            var sourceFileName = Path.GetFileNameWithoutExtension(sourcePath);
-            var files = _diskProvider.GetFiles(sourceFolder, SearchOption.AllDirectories).Where(f => f != localMovie.Path);
+            var folderSearchOption = localMovie.FolderMovieInfo == null
+                ? SearchOption.TopDirectoryOnly
+                : SearchOption.AllDirectories;
 
             var wantedExtensions = _configService.ExtraFileExtensions.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries)
-                                                                     .Select(e => e.Trim(' ', '.'))
+                                                                     .Select(e => e.Trim(' ', '.')
+                                                                     .Insert(0, "."))
                                                                      .ToList();
 
-            var matchingFilenames = files.Where(f => Path.GetFileNameWithoutExtension(f).StartsWith(sourceFileName, StringComparison.InvariantCultureIgnoreCase)).ToList();
-            var filteredFilenames = new List<string>();
-            var hasNfo = false;
+            var sourceFolder = _diskProvider.GetParentFolder(localMovie.Path);
+            var files = _diskProvider.GetFiles(sourceFolder, folderSearchOption);
+            var managedFiles = _extraFileManagers.Select((i) => new List<string>()).ToArray();
 
-            foreach (var matchingFilename in matchingFilenames)
+            foreach (var file in files)
             {
-                // Filter out duplicate NFO files
-                if (matchingFilename.EndsWith(".nfo", StringComparison.InvariantCultureIgnoreCase))
-                {
-                    if (hasNfo)
-                    {
-                        continue;
-                    }
-
-                    hasNfo = true;
-                }
-
-                filteredFilenames.Add(matchingFilename);
-            }
-
-            foreach (var matchingFilename in filteredFilenames)
-            {
-                var matchingExtension = wantedExtensions.FirstOrDefault(e => matchingFilename.EndsWith(e));
+                var extension = Path.GetExtension(file);
+                var matchingExtension = wantedExtensions.FirstOrDefault(e => e.Equals(extension));
 
                 if (matchingExtension == null)
                 {
                     continue;
                 }
 
-                try
+                for (int i = 0; i < _extraFileManagers.Count; i++)
                 {
-                    foreach (var extraFileManager in _extraFileManagers)
+                    if (_extraFileManagers[i].CanImportFile(localMovie, movieFile, file, extension, isReadOnly))
                     {
-                        var extension = Path.GetExtension(matchingFilename);
-                        var extraFile = extraFileManager.Import(localMovie.Movie, movieFile, matchingFilename, extension, isReadOnly);
-
-                        if (extraFile != null)
-                        {
-                            break;
-                        }
+                        managedFiles[i].Add(file);
+                        break;
                     }
                 }
-                catch (Exception ex)
-                {
-                    _logger.Warn(ex, "Failed to import extra file: {0}", matchingFilename);
-                }
+            }
+
+            for (int i = 0; i < _extraFileManagers.Count; i++)
+            {
+                _extraFileManagers[i].ImportFiles(localMovie, movieFile, managedFiles[i], isReadOnly);
             }
         }
 

src/NzbDrone.Core/Extras/Files/ExtraFileManager.cs

@@ -8,6 +8,7 @@ using NzbDrone.Common.Extensions;
 using NzbDrone.Core.Configuration;
 using NzbDrone.Core.MediaFiles;
 using NzbDrone.Core.Movies;
+using NzbDrone.Core.Parser.Model;
 
 namespace NzbDrone.Core.Extras.Files
 {
@@ -19,7 +20,8 @@ namespace NzbDrone.Core.Extras.Files
         IEnumerable<ExtraFile> CreateAfterMovieImport(Movie movie, MovieFile movieFile);
         IEnumerable<ExtraFile> CreateAfterMovieFolder(Movie movie, string movieFolder);
         IEnumerable<ExtraFile> MoveFilesAfterRename(Movie movie, List<MovieFile> movieFiles);
-        ExtraFile Import(Movie movie, MovieFile movieFile, string path, string extension, bool readOnly);
+        bool CanImportFile(LocalMovie localMovie, MovieFile movieFile, string path, string extension, bool readOnly);
+        IEnumerable<ExtraFile> ImportFiles(LocalMovie localMovie, MovieFile movieFile, List<string> files, bool isReadOnly);
     }
 
     public abstract class ExtraFileManager<TExtraFile> : IManageExtraFiles
@@ -47,7 +49,8 @@ namespace NzbDrone.Core.Extras.Files
         public abstract IEnumerable<ExtraFile> CreateAfterMovieImport(Movie movie, MovieFile movieFile);
         public abstract IEnumerable<ExtraFile> CreateAfterMovieFolder(Movie movie, string movieFolder);
         public abstract IEnumerable<ExtraFile> MoveFilesAfterRename(Movie movie, List<MovieFile> movieFiles);
-        public abstract ExtraFile Import(Movie movie, MovieFile movieFile, string path, string extension, bool readOnly);
+        public abstract bool CanImportFile(LocalMovie localMovie, MovieFile movieFile, string path, string extension, bool readOnly);
+        public abstract IEnumerable<ExtraFile> ImportFiles(LocalMovie localMovie, MovieFile movieFile, List<string> files, bool isReadOnly);
 
         protected TExtraFile ImportFile(Movie movie, MovieFile movieFile, string path, bool readOnly, string extension, string fileNameSuffix = null)
         {

src/NzbDrone.Core/Extras/Metadata/Consumers/Xbmc/XbmcMetadata.cs

@@ -148,11 +148,13 @@ namespace NzbDrone.Core.Extras.Metadata.Consumers.Xbmc
 
                     var details = new XElement("movie");
 
-                    details.Add(new XElement("title", movieTranslation?.Title ?? movie.Title));
+                    var metadataTitle = movieTranslation?.Title ?? movie.Title;
+
+                    details.Add(new XElement("title", metadataTitle));
 
                     details.Add(new XElement("originaltitle", movie.MovieMetadata.Value.OriginalTitle));
 
-                    details.Add(new XElement("sorttitle", movie.MovieMetadata.Value.SortTitle));
+                    details.Add(new XElement("sorttitle", Parser.Parser.NormalizeTitle(metadataTitle)));
 
                     if (movie.MovieMetadata.Value.Ratings.Tmdb?.Votes > 0 || movie.MovieMetadata.Value.Ratings.Imdb?.Votes > 0)
                     {
@@ -261,7 +263,7 @@ namespace NzbDrone.Core.Extras.Metadata.Consumers.Xbmc
 
                     details.Add(new XElement("country"));
 
-                    if (movie.MovieMetadata.Value.CollectionTitle != null)
+                    if (Settings.AddCollectionName && movie.MovieMetadata.Value.CollectionTitle != null)
                     {
                         var setElement = new XElement("set");
 

src/NzbDrone.Core/Extras/Metadata/Consumers/Xbmc/XbmcMetadataSettings.cs

@@ -24,6 +24,7 @@ namespace NzbDrone.Core.Extras.Metadata.Consumers.Xbmc
             MovieMetadataLanguage = (int)Language.English;
             MovieImages = true;
             UseMovieNfo = false;
+            AddCollectionName = true;
         }
 
         [FieldDefinition(0, Label = "Movie Metadata", Type = FieldType.Checkbox)]
@@ -41,6 +42,9 @@ namespace NzbDrone.Core.Extras.Metadata.Consumers.Xbmc
         [FieldDefinition(4, Label = "Use Movie.nfo", Type = FieldType.Checkbox, HelpText = "Radarr will write metadata to movie.nfo instead of the default <movie-filename>.nfo")]
         public bool UseMovieNfo { get; set; }
 
+        [FieldDefinition(5, Label = "Collection Name", Type = FieldType.Checkbox, HelpText = "Radarr will write the collection name to the .nfo file", Advanced = true)]
+        public bool AddCollectionName { get; set; }
+
         public bool IsValid => true;
 
         public NzbDroneValidationResult Validate()

src/NzbDrone.Core/Extras/Metadata/MetadataService.cs

@@ -13,6 +13,7 @@ using NzbDrone.Core.Extras.Metadata.Files;
 using NzbDrone.Core.Extras.Others;
 using NzbDrone.Core.MediaFiles;
 using NzbDrone.Core.Movies;
+using NzbDrone.Core.Parser.Model;
 
 namespace NzbDrone.Core.Extras.Metadata
 {
@@ -191,9 +192,14 @@ namespace NzbDrone.Core.Extras.Metadata
             return movedFiles;
         }
 
-        public override ExtraFile Import(Movie movie, MovieFile movieFile, string path, string extension, bool readOnly)
+        public override bool CanImportFile(LocalMovie localMovie, MovieFile movieFile, string path, string extension, bool readOnly)
         {
-            return null;
+            return false;
+        }
+
+        public override IEnumerable<ExtraFile> ImportFiles(LocalMovie localMovie, MovieFile movieFile, List<string> files, bool isReadOnly)
+        {
+            return Enumerable.Empty<ExtraFile>();
         }
 
         private List<MetadataFile> GetMetadataFilesForConsumer(IMetadata consumer, List<MetadataFile> movieMetadata)

src/NzbDrone.Core/Extras/Others/OtherExtraService.cs

@@ -1,4 +1,6 @@
+using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using NLog;
 using NzbDrone.Common.Disk;
@@ -7,13 +9,16 @@ using NzbDrone.Core.Configuration;
 using NzbDrone.Core.Extras.Files;
 using NzbDrone.Core.MediaFiles;
 using NzbDrone.Core.Movies;
+using NzbDrone.Core.Parser.Model;
 
 namespace NzbDrone.Core.Extras.Others
 {
     public class OtherExtraService : ExtraFileManager<OtherExtraFile>
     {
+        private readonly IDiskProvider _diskProvider;
         private readonly IOtherExtraFileService _otherExtraFileService;
         private readonly IMediaFileAttributeService _mediaFileAttributeService;
+        private readonly Logger _logger;
 
         public OtherExtraService(IConfigService configService,
                                  IDiskProvider diskProvider,
@@ -23,8 +28,10 @@ namespace NzbDrone.Core.Extras.Others
                                  Logger logger)
             : base(configService, diskProvider, diskTransferService, logger)
         {
+            _diskProvider = diskProvider;
             _otherExtraFileService = otherExtraFileService;
             _mediaFileAttributeService = mediaFileAttributeService;
+            _logger = logger;
         }
 
         public override int Order => 2;
@@ -69,17 +76,79 @@ namespace NzbDrone.Core.Extras.Others
             return movedFiles;
         }
 
-        public override ExtraFile Import(Movie movie, MovieFile movieFile, string path, string extension, bool readOnly)
+        public override bool CanImportFile(LocalMovie localMovie, MovieFile movieFile, string path, string extension, bool readOnly)
         {
-            var extraFile = ImportFile(movie, movieFile, path, readOnly, extension, null);
+            return true;
+        }
 
-            if (extraFile != null)
+        public override IEnumerable<ExtraFile> ImportFiles(LocalMovie localMovie, MovieFile movieFile, List<string> files, bool isReadOnly)
+        {
+            var importedFiles = new List<ExtraFile>();
+            var filteredFiles = files.Where(f => CanImportFile(localMovie, movieFile, f, Path.GetExtension(f), isReadOnly)).ToList();
+            var sourcePath = localMovie.Path;
+            var sourceFolder = _diskProvider.GetParentFolder(sourcePath);
+            var sourceFileName = Path.GetFileNameWithoutExtension(sourcePath);
+            var matchingFiles = new List<string>();
+            var hasNfo = false;
+
+            foreach (var file in filteredFiles)
             {
-                _mediaFileAttributeService.SetFilePermissions(path);
-                _otherExtraFileService.Upsert(extraFile);
+                try
+                {
+                    // Filter out duplicate NFO files
+                    if (file.EndsWith(".nfo", StringComparison.InvariantCultureIgnoreCase))
+                    {
+                        if (hasNfo)
+                        {
+                            continue;
+                        }
+
+                        hasNfo = true;
+                    }
+
+                    // Filename match
+                    if (Path.GetFileNameWithoutExtension(file).StartsWith(sourceFileName, StringComparison.InvariantCultureIgnoreCase))
+                    {
+                        matchingFiles.Add(file);
+                        continue;
+                    }
+
+                    // Movie match
+                    var fileMovieInfo = Parser.Parser.ParseMoviePath(file) ?? new ParsedMovieInfo();
+
+                    if (fileMovieInfo.MovieTitle == null)
+                    {
+                        continue;
+                    }
+
+                    if (fileMovieInfo.MovieTitle == localMovie.FileMovieInfo.MovieTitle &&
+                        fileMovieInfo.Year.Equals(localMovie.FileMovieInfo.Year))
+                    {
+                        matchingFiles.Add(file);
+                    }
+                }
+                catch (Exception ex)
+                {
+                    _logger.Warn(ex, "Failed to import extra file: {0}", file);
+                }
             }
 
-            return extraFile;
+            foreach (string file in matchingFiles)
+            {
+                try
+                {
+                    var extraFile = ImportFile(localMovie.Movie, movieFile, file, isReadOnly, Path.GetExtension(file), null);
+                    _mediaFileAttributeService.SetFilePermissions(file);
+                    _otherExtraFileService.Upsert(extraFile);
+                    importedFiles.Add(extraFile);
+                }
+                catch (Exception ex)
+                {
+                    _logger.Warn(ex, "Failed to import extra file: {0}", file);
+                }
+            }
+
+            return importedFiles;
         }
     }
 }

src/NzbDrone.Core/Extras/Subtitles/SubtitleFile.cs

@@ -1,3 +1,4 @@
+using System.Collections.Generic;
 using NzbDrone.Core.Extras.Files;
 using NzbDrone.Core.Languages;
 
@@ -5,6 +6,17 @@ namespace NzbDrone.Core.Extras.Subtitles
 {
     public class SubtitleFile : ExtraFile
     {
+        public SubtitleFile()
+        {
+            LanguageTags = new List<string>();
+        }
+
         public Language Language { get; set; }
+
+        public string AggregateString => Language + LanguageTagsAsString + Extension;
+
+        public List<string> LanguageTags { get; set; }
+
+        private string LanguageTagsAsString => string.Join(".", LanguageTags);
     }
 }

src/NzbDrone.Core/Extras/Subtitles/SubtitleService.cs

@@ -1,3 +1,4 @@
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@@ -9,13 +10,17 @@ using NzbDrone.Core.Configuration;
 using NzbDrone.Core.Extras.Files;
 using NzbDrone.Core.Languages;
 using NzbDrone.Core.MediaFiles;
+using NzbDrone.Core.MediaFiles.MovieImport;
 using NzbDrone.Core.Movies;
 using NzbDrone.Core.Parser;
+using NzbDrone.Core.Parser.Model;
 
 namespace NzbDrone.Core.Extras.Subtitles
 {
     public class SubtitleService : ExtraFileManager<SubtitleFile>
     {
+        private readonly IDiskProvider _diskProvider;
+        private readonly IDetectSample _detectSample;
         private readonly ISubtitleFileService _subtitleFileService;
         private readonly IMediaFileAttributeService _mediaFileAttributeService;
         private readonly Logger _logger;
@@ -23,11 +28,14 @@ namespace NzbDrone.Core.Extras.Subtitles
         public SubtitleService(IConfigService configService,
                                IDiskProvider diskProvider,
                                IDiskTransferService diskTransferService,
+                               IDetectSample detectSample,
                                ISubtitleFileService subtitleFileService,
                                IMediaFileAttributeService mediaFileAttributeService,
                                Logger logger)
             : base(configService, diskProvider, diskTransferService, logger)
         {
+            _diskProvider = diskProvider;
+            _detectSample = detectSample;
             _subtitleFileService = subtitleFileService;
             _mediaFileAttributeService = mediaFileAttributeService;
             _logger = logger;
@@ -64,21 +72,16 @@ namespace NzbDrone.Core.Extras.Subtitles
             foreach (var movieFile in movieFiles)
             {
                 var groupedExtraFilesForMovieFile = subtitleFiles.Where(m => m.MovieFileId == movieFile.Id)
-                                                            .GroupBy(s => s.Language + s.Extension).ToList();
+                                                            .GroupBy(s => s.AggregateString).ToList();
 
                 foreach (var group in groupedExtraFilesForMovieFile)
                 {
                     var groupCount = group.Count();
                     var copy = 1;
 
-                    if (groupCount > 1)
-                    {
-                        _logger.Warn("Multiple subtitle files found with the same language and extension for {0}", Path.Combine(movie.Path, movieFile.RelativePath));
-                    }
-
                     foreach (var subtitleFile in group)
                     {
-                        var suffix = GetSuffix(subtitleFile.Language, copy, groupCount > 1);
+                        var suffix = GetSuffix(subtitleFile.Language, copy, subtitleFile.LanguageTags, groupCount > 1);
                         movedFiles.AddIfNotNull(MoveFile(movie, movieFile, subtitleFile, suffix));
 
                         copy++;
@@ -91,25 +94,141 @@ namespace NzbDrone.Core.Extras.Subtitles
             return movedFiles;
         }
 
-        public override ExtraFile Import(Movie movie, MovieFile movieFile, string path, string extension, bool readOnly)
+        public override bool CanImportFile(LocalMovie localEpisode, MovieFile movieFile, string path, string extension, bool readOnly)
         {
-            if (SubtitleFileExtensions.Extensions.Contains(Path.GetExtension(path)))
-            {
-                var language = LanguageParser.ParseSubtitleLanguage(path);
-                var suffix = GetSuffix(language, 1, false);
-                var subtitleFile = ImportFile(movie, movieFile, path, readOnly, extension, suffix);
-                subtitleFile.Language = language;
-
-                _mediaFileAttributeService.SetFilePermissions(path);
-                _subtitleFileService.Upsert(subtitleFile);
-
-                return subtitleFile;
-            }
-
-            return null;
+            return SubtitleFileExtensions.Extensions.Contains(extension.ToLowerInvariant());
         }
 
-        private string GetSuffix(Language language, int copy, bool multipleCopies = false)
+        public override IEnumerable<ExtraFile> ImportFiles(LocalMovie localMovie, MovieFile movieFile, List<string> files, bool isReadOnly)
+        {
+            var importedFiles = new List<SubtitleFile>();
+
+            var filteredFiles = files.Where(f => CanImportFile(localMovie, movieFile, f, Path.GetExtension(f), isReadOnly)).ToList();
+
+            var sourcePath = localMovie.Path;
+            var sourceFolder = _diskProvider.GetParentFolder(sourcePath);
+            var sourceFileName = Path.GetFileNameWithoutExtension(sourcePath);
+
+            var matchingFiles = new List<string>();
+
+            foreach (var file in filteredFiles)
+            {
+                try
+                {
+                    // Filename match
+                    if (Path.GetFileNameWithoutExtension(file).StartsWithIgnoreCase(sourceFileName))
+                    {
+                        matchingFiles.Add(file);
+                        continue;
+                    }
+
+                    // Movie match
+                    var fileMovieInfo = Parser.Parser.ParseMoviePath(file) ?? new ParsedMovieInfo();
+
+                    if (fileMovieInfo.MovieTitle == null)
+                    {
+                        continue;
+                    }
+
+                    if (fileMovieInfo.MovieTitle == localMovie.FileMovieInfo.MovieTitle &&
+                        fileMovieInfo.Year.Equals(localMovie.FileMovieInfo.Year))
+                    {
+                        matchingFiles.Add(file);
+                    }
+                }
+                catch (Exception ex)
+                {
+                    _logger.Warn(ex, "Failed to import subtitle file: {0}", file);
+                }
+            }
+
+            // Use any sub if only episode in folder
+            if (matchingFiles.Count == 0 && filteredFiles.Count > 0)
+            {
+                var videoFiles = _diskProvider.GetFiles(sourceFolder, SearchOption.AllDirectories)
+                                              .Where(file => MediaFileExtensions.Extensions.Contains(Path.GetExtension(file)))
+                                              .ToList();
+
+                if (videoFiles.Count() > 2)
+                {
+                    return importedFiles;
+                }
+
+                // Filter out samples
+                videoFiles = videoFiles.Where(file =>
+                {
+                    var sample = _detectSample.IsSample(localMovie.Movie.MovieMetadata, file);
+
+                    if (sample == DetectSampleResult.Sample)
+                    {
+                        return false;
+                    }
+
+                    return true;
+                }).ToList();
+
+                if (videoFiles.Count == 1)
+                {
+                    matchingFiles.AddRange(filteredFiles);
+
+                    _logger.Warn("Imported any available subtitle file for movie: {0}", localMovie);
+                }
+            }
+
+            var subtitleFiles = new List<SubtitleFile>();
+
+            foreach (string file in matchingFiles)
+            {
+                var language = LanguageParser.ParseSubtitleLanguage(file);
+                var extension = Path.GetExtension(file);
+                var languageTags = LanguageParser.ParseLanguageTags(file);
+                var subFile = new SubtitleFile
+                {
+                    Language = language,
+                    Extension = extension
+                };
+                subFile.LanguageTags = languageTags.ToList();
+                subFile.RelativePath = PathExtensions.GetRelativePath(sourceFolder, file);
+                subtitleFiles.Add(subFile);
+            }
+
+            var groupedSubtitleFiles = subtitleFiles.GroupBy(s => s.AggregateString).ToList();
+
+            foreach (var group in groupedSubtitleFiles)
+            {
+                var groupCount = group.Count();
+                var copy = 1;
+
+                foreach (var file in group)
+                {
+                    var path = Path.Combine(sourceFolder, file.RelativePath);
+                    var language = file.Language;
+                    var extension = file.Extension;
+                    var suffix = GetSuffix(language, copy, file.LanguageTags, groupCount > 1);
+                    try
+                    {
+                        var subtitleFile = ImportFile(localMovie.Movie, movieFile, path, isReadOnly, extension, suffix);
+                        subtitleFile.Language = language;
+                        subtitleFile.LanguageTags = file.LanguageTags;
+
+                        _mediaFileAttributeService.SetFilePermissions(path);
+                        _subtitleFileService.Upsert(subtitleFile);
+
+                        importedFiles.Add(subtitleFile);
+
+                        copy++;
+                    }
+                    catch (Exception ex)
+                    {
+                        _logger.Warn(ex, "Failed to import subtitle file: {0}", path);
+                    }
+                }
+            }
+
+            return importedFiles;
+        }
+
+        private string GetSuffix(Language language, int copy, List<string> languageTags, bool multipleCopies = false)
         {
             var suffixBuilder = new StringBuilder();
 
@@ -125,6 +244,12 @@ namespace NzbDrone.Core.Extras.Subtitles
                 suffixBuilder.Append(IsoLanguages.Get(language).TwoLetterCode);
             }
 
+            if (languageTags.Any())
+            {
+                suffixBuilder.Append(".");
+                suffixBuilder.Append(string.Join(".", languageTags));
+            }
+
             return suffixBuilder.ToString();
         }
     }

src/NzbDrone.Core/HealthCheck/ServerSideNotificationService.cs

@@ -52,7 +52,7 @@ namespace NzbDrone.Core.HealthCheck
                                       .AddQueryParam("version", BuildInfo.Version)
                                       .AddQueryParam("os", OsInfo.Os.ToString().ToLowerInvariant())
                                       .AddQueryParam("arch", RuntimeInformation.OSArchitecture)
-                                      .AddQueryParam("runtime", PlatformInfo.Platform.ToString().ToLowerInvariant())
+                                      .AddQueryParam("runtime", "netcore")
                                       .AddQueryParam("branch", _configFileProvider.Branch)
                                       .Build();
             try

src/NzbDrone.Core/History/HistoryService.cs

@@ -152,6 +152,7 @@ namespace NzbDrone.Core.History
             history.Data.Add("Guid", message.Movie.Release.Guid);
             history.Data.Add("TmdbId", message.Movie.Release.TmdbId.ToString());
             history.Data.Add("Protocol", ((int)message.Movie.Release.DownloadProtocol).ToString());
+            history.Data.Add("CustomFormatScore", message.Movie.CustomFormatScore.ToString());
             history.Data.Add("IndexerFlags", message.Movie.Release.IndexerFlags.ToString());
             history.Data.Add("IndexerId", message.Movie.Release.IndexerId.ToString());
 

src/NzbDrone.Core/ImportLists/ImportListMovies/ImportListMovieRepository.cs

@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using System.Linq;
 using NzbDrone.Core.Datastore;
 using NzbDrone.Core.Messaging.Events;
 
@@ -7,6 +8,7 @@ namespace NzbDrone.Core.ImportLists.ImportListMovies
     public interface IImportListMovieRepository : IBasicRepository<ImportListMovie>
     {
         List<ImportListMovie> GetAllForLists(List<int> listIds);
+        bool ExistsByMetadataId(int metadataId);
     }
 
     public class ImportListMovieRepository : BasicRepository<ImportListMovie>, IImportListMovieRepository
@@ -20,5 +22,12 @@ namespace NzbDrone.Core.ImportLists.ImportListMovies
         {
             return Query(x => listIds.Contains(x.ListId));
         }
+
+        public bool ExistsByMetadataId(int metadataId)
+        {
+            var movies = Query(x => x.MovieMetadataId == metadataId);
+
+            return movies.Any();
+        }
     }
 }

src/NzbDrone.Core/ImportLists/ImportListMovies/ImportListMovieService.cs

@@ -15,6 +15,7 @@ namespace NzbDrone.Core.ImportLists.ImportListMovies
         List<ImportListMovie> SyncMoviesForList(List<ImportListMovie> listMovies, int listId);
         void RemoveListMovie(ImportListMovie listMovie);
         ImportListMovie GetById(int id);
+        bool ExistsByMetadataId(int metadataId);
     }
 
     public class ImportListMovieService : IImportListMovieService, IHandleAsync<ProviderDeletedEvent<IImportList>>
@@ -79,5 +80,10 @@ namespace NzbDrone.Core.ImportLists.ImportListMovies
             var moviesOnList = _importListMovieRepository.GetAllForLists(new List<int> { message.ProviderId });
             _importListMovieRepository.DeleteMany(moviesOnList);
         }
+
+        public bool ExistsByMetadataId(int metadataId)
+        {
+            return _importListMovieRepository.ExistsByMetadataId(metadataId);
+        }
     }
 }

src/NzbDrone.Core/ImportLists/Plex/PlexParser.cs

@@ -5,6 +5,7 @@ using NzbDrone.Common.Extensions;
 using NzbDrone.Common.Serializer;
 using NzbDrone.Core.ImportLists.Exceptions;
 using NzbDrone.Core.ImportLists.ImportListMovies;
+using NzbDrone.Core.Notifications.Plex.PlexTv;
 using NzbDrone.Core.Notifications.Plex.Server;
 
 namespace NzbDrone.Core.ImportLists.Plex
@@ -19,7 +20,7 @@ namespace NzbDrone.Core.ImportLists.Plex
 
         public virtual IList<ImportListMovie> ParseResponse(ImportListResponse importResponse)
         {
-            List<PlexSectionItem> items;
+            List<PlexWatchlistItem> items;
 
             _importResponse = importResponse;
 
@@ -30,7 +31,7 @@ namespace NzbDrone.Core.ImportLists.Plex
                 return movies;
             }
 
-            items = Json.Deserialize<PlexResponse<PlexSectionResponse>>(_importResponse.Content)
+            items = Json.Deserialize<PlexResponse<PlexWatchlistRespone>>(_importResponse.Content)
                         .MediaContainer
                         .Items;
 

src/NzbDrone.Core/ImportLists/Radarr/RadarrSettings.cs

@@ -28,10 +28,10 @@ namespace NzbDrone.Core.ImportLists.Radarr
             TagIds = Array.Empty<int>();
         }
 
-        [FieldDefinition(0, Label = "Full URL", HelpText = "URL, including port, of the Radarr V3 instance to import from")]
+        [FieldDefinition(0, Label = "Full URL", HelpText = "URL, including port, of the Radarr instance to import from (Radarr 3.0 or higher)")]
         public string BaseUrl { get; set; }
 
-        [FieldDefinition(1, Label = "API Key", Privacy = PrivacyLevel.ApiKey, HelpText = "Apikey of the Radarr V3 instance to import from")]
+        [FieldDefinition(1, Label = "API Key", Privacy = PrivacyLevel.ApiKey, HelpText = "Apikey of the Radarr instance to import from (Radarr 3.0 or higher)")]
         public string ApiKey { get; set; }
 
         [FieldDefinition(2, Type = FieldType.Select, SelectOptionsProviderAction = "getProfiles", Label = "Profiles", HelpText = "Profiles from the source instance to import from")]

src/NzbDrone.Core/ImportLists/Trakt/Popular/TraktPopularSettings.cs

@@ -39,6 +39,10 @@ namespace NzbDrone.Core.ImportLists.Trakt.Popular
         public TraktPopularSettings()
         {
             TraktListType = (int)TraktPopularListType.Popular;
+            Rating = "0-100";
+            Certification = "NR,G,PG,PG-13,R,NC-17";
+            Genres = "";
+            Years = "";
         }
 
         [FieldDefinition(1, Label = "List Type", Type = FieldType.Select, SelectOptions = typeof(TraktPopularListType), HelpText = "Type of list you're seeking to import from")]

src/NzbDrone.Core/Indexers/Rarbg/RarbgParser.cs

@@ -31,10 +31,12 @@ namespace NzbDrone.Core.Indexers.Rarbg
 
             if (jsonResponse.Resource.error_code.HasValue)
             {
-                if (jsonResponse.Resource.error_code == 20 || jsonResponse.Resource.error_code == 8
-                    || jsonResponse.Resource.error_code == 9 || jsonResponse.Resource.error_code == 10)
+                if (jsonResponse.Resource.error_code == 5 || jsonResponse.Resource.error_code == 8
+                    || jsonResponse.Resource.error_code == 9 || jsonResponse.Resource.error_code == 10
+                    || jsonResponse.Resource.error_code == 13 || jsonResponse.Resource.error_code == 14
+                    || jsonResponse.Resource.error_code == 20)
                 {
-                    // No results or imdbid not found
+                    // No results, rate limit, tmdbid not found/invalid, or imdbid not found/invalid
                     return results;
                 }