Fixed: Limit titles in task name to 10 series

ignore-downstream
#6752

.devcontainer/Sonarr.code-workspace

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

.devcontainer/devcontainer.json

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

.github/dependabot.yml

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

.github/labeler.yml

@@ -1,17 +1,23 @@
 'connection':
-  - src/NzbDrone.Core/Notifications/**/*
+  - changed-files:
+    - any-glob-to-any-file: src/NzbDrone.Core/Notifications/**/*
 
 'db-migration':
-  - src/NzbDrone.Core/Datastore/Migration/*
+  - changed-files:
+    - any-glob-to-any-file: src/NzbDrone.Core/Datastore/Migration/*
 
 'download-client':
-  - src/NzbDrone.Core/Download/Clients/**/*
+  - changed-files:
+    - any-glob-to-any-file: src/NzbDrone.Core/Download/Clients/**/*
 
 'indexer':
-  - src/NzbDrone.Core/Indexers/**/*
+  - changed-files:
+    - any-glob-to-any-file: src/NzbDrone.Core/Indexers/**/*
 
 'parsing':
-  - src/NzbDrone.Core/Parser/**/*
+  - changed-files:
+    - any-glob-to-any-file: src/NzbDrone.Core/Parser/**/*
 
 'ui-only':
-  - all: ['frontend/**/*']
+  - changed-files:
+    - any-glob-to-all-files: frontend/**/*

.github/workflows/build.yml

@@ -22,7 +22,7 @@ env:
   FRAMEWORK: net6.0
   RAW_BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
   SONARR_MAJOR_VERSION: 4
-  VERSION: 4.0.2
+  VERSION: 4.0.4
 
 jobs:
   backend:
@@ -76,11 +76,11 @@ jobs:
         framework: ${{ env.FRAMEWORK }}
         runtime: linux-x64
 
-    - name: Publish osx-x64 Test Artifact
+    - name: Publish osx-arm64 Test Artifact
       uses: ./.github/actions/publish-test-artifact
       with:
         framework: ${{ env.FRAMEWORK }}
-        runtime: osx-x64
+        runtime: osx-arm64
 
     # Build Artifacts (grouped by OS)
     
@@ -121,7 +121,7 @@ jobs:
       run: yarn lint
 
     - name: Stylelint
-      run: yarn stylelint
+      run: yarn stylelint -f github
 
     - name: Build
       run: yarn build --env production
@@ -143,7 +143,7 @@ jobs:
             artifact: tests-linux-x64
             filter: TestCategory!=ManualTest&TestCategory!=WINDOWS&TestCategory!=IntegrationTest&TestCategory!=AutomationTest
           - os: macos-latest
-            artifact: tests-osx-x64
+            artifact: tests-osx-arm64
             filter: TestCategory!=ManualTest&TestCategory!=WINDOWS&TestCategory!=IntegrationTest&TestCategory!=AutomationTest
           - os: windows-latest
             artifact: tests-win-x64
@@ -190,10 +190,10 @@ jobs:
             binary_artifact: build_linux
             binary_path: linux-x64/${{ needs.backend.outputs.framework }}/Sonarr
           - os: macos-latest
-            artifact: tests-osx-x64
+            artifact: tests-osx-arm64
             filter: TestCategory!=ManualTest&TestCategory!=WINDOWS&TestCategory=IntegrationTest
             binary_artifact: build_macos
-            binary_path: osx-x64/${{ needs.backend.outputs.framework }}/Sonarr
+            binary_path: osx-arm64/${{ needs.backend.outputs.framework }}/Sonarr
           - os: windows-latest
             artifact: tests-win-x64
             filter: TestCategory!=ManualTest&TestCategory!=LINUX&TestCategory=IntegrationTest
@@ -217,7 +217,7 @@ jobs:
 
   deploy:
     if: ${{ github.ref_name == 'develop' || github.ref_name == 'main' }}
-    needs: [backend, unit_test, unit_test_postgres, integration_test]
+    needs: [backend, frontend, unit_test, unit_test_postgres, integration_test]
     secrets: inherit
     uses: ./.github/workflows/deploy.yml
     with:
@@ -225,3 +225,25 @@ jobs:
       branch: ${{ github.ref_name }}
       major_version: ${{ needs.backend.outputs.major_version }}
       version: ${{ needs.backend.outputs.version }}
+
+  notify:
+    name: Discord Notification
+    needs: [backend, frontend, unit_test, unit_test_postgres, integration_test, deploy]
+    if: ${{ !cancelled() && (github.ref_name == 'develop' || github.ref_name == 'main') }}
+    env:
+      STATUS: ${{ contains(needs.*.result, 'failure') && 'failure' || 'success' }}
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Notify
+        uses: tsickert/discord-webhook@v6.0.0
+        with:
+          webhook-url: ${{ secrets.DISCORD_WEBHOOK_URL }}
+          username: 'GitHub Actions'
+          avatar-url: 'https://github.githubassets.com/images/modules/logos_page/GitHub-Mark.png'
+          embed-title: "${{ github.workflow }}: ${{ env.STATUS == 'success' && 'Success' || 'Failure' }}"
+          embed-url: 'https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}'
+          embed-description: |
+            **Branch** ${{ github.ref }}
+            **Build** ${{ needs.backend.outputs.version }}
+          embed-color: ${{ env.STATUS == 'success' && '3066993' || '15158332' }}

.github/workflows/conflict_labeler.yml

@@ -0,0 +1,26 @@
+name: Merge Conflict Labeler
+
+on:
+  push:
+    branches:
+      - develop
+  pull_request_target:
+    branches:
+      - develop
+    types: [synchronize]
+
+jobs:
+  label:
+    name: Labeling
+    runs-on: ubuntu-latest
+    if: ${{ github.repository == 'Sonarr/Sonarr' }}
+    permissions:
+      contents: read
+      pull-requests: write
+    steps:
+      - name: Apply label
+        uses: eps1lon/actions-label-merge-conflict@v3
+        with:
+          dirtyLabel: 'merge-conflict'
+          repoToken: '${{ secrets.GITHUB_TOKEN }}'
+          

.github/workflows/deploy.yml

@@ -69,12 +69,38 @@ jobs:
         pattern: release_*
         merge-multiple: true
 
+    - name: Get Previous Release
+      id: previous-release
+      uses: cardinalby/git-get-release-action@v1
+      env:
+        GITHUB_TOKEN: ${{ github.token }}
+      with:
+        latest: true
+        prerelease: ${{ inputs.branch != 'main' }}
+
+    - name: Generate Release Notes
+      id: generate-release-notes
+      uses: actions/github-script@v7
+      with:
+        github-token: ${{ github.token }}
+        result-encoding: string
+        script: |
+          const { data } = await github.rest.repos.generateReleaseNotes({
+            owner: context.repo.owner,
+            repo: context.repo.repo,
+            tag_name: 'v${{ inputs.version }}',
+            target_commitish: '${{ github.sha }}',
+            previous_tag_name: '${{ steps.previous-release.outputs.tag_name }}',
+          })
+          return data.body
+
     - name: Create release
       uses: ncipollo/release-action@v1
       with:
         artifacts: _artifacts/Sonarr.*
         commit: ${{ github.sha }}
-        generateReleaseNotes: true
+        generateReleaseNotes: false
+        body: ${{ steps.generate-release-notes.outputs.result }}
         name: ${{ inputs.version }}
         prerelease: ${{ inputs.branch != 'main' }}
         skipIfReleaseExists: true

.github/workflows/labeler.yml

@@ -9,4 +9,4 @@ jobs:
       pull-requests: write
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/labeler@v4
+      - uses: actions/labeler@v5

.github/workflows/lock.yml

@@ -9,13 +9,13 @@ jobs:
   lock:
     runs-on: ubuntu-latest
     steps:
-      - uses: dessant/lock-threads@v2
+      - uses: dessant/lock-threads@v5
         with:
           github-token: ${{ github.token }}
-          issue-lock-inactive-days: '90'
-          issue-exclude-created-before: ''
-          issue-exclude-labels: 'one-day-maybe'
-          issue-lock-labels: ''
-          issue-lock-comment: ''
+          issue-inactive-days: '90'
+          exclude-issue-created-before: ''
+          exclude-any-issue-labels: 'one-day-maybe'
+          add-issue-labels: ''
+          issue-comment: ''
           issue-lock-reason: 'resolved'
           process-only: ''

.gitignore

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

.vscode/extensions.json

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

.vscode/launch.json

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

.vscode/tasks.json

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

frontend/src/App/State/AppSectionState.ts

@@ -19,6 +19,7 @@ export interface AppSectionSaveState {
 
 export interface PagedAppSectionState {
   pageSize: number;
+  totalRecords?: number;
 }
 
 export interface AppSectionFilterState<T> {

frontend/src/Commands/Command.ts

@@ -13,6 +13,8 @@ export interface CommandBody {
   trigger: string;
   suppressMessages: boolean;
   seriesId?: number;
+  seriesIds?: number[];
+  seasonNumber?: number;
 }
 
 interface Command extends ModelBase {

frontend/src/Components/Form/EnhancedSelectInput.css

@@ -19,7 +19,7 @@
 
 .isDisabled {
   opacity: 0.7;
-  cursor: not-allowed;
+  cursor: not-allowed !important;
 }
 
 .dropdownArrowContainer {

frontend/src/Components/Form/FormInputGroup.js

@@ -22,6 +22,7 @@ import PasswordInput from './PasswordInput';
 import PathInputConnector from './PathInputConnector';
 import QualityProfileSelectInputConnector from './QualityProfileSelectInputConnector';
 import RootFolderSelectInputConnector from './RootFolderSelectInputConnector';
+import SeriesTagInput from './SeriesTagInput';
 import SeriesTypeSelectInput from './SeriesTypeSelectInput';
 import TagInputConnector from './TagInputConnector';
 import TagSelectInputConnector from './TagSelectInputConnector';
@@ -87,6 +88,9 @@ function getComponent(type) {
     case inputTypes.DYNAMIC_SELECT:
       return EnhancedSelectInputConnector;
 
+    case inputTypes.SERIES_TAG:
+      return SeriesTagInput;
+
     case inputTypes.SERIES_TYPE_SELECT:
       return SeriesTypeSelectInput;
 

frontend/src/Components/Form/MonitorEpisodesSelectInput.js

@@ -2,7 +2,7 @@ import PropTypes from 'prop-types';
 import React from 'react';
 import monitorOptions from 'Utilities/Series/monitorOptions';
 import translate from 'Utilities/String/translate';
-import SelectInput from './SelectInput';
+import EnhancedSelectInput from './EnhancedSelectInput';
 
 function MonitorEpisodesSelectInput(props) {
   const {
@@ -19,7 +19,7 @@ function MonitorEpisodesSelectInput(props) {
       get value() {
         return translate('NoChange');
       },
-      disabled: true
+      isDisabled: true
     });
   }
 
@@ -29,12 +29,12 @@ function MonitorEpisodesSelectInput(props) {
       get value() {
         return `(${translate('Mixed')})`;
       },
-      disabled: true
+      isDisabled: true
     });
   }
 
   return (
-    <SelectInput
+    <EnhancedSelectInput
       values={values}
       {...otherProps}
     />

frontend/src/Components/Form/MonitorNewItemsSelectInput.js

@@ -1,7 +1,7 @@
 import PropTypes from 'prop-types';
 import React from 'react';
 import monitorNewItemsOptions from 'Utilities/Series/monitorNewItemsOptions';
-import SelectInput from './SelectInput';
+import EnhancedSelectInput from './EnhancedSelectInput';
 
 function MonitorNewItemsSelectInput(props) {
   const {
@@ -16,7 +16,7 @@ function MonitorNewItemsSelectInput(props) {
     values.unshift({
       key: 'noChange',
       value: 'No Change',
-      disabled: true
+      isDisabled: true
     });
   }
 
@@ -24,12 +24,12 @@ function MonitorNewItemsSelectInput(props) {
     values.unshift({
       key: 'mixed',
       value: '(Mixed)',
-      disabled: true
+      isDisabled: true
     });
   }
 
   return (
-    <SelectInput
+    <EnhancedSelectInput
       values={values}
       {...otherProps}
     />

frontend/src/Components/Form/ProviderFieldFormGroup.js

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

frontend/src/Components/Form/QualityProfileSelectInputConnector.js

@@ -28,7 +28,7 @@ function createMapStateToProps() {
           get value() {
             return translate('NoChange');
           },
-          disabled: includeNoChangeDisabled
+          isDisabled: includeNoChangeDisabled
         });
       }
 
@@ -38,7 +38,7 @@ function createMapStateToProps() {
           get value() {
             return `(${translate('Mixed')})`;
           },
-          disabled: true
+          isDisabled: true
         });
       }
 

frontend/src/Components/Form/SeriesTagInput.tsx

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

frontend/src/Components/Form/SeriesTypeSelectInput.tsx

@@ -15,7 +15,7 @@ interface ISeriesTypeOption {
   key: string;
   value: string;
   format?: string;
-  disabled?: boolean;
+  isDisabled?: boolean;
 }
 
 const seriesTypeOptions: ISeriesTypeOption[] = [
@@ -55,7 +55,7 @@ function SeriesTypeSelectInput(props: SeriesTypeSelectInputProps) {
     values.unshift({
       key: 'noChange',
       value: translate('NoChange'),
-      disabled: includeNoChangeDisabled,
+      isDisabled: includeNoChangeDisabled,
     });
   }
 
@@ -63,7 +63,7 @@ function SeriesTypeSelectInput(props: SeriesTypeSelectInputProps) {
     values.unshift({
       key: 'mixed',
       value: `(${translate('Mixed')})`,
-      disabled: true,
+      isDisabled: true,
     });
   }
 

frontend/src/Components/Modal/Modal.css

@@ -63,6 +63,13 @@
   width: 1280px;
 }
 
+
+.extraExtraLarge {
+  composes: modal;
+
+  width: 1600px;
+}
+
 @media only screen and (max-width: $breakpointExtraLarge) {
   .modal.extraLarge {
     width: 90%;
@@ -90,7 +97,8 @@
   .modal.small,
   .modal.medium,
   .modal.large,
-  .modal.extraLarge {
+  .modal.extraLarge,
+  .modal.extraExtraLarge {
     max-height: 100%;
     width: 100%;
     height: 100% !important;

frontend/src/Components/Modal/Modal.css.d.ts

@@ -1,6 +1,7 @@
 // This file is automatically generated.
 // Please do not change this file!
 interface CssExports {
+  'extraExtraLarge': string;
   'extraLarge': string;
   'large': string;
   'medium': string;

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

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

frontend/src/Episode/EpisodeDetailsModal.js

@@ -37,7 +37,7 @@ class EpisodeDetailsModal extends Component {
     return (
       <Modal
         isOpen={isOpen}
-        size={sizes.EXTRA_LARGE}
+        size={sizes.EXTRA_EXTRA_LARGE}
         closeOnBackgroundClick={this.state.closeOnBackgroundClick}
         onModalClose={onModalClose}
       >

frontend/src/Episode/getReleaseTypeName.ts

@@ -0,0 +1,17 @@
+import ReleaseType from 'InteractiveImport/ReleaseType';
+import translate from 'Utilities/String/translate';
+
+export default function getReleaseTypeName(
+  releaseType?: ReleaseType
+): string | null {
+  switch (releaseType) {
+    case 'singleEpisode':
+      return translate('SingleEpisode');
+    case 'multiEpisode':
+      return translate('MultiEpisode');
+    case 'seasonPack':
+      return translate('SeasonPack');
+    default:
+      return translate('Unknown');
+  }
+}

frontend/src/EpisodeFile/EpisodeFile.ts

@@ -1,4 +1,5 @@
 import ModelBase from 'App/ModelBase';
+import ReleaseType from 'InteractiveImport/ReleaseType';
 import Language from 'Language/Language';
 import { QualityModel } from 'Quality/Quality';
 import CustomFormat from 'typings/CustomFormat';
@@ -17,6 +18,7 @@ export interface EpisodeFile extends ModelBase {
   quality: QualityModel;
   customFormats: CustomFormat[];
   indexerFlags: number;
+  releaseType: ReleaseType;
   mediaInfo: MediaInfo;
   qualityCutoffNotMet: boolean;
 }

frontend/src/Helpers/Props/inputTypes.js

@@ -17,6 +17,7 @@ export const LANGUAGE_SELECT = 'languageSelect';
 export const DOWNLOAD_CLIENT_SELECT = 'downloadClientSelect';
 export const ROOT_FOLDER_SELECT = 'rootFolderSelect';
 export const SELECT = 'select';
+export const SERIES_TAG = 'seriesTag';
 export const DYNAMIC_SELECT = 'dynamicSelect';
 export const SERIES_TYPE_SELECT = 'seriesTypeSelect';
 export const TAG = 'tag';
@@ -45,6 +46,7 @@ export const all = [
   ROOT_FOLDER_SELECT,
   LANGUAGE_SELECT,
   SELECT,
+  SERIES_TAG,
   DYNAMIC_SELECT,
   SERIES_TYPE_SELECT,
   TAG,

frontend/src/Helpers/Props/sizes.js

@@ -3,5 +3,5 @@ export const SMALL = 'small';
 export const MEDIUM = 'medium';
 export const LARGE = 'large';
 export const EXTRA_LARGE = 'extraLarge';
-
-export const all = [EXTRA_SMALL, SMALL, MEDIUM, LARGE, EXTRA_LARGE];
+export const EXTRA_EXTRA_LARGE = 'extraExtraLarge';
+export const all = [EXTRA_SMALL, SMALL, MEDIUM, LARGE, EXTRA_LARGE, EXTRA_EXTRA_LARGE];

frontend/src/InteractiveImport/Interactive/InteractiveImportModalContent.tsx

@@ -36,6 +36,7 @@ import InteractiveImport, {
 import SelectLanguageModal from 'InteractiveImport/Language/SelectLanguageModal';
 import SelectQualityModal from 'InteractiveImport/Quality/SelectQualityModal';
 import SelectReleaseGroupModal from 'InteractiveImport/ReleaseGroup/SelectReleaseGroupModal';
+import SelectReleaseTypeModal from 'InteractiveImport/ReleaseType/SelectReleaseTypeModal';
 import SelectSeasonModal from 'InteractiveImport/Season/SelectSeasonModal';
 import SelectSeriesModal from 'InteractiveImport/Series/SelectSeriesModal';
 import Language from 'Language/Language';
@@ -73,7 +74,8 @@ type SelectType =
   | 'releaseGroup'
   | 'quality'
   | 'language'
-  | 'indexerFlags';
+  | 'indexerFlags'
+  | 'releaseType';
 
 type FilterExistingFiles = 'all' | 'new';
 
@@ -128,6 +130,12 @@ const COLUMNS = [
     isSortable: true,
     isVisible: true,
   },
+  {
+    name: 'releaseType',
+    label: () => translate('ReleaseType'),
+    isSortable: true,
+    isVisible: true,
+  },
   {
     name: 'customFormats',
     label: React.createElement(Icon, {
@@ -369,6 +377,10 @@ function InteractiveImportModalContent(
         key: 'indexerFlags',
         value: translate('SelectIndexerFlags'),
       },
+      {
+        key: 'releaseType',
+        value: translate('SelectReleaseType'),
+      },
     ];
 
     if (allowSeriesChange) {
@@ -511,6 +523,7 @@ function InteractiveImportModalContent(
           languages,
           indexerFlags,
           episodeFileId,
+          releaseType,
         } = item;
 
         if (!series) {
@@ -560,6 +573,7 @@ function InteractiveImportModalContent(
               quality,
               languages,
               indexerFlags,
+              releaseType,
             });
 
             return;
@@ -575,6 +589,7 @@ function InteractiveImportModalContent(
           quality,
           languages,
           indexerFlags,
+          releaseType,
           downloadId,
           episodeFileId,
         });
@@ -787,6 +802,22 @@ function InteractiveImportModalContent(
     [selectedIds, dispatch]
   );
 
+  const onReleaseTypeSelect = useCallback(
+    (releaseType: string) => {
+      dispatch(
+        updateInteractiveImportItems({
+          ids: selectedIds,
+          releaseType,
+        })
+      );
+
+      dispatch(reprocessInteractiveImportItems({ ids: selectedIds }));
+
+      setSelectModalOpen(null);
+    },
+    [selectedIds, dispatch]
+  );
+
   const orderedSelectedIds = items.reduce((acc: number[], file) => {
     if (selectedIds.includes(file.id)) {
       acc.push(file.id);
@@ -1000,6 +1031,14 @@ function InteractiveImportModalContent(
         onModalClose={onSelectModalClose}
       />
 
+      <SelectReleaseTypeModal
+        isOpen={selectModalOpen === 'releaseType'}
+        releaseType="unknown"
+        modalTitle={modalTitle}
+        onReleaseTypeSelect={onReleaseTypeSelect}
+        onModalClose={onSelectModalClose}
+      />
+
       <ConfirmModal
         isOpen={isConfirmDeleteModalOpen}
         kind={kinds.DANGER}

frontend/src/InteractiveImport/Interactive/InteractiveImportRow.tsx

@@ -12,6 +12,7 @@ import Episode from 'Episode/Episode';
 import EpisodeFormats from 'Episode/EpisodeFormats';
 import EpisodeLanguages from 'Episode/EpisodeLanguages';
 import EpisodeQuality from 'Episode/EpisodeQuality';
+import getReleaseTypeName from 'Episode/getReleaseTypeName';
 import IndexerFlags from 'Episode/IndexerFlags';
 import { icons, kinds, tooltipPositions } from 'Helpers/Props';
 import SelectEpisodeModal from 'InteractiveImport/Episode/SelectEpisodeModal';
@@ -20,6 +21,8 @@ import SelectIndexerFlagsModal from 'InteractiveImport/IndexerFlags/SelectIndexe
 import SelectLanguageModal from 'InteractiveImport/Language/SelectLanguageModal';
 import SelectQualityModal from 'InteractiveImport/Quality/SelectQualityModal';
 import SelectReleaseGroupModal from 'InteractiveImport/ReleaseGroup/SelectReleaseGroupModal';
+import ReleaseType from 'InteractiveImport/ReleaseType';
+import SelectReleaseTypeModal from 'InteractiveImport/ReleaseType/SelectReleaseTypeModal';
 import SelectSeasonModal from 'InteractiveImport/Season/SelectSeasonModal';
 import SelectSeriesModal from 'InteractiveImport/Series/SelectSeriesModal';
 import Language from 'Language/Language';
@@ -44,7 +47,8 @@ type SelectType =
   | 'releaseGroup'
   | 'quality'
   | 'language'
-  | 'indexerFlags';
+  | 'indexerFlags'
+  | 'releaseType';
 
 type SelectedChangeProps = SelectStateInputProps & {
   hasEpisodeFileId: boolean;
@@ -61,6 +65,7 @@ interface InteractiveImportRowProps {
   quality?: QualityModel;
   languages?: Language[];
   size: number;
+  releaseType: ReleaseType;
   customFormats?: object[];
   customFormatScore?: number;
   indexerFlags: number;
@@ -86,6 +91,7 @@ function InteractiveImportRow(props: InteractiveImportRowProps) {
     languages,
     releaseGroup,
     size,
+    releaseType,
     customFormats,
     customFormatScore,
     indexerFlags,
@@ -122,7 +128,8 @@ function InteractiveImportRow(props: InteractiveImportRowProps) {
         seasonNumber != null &&
         episodes.length &&
         quality &&
-        languages
+        languages &&
+        size > 0
       ) {
         onSelectedChange({
           id,
@@ -315,6 +322,27 @@ function InteractiveImportRow(props: InteractiveImportRowProps) {
     [id, dispatch, setSelectModalOpen, selectRowAfterChange]
   );
 
+  const onSelectReleaseTypePress = useCallback(() => {
+    setSelectModalOpen('releaseType');
+  }, [setSelectModalOpen]);
+
+  const onReleaseTypeSelect = useCallback(
+    (releaseType: ReleaseType) => {
+      dispatch(
+        updateInteractiveImportItem({
+          id,
+          releaseType,
+        })
+      );
+
+      dispatch(reprocessInteractiveImportItems({ ids: [id] }));
+
+      setSelectModalOpen(null);
+      selectRowAfterChange();
+    },
+    [id, dispatch, setSelectModalOpen, selectRowAfterChange]
+  );
+
   const onSelectIndexerFlagsPress = useCallback(() => {
     setSelectModalOpen('indexerFlags');
   }, [setSelectModalOpen]);
@@ -461,6 +489,13 @@ function InteractiveImportRow(props: InteractiveImportRowProps) {
 
       <TableRowCell>{formatBytes(size)}</TableRowCell>
 
+      <TableRowCellButton
+        title={translate('ClickToChangeReleaseType')}
+        onPress={onSelectReleaseTypePress}
+      >
+        {getReleaseTypeName(releaseType)}
+      </TableRowCellButton>
+
       <TableRowCell>
         {customFormats?.length ? (
           <Popover
@@ -572,6 +607,14 @@ function InteractiveImportRow(props: InteractiveImportRowProps) {
         onModalClose={onSelectModalClose}
       />
 
+      <SelectReleaseTypeModal
+        isOpen={selectModalOpen === 'releaseType'}
+        releaseType={releaseType ?? 'unknown'}
+        modalTitle={modalTitle}
+        onReleaseTypeSelect={onReleaseTypeSelect}
+        onModalClose={onSelectModalClose}
+      />
+
       <SelectIndexerFlagsModal
         isOpen={selectModalOpen === 'indexerFlags'}
         indexerFlags={indexerFlags ?? 0}

frontend/src/InteractiveImport/InteractiveImport.ts

@@ -1,5 +1,6 @@
 import ModelBase from 'App/ModelBase';
 import Episode from 'Episode/Episode';
+import ReleaseType from 'InteractiveImport/ReleaseType';
 import Language from 'Language/Language';
 import { QualityModel } from 'Quality/Quality';
 import Series from 'Series/Series';
@@ -14,6 +15,7 @@ export interface InteractiveImportCommandOptions {
   quality: QualityModel;
   languages: Language[];
   indexerFlags: number;
+  releaseType: ReleaseType;
   downloadId?: string;
   episodeFileId?: number;
 }
@@ -33,6 +35,7 @@ interface InteractiveImport extends ModelBase {
   qualityWeight: number;
   customFormats: object[];
   indexerFlags: number;
+  releaseType: ReleaseType;
   rejections: Rejection[];
   episodeFileId?: number;
 }

frontend/src/InteractiveImport/InteractiveImportModal.tsx

@@ -47,7 +47,7 @@ function InteractiveImportModal(props: InteractiveImportModalProps) {
   return (
     <Modal
       isOpen={isOpen}
-      size={sizes.EXTRA_LARGE}
+      size={sizes.EXTRA_EXTRA_LARGE}
       closeOnBackgroundClick={false}
       onModalClose={onModalClose}
     >

frontend/src/InteractiveImport/ReleaseType.ts

@@ -0,0 +1,3 @@
+type ReleaseType = 'unknown' | 'singleEpisode' | 'multiEpisode' | 'seasonPack';
+
+export default ReleaseType;

frontend/src/InteractiveImport/ReleaseType/SelectReleaseTypeModal.tsx

@@ -0,0 +1,30 @@
+import React from 'react';
+import Modal from 'Components/Modal/Modal';
+import ReleaseType from 'InteractiveImport/ReleaseType';
+import SelectReleaseTypeModalContent from './SelectReleaseTypeModalContent';
+
+interface SelectQualityModalProps {
+  isOpen: boolean;
+  releaseType: ReleaseType;
+  modalTitle: string;
+  onReleaseTypeSelect(releaseType: ReleaseType): void;
+  onModalClose(): void;
+}
+
+function SelectReleaseTypeModal(props: SelectQualityModalProps) {
+  const { isOpen, releaseType, modalTitle, onReleaseTypeSelect, onModalClose } =
+    props;
+
+  return (
+    <Modal isOpen={isOpen} onModalClose={onModalClose}>
+      <SelectReleaseTypeModalContent
+        releaseType={releaseType}
+        modalTitle={modalTitle}
+        onReleaseTypeSelect={onReleaseTypeSelect}
+        onModalClose={onModalClose}
+      />
+    </Modal>
+  );
+}
+
+export default SelectReleaseTypeModal;

frontend/src/InteractiveImport/ReleaseType/SelectReleaseTypeModalContent.tsx

@@ -0,0 +1,99 @@
+import React, { useCallback, useState } from 'react';
+import Form from 'Components/Form/Form';
+import FormGroup from 'Components/Form/FormGroup';
+import FormInputGroup from 'Components/Form/FormInputGroup';
+import FormLabel from 'Components/Form/FormLabel';
+import Button from 'Components/Link/Button';
+import ModalBody from 'Components/Modal/ModalBody';
+import ModalContent from 'Components/Modal/ModalContent';
+import ModalFooter from 'Components/Modal/ModalFooter';
+import ModalHeader from 'Components/Modal/ModalHeader';
+import { inputTypes, kinds } from 'Helpers/Props';
+import ReleaseType from 'InteractiveImport/ReleaseType';
+import translate from 'Utilities/String/translate';
+
+const options = [
+  {
+    key: 'unknown',
+    get value() {
+      return translate('Unknown');
+    },
+  },
+  {
+    key: 'singleEpisode',
+    get value() {
+      return translate('SingleEpisode');
+    },
+  },
+  {
+    key: 'multiEpisode',
+    get value() {
+      return translate('MultiEpisode');
+    },
+  },
+  {
+    key: 'seasonPack',
+    get value() {
+      return translate('SeasonPack');
+    },
+  },
+];
+
+interface SelectReleaseTypeModalContentProps {
+  releaseType: ReleaseType;
+  modalTitle: string;
+  onReleaseTypeSelect(releaseType: ReleaseType): void;
+  onModalClose(): void;
+}
+
+function SelectReleaseTypeModalContent(
+  props: SelectReleaseTypeModalContentProps
+) {
+  const { modalTitle, onReleaseTypeSelect, onModalClose } = props;
+  const [releaseType, setReleaseType] = useState(props.releaseType);
+
+  const handleReleaseTypeChange = useCallback(
+    ({ value }: { value: string }) => {
+      setReleaseType(value as ReleaseType);
+    },
+    [setReleaseType]
+  );
+
+  const handleReleaseTypeSelect = useCallback(() => {
+    onReleaseTypeSelect(releaseType);
+  }, [releaseType, onReleaseTypeSelect]);
+
+  return (
+    <ModalContent onModalClose={onModalClose}>
+      <ModalHeader>
+        {modalTitle} - {translate('SelectReleaseType')}
+      </ModalHeader>
+
+      <ModalBody>
+        <Form>
+          <FormGroup>
+            <FormLabel>{translate('ReleaseType')}</FormLabel>
+
+            <FormInputGroup
+              type={inputTypes.SELECT}
+              name="releaseType"
+              value={releaseType}
+              values={options}
+              onChange={handleReleaseTypeChange}
+            />
+          </FormGroup>
+        </Form>
+      </ModalBody>
+
+      <ModalFooter>
+        <Button onPress={onModalClose}>{translate('Cancel')}</Button>
+
+        <Button kind={kinds.SUCCESS} onPress={handleReleaseTypeSelect}>
+          {translate('SelectReleaseType')}
+        </Button>
+      </ModalFooter>
+    </ModalContent>
+  );
+}
+
+export default SelectReleaseTypeModalContent;

frontend/src/Series/Index/Select/Edit/EditSeriesModalContent.tsx

@@ -36,7 +36,7 @@ const monitoredOptions = [
     get value() {
       return translate('NoChange');
     },
-    disabled: true,
+    isDisabled: true,
   },
   {
     key: 'monitored',
@@ -58,7 +58,7 @@ const seasonFolderOptions = [
     get value() {
       return translate('NoChange');
     },
-    disabled: true,
+    isDisabled: true,
   },
   {
     key: 'yes',

frontend/src/Series/Search/SeasonInteractiveSearchModal.js

@@ -15,7 +15,7 @@ function SeasonInteractiveSearchModal(props) {
   return (
     <Modal
       isOpen={isOpen}
-      size={sizes.EXTRA_LARGE}
+      size={sizes.EXTRA_EXTRA_LARGE}
       closeOnBackgroundClick={false}
       onModalClose={onModalClose}
     >

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

@@ -151,6 +151,11 @@ class EditCustomFormatModalContent extends Component {
                   </Form>
 
                   <FieldSet legend={translate('Conditions')}>
+                    <Alert kind={kinds.INFO}>
+                      <div>
+                        {translate('CustomFormatsSettingsTriggerInfo')}
+                      </div>
+                    </Alert>
                     <div className={styles.customFormats}>
                       {
                         specifications.map((tag) => {

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

@@ -15,6 +15,7 @@ import ModalContent from 'Components/Modal/ModalContent';
 import ModalFooter from 'Components/Modal/ModalFooter';
 import ModalHeader from 'Components/Modal/ModalHeader';
 import { inputTypes, kinds, sizes } from 'Helpers/Props';
+import AdvancedSettingsButton from 'Settings/AdvancedSettingsButton';
 import translate from 'Utilities/String/translate';
 import styles from './EditDownloadClientModalContent.css';
 
@@ -37,6 +38,7 @@ class EditDownloadClientModalContent extends Component {
       onModalClose,
       onSavePress,
       onTestPress,
+      onAdvancedSettingsPress,
       onDeleteDownloadClientPress,
       ...otherProps
     } = this.props;
@@ -199,6 +201,12 @@ class EditDownloadClientModalContent extends Component {
               </Button>
           }
 
+          <AdvancedSettingsButton
+            advancedSettings={advancedSettings}
+            onAdvancedSettingsPress={onAdvancedSettingsPress}
+            showLabel={false}
+          />
+
           <SpinnerErrorButton
             isSpinning={isTesting}
             error={saveError}
@@ -239,6 +247,7 @@ EditDownloadClientModalContent.propTypes = {
   onModalClose: PropTypes.func.isRequired,
   onSavePress: PropTypes.func.isRequired,
   onTestPress: PropTypes.func.isRequired,
+  onAdvancedSettingsPress: PropTypes.func.isRequired,
   onDeleteDownloadClientPress: PropTypes.func
 };
 

frontend/src/Settings/DownloadClients/DownloadClients/EditDownloadClientModalContentConnector.js

@@ -2,7 +2,13 @@ import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import { connect } from 'react-redux';
 import { createSelector } from 'reselect';
-import { saveDownloadClient, setDownloadClientFieldValue, setDownloadClientValue, testDownloadClient } from 'Store/Actions/settingsActions';
+import {
+  saveDownloadClient,
+  setDownloadClientFieldValue,
+  setDownloadClientValue,
+  testDownloadClient,
+  toggleAdvancedSettings
+} from 'Store/Actions/settingsActions';
 import createProviderSettingsSelector from 'Store/Selectors/createProviderSettingsSelector';
 import EditDownloadClientModalContent from './EditDownloadClientModalContent';
 
@@ -23,7 +29,8 @@ const mapDispatchToProps = {
   setDownloadClientValue,
   setDownloadClientFieldValue,
   saveDownloadClient,
-  testDownloadClient
+  testDownloadClient,
+  toggleAdvancedSettings
 };
 
 class EditDownloadClientModalContentConnector extends Component {
@@ -56,6 +63,10 @@ class EditDownloadClientModalContentConnector extends Component {
     this.props.testDownloadClient({ id: this.props.id });
   };
 
+  onAdvancedSettingsPress = () => {
+    this.props.toggleAdvancedSettings();
+  };
+
   //
   // Render
 
@@ -65,6 +76,7 @@ class EditDownloadClientModalContentConnector extends Component {
         {...this.props}
         onSavePress={this.onSavePress}
         onTestPress={this.onTestPress}
+        onAdvancedSettingsPress={this.onAdvancedSettingsPress}
         onInputChange={this.onInputChange}
         onFieldChange={this.onFieldChange}
       />
@@ -82,6 +94,7 @@ EditDownloadClientModalContentConnector.propTypes = {
   setDownloadClientFieldValue: PropTypes.func.isRequired,
   saveDownloadClient: PropTypes.func.isRequired,
   testDownloadClient: PropTypes.func.isRequired,
+  toggleAdvancedSettings: PropTypes.func.isRequired,
   onModalClose: PropTypes.func.isRequired
 };
 

frontend/src/Settings/DownloadClients/DownloadClients/Manage/Edit/ManageDownloadClientsEditModalContent.tsx

@@ -32,7 +32,7 @@ const enableOptions = [
     get value() {
       return translate('NoChange');
     },
-    disabled: true,
+    isDisabled: true,
   },
   {
     key: 'enabled',

frontend/src/Settings/ImportLists/ImportListExclusions/ImportListExclusions.tsx

@@ -1,5 +1,6 @@
 import React, { useCallback, useEffect } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
+import { useHistory } from 'react-router';
 import { createSelector } from 'reselect';
 import AppState from 'App/State/AppState';
 import FieldSet from 'Components/FieldSet';
@@ -41,11 +42,6 @@ const COLUMNS = [
   },
 ];
 
-interface ImportListExclusionsProps {
-  useCurrentPage: number;
-  totalRecords: number;
-}
-
 function createImportListExlucionsSelector() {
   return createSelector(
     (state: AppState) => state.settings.importListExclusions,
@@ -57,8 +53,9 @@ function createImportListExlucionsSelector() {
   );
 }
 
-function ImportListExclusions(props: ImportListExclusionsProps) {
-  const { useCurrentPage, totalRecords } = props;
+function ImportListExclusions() {
+  const history = useHistory();
+  const useCurrentPage = history.action === 'POP';
 
   const dispatch = useDispatch();
 
@@ -155,6 +152,7 @@ function ImportListExclusions(props: ImportListExclusionsProps) {
     sortKey,
     error,
     sortDirection,
+    totalRecords,
     ...otherProps
   } = selected;
 

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

@@ -19,6 +19,7 @@ import ModalFooter from 'Components/Modal/ModalFooter';
 import ModalHeader from 'Components/Modal/ModalHeader';
 import Popover from 'Components/Tooltip/Popover';
 import { icons, inputTypes, kinds, tooltipPositions } from 'Helpers/Props';
+import AdvancedSettingsButton from 'Settings/AdvancedSettingsButton';
 import formatShortTimeSpan from 'Utilities/Date/formatShortTimeSpan';
 import translate from 'Utilities/String/translate';
 import styles from './EditImportListModalContent.css';
@@ -38,6 +39,7 @@ function EditImportListModalContent(props) {
     onModalClose,
     onSavePress,
     onTestPress,
+    onAdvancedSettingsPress,
     onDeleteImportListPress,
     ...otherProps
   } = props;
@@ -288,6 +290,12 @@ function EditImportListModalContent(props) {
             </Button>
         }
 
+        <AdvancedSettingsButton
+          advancedSettings={advancedSettings}
+          onAdvancedSettingsPress={onAdvancedSettingsPress}
+          showLabel={false}
+        />
+
         <SpinnerErrorButton
           isSpinning={isTesting}
           error={saveError}
@@ -327,6 +335,7 @@ EditImportListModalContent.propTypes = {
   onModalClose: PropTypes.func.isRequired,
   onSavePress: PropTypes.func.isRequired,
   onTestPress: PropTypes.func.isRequired,
+  onAdvancedSettingsPress: PropTypes.func.isRequired,
   onDeleteImportListPress: PropTypes.func
 };
 

frontend/src/Settings/ImportLists/ImportLists/EditImportListModalContentConnector.js

@@ -2,7 +2,13 @@ import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import { connect } from 'react-redux';
 import { createSelector } from 'reselect';
-import { saveImportList, setImportListFieldValue, setImportListValue, testImportList } from 'Store/Actions/settingsActions';
+import {
+  saveImportList,
+  setImportListFieldValue,
+  setImportListValue,
+  testImportList,
+  toggleAdvancedSettings
+} from 'Store/Actions/settingsActions';
 import createProviderSettingsSelector from 'Store/Selectors/createProviderSettingsSelector';
 import EditImportListModalContent from './EditImportListModalContent';
 
@@ -23,7 +29,8 @@ const mapDispatchToProps = {
   setImportListValue,
   setImportListFieldValue,
   saveImportList,
-  testImportList
+  testImportList,
+  toggleAdvancedSettings
 };
 
 class EditImportListModalContentConnector extends Component {
@@ -56,6 +63,10 @@ class EditImportListModalContentConnector extends Component {
     this.props.testImportList({ id: this.props.id });
   };
 
+  onAdvancedSettingsPress = () => {
+    this.props.toggleAdvancedSettings();
+  };
+
   //
   // Render
 
@@ -65,6 +76,7 @@ class EditImportListModalContentConnector extends Component {
         {...this.props}
         onSavePress={this.onSavePress}
         onTestPress={this.onTestPress}
+        onAdvancedSettingsPress={this.onAdvancedSettingsPress}
         onInputChange={this.onInputChange}
         onFieldChange={this.onFieldChange}
       />
@@ -82,6 +94,7 @@ EditImportListModalContentConnector.propTypes = {
   setImportListFieldValue: PropTypes.func.isRequired,
   saveImportList: PropTypes.func.isRequired,
   testImportList: PropTypes.func.isRequired,
+  toggleAdvancedSettings: PropTypes.func.isRequired,
   onModalClose: PropTypes.func.isRequired
 };
 

frontend/src/Settings/ImportLists/ImportLists/Manage/Edit/ManageImportListsEditModalContent.tsx

@@ -31,7 +31,7 @@ const autoAddOptions = [
     get value() {
       return translate('NoChange');
     },
-    disabled: true,
+    isDisabled: true,
   },
   {
     key: 'enabled',

frontend/src/Settings/Indexers/Indexers/Manage/Edit/ManageIndexersEditModalContent.tsx

@@ -32,7 +32,7 @@ const enableOptions = [
     get value() {
       return translate('NoChange');
     },
-    disabled: true,
+    isDisabled: true,
   },
   {
     key: 'enabled',

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

@@ -80,19 +80,19 @@ const fileNameTokens = [
 ];
 
 const seriesTokens = [
-  { token: '{Series Title}', example: 'The Series Title\'s!' },
-  { token: '{Series CleanTitle}', example: 'The Series Title\'s!' },
-  { token: '{Series TitleYear}', example: 'The Series Title\'s! (2010)' },
-  { token: '{Series CleanTitleYear}', example: 'The Series Title\'s! 2010' },
-  { token: '{Series TitleWithoutYear}', example: 'The Series Title\'s!' },
-  { token: '{Series CleanTitleWithoutYear}', example: 'The Series Title\'s!' },
-  { token: '{Series TitleThe}', example: 'Series Title\'s!, The' },
-  { token: '{Series CleanTitleThe}', example: 'Series Title\'s!, The' },
-  { token: '{Series TitleTheYear}', example: 'Series Title\'s!, The (2010)' },
-  { token: '{Series CleanTitleTheYear}', example: 'Series Title\'s!, The 2010' },
-  { token: '{Series TitleTheWithoutYear}', example: 'Series Title\'s!, The' },
-  { token: '{Series CleanTitleTheWithoutYear}', example: 'Series Title\'s!, The' },
-  { token: '{Series TitleFirstCharacter}', example: 'S' },
+  { token: '{Series Title}', example: 'The Series Title\'s!', footNote: 1 },
+  { token: '{Series CleanTitle}', example: 'The Series Title\'s!', footNote: 1 },
+  { token: '{Series TitleYear}', example: 'The Series Title\'s! (2010)', footNote: 1 },
+  { token: '{Series CleanTitleYear}', example: 'The Series Title\'s! 2010', footNote: 1 },
+  { token: '{Series TitleWithoutYear}', example: 'The Series Title\'s!', footNote: 1 },
+  { token: '{Series CleanTitleWithoutYear}', example: 'The Series Title\'s!', footNote: 1 },
+  { token: '{Series TitleThe}', example: 'Series Title\'s!, The', footNote: 1 },
+  { token: '{Series CleanTitleThe}', example: 'Series Title\'s!, The', footNote: 1 },
+  { token: '{Series TitleTheYear}', example: 'Series Title\'s!, The (2010)', footNote: 1 },
+  { token: '{Series CleanTitleTheYear}', example: 'Series Title\'s!, The 2010', footNote: 1 },
+  { token: '{Series TitleTheWithoutYear}', example: 'Series Title\'s!, The', footNote: 1 },
+  { token: '{Series CleanTitleTheWithoutYear}', example: 'Series Title\'s!, The', footNote: 1 },
+  { token: '{Series TitleFirstCharacter}', example: 'S', footNote: 1 },
   { token: '{Series Year}', example: '2010' }
 ];
 
@@ -124,8 +124,8 @@ const absoluteTokens = [
 ];
 
 const episodeTitleTokens = [
-  { token: '{Episode Title}', example: 'Episode\'s Title' },
-  { token: '{Episode CleanTitle}', example: 'Episodes Title' }
+  { token: '{Episode Title}', example: 'Episode\'s Title', footNote: 1 },
+  { token: '{Episode CleanTitle}', example: 'Episodes Title', footNote: 1 }
 ];
 
 const qualityTokens = [
@@ -149,8 +149,13 @@ const mediaInfoTokens = [
 ];
 
 const otherTokens = [
-  { token: '{Release Group}', example: 'Rls Grp' },
-  { token: '{Custom Formats}', example: 'iNTERNAL' }
+  { token: '{Release Group}', example: 'Rls Grp', footNote: 1 },
+  { token: '{Custom Formats}', example: 'iNTERNAL' },
+  { token: '{Custom Format:FormatName}', example: 'AMZN' }
+];
+
+const otherAnimeTokens = [
+  { token: '{Release Hash}', example: 'ABCDEFGH' }
 ];
 
 const originalTokens = [
@@ -300,7 +305,7 @@ class NamingModal extends Component {
             <FieldSet legend={translate('Series')}>
               <div className={styles.groups}>
                 {
-                  seriesTokens.map(({ token, example }) => {
+                  seriesTokens.map(({ token, example, footNote }) => {
                     return (
                       <NamingOption
                         key={token}
@@ -308,6 +313,7 @@ class NamingModal extends Component {
                         value={value}
                         token={token}
                         example={example}
+                        footNote={footNote}
                         tokenSeparator={tokenSeparator}
                         tokenCase={tokenCase}
                         onPress={this.onOptionPress}
@@ -317,6 +323,11 @@ class NamingModal extends Component {
                   )
                 }
               </div>
+
+              <div className={styles.footNote}>
+                <Icon className={styles.icon} name={icons.FOOTNOTE} />
+                <InlineMarkdown data={translate('SeriesFootNote')} />
+              </div>
             </FieldSet>
 
             <FieldSet legend={translate('SeriesID')}>
@@ -446,7 +457,7 @@ class NamingModal extends Component {
                   <FieldSet legend={translate('EpisodeTitle')}>
                     <div className={styles.groups}>
                       {
-                        episodeTitleTokens.map(({ token, example }) => {
+                        episodeTitleTokens.map(({ token, example, footNote }) => {
                           return (
                             <NamingOption
                               key={token}
@@ -454,6 +465,7 @@ class NamingModal extends Component {
                               value={value}
                               token={token}
                               example={example}
+                              footNote={footNote}
                               tokenSeparator={tokenSeparator}
                               tokenCase={tokenCase}
                               onPress={this.onOptionPress}
@@ -463,6 +475,10 @@ class NamingModal extends Component {
                         )
                       }
                     </div>
+                    <div className={styles.footNote}>
+                      <Icon className={styles.icon} name={icons.FOOTNOTE} />
+                      <InlineMarkdown data={translate('EpisodeTitleFootNote')} />
+                    </div>
                   </FieldSet>
 
                   <FieldSet legend={translate('Quality')}>
@@ -518,7 +534,26 @@ class NamingModal extends Component {
                   <FieldSet legend={translate('Other')}>
                     <div className={styles.groups}>
                       {
-                        otherTokens.map(({ token, example }) => {
+                        otherTokens.map(({ token, example, footNote }) => {
+                          return (
+                            <NamingOption
+                              key={token}
+                              name={name}
+                              value={value}
+                              token={token}
+                              example={example}
+                              footNote={footNote}
+                              tokenSeparator={tokenSeparator}
+                              tokenCase={tokenCase}
+                              onPress={this.onOptionPress}
+                            />
+                          );
+                        }
+                        )
+                      }
+
+                      {
+                        anime && otherAnimeTokens.map(({ token, example }) => {
                           return (
                             <NamingOption
                               key={token}
@@ -535,6 +570,11 @@ class NamingModal extends Component {
                         )
                       }
                     </div>
+
+                    <div className={styles.footNote}>
+                      <Icon className={styles.icon} name={icons.FOOTNOTE} />
+                      <InlineMarkdown data={translate('ReleaseGroupFootNote')} />
+                    </div>
                   </FieldSet>
 
                   <FieldSet legend={translate('Original')}>

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

@@ -26,7 +26,7 @@
 
 .token {
   flex: 0 0 50%;
-  padding: 6px 6px;
+  padding: 6px;
   background-color: var(--popoverTitleBackgroundColor);
   font-family: $monoSpaceFontFamily;
 }
@@ -36,7 +36,7 @@
   align-items: center;
   justify-content: space-between;
   flex: 0 0 50%;
-  padding: 6px 6px;
+  padding: 6px;
   background-color: var(--popoverBodyBackgroundColor);
 
   .footNote {

frontend/src/Settings/MetadataSource/TheTvdb.js

@@ -4,7 +4,6 @@ import translate from 'Utilities/String/translate';
 import styles from './TheTvdb.css';
 
 function TheTvdb(props) {
-  debugger;
   return (
     <div className={styles.container}>
       <img

frontend/src/Settings/Notifications/Notifications/EditNotificationModalContent.js

@@ -14,6 +14,7 @@ import ModalContent from 'Components/Modal/ModalContent';
 import ModalFooter from 'Components/Modal/ModalFooter';
 import ModalHeader from 'Components/Modal/ModalHeader';
 import { inputTypes, kinds } from 'Helpers/Props';
+import AdvancedSettingsButton from 'Settings/AdvancedSettingsButton';
 import translate from 'Utilities/String/translate';
 import NotificationEventItems from './NotificationEventItems';
 import styles from './EditNotificationModalContent.css';
@@ -32,6 +33,7 @@ function EditNotificationModalContent(props) {
     onModalClose,
     onSavePress,
     onTestPress,
+    onAdvancedSettingsPress,
     onDeleteNotificationPress,
     ...otherProps
   } = props;
@@ -136,6 +138,12 @@ function EditNotificationModalContent(props) {
             </Button>
         }
 
+        <AdvancedSettingsButton
+          advancedSettings={advancedSettings}
+          onAdvancedSettingsPress={onAdvancedSettingsPress}
+          showLabel={false}
+        />
+
         <SpinnerErrorButton
           isSpinning={isTesting}
           error={saveError}
@@ -175,6 +183,7 @@ EditNotificationModalContent.propTypes = {
   onModalClose: PropTypes.func.isRequired,
   onSavePress: PropTypes.func.isRequired,
   onTestPress: PropTypes.func.isRequired,
+  onAdvancedSettingsPress: PropTypes.func.isRequired,
   onDeleteNotificationPress: PropTypes.func
 };
 

frontend/src/Settings/Notifications/Notifications/EditNotificationModalContentConnector.js

@@ -2,7 +2,13 @@ import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import { connect } from 'react-redux';
 import { createSelector } from 'reselect';
-import { saveNotification, setNotificationFieldValue, setNotificationValue, testNotification } from 'Store/Actions/settingsActions';
+import {
+  saveNotification,
+  setNotificationFieldValue,
+  setNotificationValue,
+  testNotification,
+  toggleAdvancedSettings
+} from 'Store/Actions/settingsActions';
 import createProviderSettingsSelector from 'Store/Selectors/createProviderSettingsSelector';
 import EditNotificationModalContent from './EditNotificationModalContent';
 
@@ -23,7 +29,8 @@ const mapDispatchToProps = {
   setNotificationValue,
   setNotificationFieldValue,
   saveNotification,
-  testNotification
+  testNotification,
+  toggleAdvancedSettings
 };
 
 class EditNotificationModalContentConnector extends Component {
@@ -56,6 +63,10 @@ class EditNotificationModalContentConnector extends Component {
     this.props.testNotification({ id: this.props.id });
   };
 
+  onAdvancedSettingsPress = () => {
+    this.props.toggleAdvancedSettings();
+  };
+
   //
   // Render
 
@@ -65,6 +76,7 @@ class EditNotificationModalContentConnector extends Component {
         {...this.props}
         onSavePress={this.onSavePress}
         onTestPress={this.onTestPress}
+        onAdvancedSettingsPress={this.onAdvancedSettingsPress}
         onInputChange={this.onInputChange}
         onFieldChange={this.onFieldChange}
       />
@@ -82,6 +94,7 @@ EditNotificationModalContentConnector.propTypes = {
   setNotificationFieldValue: PropTypes.func.isRequired,
   saveNotification: PropTypes.func.isRequired,
   testNotification: PropTypes.func.isRequired,
+  toggleAdvancedSettings: PropTypes.func.isRequired,
   onModalClose: PropTypes.func.isRequired
 };
 

frontend/src/Settings/Tags/TagInUse.js

@@ -12,7 +12,7 @@ export default function TagInUse(props) {
     return null;
   }
 
-  if (count > 1 && labelPlural ) {
+  if (count > 1 && labelPlural) {
     return (
       <div>
         {count} {labelPlural.toLowerCase()}

frontend/src/Store/Actions/Creators/createTestProviderHandler.js

@@ -1,8 +1,11 @@
+import $ from 'jquery';
+import _ from 'lodash';
 import createAjaxRequest from 'Utilities/createAjaxRequest';
 import getProviderState from 'Utilities/State/getProviderState';
 import { set } from '../baseActions';
 
 const abortCurrentRequests = {};
+let lastTestData = null;
 
 export function createCancelTestProviderHandler(section) {
   return function(getState, payload, dispatch) {
@@ -17,10 +20,25 @@ function createTestProviderHandler(section, url) {
   return function(getState, payload, dispatch) {
     dispatch(set({ section, isTesting: true }));
 
-    const testData = getProviderState(payload, getState, section);
+    const {
+      queryParams = {},
+      ...otherPayload
+    } = payload;
+
+    const testData = getProviderState({ ...otherPayload }, getState, section);
+    const params = { ...queryParams };
+
+    // If the user is re-testing the same provider without changes
+    // force it to be tested.
+
+    if (_.isEqual(testData, lastTestData)) {
+      params.forceTest = true;
+    }
+
+    lastTestData = testData;
 
     const ajaxOptions = {
-      url: `${url}/test`,
+      url: `${url}/test?${$.param(params, true)}`,
       method: 'POST',
       contentType: 'application/json',
       dataType: 'json',
@@ -32,6 +50,8 @@ function createTestProviderHandler(section, url) {
     abortCurrentRequests[section] = abortRequest;
 
     request.done((data) => {
+      lastTestData = null;
+
       dispatch(set({
         section,
         isTesting: false,

frontend/src/Store/Actions/Settings/importListExclusions.js

@@ -1,11 +1,11 @@
 import { createAction } from 'redux-actions';
 import createRemoveItemHandler from 'Store/Actions/Creators/createRemoveItemHandler';
 import createSaveProviderHandler from 'Store/Actions/Creators/createSaveProviderHandler';
+import createServerSideCollectionHandlers from 'Store/Actions/Creators/createServerSideCollectionHandlers';
 import createSetSettingValueReducer from 'Store/Actions/Creators/Reducers/createSetSettingValueReducer';
+import createSetTableOptionReducer from 'Store/Actions/Creators/Reducers/createSetTableOptionReducer';
 import { createThunk, handleThunks } from 'Store/thunks';
 import serverSideCollectionHandlers from 'Utilities/serverSideCollectionHandlers';
-import createServerSideCollectionHandlers from '../Creators/createServerSideCollectionHandlers';
-import createSetTableOptionReducer from '../Creators/Reducers/createSetTableOptionReducer';
 
 //
 // Variables

frontend/src/Store/Actions/interactiveImportActions.js

@@ -163,6 +163,7 @@ export const actionHandlers = handleThunks({
         languages: item.languages,
         releaseGroup: item.releaseGroup,
         indexerFlags: item.indexerFlags,
+        releaseType: item.releaseType,
         downloadId: item.downloadId
       };
     });

frontend/src/Store/Actions/settingsActions.js

@@ -1,5 +1,4 @@
 import { createAction } from 'redux-actions';
-import indexerFlags from 'Store/Actions/Settings/indexerFlags';
 import { handleThunks } from 'Store/thunks';
 import createHandleActions from './Creators/createHandleActions';
 import autoTaggings from './Settings/autoTaggings';
@@ -13,6 +12,7 @@ import general from './Settings/general';
 import importListExclusions from './Settings/importListExclusions';
 import importListOptions from './Settings/importListOptions';
 import importLists from './Settings/importLists';
+import indexerFlags from './Settings/indexerFlags';
 import indexerOptions from './Settings/indexerOptions';
 import indexers from './Settings/indexers';
 import languages from './Settings/languages';
@@ -91,7 +91,8 @@ export const defaultState = {
 };
 
 export const persistState = [
-  'settings.advancedSettings'
+  'settings.advancedSettings',
+  'settings.importListExclusions.pageSize'
 ];
 
 //

frontend/src/Store/Selectors/createMultiSeriesSelector.ts

@@ -0,0 +1,23 @@
+import { createSelector } from 'reselect';
+import AppState from 'App/State/AppState';
+import Series from 'Series/Series';
+
+function createMultiSeriesSelector(seriesIds: number[]) {
+  return createSelector(
+    (state: AppState) => state.series.itemMap,
+    (state: AppState) => state.series.items,
+    (itemMap, allSeries) => {
+      return seriesIds.reduce((acc: Series[], seriesId) => {
+        const series = allSeries[itemMap[seriesId]];
+
+        if (series) {
+          acc.push(series);
+        }
+
+        return acc;
+      }, []);
+    }
+  );
+}
+
+export default createMultiSeriesSelector;

frontend/src/System/Tasks/Queued/QueuedTaskRow.css

@@ -10,15 +10,6 @@
   width: 100%;
 }
 
-.commandName {
-  display: inline-block;
-  min-width: 220px;
-}
-
-.userAgent {
-  color: #b0b0b0;
-}
-
 .queued,
 .started,
 .ended {

frontend/src/System/Tasks/Queued/QueuedTaskRow.css.d.ts

@@ -2,14 +2,12 @@
 // Please do not change this file!
 interface CssExports {
   'actions': string;
-  'commandName': string;
   'duration': string;
   'ended': string;
   'queued': string;
   'started': string;
   'trigger': string;
   'triggerContent': string;
-  'userAgent': string;
 }
 export const cssExports: CssExports;
 export default cssExports;

frontend/src/System/Tasks/Queued/QueuedTaskRow.js

@@ -1,279 +0,0 @@
-import moment from 'moment';
-import PropTypes from 'prop-types';
-import React, { Component } from 'react';
-import Icon from 'Components/Icon';
-import IconButton from 'Components/Link/IconButton';
-import ConfirmModal from 'Components/Modal/ConfirmModal';
-import TableRowCell from 'Components/Table/Cells/TableRowCell';
-import TableRow from 'Components/Table/TableRow';
-import { icons, kinds } from 'Helpers/Props';
-import formatDate from 'Utilities/Date/formatDate';
-import formatDateTime from 'Utilities/Date/formatDateTime';
-import formatTimeSpan from 'Utilities/Date/formatTimeSpan';
-import titleCase from 'Utilities/String/titleCase';
-import translate from 'Utilities/String/translate';
-import styles from './QueuedTaskRow.css';
-
-function getStatusIconProps(status, message) {
-  const title = titleCase(status);
-
-  switch (status) {
-    case 'queued':
-      return {
-        name: icons.PENDING,
-        title
-      };
-
-    case 'started':
-      return {
-        name: icons.REFRESH,
-        isSpinning: true,
-        title
-      };
-
-    case 'completed':
-      return {
-        name: icons.CHECK,
-        kind: kinds.SUCCESS,
-        title: message === 'Completed' ? title : `${title}: ${message}`
-      };
-
-    case 'failed':
-      return {
-        name: icons.FATAL,
-        kind: kinds.DANGER,
-        title: `${title}: ${message}`
-      };
-
-    default:
-      return {
-        name: icons.UNKNOWN,
-        title
-      };
-  }
-}
-
-function getFormattedDates(props) {
-  const {
-    queued,
-    started,
-    ended,
-    showRelativeDates,
-    shortDateFormat
-  } = props;
-
-  if (showRelativeDates) {
-    return {
-      queuedAt: moment(queued).fromNow(),
-      startedAt: started ? moment(started).fromNow() : '-',
-      endedAt: ended ? moment(ended).fromNow() : '-'
-    };
-  }
-
-  return {
-    queuedAt: formatDate(queued, shortDateFormat),
-    startedAt: started ? formatDate(started, shortDateFormat) : '-',
-    endedAt: ended ? formatDate(ended, shortDateFormat) : '-'
-  };
-}
-
-class QueuedTaskRow extends Component {
-
-  //
-  // Lifecycle
-
-  constructor(props, context) {
-    super(props, context);
-
-    this.state = {
-      ...getFormattedDates(props),
-      isCancelConfirmModalOpen: false
-    };
-
-    this._updateTimeoutId = null;
-  }
-
-  componentDidMount() {
-    this.setUpdateTimer();
-  }
-
-  componentDidUpdate(prevProps) {
-    const {
-      queued,
-      started,
-      ended
-    } = this.props;
-
-    if (
-      queued !== prevProps.queued ||
-      started !== prevProps.started ||
-      ended !== prevProps.ended
-    ) {
-      this.setState(getFormattedDates(this.props));
-    }
-  }
-
-  componentWillUnmount() {
-    if (this._updateTimeoutId) {
-      this._updateTimeoutId = clearTimeout(this._updateTimeoutId);
-    }
-  }
-
-  //
-  // Control
-
-  setUpdateTimer() {
-    this._updateTimeoutId = setTimeout(() => {
-      this.setState(getFormattedDates(this.props));
-      this.setUpdateTimer();
-    }, 30000);
-  }
-
-  //
-  // Listeners
-
-  onCancelPress = () => {
-    this.setState({
-      isCancelConfirmModalOpen: true
-    });
-  };
-
-  onAbortCancel = () => {
-    this.setState({
-      isCancelConfirmModalOpen: false
-    });
-  };
-
-  //
-  // Render
-
-  render() {
-    const {
-      trigger,
-      commandName,
-      queued,
-      started,
-      ended,
-      status,
-      duration,
-      message,
-      clientUserAgent,
-      longDateFormat,
-      timeFormat,
-      onCancelPress
-    } = this.props;
-
-    const {
-      queuedAt,
-      startedAt,
-      endedAt,
-      isCancelConfirmModalOpen
-    } = this.state;
-
-    let triggerIcon = icons.QUICK;
-
-    if (trigger === 'manual') {
-      triggerIcon = icons.INTERACTIVE;
-    } else if (trigger === 'scheduled') {
-      triggerIcon = icons.SCHEDULED;
-    }
-
-    return (
-      <TableRow>
-        <TableRowCell className={styles.trigger}>
-          <span className={styles.triggerContent}>
-            <Icon
-              name={triggerIcon}
-              title={titleCase(trigger)}
-            />
-
-            <Icon
-              {...getStatusIconProps(status, message)}
-            />
-          </span>
-        </TableRowCell>
-
-        <TableRowCell>
-          <span className={styles.commandName}>
-            {commandName}
-          </span>
-          {
-            clientUserAgent ?
-              <span className={styles.userAgent} title={translate('TaskUserAgentTooltip')}>
-                {translate('From')}: {clientUserAgent}
-              </span> :
-              null
-          }
-        </TableRowCell>
-
-        <TableRowCell
-          className={styles.queued}
-          title={formatDateTime(queued, longDateFormat, timeFormat)}
-        >
-          {queuedAt}
-        </TableRowCell>
-
-        <TableRowCell
-          className={styles.started}
-          title={formatDateTime(started, longDateFormat, timeFormat)}
-        >
-          {startedAt}
-        </TableRowCell>
-
-        <TableRowCell
-          className={styles.ended}
-          title={formatDateTime(ended, longDateFormat, timeFormat)}
-        >
-          {endedAt}
-        </TableRowCell>
-
-        <TableRowCell className={styles.duration}>
-          {formatTimeSpan(duration)}
-        </TableRowCell>
-
-        <TableRowCell
-          className={styles.actions}
-        >
-          {
-            status === 'queued' &&
-              <IconButton
-                title={translate('RemovedFromTaskQueue')}
-                name={icons.REMOVE}
-                onPress={this.onCancelPress}
-              />
-          }
-        </TableRowCell>
-
-        <ConfirmModal
-          isOpen={isCancelConfirmModalOpen}
-          kind={kinds.DANGER}
-          title={translate('Cancel')}
-          message={translate('CancelPendingTask')}
-          confirmLabel={translate('YesCancel')}
-          cancelLabel={translate('NoLeaveIt')}
-          onConfirm={onCancelPress}
-          onCancel={this.onAbortCancel}
-        />
-      </TableRow>
-    );
-  }
-}
-
-QueuedTaskRow.propTypes = {
-  trigger: PropTypes.string.isRequired,
-  commandName: PropTypes.string.isRequired,
-  queued: PropTypes.string.isRequired,
-  started: PropTypes.string,
-  ended: PropTypes.string,
-  status: PropTypes.string.isRequired,
-  duration: PropTypes.string,
-  message: PropTypes.string,
-  clientUserAgent: PropTypes.string,
-  showRelativeDates: PropTypes.bool.isRequired,
-  shortDateFormat: PropTypes.string.isRequired,
-  longDateFormat: PropTypes.string.isRequired,
-  timeFormat: PropTypes.string.isRequired,
-  onCancelPress: PropTypes.func.isRequired
-};
-
-export default QueuedTaskRow;

frontend/src/System/Tasks/Queued/QueuedTaskRow.tsx

@@ -0,0 +1,238 @@
+import moment from 'moment';
+import React, { useCallback, useEffect, useRef, useState } from 'react';
+import { useDispatch, useSelector } from 'react-redux';
+import { CommandBody } from 'Commands/Command';
+import Icon from 'Components/Icon';
+import IconButton from 'Components/Link/IconButton';
+import ConfirmModal from 'Components/Modal/ConfirmModal';
+import TableRowCell from 'Components/Table/Cells/TableRowCell';
+import TableRow from 'Components/Table/TableRow';
+import useModalOpenState from 'Helpers/Hooks/useModalOpenState';
+import { icons, kinds } from 'Helpers/Props';
+import { cancelCommand } from 'Store/Actions/commandActions';
+import createUISettingsSelector from 'Store/Selectors/createUISettingsSelector';
+import formatDate from 'Utilities/Date/formatDate';
+import formatDateTime from 'Utilities/Date/formatDateTime';
+import formatTimeSpan from 'Utilities/Date/formatTimeSpan';
+import titleCase from 'Utilities/String/titleCase';
+import translate from 'Utilities/String/translate';
+import QueuedTaskRowNameCell from './QueuedTaskRowNameCell';
+import styles from './QueuedTaskRow.css';
+
+function getStatusIconProps(status: string, message: string | undefined) {
+  const title = titleCase(status);
+
+  switch (status) {
+    case 'queued':
+      return {
+        name: icons.PENDING,
+        title,
+      };
+
+    case 'started':
+      return {
+        name: icons.REFRESH,
+        isSpinning: true,
+        title,
+      };
+
+    case 'completed':
+      return {
+        name: icons.CHECK,
+        kind: kinds.SUCCESS,
+        title: message === 'Completed' ? title : `${title}: ${message}`,
+      };
+
+    case 'failed':
+      return {
+        name: icons.FATAL,
+        kind: kinds.DANGER,
+        title: `${title}: ${message}`,
+      };
+
+    default:
+      return {
+        name: icons.UNKNOWN,
+        title,
+      };
+  }
+}
+
+function getFormattedDates(
+  queued: string,
+  started: string | undefined,
+  ended: string | undefined,
+  showRelativeDates: boolean,
+  shortDateFormat: string
+) {
+  if (showRelativeDates) {
+    return {
+      queuedAt: moment(queued).fromNow(),
+      startedAt: started ? moment(started).fromNow() : '-',
+      endedAt: ended ? moment(ended).fromNow() : '-',
+    };
+  }
+
+  return {
+    queuedAt: formatDate(queued, shortDateFormat),
+    startedAt: started ? formatDate(started, shortDateFormat) : '-',
+    endedAt: ended ? formatDate(ended, shortDateFormat) : '-',
+  };
+}
+
+interface QueuedTimes {
+  queuedAt: string;
+  startedAt: string;
+  endedAt: string;
+}
+
+export interface QueuedTaskRowProps {
+  id: number;
+  trigger: string;
+  commandName: string;
+  queued: string;
+  started?: string;
+  ended?: string;
+  status: string;
+  duration?: string;
+  message?: string;
+  body: CommandBody;
+  clientUserAgent?: string;
+}
+
+export default function QueuedTaskRow(props: QueuedTaskRowProps) {
+  const {
+    id,
+    trigger,
+    commandName,
+    queued,
+    started,
+    ended,
+    status,
+    duration,
+    message,
+    body,
+    clientUserAgent,
+  } = props;
+
+  const dispatch = useDispatch();
+  const { longDateFormat, shortDateFormat, showRelativeDates, timeFormat } =
+    useSelector(createUISettingsSelector());
+
+  const updateTimeTimeoutId = useRef<ReturnType<typeof setTimeout> | null>(
+    null
+  );
+  const [times, setTimes] = useState<QueuedTimes>(
+    getFormattedDates(
+      queued,
+      started,
+      ended,
+      showRelativeDates,
+      shortDateFormat
+    )
+  );
+
+  const [
+    isCancelConfirmModalOpen,
+    openCancelConfirmModal,
+    closeCancelConfirmModal,
+  ] = useModalOpenState(false);
+
+  const handleCancelPress = useCallback(() => {
+    dispatch(cancelCommand({ id }));
+  }, [id, dispatch]);
+
+  useEffect(() => {
+    updateTimeTimeoutId.current = setTimeout(() => {
+      setTimes(
+        getFormattedDates(
+          queued,
+          started,
+          ended,
+          showRelativeDates,
+          shortDateFormat
+        )
+      );
+    }, 30000);
+
+    return () => {
+      if (updateTimeTimeoutId.current) {
+        clearTimeout(updateTimeTimeoutId.current);
+      }
+    };
+  }, [queued, started, ended, showRelativeDates, shortDateFormat, setTimes]);
+
+  const { queuedAt, startedAt, endedAt } = times;
+
+  let triggerIcon = icons.QUICK;
+
+  if (trigger === 'manual') {
+    triggerIcon = icons.INTERACTIVE;
+  } else if (trigger === 'scheduled') {
+    triggerIcon = icons.SCHEDULED;
+  }
+
+  return (
+    <TableRow>
+      <TableRowCell className={styles.trigger}>
+        <span className={styles.triggerContent}>
+          <Icon name={triggerIcon} title={titleCase(trigger)} />
+
+          <Icon {...getStatusIconProps(status, message)} />
+        </span>
+      </TableRowCell>
+
+      <QueuedTaskRowNameCell
+        commandName={commandName}
+        body={body}
+        clientUserAgent={clientUserAgent}
+      />
+
+      <TableRowCell
+        className={styles.queued}
+        title={formatDateTime(queued, longDateFormat, timeFormat)}
+      >
+        {queuedAt}
+      </TableRowCell>
+
+      <TableRowCell
+        className={styles.started}
+        title={formatDateTime(started, longDateFormat, timeFormat)}
+      >
+        {startedAt}
+      </TableRowCell>
+
+      <TableRowCell
+        className={styles.ended}
+        title={formatDateTime(ended, longDateFormat, timeFormat)}
+      >
+        {endedAt}
+      </TableRowCell>
+
+      <TableRowCell className={styles.duration}>
+        {formatTimeSpan(duration)}
+      </TableRowCell>
+
+      <TableRowCell className={styles.actions}>
+        {status === 'queued' && (
+          <IconButton
+            title={translate('RemovedFromTaskQueue')}
+            name={icons.REMOVE}
+            onPress={openCancelConfirmModal}
+          />
+        )}
+      </TableRowCell>
+
+      <ConfirmModal
+        isOpen={isCancelConfirmModalOpen}
+        kind={kinds.DANGER}
+        title={translate('Cancel')}
+        message={translate('CancelPendingTask')}
+        confirmLabel={translate('YesCancel')}
+        cancelLabel={translate('NoLeaveIt')}
+        onConfirm={handleCancelPress}
+        onCancel={closeCancelConfirmModal}
+      />
+    </TableRow>
+  );
+}

frontend/src/System/Tasks/Queued/QueuedTaskRowConnector.js

@@ -1,31 +0,0 @@
-import { connect } from 'react-redux';
-import { createSelector } from 'reselect';
-import { cancelCommand } from 'Store/Actions/commandActions';
-import createUISettingsSelector from 'Store/Selectors/createUISettingsSelector';
-import QueuedTaskRow from './QueuedTaskRow';
-
-function createMapStateToProps() {
-  return createSelector(
-    createUISettingsSelector(),
-    (uiSettings) => {
-      return {
-        showRelativeDates: uiSettings.showRelativeDates,
-        shortDateFormat: uiSettings.shortDateFormat,
-        longDateFormat: uiSettings.longDateFormat,
-        timeFormat: uiSettings.timeFormat
-      };
-    }
-  );
-}
-
-function createMapDispatchToProps(dispatch, props) {
-  return {
-    onCancelPress() {
-      dispatch(cancelCommand({
-        id: props.id
-      }));
-    }
-  };
-}
-
-export default connect(createMapStateToProps, createMapDispatchToProps)(QueuedTaskRow);

frontend/src/System/Tasks/Queued/QueuedTaskRowNameCell.css

@@ -0,0 +1,8 @@
+.commandName {
+  display: inline-block;
+  min-width: 220px;
+}
+
+.userAgent {
+  color: #b0b0b0;
+}

frontend/src/System/Tasks/Queued/QueuedTaskRowNameCell.css.d.ts

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

frontend/src/System/Tasks/Queued/QueuedTaskRowNameCell.tsx

@@ -0,0 +1,73 @@
+import React from 'react';
+import { useSelector } from 'react-redux';
+import { CommandBody } from 'Commands/Command';
+import TableRowCell from 'Components/Table/Cells/TableRowCell';
+import createMultiSeriesSelector from 'Store/Selectors/createMultiSeriesSelector';
+import translate from 'Utilities/String/translate';
+import styles from './QueuedTaskRowNameCell.css';
+
+function formatTitles(titles: string[]) {
+  if (!titles) {
+    return null;
+  }
+
+  if (titles.length > 11) {
+    return (
+      <span title={titles.join(', ')}>
+        {titles.slice(0, 10).join(', ')}, {titles.length - 10} more
+      </span>
+    );
+  }
+
+  return <span>{titles.join(', ')}</span>;
+}
+
+export interface QueuedTaskRowNameCellProps {
+  commandName: string;
+  body: CommandBody;
+  clientUserAgent?: string;
+}
+
+export default function QueuedTaskRowNameCell(
+  props: QueuedTaskRowNameCellProps
+) {
+  const { commandName, body, clientUserAgent } = props;
+  const seriesIds = [...(body.seriesIds ?? [])];
+
+  if (body.seriesId) {
+    seriesIds.push(body.seriesId);
+  }
+
+  const series = useSelector(createMultiSeriesSelector(seriesIds));
+  const sortedSeries = series.sort((a, b) =>
+    a.sortTitle.localeCompare(b.sortTitle)
+  );
+
+  return (
+    <TableRowCell>
+      <span className={styles.commandName}>
+        {commandName}
+        {sortedSeries.length ? (
+          <span> - {formatTitles(sortedSeries.map((s) => s.title))}</span>
+        ) : null}
+        {body.seasonNumber ? (
+          <span>
+            {' '}
+            {translate('SeasonNumberToken', {
+              seasonNumber: body.seasonNumber,
+            })}
+          </span>
+        ) : null}
+      </span>
+
+      {clientUserAgent ? (
+        <span
+          className={styles.userAgent}
+          title={translate('TaskUserAgentTooltip')}
+        >
+          {translate('From')}: {clientUserAgent}
+        </span>
+      ) : null}
+    </TableRowCell>
+  );
+}

frontend/src/System/Tasks/Queued/QueuedTasks.js

@@ -1,90 +0,0 @@
-import PropTypes from 'prop-types';
-import React from 'react';
-import FieldSet from 'Components/FieldSet';
-import LoadingIndicator from 'Components/Loading/LoadingIndicator';
-import Table from 'Components/Table/Table';
-import TableBody from 'Components/Table/TableBody';
-import translate from 'Utilities/String/translate';
-import QueuedTaskRowConnector from './QueuedTaskRowConnector';
-
-const columns = [
-  {
-    name: 'trigger',
-    label: '',
-    isVisible: true
-  },
-  {
-    name: 'commandName',
-    label: () => translate('Name'),
-    isVisible: true
-  },
-  {
-    name: 'queued',
-    label: () => translate('Queued'),
-    isVisible: true
-  },
-  {
-    name: 'started',
-    label: () => translate('Started'),
-    isVisible: true
-  },
-  {
-    name: 'ended',
-    label: () => translate('Ended'),
-    isVisible: true
-  },
-  {
-    name: 'duration',
-    label: () => translate('Duration'),
-    isVisible: true
-  },
-  {
-    name: 'actions',
-    isVisible: true
-  }
-];
-
-function QueuedTasks(props) {
-  const {
-    isFetching,
-    isPopulated,
-    items
-  } = props;
-
-  return (
-    <FieldSet legend={translate('Queue')}>
-      {
-        isFetching && !isPopulated &&
-          <LoadingIndicator />
-      }
-
-      {
-        isPopulated &&
-          <Table
-            columns={columns}
-          >
-            <TableBody>
-              {
-                items.map((item) => {
-                  return (
-                    <QueuedTaskRowConnector
-                      key={item.id}
-                      {...item}
-                    />
-                  );
-                })
-              }
-            </TableBody>
-          </Table>
-      }
-    </FieldSet>
-  );
-}
-
-QueuedTasks.propTypes = {
-  isFetching: PropTypes.bool.isRequired,
-  isPopulated: PropTypes.bool.isRequired,
-  items: PropTypes.array.isRequired
-};
-
-export default QueuedTasks;

frontend/src/System/Tasks/Queued/QueuedTasks.tsx

@@ -0,0 +1,74 @@
+import React, { useEffect } from 'react';
+import { useDispatch, useSelector } from 'react-redux';
+import AppState from 'App/State/AppState';
+import FieldSet from 'Components/FieldSet';
+import LoadingIndicator from 'Components/Loading/LoadingIndicator';
+import Table from 'Components/Table/Table';
+import TableBody from 'Components/Table/TableBody';
+import { fetchCommands } from 'Store/Actions/commandActions';
+import translate from 'Utilities/String/translate';
+import QueuedTaskRow from './QueuedTaskRow';
+
+const columns = [
+  {
+    name: 'trigger',
+    label: '',
+    isVisible: true,
+  },
+  {
+    name: 'commandName',
+    label: () => translate('Name'),
+    isVisible: true,
+  },
+  {
+    name: 'queued',
+    label: () => translate('Queued'),
+    isVisible: true,
+  },
+  {
+    name: 'started',
+    label: () => translate('Started'),
+    isVisible: true,
+  },
+  {
+    name: 'ended',
+    label: () => translate('Ended'),
+    isVisible: true,
+  },
+  {
+    name: 'duration',
+    label: () => translate('Duration'),
+    isVisible: true,
+  },
+  {
+    name: 'actions',
+    isVisible: true,
+  },
+];
+
+export default function QueuedTasks() {
+  const dispatch = useDispatch();
+  const { isFetching, isPopulated, items } = useSelector(
+    (state: AppState) => state.commands
+  );
+
+  useEffect(() => {
+    dispatch(fetchCommands());
+  }, [dispatch]);
+
+  return (
+    <FieldSet legend={translate('Queue')}>
+      {isFetching && !isPopulated && <LoadingIndicator />}
+
+      {isPopulated && (
+        <Table columns={columns}>
+          <TableBody>
+            {items.map((item) => {
+              return <QueuedTaskRow key={item.id} {...item} />;
+            })}
+          </TableBody>
+        </Table>
+      )}
+    </FieldSet>
+  );
+}

frontend/src/System/Tasks/Queued/QueuedTasksConnector.js

@@ -1,46 +0,0 @@
-import PropTypes from 'prop-types';
-import React, { Component } from 'react';
-import { connect } from 'react-redux';
-import { createSelector } from 'reselect';
-import { fetchCommands } from 'Store/Actions/commandActions';
-import QueuedTasks from './QueuedTasks';
-
-function createMapStateToProps() {
-  return createSelector(
-    (state) => state.commands,
-    (commands) => {
-      return commands;
-    }
-  );
-}
-
-const mapDispatchToProps = {
-  dispatchFetchCommands: fetchCommands
-};
-
-class QueuedTasksConnector extends Component {
-
-  //
-  // Lifecycle
-
-  componentDidMount() {
-    this.props.dispatchFetchCommands();
-  }
-
-  //
-  // Render
-
-  render() {
-    return (
-      <QueuedTasks
-        {...this.props}
-      />
-    );
-  }
-}
-
-QueuedTasksConnector.propTypes = {
-  dispatchFetchCommands: PropTypes.func.isRequired
-};
-
-export default connect(createMapStateToProps, mapDispatchToProps)(QueuedTasksConnector);

frontend/src/System/Tasks/Tasks.js

@@ -2,7 +2,7 @@ import React from 'react';
 import PageContent from 'Components/Page/PageContent';
 import PageContentBody from 'Components/Page/PageContentBody';
 import translate from 'Utilities/String/translate';
-import QueuedTasksConnector from './Queued/QueuedTasksConnector';
+import QueuedTasks from './Queued/QueuedTasks';
 import ScheduledTasksConnector from './Scheduled/ScheduledTasksConnector';
 
 function Tasks() {
@@ -10,7 +10,7 @@ function Tasks() {
     <PageContent title={translate('Tasks')}>
       <PageContentBody>
         <ScheduledTasksConnector />
-        <QueuedTasksConnector />
+        <QueuedTasks />
       </PageContentBody>
     </PageContent>
   );

frontend/src/index.ejs

@@ -3,13 +3,16 @@
   <head>
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="mobile-web-app-capable" content="yes" />
-    <meta name="apple-mobile-web-app-capable" content="yes" />
 
     <!-- Chrome, Opera, and Firefox OS -->
     <meta name="theme-color" content="#3a3f51" />
     <!-- Windows Phone -->
     <meta name="msapplication-navbutton-color" content="#3a3f51" />
+    <!-- Android/Apple Phone -->
+    <meta name="mobile-web-app-capable" content="yes" />
+    <meta name="apple-mobile-web-app-capable" content="yes" />
+    <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent" />
+    <meta name="format-detection" content="telephone=no">
 
     <meta name="description" content="Sonarr" />
 

frontend/src/login.html

@@ -3,13 +3,16 @@
   <head>
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="mobile-web-app-capable" content="yes" />
-    <meta name="apple-mobile-web-app-capable" content="yes" />
 
     <!-- Chrome, Opera, and Firefox OS -->
     <meta name="theme-color" content="#3a3f51" />
     <!-- Windows Phone -->
     <meta name="msapplication-navbutton-color" content="#3a3f51" />
+    <!-- Android/Apple Phone -->
+    <meta name="mobile-web-app-capable" content="yes" />
+    <meta name="apple-mobile-web-app-capable" content="yes" />
+    <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent" />
+    <meta name="format-detection" content="telephone=no">
 
     <meta name="description" content="Sonarr" />
 

package.json

@@ -10,7 +10,7 @@
     "watch": "webpack --watch --config ./frontend/build/webpack.config.js",
     "lint": "eslint --config frontend/.eslintrc.js --ignore-path frontend/.eslintignore frontend/",
     "lint-fix": "yarn lint --fix",
-    "stylelint": "stylelint frontend/**/*.css --config frontend/.stylelintrc"
+    "stylelint": "stylelint \"frontend/**/*.css\" --config frontend/.stylelintrc"
   },
   "repository": "https://github.com/Sonarr/Sonarr",
   "author": "Team Sonarr",
@@ -29,9 +29,9 @@
     "@juggle/resize-observer": "3.4.0",
     "@microsoft/signalr": "6.0.21",
     "@sentry/browser": "7.100.0",
-    "@types/node": "18.16.8",
-    "@types/react": "18.2.6",
-    "@types/react-dom": "18.2.4",
+    "@types/node": "18.19.31",
+    "@types/react": "18.2.79",
+    "@types/react-dom": "18.2.25",
     "classnames": "2.3.2",
     "clipboard": "2.0.11",
     "connected-react-router": "6.9.3",
@@ -81,17 +81,16 @@
     "redux-thunk": "2.4.2",
     "reselect": "4.1.8",
     "stacktrace-js": "2.0.2",
-    "typescript": "4.9.5"
+    "typescript": "5.1.6"
   },
   "devDependencies": {
-    "@babel/core": "7.22.11",
-    "@babel/eslint-parser": "7.22.11",
-    "@babel/plugin-proposal-export-default-from": "7.22.5",
+    "@babel/core": "7.24.4",
+    "@babel/eslint-parser": "7.24.1",
+    "@babel/plugin-proposal-export-default-from": "7.24.1",
     "@babel/plugin-syntax-dynamic-import": "7.8.3",
-    "@babel/preset-env": "7.22.14",
-    "@babel/preset-react": "7.22.5",
-    "@babel/preset-typescript": "7.22.11",
-    "@types/classnames": "2.3.1",
+    "@babel/preset-env": "7.24.4",
+    "@babel/preset-react": "7.24.1",
+    "@babel/preset-typescript": "7.24.1",
     "@types/lodash": "4.14.194",
     "@types/react-lazyload": "3.2.0",
     "@types/react-router-dom": "5.3.3",
@@ -99,30 +98,30 @@
     "@types/react-window": "1.8.5",
     "@types/redux-actions": "2.6.2",
     "@types/webpack-livereload-plugin": "^2.3.3",
-    "@typescript-eslint/eslint-plugin": "5.59.5",
-    "@typescript-eslint/parser": "5.59.5",
+    "@typescript-eslint/eslint-plugin": "6.21.0",
+    "@typescript-eslint/parser": "6.21.0",
     "autoprefixer": "10.4.14",
     "babel-loader": "9.1.2",
     "babel-plugin-inline-classnames": "2.0.1",
     "babel-plugin-transform-react-remove-prop-types": "0.4.24",
-    "core-js": "3.32.1",
+    "core-js": "3.37.0",
     "css-loader": "6.7.3",
     "css-modules-typescript-loader": "4.0.1",
-    "eslint": "8.40.0",
-    "eslint-config-prettier": "8.8.0",
+    "eslint": "8.57.0",
+    "eslint-config-prettier": "8.10.0",
     "eslint-plugin-filenames": "1.3.2",
-    "eslint-plugin-import": "2.27.5",
+    "eslint-plugin-import": "2.29.1",
     "eslint-plugin-prettier": "4.2.1",
-    "eslint-plugin-react": "7.32.2",
+    "eslint-plugin-react": "7.34.1",
     "eslint-plugin-react-hooks": "4.6.0",
-    "eslint-plugin-simple-import-sort": "10.0.0",
+    "eslint-plugin-simple-import-sort": "12.1.0",
     "file-loader": "6.2.0",
     "filemanager-webpack-plugin": "8.0.0",
     "fork-ts-checker-webpack-plugin": "8.0.0",
     "html-webpack-plugin": "5.5.1",
     "loader-utils": "^3.2.1",
     "mini-css-extract-plugin": "2.7.5",
-    "postcss": "8.4.23",
+    "postcss": "8.4.38",
     "postcss-color-function": "4.1.0",
     "postcss-loader": "7.3.0",
     "postcss-mixins": "9.0.4",

src/Directory.Build.props

@@ -175,16 +175,46 @@
     </Otherwise>
   </Choose>
 
+  <!--
+       Set architecture to RuntimeInformation.ProcessArchitecture if not specified -->
+  <Choose>
+    <When Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::ProcessArchitecture)' == 'X64'">
+      <PropertyGroup>
+        <Architecture>x64</Architecture>
+      </PropertyGroup>
+    </When>
+    <When Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::ProcessArchitecture)' == 'X86'">
+      <PropertyGroup>
+        <Architecture>x86</Architecture>
+      </PropertyGroup>
+    </When>
+    <When Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::ProcessArchitecture)' == 'Arm64'">
+      <PropertyGroup>
+        <Architecture>arm64</Architecture>
+      </PropertyGroup>
+    </When>
+    <When Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::ProcessArchitecture)' == 'Arm'">
+      <PropertyGroup>
+        <Architecture>arm</Architecture>
+      </PropertyGroup>
+    </When>
+    <Otherwise>
+      <PropertyGroup>
+        <Architecture></Architecture>
+      </PropertyGroup>
+    </Otherwise>
+  </Choose>
+
   <PropertyGroup Condition="'$(IsWindows)' == 'true' and
                             '$(RuntimeIdentifier)' == ''">
     <_UsingDefaultRuntimeIdentifier>true</_UsingDefaultRuntimeIdentifier>
-    <RuntimeIdentifier>win-x64</RuntimeIdentifier>
+    <RuntimeIdentifier>win-$(Architecture)</RuntimeIdentifier>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(IsLinux)' == 'true' and
                             '$(RuntimeIdentifier)' == ''">
     <_UsingDefaultRuntimeIdentifier>true</_UsingDefaultRuntimeIdentifier>
-    <RuntimeIdentifier>linux-x64</RuntimeIdentifier>
+    <RuntimeIdentifier>linux-$(Architecture)</RuntimeIdentifier>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(IsOSX)' == 'true' and

src/NzbDrone.Common.Test/ConfigFileProviderTest.cs

@@ -1,10 +1,12 @@
 using System.Collections.Generic;
 using FluentAssertions;
+using Microsoft.Extensions.Options;
 using Moq;
 using NUnit.Framework;
 using NzbDrone.Common.Disk;
 using NzbDrone.Common.EnvironmentInfo;
 using NzbDrone.Common.Extensions;
+using NzbDrone.Common.Options;
 using NzbDrone.Core.Authentication;
 using NzbDrone.Core.Configuration;
 using NzbDrone.Test.Common;
@@ -43,6 +45,26 @@ namespace NzbDrone.Common.Test
             Mocker.GetMock<IDiskProvider>()
                 .Setup(v => v.WriteAllText(configFile, It.IsAny<string>()))
                 .Callback<string, string>((p, t) => _configFileContents = t);
+
+            Mocker.GetMock<IOptions<AuthOptions>>()
+                .Setup(v => v.Value)
+                .Returns(new AuthOptions());
+
+            Mocker.GetMock<IOptions<AppOptions>>()
+                .Setup(v => v.Value)
+                .Returns(new AppOptions());
+
+            Mocker.GetMock<IOptions<ServerOptions>>()
+                .Setup(v => v.Value)
+                .Returns(new ServerOptions());
+
+            Mocker.GetMock<IOptions<LogOptions>>()
+                .Setup(v => v.Value)
+                .Returns(new LogOptions());
+
+            Mocker.GetMock<IOptions<UpdateOptions>>()
+                .Setup(v => v.Value)
+                .Returns(new UpdateOptions());
         }
 
         [Test]

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

@@ -18,6 +18,8 @@ namespace NzbDrone.Common.Test.InstrumentationTests
         [TestCase(@"https://baconbits.org/feeds.php?feed=torrents_tv&user=12345&auth=2b51db35e1910123321025a12b9933d2&passkey=mySecret&authkey=2b51db35e1910123321025a12b9933d2")]
         [TestCase(@"http://127.0.0.1:9117/dl/indexername?jackett_apikey=flwjiefewklfjacketmySecretsdfldskjfsdlk&path=we0re9f0sdfbase64sfdkfjsdlfjk&file=The+Torrent+File+Name.torrent")]
         [TestCase(@"http://nzb.su/getnzb/2b51db35e1912ffc138825a12b9933d2.nzb&i=37292&r=2b51db35e1910123321025a12b9933d2")]
+        [TestCase(@"https://b-hd.me/torrent/download/auto.343756.is1t1pl127p1sfwur8h4kgyhg1wcsn05")]
+        [TestCase(@"https://b-hd.me/torrent/download/a-slug-in-the-url.343756.is1t1pl127p1sfwur8h4kgyhg1wcsn05")]
 
         // NzbGet
         [TestCase(@"{ ""Name"" : ""ControlUsername"", ""Value"" : ""mySecret"" }, { ""Name"" : ""ControlPassword"", ""Value"" : ""mySecret"" }, ")]

src/NzbDrone.Common.Test/PathExtensionFixture.cs

@@ -3,6 +3,7 @@ using System.IO;
 using FluentAssertions;
 using Moq;
 using NUnit.Framework;
+using NzbDrone.Common.Disk;
 using NzbDrone.Common.EnvironmentInfo;
 using NzbDrone.Common.Extensions;
 using NzbDrone.Test.Common;
@@ -34,7 +35,7 @@ namespace NzbDrone.Common.Test
         [TestCase(@"\\Testserver\\Test\", @"\\Testserver\Test")]
         [TestCase(@"\\Testserver\Test\file.ext", @"\\Testserver\Test\file.ext")]
         [TestCase(@"\\Testserver\Test\file.ext\\", @"\\Testserver\Test\file.ext")]
-        [TestCase(@"\\Testserver\Test\file.ext   \\", @"\\Testserver\Test\file.ext")]
+        [TestCase(@"\\Testserver\Test\file.ext   ", @"\\Testserver\Test\file.ext")]
         [TestCase(@"//CAPITAL//lower// ", @"\\CAPITAL\lower")]
         public void Clean_Path_Windows(string dirty, string clean)
         {
@@ -335,5 +336,30 @@ namespace NzbDrone.Common.Test
             result[2].Should().Be(@"TV");
             result[3].Should().Be(@"Series Title");
         }
+
+        [TestCase(@"C:\Test\")]
+        [TestCase(@"C:\Test")]
+        [TestCase(@"C:\Test\TV\")]
+        [TestCase(@"C:\Test\TV")]
+        public void IsPathValid_should_be_true(string path)
+        {
+            path.AsOsAgnostic().IsPathValid(PathValidationType.CurrentOs).Should().BeTrue();
+        }
+
+        [TestCase(@"C:\Test \")]
+        [TestCase(@"C:\Test ")]
+        [TestCase(@"C:\ Test\")]
+        [TestCase(@"C:\ Test")]
+        [TestCase(@"C:\Test \TV")]
+        [TestCase(@"C:\ Test\TV")]
+        [TestCase(@"C:\Test \TV\")]
+        [TestCase(@"C:\ Test\TV\")]
+        [TestCase(@" C:\Test\TV\")]
+        [TestCase(@" C:\Test\TV")]
+
+        public void IsPathValid_should_be_false(string path)
+        {
+            path.AsOsAgnostic().IsPathValid(PathValidationType.CurrentOs).Should().BeFalse();
+        }
     }
 }

src/NzbDrone.Common.Test/ServiceFactoryFixture.cs

@@ -10,6 +10,7 @@ using NUnit.Framework;
 using NzbDrone.Common.Composition.Extensions;
 using NzbDrone.Common.EnvironmentInfo;
 using NzbDrone.Common.Instrumentation.Extensions;
+using NzbDrone.Common.Options;
 using NzbDrone.Core.Datastore;
 using NzbDrone.Core.Datastore.Extensions;
 using NzbDrone.Core.Lifecycle;
@@ -33,6 +34,11 @@ namespace NzbDrone.Common.Test
 
             container.RegisterInstance(new Mock<IHostLifetime>().Object);
             container.RegisterInstance(new Mock<IOptions<PostgresOptions>>().Object);
+            container.RegisterInstance(new Mock<IOptions<AppOptions>>().Object);
+            container.RegisterInstance(new Mock<IOptions<AuthOptions>>().Object);
+            container.RegisterInstance(new Mock<IOptions<ServerOptions>>().Object);
+            container.RegisterInstance(new Mock<IOptions<LogOptions>>().Object);
+            container.RegisterInstance(new Mock<IOptions<UpdateOptions>>().Object);
 
             var serviceProvider = container.GetServiceProvider();
 

src/NzbDrone.Common/Extensions/PathExtensions.cs

@@ -29,6 +29,12 @@ namespace NzbDrone.Common.Extensions
 
         public static string CleanFilePath(this string path)
         {
+            if (path.IsNotNullOrWhiteSpace())
+            {
+                // Trim trailing spaces before checking if the path is valid so validation doesn't fail for something we can fix.
+                path = path.TrimEnd(' ');
+            }
+
             Ensure.That(path, () => path).IsNotNullOrWhiteSpace();
             Ensure.That(path, () => path).IsValidPath(PathValidationType.AnyOs);
 
@@ -37,10 +43,10 @@ namespace NzbDrone.Common.Extensions
             // UNC
             if (!info.FullName.Contains('/') && info.FullName.StartsWith(@"\\"))
             {
-                return info.FullName.TrimEnd('/', '\\', ' ');
+                return info.FullName.TrimEnd('/', '\\');
             }
 
-            return info.FullName.TrimEnd('/').Trim('\\', ' ');
+            return info.FullName.TrimEnd('/').Trim('\\');
         }
 
         public static bool PathNotEquals(this string firstPath, string secondPath, StringComparison? comparison = null)
@@ -154,6 +160,23 @@ namespace NzbDrone.Common.Extensions
                 return false;
             }
 
+            if (path.Trim() != path)
+            {
+                return false;
+            }
+
+            var directoryInfo = new DirectoryInfo(path);
+
+            while (directoryInfo != null)
+            {
+                if (directoryInfo.Name.Trim() != directoryInfo.Name)
+                {
+                    return false;
+                }
+
+                directoryInfo = directoryInfo.Parent;
+            }
+
             if (validationType == PathValidationType.AnyOs)
             {
                 return IsPathValidForWindows(path) || IsPathValidForNonWindows(path);
@@ -291,6 +314,11 @@ namespace NzbDrone.Common.Extensions
             return processName;
         }
 
+        public static string CleanPath(this string path)
+        {
+            return Path.Join(path.Split(Path.DirectorySeparatorChar).Select(s => s.Trim()).ToArray());
+        }
+
         public static string GetAppDataPath(this IAppFolderInfo appFolderInfo)
         {
             return appFolderInfo.AppDataFolder;

src/NzbDrone.Common/Http/Dispatchers/ManagedHttpDispatcher.cs

@@ -9,6 +9,7 @@ using System.Net.Sockets;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
+using NLog;
 using NzbDrone.Common.Cache;
 using NzbDrone.Common.Extensions;
 using NzbDrone.Common.Http.Proxy;
@@ -30,11 +31,14 @@ namespace NzbDrone.Common.Http.Dispatchers
         private readonly ICached<System.Net.Http.HttpClient> _httpClientCache;
         private readonly ICached<CredentialCache> _credentialCache;
 
+        private readonly Logger _logger;
+
         public ManagedHttpDispatcher(IHttpProxySettingsProvider proxySettingsProvider,
             ICreateManagedWebProxy createManagedWebProxy,
             ICertificateValidationService certificateValidationService,
             IUserAgentBuilder userAgentBuilder,
-            ICacheManager cacheManager)
+            ICacheManager cacheManager,
+            Logger logger)
         {
             _proxySettingsProvider = proxySettingsProvider;
             _createManagedWebProxy = createManagedWebProxy;
@@ -43,6 +47,8 @@ namespace NzbDrone.Common.Http.Dispatchers
 
             _httpClientCache = cacheManager.GetCache<System.Net.Http.HttpClient>(typeof(ManagedHttpDispatcher));
             _credentialCache = cacheManager.GetCache<CredentialCache>(typeof(ManagedHttpDispatcher), "credentialcache");
+
+            _logger = logger;
         }
 
         public async Task<HttpResponse> GetResponseAsync(HttpRequest request, CookieContainer cookies)
@@ -249,19 +255,27 @@ namespace NzbDrone.Common.Http.Dispatchers
             return _credentialCache.Get("credentialCache", () => new CredentialCache());
         }
 
-        private static bool HasRoutableIPv4Address()
+        private bool HasRoutableIPv4Address()
         {
             // Get all IPv4 addresses from all interfaces and return true if there are any with non-loopback addresses
-            var networkInterfaces = NetworkInterface.GetAllNetworkInterfaces();
+            try
+            {
+                var networkInterfaces = NetworkInterface.GetAllNetworkInterfaces();
 
-            return networkInterfaces.Any(ni =>
-                ni.OperationalStatus == OperationalStatus.Up &&
-                ni.GetIPProperties().UnicastAddresses.Any(ip =>
-                    ip.Address.AddressFamily == AddressFamily.InterNetwork &&
-                    !IPAddress.IsLoopback(ip.Address)));
+                return networkInterfaces.Any(ni =>
+                    ni.OperationalStatus == OperationalStatus.Up &&
+                    ni.GetIPProperties().UnicastAddresses.Any(ip =>
+                        ip.Address.AddressFamily == AddressFamily.InterNetwork &&
+                        !IPAddress.IsLoopback(ip.Address)));
+            }
+            catch (Exception e)
+            {
+                _logger.Debug(e, "Caught exception while GetAllNetworkInterfaces assuming IPv4 connectivity: {0}", e.Message);
+                return true;
+            }
         }
 
-        private static async ValueTask<Stream> onConnect(SocketsHttpConnectionContext context, CancellationToken cancellationToken)
+        private async ValueTask<Stream> onConnect(SocketsHttpConnectionContext context, CancellationToken cancellationToken)
         {
             // Until .NET supports an implementation of Happy Eyeballs (https://tools.ietf.org/html/rfc8305#section-2), let's make IPv4 fallback work in a simple way.
             // This issue is being tracked at https://github.com/dotnet/runtime/issues/26177 and expected to be fixed in .NET 6.
@@ -285,7 +299,9 @@ namespace NzbDrone.Common.Http.Dispatchers
                 catch
                 {
                     // Do not retry IPv6 if a routable IPv4 address is available, otherwise continue to attempt IPv6 connections.
-                    useIPv6 = !HasRoutableIPv4Address();
+                    var routableIPv4 = HasRoutableIPv4Address();
+                    _logger.Info("IPv4 is available: {0}, IPv6 will be {1}", routableIPv4, routableIPv4 ? "disabled" : "left enabled");
+                    useIPv6 = !routableIPv4;
                 }
                 finally
                 {

src/NzbDrone.Common/Instrumentation/CleanseLogMessage.cs

@@ -18,6 +18,7 @@ namespace NzbDrone.Common.Instrumentation
             new (@"/fetch/[a-z0-9]{32}/(?<secret>[a-z0-9]{32})", RegexOptions.Compiled),
             new (@"getnzb.*?(?<=\?|&)(r)=(?<secret>[^&=]+?)(?= |&|$)", RegexOptions.Compiled | RegexOptions.IgnoreCase),
             new (@"\b(\w*)?(_?(?<!use|get_)token|username|passwo?rd)=(?<secret>[^&=]+?)(?= |&|$|;)", RegexOptions.Compiled | RegexOptions.IgnoreCase),
+            new (@"-hd.me/torrent/[a-z0-9-]\.[0-9]+\.(?<secret>[0-9a-z]+)", RegexOptions.Compiled | RegexOptions.IgnoreCase),
 
             // Trackers Announce Keys; Designed for Qbit Json; should work for all in theory
             new (@"announce(\.php)?(/|%2f|%3fpasskey%3d)(?<secret>[a-z0-9]{16,})|(?<secret>[a-z0-9]{16,})(/|%2f)announce", RegexOptions.Compiled | RegexOptions.IgnoreCase),

src/NzbDrone.Common/Options/AppOptions.cs

@@ -0,0 +1,8 @@
+namespace NzbDrone.Common.Options;
+
+public class AppOptions
+{
+    public string InstanceName { get; set; }
+    public string Theme { get; set; }
+    public bool? LaunchBrowser { get; set; }
+}

src/NzbDrone.Common/Options/AuthOptions.cs

@@ -0,0 +1,9 @@
+namespace NzbDrone.Common.Options;
+
+public class AuthOptions
+{
+    public string ApiKey { get; set; }
+    public bool? Enabled { get; set; }
+    public string Method { get; set; }
+    public string Required { get; set; }
+}

src/NzbDrone.Common/Options/LogOptions.cs

@@ -0,0 +1,14 @@
+namespace NzbDrone.Common.Options;
+
+public class LogOptions
+{
+    public string Level { get; set; }
+    public bool? FilterSentryEvents { get; set; }
+    public int? Rotate { get; set; }
+    public bool? Sql { get; set; }
+    public string ConsoleLevel { get; set; }
+    public bool? AnalyticsEnabled { get; set; }
+    public string SyslogServer { get; set; }
+    public int? SyslogPort { get; set; }
+    public string SyslogLevel { get; set; }
+}

src/NzbDrone.Common/Options/ServerOptions.cs

@@ -0,0 +1,12 @@
+namespace NzbDrone.Common.Options;
+
+public class ServerOptions
+{
+    public string UrlBase { get; set; }
+    public string BindAddress { get; set; }
+    public int? Port { get; set; }
+    public bool? EnableSsl { get; set; }
+    public int? SslPort { get; set; }
+    public string SslCertPath { get; set; }
+    public string SslCertPassword { get; set; }
+}

src/NzbDrone.Common/Options/UpdateOptions.cs

@@ -0,0 +1,9 @@
+namespace NzbDrone.Common.Options;
+
+public class UpdateOptions
+{
+    public string Mechanism { get; set; }
+    public bool? Automatically { get; set; }
+    public string ScriptPath { get; set; }
+    public string Branch { get; set; }
+}

src/NzbDrone.Common/Sonarr.Common.csproj

@@ -4,16 +4,16 @@
     <DefineConstants Condition="'$(RuntimeIdentifier)' == 'linux-musl-x64' or '$(RuntimeIdentifier)' == 'linux-musl-arm64'">ISMUSL</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="DryIoc.dll" Version="5.4.1" />
+    <PackageReference Include="DryIoc.dll" Version="5.4.3" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.1" />
-    <PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="6.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="6.0.2" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="NLog" Version="4.7.14" />
     <PackageReference Include="NLog.Targets.Syslog" Version="6.0.3" />
     <PackageReference Include="NLog.Extensions.Logging" Version="1.7.4" />
     <PackageReference Include="Sentry" Version="4.0.2" />
     <PackageReference Include="SharpZipLib" Version="1.4.2" />
-    <PackageReference Include="System.Text.Json" Version="6.0.8" />
+    <PackageReference Include="System.Text.Json" Version="6.0.9" />
     <PackageReference Include="System.ValueTuple" Version="4.5.0" />
     <PackageReference Include="System.Data.SQLite.Core.Servarr" Version="1.0.115.5-18" />
     <PackageReference Include="System.Configuration.ConfigurationManager" Version="6.0.1" />

src/NzbDrone.Core.Test/Download/DownloadClientTests/QBittorrentTests/QBittorrentFixture.cs

@@ -108,7 +108,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.QBittorrentTests
             Subject.Definition.Settings.As<QBittorrentSettings>().RecentTvPriority = (int)QBittorrentPriority.First;
         }
 
-        protected void GivenGlobalSeedLimits(float maxRatio, int maxSeedingTime = -1, QBittorrentMaxRatioAction maxRatioAction = QBittorrentMaxRatioAction.Pause)
+        protected void GivenGlobalSeedLimits(float maxRatio, int maxSeedingTime = -1, int maxInactiveSeedingTime = -1, QBittorrentMaxRatioAction maxRatioAction = QBittorrentMaxRatioAction.Pause)
         {
             Mocker.GetMock<IQBittorrentProxy>()
                   .Setup(s => s.GetConfig(It.IsAny<QBittorrentSettings>()))
@@ -118,7 +118,9 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.QBittorrentTests
                       MaxRatio = maxRatio,
                       MaxRatioEnabled = maxRatio >= 0,
                       MaxSeedingTime = maxSeedingTime,
-                      MaxSeedingTimeEnabled = maxSeedingTime >= 0
+                      MaxSeedingTimeEnabled = maxSeedingTime >= 0,
+                      MaxInactiveSeedingTime = maxInactiveSeedingTime,
+                      MaxInactiveSeedingTimeEnabled = maxInactiveSeedingTime >= 0
                   });
         }
 
@@ -610,7 +612,9 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.QBittorrentTests
             float ratio = 0.1f,
             float ratioLimit = -2,
             int seedingTime = 1,
-            int seedingTimeLimit = -2)
+            int seedingTimeLimit = -2,
+            int inactiveSeedingTimeLimit = -2,
+            long lastActivity = -1)
         {
             var torrent = new QBittorrentTorrent
             {
@@ -624,7 +628,9 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.QBittorrentTests
                 SavePath = "",
                 Ratio = ratio,
                 RatioLimit = ratioLimit,
-                SeedingTimeLimit = seedingTimeLimit
+                SeedingTimeLimit = seedingTimeLimit,
+                InactiveSeedingTimeLimit = inactiveSeedingTimeLimit,
+                LastActivity = lastActivity == -1 ? DateTimeOffset.UtcNow.ToUnixTimeSeconds() : lastActivity
             };
 
             GivenTorrents(new List<QBittorrentTorrent>() { torrent });
@@ -739,6 +745,50 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.QBittorrentTests
             item.CanMoveFiles.Should().BeFalse();
         }
 
+        [Test]
+        public void should_not_be_removable_and_should_not_allow_move_files_if_max_inactive_seedingtime_reached_and_not_paused()
+        {
+            GivenGlobalSeedLimits(-1, maxInactiveSeedingTime: 20);
+            GivenCompletedTorrent("uploading", ratio: 2.0f, lastActivity: DateTimeOffset.UtcNow.Subtract(TimeSpan.FromMinutes(25)).ToUnixTimeSeconds());
+
+            var item = Subject.GetItems().Single();
+            item.CanBeRemoved.Should().BeFalse();
+            item.CanMoveFiles.Should().BeFalse();
+        }
+
+        [Test]
+        public void should_be_removable_and_should_allow_move_files_if_max_inactive_seedingtime_reached_and_paused()
+        {
+            GivenGlobalSeedLimits(-1, maxInactiveSeedingTime: 20);
+            GivenCompletedTorrent("pausedUP", ratio: 2.0f, lastActivity: DateTimeOffset.UtcNow.Subtract(TimeSpan.FromMinutes(25)).ToUnixTimeSeconds());
+
+            var item = Subject.GetItems().Single();
+            item.CanBeRemoved.Should().BeTrue();
+            item.CanMoveFiles.Should().BeTrue();
+        }
+
+        [Test]
+        public void should_be_removable_and_should_allow_move_files_if_overridden_max_inactive_seedingtime_reached_and_paused()
+        {
+            GivenGlobalSeedLimits(-1, maxInactiveSeedingTime: 40);
+            GivenCompletedTorrent("pausedUP", ratio: 2.0f, seedingTime: 20, inactiveSeedingTimeLimit: 10, lastActivity: DateTimeOffset.UtcNow.Subtract(TimeSpan.FromMinutes(15)).ToUnixTimeSeconds());
+
+            var item = Subject.GetItems().Single();
+            item.CanBeRemoved.Should().BeTrue();
+            item.CanMoveFiles.Should().BeTrue();
+        }
+
+        [Test]
+        public void should_not_be_removable_if_overridden_max_inactive_seedingtime_not_reached_and_paused()
+        {
+            GivenGlobalSeedLimits(-1, maxInactiveSeedingTime: 20);
+            GivenCompletedTorrent("pausedUP", ratio: 2.0f, seedingTime: 30, inactiveSeedingTimeLimit: 40, lastActivity: DateTimeOffset.UtcNow.Subtract(TimeSpan.FromMinutes(30)).ToUnixTimeSeconds());
+
+            var item = Subject.GetItems().Single();
+            item.CanBeRemoved.Should().BeFalse();
+            item.CanMoveFiles.Should().BeFalse();
+        }
+
         [Test]
         public void should_be_removable_and_should_allow_move_files_if_max_seedingtime_reached_but_ratio_not_and_paused()
         {
@@ -750,6 +800,17 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.QBittorrentTests
             item.CanMoveFiles.Should().BeTrue();
         }
 
+        [Test]
+        public void should_be_removable_and_should_allow_move_files_if_max_inactive_seedingtime_reached_but_ratio_not_and_paused()
+        {
+            GivenGlobalSeedLimits(2.0f, maxInactiveSeedingTime: 20);
+            GivenCompletedTorrent("pausedUP", ratio: 1.0f, lastActivity: DateTimeOffset.UtcNow.Subtract(TimeSpan.FromMinutes(25)).ToUnixTimeSeconds());
+
+            var item = Subject.GetItems().Single();
+            item.CanBeRemoved.Should().BeTrue();
+            item.CanMoveFiles.Should().BeTrue();
+        }
+
         [Test]
         public void should_not_fetch_details_twice()
         {

src/NzbDrone.Core.Test/Framework/CoreTest.cs

@@ -25,7 +25,7 @@ namespace NzbDrone.Core.Test.Framework
             Mocker.SetConstant<IHttpProxySettingsProvider>(new HttpProxySettingsProvider(Mocker.Resolve<ConfigService>()));
             Mocker.SetConstant<ICreateManagedWebProxy>(new ManagedWebProxyFactory(Mocker.Resolve<CacheManager>()));
             Mocker.SetConstant<ICertificateValidationService>(new X509CertificateValidationService(Mocker.Resolve<ConfigService>(), TestLogger));
-            Mocker.SetConstant<IHttpDispatcher>(new ManagedHttpDispatcher(Mocker.Resolve<IHttpProxySettingsProvider>(), Mocker.Resolve<ICreateManagedWebProxy>(), Mocker.Resolve<ICertificateValidationService>(), Mocker.Resolve<UserAgentBuilder>(), Mocker.Resolve<CacheManager>()));
+            Mocker.SetConstant<IHttpDispatcher>(new ManagedHttpDispatcher(Mocker.Resolve<IHttpProxySettingsProvider>(), Mocker.Resolve<ICreateManagedWebProxy>(), Mocker.Resolve<ICertificateValidationService>(), Mocker.Resolve<UserAgentBuilder>(), Mocker.Resolve<CacheManager>(), TestLogger));
             Mocker.SetConstant<IHttpClient>(new HttpClient(Array.Empty<IHttpRequestInterceptor>(), Mocker.Resolve<CacheManager>(), Mocker.Resolve<RateLimitService>(), Mocker.Resolve<IHttpDispatcher>(), TestLogger));
             Mocker.SetConstant<ISonarrCloudRequestBuilder>(new SonarrCloudRequestBuilder());
         }

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

@@ -1,6 +1,9 @@
+using System.Collections.Generic;
 using FizzWare.NBuilder;
 using FluentAssertions;
 using NUnit.Framework;
+using NzbDrone.Core.AutoTagging;
+using NzbDrone.Core.AutoTagging.Specifications;
 using NzbDrone.Core.Housekeeping.Housekeepers;
 using NzbDrone.Core.Profiles.Releases;
 using NzbDrone.Core.Tags;
@@ -45,5 +48,35 @@ namespace NzbDrone.Core.Test.Housekeeping.Housekeepers
             Subject.Clean();
             AllStoredModels.Should().HaveCount(1);
         }
+
+        [Test]
+        public void should_not_delete_used_auto_tagging_tag_specification_tags()
+        {
+            var tags = Builder<Tag>
+                .CreateListOfSize(2)
+                .All()
+                .With(x => x.Id = 0)
+                .BuildList();
+            Db.InsertMany(tags);
+
+            var autoTags = Builder<AutoTag>.CreateListOfSize(1)
+                .All()
+                .With(x => x.Id = 0)
+                .With(x => x.Specifications = new List<IAutoTaggingSpecification>
+                {
+                    new TagSpecification
+                    {
+                        Name = "Test",
+                        Value = tags[0].Id
+                    }
+                })
+                .BuildList();
+
+            Mocker.GetMock<IAutoTaggingRepository>().Setup(s => s.All())
+                .Returns(autoTags);
+
+            Subject.Clean();
+            AllStoredModels.Should().HaveCount(1);
+        }
     }
 }

src/NzbDrone.Core.Test/ImportListTests/ImportListSyncServiceFixture.cs

@@ -120,6 +120,17 @@ namespace NzbDrone.Core.Test.ImportListTests
         private void WithImdbId()
         {
             _list1Series.First().ImdbId = "tt0496424";
+
+            Mocker.GetMock<ISearchForNewSeries>()
+                .Setup(s => s.SearchForNewSeriesByImdbId(_list1Series.First().ImdbId))
+                .Returns(
+                    Builder<Series>
+                        .CreateListOfSize(1)
+                        .All()
+                        .With(s => s.Title = "Breaking Bad")
+                        .With(s => s.TvdbId = 81189)
+                        .Build()
+                        .ToList());
         }
 
         private void WithExistingSeries()
@@ -342,6 +353,7 @@ namespace NzbDrone.Core.Test.ImportListTests
         public void should_add_new_series_from_single_list_to_library()
         {
             _importListFetch.Series.ForEach(m => m.ImportListId = 1);
+            WithTvdbId();
             WithList(1, true);
             WithCleanLevel(ListSyncLevelType.Disabled);
 
@@ -358,6 +370,7 @@ namespace NzbDrone.Core.Test.ImportListTests
             _importListFetch.Series.ForEach(m => m.ImportListId = 1);
             _importListFetch.Series.AddRange(_list2Series);
 
+            WithTvdbId();
             WithList(1, true);
             WithList(2, true);
 
@@ -376,6 +389,7 @@ namespace NzbDrone.Core.Test.ImportListTests
             _importListFetch.Series.ForEach(m => m.ImportListId = 1);
             _importListFetch.Series.AddRange(_list2Series);
 
+            WithTvdbId();
             WithList(1, true);
             WithList(2, false);
 
@@ -422,12 +436,17 @@ namespace NzbDrone.Core.Test.ImportListTests
         public void should_search_by_imdb_if_series_title_and_series_imdb()
         {
             _importListFetch.Series.ForEach(m => m.ImportListId = 1);
+
             WithList(1, true);
             WithImdbId();
+
             Subject.Execute(_commandAll);
 
             Mocker.GetMock<ISearchForNewSeries>()
                   .Verify(v => v.SearchForNewSeriesByImdbId(It.IsAny<string>()), Times.Once());
+
+            Mocker.GetMock<IAddSeriesService>()
+                .Verify(v => v.AddSeries(It.Is<List<Series>>(t => t.Count == 1), It.IsAny<bool>()));
         }
 
         [Test]
@@ -498,5 +517,18 @@ namespace NzbDrone.Core.Test.ImportListTests
             Mocker.GetMock<IImportListExclusionService>()
                 .Verify(v => v.All(), Times.Never);
         }
+
+        [Test]
+        public void should_not_add_if_tvdbid_is_0()
+        {
+            _importListFetch.Series.ForEach(m => m.ImportListId = 1);
+            WithList(1, true);
+            WithExcludedSeries();
+
+            Subject.Execute(_commandAll);
+
+            Mocker.GetMock<IAddSeriesService>()
+                .Verify(v => v.AddSeries(It.Is<List<Series>>(t => t.Count == 0), It.IsAny<bool>()));
+        }
     }
 }

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

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using NzbDrone.Core.Indexers;
 using NzbDrone.Core.Validation;
 
@@ -12,5 +13,7 @@ namespace NzbDrone.Core.Test.IndexerTests
         }
 
         public string BaseUrl { get; set; }
+
+        public IEnumerable<int> MultiLanguages { get; set; }
     }
 }

src/NzbDrone.Core.Test/MediaFiles/EpisodeImport/Aggregation/Aggregators/AggregateReleaseHashFixture.cs

@@ -0,0 +1,83 @@
+using FizzWare.NBuilder;
+using FluentAssertions;
+using NUnit.Framework;
+using NzbDrone.Core.MediaFiles.EpisodeImport.Aggregation.Aggregators;
+using NzbDrone.Core.Parser.Model;
+using NzbDrone.Core.Test.Framework;
+using NzbDrone.Core.Tv;
+using NzbDrone.Test.Common;
+
+namespace NzbDrone.Core.Test.MediaFiles.EpisodeImport.Aggregation.Aggregators
+{
+    [TestFixture]
+    public class AggregateReleaseHashFixture : CoreTest<AggregateReleaseHash>
+    {
+        private Series _series;
+
+        [SetUp]
+        public void Setup()
+        {
+            _series = Builder<Series>.CreateNew().Build();
+        }
+
+        [Test]
+        public void should_prefer_file()
+        {
+            var fileEpisodeInfo = Parser.Parser.ParseTitle("[DHD] Series Title! - 08 (1280x720 10bit AAC) [ABCDEFGH]");
+            var folderEpisodeInfo = Parser.Parser.ParseTitle("[DHD] Series Title! - 08 [12345678]");
+            var downloadClientEpisodeInfo = Parser.Parser.ParseTitle("[DHD] Series Title! - 08 (1280x720 10bit AAC) [ABCD1234]");
+            var localEpisode = new LocalEpisode
+            {
+                FileEpisodeInfo = fileEpisodeInfo,
+                FolderEpisodeInfo = folderEpisodeInfo,
+                DownloadClientEpisodeInfo = downloadClientEpisodeInfo,
+                Path = @"C:\Test\Unsorted TV\Series.Title.S01\Series.Title.S01E01.mkv".AsOsAgnostic(),
+                Series = _series
+            };
+
+            Subject.Aggregate(localEpisode, null);
+
+            localEpisode.ReleaseHash.Should().Be("ABCDEFGH");
+        }
+
+        [Test]
+        public void should_fallback_to_downloadclient()
+        {
+            var fileEpisodeInfo = Parser.Parser.ParseTitle("[DHD] Series Title! - 08 (1280x720 10bit AAC)");
+            var downloadClientEpisodeInfo = Parser.Parser.ParseTitle("[DHD] Series Title! - 08 (1280x720 10bit AAC) [ABCD1234]");
+            var folderEpisodeInfo = Parser.Parser.ParseTitle("[DHD] Series Title! - 08 [12345678]");
+            var localEpisode = new LocalEpisode
+            {
+                FileEpisodeInfo = fileEpisodeInfo,
+                FolderEpisodeInfo = folderEpisodeInfo,
+                DownloadClientEpisodeInfo = downloadClientEpisodeInfo,
+                Path = @"C:\Test\Unsorted TV\Series.Title.S01\Series.Title.S01E01.WEB-DL.mkv".AsOsAgnostic(),
+                Series = _series
+            };
+
+            Subject.Aggregate(localEpisode, null);
+
+            localEpisode.ReleaseHash.Should().Be("ABCD1234");
+        }
+
+        [Test]
+        public void should_fallback_to_folder()
+        {
+            var fileEpisodeInfo = Parser.Parser.ParseTitle("[DHD] Series Title! - 08 (1280x720 10bit AAC)");
+            var downloadClientEpisodeInfo = Parser.Parser.ParseTitle("[DHD] Series Title! - 08 (1280x720 10bit AAC)");
+            var folderEpisodeInfo = Parser.Parser.ParseTitle("[DHD] Series Title! - 08 [12345678]");
+            var localEpisode = new LocalEpisode
+            {
+                FileEpisodeInfo = fileEpisodeInfo,
+                FolderEpisodeInfo = folderEpisodeInfo,
+                DownloadClientEpisodeInfo = downloadClientEpisodeInfo,
+                Path = @"C:\Test\Unsorted TV\Series.Title.S01\Series.Title.S01E01.WEB-DL.mkv".AsOsAgnostic(),
+                Series = _series
+            };
+
+            Subject.Aggregate(localEpisode, null);
+
+            localEpisode.ReleaseHash.Should().Be("12345678");
+        }
+    }
+}

src/NzbDrone.Core.Test/MediaFiles/EpisodeImport/Aggregation/Aggregators/AggregateSubtitleInfoFixture.cs

@@ -9,13 +9,14 @@ namespace NzbDrone.Core.Test.MediaFiles.EpisodeImport.Aggregation.Aggregators
     [TestFixture]
     public class AggregateSubtitleInfoFixture : CoreTest<AggregateSubtitleInfo>
     {
-        [TestCase("Name (2020)/Season 1/Name (2020) - S01E20 - [AAC 2.0].mkv", "", "Name (2020) - S01E20 - [AAC 2.0].default.eng.forced.ass")]
-        [TestCase("Name (2020)/Season 1/Name (2020) - S01E20 - [AAC 2.0].mkv", "", "Name (2020) - S01E20 - [AAC 2.0].eng.default.ass")]
-        [TestCase("Name (2020)/Season 1/Name (2020) - S01E20 - [AAC 2.0].mkv", "", "Name (2020) - S01E20 - [AAC 2.0].fra.ass")]
-        [TestCase("", "Name (2020)/Season 1/Name (2020) - S01E20 - [AAC 2.0].mkv", "Name (2020) - S01E20 - [AAC 2.0].default.eng.forced.ass")]
-        [TestCase("", "Name (2020)/Season 1/Name (2020) - S01E20 - [AAC 2.0].mkv", "Name (2020) - S01E20 - [AAC 2.0].eng.default.ass")]
-        [TestCase("", "Name (2020)/Season 1/Name (2020) - S01E20 - [AAC 2.0].mkv", "Name (2020) - S01E20 - [AAC 2.0].fra.ass")]
-        public void should_do_basic_parse(string relativePath, string originalFilePath, string path)
+        [TestCase("Name (2020)/Season 1/Name (2020) - S01E20 - [AAC 2.0].mkv", "", "Name (2020) - S01E20 - [AAC 2.0].default.eng.forced.ass", null)]
+        [TestCase("Name (2020)/Season 1/Name (2020) - S01E20 - [AAC 2.0].mkv", "", "Name (2020) - S01E20 - [AAC 2.0].eng.default.ass", null)]
+        [TestCase("Name (2020)/Season 1/Name (2020) - S01E20 - [AAC 2.0].mkv", "", "Name (2020) - S01E20 - [AAC 2.0].fra.ass", null)]
+        [TestCase("Name (2020)/Season 1/Name (2020) - S01E20 - [AAC 5.1].mkv", "", "Name (2020) - S01E20 - [FLAC 2.0].fra.ass", "Name (2020)/Season 1/Name (2020) - S01E20 - [FLAC 2.0].mkv")]
+        [TestCase("", "Name (2020)/Season 1/Name (2020) - S01E20 - [AAC 2.0].mkv", "Name (2020) - S01E20 - [AAC 2.0].default.eng.forced.ass", null)]
+        [TestCase("", "Name (2020)/Season 1/Name (2020) - S01E20 - [AAC 2.0].mkv", "Name (2020) - S01E20 - [AAC 2.0].eng.default.ass", null)]
+        [TestCase("", "Name (2020)/Season 1/Name (2020) - S01E20 - [AAC 2.0].mkv", "Name (2020) - S01E20 - [AAC 2.0].fra.ass", null)]
+        public void should_do_basic_parse(string relativePath, string originalFilePath, string path, string fileNameBeforeRename)
         {
             var episodeFile = new EpisodeFile
             {
@@ -23,7 +24,7 @@ namespace NzbDrone.Core.Test.MediaFiles.EpisodeImport.Aggregation.Aggregators
                 OriginalFilePath = originalFilePath
             };
 
-            var subtitleTitleInfo = Subject.CleanSubtitleTitleInfo(episodeFile, path);
+            var subtitleTitleInfo = Subject.CleanSubtitleTitleInfo(episodeFile, path, fileNameBeforeRename);
 
             subtitleTitleInfo.Title.Should().BeNull();
             subtitleTitleInfo.Copy.Should().Be(0);
@@ -40,7 +41,7 @@ namespace NzbDrone.Core.Test.MediaFiles.EpisodeImport.Aggregation.Aggregators
                 RelativePath = relativePath
             };
 
-            var subtitleTitleInfo = Subject.CleanSubtitleTitleInfo(episodeFile, path);
+            var subtitleTitleInfo = Subject.CleanSubtitleTitleInfo(episodeFile, path, null);
 
             subtitleTitleInfo.LanguageTags.Should().NotContain("default");
         }

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

@@ -0,0 +1,146 @@
+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.Organizer;
+using NzbDrone.Core.Qualities;
+using NzbDrone.Core.Test.Framework;
+using NzbDrone.Core.Tv;
+
+namespace NzbDrone.Core.Test.OrganizerTests.FileNameBuilderTests
+{
+    [TestFixture]
+
+    public class CustomFormatsFixture : CoreTest<FileNameBuilder>
+    {
+        private Series _series;
+        private Episode _episode1;
+        private EpisodeFile _episodeFile;
+        private NamingConfig _namingConfig;
+
+        private List<CustomFormat> _customFormats;
+
+        [SetUp]
+        public void Setup()
+        {
+            _series = Builder<Series>
+                    .CreateNew()
+                    .With(s => s.Title = "South Park")
+                    .Build();
+
+            _namingConfig = NamingConfig.Default;
+            _namingConfig.RenameEpisodes = true;
+
+            Mocker.GetMock<INamingConfigService>()
+                  .Setup(c => c.GetConfig()).Returns(_namingConfig);
+
+            _episode1 = Builder<Episode>.CreateNew()
+                            .With(e => e.Title = "City Sushi")
+                            .With(e => e.SeasonNumber = 15)
+                            .With(e => e.EpisodeNumber = 6)
+                            .With(e => e.AbsoluteEpisodeNumber = 100)
+                            .Build();
+
+            _episodeFile = new EpisodeFile { Quality = new QualityModel(Quality.HDTV720p), ReleaseGroup = "SonarrTest" };
+
+            _customFormats = new List<CustomFormat>()
+            {
+                new CustomFormat()
+                {
+                    Name = "INTERNAL",
+                    IncludeCustomFormatWhenRenaming = true
+                },
+                new CustomFormat()
+                {
+                    Name = "AMZN",
+                    IncludeCustomFormatWhenRenaming = true
+                },
+                new CustomFormat()
+                {
+                    Name = "NAME WITH SPACES",
+                    IncludeCustomFormatWhenRenaming = true
+                },
+                new CustomFormat()
+                {
+                    Name = "NotIncludedFormat",
+                    IncludeCustomFormatWhenRenaming = false
+                }
+            };
+
+            Mocker.GetMock<IQualityDefinitionService>()
+                .Setup(v => v.Get(Moq.It.IsAny<Quality>()))
+                .Returns<Quality>(v => Quality.DefaultQualityDefinitions.First(c => c.Quality == v));
+        }
+
+        [TestCase("{Custom Formats}", "INTERNAL AMZN NAME WITH SPACES")]
+        public void should_replace_custom_formats(string format, string expected)
+        {
+            _namingConfig.StandardEpisodeFormat = format;
+
+            Subject.BuildFileName(new List<Episode> { _episode1 }, _series, _episodeFile, customFormats: _customFormats)
+                   .Should().Be(expected);
+        }
+
+        [TestCase("{Custom Formats}", "")]
+        public void should_replace_custom_formats_with_no_custom_formats(string format, string expected)
+        {
+            _namingConfig.StandardEpisodeFormat = format;
+
+            Subject.BuildFileName(new List<Episode> { _episode1 }, _series, _episodeFile, customFormats: new List<CustomFormat>())
+                   .Should().Be(expected);
+        }
+
+        [TestCase("{Custom Formats:-INTERNAL}", "AMZN NAME WITH SPACES")]
+        [TestCase("{Custom Formats:-NAME WITH SPACES}", "INTERNAL AMZN")]
+        [TestCase("{Custom Formats:-INTERNAL,NAME WITH SPACES}", "AMZN")]
+        [TestCase("{Custom Formats:INTERNAL}", "INTERNAL")]
+        [TestCase("{Custom Formats:NAME WITH SPACES}", "NAME WITH SPACES")]
+        [TestCase("{Custom Formats:INTERNAL,NAME WITH SPACES}", "INTERNAL NAME WITH SPACES")]
+        public void should_replace_custom_formats_with_filtered_names(string format, string expected)
+        {
+            _namingConfig.StandardEpisodeFormat = format;
+
+            Subject.BuildFileName(new List<Episode> { _episode1 }, _series, _episodeFile, customFormats: _customFormats)
+                   .Should().Be(expected);
+        }
+
+        [TestCase("{Custom Formats:-}", "{Custom Formats:-}")]
+        [TestCase("{Custom Formats:}", "{Custom Formats:}")]
+        public void should_not_replace_custom_formats_due_to_invalid_token(string format, string expected)
+        {
+            _namingConfig.StandardEpisodeFormat = format;
+
+            Subject.BuildFileName(new List<Episode> { _episode1 }, _series, _episodeFile, customFormats: _customFormats)
+                   .Should().Be(expected);
+        }
+
+        [TestCase("{Custom Format}", "")]
+        [TestCase("{Custom Format:INTERNAL}", "INTERNAL")]
+        [TestCase("{Custom Format:AMZN}", "AMZN")]
+        [TestCase("{Custom Format:NAME WITH SPACES}", "NAME WITH SPACES")]
+        [TestCase("{Custom Format:DOESNOTEXIST}", "")]
+        [TestCase("{Custom Format:INTERNAL} - {Custom Format:AMZN}", "INTERNAL - AMZN")]
+        [TestCase("{Custom Format:AMZN} - {Custom Format:INTERNAL}", "AMZN - INTERNAL")]
+        public void should_replace_custom_format(string format, string expected)
+        {
+            _namingConfig.StandardEpisodeFormat = format;
+
+            Subject.BuildFileName(new List<Episode> { _episode1 }, _series, _episodeFile, customFormats: _customFormats)
+                   .Should().Be(expected);
+        }
+
+        [TestCase("{Custom Format}", "")]
+        [TestCase("{Custom Format:INTERNAL}", "")]
+        [TestCase("{Custom Format:AMZN}", "")]
+        public void should_replace_custom_format_with_no_custom_formats(string format, string expected)
+        {
+            _namingConfig.StandardEpisodeFormat = format;
+
+            Subject.BuildFileName(new List<Episode> { _episode1 }, _series, _episodeFile, customFormats: new List<CustomFormat>())
+                   .Should().Be(expected);
+        }
+    }
+}

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

@@ -991,6 +991,28 @@ namespace NzbDrone.Core.Test.OrganizerTests.FileNameBuilderTests
             result.Should().EndWith("HDR");
         }
 
+        [Test]
+        public void should_replace_release_hash_with_stored_hash()
+        {
+            _namingConfig.StandardEpisodeFormat = "{Release Hash}";
+
+            _episodeFile.ReleaseHash = "ABCDEFGH";
+
+            Subject.BuildFileName(new List<Episode> { _episode1 }, _series, _episodeFile)
+                   .Should().Be("ABCDEFGH");
+        }
+
+        [Test]
+        public void should_replace_null_release_hash_with_empty_string()
+        {
+            _namingConfig.StandardEpisodeFormat = "{Release Hash}";
+
+            _episodeFile.ReleaseHash = null;
+
+            Subject.BuildFileName(new List<Episode> { _episode1 }, _series, _episodeFile)
+                   .Should().Be(string.Empty);
+        }
+
         private void GivenMediaInfoModel(string videoCodec = "h264",
                                          string audioCodec = "dts",
                                          int audioChannels = 6,

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

@@ -132,6 +132,9 @@ namespace NzbDrone.Core.Test.ParserTests
         [TestCase("[Naruto-Kun.Hu] Dr Series S3 - 21 [1080p]", "Dr Series S3", 21, 0, 0)]
         [TestCase("[Naruto-Kun.Hu] Series Title - 12 [1080p].mkv", "Series Title", 12, 0, 0)]
         [TestCase("[Naruto-Kun.Hu] Anime Triangle - 08 [1080p].mkv", "Anime Triangle", 8, 0, 0)]
+        [TestCase("[Mystic Z-Team] Series Title Super - Episode 013 VF - Non-censuré [720p].mp4", "Series Title Super", 13, 0, 0)]
+        [TestCase("Series Title Kai Episodio 13 Audio Latino", "Series Title Kai", 13, 0, 0)]
+        [TestCase("Series_Title_2_[01]_[AniLibria_TV]_[WEBRip_1080p]", "Series Title 2", 1, 0, 0)]
 
         // [TestCase("", "", 0, 0, 0)]
         public void should_parse_absolute_numbers(string postTitle, string title, int absoluteEpisodeNumber, int seasonNumber, int episodeNumber)
@@ -177,6 +180,7 @@ namespace NzbDrone.Core.Test.ParserTests
         [TestCase("[Erai-raws] Series-Title! 2 - 01~10 [1080p][Multiple Subtitle]", "Series-Title! 2", 1, 10)]
         [TestCase("[Erai-raws] Series Title! - 01 ~ 10 [1080p][Multiple Subtitle]", "Series Title!", 1, 10)]
         [TestCase("[Erai-raws] Series-Title! 2 - 01 ~ 10 [1080p][Multiple Subtitle]", "Series-Title! 2", 1, 10)]
+        [TestCase("Series_Title_2_[01-05]_[AniLibria_TV]_[WEBRip_1080p]", "Series Title 2", 1, 5)]
 
         // [TestCase("", "", 1, 2)]
         public void should_parse_multi_episode_absolute_numbers(string postTitle, string title, int firstAbsoluteEpisodeNumber, int lastAbsoluteEpisodeNumber)

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

@@ -22,12 +22,42 @@ namespace NzbDrone.Core.Test.ParserTests
         [TestCase("Series Title - 031 - The Resolution to Kill [Lunar].avi", "Lunar", "")]
         [TestCase("[ACX]Series Title 01 Episode Name [Kosaka] [9C57891E].mkv", "ACX", "9C57891E")]
         [TestCase("[S-T-D] Series Title! - 06 (1280x720 10bit AAC) [59B3F2EA].mkv", "S-T-D", "59B3F2EA")]
-        public void should_parse_absolute_numbers(string postTitle, string subGroup, string hash)
+
+        // These tests are dupes of the above, except with parenthesized hashes instead of square bracket
+        [TestCase("[SubDESU]_Show_Title_DxD_07_(1280x720_x264-AAC)_(6B7FD717)", "SubDESU", "6B7FD717")]
+        [TestCase("[Chihiro]_Show_Title!!_-_06_[848x480_H.264_AAC](859EEAFA)", "Chihiro", "859EEAFA")]
+        [TestCase("[Underwater]_Show_Title_-_12_(720p)_(5C7BC4F9)", "Underwater", "5C7BC4F9")]
+        [TestCase("[HorribleSubs]_Show_Title_-_33_[720p]", "HorribleSubs", "")]
+        [TestCase("[HorribleSubs] Show-Title - 13 [1080p].mkv", "HorribleSubs", "")]
+        [TestCase("[Doremi].Show.Title.5.Go.Go!.31.[1280x720].(C65D4B1F).mkv", "Doremi", "C65D4B1F")]
+        [TestCase("[Doremi].Show.Title.5.Go.Go!.31[1280x720].(C65D4B1F)", "Doremi", "C65D4B1F")]
+        [TestCase("[Doremi].Show.Title.5.Go.Go!.31.[1280x720].mkv", "Doremi", "")]
+        [TestCase("[K-F] Series Title 214", "K-F", "")]
+        [TestCase("[K-F] Series Title S10E14 214", "K-F", "")]
+        [TestCase("[K-F] Series Title 10x14 214", "K-F", "")]
+        [TestCase("[K-F] Series Title 214 10x14", "K-F", "")]
+        [TestCase("Series Title - 031 - The Resolution to Kill [Lunar].avi", "Lunar", "")]
+        [TestCase("[ACX]Series Title 01 Episode Name [Kosaka] (9C57891E).mkv", "ACX", "9C57891E")]
+        [TestCase("[S-T-D] Series Title! - 06 (1280x720 10bit AAC) (59B3F2EA).mkv", "S-T-D", "59B3F2EA")]
+        public void should_parse_releasegroup_and_hash(string postTitle, string subGroup, string hash)
         {
             var result = Parser.Parser.ParseTitle(postTitle);
             result.Should().NotBeNull();
             result.ReleaseGroup.Should().Be(subGroup);
             result.ReleaseHash.Should().Be(hash);
         }
+
+        [TestCase("[DHD] Series Title! - 08 (1280x720 10bit AAC) [8B00F2EA].mkv", "8B00F2EA")]
+        [TestCase("[DHD] Series Title! - 10 (1280x720 10bit AAC) [10BBF2EA].mkv", "10BBF2EA")]
+        [TestCase("[DHD] Series Title! - 08 (1280x720 10bit AAC) [008BF28B].mkv", "008BF28B")]
+        [TestCase("[DHD] Series Title! - 10 (1280x720 10bit AAC) [000BF10B].mkv", "000BF10B")]
+        [TestCase("[DHD] Series Title! - 08 (1280x720 8bit AAC) [8B8BF2EA].mkv", "8B8BF2EA")]
+        [TestCase("[DHD] Series Title! - 10 (1280x720 8bit AAC) [10B10BEA].mkv", "10B10BEA")]
+        public void should_parse_release_hashes_with_10b_or_8b(string postTitle, string hash)
+        {
+            var result = Parser.Parser.ParseTitle(postTitle);
+            result.Should().NotBeNull();
+            result.ReleaseHash.Should().Be(hash);
+        }
     }
 }