Speed up collections load by 50%

.gitignore

@@ -166,8 +166,27 @@ packages.config.md5sum
 
 # Common IntelliJ Platform excludes
 
-# Ignore Rider projects completely for now
-.idea/
+# User specific
+**/.idea/**/workspace.xml
+**/.idea/**/tasks.xml
+**/.idea/shelf/*
+**/.idea/dictionaries
+**/.idea/.idea.Radarr.Posix
+**/.idea/.idea.Radarr.Windows
+
+# Sensitive or high-churn files
+**/.idea/**/dataSources/
+**/.idea/**/dataSources.ids
+**/.idea/**/dataSources.xml
+**/.idea/**/dataSources.local.xml
+**/.idea/**/sqlDataSources.xml
+**/.idea/**/dynamic.xml
+
+# Rider
+# Rider auto-generates .iml files, and contentModel.xml
+**/.idea/**/*.iml
+**/.idea/**/contentModel.xml
+**/.idea/**/modules.xml
 
 # ignore node_modules symlink
 node_modules

README.md

@@ -76,15 +76,6 @@ Thank you to [<img src="/Logo/jetbrains.svg" alt="JetBrains" width="32"> JetBrai
 * [<img src="/Logo/rider.svg" alt="Rider" width="32"> Rider](http://www.jetbrains.com/rider/)
 * [<img src="/Logo/dottrace.svg" alt="dotTrace" width="32"> dotTrace](http://www.jetbrains.com/dottrace/)
 
-## DigitalOcean
-
-This project is also supported by DigitalOcean
-<p>
-  <a href="https://www.digitalocean.com/">
-    <img src="https://opensource.nyc3.cdn.digitaloceanspaces.com/attribution/assets/SVG/DO_Logo_horizontal_blue.svg" width="201px">
-  </a>
-</p>
-
 ### License
 
 * [GNU GPL v3](http://www.gnu.org/licenses/gpl.html)

azure-pipelines.yml

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

frontend/src/Activity/History/HistoryRow.js

@@ -56,7 +56,6 @@ class HistoryRow extends Component {
       movie,
       quality,
       customFormats,
-      customFormatScore,
       languages,
       qualityCutoffNotMet,
       eventType,
@@ -176,7 +175,7 @@ class HistoryRow extends Component {
                   key={name}
                   className={styles.customFormatScore}
                 >
-                  {formatCustomFormatScore(customFormatScore)}
+                  {formatCustomFormatScore(data.customFormatScore)}
                 </TableRowCell>
               );
             }
@@ -242,9 +241,8 @@ HistoryRow.propTypes = {
   movie: PropTypes.object.isRequired,
   languages: PropTypes.arrayOf(PropTypes.object).isRequired,
   quality: PropTypes.object.isRequired,
-  customFormats: PropTypes.arrayOf(PropTypes.object),
-  customFormatScore: PropTypes.number.isRequired,
   qualityCutoffNotMet: PropTypes.bool.isRequired,
+  customFormats: PropTypes.arrayOf(PropTypes.object).isRequired,
   eventType: PropTypes.string.isRequired,
   sourceTitle: PropTypes.string.isRequired,
   date: PropTypes.string.isRequired,

frontend/src/Activity/Queue/Queue.js

@@ -75,23 +75,13 @@ class Queue extends Component {
       return;
     }
 
-    const nextState = {};
-
-    if (prevProps.items !== items) {
-      nextState.items = items;
-    }
-
     const selectedIds = this.getSelectedIds();
     const isPendingSelected = _.some(this.props.items, (item) => {
       return selectedIds.indexOf(item.id) > -1 && item.status === 'delay';
     });
 
     if (isPendingSelected !== this.state.isPendingSelected) {
-      nextState.isPendingSelected = isPendingSelected;
-    }
-
-    if (!_.isEmpty(nextState)) {
-      this.setState(nextState);
+      this.setState({ isPendingSelected });
     }
   }
 
@@ -224,29 +214,26 @@ class Queue extends Component {
 
         <PageContentBody>
           {
-            isRefreshing && !isAllPopulated ?
-              <LoadingIndicator /> :
-              null
+            isRefreshing && !isAllPopulated &&
+              <LoadingIndicator />
           }
 
           {
-            !isRefreshing && hasError ?
+            !isRefreshing && hasError &&
               <div>
                 {translate('FailedToLoadQueue')}
-              </div> :
-              null
+              </div>
           }
 
           {
-            isAllPopulated && !hasError && !items.length ?
+            isAllPopulated && !hasError && !items.length &&
               <div>
                 {translate('QueueIsEmpty')}
-              </div> :
-              null
+              </div>
           }
 
           {
-            isAllPopulated && !hasError && !!items.length ?
+            isAllPopulated && !hasError && !!items.length &&
               <div>
                 <Table
                   columns={columns}
@@ -281,8 +268,7 @@ class Queue extends Component {
                   isFetching={isRefreshing}
                   {...otherProps}
                 />
-              </div> :
-              null
+              </div>
           }
         </PageContentBody>
 

frontend/src/Activity/Queue/QueueRow.js

@@ -128,7 +128,6 @@ class QueueRow extends Component {
 
         {
           columns.map((column) => {
-
             const {
               name,
               isVisible
@@ -235,16 +234,6 @@ class QueueRow extends Component {
               );
             }
 
-            if (name === 'year') {
-              return (
-                <TableRowCell key={name}>
-                  {
-                    movie ? movie.year : ''
-                  }
-                </TableRowCell>
-              );
-            }
-
             if (name === 'title') {
               return (
                 <TableRowCell key={name}>
@@ -373,7 +362,6 @@ QueueRow.propTypes = {
   estimatedCompletionTime: PropTypes.string,
   timeleft: PropTypes.string,
   size: PropTypes.number,
-  year: PropTypes.number,
   sizeleft: PropTypes.number,
   showRelativeDates: PropTypes.bool.isRequired,
   shortDateFormat: PropTypes.string.isRequired,

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

@@ -225,19 +225,13 @@ class ImportMovieFooter extends Component {
                   body={
                     <ul>
                       {
-                        Array.isArray(importError.responseJSON) ?
-                          importError.responseJSON.map((error, index) => {
-                            return (
-                              <li key={index}>
-                                {error.errorMessage}
-                              </li>
-                            );
-                          }) :
-                          <li>
-                            {
-                              JSON.stringify(importError.responseJSON)
-                            }
-                          </li>
+                        importError.responseJSON.map((error, index) => {
+                          return (
+                            <li key={index}>
+                              {error.errorMessage}
+                            </li>
+                          );
+                        })
                       }
                     </ul>
                   }

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

@@ -152,19 +152,13 @@ class ImportMovieSelectFolder extends Component {
 
                       <ul>
                         {
-                          Array.isArray(saveError.responseJSON) ?
-                            saveError.responseJSON.map((e, index) => {
-                              return (
-                                <li key={index}>
-                                  {e.errorMessage}
-                                </li>
-                              );
-                            }) :
-                            <li>
-                              {
-                                JSON.stringify(saveError.responseJSON)
-                              }
-                            </li>
+                          saveError.responseJSON.map((e, index) => {
+                            return (
+                              <li key={index}>
+                                {e.errorMessage}
+                              </li>
+                            );
+                          })
                         }
                       </ul>
                     </Alert> :

frontend/src/Components/Form/EnhancedSelectInput.js

@@ -113,12 +113,10 @@ class EnhancedSelectInput extends Component {
       this._scheduleUpdate();
     }
 
-    if (!Array.isArray(this.props.value)) {
-      if (prevProps.value !== this.props.value || prevProps.values !== this.props.values) {
-        this.setState({
-          selectedIndex: getSelectedIndex(this.props)
-        });
-      }
+    if (!Array.isArray(this.props.value) && prevProps.value !== this.props.value) {
+      this.setState({
+        selectedIndex: getSelectedIndex(this.props)
+      });
     }
   }
 
@@ -334,11 +332,6 @@ class EnhancedSelectInput extends Component {
 
     const isMultiSelect = Array.isArray(value);
     const selectedOption = getSelectedOption(selectedIndex, values);
-    let selectedValue = value;
-
-    if (!values.length) {
-      selectedValue = isMultiSelect ? [] : '';
-    }
 
     return (
       <div>
@@ -379,17 +372,15 @@ class EnhancedSelectInput extends Component {
                           onPress={this.onPress}
                         >
                           {
-                            isFetching ?
+                            isFetching &&
                               <LoadingIndicator
                                 className={styles.loading}
                                 size={20}
-                              /> :
-                              null
+                              />
                           }
 
                           {
-                            isFetching ?
-                              null :
+                            !isFetching &&
                               <Icon
                                 name={icons.CARET_DOWN}
                               />
@@ -409,7 +400,7 @@ class EnhancedSelectInput extends Component {
                         onPress={this.onPress}
                       >
                         <SelectedValueComponent
-                          value={selectedValue}
+                          value={value}
                           values={values}
                           {...selectedValueOptions}
                           {...selectedOption}
@@ -427,17 +418,15 @@ class EnhancedSelectInput extends Component {
                         >
 
                           {
-                            isFetching ?
+                            isFetching &&
                               <LoadingIndicator
                                 className={styles.loading}
                                 size={20}
-                              /> :
-                              null
+                              />
                           }
 
                           {
-                            isFetching ?
-                              null :
+                            !isFetching &&
                               <Icon
                                 name={icons.CARET_DOWN}
                               />
@@ -517,7 +506,7 @@ class EnhancedSelectInput extends Component {
         </Manager>
 
         {
-          isMobile ?
+          isMobile &&
             <Modal
               className={styles.optionsModal}
               size={sizes.EXTRA_SMALL}
@@ -568,8 +557,7 @@ class EnhancedSelectInput extends Component {
                   }
                 </Scroller>
               </ModalBody>
-            </Modal> :
-            null
+            </Modal>
         }
       </div>
     );

frontend/src/Components/Form/HintedSelectInputSelectedValue.js

@@ -24,7 +24,7 @@ function HintedSelectInputSelectedValue(props) {
     >
       <div className={styles.valueText}>
         {
-          isMultiSelect ?
+          isMultiSelect &&
             value.map((key, index) => {
               const v = valuesMap[key];
               return (
@@ -32,28 +32,26 @@ function HintedSelectInputSelectedValue(props) {
                   {v ? v.value : key}
                 </Label>
               );
-            }) :
-            null
+            })
         }
 
         {
-          isMultiSelect ? null : value
+          !isMultiSelect && value
         }
       </div>
 
       {
-        hint != null && includeHint ?
+        hint != null && includeHint &&
           <div className={styles.hintText}>
             {hint}
-          </div> :
-          null
+          </div>
       }
     </EnhancedSelectInputSelectedValue>
   );
 }
 
 HintedSelectInputSelectedValue.propTypes = {
-  value: PropTypes.oneOfType([PropTypes.number, PropTypes.string, PropTypes.arrayOf(PropTypes.oneOfType([PropTypes.string, PropTypes.number]))]).isRequired,
+  value: PropTypes.oneOfType([PropTypes.string, PropTypes.arrayOf(PropTypes.oneOfType([PropTypes.string, PropTypes.number]))]).isRequired,
   values: PropTypes.arrayOf(PropTypes.object).isRequired,
   hint: PropTypes.string,
   isMultiSelect: PropTypes.bool.isRequired,

frontend/src/Components/Form/RootFolderSelectInputOption.js

@@ -68,7 +68,7 @@ RootFolderSelectInputOption.propTypes = {
   value: PropTypes.string.isRequired,
   freeSpace: PropTypes.number,
   movieFolder: PropTypes.string,
-  isMissing: PropTypes.bool,
+  isMissing: PropTypes.boolean,
   isMobile: PropTypes.bool.isRequired,
   isWindows: PropTypes.bool
 };

frontend/src/Components/Menu/FilterMenu.js

@@ -60,7 +60,7 @@ class FilterMenu extends Component {
             iconName={icons.FILTER}
             text={translate('Filter')}
             isDisabled={isDisabled}
-            showIndicator={selectedFilterKey !== 'all'}
+            indicator={selectedFilterKey !== 'all'}
           />
 
           <FilterMenuContent

frontend/src/Components/Menu/PageMenuButton.css

@@ -1,19 +1,11 @@
 .menuButton {
   composes: menuButton from '~./MenuButton.css';
 
-  position: relative;
-
   &:hover {
     color: #666;
   }
 }
 
-.indicatorContainer {
-  position: absolute;
-  top: 10px;
-  left: 10px;
-}
-
 .label {
   margin-left: 5px;
 }

frontend/src/Components/Menu/PageMenuButton.js

@@ -1,15 +1,13 @@
-import classNames from 'classnames';
 import PropTypes from 'prop-types';
 import React from 'react';
 import Icon from 'Components/Icon';
 import MenuButton from 'Components/Menu/MenuButton';
-import { icons } from 'Helpers/Props';
 import styles from './PageMenuButton.css';
 
 function PageMenuButton(props) {
   const {
     iconName,
-    showIndicator,
+    indicator,
     text,
     ...otherProps
   } = props;
@@ -24,22 +22,6 @@ function PageMenuButton(props) {
         size={18}
       />
 
-      {
-        showIndicator ?
-          <span
-            className={classNames(
-              styles.indicatorContainer,
-              'fa-layers fa-fw'
-            )}
-          >
-            <Icon
-              name={icons.CIRCLE}
-              size={9}
-            />
-          </span> :
-          null
-      }
-
       <div className={styles.label}>
         {text}
       </div>
@@ -50,11 +32,11 @@ function PageMenuButton(props) {
 PageMenuButton.propTypes = {
   iconName: PropTypes.object.isRequired,
   text: PropTypes.string,
-  showIndicator: PropTypes.bool.isRequired
+  indicator: PropTypes.bool.isRequired
 };
 
 PageMenuButton.defaultProps = {
-  showIndicator: false
+  indicator: false
 };
 
 export default PageMenuButton;

frontend/src/Components/Menu/ToolbarMenuButton.js

@@ -9,7 +9,7 @@ import styles from './ToolbarMenuButton.css';
 function ToolbarMenuButton(props) {
   const {
     iconName,
-    showIndicator,
+    indicator,
     text,
     ...otherProps
   } = props;
@@ -26,7 +26,7 @@ function ToolbarMenuButton(props) {
         />
 
         {
-          showIndicator &&
+          indicator &&
             <span
               className={classNames(
                 styles.indicatorContainer,
@@ -53,11 +53,11 @@ function ToolbarMenuButton(props) {
 ToolbarMenuButton.propTypes = {
   iconName: PropTypes.object.isRequired,
   text: PropTypes.string,
-  showIndicator: PropTypes.bool.isRequired
+  indicator: PropTypes.bool.isRequired
 };
 
 ToolbarMenuButton.defaultProps = {
-  showIndicator: false
+  indicator: false
 };
 
 export default ToolbarMenuButton;

frontend/src/Components/Page/PageContentFooter.css

@@ -19,7 +19,7 @@
   }
 }
 
-@media only screen and (max-width: $breakpointExtraLarge) {
+@media only screen and (max-width: $breakpointLarge) {
   .contentFooter {
     flex-wrap: wrap;
   }

frontend/src/Components/ProgressBar.css

@@ -20,11 +20,7 @@
 
 .frontTextContainer {
   z-index: 1;
-  color: var(--progressBarFrontTextColor);
-}
-
-.backTextContainer {
-  color: var(--progressBarBackTextColor);
+  color: var(--white);
 }
 
 .backTextContainer,

frontend/src/InteractiveImport/Interactive/InteractiveImportModalContent.js

@@ -64,15 +64,6 @@ const columns = [
     isSortable: true,
     isVisible: true
   },
-  {
-    name: 'customFormats',
-    label: React.createElement(Icon, {
-      name: icons.INTERACTIVE,
-      title: translate('CustomFormat')
-    }),
-    isSortable: true,
-    isVisible: true
-  },
   {
     name: 'rejections',
     label: React.createElement(Icon, {

frontend/src/InteractiveImport/Interactive/InteractiveImportRow.css

@@ -5,10 +5,8 @@
 }
 
 .quality,
-.languages {
+.language {
   composes: cell from '~Components/Table/Cells/TableRowCell.css';
-
-  text-align: center;
 }
 
 .label {
@@ -23,7 +21,3 @@
   margin-top: 0;
   text-align: start;
 }
-
-.customFormatTooltip {
-  max-width: 250px;
-}

frontend/src/InteractiveImport/Interactive/InteractiveImportRow.js

@@ -12,7 +12,6 @@ import SelectLanguageModal from 'InteractiveImport/Language/SelectLanguageModal'
 import SelectMovieModal from 'InteractiveImport/Movie/SelectMovieModal';
 import SelectQualityModal from 'InteractiveImport/Quality/SelectQualityModal';
 import SelectReleaseGroupModal from 'InteractiveImport/ReleaseGroup/SelectReleaseGroupModal';
-import MovieFormats from 'Movie/MovieFormats';
 import MovieLanguage from 'Movie/MovieLanguage';
 import MovieQuality from 'Movie/MovieQuality';
 import formatBytes from 'Utilities/Number/formatBytes';
@@ -151,7 +150,6 @@ class InteractiveImportRow extends Component {
       languages,
       releaseGroup,
       size,
-      customFormats,
       rejections,
       isReprocessing,
       isSelected,
@@ -228,7 +226,7 @@ class InteractiveImportRow extends Component {
         </TableRowCellButton>
 
         <TableRowCellButton
-          className={styles.languages}
+          className={styles.language}
           title={translate('ClickToChangeLanguage')}
           onPress={this.onSelectLanguagePress}
         >
@@ -261,26 +259,7 @@ class InteractiveImportRow extends Component {
 
         <TableRowCell>
           {
-            customFormats?.length ?
-              <Popover
-                anchor={
-                  <Icon name={icons.INTERACTIVE} />
-                }
-                title="Formats"
-                body={
-                  <div className={styles.customFormatTooltip}>
-                    <MovieFormats formats={customFormats} />
-                  </div>
-                }
-                position={tooltipPositions.LEFT}
-              /> :
-              null
-          }
-        </TableRowCell>
-
-        <TableRowCell>
-          {
-            rejections.length ?
+            !!rejections.length &&
               <Popover
                 anchor={
                   <Icon
@@ -303,9 +282,7 @@ class InteractiveImportRow extends Component {
                   </ul>
                 }
                 position={tooltipPositions.LEFT}
-                canFlip={false}
-              /> :
-              null
+              />
           }
         </TableRowCell>
 
@@ -353,7 +330,6 @@ InteractiveImportRow.propTypes = {
   languages: PropTypes.arrayOf(PropTypes.object),
   releaseGroup: PropTypes.string,
   size: PropTypes.number.isRequired,
-  customFormats: PropTypes.arrayOf(PropTypes.object),
   rejections: PropTypes.arrayOf(PropTypes.object).isRequired,
   isReprocessing: PropTypes.bool,
   isSelected: PropTypes.bool,

frontend/src/Movie/History/MovieHistoryRow.js

@@ -62,7 +62,6 @@ class MovieHistoryRow extends Component {
       sourceTitle,
       quality,
       customFormats,
-      customFormatScore,
       languages,
       qualityCutoffNotMet,
       date,
@@ -107,7 +106,7 @@ class MovieHistoryRow extends Component {
         </TableRowCell>
 
         <TableRowCell key={name}>
-          {formatCustomFormatScore(customFormatScore)}
+          {formatCustomFormatScore(data.customFormatScore)}
         </TableRowCell>
 
         <RelativeDateCellConnector
@@ -162,8 +161,7 @@ MovieHistoryRow.propTypes = {
   sourceTitle: PropTypes.string.isRequired,
   languages: PropTypes.arrayOf(PropTypes.object).isRequired,
   quality: PropTypes.object.isRequired,
-  customFormats: PropTypes.arrayOf(PropTypes.object),
-  customFormatScore: PropTypes.number.isRequired,
+  customFormats: PropTypes.arrayOf(PropTypes.object).isRequired,
   qualityCutoffNotMet: PropTypes.bool.isRequired,
   date: PropTypes.string.isRequired,
   data: PropTypes.object.isRequired,

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

@@ -17,10 +17,6 @@
   font-size: 24px;
 }
 
-.buttons {
-  flex: 0 0 auto;
-}
-
 .cloneButton {
   composes: button from '~Components/Link/IconButton.css';
 
@@ -40,10 +36,3 @@
   margin: 0;
   border: none;
 }
-
-.label {
-  @add-mixin truncate;
-  composes: label from '~Components/Label.css';
-
-  max-width: 100%;
-}

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

@@ -90,7 +90,7 @@ class CustomFormat extends Component {
             {name}
           </div>
 
-          <div className={styles.buttons}>
+          <div>
             <IconButton
               className={styles.cloneButton}
               title={translate('CloneCustomFormat')}
@@ -124,7 +124,6 @@ class CustomFormat extends Component {
 
               return (
                 <Label
-                  className={styles.label}
                   key={index}
                   kind={kind}
                 >

frontend/src/Settings/Indexers/Indexers/EditIndexerModalContent.js

@@ -89,7 +89,6 @@ function EditIndexerModalContent(props) {
                 <FormInputGroup
                   type={inputTypes.CHECK}
                   name="enableRss"
-                  helpText={supportsRss.value ? translate('RSSHelpText') : undefined}
                   helpTextWarning={supportsRss.value ? undefined : translate('RSSIsNotSupportedWithThisIndexer')}
                   isDisabled={!supportsRss.value}
                   {...enableRss}

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

@@ -30,7 +30,6 @@
   code {
     padding: 0 1px;
     border: 1px solid var(--borderColor);
-    background-color: var(--modalCloseButtonHoverColor);
-    color: var(--movieBackgroundColor);
+    background-color: #f7f7f7;
   }
 }

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

@@ -7,11 +7,11 @@
 
   &:hover {
     .token {
-      background-color: var(--popoverTitleBackgroundInverseColor);
+      background-color: #ddd;
     }
 
     .example {
-      background-color: var(--popoverTitleBorderInverseColor);
+      background-color: #ccc;
     }
   }
 }
@@ -27,7 +27,7 @@
 .token {
   flex: 0 0 50%;
   padding: 6px 16px;
-  background-color: var(--popoverTitleBorderColor);
+  background-color: #eee;
   font-family: $monoSpaceFontFamily;
 }
 
@@ -38,7 +38,7 @@
   justify-content: space-between;
   flex: 0 0 50%;
   padding: 6px 16px;
-  background-color: var(--popoverTitleBackgroundColor);
+  background-color: #ddd;
 
   .footNote {
     padding: 2px;

frontend/src/Store/Actions/queueActions.js

@@ -118,12 +118,6 @@ export const defaultState = {
         isSortable: true,
         isVisible: false
       },
-      {
-        name: 'year',
-        label: translate('Year'),
-        isSortable: true,
-        isVisible: true
-      },
       {
         name: 'outputPath',
         label: translate('OutputPath'),

frontend/src/Store/Actions/releaseActions.js

@@ -201,11 +201,6 @@ export const defaultState = {
         return genreList.sort(sortByName);
       }
     },
-    {
-      name: 'customFormatScore',
-      label: translate('CustomFormatScore'),
-      type: filterBuilderTypes.NUMBER
-    },
     {
       name: 'rejectionCount',
       label: translate('RejectionCount'),

frontend/src/Styles/Themes/dark.js

@@ -226,8 +226,6 @@ module.exports = {
   //
   // Misc
 
-  progressBarFrontTextColor: white,
-  progressBarBackTextColor: white,
   progressBarBackgroundColor: '#727070',
   logEventsBackgroundColor: '#2a2a2a'
 };

frontend/src/Styles/Themes/index.js

@@ -1,11 +1,7 @@
 import * as dark from './dark';
 import * as light from './light';
 
-const defaultDark = window.matchMedia('(prefers-color-scheme: dark)').matches;
-const auto = defaultDark ? { ...dark } : { ...light };
-
 export default {
-  auto,
   light,
   dark
 };

frontend/src/Styles/Themes/light.js

@@ -198,8 +198,8 @@ module.exports = {
   popoverShadowColor: 'rgba(0, 0, 0, 0.2)',
   popoverArrowBorderColor: '#fff',
 
-  popoverTitleBackgroundInverseColor: '#9b9b9b',
-  popoverTitleBorderInverseColor: '#bfbfbf',
+  popoverTitleBackgroundInverseColor: '#595959',
+  popoverTitleBorderInverseColor: '#707070',
   popoverShadowInverseColor: 'rgba(0, 0, 0, 0.2)',
   popoverArrowBorderInverseColor: 'rgba(58, 63, 81, 0.75)',
 
@@ -227,8 +227,6 @@ module.exports = {
   //
   // Misc
 
-  progressBarFrontTextColor: white,
-  progressBarBackTextColor: darkGray,
-  progressBarBackgroundColor: white,
-  logEventsBackgroundColor: white
+  progressBarBackgroundColor: '#fff',
+  logEventsBackgroundColor: '#fff'
 };

frontend/src/Utilities/Number/formatCustomFormatScore.js

@@ -1,4 +1,5 @@
-function formatCustomFormatScore(input, customFormatsLength = 0) {
+
+function formatCustomFormatScore(input) {
   const score = Number(input);
 
   if (score > 0) {
@@ -9,7 +10,7 @@ function formatCustomFormatScore(input, customFormatsLength = 0) {
     return score;
   }
 
-  return customFormatsLength > 0 ? '+0' : '';
+  return '';
 }
 
 export default formatCustomFormatScore;

package.json

@@ -113,7 +113,7 @@
     "file-loader": "6.2.0",
     "filemanager-webpack-plugin": "5.0.0",
     "html-webpack-plugin": "5.3.1",
-    "loader-utils": "^3.2.1",
+    "loader-utils": "^2.0.0",
     "mini-css-extract-plugin": "1.5.0",
     "postcss": "8.2.12",
     "postcss-color-function": "4.1.0",
@@ -134,9 +134,5 @@
     "webpack-cli": "4.9.1",
     "webpack-livereload-plugin": "3.0.2",
     "worker-loader": "3.0.8"
-  },
-  "volta": {
-    "node": "16.17.0",
-    "yarn": "1.22.19"
   }
 }

src/NzbDrone.Common.Test/ExtensionTests/StringExtensionTests/IsValidIPAddressFixture.cs

@@ -1,25 +0,0 @@
-using System.Globalization;
-using FluentAssertions;
-using NUnit.Framework;
-using NzbDrone.Common.Extensions;
-
-namespace NzbDrone.Common.Test.ExtensionTests.StringExtensionTests
-{
-    [TestFixture]
-    public class IsValidIPAddressFixture
-    {
-        [TestCase("192.168.0.1")]
-        [TestCase("::1")]
-        [TestCase("2001:db8:4006:812::200e")]
-        public void should_validate_ip_address(string input)
-        {
-            input.IsValidIpAddress().Should().BeTrue();
-        }
-
-        [TestCase("sonarr.tv")]
-        public void should_not_parse_non_ip_address(string input)
-        {
-            input.IsValidIpAddress().Should().BeFalse();
-        }
-    }
-}

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

@@ -1,4 +1,4 @@
-using FluentAssertions;
+using FluentAssertions;
 using NUnit.Framework;
 using NzbDrone.Common.Http;
 using NzbDrone.Test.Common;
@@ -10,7 +10,6 @@ namespace NzbDrone.Common.Test.Http
         [TestCase("abc://my_host.com:8080/root/api/")]
         [TestCase("abc://my_host.com:8080//root/api/")]
         [TestCase("abc://my_host.com:8080/root//api/")]
-        [TestCase("abc://[::1]:8080/root//api/")]
         public void should_parse(string uri)
         {
             var newUri = new HttpUri(uri);

src/NzbDrone.Common/EnvironmentInfo/IRuntimeInfo.cs

@@ -9,7 +9,6 @@ namespace NzbDrone.Common.EnvironmentInfo
         bool IsAdmin { get; }
         bool IsWindowsService { get; }
         bool IsWindowsTray { get; }
-        bool IsStarting { get; set; }
         bool IsExiting { get; set; }
         bool IsTray { get; }
         RuntimeMode Mode { get; }

src/NzbDrone.Common/EnvironmentInfo/RuntimeInfo.cs

@@ -19,7 +19,6 @@ namespace NzbDrone.Common.EnvironmentInfo
             _logger = logger;
 
             IsWindowsService = hostLifetime is WindowsServiceLifetime;
-            IsStarting = true;
 
             // net6.0 will return Radarr.dll for entry assembly, we need the actual
             // executable name (Radarr on linux).  On mono this will return the location of
@@ -83,7 +82,6 @@ namespace NzbDrone.Common.EnvironmentInfo
 
         public bool IsWindowsService { get; private set; }
 
-        public bool IsStarting { get; set; }
         public bool IsExiting { get; set; }
         public bool IsTray
         {

src/NzbDrone.Common/Extensions/IpAddressExtensions.cs

@@ -7,50 +7,34 @@ namespace NzbDrone.Common.Extensions
     {
         public static bool IsLocalAddress(this IPAddress ipAddress)
         {
-            // Map back to IPv4 if mapped to IPv6, for example "::ffff:1.2.3.4" to "1.2.3.4".
-            if (ipAddress.IsIPv4MappedToIPv6)
+            if (ipAddress.IsIPv6LinkLocal)
             {
-                ipAddress = ipAddress.MapToIPv4();
+                return true;
             }
 
-            // Checks loopback ranges for both IPv4 and IPv6.
             if (IPAddress.IsLoopback(ipAddress))
             {
                 return true;
             }
 
-            // IPv4
             if (ipAddress.AddressFamily == AddressFamily.InterNetwork)
             {
-                return IsLocalIPv4(ipAddress.GetAddressBytes());
-            }
-
-            // IPv6
-            if (ipAddress.AddressFamily == AddressFamily.InterNetworkV6)
-            {
-                return ipAddress.IsIPv6LinkLocal ||
-                        ipAddress.IsIPv6UniqueLocal ||
-                        ipAddress.IsIPv6SiteLocal;
+                byte[] bytes = ipAddress.GetAddressBytes();
+                switch (bytes[0])
+                {
+                    case 10:
+                    case 127:
+                        return true;
+                    case 172:
+                        return bytes[1] < 32 && bytes[1] >= 16;
+                    case 192:
+                        return bytes[1] == 168;
+                    default:
+                        return false;
+                }
             }
 
             return false;
         }
-
-        private static bool IsLocalIPv4(byte[] ipv4Bytes)
-        {
-            // Link local (no IP assigned by DHCP): 169.254.0.0 to 169.254.255.255 (169.254.0.0/16)
-            bool IsLinkLocal() => ipv4Bytes[0] == 169 && ipv4Bytes[1] == 254;
-
-            // Class A private range: 10.0.0.0 – 10.255.255.255 (10.0.0.0/8)
-            bool IsClassA() => ipv4Bytes[0] == 10;
-
-            // Class B private range: 172.16.0.0 – 172.31.255.255 (172.16.0.0/12)
-            bool IsClassB() => ipv4Bytes[0] == 172 && ipv4Bytes[1] >= 16 && ipv4Bytes[1] <= 31;
-
-            // Class C private range: 192.168.0.0 – 192.168.255.255 (192.168.0.0/16)
-            bool IsClassC() => ipv4Bytes[0] == 192 && ipv4Bytes[1] == 168;
-
-            return IsLinkLocal() || IsClassA() || IsClassC() || IsClassB();
-        }
     }
 }

src/NzbDrone.Common/Extensions/StringExtensions.cs

@@ -2,8 +2,6 @@ using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
-using System.Net;
-using System.Net.Sockets;
 using System.Text;
 using System.Text.RegularExpressions;
 
@@ -194,30 +192,5 @@ namespace NzbDrone.Common.Extensions
                 .Replace("'", "%27")
                 .Replace("%7E", "~");
         }
-
-        public static bool IsValidIpAddress(this string value)
-        {
-            if (!IPAddress.TryParse(value, out var parsedAddress))
-            {
-                return false;
-            }
-
-            if (parsedAddress.Equals(IPAddress.Parse("255.255.255.255")))
-            {
-                return false;
-            }
-
-            if (parsedAddress.IsIPv6Multicast)
-            {
-                return false;
-            }
-
-            return parsedAddress.AddressFamily == AddressFamily.InterNetwork || parsedAddress.AddressFamily == AddressFamily.InterNetworkV6;
-        }
-
-        public static string ToUrlHost(this string input)
-        {
-            return input.Contains(":") ? $"[{input}]" : input;
-        }
     }
 }

src/NzbDrone.Common/Http/HttpUri.cs

@@ -8,7 +8,7 @@ namespace NzbDrone.Common.Http
 {
     public class HttpUri : IEquatable<HttpUri>
     {
-        private static readonly Regex RegexUri = new Regex(@"^(?:(?<scheme>[a-z]+):)?(?://(?<host>[-_A-Z0-9.]+|\[[[A-F0-9:]+\])(?::(?<port>[0-9]{1,5}))?)?(?<path>(?:(?:(?<=^)|/+)[^/?#\r\n]+)+/*|/+)?(?:\?(?<query>[^#\r\n]*))?(?:\#(?<fragment>.*))?$", RegexOptions.Compiled | RegexOptions.IgnoreCase);
+        private static readonly Regex RegexUri = new Regex(@"^(?:(?<scheme>[a-z]+):)?(?://(?<host>[-_A-Z0-9.]+)(?::(?<port>[0-9]{1,5}))?)?(?<path>(?:(?:(?<=^)|/+)[^/?#\r\n]+)+/*|/+)?(?:\?(?<query>[^#\r\n]*))?(?:\#(?<fragment>.*))?$", RegexOptions.Compiled | RegexOptions.IgnoreCase);
 
         private readonly string _uri;
         public string FullUri => _uri;
@@ -70,8 +70,6 @@ namespace NzbDrone.Common.Http
 
         private void Parse()
         {
-            var parseSuccess = Uri.TryCreate(_uri, UriKind.RelativeOrAbsolute, out var uri);
-
             var match = RegexUri.Match(_uri);
 
             var scheme = match.Groups["scheme"];
@@ -81,7 +79,7 @@ namespace NzbDrone.Common.Http
             var query = match.Groups["query"];
             var fragment = match.Groups["fragment"];
 
-            if (!parseSuccess || (scheme.Success && !host.Success && path.Success))
+            if (!match.Success || (scheme.Success && !host.Success && path.Success))
             {
                 throw new ArgumentException("Uri didn't match expected pattern: " + _uri);
             }

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

@@ -11,41 +11,26 @@ namespace NzbDrone.Common.Instrumentation.Sentry
         {
             try
             {
-                if (sentryEvent.Message is not null)
-                {
-                    sentryEvent.Message.Formatted = CleanseLogMessage.Cleanse(sentryEvent.Message.Formatted);
-                    sentryEvent.Message.Message = CleanseLogMessage.Cleanse(sentryEvent.Message.Message);
-                    sentryEvent.Message.Params = sentryEvent.Message.Params?.Select(x => CleanseLogMessage.Cleanse(x switch
-                    {
-                        string str => str,
-                        _ => x.ToString()
-                    })).ToList();
-                }
+                sentryEvent.Message.Message = CleanseLogMessage.Cleanse(sentryEvent.Message.Message);
 
-                if (sentryEvent.Fingerprint.Any())
+                if (sentryEvent.Fingerprint != null)
                 {
                     var fingerprint = sentryEvent.Fingerprint.Select(x => CleanseLogMessage.Cleanse(x)).ToList();
                     sentryEvent.SetFingerprint(fingerprint);
                 }
 
-                if (sentryEvent.Extra.Any())
+                if (sentryEvent.Extra != null)
                 {
-                    var extras = sentryEvent.Extra.ToDictionary(x => x.Key, y => (object)CleanseLogMessage.Cleanse(y.Value as string));
+                    var extras = sentryEvent.Extra.ToDictionary(x => x.Key, y => (object)CleanseLogMessage.Cleanse((string)y.Value));
                     sentryEvent.SetExtras(extras);
                 }
 
-                if (sentryEvent.SentryExceptions is not null)
+                foreach (var exception in sentryEvent.SentryExceptions)
                 {
-                    foreach (var exception in sentryEvent.SentryExceptions)
+                    exception.Value = CleanseLogMessage.Cleanse(exception.Value);
+                    foreach (var frame in exception.Stacktrace.Frames)
                     {
-                        exception.Value = CleanseLogMessage.Cleanse(exception.Value);
-                        if (exception.Stacktrace is not null)
-                        {
-                            foreach (var frame in exception.Stacktrace.Frames)
-                            {
-                                frame.FileName = ShortenPath(frame.FileName);
-                            }
-                        }
+                        frame.FileName = ShortenPath(frame.FileName);
                     }
                 }
             }

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

@@ -8,7 +8,6 @@ using System.Threading;
 using NLog;
 using NLog.Common;
 using NLog.Targets;
-using Npgsql;
 using NzbDrone.Common.EnvironmentInfo;
 using NzbDrone.Common.Extensions;
 using Sentry;
@@ -35,14 +34,6 @@ namespace NzbDrone.Common.Instrumentation.Sentry
             SQLiteErrorCode.Auth
         };
 
-        private static readonly HashSet<string> FilteredPostgresErrorCodes = new HashSet<string>
-        {
-            PostgresErrorCodes.OutOfMemory,
-            PostgresErrorCodes.TooManyConnections,
-            PostgresErrorCodes.DiskFull,
-            PostgresErrorCodes.ProgramLimitExceeded
-        };
-
         // use string and not Type so we don't need a reference to the project
         // where these are defined
         private static readonly HashSet<string> FilteredExceptionTypeNames = new HashSet<string>
@@ -108,6 +99,9 @@ namespace NzbDrone.Common.Instrumentation.Sentry
                                       o.Dsn = dsn;
                                       o.AttachStacktrace = true;
                                       o.MaxBreadcrumbs = 200;
+                                      o.SendDefaultPii = false;
+                                      o.Debug = false;
+                                      o.DiagnosticLevel = SentryLevel.Debug;
                                       o.Release = BuildInfo.Release;
                                       o.BeforeSend = x => SentryCleanser.CleanseEvent(x);
                                       o.BeforeBreadcrumb = x => SentryCleanser.CleanseBreadcrumb(x);
@@ -259,19 +253,6 @@ namespace NzbDrone.Common.Instrumentation.Sentry
                             isSentry = false;
                         }
 
-                        var pgEx = logEvent.Exception as PostgresException;
-                        if (pgEx != null && FilteredPostgresErrorCodes.Contains(pgEx.SqlState))
-                        {
-                            return false;
-                        }
-
-                        // We don't care about transient network and timeout errors
-                        var npgEx = logEvent.Exception as NpgsqlException;
-                        if (npgEx != null && npgEx.IsTransient)
-                        {
-                            return false;
-                        }
-
                         if (FilteredExceptionTypeNames.Contains(ex.GetType().Name))
                         {
                             isSentry = false;

src/NzbDrone.Common/Radarr.Common.csproj

@@ -7,11 +7,10 @@
     <PackageReference Include="DryIoc.dll" Version="5.3.0" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
     <PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="6.0.0" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
     <PackageReference Include="NLog" Version="5.0.1" />
     <PackageReference Include="NLog.Extensions.Logging" Version="5.0.0" />
-    <PackageReference Include="Npgsql" Version="5.0.11" />
-    <PackageReference Include="Sentry" Version="3.23.1" />
+    <PackageReference Include="Sentry" Version="3.20.1" />
     <PackageReference Include="NLog.Targets.Syslog" Version="7.0.0" />
     <PackageReference Include="SharpZipLib" Version="1.3.3" />
     <PackageReference Include="System.Text.Json" Version="6.0.5" />

src/NzbDrone.Core.Test/CustomFormats/CustomFormatsFixture.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using NUnit.Framework;
@@ -9,7 +9,7 @@ using NzbDrone.Core.Test.Framework;
 namespace NzbDrone.Core.Test.CustomFormats
 {
     [TestFixture]
-    public class CustomFormatsTestHelpers : CoreTest
+    public class CustomFormatsFixture : CoreTest
     {
         private static List<CustomFormat> _customFormats { get; set; }
 

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

@@ -46,14 +46,14 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
                 ParsedMovieInfo = new ParsedMovieInfo { Quality = new QualityModel(Quality.DVD, new Revision(version: 2)) },
             };
 
-            CustomFormatsTestHelpers.GivenCustomFormats(_format1, _format2);
+            CustomFormatsFixture.GivenCustomFormats(_format1, _format2);
         }
 
         [Test]
         public void should_allow_if_format_score_greater_than_min()
         {
             _remoteMovie.CustomFormats = new List<CustomFormat> { _format1 };
-            _remoteMovie.Movie.Profile.FormatItems = CustomFormatsTestHelpers.GetSampleFormatItems(_format1.Name);
+            _remoteMovie.Movie.Profile.FormatItems = CustomFormatsFixture.GetSampleFormatItems(_format1.Name);
             _remoteMovie.CustomFormatScore = _remoteMovie.Movie.Profile.CalculateCustomFormatScore(_remoteMovie.CustomFormats);
 
             Subject.IsSatisfiedBy(_remoteMovie, null).Accepted.Should().BeTrue();
@@ -63,7 +63,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
         public void should_deny_if_format_score_not_greater_than_min()
         {
             _remoteMovie.CustomFormats = new List<CustomFormat> { _format2 };
-            _remoteMovie.Movie.Profile.FormatItems = CustomFormatsTestHelpers.GetSampleFormatItems(_format1.Name);
+            _remoteMovie.Movie.Profile.FormatItems = CustomFormatsFixture.GetSampleFormatItems(_format1.Name);
             _remoteMovie.CustomFormatScore = _remoteMovie.Movie.Profile.CalculateCustomFormatScore(_remoteMovie.CustomFormats);
 
             Console.WriteLine(_remoteMovie.CustomFormatScore);
@@ -76,7 +76,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
         public void should_deny_if_format_score_not_greater_than_min_2()
         {
             _remoteMovie.CustomFormats = new List<CustomFormat> { _format2, _format1 };
-            _remoteMovie.Movie.Profile.FormatItems = CustomFormatsTestHelpers.GetSampleFormatItems(_format1.Name);
+            _remoteMovie.Movie.Profile.FormatItems = CustomFormatsFixture.GetSampleFormatItems(_format1.Name);
             _remoteMovie.CustomFormatScore = _remoteMovie.Movie.Profile.CalculateCustomFormatScore(_remoteMovie.CustomFormats);
 
             Subject.IsSatisfiedBy(_remoteMovie, null).Accepted.Should().BeFalse();
@@ -86,7 +86,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
         public void should_allow_if_all_format_is_defined_in_profile()
         {
             _remoteMovie.CustomFormats = new List<CustomFormat> { _format2, _format1 };
-            _remoteMovie.Movie.Profile.FormatItems = CustomFormatsTestHelpers.GetSampleFormatItems(_format1.Name, _format2.Name);
+            _remoteMovie.Movie.Profile.FormatItems = CustomFormatsFixture.GetSampleFormatItems(_format1.Name, _format2.Name);
             _remoteMovie.CustomFormatScore = _remoteMovie.Movie.Profile.CalculateCustomFormatScore(_remoteMovie.CustomFormats);
 
             Subject.IsSatisfiedBy(_remoteMovie, null).Accepted.Should().BeTrue();
@@ -96,7 +96,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
         public void should_deny_if_no_format_was_parsed_and_min_score_positive()
         {
             _remoteMovie.CustomFormats = new List<CustomFormat> { };
-            _remoteMovie.Movie.Profile.FormatItems = CustomFormatsTestHelpers.GetSampleFormatItems(_format1.Name, _format2.Name);
+            _remoteMovie.Movie.Profile.FormatItems = CustomFormatsFixture.GetSampleFormatItems(_format1.Name, _format2.Name);
             _remoteMovie.CustomFormatScore = _remoteMovie.Movie.Profile.CalculateCustomFormatScore(_remoteMovie.CustomFormats);
 
             Subject.IsSatisfiedBy(_remoteMovie, null).Accepted.Should().BeFalse();
@@ -106,7 +106,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
         public void should_allow_if_no_format_was_parsed_min_score_is_zero()
         {
             _remoteMovie.CustomFormats = new List<CustomFormat> { };
-            _remoteMovie.Movie.Profile.FormatItems = CustomFormatsTestHelpers.GetSampleFormatItems(_format1.Name, _format2.Name);
+            _remoteMovie.Movie.Profile.FormatItems = CustomFormatsFixture.GetSampleFormatItems(_format1.Name, _format2.Name);
             _remoteMovie.Movie.Profile.MinFormatScore = 0;
             _remoteMovie.CustomFormatScore = _remoteMovie.Movie.Profile.CalculateCustomFormatScore(_remoteMovie.CustomFormats);
 

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

@@ -40,8 +40,8 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
 
         private void GivenProfile(Profile profile)
         {
-            CustomFormatsTestHelpers.GivenCustomFormats();
-            profile.FormatItems = CustomFormatsTestHelpers.GetSampleFormatItems();
+            CustomFormatsFixture.GivenCustomFormats();
+            profile.FormatItems = CustomFormatsFixture.GetSampleFormatItems();
             profile.MinFormatScore = 0;
             _remoteMovie.Movie.Profile = profile;
 
@@ -74,7 +74,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
         {
             _customFormat = new CustomFormat("My Format", new ResolutionSpecification { Value = (int)Resolution.R1080p }) { Id = 1 };
 
-            CustomFormatsTestHelpers.GivenCustomFormats(_customFormat);
+            CustomFormatsFixture.GivenCustomFormats(_customFormat);
         }
 
         [Test]
@@ -157,7 +157,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
                 Cutoff = Quality.HDTV720p.Id,
                 Items = Qualities.QualityFixture.GetDefaultQualities(),
                 MinFormatScore = 0,
-                FormatItems = CustomFormatsTestHelpers.GetSampleFormatItems("My Format"),
+                FormatItems = CustomFormatsFixture.GetSampleFormatItems("My Format"),
                 UpgradeAllowed = true
             });
 

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

@@ -38,14 +38,14 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
             Mocker.Resolve<UpgradableSpecification>();
             _upgradeHistory = Mocker.Resolve<HistorySpecification>();
 
-            CustomFormatsTestHelpers.GivenCustomFormats();
+            CustomFormatsFixture.GivenCustomFormats();
 
             _fakeMovie = Builder<Movie>.CreateNew()
                 .With(c => c.Profile = new Profile
                 {
                     Items = Qualities.QualityFixture.GetDefaultQualities(),
                     Cutoff = Quality.Bluray1080p.Id,
-                    FormatItems = CustomFormatsTestHelpers.GetSampleFormatItems("None"),
+                    FormatItems = CustomFormatsFixture.GetSampleFormatItems("None"),
                     MinFormatScore = 0,
                     UpgradeAllowed = true
                 })
@@ -66,7 +66,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
                   .Returns(true);
 
             Mocker.GetMock<ICustomFormatCalculationService>()
-                .Setup(x => x.ParseCustomFormat(It.IsAny<MovieHistory>(), It.IsAny<Movie>()))
+                .Setup(x => x.ParseCustomFormat(It.IsAny<MovieHistory>()))
                 .Returns(new List<CustomFormat>());
         }
 
@@ -163,7 +163,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
             {
                 Items = Qualities.QualityFixture.GetDefaultQualities(),
                 Cutoff = Quality.Bluray1080p.Id,
-                FormatItems = CustomFormatsTestHelpers.GetSampleFormatItems(),
+                FormatItems = CustomFormatsFixture.GetSampleFormatItems(),
                 MinFormatScore = 0
             };
 
@@ -171,7 +171,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
             _upgradableQuality = new QualityModel(Quality.WEBDL1080p, new Revision(version: 1));
 
             Mocker.GetMock<ICustomFormatCalculationService>()
-                .Setup(x => x.ParseCustomFormat(It.IsAny<MovieHistory>(), It.IsAny<Movie>()))
+                .Setup(x => x.ParseCustomFormat(It.IsAny<MovieHistory>()))
                 .Returns(new List<CustomFormat>());
 
             GivenMostRecentForEpisode(FIRST_EPISODE_ID, string.Empty, _upgradableQuality, DateTime.UtcNow, MovieHistoryEventType.Grabbed);
@@ -186,7 +186,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
             {
                 Items = Qualities.QualityFixture.GetDefaultQualities(),
                 Cutoff = Quality.WEBDL1080p.Id,
-                FormatItems = CustomFormatsTestHelpers.GetSampleFormatItems(),
+                FormatItems = CustomFormatsFixture.GetSampleFormatItems(),
                 MinFormatScore = 0
             };
 
@@ -221,7 +221,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
             {
                 Items = Qualities.QualityFixture.GetDefaultQualities(),
                 Cutoff = Quality.WEBDL1080p.Id,
-                FormatItems = CustomFormatsTestHelpers.GetSampleFormatItems(),
+                FormatItems = CustomFormatsFixture.GetSampleFormatItems(),
                 MinFormatScore = 0
             };
 

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

@@ -41,17 +41,17 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
 
         private void WithEnglishRelease()
         {
-            _remoteMovie.Languages = new List<Language> { Language.English };
+            _remoteMovie.ParsedMovieInfo.Languages = new List<Language> { Language.English };
         }
 
         private void WithGermanRelease()
         {
-            _remoteMovie.Languages = new List<Language> { Language.German };
+            _remoteMovie.ParsedMovieInfo.Languages = new List<Language> { Language.German };
         }
 
         private void WithFrenchRelease()
         {
-            _remoteMovie.Languages = new List<Language> { Language.French };
+            _remoteMovie.ParsedMovieInfo.Languages = new List<Language> { Language.French };
         }
 
         [Test]

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

@@ -37,7 +37,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
             _customFormat1 = new CustomFormat("My Format 1", new LanguageSpecification { Value = (int)Language.English }) { Id = 1 };
             _customFormat2 = new CustomFormat("My Format 2", new LanguageSpecification { Value = (int)Language.French }) { Id = 2 };
 
-            CustomFormatsTestHelpers.GivenCustomFormats(_customFormat1, _customFormat2);
+            CustomFormatsFixture.GivenCustomFormats(_customFormat1, _customFormat2);
 
             Mocker.GetMock<IQualityDefinitionService>()
                   .Setup(s => s.Get(It.IsAny<Quality>()))
@@ -62,7 +62,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
             remoteMovie.Movie = Builder<Movie>.CreateNew().With(m => m.Profile = new Profile
             {
                 Items = Qualities.QualityFixture.GetDefaultQualities(),
-                FormatItems = CustomFormatsTestHelpers.GetSampleFormatItems(_customFormat1.Name, _customFormat2.Name),
+                FormatItems = CustomFormatsFixture.GetSampleFormatItems(_customFormat1.Name, _customFormat2.Name),
                 MinFormatScore = 0
             })
                 .With(m => m.Title = "A Movie")

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

@@ -48,7 +48,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
         [SetUp]
         public void Setup()
         {
-            CustomFormatsTestHelpers.GivenCustomFormats(_customFormat1, _customFormat2);
+            CustomFormatsFixture.GivenCustomFormats(_customFormat1, _customFormat2);
         }
 
         private void GivenAutoDownloadPropers(ProperDownloadTypes type)
@@ -73,7 +73,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
             var profile = new Profile
             {
                 Items = Qualities.QualityFixture.GetDefaultQualities(),
-                FormatItems = CustomFormatsTestHelpers.GetSampleFormatItems(_customFormat1.Name, _customFormat2.Name),
+                FormatItems = CustomFormatsFixture.GetSampleFormatItems(_customFormat1.Name, _customFormat2.Name),
                 MinFormatScore = 0
             };
 

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

@@ -32,13 +32,13 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
         {
             Mocker.Resolve<UpgradableSpecification>();
 
-            CustomFormatsTestHelpers.GivenCustomFormats();
+            CustomFormatsFixture.GivenCustomFormats();
 
             _movie = Builder<Movie>.CreateNew()
                                      .With(e => e.Profile = new Profile
                                      {
                                          Items = Qualities.QualityFixture.GetDefaultQualities(),
-                                         FormatItems = CustomFormatsTestHelpers.GetSampleFormatItems(),
+                                         FormatItems = CustomFormatsFixture.GetSampleFormatItems(),
                                          MinFormatScore = 0,
                                          UpgradeAllowed = true
                                      })
@@ -58,7 +58,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
                 .Build();
 
             Mocker.GetMock<ICustomFormatCalculationService>()
-                .Setup(x => x.ParseCustomFormat(It.IsAny<RemoteMovie>(), It.IsAny<long>()))
+                .Setup(x => x.ParseCustomFormat(It.IsAny<ParsedMovieInfo>(), _movie))
                 .Returns(new List<CustomFormat>());
         }
 

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

@@ -1,209 +0,0 @@
-using System.Collections.Generic;
-using FluentAssertions;
-using NUnit.Framework;
-using NzbDrone.Core.CustomFormats;
-using NzbDrone.Core.DecisionEngine.Specifications;
-using NzbDrone.Core.Profiles;
-using NzbDrone.Core.Qualities;
-using NzbDrone.Core.Test.Framework;
-
-namespace NzbDrone.Core.Test.DecisionEngineTests
-{
-    [TestFixture]
-    public class UpgradeAllowedSpecificationFixture : CoreTest<UpgradableSpecification>
-    {
-        private CustomFormat _customFormatOne;
-        private CustomFormat _customFormatTwo;
-        private Profile _qualityProfile;
-
-        [SetUp]
-        public void Setup()
-        {
-            _customFormatOne = new CustomFormat
-            {
-                Id = 1,
-                Name = "One"
-            };
-            _customFormatTwo = new CustomFormat
-            {
-                Id = 2,
-                Name = "Two"
-            };
-
-            _qualityProfile = new Profile
-            {
-                Cutoff = Quality.Bluray1080p.Id,
-                Items = Qualities.QualityFixture.GetDefaultQualities(),
-                UpgradeAllowed = false,
-                CutoffFormatScore = 100,
-                FormatItems = new List<ProfileFormatItem>
-                {
-                    new ProfileFormatItem
-                    {
-                        Format = _customFormatOne,
-                        Score = 50
-                    },
-                    new ProfileFormatItem
-                    {
-                        Format = _customFormatTwo,
-                        Score = 100
-                    }
-                }
-            };
-        }
-
-        [Test]
-        public void should_return_false_when_quality_is_better_custom_formats_are_the_same_and_upgrading_is_not_allowed()
-        {
-            _qualityProfile.UpgradeAllowed = false;
-
-            Subject.IsUpgradeAllowed(
-                _qualityProfile,
-                new QualityModel(Quality.DVD),
-                new List<CustomFormat>(),
-                new QualityModel(Quality.Bluray1080p),
-                new List<CustomFormat>())
-            .Should().BeFalse();
-        }
-
-        [Test]
-        public void should_return_false_when_quality_is_same_and_custom_format_is_upgrade_and_upgrading_is_not_allowed()
-        {
-            _qualityProfile.UpgradeAllowed = false;
-
-            Subject.IsUpgradeAllowed(
-                    _qualityProfile,
-                    new QualityModel(Quality.DVD),
-                    new List<CustomFormat> { _customFormatOne },
-                    new QualityModel(Quality.DVD),
-                    new List<CustomFormat> { _customFormatTwo })
-                .Should().BeFalse();
-        }
-
-        [Test]
-        public void should_return_true_for_custom_format_upgrade_when_upgrading_is_allowed()
-        {
-            _qualityProfile.UpgradeAllowed = true;
-
-            Subject.IsUpgradeAllowed(
-                _qualityProfile,
-                new QualityModel(Quality.DVD),
-                new List<CustomFormat> { _customFormatOne },
-                new QualityModel(Quality.DVD),
-                new List<CustomFormat> { _customFormatTwo })
-            .Should().BeTrue();
-        }
-
-        [Test]
-        public void should_return_true_for_same_custom_format_score_when_upgrading_is_not_allowed()
-        {
-            _qualityProfile.UpgradeAllowed = false;
-
-            Subject.IsUpgradeAllowed(
-                _qualityProfile,
-                new QualityModel(Quality.DVD),
-                new List<CustomFormat> { _customFormatOne },
-                new QualityModel(Quality.DVD),
-                new List<CustomFormat> { _customFormatOne })
-            .Should().BeTrue();
-        }
-
-        [Test]
-        public void should_return_true_for_lower_custom_format_score_when_upgrading_is_allowed()
-        {
-            _qualityProfile.UpgradeAllowed = true;
-
-            Subject.IsUpgradeAllowed(
-                _qualityProfile,
-                new QualityModel(Quality.DVD),
-                new List<CustomFormat> { _customFormatTwo },
-                new QualityModel(Quality.DVD),
-                new List<CustomFormat> { _customFormatOne })
-            .Should().BeTrue();
-        }
-
-        [Test]
-        public void should_return_true_for_lower_language_when_upgrading_is_not_allowed()
-        {
-            _qualityProfile.UpgradeAllowed = false;
-
-            Subject.IsUpgradeAllowed(
-                _qualityProfile,
-                new QualityModel(Quality.DVD),
-                new List<CustomFormat> { _customFormatTwo },
-                new QualityModel(Quality.DVD),
-                new List<CustomFormat> { _customFormatOne })
-            .Should().BeTrue();
-        }
-
-        [Test]
-        public void should_return_true_for_quality_upgrade_when_upgrading_is_allowed()
-        {
-            _qualityProfile.UpgradeAllowed = true;
-
-            Subject.IsUpgradeAllowed(
-                _qualityProfile,
-                new QualityModel(Quality.DVD),
-                new List<CustomFormat>(),
-                new QualityModel(Quality.Bluray1080p),
-                new List<CustomFormat>())
-            .Should().BeTrue();
-        }
-
-        [Test]
-        public void should_return_true_for_same_quality_when_upgrading_is_allowed()
-        {
-            _qualityProfile.UpgradeAllowed = true;
-
-            Subject.IsUpgradeAllowed(
-                _qualityProfile,
-                new QualityModel(Quality.DVD),
-                new List<CustomFormat>(),
-                new QualityModel(Quality.DVD),
-                new List<CustomFormat>())
-            .Should().BeTrue();
-        }
-
-        [Test]
-        public void should_return_true_for_same_quality_when_upgrading_is_not_allowed()
-        {
-            _qualityProfile.UpgradeAllowed = false;
-
-            Subject.IsUpgradeAllowed(
-                _qualityProfile,
-                new QualityModel(Quality.DVD),
-                new List<CustomFormat>(),
-                new QualityModel(Quality.DVD),
-                new List<CustomFormat>())
-            .Should().BeTrue();
-        }
-
-        [Test]
-        public void should_return_true_for_lower_quality_when_upgrading_is_allowed()
-        {
-            _qualityProfile.UpgradeAllowed = true;
-
-            Subject.IsUpgradeAllowed(
-                _qualityProfile,
-                new QualityModel(Quality.DVD),
-                new List<CustomFormat>(),
-                new QualityModel(Quality.SDTV),
-                new List<CustomFormat>())
-            .Should().BeTrue();
-        }
-
-        [Test]
-        public void should_return_true_for_lower_quality_when_upgrading_is_not_allowed()
-        {
-            _qualityProfile.UpgradeAllowed = false;
-
-            Subject.IsUpgradeAllowed(
-                _qualityProfile,
-                new QualityModel(Quality.DVD),
-                new List<CustomFormat>(),
-                new QualityModel(Quality.SDTV),
-                new List<CustomFormat>())
-            .Should().BeTrue();
-        }
-    }
-}

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

@@ -31,7 +31,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
             Mocker.Resolve<UpgradableSpecification>();
             _upgradeDisk = Mocker.Resolve<UpgradeDiskSpecification>();
 
-            CustomFormatsTestHelpers.GivenCustomFormats();
+            CustomFormatsFixture.GivenCustomFormats();
 
             _firstFile = new MovieFile { Quality = new QualityModel(Quality.Bluray1080p, new Revision(version: 2)), DateAdded = DateTime.Now };
 
@@ -39,7 +39,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
                 .With(c => c.Profile = new Profile
                 {
                     Cutoff = Quality.Bluray1080p.Id, Items = Qualities.QualityFixture.GetDefaultQualities(),
-                    FormatItems = CustomFormatsTestHelpers.GetSampleFormatItems(),
+                    FormatItems = CustomFormatsFixture.GetSampleFormatItems(),
                     MinFormatScore = 0
                 })
                 .With(e => e.MovieFile = _firstFile)

src/NzbDrone.Core.Test/Download/Aggregation/Aggregators/AggregateLanguagesFixture.cs

@@ -1,112 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using FizzWare.NBuilder;
-using FluentAssertions;
-using NUnit.Framework;
-using NzbDrone.Core.Download.Aggregation.Aggregators;
-using NzbDrone.Core.Languages;
-using NzbDrone.Core.Movies;
-using NzbDrone.Core.Parser.Model;
-using NzbDrone.Core.Test.Framework;
-
-namespace NzbDrone.Core.Test.Download.Aggregation.Aggregators
-{
-    [TestFixture]
-    public class AggregateLanguagesFixture : CoreTest<AggregateLanguages>
-    {
-        private RemoteMovie _remoteMovie;
-        private Movie _movie;
-        private string _simpleReleaseTitle = "Series.Title.S01E01.xyz-RlsGroup";
-
-        [SetUp]
-        public void Setup()
-        {
-            _movie = Builder<Movie>.CreateNew()
-                       .With(m => m.MovieMetadata = new MovieMetadata
-                       {
-                           Title = "Some Movie",
-                           OriginalLanguage = Language.English
-                       })
-                       .Build();
-
-            _remoteMovie = Builder<RemoteMovie>.CreateNew()
-                                                 .With(l => l.ParsedMovieInfo = null)
-                                                 .With(l => l.Movie = _movie)
-                                                 .Build();
-        }
-
-        private ParsedMovieInfo GetParsedMovieInfo(List<Language> languages, string releaseTitle, string releaseTokens = "")
-        {
-            return new ParsedMovieInfo
-                   {
-                       Languages = languages,
-                       ReleaseTitle = releaseTitle,
-                       SimpleReleaseTitle = releaseTokens
-                   };
-        }
-
-        [Test]
-        public void should_return_existing_language_if_episode_title_does_not_have_language()
-        {
-            _remoteMovie.ParsedMovieInfo = GetParsedMovieInfo(new List<Language> { Language.Original }, _simpleReleaseTitle);
-
-            Subject.Aggregate(_remoteMovie).Languages.Should().Contain(_movie.MovieMetadata.Value.OriginalLanguage);
-        }
-
-        [Test]
-        public void should_return_parsed_language()
-        {
-            _remoteMovie.ParsedMovieInfo = GetParsedMovieInfo(new List<Language> { Language.French }, _simpleReleaseTitle);
-
-            Subject.Aggregate(_remoteMovie).Languages.Should().Equal(_remoteMovie.ParsedMovieInfo.Languages);
-        }
-
-        [Test]
-        public void should_exclude_language_that_is_part_of_episode_title_when_release_tokens_contains_episode_title()
-        {
-            var releaseTitle = "Series.Title.S01E01.Jimmy.The.Greek.xyz-RlsGroup";
-            var releaseTokens = ".Jimmy.The.Greek.xyz-RlsGroup";
-
-            _remoteMovie.Movie.Title = "Jimmy The Greek";
-            _remoteMovie.ParsedMovieInfo = GetParsedMovieInfo(new List<Language> { Language.Greek }, releaseTitle, releaseTokens);
-
-            Subject.Aggregate(_remoteMovie).Languages.Should().Equal(_movie.MovieMetadata.Value.OriginalLanguage);
-        }
-
-        [Test]
-        public void should_remove_parsed_language_that_is_part_of_episode_title_when_release_tokens_contains_episode_title()
-        {
-            var releaseTitle = "Series.Title.S01E01.Jimmy.The.Greek.French.xyz-RlsGroup";
-            var releaseTokens = ".Jimmy.The.Greek.French.xyz-RlsGroup";
-
-            _remoteMovie.Movie.Title = "Jimmy The Greek";
-            _remoteMovie.ParsedMovieInfo = GetParsedMovieInfo(new List<Language> { Language.Greek, Language.French }, releaseTitle, releaseTokens);
-
-            Subject.Aggregate(_remoteMovie).Languages.Should().Equal(Language.French);
-        }
-
-        [Test]
-        public void should_not_exclude_language_that_is_part_of_episode_title_when_release_tokens_does_not_contain_episode_title()
-        {
-            var releaseTitle = "Series.Title.S01E01.xyz-RlsGroup";
-            var releaseTokens = ".xyz-RlsGroup";
-
-            _remoteMovie.Movie.Title = "Jimmy The Greek";
-            _remoteMovie.ParsedMovieInfo = GetParsedMovieInfo(new List<Language> { Language.Greek }, releaseTitle, releaseTokens);
-
-            Subject.Aggregate(_remoteMovie).Languages.Should().Equal(Language.Greek);
-        }
-
-        [Test]
-        public void should_use_reparse_language_after_determining_languages_that_are_in_episode_titles()
-        {
-            var releaseTitle = "Series.Title.S01E01.Jimmy.The.Greek.Greek.xyz-RlsGroup";
-            var releaseTokens = ".Jimmy.The.Greek.Greek.xyz-RlsGroup";
-
-            _remoteMovie.Movie.Title = "Jimmy The Greek";
-            _remoteMovie.ParsedMovieInfo = GetParsedMovieInfo(new List<Language> { Language.Greek }, releaseTitle, releaseTokens);
-
-            Subject.Aggregate(_remoteMovie).Languages.Should().Equal(Language.Greek);
-        }
-    }
-}

src/NzbDrone.Core.Test/Download/DownloadClientTests/FreeboxDownloadTests/TorrentFreeboxDownloadFixture.cs

@@ -1,367 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using FluentAssertions;
-using Moq;
-using NUnit.Framework;
-using NzbDrone.Common.Disk;
-using NzbDrone.Common.Http;
-using NzbDrone.Core.Download;
-using NzbDrone.Core.Download.Clients;
-using NzbDrone.Core.Download.Clients.FreeboxDownload;
-using NzbDrone.Core.Download.Clients.FreeboxDownload.Responses;
-using NzbDrone.Core.Movies;
-using NzbDrone.Core.Parser.Model;
-
-namespace NzbDrone.Core.Test.Download.DownloadClientTests.FreeboxDownloadTests
-{
-    [TestFixture]
-    public class TorrentFreeboxDownloadFixture : DownloadClientFixtureBase<TorrentFreeboxDownload>
-    {
-        protected FreeboxDownloadSettings _settings;
-
-        protected FreeboxDownloadConfiguration _downloadConfiguration;
-
-        protected FreeboxDownloadTask _task;
-
-        protected string _defaultDestination = @"/some/path";
-        protected string _encodedDefaultDestination = "L3NvbWUvcGF0aA==";
-        protected string _category = "somecat";
-        protected string _encodedDefaultDestinationAndCategory = "L3NvbWUvcGF0aC9zb21lY2F0";
-        protected string _destinationDirectory = @"/path/to/media";
-        protected string _encodedDestinationDirectory = "L3BhdGgvdG8vbWVkaWE=";
-        protected OsPath _physicalPath = new OsPath("/mnt/sdb1/mydata");
-        protected string _downloadURL => "magnet:?xt=urn:btih:5dee65101db281ac9c46344cd6b175cdcad53426&dn=download";
-
-        [SetUp]
-        public void Setup()
-        {
-            Subject.Definition = new DownloadClientDefinition();
-
-            _settings = new FreeboxDownloadSettings()
-            {
-                Host = "127.0.0.1",
-                Port = 443,
-                ApiUrl = "/api/v1/",
-                AppId = "someid",
-                AppToken = "S0mEv3RY1oN9T0k3n"
-            };
-
-            Subject.Definition.Settings = _settings;
-
-            _downloadConfiguration = new FreeboxDownloadConfiguration()
-            {
-                DownloadDirectory = _encodedDefaultDestination
-            };
-
-            _task = new FreeboxDownloadTask()
-            {
-                Id = "id0",
-                Name = "name",
-                DownloadDirectory = "L3NvbWUvcGF0aA==",
-                InfoHash = "HASH",
-                QueuePosition = 1,
-                Status = FreeboxDownloadTaskStatus.Unknown,
-                Eta = 0,
-                Error = "none",
-                Type = FreeboxDownloadTaskType.Bt.ToString(),
-                IoPriority = FreeboxDownloadTaskIoPriority.Normal.ToString(),
-                StopRatio = 150,
-                PieceLength = 125,
-                CreatedTimestamp = 1665261599,
-                Size = 1000,
-                ReceivedPrct = 0,
-                ReceivedBytes = 0,
-                ReceivedRate = 0,
-                TransmittedPrct = 0,
-                TransmittedBytes = 0,
-                TransmittedRate = 0,
-            };
-
-            Mocker.GetMock<IHttpClient>()
-                  .Setup(s => s.Get(It.IsAny<HttpRequest>()))
-                  .Returns<HttpRequest>(r => new HttpResponse(r, new HttpHeader(), new byte[0]));
-        }
-
-        protected void GivenCategory()
-        {
-            _settings.Category = _category;
-        }
-
-        protected void GivenDestinationDirectory()
-        {
-            _settings.DestinationDirectory = _destinationDirectory;
-        }
-
-        protected virtual void GivenDownloadConfiguration()
-        {
-            Mocker.GetMock<IFreeboxDownloadProxy>()
-                  .Setup(s => s.GetDownloadConfiguration(It.IsAny<FreeboxDownloadSettings>()))
-                  .Returns(_downloadConfiguration);
-        }
-
-        protected virtual void GivenTasks(List<FreeboxDownloadTask> torrents)
-        {
-            if (torrents == null)
-            {
-                torrents = new List<FreeboxDownloadTask>();
-            }
-
-            Mocker.GetMock<IFreeboxDownloadProxy>()
-                  .Setup(s => s.GetTasks(It.IsAny<FreeboxDownloadSettings>()))
-                  .Returns(torrents);
-        }
-
-        protected void PrepareClientToReturnQueuedItem()
-        {
-            _task.Status = FreeboxDownloadTaskStatus.Queued;
-
-            GivenTasks(new List<FreeboxDownloadTask>
-            {
-                _task
-            });
-        }
-
-        protected void GivenSuccessfulDownload()
-        {
-            Mocker.GetMock<IHttpClient>()
-                  .Setup(s => s.Get(It.IsAny<HttpRequest>()))
-                  .Returns<HttpRequest>(r => new HttpResponse(r, new HttpHeader(), new byte[1000]));
-
-            Mocker.GetMock<IFreeboxDownloadProxy>()
-                  .Setup(s => s.AddTaskFromUrl(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<bool>(), It.IsAny<bool>(), It.IsAny<double?>(), It.IsAny<FreeboxDownloadSettings>()))
-                  .Callback(PrepareClientToReturnQueuedItem);
-
-            Mocker.GetMock<IFreeboxDownloadProxy>()
-                  .Setup(s => s.AddTaskFromFile(It.IsAny<string>(), It.IsAny<byte[]>(), It.IsAny<string>(), It.IsAny<bool>(), It.IsAny<bool>(), It.IsAny<double?>(), It.IsAny<FreeboxDownloadSettings>()))
-                  .Callback(PrepareClientToReturnQueuedItem);
-        }
-
-        protected override RemoteMovie CreateRemoteMovie()
-        {
-            var movie = base.CreateRemoteMovie();
-
-            movie.Release.DownloadUrl = _downloadURL;
-
-            return movie;
-        }
-
-        [Test]
-        public void Download_with_DestinationDirectory_should_force_directory()
-        {
-            GivenDestinationDirectory();
-            GivenSuccessfulDownload();
-
-            var remoteMovie = CreateRemoteMovie();
-
-            Subject.Download(remoteMovie);
-
-            Mocker.GetMock<IFreeboxDownloadProxy>()
-                  .Verify(v => v.AddTaskFromUrl(It.IsAny<string>(), _encodedDestinationDirectory, It.IsAny<bool>(), It.IsAny<bool>(), It.IsAny<double?>(), It.IsAny<FreeboxDownloadSettings>()), Times.Once());
-        }
-
-        [Test]
-        public void Download_with_Category_should_force_directory()
-        {
-            GivenDownloadConfiguration();
-            GivenCategory();
-            GivenSuccessfulDownload();
-
-            var remoteMovie = CreateRemoteMovie();
-
-            Subject.Download(remoteMovie);
-
-            Mocker.GetMock<IFreeboxDownloadProxy>()
-                  .Verify(v => v.AddTaskFromUrl(It.IsAny<string>(), _encodedDefaultDestinationAndCategory, It.IsAny<bool>(), It.IsAny<bool>(), It.IsAny<double?>(), It.IsAny<FreeboxDownloadSettings>()), Times.Once());
-        }
-
-        [Test]
-        public void Download_without_DestinationDirectory_and_Category_should_use_default()
-        {
-            GivenDownloadConfiguration();
-            GivenSuccessfulDownload();
-
-            var remoteMovie = CreateRemoteMovie();
-
-            Subject.Download(remoteMovie);
-
-            Mocker.GetMock<IFreeboxDownloadProxy>()
-                  .Verify(v => v.AddTaskFromUrl(It.IsAny<string>(), _encodedDefaultDestination, It.IsAny<bool>(), It.IsAny<bool>(), It.IsAny<double?>(), It.IsAny<FreeboxDownloadSettings>()), Times.Once());
-        }
-
-        [TestCase(false, false)]
-        [TestCase(true, true)]
-        public void Download_should_pause_torrent_as_expected(bool addPausedSetting, bool toBePausedFlag)
-        {
-            _settings.AddPaused = addPausedSetting;
-
-            GivenDownloadConfiguration();
-            GivenSuccessfulDownload();
-
-            var remoteMovie = CreateRemoteMovie();
-
-            Subject.Download(remoteMovie);
-
-            Mocker.GetMock<IFreeboxDownloadProxy>()
-                  .Verify(v => v.AddTaskFromUrl(It.IsAny<string>(), It.IsAny<string>(), toBePausedFlag, It.IsAny<bool>(), It.IsAny<double?>(), It.IsAny<FreeboxDownloadSettings>()), Times.Once());
-        }
-
-        [TestCase(0, (int)FreeboxDownloadPriority.First, (int)FreeboxDownloadPriority.First, true)]
-        [TestCase(0, (int)FreeboxDownloadPriority.Last, (int)FreeboxDownloadPriority.First, true)]
-        [TestCase(0, (int)FreeboxDownloadPriority.First, (int)FreeboxDownloadPriority.Last, false)]
-        [TestCase(0, (int)FreeboxDownloadPriority.Last, (int)FreeboxDownloadPriority.Last, false)]
-        [TestCase(22, (int)FreeboxDownloadPriority.First, (int)FreeboxDownloadPriority.First, true)]
-        [TestCase(22, (int)FreeboxDownloadPriority.Last, (int)FreeboxDownloadPriority.First, false)]
-        [TestCase(22, (int)FreeboxDownloadPriority.First, (int)FreeboxDownloadPriority.Last, true)]
-        [TestCase(22, (int)FreeboxDownloadPriority.Last, (int)FreeboxDownloadPriority.Last, false)]
-        public void Download_should_queue_torrent_first_as_expected(int ageDay, int olderPriority, int recentPriority, bool toBeQueuedFirstFlag)
-        {
-            _settings.OlderPriority = olderPriority;
-            _settings.RecentPriority = recentPriority;
-
-            GivenDownloadConfiguration();
-            GivenSuccessfulDownload();
-
-            var remoteMovie = CreateRemoteMovie();
-
-            remoteMovie.Movie.MovieMetadata.Value.PhysicalRelease = DateTime.UtcNow.AddDays(-ageDay);
-
-            Subject.Download(remoteMovie);
-
-            Mocker.GetMock<IFreeboxDownloadProxy>()
-                  .Verify(v => v.AddTaskFromUrl(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<bool>(), toBeQueuedFirstFlag, It.IsAny<double?>(), It.IsAny<FreeboxDownloadSettings>()), Times.Once());
-        }
-
-        [TestCase(0, 0)]
-        [TestCase(1.5, 150)]
-        public void Download_should_define_seed_ratio_as_expected(double? providerSeedRatio, double? expectedSeedRatio)
-        {
-            GivenDownloadConfiguration();
-            GivenSuccessfulDownload();
-
-            var remoteMovie = CreateRemoteMovie();
-
-            remoteMovie.SeedConfiguration = new TorrentSeedConfiguration();
-            remoteMovie.SeedConfiguration.Ratio = providerSeedRatio;
-
-            Subject.Download(remoteMovie);
-
-            Mocker.GetMock<IFreeboxDownloadProxy>()
-                  .Verify(v => v.AddTaskFromUrl(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<bool>(), It.IsAny<bool>(), expectedSeedRatio, It.IsAny<FreeboxDownloadSettings>()), Times.Once());
-        }
-
-        [Test]
-        public void GetItems_should_return_empty_list_if_no_tasks_available()
-        {
-            GivenTasks(new List<FreeboxDownloadTask>());
-
-            Subject.GetItems().Should().BeEmpty();
-        }
-
-        [Test]
-        public void GetItems_should_return_ignore_tasks_of_unknown_type()
-        {
-            _task.Status = FreeboxDownloadTaskStatus.Done;
-            _task.Type = "toto";
-
-            GivenTasks(new List<FreeboxDownloadTask> { _task });
-
-            Subject.GetItems().Should().BeEmpty();
-        }
-
-        [Test]
-        public void GetItems_when_destinationdirectory_is_set_should_ignore_downloads_in_wrong_folder()
-        {
-            _settings.DestinationDirectory = @"/some/path/that/will/not/match";
-
-            _task.Status = FreeboxDownloadTaskStatus.Done;
-
-            GivenTasks(new List<FreeboxDownloadTask> { _task });
-
-            Subject.GetItems().Should().BeEmpty();
-        }
-
-        [Test]
-        public void GetItems_when_category_is_set_should_ignore_downloads_in_wrong_folder()
-        {
-            _settings.Category = "somecategory";
-
-            _task.Status = FreeboxDownloadTaskStatus.Done;
-
-            GivenTasks(new List<FreeboxDownloadTask> { _task });
-
-            Subject.GetItems().Should().BeEmpty();
-        }
-
-        [TestCase(FreeboxDownloadTaskStatus.Downloading, false, false)]
-        [TestCase(FreeboxDownloadTaskStatus.Done, true, true)]
-        [TestCase(FreeboxDownloadTaskStatus.Seeding, false, false)]
-        [TestCase(FreeboxDownloadTaskStatus.Stopped, false, false)]
-        public void GetItems_should_return_canBeMoved_and_canBeDeleted_as_expected(FreeboxDownloadTaskStatus apiStatus, bool canMoveFilesExpected, bool canBeRemovedExpected)
-        {
-            _task.Status = apiStatus;
-
-            GivenTasks(new List<FreeboxDownloadTask>() { _task });
-
-            var items = Subject.GetItems();
-
-            items.Should().HaveCount(1);
-            items.First().CanBeRemoved.Should().Be(canBeRemovedExpected);
-            items.First().CanMoveFiles.Should().Be(canMoveFilesExpected);
-        }
-
-        [TestCase(FreeboxDownloadTaskStatus.Stopped, DownloadItemStatus.Paused)]
-        [TestCase(FreeboxDownloadTaskStatus.Stopping, DownloadItemStatus.Paused)]
-        [TestCase(FreeboxDownloadTaskStatus.Queued, DownloadItemStatus.Queued)]
-        [TestCase(FreeboxDownloadTaskStatus.Starting, DownloadItemStatus.Downloading)]
-        [TestCase(FreeboxDownloadTaskStatus.Downloading, DownloadItemStatus.Downloading)]
-        [TestCase(FreeboxDownloadTaskStatus.Retry, DownloadItemStatus.Downloading)]
-        [TestCase(FreeboxDownloadTaskStatus.Checking, DownloadItemStatus.Downloading)]
-        [TestCase(FreeboxDownloadTaskStatus.Error, DownloadItemStatus.Warning)]
-        [TestCase(FreeboxDownloadTaskStatus.Seeding, DownloadItemStatus.Completed)]
-        [TestCase(FreeboxDownloadTaskStatus.Done, DownloadItemStatus.Completed)]
-        [TestCase(FreeboxDownloadTaskStatus.Unknown, DownloadItemStatus.Downloading)]
-        public void GetItems_should_return_item_as_downloadItemStatus(FreeboxDownloadTaskStatus apiStatus, DownloadItemStatus expectedItemStatus)
-        {
-            _task.Status = apiStatus;
-
-            GivenTasks(new List<FreeboxDownloadTask>() { _task });
-
-            var items = Subject.GetItems();
-
-            items.Should().HaveCount(1);
-            items.First().Status.Should().Be(expectedItemStatus);
-        }
-
-        [Test]
-        public void GetItems_should_return_decoded_destination_directory()
-        {
-            var decodedDownloadDirectory = "/that/the/path";
-
-            _task.Status = FreeboxDownloadTaskStatus.Done;
-            _task.DownloadDirectory = "L3RoYXQvdGhlL3BhdGg=";
-
-            GivenTasks(new List<FreeboxDownloadTask> { _task });
-
-            var items = Subject.GetItems();
-
-            items.Should().HaveCount(1);
-            items.First().OutputPath.Should().Be(decodedDownloadDirectory);
-        }
-
-        [Test]
-        public void GetItems_should_return_message_if_tasks_in_error()
-        {
-            _task.Status = FreeboxDownloadTaskStatus.Error;
-            _task.Error = "internal";
-
-            GivenTasks(new List<FreeboxDownloadTask> { _task });
-
-            var items = Subject.GetItems();
-
-            items.Should().HaveCount(1);
-            items.First().Message.Should().Be("Internal error.");
-            items.First().Status.Should().Be(DownloadItemStatus.Warning);
-        }
-    }
-}

src/NzbDrone.Core.Test/Download/DownloadServiceFixture.cs

@@ -27,7 +27,7 @@ namespace NzbDrone.Core.Test.Download
             _downloadClients = new List<IDownloadClient>();
 
             Mocker.GetMock<IProvideDownloadClient>()
-                .Setup(v => v.GetDownloadClients(It.IsAny<bool>()))
+                .Setup(v => v.GetDownloadClients())
                 .Returns(_downloadClients);
 
             Mocker.GetMock<IProvideDownloadClient>()

src/NzbDrone.Core.Test/Download/Pending/PendingReleaseServiceTests/AddFixture.cs

@@ -89,7 +89,6 @@ namespace NzbDrone.Core.Test.Download.Pending.PendingReleaseServiceTests
                                                    .With(h => h.Title = title)
                                                    .With(h => h.Release = release)
                                                    .With(h => h.Reason = reason)
-                                                   .With(h => h.ParsedMovieInfo = _parsedMovieInfo)
                                                    .Build();
 
             _heldReleases.AddRange(heldReleases);

src/NzbDrone.Core.Test/Download/Pending/PendingReleaseServiceTests/RemovePendingFixture.cs

@@ -52,9 +52,7 @@ namespace NzbDrone.Core.Test.Download.Pending.PendingReleaseServiceTests
             _pending.Add(new PendingRelease
             {
                 Id = id,
-                Title = "Movie.Title.2020.720p-Radarr",
                 ParsedMovieInfo = new ParsedMovieInfo { MovieTitles = new List<string> { title }, Year = year },
-                Release = Builder<ReleaseInfo>.CreateNew().Build(),
                 MovieId = _movie.Id
             });
         }

src/NzbDrone.Core.Test/Download/Pending/PendingReleaseServiceTests/RemoveRejectedFixture.cs

@@ -93,7 +93,6 @@ namespace NzbDrone.Core.Test.Download.Pending.PendingReleaseServiceTests
                                                    .With(h => h.MovieId = _movie.Id)
                                                    .With(h => h.Title = title)
                                                    .With(h => h.Release = release)
-                                                   .With(h => h.ParsedMovieInfo = _parsedMovieInfo)
                                                    .Build();
 
             Mocker.GetMock<IPendingReleaseRepository>()

src/NzbDrone.Core.Test/HealthCheck/Checks/DownloadClientCheckFixture.cs

@@ -24,7 +24,7 @@ namespace NzbDrone.Core.Test.HealthCheck.Checks
         public void should_return_warning_when_download_client_has_not_been_configured()
         {
             Mocker.GetMock<IProvideDownloadClient>()
-                  .Setup(s => s.GetDownloadClients(It.IsAny<bool>()))
+                  .Setup(s => s.GetDownloadClients())
                   .Returns(Array.Empty<IDownloadClient>());
 
             Subject.Check().ShouldBeWarning();
@@ -40,7 +40,7 @@ namespace NzbDrone.Core.Test.HealthCheck.Checks
                           .Throws<Exception>();
 
             Mocker.GetMock<IProvideDownloadClient>()
-                  .Setup(s => s.GetDownloadClients(It.IsAny<bool>()))
+                  .Setup(s => s.GetDownloadClients())
                   .Returns(new IDownloadClient[] { downloadClient.Object });
 
             Subject.Check().ShouldBeError();
@@ -55,7 +55,7 @@ namespace NzbDrone.Core.Test.HealthCheck.Checks
                           .Returns(new List<DownloadClientItem>());
 
             Mocker.GetMock<IProvideDownloadClient>()
-                  .Setup(s => s.GetDownloadClients(It.IsAny<bool>()))
+                  .Setup(s => s.GetDownloadClients())
                   .Returns(new IDownloadClient[] { downloadClient.Object });
 
             Subject.Check().ShouldBeOk();

src/NzbDrone.Core.Test/HealthCheck/Checks/DownloadClientRootFolderCheckFixture.cs

@@ -49,7 +49,7 @@ namespace NzbDrone.Core.Test.HealthCheck.Checks
                 .Returns(_clientStatus);
 
             Mocker.GetMock<IProvideDownloadClient>()
-                  .Setup(s => s.GetDownloadClients(It.IsAny<bool>()))
+                  .Setup(s => s.GetDownloadClients())
                   .Returns(new IDownloadClient[] { _downloadClient.Object });
 
             Mocker.GetMock<IDiskProvider>()

src/NzbDrone.Core.Test/HealthCheck/Checks/DownloadClientSortingCheckFixture.cs

@@ -1,80 +0,0 @@
-using System;
-using System.Collections.Generic;
-using Moq;
-using NUnit.Framework;
-using NzbDrone.Common.Disk;
-using NzbDrone.Core.Download;
-using NzbDrone.Core.Download.Clients;
-using NzbDrone.Core.HealthCheck.Checks;
-using NzbDrone.Core.Localization;
-using NzbDrone.Core.RootFolders;
-using NzbDrone.Core.Test.Framework;
-using NzbDrone.Test.Common;
-
-namespace NzbDrone.Core.Test.HealthCheck.Checks
-{
-    [TestFixture]
-    public class DownloadClientFolderCheckFixture : CoreTest<DownloadClientSortingCheck>
-    {
-        private DownloadClientInfo _clientStatus;
-        private Mock<IDownloadClient> _downloadClient;
-
-        private static Exception[] DownloadClientExceptions =
-        {
-            new DownloadClientUnavailableException("error"),
-            new DownloadClientAuthenticationException("error"),
-            new DownloadClientException("error")
-        };
-
-        [SetUp]
-        public void Setup()
-        {
-            Mocker.GetMock<ILocalizationService>()
-                  .Setup(s => s.GetLocalizedString(It.IsAny<string>()))
-                  .Returns("Some Warning Message");
-
-            _clientStatus = new DownloadClientInfo
-            {
-                IsLocalhost = true,
-                SortingMode = null
-            };
-
-            _downloadClient = Mocker.GetMock<IDownloadClient>();
-            _downloadClient.Setup(s => s.Definition)
-                .Returns(new DownloadClientDefinition { Name = "Test" });
-
-            _downloadClient.Setup(s => s.GetStatus())
-                .Returns(_clientStatus);
-
-            Mocker.GetMock<IProvideDownloadClient>()
-                .Setup(s => s.GetDownloadClients(It.IsAny<bool>()))
-                .Returns(new IDownloadClient[] { _downloadClient.Object });
-        }
-
-        [Test]
-        public void should_return_ok_if_sorting_is_not_enabled()
-        {
-            Subject.Check().ShouldBeOk();
-        }
-
-        [Test]
-        public void should_return_warning_if_sorting_is_enabled()
-        {
-            _clientStatus.SortingMode = "TV";
-
-            Subject.Check().ShouldBeWarning();
-        }
-
-        [Test]
-        [TestCaseSource("DownloadClientExceptions")]
-        public void should_return_ok_if_client_throws_downloadclientexception(Exception ex)
-        {
-            _downloadClient.Setup(s => s.GetStatus())
-                .Throws(ex);
-
-            Subject.Check().ShouldBeOk();
-
-            ExceptionVerification.ExpectedErrors(0);
-        }
-    }
-}

src/NzbDrone.Core.Test/HealthCheck/Checks/RemotePathMappingCheckFixture.cs

@@ -63,7 +63,7 @@ namespace NzbDrone.Core.Test.HealthCheck.Checks
                 .Returns(_clientStatus);
 
             Mocker.GetMock<IProvideDownloadClient>()
-                  .Setup(s => s.GetDownloadClients(It.IsAny<bool>()))
+                  .Setup(s => s.GetDownloadClients())
                   .Returns(new IDownloadClient[] { _downloadClient.Object });
 
             Mocker.GetMock<IConfigService>()

src/NzbDrone.Core.Test/Housekeeping/Housekeepers/CleanupQualityProfileFormatItemsFixture.cs

@@ -1,133 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using FizzWare.NBuilder;
-using FluentAssertions;
-using NUnit.Framework;
-using NzbDrone.Core.CustomFormats;
-using NzbDrone.Core.Datastore;
-using NzbDrone.Core.Housekeeping.Housekeepers;
-using NzbDrone.Core.Messaging.Events;
-using NzbDrone.Core.Profiles;
-using NzbDrone.Core.Test.Framework;
-
-namespace NzbDrone.Core.Test.Housekeeping.Housekeepers
-{
-    [TestFixture]
-    public class CleanupQualityProfileFormatItemsFixture : DbTest<CleanupQualityProfileFormatItems, Profile>
-    {
-        [SetUp]
-        public void Setup()
-        {
-            Mocker.SetConstant<IQualityProfileFormatItemsCleanupRepository>(
-                new QualityProfileFormatItemsCleanupRepository(Mocker.Resolve<IMainDatabase>(), Mocker.Resolve<IEventAggregator>()));
-
-            Mocker.SetConstant<ICustomFormatRepository>(
-                new CustomFormatRepository(Mocker.Resolve<IMainDatabase>(), Mocker.Resolve<IEventAggregator>()));
-        }
-
-        [Test]
-        public void should_remove_orphaned_custom_formats()
-        {
-            var qualityProfile = Builder<Profile>.CreateNew()
-                .With(h => h.Items = Qualities.QualityFixture.GetDefaultQualities())
-                .With(h => h.MinFormatScore = 50)
-                .With(h => h.CutoffFormatScore = 100)
-                .With(h => h.FormatItems = new List<ProfileFormatItem>
-                {
-                    Builder<ProfileFormatItem>.CreateNew()
-                        .With(c => c.Format = new CustomFormat("My Custom Format") { Id = 0 })
-                        .Build()
-                })
-                .BuildNew();
-
-            Db.Insert(qualityProfile);
-            Subject.Clean();
-
-            var result = AllStoredModels;
-
-            result.Should().HaveCount(1);
-            result.First().FormatItems.Should().BeEmpty();
-            result.First().MinFormatScore.Should().Be(0);
-            result.First().CutoffFormatScore.Should().Be(0);
-        }
-
-        [Test]
-        public void should_not_remove_unorphaned_custom_formats()
-        {
-            var minFormatScore = 50;
-            var cutoffFormatScore = 100;
-
-            var customFormat = Builder<CustomFormat>.CreateNew()
-                .With(h => h.Specifications = new List<ICustomFormatSpecification>())
-                .BuildNew();
-
-            Db.Insert(customFormat);
-
-            var qualityProfile = Builder<Profile>.CreateNew()
-                .With(h => h.Items = Qualities.QualityFixture.GetDefaultQualities())
-                .With(h => h.MinFormatScore = minFormatScore)
-                .With(h => h.CutoffFormatScore = cutoffFormatScore)
-                .With(h => h.FormatItems = new List<ProfileFormatItem>
-                {
-                    Builder<ProfileFormatItem>.CreateNew()
-                        .With(c => c.Format = customFormat)
-                        .Build()
-                })
-                .BuildNew();
-
-            Db.Insert(qualityProfile);
-
-            Subject.Clean();
-            var result = AllStoredModels;
-
-            result.Should().HaveCount(1);
-            result.First().FormatItems.Should().HaveCount(1);
-            result.First().MinFormatScore.Should().Be(minFormatScore);
-            result.First().CutoffFormatScore.Should().Be(cutoffFormatScore);
-        }
-
-        [Test]
-        public void should_add_missing_custom_formats()
-        {
-            var minFormatScore = 50;
-            var cutoffFormatScore = 100;
-
-            var customFormat1 = Builder<CustomFormat>.CreateNew()
-                .With(h => h.Id = 1)
-                .With(h => h.Name = "Custom Format 1")
-                .With(h => h.Specifications = new List<ICustomFormatSpecification>())
-                .BuildNew();
-
-            var customFormat2 = Builder<CustomFormat>.CreateNew()
-                .With(h => h.Id = 2)
-                .With(h => h.Name = "Custom Format 2")
-                .With(h => h.Specifications = new List<ICustomFormatSpecification>())
-                .BuildNew();
-
-            Db.Insert(customFormat1);
-            Db.Insert(customFormat2);
-
-            var qualityProfile = Builder<Profile>.CreateNew()
-                .With(h => h.Items = Qualities.QualityFixture.GetDefaultQualities())
-                .With(h => h.MinFormatScore = minFormatScore)
-                .With(h => h.CutoffFormatScore = cutoffFormatScore)
-                .With(h => h.FormatItems = new List<ProfileFormatItem>
-                {
-                    Builder<ProfileFormatItem>.CreateNew()
-                        .With(c => c.Format = customFormat1)
-                        .Build()
-                })
-                .BuildNew();
-
-            Db.Insert(qualityProfile);
-
-            Subject.Clean();
-            var result = AllStoredModels;
-
-            result.Should().HaveCount(1);
-            result.First().FormatItems.Should().HaveCount(2);
-            result.First().MinFormatScore.Should().Be(minFormatScore);
-            result.First().CutoffFormatScore.Should().Be(cutoffFormatScore);
-        }
-    }
-}

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

@@ -1,10 +1,10 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using FizzWare.NBuilder;
 using FluentAssertions;
 using NUnit.Framework;
 using NzbDrone.Core.Indexers;
-using NzbDrone.Core.Indexers.FileList;
 using NzbDrone.Core.Indexers.Newznab;
+using NzbDrone.Core.Indexers.Omgwtfnzbs;
 using NzbDrone.Core.Lifecycle;
 using NzbDrone.Core.Test.Framework;
 
@@ -20,7 +20,7 @@ namespace NzbDrone.Core.Test.IndexerTests
             _indexers = new List<IIndexer>();
 
             _indexers.Add(Mocker.Resolve<Newznab>());
-            _indexers.Add(Mocker.Resolve<FileList>());
+            _indexers.Add(Mocker.Resolve<Omgwtfnzbs>());
 
             Mocker.SetConstant<IEnumerable<IIndexer>>(_indexers);
         }

src/NzbDrone.Core.Test/IndexerTests/OmgwtfnzbsTests/OmgwtfnzbsFixture.cs

@@ -0,0 +1,56 @@
+using System;
+using System.Linq;
+using System.Net.Http;
+using FluentAssertions;
+using Moq;
+using NUnit.Framework;
+using NzbDrone.Common.Http;
+using NzbDrone.Core.Indexers;
+using NzbDrone.Core.Indexers.Omgwtfnzbs;
+using NzbDrone.Core.Test.Framework;
+
+namespace NzbDrone.Core.Test.IndexerTests.OmgwtfnzbsTests
+{
+    [TestFixture]
+    public class OmgwtfnzbsFixture : CoreTest<Omgwtfnzbs>
+    {
+        [SetUp]
+        public void Setup()
+        {
+            Subject.Definition = new IndexerDefinition()
+            {
+                Name = "Omgwtfnzbs",
+                Settings = new OmgwtfnzbsSettings()
+                {
+                    ApiKey = "xxx",
+                    Username = "me@my.domain"
+                }
+            };
+        }
+
+        [Test]
+        public void should_parse_recent_feed_from_omgwtfnzbs()
+        {
+            var recentFeed = ReadAllText(@"Files/Indexers/Omgwtfnzbs/Omgwtfnzbs.xml");
+
+            Mocker.GetMock<IHttpClient>()
+                .Setup(o => o.Execute(It.Is<HttpRequest>(v => v.Method == HttpMethod.Get)))
+                .Returns<HttpRequest>(r => new HttpResponse(r, new HttpHeader(), recentFeed));
+
+            var releases = Subject.FetchRecent();
+
+            releases.Should().HaveCount(100);
+
+            var releaseInfo = releases.First();
+
+            releaseInfo.Title.Should().Be("Un.Petit.Boulot.2016.FRENCH.720p.BluRay.DTS.x264-LOST");
+            releaseInfo.DownloadProtocol.Should().Be(DownloadProtocol.Usenet);
+            releaseInfo.DownloadUrl.Should().Be("https://api.omgwtfnzbs.me/nzb/?id=8a2Bw&user=nzbdrone&api=nzbdrone");
+            releaseInfo.InfoUrl.Should().Be("https://omgwtfnzbs.me/details.php?id=8a2Bw");
+            releaseInfo.CommentUrl.Should().BeNullOrEmpty();
+            releaseInfo.Indexer.Should().Be(Subject.Definition.Name);
+            releaseInfo.PublishDate.Should().Be(DateTime.Parse("2017/01/09 00:16:54"));
+            releaseInfo.Size.Should().Be(5354909355);
+        }
+    }
+}

src/NzbDrone.Core.Test/IndexerTests/PTPTests/PTPFixture.cs

@@ -1,4 +1,3 @@
-using System;
 using System.Linq;
 using System.Net.Http;
 using FluentAssertions;
@@ -56,7 +55,7 @@ namespace NzbDrone.Core.Test.IndexerTests.PTPTests
             first.DownloadUrl.Should().Be("https://passthepopcorn.me/torrents.php?action=download&id=452135&authkey=00000000000000000000000000000000&torrent_pass=00000000000000000000000000000000");
             first.InfoUrl.Should().Be("https://passthepopcorn.me/torrents.php?id=148131&torrentid=452135");
 
-            first.PublishDate.Should().Be(DateTime.Parse("2016-10-18T23:40:59+0000").ToUniversalTime());
+            // first.PublishDate.Should().Be(DateTime.Parse("2017-04-17T12:13:42+0000").ToUniversalTime()); stupid timezones
             first.Size.Should().Be(2466170624L);
             first.InfoHash.Should().BeNullOrEmpty();
             first.MagnetUrl.Should().BeNullOrEmpty();

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

@@ -49,7 +49,6 @@ namespace NzbDrone.Core.Test.Languages
                 new object[] { 34, Language.Bengali },
                 new object[] { 35, Language.Slovak },
                 new object[] { 36, Language.Latvian },
-                new object[] { 37, Language.SpanishLatino }
             };
 
         public static object[] ToIntCases =
@@ -93,7 +92,6 @@ namespace NzbDrone.Core.Test.Languages
                 new object[] { Language.Bengali, 34 },
                 new object[] { Language.Slovak, 35 },
                 new object[] { Language.Latvian, 36 },
-                new object[] { Language.SpanishLatino, 37 }
             };
 
         [Test]

src/NzbDrone.Core.Test/MediaFiles/DownloadedMoviesImportServiceFixture.cs

@@ -445,58 +445,6 @@ namespace NzbDrone.Core.Test.MediaFiles
                   .Verify(v => v.DeleteFolder(It.IsAny<string>(), true), Times.Never());
         }
 
-        [Test]
-        public void should_return_rejection_if_nothing_imported_and_contains_rar_file()
-        {
-            GivenValidMovie();
-
-            var path = @"C:\media\ba09030e-1234-1234-1234-123456789abc\[HorribleSubs] American Psycho (2000) [720p]\[HorribleSubs] American Psycho (2000) [720p].mkv".AsOsAgnostic();
-            var imported = new List<ImportDecision>();
-
-            Mocker.GetMock<IMakeImportDecision>()
-                .Setup(s => s.GetImportDecisions(It.IsAny<List<string>>(), It.IsAny<Movie>(), It.IsAny<DownloadClientItem>(), null, true, true))
-                .Returns(imported);
-
-            Mocker.GetMock<IImportApprovedMovie>()
-                .Setup(s => s.Import(It.IsAny<List<ImportDecision>>(), true, null, ImportMode.Auto))
-                .Returns(imported.Select(i => new ImportResult(i)).ToList());
-
-            Mocker.GetMock<IDiskProvider>()
-                .Setup(s => s.GetFiles(It.IsAny<string>(), SearchOption.AllDirectories))
-                .Returns(new[] { _videoFiles.First().Replace(".ext", ".rar") });
-
-            var result = Subject.ProcessPath(path);
-
-            result.Count.Should().Be(1);
-            result.First().Result.Should().Be(ImportResultType.Rejected);
-        }
-
-        [Test]
-        public void should_return_rejection_if_nothing_imported_and_contains_executable_file()
-        {
-            GivenValidMovie();
-
-            var path = @"C:\media\ba09030e-1234-1234-1234-123456789abc\[HorribleSubs] American Psycho (2000) [720p]\[HorribleSubs] American Psycho (2000) [720p].mkv".AsOsAgnostic();
-            var imported = new List<ImportDecision>();
-
-            Mocker.GetMock<IMakeImportDecision>()
-                .Setup(s => s.GetImportDecisions(It.IsAny<List<string>>(), It.IsAny<Movie>(), It.IsAny<DownloadClientItem>(), null, true, true))
-                .Returns(imported);
-
-            Mocker.GetMock<IImportApprovedMovie>()
-                .Setup(s => s.Import(It.IsAny<List<ImportDecision>>(), true, null, ImportMode.Auto))
-                .Returns(imported.Select(i => new ImportResult(i)).ToList());
-
-            Mocker.GetMock<IDiskProvider>()
-                .Setup(s => s.GetFiles(It.IsAny<string>(), SearchOption.AllDirectories))
-                .Returns(new[] { _videoFiles.First().Replace(".ext", ".exe") });
-
-            var result = Subject.ProcessPath(path);
-
-            result.Count.Should().Be(1);
-            result.First().Result.Should().Be(ImportResultType.Rejected);
-        }
-
         private void VerifyNoImport()
         {
             Mocker.GetMock<IImportApprovedMovie>().Verify(c => c.Import(It.IsAny<List<ImportDecision>>(), true, null, ImportMode.Auto),

src/NzbDrone.Core.Test/MovieTests/MovieRepositoryTests/MovieRepositoryFixture.cs

@@ -35,7 +35,7 @@ namespace NzbDrone.Core.Test.MovieTests.MovieRepositoryTests
             var profile = new Profile
             {
                 Items = Qualities.QualityFixture.GetDefaultQualities(Quality.Bluray1080p, Quality.DVD, Quality.HDTV720p),
-                FormatItems = CustomFormatsTestHelpers.GetDefaultFormatItems(),
+                FormatItems = CustomFormatsFixture.GetDefaultFormatItems(),
                 MinFormatScore = 0,
                 Cutoff = Quality.Bluray1080p.Id,
                 Name = "TestProfile"

src/NzbDrone.Core.Test/NotificationTests/TraktTests/TraktServiceFixture.cs

@@ -1,4 +1,3 @@
-using System;
 using System.Linq;
 using Moq;
 using NUnit.Framework;
@@ -14,10 +13,10 @@ using NzbDrone.Core.Test.Framework;
 namespace NzbDrone.Core.Test.NotificationTests
 {
     [TestFixture]
-    public class TraktServiceFixture : CoreTest<Trakt>
+    public class TraktServiceFixture : CoreTest<TraktService>
     {
         private DownloadMessage _downloadMessage;
-        private NotificationDefinition _traktDefinition;
+        private TraktSettings _traktSettings;
 
         [SetUp]
         public void Setup()
@@ -35,17 +34,11 @@ namespace NzbDrone.Core.Test.NotificationTests
                 }
             };
 
-            _traktDefinition = new NotificationDefinition
+            _traktSettings = new TraktSettings
             {
-                Settings = new TraktSettings
-                {
-                    AccessToken = "",
-                    RefreshToken = "",
-                    Expires = DateTime.Now.AddDays(1)
-                }
+                AccessToken = "",
+                RefreshToken = ""
             };
-
-            Subject.Definition = _traktDefinition;
         }
 
         private void GiventValidMediaInfo(Quality quality, string audioChannels, string audioFormat, string scanType)
@@ -63,7 +56,7 @@ namespace NzbDrone.Core.Test.NotificationTests
         [Test]
         public void should_add_collection_movie_if_null_mediainfo()
         {
-            Subject.OnDownload(_downloadMessage);
+            Subject.AddMovieToCollection(_traktSettings, _downloadMessage.Movie, _downloadMessage.MovieFile);
 
             Mocker.GetMock<ITraktProxy>()
                   .Verify(v => v.AddToCollection(It.IsAny<TraktCollectMoviesResource>(), It.IsAny<string>()), Times.Once());
@@ -74,7 +67,7 @@ namespace NzbDrone.Core.Test.NotificationTests
         {
             GiventValidMediaInfo(Quality.Bluray1080p, "5.1", "DTS", "Progressive");
 
-            Subject.OnDownload(_downloadMessage);
+            Subject.AddMovieToCollection(_traktSettings, _downloadMessage.Movie, _downloadMessage.MovieFile);
 
             Mocker.GetMock<ITraktProxy>()
                   .Verify(v => v.AddToCollection(It.Is<TraktCollectMoviesResource>(t =>
@@ -90,7 +83,7 @@ namespace NzbDrone.Core.Test.NotificationTests
         {
             GiventValidMediaInfo(Quality.Bluray1080p, "2.0", "DTS", "Progressive");
 
-            Subject.OnDownload(_downloadMessage);
+            Subject.AddMovieToCollection(_traktSettings, _downloadMessage.Movie, _downloadMessage.MovieFile);
 
             Mocker.GetMock<ITraktProxy>()
                   .Verify(v => v.AddToCollection(It.Is<TraktCollectMoviesResource>(t =>

src/NzbDrone.Core.Test/OrganizerTests/CleanFixture.cs

@@ -10,8 +10,6 @@ namespace NzbDrone.Core.Test.OrganizerTests
     {
         [TestCase("Mission: Impossible - no [HDTV-720p]",
             "Mission Impossible - no [HDTV-720p]")]
-        [TestCase(".45 (2006)", "45 (2006)")]
-        [TestCase(" The Movie Title ", "The Movie Title")]
         public void CleanFileName(string name, string expectedName)
         {
             FileNameBuilder.CleanFileName(name).Should().Be(expectedName);

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

@@ -562,6 +562,19 @@ namespace NzbDrone.Core.Test.OrganizerTests.FileNameBuilderTests
                    .Should().Be(string.Format("HDTV-720p{0}South{0}Park", separator));
         }
 
+        [Test]
+        public void should_be_able_to_use_original_filename()
+        {
+            _movie.Title = "30 Rock";
+            _namingConfig.StandardMovieFormat = "{Movie Title} - {Original Filename}";
+
+            _movieFile.SceneName = "30.Rock.S01E01.xvid-LOL";
+            _movieFile.RelativePath = "30 Rock - S01E01 - Test";
+
+            Subject.BuildFileName(_movie, _movieFile)
+                   .Should().Be("30 Rock - 30 Rock - S01E01 - Test");
+        }
+
         [TestCase("en-US")]
         [TestCase("fr-FR")]
         [TestCase("az")]

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

@@ -1,88 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using FizzWare.NBuilder;
-using FluentAssertions;
-using NUnit.Framework;
-using NzbDrone.Core.CustomFormats;
-using NzbDrone.Core.MediaFiles;
-using NzbDrone.Core.Movies;
-using NzbDrone.Core.Organizer;
-using NzbDrone.Core.Qualities;
-using NzbDrone.Core.Test.Framework;
-
-namespace NzbDrone.Core.Test.OrganizerTests.FileNameBuilderTests
-{
-    [TestFixture]
-    public class OriginalTitleFixture : CoreTest<FileNameBuilder>
-    {
-        private Movie _movie;
-        private MovieFile _movieFile;
-        private NamingConfig _namingConfig;
-
-        [SetUp]
-        public void Setup()
-        {
-            _movie = Builder<Movie>
-                    .CreateNew()
-                    .With(s => s.Title = "My Movie")
-                    .Build();
-
-            _movieFile = new MovieFile { Quality = new QualityModel(Quality.HDTV720p), ReleaseGroup = "RadarrTest" };
-
-            _namingConfig = NamingConfig.Default;
-            _namingConfig.RenameMovies = true;
-
-            Mocker.GetMock<INamingConfigService>()
-                  .Setup(c => c.GetConfig()).Returns(_namingConfig);
-
-            Mocker.GetMock<IQualityDefinitionService>()
-                .Setup(v => v.Get(Moq.It.IsAny<Quality>()))
-                .Returns<Quality>(v => Quality.DefaultQualityDefinitions.First(c => c.Quality == v));
-
-            Mocker.GetMock<ICustomFormatService>()
-                .Setup(v => v.All())
-                .Returns(new List<CustomFormat>());
-        }
-
-        [Test]
-        public void should_not_recursively_include_current_filename()
-        {
-            _movieFile.RelativePath = "My Movie";
-            _namingConfig.StandardMovieFormat = "{Movie Title} {[Original Title]}";
-
-            Subject.BuildFileName(_movie, _movieFile)
-                   .Should().Be("My Movie");
-        }
-
-        [Test]
-        public void should_include_original_title_if_not_current_file_name()
-        {
-            _movieFile.SceneName = "my.movie.2008";
-            _movieFile.RelativePath = "My Movie";
-            _namingConfig.StandardMovieFormat = "{Movie Title} {[Original Title]}";
-
-            Subject.BuildFileName(_movie, _movieFile)
-                   .Should().Be("My Movie [my.movie.2008]");
-        }
-
-        [Test]
-        public void should_include_current_filename_if_not_renaming_files()
-        {
-            _movieFile.SceneName = "my.movie.2008";
-            _namingConfig.RenameMovies = false;
-
-            Subject.BuildFileName(_movie, _movieFile)
-                   .Should().Be("my.movie.2008");
-        }
-
-        [Test]
-        public void should_include_current_filename_if_not_including_multiple_naming_tokens()
-        {
-            _movieFile.RelativePath = "My Movie";
-            _namingConfig.StandardMovieFormat = "{Original Title}";
-
-            Subject.BuildFileName(_movie, _movieFile)
-                   .Should().Be("My Movie");
-        }
-    }
-}

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

@@ -49,7 +49,6 @@ namespace NzbDrone.Core.Test.ParserTests
         [TestCase("Movie.Title.1990.Ultimate.Rekall.Edition.NORDiC.REMUX.1080p.BluRay.AVC.DTS-HD.MA5.1-TWA", "Ultimate Rekall Edition")]
         [TestCase("Movie.Title.1971.Signature.Edition.1080p.BluRay.FLAC.2.0.x264-TDD", "Signature Edition")]
         [TestCase("Movie.1979.The.Imperial.Edition.BluRay.720p.DTS.x264-CtrlHD", "Imperial Edition")]
-        [TestCase("Movie.1997.Open.Matte.1080p.BluRay.x264.DTS-FGT", "Open Matte")]
         public void should_parse_edition(string postTitle, string edition)
         {
             var parsed = Parser.Parser.ParseMovieTitle(postTitle);

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

@@ -1,4 +1,3 @@
-using System.Linq;
 using FluentAssertions;
 using NUnit.Framework;
 using NzbDrone.Core.Languages;
@@ -381,18 +380,6 @@ namespace NzbDrone.Core.Test.ParserTests
             result.Languages.Should().BeEquivalentTo(Language.Latvian);
         }
 
-        [TestCase("Movie.Title.2019.720p_Eng-Spa(Latino)_MovieClubMx")]
-        [TestCase("Movie.Title.1.WEB-DL.720p.Complete.Latino.YG")]
-        [TestCase("Movie.Title.1080p.WEB.H264.Latino.YG")]
-        [TestCase("Movie Title latino")]
-        [TestCase("Movie Title (Temporada 11 Completa) Audio Dual Ingles/Latino 1920x1080")]
-        [TestCase("Movie title 7x4 audio latino")]
-        public void should_parse_language_spanish_latino(string postTitle)
-        {
-            var result = LanguageParser.ParseLanguages(postTitle);
-            result.First().Id.Should().Be(Language.SpanishLatino.Id);
-        }
-
         [TestCase("Movie.Title.en.sub")]
         [TestCase("Movie Title.eng.sub")]
         [TestCase("Movie.Title.eng.forced.sub")]

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

@@ -215,7 +215,6 @@ namespace NzbDrone.Core.Test.ParserTests
         [TestCase("Movie Name FRENCH BluRay 720p 2016 kjhlj", 2016)]
         [TestCase("Der.Movie.German.Bluray.FuckYou.Pso.Why.cant.you.follow.scene.rules.1998", 1998)]
         [TestCase("Movie Name (1897) [DVD].mp4", 1897)]
-        [TestCase("World Movie Z Movie [2023]", 2023)]
         public void should_parse_movie_year(string postTitle, int year)
         {
             Parser.Parser.ParseMovieTitle(postTitle).Year.Should().Be(year);
@@ -255,18 +254,6 @@ namespace NzbDrone.Core.Test.ParserTests
             parsed.Languages.Should().Contain(Language.German);
         }
 
-        [TestCase("Movie.Title.2016.1080p.KORSUB.WEBRip.x264.AAC2.0-RADARR", "KORSUB")]
-        [TestCase("Movie.Title.2016.1080p.KORSUBS.WEBRip.x264.AAC2.0-RADARR", "KORSUBS")]
-        [TestCase("Movie Title 2017 HC 720p HDRiP DD5 1 x264-LEGi0N", "Generic Hardcoded Subs")]
-        [TestCase("Movie.Title.2017.720p.SUBBED.HDRip.V2.XViD-26k.avi", "Generic Hardcoded Subs")]
-        [TestCase("Movie.Title.2000.1080p.BlueRay.x264.DTS.RoSubbed-playHD", null)]
-        [TestCase("Movie Title! 2018 [Web][MKV][h264][480p][AAC 2.0][Softsubs]", null)]
-        [TestCase("Movie Title! 2019 [HorribleSubs][Web][MKV][h264][848x480][AAC 2.0][Softsubs(HorribleSubs)]", null)]
-        public void should_parse_hardcoded_subs(string postTitle, string sub)
-        {
-            Parser.Parser.ParseMovieTitle(postTitle).HardcodedSubs.Should().Be(sub);
-        }
-
         [TestCase("That Italian Movie 2008 [tt1234567] 720p BluRay X264", "tt1234567")]
         [TestCase("That Italian Movie 2008 [tt12345678] 720p BluRay X264", "tt12345678")]
         public void should_parse_imdb_in_title(string postTitle, string imdb)

src/NzbDrone.Core.Test/ParserTests/ParsingServiceTests/AugmentersTests/AugmentMovieInfoFixture.cs

@@ -0,0 +1,28 @@
+using System.Collections.Generic;
+using NUnit.Framework;
+using NzbDrone.Core.Parser.Augmenters;
+using NzbDrone.Core.Parser.Model;
+using NzbDrone.Core.Qualities;
+using NzbDrone.Core.Test.Framework;
+
+namespace NzbDrone.Core.Test.ParserTests.ParsingServiceTests.AugmentersTests
+{
+    [TestFixture]
+    public abstract class AugmentMovieInfoFixture<TAugmenter> : CoreTest<TAugmenter>
+        where TAugmenter : class, IAugmentParsedMovieInfo
+    {
+        protected ParsedMovieInfo MovieInfo;
+
+        [SetUp]
+        public virtual void Setup()
+        {
+            MovieInfo = new ParsedMovieInfo
+            {
+                MovieTitles = new List<string> { "A Movie" },
+                Year = 1998,
+                SimpleReleaseTitle = "A Movie Title 1998 Bluray 1080p",
+                Quality = new QualityModel(Quality.Bluray1080p)
+            };
+        }
+    }
+}

src/NzbDrone.Core.Test/ParserTests/ParsingServiceTests/AugmentersTests/AugmentWithFileSizeFixture.cs

@@ -0,0 +1,23 @@
+using FluentAssertions;
+using NUnit.Framework;
+using NzbDrone.Core.Parser.Augmenters;
+using NzbDrone.Core.Parser.Model;
+
+namespace NzbDrone.Core.Test.ParserTests.ParsingServiceTests.AugmentersTests
+{
+    [TestFixture]
+    public class AugmentWithFileSizeFixture : AugmentMovieInfoFixture<AugmentWithFileSize>
+    {
+        [Test]
+        public void should_add_file_size()
+        {
+            var localMovie = new LocalMovie
+            {
+                Size = 1500
+            };
+
+            var movieInfo = Subject.AugmentMovieInfo(MovieInfo, localMovie);
+            movieInfo.ExtraInfo["Size"].Should().BeEquivalentTo(1500);
+        }
+    }
+}

src/NzbDrone.Core.Test/ParserTests/ParsingServiceTests/AugmentersTests/AugmentWithHistoryFixture.cs

@@ -0,0 +1,109 @@
+using System;
+using System.Collections.Generic;
+using FluentAssertions;
+using Moq;
+using NUnit.Framework;
+using NzbDrone.Core.History;
+using NzbDrone.Core.Indexers;
+using NzbDrone.Core.Indexers.Rarbg;
+using NzbDrone.Core.Languages;
+using NzbDrone.Core.Parser.Augmenters;
+using NzbDrone.Core.Parser.Model;
+
+namespace NzbDrone.Core.Test.ParserTests.ParsingServiceTests.AugmentersTests
+{
+    [TestFixture]
+    public class AugmentWithHistoryFixture : AugmentMovieInfoFixture<AugmentWithHistory>
+    {
+        private AugmentWithHistory _customSubject { get; set; }
+
+        [SetUp]
+        public override void Setup()
+        {
+            base.Setup();
+
+            // Add multi indexer
+            GivenIndexerSettings(new RarbgSettings
+            {
+                MultiLanguages = new List<int>
+                {
+                    (int)Language.English,
+                    (int)Language.French,
+                }
+            });
+        }
+
+        protected new AugmentWithHistory Subject
+        {
+            get
+            {
+                if (_customSubject == null)
+                {
+                    _customSubject = new AugmentWithHistory(new List<Lazy<IAugmentParsedMovieInfo>> { new (Mocker.Resolve<AugmentWithReleaseInfo>()) });
+                }
+
+                return _customSubject;
+            }
+        }
+
+        private void GivenIndexerSettings(IIndexerSettings indexerSettings)
+        {
+            Mocker.GetMock<IIndexerFactory>().Setup(f => f.Get(It.IsAny<int>())).Returns(new IndexerDefinition
+            {
+                Settings = indexerSettings
+            });
+        }
+
+        private MovieHistory HistoryWithData(params string[] data)
+        {
+            var dict = new Dictionary<string, string>(StringComparer.InvariantCultureIgnoreCase);
+            for (var i = 0; i < data.Length; i += 2)
+            {
+                dict.Add(data[i], data[i + 1]);
+            }
+
+            return new MovieHistory
+            {
+                Data = dict,
+                EventType = MovieHistoryEventType.Grabbed
+            };
+        }
+
+        [Test]
+        public void should_add_indexer_flags()
+        {
+            var history = HistoryWithData("IndexerFlags", (IndexerFlags.PTP_Approved | IndexerFlags.PTP_Golden).ToString());
+            var movieInfo = Subject.AugmentMovieInfo(MovieInfo, history);
+            movieInfo.ExtraInfo["IndexerFlags"].Should().BeEquivalentTo(IndexerFlags.PTP_Golden | IndexerFlags.PTP_Approved);
+        }
+
+        [Test]
+        public void should_add_size()
+        {
+            var history = HistoryWithData("Size", 9663676416.ToString());
+            var movieInfo = Subject.AugmentMovieInfo(MovieInfo, history);
+            movieInfo.ExtraInfo["Size"].Should().BeEquivalentTo(9663676416);
+        }
+
+        [Test]
+        public void should_use_settings_languages_when_necessary()
+        {
+            var history = HistoryWithData("IndexerId", 1.ToString());
+
+            var movieInfo = Subject.AugmentMovieInfo(MovieInfo, history);
+            movieInfo.Languages.Should().BeEquivalentTo();
+
+            MovieInfo.SimpleReleaseTitle = "A Movie 1998 Bluray 1080p MULTI";
+            var multiInfo = Subject.AugmentMovieInfo(MovieInfo, history);
+            multiInfo.Languages.Should().BeEquivalentTo(Language.English, Language.French);
+        }
+
+        [Test]
+        public void should_not_use_settings_languages()
+        {
+            var unknownIndexer = HistoryWithData();
+            var unknownIndexerInfo = Subject.AugmentMovieInfo(MovieInfo, unknownIndexer);
+            unknownIndexerInfo.Languages.Should().BeEquivalentTo();
+        }
+    }
+}

src/NzbDrone.Core.Test/ParserTests/ParsingServiceTests/AugmentersTests/AugmentWithMediaInfoFixture.cs

@@ -0,0 +1,90 @@
+// using FluentAssertions;
+// using NUnit.Framework;
+// using NzbDrone.Core.CustomFormats;
+// using NzbDrone.Core.MediaFiles.MediaInfo;
+// using NzbDrone.Core.Parser;
+// using NzbDrone.Core.Parser.Augmenters;
+// using NzbDrone.Core.Qualities;
+
+// namespace NzbDrone.Core.Test.ParserTests.ParsingServiceTests.AugmentersTests
+// {
+//    [TestFixture]
+//    public class AugmentWithMediaInfoFixture : AugmentMovieInfoFixture<AugmentWithMediaInfo>
+//    {
+//        [TestCase(Resolution.R720p, Source.BLURAY, Resolution.R1080p)]
+//        [TestCase(Resolution.R1080p, Source.TV, Resolution.R720p)]
+//        public void should_correct_resolution(Resolution resolution, Source source, Resolution realResolution)
+//        {
+//            var quality = new QualityModel
+//            {
+//                Source = source,
+//                Resolution = resolution,
+//            };
+//            MovieInfo.Quality = quality;
+
+// var realWidth = 480;
+//            switch (realResolution)
+//            {
+//                case Resolution.R720p:
+//                    realWidth = 1280;
+//                    break;
+//                case Resolution.R1080p:
+//                    realWidth = 1920;
+//                    break;
+//                case Resolution.R2160p:
+//                    realWidth = 2160;
+//                    break;
+
+// }
+
+// var mediaInfo = new MediaInfoModel
+//            {
+//                Width = realWidth
+//            };
+
+// var movieInfo = Subject.AugmentMovieInfo(MovieInfo, mediaInfo);
+//            movieInfo.Quality.Resolution.Should().BeEquivalentTo(realResolution);
+//            movieInfo.Quality.QualityDetectionSource.Should().BeEquivalentTo(QualityDetectionSource.MediaInfo);
+//        }
+
+// [TestCase(Resolution.R720P, Source.BLURAY, Resolution.R1080P, Modifier.BRDISK)]
+//        [TestCase(Resolution.R1080P, Source.BLURAY, Resolution.R720P, Modifier.REMUX)]
+//        [TestCase(Resolution.R480P, Source.BLURAY, Resolution.R720P)]
+//        [TestCase(Resolution.R720P, Source.DVD, Resolution.R480P)]
+//        public void should_not_correct_resolution(Resolution resolution, Source source, Resolution realResolution, Modifier modifier = Modifier.NONE)
+//        {
+//            var quality = new QualityModel
+//            {
+//                Source = source,
+//                Resolution = resolution,
+//                Modifier = modifier,
+//            };
+
+// MovieInfo.Quality = quality;
+
+// var realWidth = 480;
+//            switch (realResolution)
+//            {
+//                case Resolution.R720P:
+//                    realWidth = 1280;
+//                    break;
+//                case Resolution.R1080P:
+//                    realWidth = 1920;
+//                    break;
+//                case Resolution.R2160P:
+//                    realWidth = 2160;
+//                    break;
+
+// }
+
+// var mediaInfo = new MediaInfoModel
+//            {
+//                Width = realWidth
+//            };
+
+// var movieInfo = Subject.AugmentMovieInfo(MovieInfo, mediaInfo);
+//            movieInfo.Quality.Resolution.Should().BeEquivalentTo(resolution);
+//            movieInfo.Quality.QualityDetectionSource.Should().BeEquivalentTo(QualityDetectionSource.Name);
+//        }
+//    }
+// }

src/NzbDrone.Core.Test/ParserTests/ParsingServiceTests/AugmentersTests/AugmentWithOriginalLanguageFixture.cs

@@ -0,0 +1,29 @@
+using System;
+using FluentAssertions;
+using NUnit.Framework;
+using NzbDrone.Core.Languages;
+using NzbDrone.Core.Parser.Augmenters;
+using NzbDrone.Core.Parser.Model;
+
+namespace NzbDrone.Core.Test.ParserTests.ParsingServiceTests.AugmentersTests
+{
+    [TestFixture]
+    public class AugmentWithOriginalLanguageFixture : AugmentMovieInfoFixture<AugmentWithOriginalLanguage>
+    {
+        [Test]
+        public void should_add_movie_original_language()
+        {
+            var releaseInfo = new ParsedMovieInfo();
+            var movie = new Movies.Movie
+            {
+                MovieMetadata = new Movies.MovieMetadata
+                {
+                    OriginalLanguage = Language.English
+                }
+            };
+            var result = Subject.AugmentMovieInfo(releaseInfo, movie);
+            result.ExtraInfo.Should().ContainKey("OriginalLanguage");
+            result.ExtraInfo["OriginalLanguage"].Should().Be(Language.English);
+        }
+    }
+}

src/NzbDrone.Core.Test/ParserTests/ParsingServiceTests/AugmentersTests/AugmentWithParsedMovieInfo.cs

@@ -0,0 +1,77 @@
+using System.Collections.Generic;
+using FluentAssertions;
+using NUnit.Framework;
+using NzbDrone.Core.Languages;
+using NzbDrone.Core.Parser.Augmenters;
+using NzbDrone.Core.Parser.Model;
+
+namespace NzbDrone.Core.Test.ParserTests.ParsingServiceTests.AugmentersTests
+{
+    [TestFixture]
+    public class AugmentWithParsedMovieInfoFixture : AugmentMovieInfoFixture<AugmentWithParsedMovieInfo>
+    {
+        [Test]
+        public void should_add_edition_if_null()
+        {
+            var folderInfo = new ParsedMovieInfo
+            {
+                Edition = "Directors Cut"
+            };
+
+            var result = Subject.AugmentMovieInfo(MovieInfo, folderInfo);
+
+            result.Edition.Should().Be(folderInfo.Edition);
+        }
+
+        [Test]
+        public void should_preferr_longer_edition()
+        {
+            var folderInfo = new ParsedMovieInfo
+            {
+                Edition = "Super duper cut"
+            };
+
+            MovieInfo.Edition = "Rogue";
+
+            var result = Subject.AugmentMovieInfo(MovieInfo, folderInfo);
+
+            result.Edition.Should().Be(folderInfo.Edition);
+
+            MovieInfo.Edition = "Super duper awesome cut";
+
+            result = Subject.AugmentMovieInfo(MovieInfo, folderInfo);
+
+            result.Edition.Should().Be(MovieInfo.Edition);
+        }
+
+        [Test]
+        public void should_combine_languages()
+        {
+            var folderInfo = new ParsedMovieInfo
+            {
+                Languages = new List<Language> { Language.French }
+            };
+
+            MovieInfo.Languages = new List<Language> { Language.English };
+
+            var result = Subject.AugmentMovieInfo(MovieInfo, folderInfo);
+
+            result.Languages.Should().BeEquivalentTo(Language.English, Language.French);
+        }
+
+        [Test]
+        public void should_use_folder_release_group()
+        {
+            var folderInfo = new ParsedMovieInfo
+            {
+                ReleaseGroup = "AwesomeGroup"
+            };
+
+            MovieInfo.ReleaseGroup = "";
+
+            var result = Subject.AugmentMovieInfo(MovieInfo, folderInfo);
+
+            result.ReleaseGroup.Should().BeEquivalentTo(folderInfo.ReleaseGroup);
+        }
+    }
+}

src/NzbDrone.Core.Test/ParserTests/ParsingServiceTests/AugmentersTests/AugmentWithReleaseInfoFixture.cs

@@ -0,0 +1,82 @@
+using System.Linq;
+using FluentAssertions;
+using NUnit.Framework;
+using NzbDrone.Core.Indexers;
+using NzbDrone.Core.Indexers.Rarbg;
+using NzbDrone.Core.Languages;
+using NzbDrone.Core.Parser.Augmenters;
+using NzbDrone.Core.Parser.Model;
+
+namespace NzbDrone.Core.Test.ParserTests.ParsingServiceTests.AugmentersTests
+{
+    [TestFixture]
+    public class AugmentWithReleaseInfoFixture : AugmentMovieInfoFixture<AugmentWithReleaseInfo>
+    {
+        private IndexerDefinition _indexerDefinition;
+
+        private ReleaseInfo ReleaseInfoWithLanguages(params Language[] languages)
+        {
+            _indexerDefinition = new IndexerDefinition
+            {
+                Settings = new RarbgSettings { MultiLanguages = languages.ToList().Select(l => (int)l) }
+            };
+
+            Mocker.GetMock<IIndexerFactory>()
+                .Setup(v => v.Get(1))
+                .Returns(_indexerDefinition);
+
+            return new ReleaseInfo
+            {
+                IndexerId = 1
+            };
+        }
+
+        [Test]
+        public void should_add_language_from_indexer()
+        {
+            var releaseInfo = ReleaseInfoWithLanguages(Language.English, Language.French);
+            MovieInfo.SimpleReleaseTitle = "A Movie Title 1998 Bluray 1080p MULTI";
+            var movieInfo = Subject.AugmentMovieInfo(MovieInfo, releaseInfo);
+            movieInfo.Languages.Count.Should().Be(2);
+            movieInfo.Languages.Should().BeEquivalentTo(Language.English, Language.French);
+        }
+
+        [Test]
+        public void should_add_size_info()
+        {
+            var releaseInfo = new ReleaseInfo
+            {
+                Size = 1500
+            };
+
+            var movieInfo = Subject.AugmentMovieInfo(MovieInfo, releaseInfo);
+            movieInfo.ExtraInfo["Size"].Should().BeEquivalentTo(1500);
+        }
+
+        [Test]
+        public void should_not_add_size_when_already_present()
+        {
+            var releaseInfo = new ReleaseInfo
+            {
+                Size = 1500
+            };
+
+            MovieInfo.ExtraInfo["Size"] = 1600;
+
+            var movieInfo = Subject.AugmentMovieInfo(MovieInfo, releaseInfo);
+            movieInfo.ExtraInfo["Size"].Should().BeEquivalentTo(1600);
+        }
+
+        [Test]
+        public void should_add_indexer_flags()
+        {
+            var releaseInfo = new ReleaseInfo
+            {
+                IndexerFlags = IndexerFlags.PTP_Approved | IndexerFlags.PTP_Golden
+            };
+
+            var movieInfo = Subject.AugmentMovieInfo(MovieInfo, releaseInfo);
+            movieInfo.ExtraInfo["IndexerFlags"].Should().BeEquivalentTo(IndexerFlags.PTP_Approved | IndexerFlags.PTP_Golden);
+        }
+    }
+}

src/NzbDrone.Core.Test/ParserTests/ParsingServiceTests/MapFixture.cs

@@ -194,5 +194,20 @@ namespace NzbDrone.Core.Test.ParserTests.ParsingServiceTests
             Subject.Map(_umlautInfo, "", _movieSearchCriteria).Movie.Should().Be(_movieSearchCriteria.Movie);
             Subject.Map(_umlautAltInfo, "", _movieSearchCriteria).Movie.Should().Be(_movieSearchCriteria.Movie);
         }
+
+        [Test]
+        public void should_convert_original()
+        {
+            Subject.Map(_multiLanguageInfo, "", _movieSearchCriteria).RemoteMovie.ParsedMovieInfo.Languages.Should().Contain(Language.English);
+            Subject.Map(_multiLanguageInfo, "", _movieSearchCriteria).RemoteMovie.ParsedMovieInfo.Languages.Should().Contain(Language.French);
+        }
+
+        [Test]
+        public void should_remove_original_as_already_exists()
+        {
+            Subject.Map(_multiLanguageWithOriginalInfo, "", _movieSearchCriteria).RemoteMovie.ParsedMovieInfo.Languages.Should().Contain(Language.English);
+            Subject.Map(_multiLanguageWithOriginalInfo, "", _movieSearchCriteria).RemoteMovie.ParsedMovieInfo.Languages.Should().Contain(Language.French);
+            Subject.Map(_multiLanguageWithOriginalInfo, "", _movieSearchCriteria).RemoteMovie.ParsedMovieInfo.Languages.Should().NotContain(Language.Original);
+        }
     }
 }

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

@@ -44,7 +44,6 @@ namespace NzbDrone.Core.Test.ParserTests
         [TestCase("Movie Name 2018 NEW PROPER 720p HD-CAM X264 HQ-CPG", true)]
         [TestCase("Movie Name (2022) 1080p HQCAM ENG x264 AAC - QRips", false)]
         [TestCase("Movie Name (2018) 720p Hindi HQ CAMrip x264 AAC 1.4GB", false)]
-        [TestCase("Movie Name (2022) New HDCAMRip 1080p [Love Rulz]", false)]
         public void should_parse_cam(string title, bool proper)
         {
             ParseAndVerifyQuality(title, Source.CAM, proper, Resolution.Unknown);
@@ -452,6 +451,17 @@ namespace NzbDrone.Core.Test.ParserTests
             result.ResolutionDetectionSource.Should().Be(QualityDetectionSource.Name);
         }
 
+        [TestCase("Movie.Title.2016.1080p.KORSUB.WEBRip.x264.AAC2.0-RADARR", "KORSUB")]
+        [TestCase("Movie.Title.2016.1080p.KORSUBS.WEBRip.x264.AAC2.0-RADARR", "KORSUBS")]
+        [TestCase("Movie Title 2017 HC 720p HDRiP DD5 1 x264-LEGi0N", "Generic Hardcoded Subs")]
+        [TestCase("Movie.Title.2017.720p.SUBBED.HDRip.V2.XViD-26k.avi", "Generic Hardcoded Subs")]
+        [TestCase("Movie Title! 2018 [Web][MKV][h264][480p][AAC 2.0][Softsubs]", null)]
+        [TestCase("Movie Title! 2019 [HorribleSubs][Web][MKV][h264][848x480][AAC 2.0][Softsubs(HorribleSubs)]", null)]
+        public void should_parse_hardcoded_subs(string postTitle, string sub)
+        {
+            QualityParser.ParseQuality(postTitle).HardcodedSubs.Should().Be(sub);
+        }
+
         [TestCase("Movie Title 2018 REPACK 720p x264 aAF", true)]
         [TestCase("Movie.Title.2018.REPACK.720p.x264-aAF", true)]
         [TestCase("Movie.Title.2018.PROPER.720p.x264-aAF", false)]

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

@@ -51,7 +51,6 @@ namespace NzbDrone.Core.Test.ParserTests
         [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.Name.2022.1080p.BluRay.x264-VARYG", "VARYG")]
         [TestCase("Movie.Title.2019.1080p.AMZN.WEB-Rip.DDP.5.1.HEVC", null)]
         public void should_parse_expected_release_group(string title, string expected)
         {
@@ -108,7 +107,6 @@ namespace NzbDrone.Core.Test.ParserTests
         [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")]
-        [TestCase("Movie.Name.2022.1080p.BluRay.x264-VARYG (Blue Lock, Multi-Subs)", "VARYG")]
         public void should_parse_exception_release_group(string title, string expected)
         {
             Parser.Parser.ParseReleaseGroup(title).Should().Be(expected);

src/NzbDrone.Core.Test/Profiles/ProfileRepositoryFixture.cs

@@ -22,7 +22,7 @@ namespace NzbDrone.Core.Test.Profiles
             {
                 Items = Qualities.QualityFixture.GetDefaultQualities(Quality.Bluray1080p, Quality.DVD, Quality.HDTV720p),
                 MinFormatScore = 0,
-                FormatItems = CustomFormatsTestHelpers.GetDefaultFormatItems(),
+                FormatItems = CustomFormatsFixture.GetDefaultFormatItems(),
                 Cutoff = Quality.Bluray1080p.Id,
                 Name = "TestProfile"
             };

src/NzbDrone.Core.Test/Profiles/ProfileServiceFixture.cs

@@ -170,9 +170,9 @@ namespace NzbDrone.Core.Test.Profiles
             var customFormat1 = new CustomFormat("My Format 1", new LanguageSpecification { Value = (int)Language.English }) { Id = 1 };
             var customFormat2 = new CustomFormat("My Format 2", new LanguageSpecification { Value = (int)Language.French }) { Id = 2 };
 
-            CustomFormatsTestHelpers.GivenCustomFormats(customFormat1, customFormat2);
+            CustomFormatsFixture.GivenCustomFormats(customFormat1, customFormat2);
 
-            profile.FormatItems = CustomFormatsTestHelpers.GetSampleFormatItems(customFormat2.Name);
+            profile.FormatItems = CustomFormatsFixture.GetSampleFormatItems(customFormat2.Name);
 
             Mocker.GetMock<IProfileRepository>()
                   .Setup(s => s.Get(It.IsAny<int>()))

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

@@ -24,6 +24,7 @@ namespace NzbDrone.Core.Test.UpdateTests
             Subject.GetLatestUpdate("develop", new Version(10, 0)).Should().BeNull();
         }
 
+        [Ignore("Pending linux-x86 release")]
         [Test]
         public void finds_update_when_version_lower()
         {
@@ -39,6 +40,7 @@ namespace NzbDrone.Core.Test.UpdateTests
             Subject.GetLatestUpdate("invalid_branch", new Version(0, 2)).Should().NotBeNull();
         }
 
+        [Ignore("Pending linux-x86 release")]
         [Test]
         public void should_get_recent_updates()
         {

src/NzbDrone.Core/Configuration/ConfigFileProvider.cs

@@ -198,7 +198,7 @@ namespace NzbDrone.Core.Configuration
 
         public string LogLevel => GetValue("LogLevel", "info").ToLowerInvariant();
         public string ConsoleLogLevel => GetValue("ConsoleLogLevel", string.Empty, persist: false);
-        public string Theme => GetValue("Theme", "auto", persist: false);
+        public string Theme => GetValue("Theme", "light", persist: false);
         public string PostgresHost => _postgresOptions?.Host ?? GetValue("PostgresHost", string.Empty, persist: false);
         public string PostgresUser => _postgresOptions?.User ?? GetValue("PostgresUser", string.Empty, persist: false);
         public string PostgresPassword => _postgresOptions?.Password ?? GetValue("PostgresPassword", string.Empty, persist: false);

src/NzbDrone.Core/CustomFormats/CustomFormatCalculationService.cs

@@ -14,133 +14,28 @@ namespace NzbDrone.Core.CustomFormats
 {
     public interface ICustomFormatCalculationService
     {
-        List<CustomFormat> ParseCustomFormat(RemoteMovie remoteMovie, long size);
-        List<CustomFormat> ParseCustomFormat(MovieFile movieFile, Movie movie);
+        List<CustomFormat> ParseCustomFormat(ParsedMovieInfo movieInfo, Movie movie);
         List<CustomFormat> ParseCustomFormat(MovieFile movieFile);
-        List<CustomFormat> ParseCustomFormat(Blocklist blocklist, Movie movie);
-        List<CustomFormat> ParseCustomFormat(MovieHistory history, Movie movie);
-        List<CustomFormat> ParseCustomFormat(LocalMovie localMovie);
+        List<CustomFormat> ParseCustomFormat(Blocklist blocklist);
+        List<CustomFormat> ParseCustomFormat(MovieHistory history);
     }
 
     public class CustomFormatCalculationService : ICustomFormatCalculationService
     {
         private readonly ICustomFormatService _formatService;
+        private readonly IParsingService _parsingService;
+        private readonly IMovieService _movieService;
 
-        public CustomFormatCalculationService(ICustomFormatService formatService)
+        public CustomFormatCalculationService(ICustomFormatService formatService,
+                                              IParsingService parsingService,
+                                              IMovieService movieService)
         {
             _formatService = formatService;
+            _parsingService = parsingService;
+            _movieService = movieService;
         }
 
-        public List<CustomFormat> ParseCustomFormat(RemoteMovie remoteMovie, long size)
-        {
-            var input = new CustomFormatInput
-            {
-                MovieInfo = remoteMovie.ParsedMovieInfo,
-                Movie = remoteMovie.Movie,
-                Size = size,
-                Languages = remoteMovie.Languages
-            };
-
-            return ParseCustomFormat(input);
-        }
-
-        public List<CustomFormat> ParseCustomFormat(MovieFile movieFile, Movie movie)
-        {
-            return ParseCustomFormat(movieFile, movie, _formatService.All());
-        }
-
-        public List<CustomFormat> ParseCustomFormat(MovieFile movieFile)
-        {
-            return ParseCustomFormat(movieFile, movieFile.Movie, _formatService.All());
-        }
-
-        public List<CustomFormat> ParseCustomFormat(Blocklist blocklist, Movie movie)
-        {
-            var parsed = Parser.Parser.ParseMovieTitle(blocklist.SourceTitle);
-
-            var movieInfo = new ParsedMovieInfo
-            {
-                MovieTitles = new List<string>() { movie.Title },
-                SimpleReleaseTitle = parsed?.SimpleReleaseTitle ?? blocklist.SourceTitle.SimplifyReleaseTitle(),
-                ReleaseTitle = parsed?.ReleaseTitle ?? blocklist.SourceTitle,
-                Edition = parsed?.Edition,
-                Quality = blocklist.Quality,
-                Languages = blocklist.Languages,
-                ReleaseGroup = parsed?.ReleaseGroup
-            };
-
-            var input = new CustomFormatInput
-            {
-                MovieInfo = movieInfo,
-                Movie = movie,
-                Size = blocklist.Size ?? 0,
-                IndexerFlags = blocklist.IndexerFlags,
-                Languages = blocklist.Languages
-            };
-
-            return ParseCustomFormat(input);
-        }
-
-        public List<CustomFormat> ParseCustomFormat(MovieHistory history, Movie movie)
-        {
-            var parsed = Parser.Parser.ParseMovieTitle(history.SourceTitle);
-
-            long.TryParse(history.Data.GetValueOrDefault("size"), out var size);
-            Enum.TryParse(history.Data.GetValueOrDefault("indexerFlags"), true, out IndexerFlags flags);
-
-            var movieInfo = new ParsedMovieInfo
-            {
-                MovieTitles = new List<string>() { movie.Title },
-                SimpleReleaseTitle = parsed?.SimpleReleaseTitle ?? history.SourceTitle.SimplifyReleaseTitle(),
-                ReleaseTitle = parsed?.ReleaseTitle ?? history.SourceTitle,
-                Edition = parsed?.Edition,
-                Quality = history.Quality,
-                Languages = history.Languages,
-                ReleaseGroup = parsed?.ReleaseGroup,
-            };
-
-            var input = new CustomFormatInput
-            {
-                MovieInfo = movieInfo,
-                Movie = movie,
-                Size = size,
-                IndexerFlags = flags,
-                Languages = history.Languages
-            };
-
-            return ParseCustomFormat(input);
-        }
-
-        public List<CustomFormat> ParseCustomFormat(LocalMovie localMovie)
-        {
-            var episodeInfo = new ParsedMovieInfo
-            {
-                MovieTitles = new List<string>() { localMovie.Movie.Title },
-                SimpleReleaseTitle = localMovie.SceneName?.SimplifyReleaseTitle(),
-                ReleaseTitle = localMovie.SceneName,
-                Quality = localMovie.Quality,
-                Edition = localMovie.Edition,
-                Languages = localMovie.Languages,
-                ReleaseGroup = localMovie.ReleaseGroup
-            };
-
-            var input = new CustomFormatInput
-            {
-                MovieInfo = episodeInfo,
-                Movie = localMovie.Movie,
-                Size = localMovie.Size,
-                Languages = localMovie.Languages
-            };
-
-            return ParseCustomFormat(input);
-        }
-
-        private List<CustomFormat> ParseCustomFormat(CustomFormatInput input)
-        {
-            return ParseCustomFormat(input, _formatService.All());
-        }
-
-        private static List<CustomFormat> ParseCustomFormat(CustomFormatInput input, List<CustomFormat> allCustomFormats)
+        public static List<CustomFormat> ParseCustomFormat(ParsedMovieInfo movieInfo, List<CustomFormat> allCustomFormats)
         {
             var matches = new List<CustomFormat>();
 
@@ -150,7 +45,7 @@ namespace NzbDrone.Core.CustomFormats
                     .GroupBy(t => t.GetType())
                     .Select(g => new SpecificationMatchesGroup
                     {
-                        Matches = g.ToDictionary(t => t, t => t.IsSatisfiedBy(input))
+                        Matches = g.ToDictionary(t => t, t => t.IsSatisfiedBy(movieInfo))
                     })
                     .ToList();
 
@@ -163,7 +58,7 @@ namespace NzbDrone.Core.CustomFormats
             return matches;
         }
 
-        private static List<CustomFormat> ParseCustomFormat(MovieFile movieFile, Movie movie, List<CustomFormat> allCustomFormats)
+        public static List<CustomFormat> ParseCustomFormat(MovieFile movieFile, List<CustomFormat> allCustomFormats)
         {
             var sceneName = string.Empty;
             if (movieFile.SceneName.IsNotNullOrWhiteSpace())
@@ -179,29 +74,90 @@ namespace NzbDrone.Core.CustomFormats
                 sceneName = Path.GetFileName(movieFile.RelativePath);
             }
 
-            var movieInfo = new ParsedMovieInfo
+            var info = new ParsedMovieInfo
             {
-                MovieTitles = new List<string>() { movie.Title },
+                MovieTitles = new List<string>() { movieFile.Movie.MovieMetadata.Value.Title },
                 SimpleReleaseTitle = sceneName.SimplifyReleaseTitle(),
                 Quality = movieFile.Quality,
                 Languages = movieFile.Languages,
                 ReleaseGroup = movieFile.ReleaseGroup,
                 Edition = movieFile.Edition,
                 Year = movieFile.Movie.MovieMetadata.Value.Year,
-                ImdbId = movieFile.Movie.MovieMetadata.Value.ImdbId
+                ImdbId = movieFile.Movie.MovieMetadata.Value.ImdbId,
+                ExtraInfo = new Dictionary<string, object>
+                {
+                    { "IndexerFlags", movieFile.IndexerFlags },
+                    { "Size", movieFile.Size },
+                    { "Filename", Path.GetFileName(movieFile.RelativePath) },
+                    { "OriginalLanguage", movieFile.Movie.MovieMetadata.Value.OriginalLanguage }
+                }
             };
 
-            var input = new CustomFormatInput
+            return ParseCustomFormat(info, allCustomFormats);
+        }
+
+        public List<CustomFormat> ParseCustomFormat(ParsedMovieInfo movieInfo, Movie movie)
+        {
+            movieInfo = _parsingService.EnhanceMovieInfo(movieInfo, new List<object> { movie }) ?? movieInfo;
+            return ParseCustomFormat(movieInfo, _formatService.All());
+        }
+
+        public List<CustomFormat> ParseCustomFormat(MovieFile movieFile)
+        {
+            return ParseCustomFormat(movieFile, _formatService.All());
+        }
+
+        public List<CustomFormat> ParseCustomFormat(Blocklist blocklist)
+        {
+            var movie = _movieService.GetMovie(blocklist.MovieId);
+            var parsed = _parsingService.ParseMovieInfo(blocklist.SourceTitle, null);
+
+            var info = new ParsedMovieInfo
             {
-                MovieInfo = movieInfo,
-                Movie = movie,
-                Size = movieFile.Size,
-                IndexerFlags = movieFile.IndexerFlags,
-                Languages = movieFile.Languages,
-                Filename = Path.GetFileName(movieFile.RelativePath)
+                MovieTitles = new List<string>() { movie.MovieMetadata.Value.Title },
+                SimpleReleaseTitle = parsed?.SimpleReleaseTitle ?? blocklist.SourceTitle.SimplifyReleaseTitle(),
+                Quality = blocklist.Quality,
+                Languages = blocklist.Languages,
+                ReleaseGroup = parsed?.ReleaseGroup,
+                Edition = parsed?.Edition,
+                Year = movie.MovieMetadata.Value.Year,
+                ImdbId = movie.MovieMetadata.Value.ImdbId,
+                ExtraInfo = new Dictionary<string, object>
+                {
+                    { "IndexerFlags", blocklist.IndexerFlags },
+                    { "Size", blocklist.Size }
+                }
             };
 
-            return ParseCustomFormat(input, allCustomFormats);
+            return ParseCustomFormat(info, movie);
+        }
+
+        public List<CustomFormat> ParseCustomFormat(MovieHistory history)
+        {
+            var movie = _movieService.GetMovie(history.MovieId);
+            var parsed = _parsingService.ParseMovieInfo(history.SourceTitle, null);
+
+            Enum.TryParse(history.Data.GetValueOrDefault("indexerFlags"), true, out IndexerFlags flags);
+            long.TryParse(history.Data.GetValueOrDefault("size"), out var size);
+
+            var info = new ParsedMovieInfo
+            {
+                MovieTitles = new List<string>() { movie.MovieMetadata.Value.Title },
+                SimpleReleaseTitle = parsed?.SimpleReleaseTitle ?? history.SourceTitle.SimplifyReleaseTitle(),
+                Quality = history.Quality,
+                Languages = history.Languages,
+                ReleaseGroup = parsed?.ReleaseGroup,
+                Edition = parsed?.Edition,
+                Year = movie.MovieMetadata.Value.Year,
+                ImdbId = movie.MovieMetadata.Value.ImdbId,
+                ExtraInfo = new Dictionary<string, object>
+                {
+                    { "IndexerFlags", flags },
+                    { "Size", size }
+                }
+            };
+
+            return ParseCustomFormat(info, movie);
         }
     }
 }

src/NzbDrone.Core/CustomFormats/CustomFormatInput.cs

@@ -1,22 +0,0 @@
-using System.Collections.Generic;
-using NzbDrone.Core.Languages;
-using NzbDrone.Core.Movies;
-using NzbDrone.Core.Parser.Model;
-
-namespace NzbDrone.Core.CustomFormats
-{
-    public class CustomFormatInput
-    {
-        public ParsedMovieInfo MovieInfo { get; set; }
-        public Movie Movie { get; set; }
-        public long Size { get; set; }
-        public IndexerFlags IndexerFlags { get; set; }
-        public List<Language> Languages { get; set; }
-        public string Filename { get; set; }
-
-        public CustomFormatInput()
-        {
-            Languages = new List<Language>();
-        }
-    }
-}

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

@@ -21,9 +21,9 @@ namespace NzbDrone.Core.CustomFormats
 
         public abstract NzbDroneValidationResult Validate();
 
-        public bool IsSatisfiedBy(CustomFormatInput input)
+        public bool IsSatisfiedBy(ParsedMovieInfo movieInfo)
         {
-            var match = IsSatisfiedByWithoutNegate(input);
+            var match = IsSatisfiedByWithoutNegate(movieInfo);
             if (Negate)
             {
                 match = !match;
@@ -32,6 +32,6 @@ namespace NzbDrone.Core.CustomFormats
             return match;
         }
 
-        protected abstract bool IsSatisfiedByWithoutNegate(CustomFormatInput input);
+        protected abstract bool IsSatisfiedByWithoutNegate(ParsedMovieInfo movieInfo);
     }
 }

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

@@ -1,3 +1,5 @@
+using NzbDrone.Core.Parser.Model;
+
 namespace NzbDrone.Core.CustomFormats
 {
     public class EditionSpecification : RegexSpecificationBase
@@ -6,9 +8,9 @@ namespace NzbDrone.Core.CustomFormats
         public override string ImplementationName => "Edition";
         public override string InfoLink => "https://wiki.servarr.com/radarr/settings#custom-formats-2";
 
-        protected override bool IsSatisfiedByWithoutNegate(CustomFormatInput input)
+        protected override bool IsSatisfiedByWithoutNegate(ParsedMovieInfo movieInfo)
         {
-            return MatchString(input.MovieInfo.Edition);
+            return MatchString(movieInfo.Edition);
         }
     }
 }

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

@@ -15,6 +15,6 @@ namespace NzbDrone.Core.CustomFormats
         NzbDroneValidationResult Validate();
 
         ICustomFormatSpecification Clone();
-        bool IsSatisfiedBy(CustomFormatInput input);
+        bool IsSatisfiedBy(ParsedMovieInfo movieInfo);
     }
 }

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

@@ -32,9 +32,10 @@ namespace NzbDrone.Core.CustomFormats
         [FieldDefinition(1, Label = "Flag", Type = FieldType.Select, SelectOptions = typeof(IndexerFlags))]
         public int Value { get; set; }
 
-        protected override bool IsSatisfiedByWithoutNegate(CustomFormatInput input)
+        protected override bool IsSatisfiedByWithoutNegate(ParsedMovieInfo movieInfo)
         {
-            return input.IndexerFlags.HasFlag((IndexerFlags)Value) == true;
+            var flags = movieInfo?.ExtraInfo?.GetValueOrDefault("IndexerFlags") as IndexerFlags?;
+            return flags?.HasFlag((IndexerFlags)Value) == true;
         }
 
         public override NzbDroneValidationResult Validate()

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

@@ -32,12 +32,12 @@ namespace NzbDrone.Core.CustomFormats
         [FieldDefinition(1, Label = "Language", Type = FieldType.Select, SelectOptions = typeof(LanguageFieldConverter))]
         public int Value { get; set; }
 
-        protected override bool IsSatisfiedByWithoutNegate(CustomFormatInput input)
+        protected override bool IsSatisfiedByWithoutNegate(ParsedMovieInfo movieInfo)
         {
-            var comparedLanguage = input.MovieInfo != null && Value == Language.Original.Id && input.Movie.MovieMetadata.Value.OriginalLanguage != Language.Unknown
-                ? input.Movie.MovieMetadata.Value.OriginalLanguage
+            var comparedLanguage = movieInfo != null && Value == Language.Original.Id && movieInfo.ExtraInfo.ContainsKey("OriginalLanguage")
+                ? (Language)movieInfo.ExtraInfo["OriginalLanguage"]
                 : (Language)Value;
-            return input?.Languages?.Contains(comparedLanguage) ?? false;
+            return movieInfo?.Languages?.Contains(comparedLanguage) ?? false;
         }
 
         public override NzbDroneValidationResult Validate()

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

@@ -32,9 +32,9 @@ namespace NzbDrone.Core.CustomFormats
         [FieldDefinition(1, Label = "Quality Modifier", Type = FieldType.Select, SelectOptions = typeof(Modifier))]
         public int Value { get; set; }
 
-        protected override bool IsSatisfiedByWithoutNegate(CustomFormatInput input)
+        protected override bool IsSatisfiedByWithoutNegate(ParsedMovieInfo movieInfo)
         {
-            return (input.MovieInfo?.Quality?.Quality?.Modifier ?? (int)Modifier.NONE) == (Modifier)Value;
+            return (movieInfo?.Quality?.Quality?.Modifier ?? (int)Modifier.NONE) == (Modifier)Value;
         }
 
         public override NzbDroneValidationResult Validate()