Bump version to 4.0.7

Multiple Translations updated by Weblate
ignore-downstream Co-authored-by: Havok Dan <havokdan@yahoo.com.br> Co-authored-by: Lizandra Candido da Silva <lizandra.c.s@gmail.com> Co-authored-by: MattiaPell <mattiapellegrini16@gmail.com> Co-authored-by: Rauniik <raunerjakub@gmail.com> Co-authored-by: Weblate <noreply@weblate.org> Co-authored-by: fordas <fordas15@gmail.com> Translate-URL: https://translate.servarr.com/projects/servarr/sonarr/ Translate-URL: https://translate.servarr.com/projects/servarr/sonarr/cs/ Translate-URL: https://translate.servarr.com/projects/servarr/sonarr/es/ Translate-URL: https://translate.servarr.com/projects/servarr/sonarr/it/ Translate-URL: https://translate.servarr.com/projects/servarr/sonarr/pt_BR/ Translation: Servarr/Sonarr
2026-04-17 21:26:13 -04:00 · 2024-07-14 16:44:07 -07:00 · 2024-07-14 16:43:56 -07:00 · 2024-07-09 22:22:48 -07:00 · 2024-07-10 01:19:07 -04:00 · 2024-07-10 01:02:23 -04:00
309 changed files with 5016 additions and 1701 deletions
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -6,13 +6,13 @@ on:
      - develop
      - main
    paths-ignore:
-      - 'src/Sonarr.Api.*/openapi.json'
+      - "src/Sonarr.Api.*/openapi.json"
  pull_request:
    branches:
      - develop
    paths-ignore:
-      - 'src/NzbDrone.Core/Localization/Core/**'
-      - 'src/Sonarr.Api.*/openapi.json'
+      - "src/NzbDrone.Core/Localization/Core/**"
+      - "src/Sonarr.Api.*/openapi.json"

 concurrency:
  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
@@ -22,7 +22,7 @@ env:
  FRAMEWORK: net6.0
  RAW_BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
  SONARR_MAJOR_VERSION: 4
-  VERSION: 4.0.4
+  VERSION: 4.0.7

 jobs:
  backend:
@@ -32,105 +32,105 @@ jobs:
      major_version: ${{ steps.variables.outputs.major_version }}
      version: ${{ steps.variables.outputs.version }}
    steps:
-    - name: Check out
-      uses: actions/checkout@v4
+      - name: Check out
+        uses: actions/checkout@v4

-    - name: Setup .NET
-      uses: actions/setup-dotnet@v4
+      - name: Setup .NET
+        uses: actions/setup-dotnet@v4

-    - name: Setup Environment Variables
-      id: variables
-      shell: bash
-      run: |
-        # Add 800 to the build number because GitHub won't let us pick an arbitrary starting point
-        SONARR_VERSION="${{ env.VERSION }}.$((${{ github.run_number }}+800))"
-        DOTNET_VERSION=$(jq -r '.sdk.version' global.json)
+      - name: Setup Environment Variables
+        id: variables
+        shell: bash
+        run: |
+          # Add 800 to the build number because GitHub won't let us pick an arbitrary starting point
+          SONARR_VERSION="${{ env.VERSION }}.$((${{ github.run_number }}+800))"
+          DOTNET_VERSION=$(jq -r '.sdk.version' global.json)

-        echo "SDK_PATH=${{ env.DOTNET_ROOT }}/sdk/${DOTNET_VERSION}" >> "$GITHUB_ENV"
-        echo "SONARR_VERSION=$SONARR_VERSION" >> "$GITHUB_ENV"
-        echo "BRANCH=${RAW_BRANCH_NAME/\//-}" >> "$GITHUB_ENV"
+          echo "SDK_PATH=${{ env.DOTNET_ROOT }}/sdk/${DOTNET_VERSION}" >> "$GITHUB_ENV"
+          echo "SONARR_VERSION=$SONARR_VERSION" >> "$GITHUB_ENV"
+          echo "BRANCH=${RAW_BRANCH_NAME//\//-}" >> "$GITHUB_ENV"

-        echo "framework=${{ env.FRAMEWORK }}" >> "$GITHUB_OUTPUT"
-        echo "major_version=${{ env.SONARR_MAJOR_VERSION }}" >> "$GITHUB_OUTPUT"
-        echo "version=$SONARR_VERSION" >> "$GITHUB_OUTPUT"
+          echo "framework=${{ env.FRAMEWORK }}" >> "$GITHUB_OUTPUT"
+          echo "major_version=${{ env.SONARR_MAJOR_VERSION }}" >> "$GITHUB_OUTPUT"
+          echo "version=$SONARR_VERSION" >> "$GITHUB_OUTPUT"

-    - name: Enable Extra Platforms In SDK
-      shell: bash
-      run: ./build.sh --enable-extra-platforms-in-sdk
+      - name: Enable Extra Platforms In SDK
+        shell: bash
+        run: ./build.sh --enable-extra-platforms-in-sdk

-    - name: Build Backend
-      shell: bash
-      run: ./build.sh --backend --enable-extra-platforms --packages
+      - name: Build Backend
+        shell: bash
+        run: ./build.sh --backend --enable-extra-platforms --packages

-    # Test Artifacts
+      # Test Artifacts

-    - name: Publish win-x64 Test Artifact
-      uses: ./.github/actions/publish-test-artifact
-      with:
-        framework: ${{ env.FRAMEWORK }}
-        runtime: win-x64
+      - name: Publish win-x64 Test Artifact
+        uses: ./.github/actions/publish-test-artifact
+        with:
+          framework: ${{ env.FRAMEWORK }}
+          runtime: win-x64

-    - name: Publish linux-x64 Test Artifact
-      uses: ./.github/actions/publish-test-artifact
-      with:
-        framework: ${{ env.FRAMEWORK }}
-        runtime: linux-x64
+      - name: Publish linux-x64 Test Artifact
+        uses: ./.github/actions/publish-test-artifact
+        with:
+          framework: ${{ env.FRAMEWORK }}
+          runtime: linux-x64

-    - name: Publish osx-arm64 Test Artifact
-      uses: ./.github/actions/publish-test-artifact
-      with:
-        framework: ${{ env.FRAMEWORK }}
-        runtime: osx-arm64
+      - name: Publish osx-arm64 Test Artifact
+        uses: ./.github/actions/publish-test-artifact
+        with:
+          framework: ${{ env.FRAMEWORK }}
+          runtime: osx-arm64

-    # Build Artifacts (grouped by OS)
-    
-    - name: Publish FreeBSD Artifact
-      uses: actions/upload-artifact@v4
-      with:
-        name: build_freebsd
-        path: _artifacts/freebsd-*/**/*
-    - name: Publish Linux Artifact
-      uses: actions/upload-artifact@v4
-      with:
-        name: build_linux
-        path: _artifacts/linux-*/**/*
-    - name: Publish macOS Artifact
-      uses: actions/upload-artifact@v4
-      with:
-        name: build_macos
-        path: _artifacts/osx-*/**/*
-    - name: Publish Windows Artifact
-      uses: actions/upload-artifact@v4
-      with:
-        name: build_windows
-        path: _artifacts/win-*/**/*
+      # Build Artifacts (grouped by OS)
+
+      - name: Publish FreeBSD Artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: build_freebsd
+          path: _artifacts/freebsd-*/**/*
+      - name: Publish Linux Artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: build_linux
+          path: _artifacts/linux-*/**/*
+      - name: Publish macOS Artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: build_macos
+          path: _artifacts/osx-*/**/*
+      - name: Publish Windows Artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: build_windows
+          path: _artifacts/win-*/**/*

  frontend:
    runs-on: ubuntu-latest
    steps:
-    - name: Check out
-      uses: actions/checkout@v4
+      - name: Check out
+        uses: actions/checkout@v4

-    - name: Volta
-      uses: volta-cli/action@v4
+      - name: Volta
+        uses: volta-cli/action@v4

-    - name: Yarn Install
-      run: yarn install
+      - name: Yarn Install
+        run: yarn install

-    - name: Lint
-      run: yarn lint
+      - name: Lint
+        run: yarn lint

-    - name: Stylelint
-      run: yarn stylelint -f github
+      - name: Stylelint
+        run: yarn stylelint -f github

-    - name: Build
-      run: yarn build --env production
+      - name: Build
+        run: yarn build --env production

-    - name: Publish UI Artifact
-      uses: actions/upload-artifact@v4
-      with:
-        name: build_ui
-        path: _output/UI/**/*
+      - name: Publish UI Artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: build_ui
+          path: _output/UI/**/*

  unit_test:
    needs: backend
@@ -150,32 +150,32 @@ jobs:
            filter: TestCategory!=ManualTest&TestCategory!=LINUX&TestCategory!=IntegrationTest&TestCategory!=AutomationTest
    runs-on: ${{ matrix.os }}
    steps:
-    - name: Check out
-      uses: actions/checkout@v4
+      - name: Check out
+        uses: actions/checkout@v4

-    - name: Test
-      uses: ./.github/actions/test
-      with:
-        os: ${{ matrix.os }}
-        artifact: ${{ matrix.artifact }}
-        pattern: Sonarr.*.Test.dll
-        filter: ${{ matrix.filter }}
+      - name: Test
+        uses: ./.github/actions/test
+        with:
+          os: ${{ matrix.os }}
+          artifact: ${{ matrix.artifact }}
+          pattern: Sonarr.*.Test.dll
+          filter: ${{ matrix.filter }}

  unit_test_postgres:
    needs: backend
    runs-on: ubuntu-latest
    steps:
-    - name: Check out
-      uses: actions/checkout@v4
+      - name: Check out
+        uses: actions/checkout@v4

-    - name: Test
-      uses: ./.github/actions/test
-      with:
-        os: ubuntu-latest
-        artifact: tests-linux-x64
-        pattern: Sonarr.*.Test.dll
-        filter: TestCategory!=ManualTest&TestCategory!=WINDOWS&TestCategory!=IntegrationTest&TestCategory!=AutomationTest
-        use_postgres: true
+      - name: Test
+        uses: ./.github/actions/test
+        with:
+          os: ubuntu-latest
+          artifact: tests-linux-x64
+          pattern: Sonarr.*.Test.dll
+          filter: TestCategory!=ManualTest&TestCategory!=WINDOWS&TestCategory!=IntegrationTest&TestCategory!=AutomationTest
+          use_postgres: true

  integration_test:
    needs: backend
@@ -201,19 +201,19 @@ jobs:
            binary_path: win-x64/${{ needs.backend.outputs.framework }}/Sonarr
    runs-on: ${{ matrix.os }}
    steps:
-    - name: Check out
-      uses: actions/checkout@v4
+      - name: Check out
+        uses: actions/checkout@v4

-    - name: Test
-      uses: ./.github/actions/test
-      with:
-        os: ${{ matrix.os }}
-        artifact: ${{ matrix.artifact }}
-        pattern: Sonarr.*.Test.dll
-        filter: ${{ matrix.filter }}
-        integration_tests: true
-        binary_artifact: ${{ matrix.binary_artifact }}
-        binary_path: ${{ matrix.binary_path }}
+      - name: Test
+        uses: ./.github/actions/test
+        with:
+          os: ${{ matrix.os }}
+          artifact: ${{ matrix.artifact }}
+          pattern: Sonarr.*.Test.dll
+          filter: ${{ matrix.filter }}
+          integration_tests: true
+          binary_artifact: ${{ matrix.binary_artifact }}
+          binary_path: ${{ matrix.binary_path }}

  deploy:
    if: ${{ github.ref_name == 'develop' || github.ref_name == 'main' }}
@@ -228,7 +228,15 @@ jobs:

  notify:
    name: Discord Notification
-    needs: [backend, frontend, unit_test, unit_test_postgres, integration_test, deploy]
+    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' }}
@@ -239,10 +247,10 @@ jobs:
        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'
+          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-url: "https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}"
          embed-description: |
            **Branch** ${{ github.ref }}
            **Build** ${{ needs.backend.outputs.version }}
--- a/.github/workflows/labeler.yml
+++ b/.github/workflows/labeler.yml
@@ -8,5 +8,6 @@ jobs:
      contents: read
      pull-requests: write
    runs-on: ubuntu-latest
+    if: github.repository == 'Sonarr/Sonarr'
    steps:
      - uses: actions/labeler@v5
--- a/.github/workflows/lock.yml
+++ b/.github/workflows/lock.yml
@@ -8,6 +8,7 @@ on:
 jobs:
  lock:
    runs-on: ubuntu-latest
+    if: github.repository == 'Sonarr/Sonarr'
    steps:
      - uses: dessant/lock-threads@v5
        with:
--- a/docs.sh
+++ b/docs.sh
@@ -25,17 +25,23 @@ slnFile=src/Sonarr.sln

 platform=Posix

+if [ "$PLATFORM" = "Windows" ]; then
+  application=Sonarr.Console.dll
+else
+  application=Sonarr.dll
+fi
+
 dotnet clean $slnFile -c Debug
 dotnet clean $slnFile -c Release

 dotnet msbuild -restore $slnFile -p:Configuration=Debug -p:Platform=$platform -p:RuntimeIdentifiers=$RUNTIME -t:PublishAllRids

 dotnet new tool-manifest
-dotnet tool install --version 6.5.0 Swashbuckle.AspNetCore.Cli
+dotnet tool install --version 6.6.2 Swashbuckle.AspNetCore.Cli

-dotnet tool run swagger tofile --output ./src/Sonarr.Api.V3/openapi.json "$outputFolder/$FRAMEWORK/$RUNTIME/Sonarr.dll" v3 &
+dotnet tool run swagger tofile --output ./src/Sonarr.Api.V3/openapi.json "$outputFolder/$FRAMEWORK/$RUNTIME/$application" v3 &

-sleep 30
+sleep 45

 kill %1

--- a/frontend/src/Activity/Blocklist/Blocklist.js
+++ b/frontend/src/Activity/Blocklist/Blocklist.js
@@ -2,6 +2,7 @@ import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import Alert from 'Components/Alert';
 import LoadingIndicator from 'Components/Loading/LoadingIndicator';
+import FilterMenu from 'Components/Menu/FilterMenu';
 import ConfirmModal from 'Components/Modal/ConfirmModal';
 import PageContent from 'Components/Page/PageContent';
 import PageContentBody from 'Components/Page/PageContentBody';
@@ -20,6 +21,7 @@ import getSelectedIds from 'Utilities/Table/getSelectedIds';
 import removeOldSelectedState from 'Utilities/Table/removeOldSelectedState';
 import selectAll from 'Utilities/Table/selectAll';
 import toggleSelected from 'Utilities/Table/toggleSelected';
+import BlocklistFilterModal from './BlocklistFilterModal';
 import BlocklistRowConnector from './BlocklistRowConnector';

 class Blocklist extends Component {
@@ -114,9 +116,13 @@ class Blocklist extends Component {
      error,
      items,
      columns,
+      selectedFilterKey,
+      filters,
+      customFilters,
      totalRecords,
      isRemoving,
      isClearingBlocklistExecuting,
+      onFilterSelect,
      ...otherProps
    } = this.props;

@@ -161,6 +167,15 @@ class Blocklist extends Component {
                iconName={icons.TABLE}
              />
            </TableOptionsModalWrapper>
+
+            <FilterMenu
+              alignMenu={align.RIGHT}
+              selectedFilterKey={selectedFilterKey}
+              filters={filters}
+              customFilters={customFilters}
+              filterModalConnectorComponent={BlocklistFilterModal}
+              onFilterSelect={onFilterSelect}
+            />
          </PageToolbarSection>
        </PageToolbar>

@@ -180,7 +195,11 @@ class Blocklist extends Component {
          {
            isPopulated && !error && !items.length &&
              <Alert kind={kinds.INFO}>
-                {translate('NoHistoryBlocklist')}
+                {
+                  selectedFilterKey === 'all' ?
+                    translate('NoHistoryBlocklist') :
+                    translate('BlocklistFilterHasNoItems')
+                }
              </Alert>
          }

@@ -251,11 +270,15 @@ Blocklist.propTypes = {
  error: PropTypes.object,
  items: PropTypes.arrayOf(PropTypes.object).isRequired,
  columns: PropTypes.arrayOf(PropTypes.object).isRequired,
+  selectedFilterKey: PropTypes.oneOfType([PropTypes.string, PropTypes.number]).isRequired,
+  filters: PropTypes.arrayOf(PropTypes.object).isRequired,
+  customFilters: PropTypes.arrayOf(PropTypes.object).isRequired,
  totalRecords: PropTypes.number,
  isRemoving: PropTypes.bool.isRequired,
  isClearingBlocklistExecuting: PropTypes.bool.isRequired,
  onRemoveSelected: PropTypes.func.isRequired,
-  onClearBlocklistPress: PropTypes.func.isRequired
+  onClearBlocklistPress: PropTypes.func.isRequired,
+  onFilterSelect: PropTypes.func.isRequired
 };

 export default Blocklist;
--- a/frontend/src/Activity/Blocklist/BlocklistConnector.js
+++ b/frontend/src/Activity/Blocklist/BlocklistConnector.js
@@ -6,6 +6,7 @@ import * as commandNames from 'Commands/commandNames';
 import withCurrentPage from 'Components/withCurrentPage';
 import * as blocklistActions from 'Store/Actions/blocklistActions';
 import { executeCommand } from 'Store/Actions/commandActions';
+import { createCustomFiltersSelector } from 'Store/Selectors/createClientSideCollectionSelector';
 import createCommandExecutingSelector from 'Store/Selectors/createCommandExecutingSelector';
 import { registerPagePopulator, unregisterPagePopulator } from 'Utilities/pagePopulator';
 import Blocklist from './Blocklist';
@@ -13,10 +14,12 @@ import Blocklist from './Blocklist';
 function createMapStateToProps() {
  return createSelector(
    (state) => state.blocklist,
+    createCustomFiltersSelector('blocklist'),
    createCommandExecutingSelector(commandNames.CLEAR_BLOCKLIST),
-    (blocklist, isClearingBlocklistExecuting) => {
+    (blocklist, customFilters, isClearingBlocklistExecuting) => {
      return {
        isClearingBlocklistExecuting,
+        customFilters,
        ...blocklist
      };
    }
@@ -97,6 +100,10 @@ class BlocklistConnector extends Component {
    this.props.setBlocklistSort({ sortKey });
  };

+  onFilterSelect = (selectedFilterKey) => {
+    this.props.setBlocklistFilter({ selectedFilterKey });
+  };
+
  onClearBlocklistPress = () => {
    this.props.executeCommand({ name: commandNames.CLEAR_BLOCKLIST });
  };
@@ -122,6 +129,7 @@ class BlocklistConnector extends Component {
        onPageSelect={this.onPageSelect}
        onRemoveSelected={this.onRemoveSelected}
        onSortPress={this.onSortPress}
+        onFilterSelect={this.onFilterSelect}
        onTableOptionChange={this.onTableOptionChange}
        onClearBlocklistPress={this.onClearBlocklistPress}
        {...this.props}
@@ -142,6 +150,7 @@ BlocklistConnector.propTypes = {
  gotoBlocklistPage: PropTypes.func.isRequired,
  removeBlocklistItems: PropTypes.func.isRequired,
  setBlocklistSort: PropTypes.func.isRequired,
+  setBlocklistFilter: PropTypes.func.isRequired,
  setBlocklistTableOption: PropTypes.func.isRequired,
  clearBlocklist: PropTypes.func.isRequired,
  executeCommand: PropTypes.func.isRequired
--- a/frontend/src/Activity/Blocklist/BlocklistFilterModal.tsx
+++ b/frontend/src/Activity/Blocklist/BlocklistFilterModal.tsx
@@ -0,0 +1,54 @@
+import React, { useCallback } from 'react';
+import { useDispatch, useSelector } from 'react-redux';
+import { createSelector } from 'reselect';
+import AppState from 'App/State/AppState';
+import FilterModal from 'Components/Filter/FilterModal';
+import { setBlocklistFilter } from 'Store/Actions/blocklistActions';
+
+function createBlocklistSelector() {
+  return createSelector(
+    (state: AppState) => state.blocklist.items,
+    (blocklistItems) => {
+      return blocklistItems;
+    }
+  );
+}
+
+function createFilterBuilderPropsSelector() {
+  return createSelector(
+    (state: AppState) => state.blocklist.filterBuilderProps,
+    (filterBuilderProps) => {
+      return filterBuilderProps;
+    }
+  );
+}
+
+interface BlocklistFilterModalProps {
+  isOpen: boolean;
+}
+
+export default function BlocklistFilterModal(props: BlocklistFilterModalProps) {
+  const sectionItems = useSelector(createBlocklistSelector());
+  const filterBuilderProps = useSelector(createFilterBuilderPropsSelector());
+  const customFilterType = 'blocklist';
+
+  const dispatch = useDispatch();
+
+  const dispatchSetFilter = useCallback(
+    (payload: unknown) => {
+      dispatch(setBlocklistFilter(payload));
+    },
+    [dispatch]
+  );
+
+  return (
+    <FilterModal
+      // TODO: Don't spread all the props
+      {...props}
+      sectionItems={sectionItems}
+      filterBuilderProps={filterBuilderProps}
+      customFilterType={customFilterType}
+      dispatchSetFilter={dispatchSetFilter}
+    />
+  );
+}
--- a/frontend/src/Activity/History/HistoryRow.js
+++ b/frontend/src/Activity/History/HistoryRow.js
@@ -77,7 +77,7 @@ class HistoryRow extends Component {
      onMarkAsFailedPress
    } = this.props;

-    if (!episode) {
+    if (!series || !episode) {
      return null;
    }

--- a/frontend/src/Activity/Queue/Queue.js
+++ b/frontend/src/Activity/Queue/Queue.js
@@ -217,6 +217,7 @@ class Queue extends Component {
          >
            <TableOptionsModalWrapper
              columns={columns}
+              maxPageSize={200}
              {...otherProps}
              optionsComponent={QueueOptionsConnector}
            >
--- a/frontend/src/Activity/Queue/QueueStatus.js
+++ b/frontend/src/Activity/Queue/QueueStatus.js
@@ -70,6 +70,11 @@ function QueueStatus(props) {
    iconName = icons.DOWNLOADED;
    title = translate('Downloaded');

+    if (trackedDownloadState === 'importBlocked') {
+      title += ` - ${translate('UnableToImportAutomatically')}`;
+      iconKind = kinds.WARNING;
+    }
+
    if (trackedDownloadState === 'importPending') {
      title += ` - ${translate('WaitingToImport')}`;
      iconKind = kinds.PURPLE;
--- a/frontend/src/Activity/Queue/RemoveQueueItemModal.tsx
+++ b/frontend/src/Activity/Queue/RemoveQueueItemModal.tsx
@@ -118,6 +118,7 @@ function RemoveQueueItemModal(props: RemoveQueueItemModalProps) {
      {
        key: 'blocklistAndSearch',
        value: translate('BlocklistAndSearch'),
+        isDisabled: isPending,
        hint: multipleSelected
          ? translate('BlocklistAndSearchMultipleHint')
          : translate('BlocklistAndSearchHint'),
@@ -130,7 +131,7 @@ function RemoveQueueItemModal(props: RemoveQueueItemModalProps) {
          : translate('BlocklistOnlyHint'),
      },
    ];
-  }, [multipleSelected]);
+  }, [isPending, multipleSelected]);

  const handleRemovalMethodChange = useCallback(
    ({ value }: { value: RemovalMethod }) => {
--- a/frontend/src/Activity/Queue/TimeleftCell.js
+++ b/frontend/src/Activity/Queue/TimeleftCell.js
@@ -24,7 +24,11 @@ function TimeleftCell(props) {
  } = props;

  if (status === 'delay') {
-    const date = getRelativeDate(estimatedCompletionTime, shortDateFormat, showRelativeDates);
+    const date = getRelativeDate({
+      date: estimatedCompletionTime,
+      shortDateFormat,
+      showRelativeDates
+    });
    const time = formatTime(estimatedCompletionTime, timeFormat, { includeMinuteZero: true });

    return (
@@ -40,7 +44,11 @@ function TimeleftCell(props) {
  }

  if (status === 'downloadClientUnavailable') {
-    const date = getRelativeDate(estimatedCompletionTime, shortDateFormat, showRelativeDates);
+    const date = getRelativeDate({
+      date: estimatedCompletionTime,
+      shortDateFormat,
+      showRelativeDates
+    });
    const time = formatTime(estimatedCompletionTime, timeFormat, { includeMinuteZero: true });

    return (
--- a/frontend/src/App/App.js
+++ b/frontend/src/App/App.js
@@ -12,11 +12,10 @@ function App({ store, history }) {
    <DocumentTitle title={window.Sonarr.instanceName}>
      <Provider store={store}>
        <ConnectedRouter history={history}>
-          <ApplyTheme>
-            <PageConnector>
-              <AppRoutes app={App} />
-            </PageConnector>
-          </ApplyTheme>
+          <ApplyTheme />
+          <PageConnector>
+            <AppRoutes app={App} />
+          </PageConnector>
        </ConnectedRouter>
      </Provider>
    </DocumentTitle>
--- a/frontend/src/App/ApplyTheme.js
+++ b/frontend/src/App/ApplyTheme.js
@@ -1,50 +0,0 @@
-import PropTypes from 'prop-types';
-import React, { Fragment, useCallback, useEffect } from 'react';
-import { connect } from 'react-redux';
-import { createSelector } from 'reselect';
-import themes from 'Styles/Themes';
-
-function createMapStateToProps() {
-  return createSelector(
-    (state) => state.settings.ui.item.theme || window.Sonarr.theme,
-    (
-      theme
-    ) => {
-      return {
-        theme
-      };
-    }
-  );
-}
-
-function ApplyTheme({ theme, children }) {
-  // Update the CSS Variables
-
-  const updateCSSVariables = useCallback(() => {
-    const arrayOfVariableKeys = Object.keys(themes[theme]);
-    const arrayOfVariableValues = Object.values(themes[theme]);
-
-    // Loop through each array key and set the CSS Variables
-    arrayOfVariableKeys.forEach((cssVariableKey, index) => {
-      // Based on our snippet from MDN
-      document.documentElement.style.setProperty(
-        `--${cssVariableKey}`,
-        arrayOfVariableValues[index]
-      );
-    });
-  }, [theme]);
-
-  // On Component Mount and Component Update
-  useEffect(() => {
-    updateCSSVariables(theme);
-  }, [updateCSSVariables, theme]);
-
-  return <Fragment>{children}</Fragment>;
-}
-
-ApplyTheme.propTypes = {
-  theme: PropTypes.string.isRequired,
-  children: PropTypes.object.isRequired
-};
-
-export default connect(createMapStateToProps)(ApplyTheme);
--- a/frontend/src/App/ApplyTheme.tsx
+++ b/frontend/src/App/ApplyTheme.tsx
@@ -0,0 +1,37 @@
+import React, { Fragment, ReactNode, useCallback, useEffect } from 'react';
+import { useSelector } from 'react-redux';
+import { createSelector } from 'reselect';
+import themes from 'Styles/Themes';
+import AppState from './State/AppState';
+
+interface ApplyThemeProps {
+  children: ReactNode;
+}
+
+function createThemeSelector() {
+  return createSelector(
+    (state: AppState) => state.settings.ui.item.theme || window.Sonarr.theme,
+    (theme) => {
+      return theme;
+    }
+  );
+}
+
+function ApplyTheme({ children }: ApplyThemeProps) {
+  const theme = useSelector(createThemeSelector());
+
+  const updateCSSVariables = useCallback(() => {
+    Object.entries(themes[theme]).forEach(([key, value]) => {
+      document.documentElement.style.setProperty(`--${key}`, value);
+    });
+  }, [theme]);
+
+  // On Component Mount and Component Update
+  useEffect(() => {
+    updateCSSVariables();
+  }, [updateCSSVariables, theme]);
+
+  return <Fragment>{children}</Fragment>;
+}
+
+export default ApplyTheme;
--- a/frontend/src/App/State/AppState.ts
+++ b/frontend/src/App/State/AppState.ts
@@ -1,4 +1,5 @@
 import InteractiveImportAppState from 'App/State/InteractiveImportAppState';
+import BlocklistAppState from './BlocklistAppState';
 import CalendarAppState from './CalendarAppState';
 import CommandAppState from './CommandAppState';
 import EpisodeFilesAppState from './EpisodeFilesAppState';
@@ -54,6 +55,7 @@ export interface AppSectionState {

 interface AppState {
  app: AppSectionState;
+  blocklist: BlocklistAppState;
  calendar: CalendarAppState;
  commands: CommandAppState;
  episodeFiles: EpisodeFilesAppState;
--- a/frontend/src/App/State/BlocklistAppState.ts
+++ b/frontend/src/App/State/BlocklistAppState.ts
@@ -0,0 +1,8 @@
+import Blocklist from 'typings/Blocklist';
+import AppSectionState, { AppSectionFilterState } from './AppSectionState';
+
+interface BlocklistAppState
+  extends AppSectionState<Blocklist>,
+    AppSectionFilterState<Blocklist> {}
+
+export default BlocklistAppState;
--- a/frontend/src/Calendar/Day/DayOfWeek.js
+++ b/frontend/src/Calendar/Day/DayOfWeek.js
@@ -28,7 +28,7 @@ class DayOfWeek extends Component {
    if (view === calendarViews.WEEK) {
      formatedDate = momentDate.format(calendarWeekColumnHeader);
    } else if (view === calendarViews.FORECAST) {
-      formatedDate = getRelativeDate(date, shortDateFormat, showRelativeDates);
+      formatedDate = getRelativeDate({ date, shortDateFormat, showRelativeDates });
    }

    return (
--- a/frontend/src/Components/Form/EnhancedSelectInput.js
+++ b/frontend/src/Components/Form/EnhancedSelectInput.js
@@ -271,26 +271,32 @@ class EnhancedSelectInput extends Component {
    this.setState({ isOpen: !this.state.isOpen });
  };

-  onSelect = (value) => {
-    if (Array.isArray(this.props.value)) {
-      let newValue = null;
-      const index = this.props.value.indexOf(value);
+  onSelect = (newValue) => {
+    const { name, value, values, onChange } = this.props;
+    const additionalProperties = values.find((v) => v.key === newValue)?.additionalProperties;
+
+    if (Array.isArray(value)) {
+      let arrayValue = null;
+      const index = value.indexOf(newValue);
+
      if (index === -1) {
-        newValue = this.props.values.map((v) => v.key).filter((v) => (v === value) || this.props.value.includes(v));
+        arrayValue = values.map((v) => v.key).filter((v) => (v === newValue) || value.includes(v));
      } else {
-        newValue = [...this.props.value];
-        newValue.splice(index, 1);
+        arrayValue = [...value];
+        arrayValue.splice(index, 1);
      }
-      this.props.onChange({
-        name: this.props.name,
-        value: newValue
+      onChange({
+        name,
+        value: arrayValue,
+        additionalProperties
      });
    } else {
      this.setState({ isOpen: false });

-      this.props.onChange({
-        name: this.props.name,
-        value
+      onChange({
+        name,
+        value: newValue,
+        additionalProperties
      });
    }
  };
@@ -485,7 +491,7 @@ class EnhancedSelectInput extends Component {
                            values.map((v, index) => {
                              const hasParent = v.parentKey !== undefined;
                              const depth = hasParent ? 1 : 0;
-                              const parentSelected = hasParent && value.includes(v.parentKey);
+                              const parentSelected = hasParent && Array.isArray(value) && value.includes(v.parentKey);
                              return (
                                <OptionComponent
                                  key={v.key}
--- a/frontend/src/Components/Form/EnhancedSelectInputConnector.js
+++ b/frontend/src/Components/Form/EnhancedSelectInputConnector.js
@@ -9,7 +9,8 @@ import EnhancedSelectInput from './EnhancedSelectInput';
 const importantFieldNames = [
  'baseUrl',
  'apiPath',
-  'apiKey'
+  'apiKey',
+  'authToken'
 ];

 function getProviderDataKey(providerData) {
@@ -34,7 +35,9 @@ function getSelectOptions(items) {
      key: option.value,
      value: option.name,
      hint: option.hint,
-      parentKey: option.parentValue
+      parentKey: option.parentValue,
+      isDisabled: option.isDisabled,
+      additionalProperties: option.additionalProperties
    };
  });
 }
@@ -147,7 +150,7 @@ EnhancedSelectInputConnector.propTypes = {
  provider: PropTypes.string.isRequired,
  providerData: PropTypes.object.isRequired,
  name: PropTypes.string.isRequired,
-  value: PropTypes.arrayOf(PropTypes.oneOfType([PropTypes.number, PropTypes.string])).isRequired,
+  value: PropTypes.oneOfType([PropTypes.string, PropTypes.number, PropTypes.arrayOf(PropTypes.string), PropTypes.arrayOf(PropTypes.number)]).isRequired,
  values: PropTypes.arrayOf(PropTypes.object).isRequired,
  selectOptionsProviderAction: PropTypes.string,
  onChange: PropTypes.func.isRequired,
--- a/frontend/src/Components/Form/PasswordInput.css
+++ b/frontend/src/Components/Form/PasswordInput.css
@@ -1,5 +0,0 @@
-.input {
-  composes: input from '~Components/Form/TextInput.css';
-
-  font-family: $passwordFamily;
-}
--- a/frontend/src/Components/Form/PasswordInput.css.d.ts
+++ b/frontend/src/Components/Form/PasswordInput.css.d.ts
@@ -1,7 +0,0 @@
-// This file is automatically generated.
-// Please do not change this file!
-interface CssExports {
-  'input': string;
-}
-export const cssExports: CssExports;
-export default cssExports;
--- a/frontend/src/Components/Form/PasswordInput.js
+++ b/frontend/src/Components/Form/PasswordInput.js
@@ -1,7 +1,5 @@
-import PropTypes from 'prop-types';
 import React from 'react';
 import TextInput from './TextInput';
-import styles from './PasswordInput.css';

 // Prevent a user from copying (or cutting) the password from the input
 function onCopy(e) {
@@ -13,17 +11,14 @@ function PasswordInput(props) {
  return (
    <TextInput
      {...props}
+      type="password"
      onCopy={onCopy}
    />
  );
 }

 PasswordInput.propTypes = {
-  className: PropTypes.string.isRequired
-};
-
-PasswordInput.defaultProps = {
-  className: styles.input
+  ...TextInput.props
 };

 export default PasswordInput;
--- a/frontend/src/Components/Label.css
+++ b/frontend/src/Components/Label.css
@@ -88,6 +88,15 @@
  }
 }

+.purple {
+  border-color: var(--purple);
+  background-color: var(--purple);
+
+  &.outline {
+    color: var(--purple);
+  }
+}
+
 /** Sizes **/

 .small {
--- a/frontend/src/Components/Label.css.d.ts
+++ b/frontend/src/Components/Label.css.d.ts
@@ -11,6 +11,7 @@ interface CssExports {
  'medium': string;
  'outline': string;
  'primary': string;
+  'purple': string;
  'small': string;
  'success': string;
  'warning': string;
--- a/frontend/src/Components/Page/Header/SeriesSearchInputConnector.js
+++ b/frontend/src/Components/Page/Header/SeriesSearchInputConnector.js
@@ -21,6 +21,7 @@ function createCleanSeriesSelector() {
          tvdbId,
          tvMazeId,
          imdbId,
+          tmdbId,
          tags = []
        } = series;

@@ -33,6 +34,7 @@ function createCleanSeriesSelector() {
          tvdbId,
          tvMazeId,
          imdbId,
+          tmdbId,
          firstCharacter: title.charAt(0).toLowerCase(),
          tags: tags.reduce((acc, id) => {
            const matchingTag = allTags.find((tag) => tag.id === id);
--- a/frontend/src/Components/Page/Header/SeriesSearchResult.js
+++ b/frontend/src/Components/Page/Header/SeriesSearchResult.js
@@ -14,6 +14,7 @@ function SeriesSearchResult(props) {
    tvdbId,
    tvMazeId,
    imdbId,
+    tmdbId,
    tags
  } = props;

@@ -73,6 +74,14 @@ function SeriesSearchResult(props) {
            null
        }

+        {
+          match.key === 'tmdbId' && tmdbId ?
+            <div className={styles.alternateTitle}>
+              TmdbId: {tmdbId}
+            </div> :
+            null
+        }
+
        {
          tag ?
            <div className={styles.tagContainer}>
@@ -97,6 +106,7 @@ SeriesSearchResult.propTypes = {
  tvdbId: PropTypes.number,
  tvMazeId: PropTypes.number,
  imdbId: PropTypes.string,
+  tmdbId: PropTypes.number,
  tags: PropTypes.arrayOf(PropTypes.object).isRequired,
  match: PropTypes.object.isRequired
 };
--- a/frontend/src/Components/Page/Header/fuse.worker.js
+++ b/frontend/src/Components/Page/Header/fuse.worker.js
@@ -13,6 +13,7 @@ const fuseOptions = {
    'tvdbId',
    'tvMazeId',
    'imdbId',
+    'tmdbId',
    'tags.label'
  ]
 };
--- a/frontend/src/Components/SignalRConnector.js
+++ b/frontend/src/Components/SignalRConnector.js
@@ -244,7 +244,7 @@ class SignalRConnector extends Component {
  handleWantedCutoff = (body) => {
    if (body.action === 'updated') {
      this.props.dispatchUpdateItem({
-        section: 'cutoffUnmet',
+        section: 'wanted.cutoffUnmet',
        updateOnly: true,
        ...body.resource
      });
@@ -254,7 +254,7 @@ class SignalRConnector extends Component {
  handleWantedMissing = (body) => {
    if (body.action === 'updated') {
      this.props.dispatchUpdateItem({
-        section: 'missing',
+        section: 'wanted.missing',
        updateOnly: true,
        ...body.resource
      });
--- a/frontend/src/Components/Table/Cells/RelativeDateCell.js
+++ b/frontend/src/Components/Table/Cells/RelativeDateCell.js
@@ -15,6 +15,7 @@ class RelativeDateCell extends PureComponent {
      className,
      date,
      includeSeconds,
+      includeTime,
      showRelativeDates,
      shortDateFormat,
      longDateFormat,
@@ -39,7 +40,7 @@ class RelativeDateCell extends PureComponent {
        title={formatDateTime(date, longDateFormat, timeFormat, { includeSeconds, includeRelativeDay: !showRelativeDates })}
        {...otherProps}
      >
-        {getRelativeDate(date, shortDateFormat, showRelativeDates, { timeFormat, includeSeconds, timeForToday: true })}
+        {getRelativeDate({ date, shortDateFormat, showRelativeDates, timeFormat, includeSeconds, includeTime, timeForToday: true })}
      </Component>
    );
  }
@@ -49,6 +50,7 @@ RelativeDateCell.propTypes = {
  className: PropTypes.string.isRequired,
  date: PropTypes.string,
  includeSeconds: PropTypes.bool.isRequired,
+  includeTime: PropTypes.bool.isRequired,
  showRelativeDates: PropTypes.bool.isRequired,
  shortDateFormat: PropTypes.string.isRequired,
  longDateFormat: PropTypes.string.isRequired,
@@ -60,6 +62,7 @@ RelativeDateCell.propTypes = {
 RelativeDateCell.defaultProps = {
  className: styles.cell,
  includeSeconds: false,
+  includeTime: false,
  component: TableRowCell
 };

--- a/frontend/src/Components/Table/TableOptions/TableOptionsModal.js
+++ b/frontend/src/Components/Table/TableOptions/TableOptionsModal.js
@@ -49,11 +49,12 @@ class TableOptionsModal extends Component {

  onPageSizeChange = ({ value }) => {
    let pageSizeError = null;
+    const maxPageSize = this.props.maxPageSize ?? 250;

    if (value < 5) {
      pageSizeError = translate('TablePageSizeMinimum', { minimumValue: '5' });
-    } else if (value > 250) {
-      pageSizeError = translate('TablePageSizeMaximum', { maximumValue: '250' });
+    } else if (value > maxPageSize) {
+      pageSizeError = translate('TablePageSizeMaximum', { maximumValue: `${maxPageSize}` });
    } else {
      this.props.onTableOptionChange({ pageSize: value });
    }
@@ -248,6 +249,7 @@ TableOptionsModal.propTypes = {
  isOpen: PropTypes.bool.isRequired,
  columns: PropTypes.arrayOf(PropTypes.object).isRequired,
  pageSize: PropTypes.number,
+  maxPageSize: PropTypes.number,
  canModifyColumns: PropTypes.bool.isRequired,
  optionsComponent: PropTypes.elementType,
  onTableOptionChange: PropTypes.func.isRequired,
--- a/frontend/src/Content/Fonts/fonts.css
+++ b/frontend/src/Content/Fonts/fonts.css
@@ -25,14 +25,3 @@
  font-family: 'Ubuntu Mono';
  src: url('UbuntuMono-Regular.eot?#iefix&v=1.3.0') format('embedded-opentype'), url('UbuntuMono-Regular.woff?v=1.3.0') format('woff'), url('UbuntuMono-Regular.ttf?v=1.3.0') format('truetype');
 }
-
-/*
- * text-security-disc
- */
-
-@font-face {
-  font-weight: normal;
-  font-style: normal;
-  font-family: 'text-security-disc';
-  src: url('text-security-disc.woff?v=1.3.0') format('woff'), url('text-security-disc.ttf?v=1.3.0') format('truetype');
-}
--- a/frontend/src/Content/Fonts/text-security-disc.ttf
+++ b/frontend/src/Content/Fonts/text-security-disc.ttf
--- a/frontend/src/Content/Fonts/text-security-disc.woff
+++ b/frontend/src/Content/Fonts/text-security-disc.woff
--- a/frontend/src/Episode/History/EpisodeHistoryRow.js
+++ b/frontend/src/Episode/History/EpisodeHistoryRow.js
@@ -111,6 +111,8 @@ class EpisodeHistoryRow extends Component {

        <RelativeDateCellConnector
          date={date}
+          includeSeconds={true}
+          includeTime={true}
        />

        <TableRowCell className={styles.actions}>
--- a/frontend/src/Episode/Summary/EpisodeFileRow.css
+++ b/frontend/src/Episode/Summary/EpisodeFileRow.css
@@ -17,6 +17,12 @@
  width: 175px;
 }

+.customFormatScore {
+  composes: cell from '~Components/Table/Cells/TableRowCell.css';
+
+  width: 65px;
+}
+
 .actions {
  composes: cell from '~Components/Table/Cells/TableRowCell.css';

--- a/frontend/src/Episode/Summary/EpisodeFileRow.css.d.ts
+++ b/frontend/src/Episode/Summary/EpisodeFileRow.css.d.ts
@@ -2,6 +2,7 @@
 // Please do not change this file!
 interface CssExports {
  'actions': string;
+  'customFormatScore': string;
  'customFormats': string;
  'languages': string;
  'quality': string;
--- a/frontend/src/Episode/Summary/EpisodeFileRow.js
+++ b/frontend/src/Episode/Summary/EpisodeFileRow.js
@@ -11,6 +11,7 @@ import EpisodeLanguages from 'Episode/EpisodeLanguages';
 import EpisodeQuality from 'Episode/EpisodeQuality';
 import { icons, kinds, tooltipPositions } from 'Helpers/Props';
 import formatBytes from 'Utilities/Number/formatBytes';
+import formatCustomFormatScore from 'Utilities/Number/formatCustomFormatScore';
 import translate from 'Utilities/String/translate';
 import MediaInfo from './MediaInfo';
 import styles from './EpisodeFileRow.css';
@@ -55,6 +56,7 @@ class EpisodeFileRow extends Component {
      languages,
      quality,
      customFormats,
+      customFormatScore,
      qualityCutoffNotMet,
      mediaInfo,
      columns
@@ -127,6 +129,17 @@ class EpisodeFileRow extends Component {
              );
            }

+            if (name === 'customFormatScore') {
+              return (
+                <TableRowCell
+                  key={name}
+                  className={styles.customFormatScore}
+                >
+                  {formatCustomFormatScore(customFormatScore, customFormats.length)}
+                </TableRowCell>
+              );
+            }
+
            if (name === 'actions') {
              return (
                <TableRowCell
@@ -183,6 +196,7 @@ EpisodeFileRow.propTypes = {
  quality: PropTypes.object.isRequired,
  qualityCutoffNotMet: PropTypes.bool.isRequired,
  customFormats: PropTypes.arrayOf(PropTypes.object),
+  customFormatScore: PropTypes.number.isRequired,
  mediaInfo: PropTypes.object,
  columns: PropTypes.arrayOf(PropTypes.object).isRequired,
  onDeleteEpisodeFile: PropTypes.func.isRequired
--- a/frontend/src/Episode/Summary/EpisodeSummary.js
+++ b/frontend/src/Episode/Summary/EpisodeSummary.js
@@ -1,10 +1,11 @@
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
+import Icon from 'Components/Icon';
 import Label from 'Components/Label';
 import ConfirmModal from 'Components/Modal/ConfirmModal';
 import Table from 'Components/Table/Table';
 import TableBody from 'Components/Table/TableBody';
-import { kinds, sizes } from 'Helpers/Props';
+import { icons, kinds, sizes } from 'Helpers/Props';
 import QualityProfileNameConnector from 'Settings/Profiles/Quality/QualityProfileNameConnector';
 import translate from 'Utilities/String/translate';
 import EpisodeAiringConnector from './EpisodeAiringConnector';
@@ -42,6 +43,15 @@ const columns = [
    isSortable: false,
    isVisible: true
  },
+  {
+    name: 'customFormatScore',
+    label: React.createElement(Icon, {
+      name: icons.SCORE,
+      title: () => translate('CustomFormatScore')
+    }),
+    isSortable: true,
+    isVisible: true
+  },
  {
    name: 'actions',
    label: '',
@@ -94,6 +104,7 @@ class EpisodeSummary extends Component {
      languages,
      quality,
      customFormats,
+      customFormatScore,
      qualityCutoffNotMet,
      onDeleteEpisodeFile
    } = this.props;
@@ -143,6 +154,7 @@ class EpisodeSummary extends Component {
                  quality={quality}
                  qualityCutoffNotMet={qualityCutoffNotMet}
                  customFormats={customFormats}
+                  customFormatScore={customFormatScore}
                  mediaInfo={mediaInfo}
                  columns={columns}
                  onDeleteEpisodeFile={onDeleteEpisodeFile}
@@ -179,6 +191,7 @@ EpisodeSummary.propTypes = {
  quality: PropTypes.object,
  qualityCutoffNotMet: PropTypes.bool,
  customFormats: PropTypes.arrayOf(PropTypes.object),
+  customFormatScore: PropTypes.number.isRequired,
  onDeleteEpisodeFile: PropTypes.func.isRequired
 };

--- a/frontend/src/Episode/Summary/EpisodeSummaryConnector.js
+++ b/frontend/src/Episode/Summary/EpisodeSummaryConnector.js
@@ -31,7 +31,8 @@ function createMapStateToProps() {
        languages,
        quality,
        qualityCutoffNotMet,
-        customFormats
+        customFormats,
+        customFormatScore
      } = episodeFile;

      return {
@@ -45,7 +46,8 @@ function createMapStateToProps() {
        languages,
        quality,
        qualityCutoffNotMet,
-        customFormats
+        customFormats,
+        customFormatScore
      };
    }
  );
--- a/frontend/src/Series/Delete/DeleteSeriesModalContent.css
+++ b/frontend/src/Series/Delete/DeleteSeriesModalContent.css
@@ -14,4 +14,9 @@
 .deleteFilesMessage {
  margin-top: 20px;
  color: var(--dangerColor);
+
+  .deleteCount {
+    margin-top: 20px;
+    color: var(--warningColor);
+  }
 }
--- a/frontend/src/Series/Delete/DeleteSeriesModalContent.css.d.ts
+++ b/frontend/src/Series/Delete/DeleteSeriesModalContent.css.d.ts
@@ -1,6 +1,7 @@
 // This file is automatically generated.
 // Please do not change this file!
 interface CssExports {
+  'deleteCount': string;
  'deleteFilesMessage': string;
  'folderPath': string;
  'pathContainer': string;
--- a/frontend/src/Series/Delete/DeleteSeriesModalContent.js
+++ b/frontend/src/Series/Delete/DeleteSeriesModalContent.js
@@ -50,15 +50,15 @@ class DeleteSeriesModalContent extends Component {
    const {
      title,
      path,
-      statistics,
+      statistics = {},
      deleteOptions,
      onModalClose,
      onDeleteOptionChange
    } = this.props;

    const {
-      episodeFileCount,
-      sizeOnDisk
+      episodeFileCount = 0,
+      sizeOnDisk = 0
    } = statistics;

    const deleteFiles = this.state.deleteFiles;
@@ -108,16 +108,20 @@ class DeleteSeriesModalContent extends Component {
          </FormGroup>

          {
-            deleteFiles &&
+            deleteFiles ?
              <div className={styles.deleteFilesMessage}>
                <div><InlineMarkdown data={translate('DeleteSeriesFolderConfirmation', { path })} blockClassName={styles.folderPath} /></div>
-                {
-                  !!episodeFileCount &&
-                    <div>{translate('DeleteSeriesFolderEpisodeCount', { episodeFileCount, size: formatBytes(sizeOnDisk) })}</div>
-                }
-              </div>
-          }

+                {
+                  episodeFileCount ?
+                    <div className={styles.deleteCount}>
+                      {translate('DeleteSeriesFolderEpisodeCount', { episodeFileCount, size: formatBytes(sizeOnDisk) })}
+                    </div> :
+                    null
+                }
+              </div> :
+              null
+          }
        </ModalBody>

        <ModalFooter>
--- a/frontend/src/Series/Details/SeasonProgressLabel.tsx
+++ b/frontend/src/Series/Details/SeasonProgressLabel.tsx
@@ -0,0 +1,69 @@
+import React from 'react';
+import { useSelector } from 'react-redux';
+import Label from 'Components/Label';
+import { kinds, sizes } from 'Helpers/Props';
+import createSeriesQueueItemsDetailsSelector, {
+  SeriesQueueDetails,
+} from 'Series/Index/createSeriesQueueDetailsSelector';
+
+function getEpisodeCountKind(
+  monitored: boolean,
+  episodeFileCount: number,
+  episodeCount: number,
+  isDownloading: boolean
+) {
+  if (isDownloading) {
+    return kinds.PURPLE;
+  }
+
+  if (episodeFileCount === episodeCount && episodeCount > 0) {
+    return kinds.SUCCESS;
+  }
+
+  if (!monitored) {
+    return kinds.WARNING;
+  }
+
+  return kinds.DANGER;
+}
+
+interface SeasonProgressLabelProps {
+  seriesId: number;
+  seasonNumber: number;
+  monitored: boolean;
+  episodeCount: number;
+  episodeFileCount: number;
+}
+
+function SeasonProgressLabel({
+  seriesId,
+  seasonNumber,
+  monitored,
+  episodeCount,
+  episodeFileCount,
+}: SeasonProgressLabelProps) {
+  const queueDetails: SeriesQueueDetails = useSelector(
+    createSeriesQueueItemsDetailsSelector(seriesId, seasonNumber)
+  );
+
+  const newDownloads = queueDetails.count - queueDetails.episodesWithFiles;
+  const text = newDownloads
+    ? `${episodeFileCount} + ${newDownloads} / ${episodeCount}`
+    : `${episodeFileCount} / ${episodeCount}`;
+
+  return (
+    <Label
+      kind={getEpisodeCountKind(
+        monitored,
+        episodeFileCount,
+        episodeCount,
+        queueDetails.count > 0
+      )}
+      size={sizes.LARGE}
+    >
+      <span>{text}</span>
+    </Label>
+  );
+}
+
+export default SeasonProgressLabel;
--- a/frontend/src/Series/Details/SeriesDetails.js
+++ b/frontend/src/Series/Details/SeriesDetails.js
@@ -175,6 +175,7 @@ class SeriesDetails extends Component {
      tvdbId,
      tvMazeId,
      imdbId,
+      tmdbId,
      title,
      runtime,
      ratings,
@@ -566,6 +567,7 @@ class SeriesDetails extends Component {
                        tvdbId={tvdbId}
                        tvMazeId={tvMazeId}
                        imdbId={imdbId}
+                        tmdbId={tmdbId}
                      />
                    }
                    kind={kinds.INVERSE}
@@ -719,6 +721,7 @@ SeriesDetails.propTypes = {
  tvdbId: PropTypes.number.isRequired,
  tvMazeId: PropTypes.number,
  imdbId: PropTypes.string,
+  tmdbId: PropTypes.number,
  title: PropTypes.string.isRequired,
  runtime: PropTypes.number.isRequired,
  ratings: PropTypes.object.isRequired,
--- a/frontend/src/Series/Details/SeriesDetailsLinks.js
+++ b/frontend/src/Series/Details/SeriesDetailsLinks.js
@@ -9,7 +9,8 @@ function SeriesDetailsLinks(props) {
  const {
    tvdbId,
    tvMazeId,
-    imdbId
+    imdbId,
+    tmdbId
  } = props;

  return (
@@ -71,6 +72,22 @@ function SeriesDetailsLinks(props) {
            </Label>
          </Link>
      }
+
+      {
+        !!tmdbId &&
+          <Link
+            className={styles.link}
+            to={`https://www.themoviedb.org/tv/${tmdbId}`}
+          >
+            <Label
+              className={styles.linkLabel}
+              kind={kinds.INFO}
+              size={sizes.LARGE}
+            >
+              TMDB
+            </Label>
+          </Link>
+      }
    </div>
  );
 }
@@ -78,7 +95,8 @@ function SeriesDetailsLinks(props) {
 SeriesDetailsLinks.propTypes = {
  tvdbId: PropTypes.number.isRequired,
  tvMazeId: PropTypes.number,
-  imdbId: PropTypes.string
+  imdbId: PropTypes.string,
+  tmdbId: PropTypes.number
 };

 export default SeriesDetailsLinks;
--- a/frontend/src/Series/Details/SeriesDetailsSeason.js
+++ b/frontend/src/Series/Details/SeriesDetailsSeason.js
@@ -2,7 +2,6 @@ import _ from 'lodash';
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import Icon from 'Components/Icon';
-import Label from 'Components/Label';
 import IconButton from 'Components/Link/IconButton';
 import Link from 'Components/Link/Link';
 import SpinnerIconButton from 'Components/Link/SpinnerIconButton';
@@ -15,7 +14,7 @@ import SpinnerIcon from 'Components/SpinnerIcon';
 import Table from 'Components/Table/Table';
 import TableBody from 'Components/Table/TableBody';
 import Popover from 'Components/Tooltip/Popover';
-import { align, icons, kinds, sizes, sortDirections, tooltipPositions } from 'Helpers/Props';
+import { align, icons, sortDirections, tooltipPositions } from 'Helpers/Props';
 import InteractiveImportModal from 'InteractiveImport/InteractiveImportModal';
 import OrganizePreviewModalConnector from 'Organize/OrganizePreviewModalConnector';
 import SeriesHistoryModal from 'Series/History/SeriesHistoryModal';
@@ -27,6 +26,7 @@ import translate from 'Utilities/String/translate';
 import getToggledRange from 'Utilities/Table/getToggledRange';
 import EpisodeRowConnector from './EpisodeRowConnector';
 import SeasonInfo from './SeasonInfo';
+import SeasonProgressLabel from './SeasonProgressLabel';
 import styles from './SeriesDetailsSeason.css';

 function getSeasonStatistics(episodes) {
@@ -64,18 +64,6 @@ function getSeasonStatistics(episodes) {
  };
 }

-function getEpisodeCountKind(monitored, episodeFileCount, episodeCount) {
-  if (episodeFileCount === episodeCount && episodeCount > 0) {
-    return kinds.SUCCESS;
-  }
-
-  if (!monitored) {
-    return kinds.WARNING;
-  }
-
-  return kinds.DANGER;
-}
-
 class SeriesDetailsSeason extends Component {

  //
@@ -265,12 +253,13 @@ class SeriesDetailsSeason extends Component {
              className={styles.episodeCountTooltip}
              canFlip={true}
              anchor={
-                <Label
-                  kind={getEpisodeCountKind(monitored, episodeFileCount, episodeCount)}
-                  size={sizes.LARGE}
-                >
-                  <span>{episodeFileCount} / {episodeCount}</span>
-                </Label>
+                <SeasonProgressLabel
+                  seriesId={seriesId}
+                  seasonNumber={seasonNumber}
+                  monitored={monitored}
+                  episodeCount={episodeCount}
+                  episodeFileCount={episodeFileCount}
+                />
              }
              title={translate('SeasonInformation')}
              body={
--- a/frontend/src/Series/History/SeriesHistoryModal.js
+++ b/frontend/src/Series/History/SeriesHistoryModal.js
@@ -14,7 +14,7 @@ function SeriesHistoryModal(props) {
  return (
    <Modal
      isOpen={isOpen}
-      size={sizes.EXTRA_LARGE}
+      size={sizes.EXTRA_EXTRA_LARGE}
      onModalClose={onModalClose}
    >
      <SeriesHistoryModalContentConnector
--- a/frontend/src/Series/History/SeriesHistoryRow.js
+++ b/frontend/src/Series/History/SeriesHistoryRow.js
@@ -135,6 +135,8 @@ class SeriesHistoryRow extends Component {

        <RelativeDateCellConnector
          date={date}
+          includeSeconds={true}
+          includeTime={true}
        />

        <TableRowCell className={styles.actions}>
--- a/frontend/src/Series/Index/Overview/SeriesIndexOverviewInfo.tsx
+++ b/frontend/src/Series/Index/Overview/SeriesIndexOverviewInfo.tsx
@@ -138,7 +138,10 @@ function getInfoRowProps(
      }),
      iconName: icons.CALENDAR,
      label:
-        getRelativeDate(previousAiring, shortDateFormat, showRelativeDates, {
+        getRelativeDate({
+          date: previousAiring,
+          shortDateFormat,
+          showRelativeDates,
          timeFormat,
          timeForToday: true,
        }) ?? '',
@@ -156,7 +159,10 @@ function getInfoRowProps(
      }),
      iconName: icons.ADD,
      label:
-        getRelativeDate(added, shortDateFormat, showRelativeDates, {
+        getRelativeDate({
+          date: added,
+          shortDateFormat,
+          showRelativeDates,
          timeFormat,
          timeForToday: true,
        }) ?? '',
@@ -232,15 +238,13 @@ function SeriesIndexOverviewInfo(props: SeriesIndexOverviewInfoProps) {
        <SeriesIndexOverviewInfoRow
          title={formatDateTime(nextAiring, longDateFormat, timeFormat)}
          iconName={icons.SCHEDULED}
-          label={getRelativeDate(
-            nextAiring,
+          label={getRelativeDate({
+            date: nextAiring,
            shortDateFormat,
            showRelativeDates,
-            {
-              timeFormat,
-              timeForToday: true,
-            }
-          )}
+            timeFormat,
+            timeForToday: true,
+          })}
        />
      )}

--- a/frontend/src/Series/Index/Posters/SeriesIndexPoster.tsx
+++ b/frontend/src/Series/Index/Posters/SeriesIndexPoster.tsx
@@ -217,7 +217,10 @@ function SeriesIndexPoster(props: SeriesIndexPosterProps) {
            timeFormat
          )}`}
        >
-          {getRelativeDate(nextAiring, shortDateFormat, showRelativeDates, {
+          {getRelativeDate({
+            date: nextAiring,
+            shortDateFormat,
+            showRelativeDates,
            timeFormat,
            timeForToday: true,
          })}
--- a/frontend/src/Series/Index/Posters/SeriesIndexPosterInfo.tsx
+++ b/frontend/src/Series/Index/Posters/SeriesIndexPosterInfo.tsx
@@ -80,7 +80,10 @@ function SeriesIndexPosterInfo(props: SeriesIndexPosterInfoProps) {
          timeFormat
        )}`}
      >
-        {getRelativeDate(previousAiring, shortDateFormat, showRelativeDates, {
+        {getRelativeDate({
+          date: previousAiring,
+          shortDateFormat,
+          showRelativeDates,
          timeFormat,
          timeForToday: true,
        })}
@@ -89,15 +92,13 @@ function SeriesIndexPosterInfo(props: SeriesIndexPosterInfoProps) {
  }

  if (sortKey === 'added' && added) {
-    const addedDate = getRelativeDate(
-      added,
+    const addedDate = getRelativeDate({
+      date: added,
      shortDateFormat,
      showRelativeDates,
-      {
-        timeFormat,
-        timeForToday: false,
-      }
-    );
+      timeFormat,
+      timeForToday: false,
+    });

    return (
      <div
--- a/frontend/src/Series/Index/Select/Delete/DeleteSeriesModalContent.css
+++ b/frontend/src/Series/Index/Select/Delete/DeleteSeriesModalContent.css
@@ -10,4 +10,15 @@
 .path {
  margin-left: 5px;
  color: var(--dangerColor);
+  font-weight: bold;
+}
+
+.statistics {
+  margin-left: 5px;
+  color: var(--warningColor);
+}
+
+.deleteFilesMessage {
+  margin-top: 20px;
+  color: var(--warningColor);
 }
--- a/frontend/src/Series/Index/Select/Delete/DeleteSeriesModalContent.css.d.ts
+++ b/frontend/src/Series/Index/Select/Delete/DeleteSeriesModalContent.css.d.ts
@@ -1,9 +1,11 @@
 // This file is automatically generated.
 // Please do not change this file!
 interface CssExports {
+  'deleteFilesMessage': string;
  'message': string;
  'path': string;
  'pathContainer': string;
+  'statistics': string;
 }
 export const cssExports: CssExports;
 export default cssExports;
--- a/frontend/src/Series/Index/Select/Delete/DeleteSeriesModalContent.tsx
+++ b/frontend/src/Series/Index/Select/Delete/DeleteSeriesModalContent.tsx
@@ -16,6 +16,7 @@ import Series from 'Series/Series';
 import { bulkDeleteSeries, setDeleteOption } from 'Store/Actions/seriesActions';
 import createAllSeriesSelector from 'Store/Selectors/createAllSeriesSelector';
 import { CheckInputChanged } from 'typings/inputs';
+import formatBytes from 'Utilities/Number/formatBytes';
 import translate from 'Utilities/String/translate';
 import styles from './DeleteSeriesModalContent.css';

@@ -85,6 +86,23 @@ function DeleteSeriesModalContent(props: DeleteSeriesModalContentProps) {
    onModalClose,
  ]);

+  const { totalEpisodeFileCount, totalSizeOnDisk } = useMemo(() => {
+    return series.reduce(
+      (acc, { statistics = {} }) => {
+        const { episodeFileCount = 0, sizeOnDisk = 0 } = statistics;
+
+        acc.totalEpisodeFileCount += episodeFileCount;
+        acc.totalSizeOnDisk += sizeOnDisk;
+
+        return acc;
+      },
+      {
+        totalEpisodeFileCount: 0,
+        totalSizeOnDisk: 0,
+      }
+    );
+  }, [series]);
+
  return (
    <ModalContent onModalClose={onModalClose}>
      <ModalHeader>{translate('DeleteSelectedSeries')}</ModalHeader>
@@ -136,20 +154,44 @@ function DeleteSeriesModalContent(props: DeleteSeriesModalContentProps) {
        </div>

        <ul>
-          {series.map((s) => {
+          {series.map(({ title, path, statistics = {} }) => {
+            const { episodeFileCount = 0, sizeOnDisk = 0 } = statistics;
+
            return (
-              <li key={s.title}>
-                <span>{s.title}</span>
+              <li key={title}>
+                <span>{title}</span>

                {deleteFiles && (
-                  <span className={styles.pathContainer}>
-                    -<span className={styles.path}>{s.path}</span>
+                  <span>
+                    <span className={styles.pathContainer}>
+                      -<span className={styles.path}>{path}</span>
+                    </span>
+
+                    {!!episodeFileCount && (
+                      <span className={styles.statistics}>
+                        (
+                        {translate('DeleteSeriesFolderEpisodeCount', {
+                          episodeFileCount,
+                          size: formatBytes(sizeOnDisk),
+                        })}
+                        )
+                      </span>
+                    )}
                  </span>
                )}
              </li>
            );
          })}
        </ul>
+
+        {deleteFiles && !!totalEpisodeFileCount ? (
+          <div className={styles.deleteFilesMessage}>
+            {translate('DeleteSeriesFolderEpisodeCount', {
+              episodeFileCount: totalEpisodeFileCount,
+              size: formatBytes(totalSizeOnDisk),
+            })}
+          </div>
+        ) : null}
      </ModalBody>

      <ModalFooter>
--- a/frontend/src/Series/Series.ts
+++ b/frontend/src/Series/Series.ts
@@ -70,6 +70,7 @@ interface Series extends ModelBase {
  tvdbId: number;
  tvMazeId: number;
  tvRageId: number;
+  tmdbId: number;
  useSceneNumbering: boolean;
  year: number;
  isSaving?: boolean;
--- a/frontend/src/Settings/MediaManagement/Naming/Naming.js
+++ b/frontend/src/Settings/MediaManagement/Naming/Naming.js
@@ -138,7 +138,8 @@ class Naming extends Component {
      { key: 1, value: translate('ReplaceWithDash') },
      { key: 2, value: translate('ReplaceWithSpaceDash') },
      { key: 3, value: translate('ReplaceWithSpaceDashSpace') },
-      { key: 4, value: translate('SmartReplace'), hint: translate('SmartReplaceHint') }
+      { key: 4, value: translate('SmartReplace'), hint: translate('SmartReplaceHint') },
+      { key: 5, value: translate('Custom'), hint: translate('CustomColonReplacementFormatHint') }
    ];

    const standardEpisodeFormatHelpTexts = [];
@@ -262,6 +263,22 @@ class Naming extends Component {
                  null
              }

+              {
+                replaceIllegalCharacters && settings.colonReplacementFormat.value === 5 ?
+                  <FormGroup>
+                    <FormLabel>{translate('ColonReplacement')}</FormLabel>
+
+                    <FormInputGroup
+                      type={inputTypes.TEXT}
+                      name="customColonReplacementFormat"
+                      helpText={translate('CustomColonReplacementFormatHelpText')}
+                      onChange={onInputChange}
+                      {...settings.customColonReplacementFormat}
+                    />
+                  </FormGroup> :
+                  null
+              }
+
              {
                renameEpisodes &&
                  <div>
--- a/frontend/src/Settings/MediaManagement/Naming/NamingModal.js
+++ b/frontend/src/Settings/MediaManagement/Naming/NamingModal.js
@@ -99,6 +99,7 @@ const seriesTokens = [
 const seriesIdTokens = [
  { token: '{ImdbId}', example: 'tt12345' },
  { token: '{TvdbId}', example: '12345' },
+  { token: '{TmdbId}', example: '11223' },
  { token: '{TvMazeId}', example: '54321' }
 ];

--- a/frontend/src/Settings/Notifications/Notifications/EditNotificationModalContentConnector.js
+++ b/frontend/src/Settings/Notifications/Notifications/EditNotificationModalContentConnector.js
@@ -4,7 +4,7 @@ import { connect } from 'react-redux';
 import { createSelector } from 'reselect';
 import {
  saveNotification,
-  setNotificationFieldValue,
+  setNotificationFieldValues,
  setNotificationValue,
  testNotification,
  toggleAdvancedSettings
@@ -27,7 +27,7 @@ function createMapStateToProps() {

 const mapDispatchToProps = {
  setNotificationValue,
-  setNotificationFieldValue,
+  setNotificationFieldValues,
  saveNotification,
  testNotification,
  toggleAdvancedSettings
@@ -51,8 +51,8 @@ class EditNotificationModalContentConnector extends Component {
    this.props.setNotificationValue({ name, value });
  };

-  onFieldChange = ({ name, value }) => {
-    this.props.setNotificationFieldValue({ name, value });
+  onFieldChange = ({ name, value, additionalProperties = {} }) => {
+    this.props.setNotificationFieldValues({ properties: { ...additionalProperties, [name]: value } });
  };

  onSavePress = () => {
@@ -91,7 +91,7 @@ EditNotificationModalContentConnector.propTypes = {
  saveError: PropTypes.object,
  item: PropTypes.object.isRequired,
  setNotificationValue: PropTypes.func.isRequired,
-  setNotificationFieldValue: PropTypes.func.isRequired,
+  setNotificationFieldValues: PropTypes.func.isRequired,
  saveNotification: PropTypes.func.isRequired,
  testNotification: PropTypes.func.isRequired,
  toggleAdvancedSettings: PropTypes.func.isRequired,
--- a/frontend/src/Settings/Notifications/Notifications/Notification.js
+++ b/frontend/src/Settings/Notifications/Notifications/Notification.js
@@ -59,6 +59,7 @@ class Notification extends Component {
      onGrab,
      onDownload,
      onUpgrade,
+      onImportComplete,
      onRename,
      onSeriesAdd,
      onSeriesDelete,
@@ -71,6 +72,7 @@ class Notification extends Component {
      supportsOnGrab,
      supportsOnDownload,
      supportsOnUpgrade,
+      supportsOnImportComplete,
      supportsOnRename,
      supportsOnSeriesAdd,
      supportsOnSeriesDelete,
@@ -105,7 +107,7 @@ class Notification extends Component {
        {
          supportsOnDownload && onDownload ?
            <Label kind={kinds.SUCCESS}>
-              {translate('OnImport')}
+              {translate('OnFileImport')}
            </Label> :
            null
        }
@@ -118,6 +120,14 @@ class Notification extends Component {
            null
        }

+        {
+          supportsOnImportComplete && onImportComplete ?
+            <Label kind={kinds.SUCCESS}>
+              {translate('OnImportComplete')}
+            </Label> :
+            null
+        }
+
        {
          supportsOnRename && onRename ?
            <Label kind={kinds.SUCCESS}>
@@ -191,7 +201,7 @@ class Notification extends Component {
        }

        {
-          !onGrab && !onDownload && !onRename && !onHealthIssue && !onHealthRestored && !onApplicationUpdate && !onSeriesAdd && !onSeriesDelete && !onEpisodeFileDelete && !onManualInteractionRequired ?
+          !onGrab && !onDownload && !onRename && !onImportComplete && !onHealthIssue && !onHealthRestored && !onApplicationUpdate && !onSeriesAdd && !onSeriesDelete && !onEpisodeFileDelete && !onManualInteractionRequired ?
            <Label
              kind={kinds.DISABLED}
              outline={true}
@@ -233,6 +243,7 @@ Notification.propTypes = {
  onGrab: PropTypes.bool.isRequired,
  onDownload: PropTypes.bool.isRequired,
  onUpgrade: PropTypes.bool.isRequired,
+  onImportComplete: PropTypes.bool.isRequired,
  onRename: PropTypes.bool.isRequired,
  onSeriesAdd: PropTypes.bool.isRequired,
  onSeriesDelete: PropTypes.bool.isRequired,
@@ -244,6 +255,7 @@ Notification.propTypes = {
  onManualInteractionRequired: PropTypes.bool.isRequired,
  supportsOnGrab: PropTypes.bool.isRequired,
  supportsOnDownload: PropTypes.bool.isRequired,
+  supportsOnImportComplete: PropTypes.bool.isRequired,
  supportsOnSeriesAdd: PropTypes.bool.isRequired,
  supportsOnSeriesDelete: PropTypes.bool.isRequired,
  supportsOnEpisodeFileDelete: PropTypes.bool.isRequired,
--- a/frontend/src/Settings/Notifications/Notifications/NotificationEventItems.js
+++ b/frontend/src/Settings/Notifications/Notifications/NotificationEventItems.js
@@ -18,6 +18,7 @@ function NotificationEventItems(props) {
    onGrab,
    onDownload,
    onUpgrade,
+    onImportComplete,
    onRename,
    onSeriesAdd,
    onSeriesDelete,
@@ -30,6 +31,7 @@ function NotificationEventItems(props) {
    supportsOnGrab,
    supportsOnDownload,
    supportsOnUpgrade,
+    supportsOnImportComplete,
    supportsOnRename,
    supportsOnSeriesAdd,
    supportsOnSeriesDelete,
@@ -66,7 +68,7 @@ function NotificationEventItems(props) {
            <FormInputGroup
              type={inputTypes.CHECK}
              name="onDownload"
-              helpText={translate('OnImport')}
+              helpText={translate('OnFileImport')}
              isDisabled={!supportsOnDownload.value}
              {...onDownload}
              onChange={onInputChange}
@@ -87,6 +89,17 @@ function NotificationEventItems(props) {
              </div>
          }

+          <div>
+            <FormInputGroup
+              type={inputTypes.CHECK}
+              name="onImportComplete"
+              helpText={translate('OnImportComplete')}
+              isDisabled={!supportsOnImportComplete.value}
+              {...onImportComplete}
+              onChange={onInputChange}
+            />
+          </div>
+
          <div>
            <FormInputGroup
              type={inputTypes.CHECK}
--- a/frontend/src/Store/Actions/Creators/Reducers/createSetProviderFieldValuesReducer.js
+++ b/frontend/src/Store/Actions/Creators/Reducers/createSetProviderFieldValuesReducer.js
@@ -0,0 +1,25 @@
+import getSectionState from 'Utilities/State/getSectionState';
+import updateSectionState from 'Utilities/State/updateSectionState';
+
+function createSetProviderFieldValuesReducer(section) {
+  return (state, { payload }) => {
+    if (section === payload.section) {
+      const { properties } = payload;
+      const newState = getSectionState(state, section);
+      newState.pendingChanges = Object.assign({}, newState.pendingChanges);
+      const fields = Object.assign({}, newState.pendingChanges.fields || {});
+
+      Object.keys(properties).forEach((name) => {
+        fields[name] = properties[name];
+      });
+
+      newState.pendingChanges.fields = fields;
+
+      return updateSectionState(state, section, newState);
+    }
+
+    return state;
+  };
+}
+
+export default createSetProviderFieldValuesReducer;
--- a/frontend/src/Store/Actions/Settings/notifications.js
+++ b/frontend/src/Store/Actions/Settings/notifications.js
@@ -5,6 +5,7 @@ import createRemoveItemHandler from 'Store/Actions/Creators/createRemoveItemHand
 import createSaveProviderHandler, { createCancelSaveProviderHandler } from 'Store/Actions/Creators/createSaveProviderHandler';
 import createTestProviderHandler, { createCancelTestProviderHandler } from 'Store/Actions/Creators/createTestProviderHandler';
 import createSetProviderFieldValueReducer from 'Store/Actions/Creators/Reducers/createSetProviderFieldValueReducer';
+import createSetProviderFieldValuesReducer from 'Store/Actions/Creators/Reducers/createSetProviderFieldValuesReducer';
 import createSetSettingValueReducer from 'Store/Actions/Creators/Reducers/createSetSettingValueReducer';
 import { createThunk } from 'Store/thunks';
 import selectProviderSchema from 'Utilities/State/selectProviderSchema';
@@ -22,6 +23,7 @@ export const FETCH_NOTIFICATION_SCHEMA = 'settings/notifications/fetchNotificati
 export const SELECT_NOTIFICATION_SCHEMA = 'settings/notifications/selectNotificationSchema';
 export const SET_NOTIFICATION_VALUE = 'settings/notifications/setNotificationValue';
 export const SET_NOTIFICATION_FIELD_VALUE = 'settings/notifications/setNotificationFieldValue';
+export const SET_NOTIFICATION_FIELD_VALUES = 'settings/notifications/setNotificationFieldValues';
 export const SAVE_NOTIFICATION = 'settings/notifications/saveNotification';
 export const CANCEL_SAVE_NOTIFICATION = 'settings/notifications/cancelSaveNotification';
 export const DELETE_NOTIFICATION = 'settings/notifications/deleteNotification';
@@ -55,6 +57,13 @@ export const setNotificationFieldValue = createAction(SET_NOTIFICATION_FIELD_VAL
  };
 });

+export const setNotificationFieldValues = createAction(SET_NOTIFICATION_FIELD_VALUES, (payload) => {
+  return {
+    section,
+    ...payload
+  };
+});
+
 //
 // Details

@@ -99,6 +108,7 @@ export default {
  reducers: {
    [SET_NOTIFICATION_VALUE]: createSetSettingValueReducer(section),
    [SET_NOTIFICATION_FIELD_VALUE]: createSetProviderFieldValueReducer(section),
+    [SET_NOTIFICATION_FIELD_VALUES]: createSetProviderFieldValuesReducer(section),

    [SELECT_NOTIFICATION_SCHEMA]: (state, { payload }) => {
      return selectProviderSchema(state, section, payload, (selectedSchema) => {
@@ -106,6 +116,7 @@ export default {
        selectedSchema.onGrab = selectedSchema.supportsOnGrab;
        selectedSchema.onDownload = selectedSchema.supportsOnDownload;
        selectedSchema.onUpgrade = selectedSchema.supportsOnUpgrade;
+        selectedSchema.onImportComplete = selectedSchema.supportsOnImportComplete;
        selectedSchema.onRename = selectedSchema.supportsOnRename;
        selectedSchema.onSeriesAdd = selectedSchema.supportsOnSeriesAdd;
        selectedSchema.onSeriesDelete = selectedSchema.supportsOnSeriesDelete;
--- a/frontend/src/Store/Actions/blocklistActions.js
+++ b/frontend/src/Store/Actions/blocklistActions.js
@@ -1,6 +1,6 @@
 import { createAction } from 'redux-actions';
 import { batchActions } from 'redux-batched-actions';
-import { sortDirections } from 'Helpers/Props';
+import { filterBuilderTypes, filterBuilderValueTypes, sortDirections } from 'Helpers/Props';
 import { createThunk, handleThunks } from 'Store/thunks';
 import createAjaxRequest from 'Utilities/createAjaxRequest';
 import serverSideCollectionHandlers from 'Utilities/serverSideCollectionHandlers';
@@ -77,6 +77,31 @@ export const defaultState = {
      isVisible: true,
      isModifiable: false
    }
+  ],
+
+  selectedFilterKey: 'all',
+
+  filters: [
+    {
+      key: 'all',
+      label: () => translate('All'),
+      filters: []
+    }
+  ],
+
+  filterBuilderProps: [
+    {
+      name: 'seriesIds',
+      label: () => translate('Series'),
+      type: filterBuilderTypes.EQUAL,
+      valueType: filterBuilderValueTypes.SERIES
+    },
+    {
+      name: 'protocols',
+      label: () => translate('Protocol'),
+      type: filterBuilderTypes.EQUAL,
+      valueType: filterBuilderValueTypes.PROTOCOL
+    }
  ]
 };

@@ -84,6 +109,7 @@ export const persistState = [
  'blocklist.pageSize',
  'blocklist.sortKey',
  'blocklist.sortDirection',
+  'blocklist.selectedFilterKey',
  'blocklist.columns'
 ];

@@ -97,6 +123,7 @@ export const GOTO_NEXT_BLOCKLIST_PAGE = 'blocklist/gotoBlocklistNextPage';
 export const GOTO_LAST_BLOCKLIST_PAGE = 'blocklist/gotoBlocklistLastPage';
 export const GOTO_BLOCKLIST_PAGE = 'blocklist/gotoBlocklistPage';
 export const SET_BLOCKLIST_SORT = 'blocklist/setBlocklistSort';
+export const SET_BLOCKLIST_FILTER = 'blocklist/setBlocklistFilter';
 export const SET_BLOCKLIST_TABLE_OPTION = 'blocklist/setBlocklistTableOption';
 export const REMOVE_BLOCKLIST_ITEM = 'blocklist/removeBlocklistItem';
 export const REMOVE_BLOCKLIST_ITEMS = 'blocklist/removeBlocklistItems';
@@ -112,6 +139,7 @@ export const gotoBlocklistNextPage = createThunk(GOTO_NEXT_BLOCKLIST_PAGE);
 export const gotoBlocklistLastPage = createThunk(GOTO_LAST_BLOCKLIST_PAGE);
 export const gotoBlocklistPage = createThunk(GOTO_BLOCKLIST_PAGE);
 export const setBlocklistSort = createThunk(SET_BLOCKLIST_SORT);
+export const setBlocklistFilter = createThunk(SET_BLOCKLIST_FILTER);
 export const setBlocklistTableOption = createAction(SET_BLOCKLIST_TABLE_OPTION);
 export const removeBlocklistItem = createThunk(REMOVE_BLOCKLIST_ITEM);
 export const removeBlocklistItems = createThunk(REMOVE_BLOCKLIST_ITEMS);
@@ -132,7 +160,8 @@ export const actionHandlers = handleThunks({
      [serverSideCollectionHandlers.NEXT_PAGE]: GOTO_NEXT_BLOCKLIST_PAGE,
      [serverSideCollectionHandlers.LAST_PAGE]: GOTO_LAST_BLOCKLIST_PAGE,
      [serverSideCollectionHandlers.EXACT_PAGE]: GOTO_BLOCKLIST_PAGE,
-      [serverSideCollectionHandlers.SORT]: SET_BLOCKLIST_SORT
+      [serverSideCollectionHandlers.SORT]: SET_BLOCKLIST_SORT,
+      [serverSideCollectionHandlers.FILTER]: SET_BLOCKLIST_FILTER
    }),

  [REMOVE_BLOCKLIST_ITEM]: createRemoveItemHandler(section, '/blocklist'),
--- a/frontend/src/Store/Actions/seriesActions.js
+++ b/frontend/src/Store/Actions/seriesActions.js
@@ -192,6 +192,22 @@ export const filterPredicates = {
    });

    return predicate(hasMissingSeason, filterValue);
+  },
+
+  hasUnmonitoredSeason: function(item, filterValue, type) {
+    const predicate = filterTypePredicates[type];
+    const { seasons = [] } = item;
+
+    const hasUnmonitoredSeason = seasons.some((season) => {
+      const {
+        seasonNumber,
+        monitored
+      } = season;
+
+      return seasonNumber > 0 && !monitored;
+    });
+
+    return predicate(hasUnmonitoredSeason, filterValue);
  }
 };

@@ -353,6 +369,12 @@ export const filterBuilderProps = [
    type: filterBuilderTypes.EXACT,
    valueType: filterBuilderValueTypes.BOOL
  },
+  {
+    name: 'hasUnmonitoredSeason',
+    label: () => translate('HasUnmonitoredSeason'),
+    type: filterBuilderTypes.EXACT,
+    valueType: filterBuilderValueTypes.BOOL
+  },
  {
    name: 'year',
    label: () => translate('Year'),
--- a/frontend/src/Styles/Themes/index.js
+++ b/frontend/src/Styles/Themes/index.js
@@ -2,7 +2,7 @@ import * as dark from './dark';
 import * as light from './light';

 const defaultDark = window.matchMedia('(prefers-color-scheme: dark)').matches;
-const auto = defaultDark ? { ...dark } : { ...light };
+const auto = defaultDark ? dark : light;

 export default {
  auto,
--- a/frontend/src/Styles/Variables/fonts.js
+++ b/frontend/src/Styles/Variables/fonts.js
@@ -2,7 +2,6 @@ module.exports = {
  // Families
  defaultFontFamily: 'Roboto, "open sans", "Helvetica Neue", Helvetica, Arial, sans-serif',
  monoSpaceFontFamily: '"Ubuntu Mono", Menlo, Monaco, Consolas, "Courier New", monospace;',
-  passwordFamily: 'text-security-disc',

  // Sizes
  extraSmallFontSize: '11px',
--- a/frontend/src/Utilities/Date/getRelativeDate.js
+++ b/frontend/src/Utilities/Date/getRelativeDate.js
@@ -1,43 +0,0 @@
-import moment from 'moment';
-import formatTime from 'Utilities/Date/formatTime';
-import isInNextWeek from 'Utilities/Date/isInNextWeek';
-import isToday from 'Utilities/Date/isToday';
-import isTomorrow from 'Utilities/Date/isTomorrow';
-import isYesterday from 'Utilities/Date/isYesterday';
-import translate from 'Utilities/String/translate';
-
-function getRelativeDate(date, shortDateFormat, showRelativeDates, { timeFormat, includeSeconds = false, timeForToday = false } = {}) {
-  if (!date) {
-    return null;
-  }
-
-  const isTodayDate = isToday(date);
-
-  if (isTodayDate && timeForToday && timeFormat) {
-    return formatTime(date, timeFormat, { includeMinuteZero: true, includeSeconds });
-  }
-
-  if (!showRelativeDates) {
-    return moment(date).format(shortDateFormat);
-  }
-
-  if (isYesterday(date)) {
-    return translate('Yesterday');
-  }
-
-  if (isTodayDate) {
-    return translate('Today');
-  }
-
-  if (isTomorrow(date)) {
-    return translate('Tomorrow');
-  }
-
-  if (isInNextWeek(date)) {
-    return moment(date).format('dddd');
-  }
-
-  return moment(date).format(shortDateFormat);
-}
-
-export default getRelativeDate;
--- a/frontend/src/Utilities/Date/getRelativeDate.tsx
+++ b/frontend/src/Utilities/Date/getRelativeDate.tsx
@@ -0,0 +1,82 @@
+import moment from 'moment';
+import formatTime from 'Utilities/Date/formatTime';
+import isInNextWeek from 'Utilities/Date/isInNextWeek';
+import isToday from 'Utilities/Date/isToday';
+import isTomorrow from 'Utilities/Date/isTomorrow';
+import isYesterday from 'Utilities/Date/isYesterday';
+import translate from 'Utilities/String/translate';
+import formatDateTime from './formatDateTime';
+
+interface GetRelativeDateOptions {
+  date?: string;
+  shortDateFormat: string;
+  showRelativeDates: boolean;
+  timeFormat?: string;
+  includeSeconds?: boolean;
+  timeForToday?: boolean;
+  includeTime?: boolean;
+}
+
+function getRelativeDate({
+  date,
+  shortDateFormat,
+  showRelativeDates,
+  timeFormat,
+  includeSeconds = false,
+  timeForToday = false,
+  includeTime = false,
+}: GetRelativeDateOptions) {
+  if (!date) {
+    return null;
+  }
+
+  if ((includeTime || timeForToday) && !timeFormat) {
+    throw new Error(
+      "getRelativeDate: 'timeFormat' is required when 'includeTime' or 'timeForToday' is true"
+    );
+  }
+
+  const isTodayDate = isToday(date);
+  const time = timeFormat
+    ? formatTime(date, timeFormat, {
+        includeMinuteZero: true,
+        includeSeconds,
+      })
+    : '';
+
+  if (isTodayDate && timeForToday) {
+    return time;
+  }
+
+  if (!showRelativeDates) {
+    return moment(date).format(shortDateFormat);
+  }
+
+  if (isYesterday(date)) {
+    return includeTime
+      ? translate('YesterdayAt', { time })
+      : translate('Yesterday');
+  }
+
+  if (isTodayDate) {
+    return includeTime ? translate('TodayAt', { time }) : translate('Today');
+  }
+
+  if (isTomorrow(date)) {
+    return includeTime
+      ? translate('TomorrowAt', { time })
+      : translate('Tomorrow');
+  }
+
+  if (isInNextWeek(date)) {
+    const day = moment(date).format('dddd');
+
+    return includeTime ? translate('DayOfWeekAt', { day, time }) : day;
+  }
+
+  return includeTime
+    ? formatDateTime(date, shortDateFormat, timeFormat, { includeSeconds })
+    : moment(date).format(shortDateFormat);
+}
+
+export default getRelativeDate;
--- a/frontend/src/login.html
+++ b/frontend/src/login.html
@@ -57,8 +57,8 @@

    <style>
      body {
-        background-color: #f5f7fa;
-        color: #656565;
+        background-color: var(--pageBackground);
+        color: var(--textColor);
        font-family: "Roboto", "open sans", "Helvetica Neue", Helvetica, Arial,
          sans-serif;
      }
@@ -88,14 +88,14 @@
        padding: 10px;
        border-top-left-radius: 4px;
        border-top-right-radius: 4px;
-        background-color: #3a3f51;
+        background-color: var(--themeDarkColor);
      }

      .panel-body {
        padding: 20px;
        border-bottom-right-radius: 4px;
        border-bottom-left-radius: 4px;
-        background-color: #fff;
+        background-color: var(--panelBackground);
      }

      .sign-in {
@@ -112,16 +112,18 @@
        padding: 6px 16px;
        width: 100%;
        height: 35px;
-        border: 1px solid #dde6e9;
+        background-color: var(--inputBackgroundColor);
+        border: 1px solid var(--inputBorderColor);
        border-radius: 4px;
-        box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+        box-shadow: inset 0 1px 1px var(--inputBoxShadowColor);
+        color: var(--textColor);
      }

      .form-input:focus {
        outline: 0;
-        border-color: #66afe9;
-        box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075),
-          0 0 8px rgba(102, 175, 233, 0.6);
+        border-color: var(--inputFocusBorderColor);
+        box-shadow: inset 0 1px 1px var(--inputBoxShadowColor),
+          0 0 8px var(--inputFocusBoxShadowColor);
      }

      .button {
@@ -130,10 +132,10 @@
        padding: 10px 0;
        width: 100%;
        border: 1px solid;
-        border-color: #5899eb;
+        border-color: var(--primaryBorderColor);
        border-radius: 4px;
-        background-color: #5d9cec;
-        color: #fff;
+        background-color: var(--primaryBackgroundColor);
+        color: var(--white);
        vertical-align: middle;
        text-align: center;
        white-space: nowrap;
@@ -141,9 +143,9 @@
      }

      .button:hover {
-        border-color: #3483e7;
-        background-color: #4b91ea;
-        color: #fff;
+        border-color: var(--primaryHoverBorderColor);
+        background-color: var(--primaryHoverBackgroundColor);
+        color: var(--white);
        text-decoration: none;
      }

@@ -165,24 +167,24 @@

      .forgot-password {
        margin-left: auto;
-        color: #909fa7;
+        color: var(--forgotPasswordColor);
        text-decoration: none;
        font-size: 13px;
      }

      .forgot-password:focus,
      .forgot-password:hover {
-        color: #748690;
+        color: var(--forgotPasswordAltColor);
        text-decoration: underline;
      }

      .forgot-password:visited {
-        color: #748690;
+        color: var(--forgotPasswordAltColor);
      }

      .login-failed {
        margin-top: 20px;
-        color: #f05050;
+        color: var(--failedColor);
        font-size: 14px;
      }

@@ -291,5 +293,59 @@

      loginFailedDiv.classList.remove("hidden");
    }
+
+    var light = {
+      white: '#fff',
+      pageBackground: '#f5f7fa',
+      textColor: '#515253',
+      themeDarkColor: '#3a3f51',
+      panelBackground: '#fff',
+      inputBackgroundColor: '#fff',
+      inputBorderColor: '#dde6e9',
+      inputBoxShadowColor: 'rgba(0, 0, 0, 0.075)',
+      inputFocusBorderColor: '#66afe9',
+      inputFocusBoxShadowColor: 'rgba(102, 175, 233, 0.6)',
+      primaryBackgroundColor: '#5d9cec',
+      primaryBorderColor: '#5899eb',
+      primaryHoverBackgroundColor: '#4b91ea',
+      primaryHoverBorderColor: '#3483e7',
+      failedColor: '#f05050',
+      forgotPasswordColor: '#909fa7',
+      forgotPasswordAltColor: '#748690'
+    };
+
+    var dark = {
+      white: '#fff',
+      pageBackground: '#202020',
+      textColor: '#ccc',
+      themeDarkColor: '#494949',
+      panelBackground: '#111',
+      inputBackgroundColor: '#333',
+      inputBorderColor: '#dde6e9',
+      inputBoxShadowColor: 'rgba(0, 0, 0, 0.075)',
+      inputFocusBorderColor: '#66afe9',
+      inputFocusBoxShadowColor: 'rgba(102, 175, 233, 0.6)',
+      primaryBackgroundColor: '#5d9cec',
+      primaryBorderColor: '#5899eb',
+      primaryHoverBackgroundColor: '#4b91ea',
+      primaryHoverBorderColor: '#3483e7',
+      failedColor: '#f05050',
+      forgotPasswordColor: '#737d83',
+      forgotPasswordAltColor: '#546067'
+    };
+
+    var theme = "_THEME_";
+    var defaultDark = window.matchMedia('(prefers-color-scheme: dark)').matches;
+    var finalTheme = theme === 'dark' || (theme === 'auto' && defaultDark) ?
+      dark :
+      light;
+
+    Object.entries(finalTheme).forEach(([key, value]) => {
+      document.documentElement.style.setProperty(
+        `--${key}`,
+        value
+      );
+    });
+
  </script>
 </html>
--- a/frontend/src/typings/Blocklist.ts
+++ b/frontend/src/typings/Blocklist.ts
@@ -0,0 +1,16 @@
+import ModelBase from 'App/ModelBase';
+import Language from 'Language/Language';
+import { QualityModel } from 'Quality/Quality';
+import CustomFormat from 'typings/CustomFormat';
+
+interface Blocklist extends ModelBase {
+  languages: Language[];
+  quality: QualityModel;
+  customFormats: CustomFormat[];
+  title: string;
+  date?: string;
+  protocol: string;
+  seriesId?: number;
+}
+
+export default Blocklist;
--- a/frontend/src/typings/UiSettings.ts
+++ b/frontend/src/typings/UiSettings.ts
@@ -1,5 +1,5 @@
 export interface UiSettings {
-  theme: string;
+  theme: 'auto' | 'dark' | 'light';
  showRelativeDates: boolean;
  shortDateFormat: string;
  longDateFormat: string;
--- a/src/NzbDrone.Common/Disk/DiskProviderBase.cs
+++ b/src/NzbDrone.Common/Disk/DiskProviderBase.cs
@@ -153,7 +153,11 @@ namespace NzbDrone.Common.Disk
        {
            Ensure.That(path, () => path).IsValidPath(PathValidationType.CurrentOs);

-            return Directory.EnumerateDirectories(path);
+            return Directory.EnumerateDirectories(path, "*", new EnumerationOptions
+            {
+                AttributesToSkip = FileAttributes.System,
+                IgnoreInaccessible = true
+            });
        }

        public IEnumerable<string> GetFiles(string path, bool recursive)
--- a/src/NzbDrone.Core.Test/Download/CompletedDownloadServiceTests/ImportFixture.cs
+++ b/src/NzbDrone.Core.Test/Download/CompletedDownloadServiceTests/ImportFixture.cs
@@ -71,6 +71,10 @@ namespace NzbDrone.Core.Test.Download.CompletedDownloadServiceTests
            Mocker.GetMock<IProvideImportItemService>()
                  .Setup(s => s.ProvideImportItem(It.IsAny<DownloadClientItem>(), It.IsAny<DownloadClientItem>()))
                  .Returns<DownloadClientItem, DownloadClientItem>((i, p) => i);
+
+            Mocker.GetMock<IEpisodeService>()
+                .Setup(s => s.GetEpisodes(It.IsAny<IEnumerable<int>>()))
+                .Returns(new List<Episode>());
        }

        private RemoteEpisode BuildRemoteEpisode()
@@ -366,7 +370,7 @@ namespace NzbDrone.Core.Test.Download.CompletedDownloadServiceTests
            Mocker.GetMock<IEventAggregator>()
                  .Verify(v => v.PublishEvent(It.IsAny<DownloadCompletedEvent>()), Times.Never());

-            _trackedDownload.State.Should().Be(TrackedDownloadState.ImportPending);
+            _trackedDownload.State.Should().Be(TrackedDownloadState.ImportBlocked);
        }

        private void AssertImported()
--- a/src/NzbDrone.Core.Test/Download/DownloadClientTests/QBittorrentTests/QBittorrentFixture.cs
+++ b/src/NzbDrone.Core.Test/Download/DownloadClientTests/QBittorrentTests/QBittorrentFixture.cs
@@ -178,8 +178,9 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.QBittorrentTests
            VerifyWarning(item);
        }

-        [Test]
-        public void paused_item_should_have_required_properties()
+        [TestCase("pausedDL")]
+        [TestCase("stoppedDL")]
+        public void paused_item_should_have_required_properties(string state)
        {
            var torrent = new QBittorrentTorrent
            {
@@ -188,7 +189,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.QBittorrentTests
                Size = 1000,
                Progress = 0.7,
                Eta = 8640000,
-                State = "pausedDL",
+                State = state,
                Label = "",
                SavePath = ""
            };
@@ -200,6 +201,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.QBittorrentTests
        }

        [TestCase("pausedUP")]
+        [TestCase("stoppedUP")]
        [TestCase("queuedUP")]
        [TestCase("uploading")]
        [TestCase("stalledUP")]
@@ -418,8 +420,9 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.QBittorrentTests
            result.OutputPath.FullPath.Should().Be(Path.Combine(torrent.SavePath, "Droned.S01.12"));
        }

-        [Test]
-        public void api_261_should_use_content_path()
+        [TestCase("pausedUP")]
+        [TestCase("stoppedUP")]
+        public void api_261_should_use_content_path(string state)
        {
            var torrent = new QBittorrentTorrent
            {
@@ -428,7 +431,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.QBittorrentTests
                Size = 1000,
                Progress = 0.7,
                Eta = 8640000,
-                State = "pausedUP",
+                State = state,
                Label = "",
                SavePath = @"C:\Torrents".AsOsAgnostic(),
                ContentPath = @"C:\Torrents\Droned.S01.12".AsOsAgnostic()
@@ -657,44 +660,48 @@ 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_ratio_is_not_set()
+        [TestCase("pausedUP")]
+        [TestCase("stoppedUP")]
+        public void should_not_be_removable_and_should_not_allow_move_files_if_max_ratio_is_not_set(string state)
        {
            GivenGlobalSeedLimits(-1);
-            GivenCompletedTorrent("pausedUP", ratio: 1.0f);
+            GivenCompletedTorrent(state, ratio: 1.0f);

            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_ratio_reached_and_paused()
+        [TestCase("pausedUP")]
+        [TestCase("stoppedUP")]
+        public void should_be_removable_and_should_allow_move_files_if_max_ratio_reached_and_paused(string state)
        {
            GivenGlobalSeedLimits(1.0f);
-            GivenCompletedTorrent("pausedUP", ratio: 1.0f);
+            GivenCompletedTorrent(state, ratio: 1.0f);

            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_ratio_reached_and_paused()
+        [TestCase("pausedUP")]
+        [TestCase("stoppedUP")]
+        public void should_be_removable_and_should_allow_move_files_if_overridden_max_ratio_reached_and_paused(string state)
        {
            GivenGlobalSeedLimits(2.0f);
-            GivenCompletedTorrent("pausedUP", ratio: 1.0f, ratioLimit: 0.8f);
+            GivenCompletedTorrent(state, ratio: 1.0f, ratioLimit: 0.8f);

            var item = Subject.GetItems().Single();
            item.CanBeRemoved.Should().BeTrue();
            item.CanMoveFiles.Should().BeTrue();
        }

-        [Test]
-        public void should_not_be_removable_if_overridden_max_ratio_not_reached_and_paused()
+        [TestCase("pausedUP")]
+        [TestCase("stoppedUP")]
+        public void should_not_be_removable_if_overridden_max_ratio_not_reached_and_paused(string state)
        {
            GivenGlobalSeedLimits(0.2f);
-            GivenCompletedTorrent("pausedUP", ratio: 0.5f, ratioLimit: 0.8f);
+            GivenCompletedTorrent(state, ratio: 0.5f, ratioLimit: 0.8f);

            var item = Subject.GetItems().Single();
            item.CanBeRemoved.Should().BeFalse();
@@ -712,33 +719,36 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.QBittorrentTests
            item.CanMoveFiles.Should().BeFalse();
        }

-        [Test]
-        public void should_be_removable_and_should_allow_move_files_if_max_seedingtime_reached_and_paused()
+        [TestCase("pausedUP")]
+        [TestCase("stoppedUP")]
+        public void should_be_removable_and_should_allow_move_files_if_max_seedingtime_reached_and_paused(string state)
        {
            GivenGlobalSeedLimits(-1, 20);
-            GivenCompletedTorrent("pausedUP", ratio: 2.0f, seedingTime: 20);
+            GivenCompletedTorrent(state, ratio: 2.0f, seedingTime: 20);

            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_seedingtime_reached_and_paused()
+        [TestCase("pausedUP")]
+        [TestCase("stoppedUP")]
+        public void should_be_removable_and_should_allow_move_files_if_overridden_max_seedingtime_reached_and_paused(string state)
        {
            GivenGlobalSeedLimits(-1, 40);
-            GivenCompletedTorrent("pausedUP", ratio: 2.0f, seedingTime: 20, seedingTimeLimit: 10);
+            GivenCompletedTorrent(state, ratio: 2.0f, seedingTime: 20, seedingTimeLimit: 10);

            var item = Subject.GetItems().Single();
            item.CanBeRemoved.Should().BeTrue();
            item.CanMoveFiles.Should().BeTrue();
        }

-        [Test]
-        public void should_not_be_removable_if_overridden_max_seedingtime_not_reached_and_paused()
+        [TestCase("pausedUP")]
+        [TestCase("stoppedUP")]
+        public void should_not_be_removable_if_overridden_max_seedingtime_not_reached_and_paused(string state)
        {
            GivenGlobalSeedLimits(-1, 20);
-            GivenCompletedTorrent("pausedUP", ratio: 2.0f, seedingTime: 30, seedingTimeLimit: 40);
+            GivenCompletedTorrent(state, ratio: 2.0f, seedingTime: 30, seedingTimeLimit: 40);

            var item = Subject.GetItems().Single();
            item.CanBeRemoved.Should().BeFalse();
@@ -756,66 +766,72 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.QBittorrentTests
            item.CanMoveFiles.Should().BeFalse();
        }

-        [Test]
-        public void should_be_removable_and_should_allow_move_files_if_max_inactive_seedingtime_reached_and_paused()
+        [TestCase("pausedUP")]
+        [TestCase("stoppedUP")]
+        public void should_be_removable_and_should_allow_move_files_if_max_inactive_seedingtime_reached_and_paused(string state)
        {
            GivenGlobalSeedLimits(-1, maxInactiveSeedingTime: 20);
-            GivenCompletedTorrent("pausedUP", ratio: 2.0f, lastActivity: DateTimeOffset.UtcNow.Subtract(TimeSpan.FromMinutes(25)).ToUnixTimeSeconds());
+            GivenCompletedTorrent(state, 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()
+        [TestCase("pausedUP")]
+        [TestCase("stoppedUP")]
+        public void should_be_removable_and_should_allow_move_files_if_overridden_max_inactive_seedingtime_reached_and_paused(string state)
        {
            GivenGlobalSeedLimits(-1, maxInactiveSeedingTime: 40);
-            GivenCompletedTorrent("pausedUP", ratio: 2.0f, seedingTime: 20, inactiveSeedingTimeLimit: 10, lastActivity: DateTimeOffset.UtcNow.Subtract(TimeSpan.FromMinutes(15)).ToUnixTimeSeconds());
+            GivenCompletedTorrent(state, 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()
+        [TestCase("pausedUP")]
+        [TestCase("stoppedUP")]
+        public void should_not_be_removable_if_overridden_max_inactive_seedingtime_not_reached_and_paused(string state)
        {
            GivenGlobalSeedLimits(-1, maxInactiveSeedingTime: 20);
-            GivenCompletedTorrent("pausedUP", ratio: 2.0f, seedingTime: 30, inactiveSeedingTimeLimit: 40, lastActivity: DateTimeOffset.UtcNow.Subtract(TimeSpan.FromMinutes(30)).ToUnixTimeSeconds());
+            GivenCompletedTorrent(state, 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()
+        [TestCase("pausedUP")]
+        [TestCase("stoppedUP")]
+        public void should_be_removable_and_should_allow_move_files_if_max_seedingtime_reached_but_ratio_not_and_paused(string state)
        {
            GivenGlobalSeedLimits(2.0f, 20);
-            GivenCompletedTorrent("pausedUP", ratio: 1.0f, seedingTime: 30);
+            GivenCompletedTorrent(state, ratio: 1.0f, seedingTime: 30);

            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_max_inactive_seedingtime_reached_but_ratio_not_and_paused()
+        [TestCase("pausedUP")]
+        [TestCase("stoppedUP")]
+        public void should_be_removable_and_should_allow_move_files_if_max_inactive_seedingtime_reached_but_ratio_not_and_paused(string state)
        {
            GivenGlobalSeedLimits(2.0f, maxInactiveSeedingTime: 20);
-            GivenCompletedTorrent("pausedUP", ratio: 1.0f, lastActivity: DateTimeOffset.UtcNow.Subtract(TimeSpan.FromMinutes(25)).ToUnixTimeSeconds());
+            GivenCompletedTorrent(state, 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()
+        [TestCase("pausedUP")]
+        [TestCase("stoppedUP")]
+        public void should_not_fetch_details_twice(string state)
        {
            GivenGlobalSeedLimits(-1, 30);
-            GivenCompletedTorrent("pausedUP", ratio: 2.0f, seedingTime: 20);
+            GivenCompletedTorrent(state, ratio: 2.0f, seedingTime: 20);

            var item = Subject.GetItems().Single();
            item.CanBeRemoved.Should().BeFalse();
@@ -827,8 +843,9 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.QBittorrentTests
                  .Verify(p => p.GetTorrentProperties(It.IsAny<string>(), It.IsAny<QBittorrentSettings>()), Times.Once());
        }

-        [Test]
-        public void should_get_category_from_the_category_if_set()
+        [TestCase("pausedUP")]
+        [TestCase("stoppedUP")]
+        public void should_get_category_from_the_category_if_set(string state)
        {
            const string category = "tv-sonarr";
            GivenGlobalSeedLimits(1.0f);
@@ -840,7 +857,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.QBittorrentTests
                Size = 1000,
                Progress = 1.0,
                Eta = 8640000,
-                State = "pausedUP",
+                State = state,
                Category = category,
                SavePath = "",
                Ratio = 1.0f
@@ -852,8 +869,9 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.QBittorrentTests
            item.Category.Should().Be(category);
        }

-        [Test]
-        public void should_get_category_from_the_label_if_the_category_is_not_available()
+        [TestCase("pausedUP")]
+        [TestCase("stoppedUP")]
+        public void should_get_category_from_the_label_if_the_category_is_not_available(string state)
        {
            const string category = "tv-sonarr";
            GivenGlobalSeedLimits(1.0f);
@@ -865,7 +883,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.QBittorrentTests
                Size = 1000,
                Progress = 1.0,
                Eta = 8640000,
-                State = "pausedUP",
+                State = state,
                Label = category,
                SavePath = "",
                Ratio = 1.0f
--- a/src/NzbDrone.Core.Test/IndexerSearchTests/ReleaseSearchServiceFixture.cs
+++ b/src/NzbDrone.Core.Test/IndexerSearchTests/ReleaseSearchServiceFixture.cs
@@ -608,5 +608,47 @@ namespace NzbDrone.Core.Test.IndexerSearchTests
            allCriteria.Last().As<SingleEpisodeSearchCriteria>().SeasonNumber.Should().Be(2);
            allCriteria.Last().As<SingleEpisodeSearchCriteria>().EpisodeNumber.Should().Be(3);
        }
+
+        [Test]
+        public async Task episode_search_should_include_series_title_when_not_a_direct_title_match()
+        {
+            _xemSeries.Title = "Sonarr's Title";
+            _xemSeries.CleanTitle = "sonarrstitle";
+
+            WithEpisode(1, 12, 2, 3);
+
+            Mocker.GetMock<ISceneMappingService>()
+                .Setup(s => s.FindByTvdbId(It.IsAny<int>()))
+                .Returns(new List<SceneMapping>
+                {
+                    new SceneMapping
+                    {
+                        TvdbId = _xemSeries.TvdbId,
+                        SearchTerm = "Sonarrs Title",
+                        ParseTerm = _xemSeries.CleanTitle,
+                        SeasonNumber = 1,
+                        SceneSeasonNumber = 1,
+                        SceneOrigin = "tvdb",
+                        Type = "ServicesProvider"
+                    }
+                });
+
+            var allCriteria = WatchForSearchCriteria();
+
+            await Subject.EpisodeSearch(_xemEpisodes.First(), false, false);
+
+            Mocker.GetMock<ISceneMappingService>()
+                .Verify(v => v.FindByTvdbId(_xemSeries.Id), Times.Once());
+
+            allCriteria.Should().HaveCount(2);
+
+            allCriteria.First().Should().BeOfType<SingleEpisodeSearchCriteria>();
+            allCriteria.First().As<SingleEpisodeSearchCriteria>().SeasonNumber.Should().Be(1);
+            allCriteria.First().As<SingleEpisodeSearchCriteria>().EpisodeNumber.Should().Be(12);
+
+            allCriteria.Last().Should().BeOfType<SingleEpisodeSearchCriteria>();
+            allCriteria.Last().As<SingleEpisodeSearchCriteria>().SeasonNumber.Should().Be(2);
+            allCriteria.Last().As<SingleEpisodeSearchCriteria>().EpisodeNumber.Should().Be(3);
+        }
    }
 }
--- a/src/NzbDrone.Core.Test/IndexerTests/NewznabTests/NewznabRequestGeneratorFixture.cs
+++ b/src/NzbDrone.Core.Test/IndexerTests/NewznabTests/NewznabRequestGeneratorFixture.cs
@@ -36,7 +36,7 @@ namespace NzbDrone.Core.Test.IndexerTests.NewznabTests

            _singleEpisodeSearchCriteria = new SingleEpisodeSearchCriteria
            {
-                Series = new Tv.Series { TvRageId = 10, TvdbId = 20, TvMazeId = 30, ImdbId = "t40" },
+                Series = new Tv.Series { TvRageId = 10, TvdbId = 20, TvMazeId = 30, ImdbId = "t40", TmdbId = 50 },
                SceneTitles = new List<string> { "Monkey Island" },
                SeasonNumber = 1,
                EpisodeNumber = 2
@@ -44,14 +44,14 @@ namespace NzbDrone.Core.Test.IndexerTests.NewznabTests

            _seasonSearchCriteria = new SeasonSearchCriteria
            {
-                Series = new Tv.Series { TvRageId = 10, TvdbId = 20, TvMazeId = 30, ImdbId = "t40" },
+                Series = new Tv.Series { TvRageId = 10, TvdbId = 20, TvMazeId = 30, ImdbId = "t40", TmdbId = 50 },
                SceneTitles = new List<string> { "Monkey Island" },
                SeasonNumber = 1,
            };

            _animeSearchCriteria = new AnimeEpisodeSearchCriteria()
            {
-                Series = new Tv.Series { TvRageId = 10, TvdbId = 20, TvMazeId = 30, ImdbId = "t40" },
+                Series = new Tv.Series { TvRageId = 10, TvdbId = 20, TvMazeId = 30, ImdbId = "t40", TmdbId = 50 },
                SceneTitles = new List<string>() { "Monkey+Island" },
                AbsoluteEpisodeNumber = 100,
                SeasonNumber = 5,
@@ -60,7 +60,7 @@ namespace NzbDrone.Core.Test.IndexerTests.NewznabTests

            _animeSeasonSearchCriteria = new AnimeSeasonSearchCriteria()
            {
-                Series = new Tv.Series { TvRageId = 10, TvdbId = 20, TvMazeId = 30, ImdbId = "t40" },
+                Series = new Tv.Series { TvRageId = 10, TvdbId = 20, TvMazeId = 30, ImdbId = "t40", TmdbId = 50 },
                SceneTitles = new List<string> { "Monkey Island" },
                SeasonNumber = 3,
            };
@@ -268,6 +268,19 @@ namespace NzbDrone.Core.Test.IndexerTests.NewznabTests
            page.Url.Query.Should().Contain("imdbid=t40");
        }

+        [Test]
+        public void should_search_by_tmdb_if_supported()
+        {
+            _capabilities.SupportedTvSearchParameters = new[] { "q", "tmdbid", "season", "ep" };
+
+            var results = Subject.GetSearchRequests(_singleEpisodeSearchCriteria);
+            results.GetTier(0).Should().HaveCount(1);
+
+            var page = results.GetAllTiers().First().First();
+
+            page.Url.Query.Should().Contain("tmdbid=50");
+        }
+
        [Test]
        public void should_prefer_search_by_tvdbid_if_rid_supported()
        {
--- a/src/NzbDrone.Core.Test/MediaFiles/MediaInfo/VideoFileInfoReaderFixture.cs
+++ b/src/NzbDrone.Core.Test/MediaFiles/MediaInfo/VideoFileInfoReaderFixture.cs
@@ -107,7 +107,7 @@ namespace NzbDrone.Core.Test.MediaFiles.MediaInfo
        [TestCase(10, "", "", "", null, HdrFormat.None)]
        [TestCase(10, "bt709", "bt709", "", null, HdrFormat.None)]
        [TestCase(8, "bt2020", "smpte2084", "", null, HdrFormat.None)]
-        [TestCase(10, "bt2020", "bt2020-10", "", null, HdrFormat.Hlg10)]
+        [TestCase(10, "bt2020", "bt2020-10", "", null, HdrFormat.None)]
        [TestCase(10, "bt2020", "arib-std-b67", "", null, HdrFormat.Hlg10)]
        [TestCase(10, "bt2020", "smpte2084", "", null, HdrFormat.Pq10)]
        [TestCase(10, "bt2020", "smpte2084", "FFMpegCore.SideData", null, HdrFormat.Pq10)]
--- a/src/NzbDrone.Core.Test/NotificationTests/NotificationBaseFixture.cs
+++ b/src/NzbDrone.Core.Test/NotificationTests/NotificationBaseFixture.cs
@@ -5,7 +5,6 @@ using FluentValidation.Results;
 using NUnit.Framework;
 using NzbDrone.Core.MediaFiles;
 using NzbDrone.Core.Notifications;
-using NzbDrone.Core.ThingiProvider;
 using NzbDrone.Core.Tv;
 using NzbDrone.Core.Validation;
 using NzbDrone.Test.Common;
@@ -15,9 +14,9 @@ namespace NzbDrone.Core.Test.NotificationTests
    [TestFixture]
    public class NotificationBaseFixture : TestBase
    {
-        private class TestSetting : IProviderConfig
+        private class TestSetting : NotificationSettingsBase<TestSetting>
        {
-            public NzbDroneValidationResult Validate()
+            public override NzbDroneValidationResult Validate()
            {
                return new NzbDroneValidationResult();
            }
--- a/src/NzbDrone.Core.Test/NotificationTests/Xbmc/OnDownloadFixture.cs
+++ b/src/NzbDrone.Core.Test/NotificationTests/Xbmc/OnDownloadFixture.cs
@@ -34,6 +34,7 @@ namespace NzbDrone.Core.Test.NotificationTests.Xbmc
            Subject.Definition = new NotificationDefinition();
            Subject.Definition.Settings = new XbmcSettings
                                          {
+                                              Host = "localhost",
                                              UpdateLibrary = true
                                          };
        }
@@ -49,6 +50,7 @@ namespace NzbDrone.Core.Test.NotificationTests.Xbmc

            Subject.Definition.Settings = new XbmcSettings
                                          {
+                                              Host = "localhost",
                                              UpdateLibrary = true,
                                              CleanLibrary = true
                                          };
@@ -58,6 +60,7 @@ namespace NzbDrone.Core.Test.NotificationTests.Xbmc
        public void should_not_clean_if_no_episode_was_replaced()
        {
            Subject.OnDownload(_downloadMessage);
+            Subject.ProcessQueue();

            Mocker.GetMock<IXbmcService>().Verify(v => v.Clean(It.IsAny<XbmcSettings>()), Times.Never());
        }
@@ -67,6 +70,7 @@ namespace NzbDrone.Core.Test.NotificationTests.Xbmc
        {
            GivenOldFiles();
            Subject.OnDownload(_downloadMessage);
+            Subject.ProcessQueue();

            Mocker.GetMock<IXbmcService>().Verify(v => v.Clean(It.IsAny<XbmcSettings>()), Times.Once());
        }
--- a/src/NzbDrone.Core.Test/OrganizerTests/FileNameBuilderTests/ColonReplacementFixture.cs
+++ b/src/NzbDrone.Core.Test/OrganizerTests/FileNameBuilderTests/ColonReplacementFixture.cs
@@ -90,5 +90,18 @@ namespace NzbDrone.Core.Test.OrganizerTests.FileNameBuilderTests
            Subject.BuildFileName(new List<Episode> { _episode1 }, _series, _episodeFile)
                .Should().Be(expected);
        }
+
+        [TestCase("Series: Title", ColonReplacementFormat.Custom, "\ua789", "Series\ua789 Title")]
+        [TestCase("Series: Title", ColonReplacementFormat.Custom, "∶", "Series∶ Title")]
+        public void should_replace_colon_with_custom_format(string seriesName, ColonReplacementFormat replacementFormat, string customFormat, string expected)
+        {
+            _series.Title = seriesName;
+            _namingConfig.StandardEpisodeFormat = "{Series Title}";
+            _namingConfig.ColonReplacementFormat = replacementFormat;
+            _namingConfig.CustomColonReplacementFormat = customFormat;
+
+            Subject.BuildFileName(new List<Episode> { _episode1 }, _series, _episodeFile)
+                .Should().Be(expected);
+        }
    }
 }
--- a/src/NzbDrone.Core.Test/OrganizerTests/FileNameBuilderTests/IdFixture.cs
+++ b/src/NzbDrone.Core.Test/OrganizerTests/FileNameBuilderTests/IdFixture.cs
@@ -56,5 +56,14 @@ namespace NzbDrone.Core.Test.OrganizerTests.FileNameBuilderTests
            Subject.GetSeriesFolder(_series)
                   .Should().Be($"Series Title ({_series.TvMazeId})");
        }
+
+        [Test]
+        public void should_add_tmdb_id()
+        {
+            _namingConfig.SeriesFolderFormat = "{Series Title} ({TmdbId})";
+
+            Subject.GetSeriesFolder(_series)
+                .Should().Be($"Series Title ({_series.TmdbId})");
+        }
    }
 }
--- a/src/NzbDrone.Core.Test/ParserTests/CrapParserFixture.cs
+++ b/src/NzbDrone.Core.Test/ParserTests/CrapParserFixture.cs
@@ -39,6 +39,13 @@ namespace NzbDrone.Core.Test.ParserTests
            ExceptionVerification.IgnoreWarns();
        }

+        [TestCase("علم نف) أ.دعادل الأبيض ٢٠٢٤ ٣ ٣")]
+        [TestCase("ror-240618_1007-1022-")]
+        public void should_parse_unknown_formats_without_error(string title)
+        {
+            Parser.Parser.ParseTitle(title).Should().NotBeNull();
+        }
+
        [Test]
        public void should_not_parse_md5()
        {
--- a/src/NzbDrone.Core.Test/ParserTests/DailyEpisodeParserFixture.cs
+++ b/src/NzbDrone.Core.Test/ParserTests/DailyEpisodeParserFixture.cs
@@ -33,6 +33,7 @@ namespace NzbDrone.Core.Test.ParserTests
        [TestCase("2019_08_20_1080_all.mp4", "", 2019, 8, 20)]
        [TestCase("Series and Title 20201013 Ep7432 [720p WebRip (x264)] [SUBS]", "Series and Title", 2020, 10, 13)]
        [TestCase("Series Title (1955) - 1954-01-23 05 00 00 - Cottage for Sale.ts", "Series Title (1955)", 1954, 1, 23)]
+        [TestCase("Series Title - 30-04-2024 HDTV 1080p H264 AAC", "Series Title", 2024, 4, 30)]

        // [TestCase("", "", 0, 0, 0)]
        public void should_parse_daily_episode(string postTitle, string title, int year, int month, int day)
@@ -100,5 +101,13 @@ namespace NzbDrone.Core.Test.ParserTests

            Parser.Parser.ParseTitle(title).Should().BeNull();
        }
+
+        [TestCase("Tmc - Quotidien - 05-06-2024 HDTV 1080p H264 AAC")]
+
+        // [TestCase("", "", 0, 0, 0)]
+        public void should_not_parse_ambiguous_daily_episode(string postTitle)
+        {
+            Parser.Parser.ParseTitle(postTitle).Should().BeNull();
+        }
    }
 }
--- a/src/NzbDrone.Core.Test/ParserTests/LanguageParserFixture.cs
+++ b/src/NzbDrone.Core.Test/ParserTests/LanguageParserFixture.cs
@@ -64,6 +64,7 @@ namespace NzbDrone.Core.Test.ParserTests
        [TestCase("Title.S01.720p.VFF.WEB-DL.AAC2.0.H.264-BTN")]
        [TestCase("Title.S01.720p.VFQ.WEB-DL.AAC2.0.H.264-BTN")]
        [TestCase("Title.S01.720p.TRUEFRENCH.WEB-DL.AAC2.0.H.264-BTN")]
+        [TestCase("Series In The Middle S01 Multi VFI VO 1080p WEB x265 HEVC AAC 5.1-Papaya")]
        public void should_parse_language_french(string postTitle)
        {
            var result = LanguageParser.ParseLanguages(postTitle);
--- a/src/NzbDrone.Core.Test/ParserTests/QualityParserFixture.cs
+++ b/src/NzbDrone.Core.Test/ParserTests/QualityParserFixture.cs
@@ -109,6 +109,8 @@ namespace NzbDrone.Core.Test.ParserTests
        [TestCase("The.Series.S01E05.480p.BluRay.DD5.1.x264-HiSD", false)]
        [TestCase("The Series (BD)(640x480(RAW) (BATCH 1) (1-13)", false)]
        [TestCase("[Doki] Series - 02 (848x480 XviD BD MP3) [95360783]", false)]
+        [TestCase("Adventures.of.Sonic.the.Hedgehog.S01.BluRay.480i.DD.2.0.AVC.REMUX-FraMeSToR", false)]
+        [TestCase("Adventures.of.Sonic.the.Hedgehog.S01E01.Best.Hedgehog.480i.DD.2.0.AVC.REMUX-FraMeSToR", false)]
        public void should_parse_bluray480p_quality(string title, bool proper)
        {
            ParseAndVerifyQuality(title, Quality.Bluray480p, proper);
@@ -252,6 +254,7 @@ namespace NzbDrone.Core.Test.ParserTests
        [TestCase("Series Title Season 2 (WEB 1080p HEVC Opus) [Netaro]", false)]
        [TestCase("Series.Title.S01E01.Erste.Begegnungen.German.DD51.Synced.DL.1080p.HBOMaxHD.AVC-TVS", false)]
        [TestCase("Series.Title.S01E05.Tavora.greift.an.German.DL.1080p.DisneyHD.h264-4SF", false)]
+        [TestCase("Series.Title.S02E04.German.Dubbed.DL.AAC.1080p.WEB.AVC-GROUP", false)]
        public void should_parse_webdl1080p_quality(string title, bool proper)
        {
            ParseAndVerifyQuality(title, Quality.WEBDL1080p, proper);
@@ -277,6 +280,7 @@ namespace NzbDrone.Core.Test.ParserTests
        [TestCase("[HorribleSubs] Series Title! S01 [Web][MKV][h264][2160p][AAC 2.0][Softsubs (HorribleSubs)]", false)]
        [TestCase("Series Title S02 2013 WEB-DL 4k H265 AAC 2Audio-HDSWEB", false)]
        [TestCase("Series.Title.S02E02.This.Year.Will.Be.Different.2160p.WEB.H.265", false)]
+        [TestCase("Series.Title.S02E04.German.Dubbed.DL.AAC.2160p.DV.HDR.WEB.HEVC-GROUP", false)]
        public void should_parse_webdl2160p_quality(string title, bool proper)
        {
            ParseAndVerifyQuality(title, Quality.WEBDL2160p, proper);
@@ -309,6 +313,7 @@ namespace NzbDrone.Core.Test.ParserTests
        [TestCase("Sans.Series.De.Traces.FRENCH.720p.BluRay.x264-FHD", false)]
        [TestCase("Series.Black.1x01.Selezione.Naturale.ITA.720p.BDMux.x264-NovaRip", false)]
        [TestCase("Series.Hunter.S02.720p.Blu-ray.Remux.AVC.FLAC.2.0-SiCFoI", false)]
+        [TestCase("Adventures.of.Sonic.the.Hedgehog.S01E01.Best.Hedgehog.720p.DD.2.0.AVC.REMUX-FraMeSToR", false)]
        public void should_parse_bluray720p_quality(string title, bool proper)
        {
            ParseAndVerifyQuality(title, Quality.Bluray720p, proper);
@@ -340,6 +345,7 @@ namespace NzbDrone.Core.Test.ParserTests
        [TestCase("Series.Title.S03E01.The.Calm.1080p.DTS-HD.MA.5.1.AVC.REMUX-FraMeSToR", false)]
        [TestCase("Series Title Season 2 (BDRemux 1080p HEVC FLAC) [Netaro]", false)]
        [TestCase("[Vodes] Series Title - Other Title (2020) [BDRemux 1080p HEVC Dual-Audio]", false)]
+        [TestCase("Adventures.of.Sonic.the.Hedgehog.S01E01.Best.Hedgehog.1080p.DD.2.0.AVC.REMUX-FraMeSToR", false)]
        public void should_parse_bluray1080p_remux_quality(string title, bool proper)
        {
            ParseAndVerifyQuality(title, Quality.Bluray1080pRemux, proper);
@@ -360,6 +366,7 @@ namespace NzbDrone.Core.Test.ParserTests
        [TestCase("Series.Title.S01E08.The.Sonarr.BluRay.2160p.AVC.DTS-HD.MA.5.1.REMUX-FraMeSToR", false)]
        [TestCase("Series.Title.2x11.Nato.Per.The.Sonarr.Bluray.Remux.AVC.2160p.AC3.ITA", false)]
        [TestCase("[Dolby Vision] Sonarr.of.Series.S07.MULTi.UHD.BLURAY.REMUX.DV-NoTag", false)]
+        [TestCase("Adventures.of.Sonic.the.Hedgehog.S01E01.Best.Hedgehog.2160p.DD.2.0.AVC.REMUX-FraMeSToR", false)]
        public void should_parse_bluray2160p_remux_quality(string title, bool proper)
        {
            ParseAndVerifyQuality(title, Quality.Bluray2160pRemux, proper);
--- a/src/NzbDrone.Core.Test/ParserTests/SeasonParserFixture.cs
+++ b/src/NzbDrone.Core.Test/ParserTests/SeasonParserFixture.cs
@@ -33,6 +33,9 @@ namespace NzbDrone.Core.Test.ParserTests
        [TestCase("Series No More S01 2023 1080p WEB-DL AVC AC3 2.0 Dual Audio -ZR-", "Series No More", 1)]
        [TestCase("Series Title / S1E1-8 of 8 [2024, WEB-DL 1080p] + Original + RUS", "Series Title", 1)]
        [TestCase("Series Title / S2E1-16 of 16 [2022, WEB-DL] RUS", "Series Title", 2)]
+        [TestCase("[hchcsen] Mobile Series 00 S01 [BD Remux Dual Audio 1080p AVC 2xFLAC] (Kidou Senshi Gundam 00 Season 1)", "Mobile Series 00", 1)]
+        [TestCase("[HorribleRips] Mobile Series 00 S1 [1080p]", "Mobile Series 00", 1)]
+        [TestCase("[Zoombie] Zom 100: Bucket List of the Dead S01 [Web][MKV][h265 10-bit][1080p][AC3 2.0][Softsubs (Zoombie)]", "Zom 100: Bucket List of the Dead", 1)]
        public void should_parse_full_season_release(string postTitle, string title, int season)
        {
            var result = Parser.Parser.ParseTitle(postTitle);
@@ -75,6 +78,7 @@ namespace NzbDrone.Core.Test.ParserTests

        [TestCase("The.Series.2016.S02.Part.1.1080p.NF.WEBRip.DD5.1.x264-NTb", "The Series 2016", 2, 1)]
        [TestCase("The.Series.S07.Vol.1.1080p.NF.WEBRip.DD5.1.x264-NTb", "The Series", 7, 1)]
+        [TestCase("The.Series.S06.P1.1080p.Blu-Ray.10-Bit.Dual-Audio.TrueHD.x265-iAHD", "The Series", 6, 1)]
        public void should_parse_partial_season_release(string postTitle, string title, int season, int seasonPart)
        {
            var result = Parser.Parser.ParseTitle(postTitle);
--- a/src/NzbDrone.Core.Test/ParserTests/SingleEpisodeParserFixture.cs
+++ b/src/NzbDrone.Core.Test/ParserTests/SingleEpisodeParserFixture.cs
@@ -168,6 +168,10 @@ namespace NzbDrone.Core.Test.ParserTests
        [TestCase("Босх: Спадок / Series: Legacy / S2E1 of 10 (2023) WEB-DL 1080p Ukr/Eng | sub Eng", "Series: Legacy", 2, 1)]
        [TestCase("Titles.s06e01.1999.BDRip.1080p.Ukr.Eng.AC3.Hurtom.TNU.Tenax555", "Titles", 6, 1)]
        [TestCase("Titles.s06.01.1999.BDRip.1080p.Ukr.Eng.AC3.Hurtom.TNU.Tenax555", "Titles", 6, 1)]
+        [TestCase("[Judas] Series Title (2024) - S01E14", "Series Title (2024)", 1, 14)]
+        [TestCase("[ReleaseGroup] SeriesTitle S01E1 Webdl 1080p", "SeriesTitle", 1, 1)]
+        [TestCase("[SubsPlus+] Series no Chill - S02E01 (NF WEB 1080p AVC AAC)", "Series no Chill", 2, 1)]
+        [TestCase("[SubsPlus+] Series no Chill - S02E01v2 (NF WEB 1080p AVC AAC)", "Series no Chill", 2, 1)]

        // [TestCase("", "", 0, 0)]
        public void should_parse_single_episode(string postTitle, string title, int seasonNumber, int episodeNumber)
--- a/src/NzbDrone.Core.Test/ParserTests/UrlFixture.cs
+++ b/src/NzbDrone.Core.Test/ParserTests/UrlFixture.cs
@@ -23,6 +23,7 @@ namespace NzbDrone.Core.Test.ParserTests
        [TestCase("[www.test-hyphen.ca] - Series (2011) S01", "Series (2011)")]
        [TestCase("test123.ca - Series Time S02 720p HDTV x264 CRON", "Series Time")]
        [TestCase("[www.test-hyphen123.co.za] - Series Title S01E01", "Series Title")]
+        [TestCase("(seriesawake.com) Series Super - 57 [720p] [English Subbed]", "Series Super")]

        public void should_not_parse_url_in_name(string postTitle, string title)
        {
--- a/src/NzbDrone.Core.Test/QueueTests/QueueServiceFixture.cs
+++ b/src/NzbDrone.Core.Test/QueueTests/QueueServiceFixture.cs
@@ -44,6 +44,7 @@ namespace NzbDrone.Core.Test.QueueTests

            _trackedDownloads = Builder<TrackedDownload>.CreateListOfSize(1)
                .All()
+                .With(v => v.IsTrackable = true)
                .With(v => v.DownloadItem = downloadItem)
                .With(v => v.RemoteEpisode = remoteEpisode)
                .Build()
--- a/src/NzbDrone.Core.Test/TvTests/RefreshSeriesServiceFixture.cs
+++ b/src/NzbDrone.Core.Test/TvTests/RefreshSeriesServiceFixture.cs
@@ -137,6 +137,20 @@ namespace NzbDrone.Core.Test.TvTests
                .Verify(v => v.UpdateSeries(It.Is<Series>(s => s.TvMazeId == newSeriesInfo.TvMazeId), It.IsAny<bool>(), It.IsAny<bool>()));
        }

+        [Test]
+        public void should_update_tmdb_id_if_changed()
+        {
+            var newSeriesInfo = _series.JsonClone();
+            newSeriesInfo.TmdbId = _series.TmdbId + 1;
+
+            GivenNewSeriesInfo(newSeriesInfo);
+
+            Subject.Execute(new RefreshSeriesCommand(new List<int> { _series.Id }));
+
+            Mocker.GetMock<ISeriesService>()
+                .Verify(v => v.UpdateSeries(It.Is<Series>(s => s.TmdbId == newSeriesInfo.TmdbId), It.IsAny<bool>(), It.IsAny<bool>()));
+        }
+
        [Test]
        public void should_log_error_if_tvdb_id_not_found()
        {
--- a/src/NzbDrone.Core.Test/TvTests/SeriesServiceTests/UpdateMultipleSeriesFixture.cs
+++ b/src/NzbDrone.Core.Test/TvTests/SeriesServiceTests/UpdateMultipleSeriesFixture.cs
@@ -5,6 +5,7 @@ using FizzWare.NBuilder;
 using FluentAssertions;
 using Moq;
 using NUnit.Framework;
+using NzbDrone.Core.AutoTagging;
 using NzbDrone.Core.Organizer;
 using NzbDrone.Core.Test.Framework;
 using NzbDrone.Core.Tv;
@@ -28,6 +29,10 @@ namespace NzbDrone.Core.Test.TvTests.SeriesServiceTests
                .With(s => s.Path = @"C:\Test\name".AsOsAgnostic())
                .With(s => s.RootFolderPath = "")
                .Build().ToList();
+
+            Mocker.GetMock<IAutoTaggingService>()
+                .Setup(s => s.GetTagChanges(It.IsAny<Series>()))
+                .Returns(new AutoTaggingChanges());
        }

        [Test]
@@ -79,5 +84,23 @@ namespace NzbDrone.Core.Test.TvTests.SeriesServiceTests

            Subject.UpdateSeries(series, false);
        }
+
+        [Test]
+        public void should_add_and_remove_tags()
+        {
+            _series[0].Tags = new HashSet<int> { 1, 2 };
+
+            Mocker.GetMock<IAutoTaggingService>()
+                .Setup(s => s.GetTagChanges(_series[0]))
+                .Returns(new AutoTaggingChanges
+                {
+                    TagsToAdd = new HashSet<int> { 3 },
+                    TagsToRemove = new HashSet<int> { 1 }
+                });
+
+            var result = Subject.UpdateSeries(_series, false);
+
+            result[0].Tags.Should().BeEquivalentTo(new[] { 2, 3 });
+        }
    }
 }
--- a/src/NzbDrone.Core.Test/TvTests/SeriesServiceTests/UpdateSeriesFixture.cs
+++ b/src/NzbDrone.Core.Test/TvTests/SeriesServiceTests/UpdateSeriesFixture.cs
@@ -1,8 +1,10 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 using FizzWare.NBuilder;
+using FluentAssertions;
 using Moq;
 using NUnit.Framework;
+using NzbDrone.Core.AutoTagging;
 using NzbDrone.Core.Test.Framework;
 using NzbDrone.Core.Tv;

@@ -31,6 +33,14 @@ namespace NzbDrone.Core.Test.TvTests.SeriesServiceTests
                new Season { SeasonNumber = 1, Monitored = true },
                new Season { SeasonNumber = 2, Monitored = true }
            };
+
+            Mocker.GetMock<IAutoTaggingService>()
+                .Setup(s => s.GetTagChanges(It.IsAny<Series>()))
+                .Returns(new AutoTaggingChanges());
+
+            Mocker.GetMock<ISeriesRepository>()
+                .Setup(s => s.Update(It.IsAny<Series>()))
+                .Returns<Series>(r => r);
        }

        private void GivenExistingSeries()
@@ -68,5 +78,28 @@ namespace NzbDrone.Core.Test.TvTests.SeriesServiceTests
            Mocker.GetMock<IEpisodeService>()
                  .Verify(v => v.SetEpisodeMonitoredBySeason(_fakeSeries.Id, It.IsAny<int>(), It.IsAny<bool>()), Times.Once());
        }
+
+        [Test]
+        public void should_add_and_remove_tags()
+        {
+            GivenExistingSeries();
+            var seasonNumber = 1;
+            var monitored = false;
+
+            _fakeSeries.Tags = new HashSet<int> { 1, 2 };
+            _fakeSeries.Seasons.Single(s => s.SeasonNumber == seasonNumber).Monitored = monitored;
+
+            Mocker.GetMock<IAutoTaggingService>()
+                .Setup(s => s.GetTagChanges(_fakeSeries))
+                .Returns(new AutoTaggingChanges
+                {
+                    TagsToAdd = new HashSet<int> { 3 },
+                    TagsToRemove = new HashSet<int> { 1 }
+                });
+
+            var result = Subject.UpdateSeries(_fakeSeries);
+
+            result.Tags.Should().BeEquivalentTo(new[] { 2, 3 });
+        }
    }
 }
--- a/src/NzbDrone.Core.Test/UpdateTests/UpdatePackageProviderFixture.cs
+++ b/src/NzbDrone.Core.Test/UpdateTests/UpdatePackageProviderFixture.cs
@@ -48,11 +48,11 @@ namespace NzbDrone.Core.Test.UpdateTests
        {
            const string branch = "main";
            UseRealHttp();
-            var recent = Subject.GetRecentUpdates(branch, new Version(3, 0), null);
+            var recent = Subject.GetRecentUpdates(branch, new Version(4, 0), null);

            recent.Should().NotBeEmpty();
            recent.Should().OnlyContain(c => c.Hash.IsNotNullOrWhiteSpace());
-            recent.Should().OnlyContain(c => c.FileName.Contains($"Sonarr.{c.Branch}.3."));
+            recent.Should().OnlyContain(c => c.FileName.Contains($"Sonarr.{c.Branch}.4."));
            recent.Should().OnlyContain(c => c.ReleaseDate.Year >= 2014);
            recent.Where(c => c.Changes != null).Should().OnlyContain(c => c.Changes.New != null);
            recent.Where(c => c.Changes != null).Should().OnlyContain(c => c.Changes.Fixed != null);
--- a/src/NzbDrone.Core/Annotations/FieldDefinitionAttribute.cs
+++ b/src/NzbDrone.Core/Annotations/FieldDefinitionAttribute.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Runtime.CompilerServices;

 namespace NzbDrone.Core.Annotations
@@ -59,13 +60,27 @@ namespace NzbDrone.Core.Annotations
        public string Value { get; set; }
    }

-    public class FieldSelectOption
+    public class FieldSelectOption<T>
+        where T : struct
    {
-        public int Value { get; set; }
+        public T Value { get; set; }
        public string Name { get; set; }
        public int Order { get; set; }
        public string Hint { get; set; }
-        public int? ParentValue { get; set; }
+        public T? ParentValue { get; set; }
+        public bool? IsDisabled { get; set; }
+        public Dictionary<string, object> AdditionalProperties { get; set; }
+    }
+
+    public class FieldSelectStringOption
+    {
+        public string Value { get; set; }
+        public string Name { get; set; }
+        public int Order { get; set; }
+        public string Hint { get; set; }
+        public string ParentValue { get; set; }
+        public bool? IsDisabled { get; set; }
+        public Dictionary<string, object> AdditionalProperties { get; set; }
    }

    public enum FieldType
--- a/src/NzbDrone.Core/Blocklisting/BlocklistRepository.cs
+++ b/src/NzbDrone.Core/Blocklisting/BlocklistRepository.cs
@@ -40,11 +40,29 @@ namespace NzbDrone.Core.Blocklisting
            Delete(x => seriesIds.Contains(x.SeriesId));
        }

-        protected override SqlBuilder PagedBuilder() => new SqlBuilder(_database.DatabaseType).Join<Blocklist, Series>((b, m) => b.SeriesId == m.Id);
-        protected override IEnumerable<Blocklist> PagedQuery(SqlBuilder sql) => _database.QueryJoined<Blocklist, Series>(sql, (bl, movie) =>
-                    {
-                        bl.Series = movie;
-                        return bl;
-                    });
+        public override PagingSpec<Blocklist> GetPaged(PagingSpec<Blocklist> pagingSpec)
+        {
+            pagingSpec.Records = GetPagedRecords(PagedBuilder(), pagingSpec, PagedQuery);
+
+            var countTemplate = $"SELECT COUNT(*) FROM (SELECT /**select**/ FROM \"{TableMapping.Mapper.TableNameMapping(typeof(Blocklist))}\" /**join**/ /**innerjoin**/ /**leftjoin**/ /**where**/ /**groupby**/ /**having**/) AS \"Inner\"";
+            pagingSpec.TotalRecords = GetPagedRecordCount(PagedBuilder().Select(typeof(Blocklist)), pagingSpec, countTemplate);
+
+            return pagingSpec;
+        }
+
+        protected override SqlBuilder PagedBuilder()
+        {
+            var builder = Builder()
+                .Join<Blocklist, Series>((b, m) => b.SeriesId == m.Id);
+
+            return builder;
+        }
+
+        protected override IEnumerable<Blocklist> PagedQuery(SqlBuilder builder) =>
+            _database.QueryJoined<Blocklist, Series>(builder, (blocklist, series) =>
+            {
+                blocklist.Series = series;
+                return blocklist;
+            });
    }
 }
--- a/src/NzbDrone.Core/Configuration/ConfigFileProvider.cs
+++ b/src/NzbDrone.Core/Configuration/ConfigFileProvider.cs
@@ -242,7 +242,7 @@ namespace NzbDrone.Core.Configuration
        {
            get
            {
-                var urlBase = _serverOptions.UrlBase ?? GetValue("UrlBase", "").Trim('/');
+                var urlBase = (_serverOptions.UrlBase ?? GetValue("UrlBase", "")).Trim('/');

                if (urlBase.IsNullOrWhiteSpace())
                {
@@ -419,13 +419,21 @@ namespace NzbDrone.Core.Configuration
                            throw new InvalidConfigFileException($"{_configFile} is corrupt. Please delete the config file and Sonarr will recreate it.");
                        }

-                        return XDocument.Parse(_diskProvider.ReadAllText(_configFile));
+                        var xDoc = XDocument.Parse(_diskProvider.ReadAllText(_configFile));
+                        var config = xDoc.Descendants(CONFIG_ELEMENT_NAME).ToList();
+
+                        if (config.Count != 1)
+                        {
+                            throw new InvalidConfigFileException($"{_configFile} is invalid. Please delete the config file and Sonarr will recreate it.");
+                        }
+
+                        return xDoc;
                    }

-                    var xDoc = new XDocument(new XDeclaration("1.0", "utf-8", "yes"));
-                    xDoc.Add(new XElement(CONFIG_ELEMENT_NAME));
+                    var newXDoc = new XDocument(new XDeclaration("1.0", "utf-8", "yes"));
+                    newXDoc.Add(new XElement(CONFIG_ELEMENT_NAME));

-                    return xDoc;
+                    return newXDoc;
                }
            }
            catch (XmlException ex)
--- a/src/NzbDrone.Core/Datastore/Migration/206_add_tmdbid.cs
+++ b/src/NzbDrone.Core/Datastore/Migration/206_add_tmdbid.cs
@@ -0,0 +1,15 @@
+using FluentMigrator;
+using NzbDrone.Core.Datastore.Migration.Framework;
+
+namespace NzbDrone.Core.Datastore.Migration
+{
+    [Migration(206)]
+    public class add_tmdbid : NzbDroneMigrationBase
+    {
+        protected override void MainDbUpgrade()
+        {
+            Alter.Table("Series").AddColumn("TmdbId").AsInt32().WithDefaultValue(0);
+            Create.Index().OnTable("Series").OnColumn("TmdbId");
+        }
+    }
+}
--- a/src/NzbDrone.Core/Datastore/Migration/209_add_on_import_complete_to_notifications.cs
+++ b/src/NzbDrone.Core/Datastore/Migration/209_add_on_import_complete_to_notifications.cs
@@ -0,0 +1,14 @@
+using FluentMigrator;
+using NzbDrone.Core.Datastore.Migration.Framework;
+
+namespace NzbDrone.Core.Datastore.Migration
+{
+    [Migration(209)]
+    public class add_on_import_complete_to_notifications : NzbDroneMigrationBase
+    {
+        protected override void MainDbUpgrade()
+        {
+            Alter.Table("Notifications").AddColumn("OnImportComplete").AsBoolean().WithDefaultValue(false);
+        }
+    }
+}
--- a/src/NzbDrone.Core/Datastore/Migration/211_add_custom_colon_replacement_to_naming_config.cs
+++ b/src/NzbDrone.Core/Datastore/Migration/211_add_custom_colon_replacement_to_naming_config.cs
@@ -0,0 +1,14 @@
+using FluentMigrator;
+using NzbDrone.Core.Datastore.Migration.Framework;
+
+namespace NzbDrone.Core.Datastore.Migration
+{
+    [Migration(211)]
+    public class add_custom_colon_replacement_to_naming_config : NzbDroneMigrationBase
+    {
+        protected override void MainDbUpgrade()
+        {
+            Alter.Table("NamingConfig").AddColumn("CustomColonReplacementFormat").AsString().WithDefaultValue("");
+        }
+    }
+}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Mark McDowall	6afd3bd344	Bump version to 4.0.7	2024-07-14 16:44:07 -07:00
Weblate	acaf5cd353	Multiple Translations updated by Weblate ignore-downstream Co-authored-by: Havok Dan <havokdan@yahoo.com.br> Co-authored-by: Lizandra Candido da Silva <lizandra.c.s@gmail.com> Co-authored-by: MattiaPell <mattiapellegrini16@gmail.com> Co-authored-by: Rauniik <raunerjakub@gmail.com> Co-authored-by: Weblate <noreply@weblate.org> Co-authored-by: fordas <fordas15@gmail.com> Translate-URL: https://translate.servarr.com/projects/servarr/sonarr/ Translate-URL: https://translate.servarr.com/projects/servarr/sonarr/cs/ Translate-URL: https://translate.servarr.com/projects/servarr/sonarr/es/ Translate-URL: https://translate.servarr.com/projects/servarr/sonarr/it/ Translate-URL: https://translate.servarr.com/projects/servarr/sonarr/pt_BR/ Translation: Servarr/Sonarr	2024-07-14 16:43:56 -07:00
Sonarr	e97e5bfe8f	Automated API Docs update ignore-downstream	2024-07-09 22:22:48 -07:00
martylukyy	678872b879	Fixed: Parsing of some Web releases	2024-07-10 01:19:07 -04:00
Mark McDowall	10e9735c1c	New: Update AutoTags on series update Closes #6783	2024-07-10 01:02:23 -04:00
Mark McDowall	293a1bc618	New: Custom colon replacement option Closes #6898	2024-07-10 01:02:04 -04:00
Bogdan	0c883f7886	Fixed: Removing pending release without blocklisting	2024-07-09 22:01:23 -07:00
Mark McDowall	46c7de379c	New: Group updates for the same series for Kodi and Emby / Jellyfin	2024-07-09 22:00:57 -07:00
Mark McDowall	a83b521766	New: 'On Import Complete' notification when all episodes in a release are imported Closes #363	2024-07-09 22:00:57 -07:00
Bogdan	1d06e40acb	New: Queued episode count for seasons in series details	2024-07-09 21:59:41 -07:00
Weblate	bfcdc89f6a	Multiple Translations updated by Weblate ignore-downstream Co-authored-by: Oskari Lavinto <olavinto@protonmail.com> Co-authored-by: Serhii Matrunchyk <serhii@digitalidea.studio> Translate-URL: https://translate.servarr.com/projects/servarr/sonarr/fi/ Translate-URL: https://translate.servarr.com/projects/servarr/sonarr/uk/ Translation: Servarr/Sonarr	2024-07-09 21:59:25 -07:00
Sonarr	67943edfbc	Automated API Docs update ignore-downstream	2024-07-05 16:35:21 -07:00
Mark McDowall	04f8595498	Custom Import List improvements Fixed: Add placeholder title for Custom Import List title New: Support 'title' property for Custom Import List	2024-07-05 16:35:08 -07:00
Bogdan	81ac73299a	Fixed: Bulk series deletion for unmonitored series Closes #6933	2024-07-05 19:34:56 -04:00
Mark McDowall	a779a5fad2	Fixed: Parsing of anime season releases with 3-digit number in title	2024-07-05 16:34:06 -07:00
Mark McDowall	bfe6a740fa	Fixed: Parsing of anime releases using standard numbering Closes #6925	2024-07-05 16:34:06 -07:00
Mark McDowall	c9ea40b874	New: Parse VFI as French Closes #6927	2024-07-05 16:34:00 -07:00
Bogdan	4ee0ae1418	Fixed: History with unknown series	2024-07-05 16:33:50 -07:00
Bogdan	ac1da45ecd	Fixed: Calculate Custom Formats after user specified options in Manual Import	2024-07-05 19:33:33 -04:00
Weblate	5c327d5be3	Multiple Translations updated by Weblate ignore-downstream Co-authored-by: Havok Dan <havokdan@yahoo.com.br> Co-authored-by: Lizandra Candido da Silva <lizandra.c.s@gmail.com> Co-authored-by: MattiaPell <mattiapellegrini16@gmail.com> Co-authored-by: Weblate <noreply@weblate.org> Co-authored-by: fordas <fordas15@gmail.com> Co-authored-by: quek76 <quek@libertysurf.fr> Translate-URL: https://translate.servarr.com/projects/servarr/sonarr/ Translate-URL: https://translate.servarr.com/projects/servarr/sonarr/es/ Translate-URL: https://translate.servarr.com/projects/servarr/sonarr/fr/ Translate-URL: https://translate.servarr.com/projects/servarr/sonarr/it/ Translate-URL: https://translate.servarr.com/projects/servarr/sonarr/pt_BR/ Translation: Servarr/Sonarr	2024-07-05 16:31:56 -07:00
Mark McDowall	55c1ce2e3d	Bump version to 4.0.6	2024-06-30 15:42:47 -07:00
Weblate	fd7f0ea973	Multiple Translations updated by Weblate ignore-downstream Co-authored-by: GkhnGRBZ <gkhn.gurbuz@hotmail.com> Co-authored-by: Havok Dan <havokdan@yahoo.com.br> Co-authored-by: Kshitij Burman <kburman6@gmail.com> Co-authored-by: MattiaPell <mattiapellegrini16@gmail.com> Co-authored-by: Weblate <noreply@weblate.org> Co-authored-by: damienmillet <contact@damien-millet.dev> Co-authored-by: fordas <fordas15@gmail.com> Translate-URL: https://translate.servarr.com/projects/servarr/sonarr/ Translate-URL: https://translate.servarr.com/projects/servarr/sonarr/es/ Translate-URL: https://translate.servarr.com/projects/servarr/sonarr/fr/ Translate-URL: https://translate.servarr.com/projects/servarr/sonarr/hi/ Translate-URL: https://translate.servarr.com/projects/servarr/sonarr/it/ Translate-URL: https://translate.servarr.com/projects/servarr/sonarr/pt_BR/ Translate-URL: https://translate.servarr.com/projects/servarr/sonarr/tr/ Translation: Servarr/Sonarr	2024-06-30 15:42:41 -07:00
Bogdan	d5dff8e8d6	Fixed: Trimming disabled logs database Closes #6918	2024-06-30 13:49:41 -04:00
Bogdan	8099ba10af	Fixed: Already imported downloads appearing in Queue briefly	2024-06-30 13:47:00 -04:00
Mark McDowall	143ccb1e2a	Remove seriesTitle from EpisodeResource Closes #6841	2024-06-28 06:22:10 -07:00
Mark McDowall	29480d9544	Fixed: Don't use cleaned up release title for release title	2024-06-28 06:22:04 -07:00
Mark McDowall	6de536a7ad	Fixed: Limit Queue maximum page size to 200 Closes #6899	2024-06-26 09:45:43 -07:00
Mark McDowall	bce848facf	Fixed: Reprocessing items that were previously blocked during importing	2024-06-26 09:45:28 -07:00
Mark McDowall	ea4fe392a0	New: Remove websites in parentheses before parsing	2024-06-25 15:52:24 -07:00
Mark McDowall	45fe585944	Fixed: Prevent errors parsing releases in unexpected formats	2024-06-25 15:52:24 -07:00
Mark McDowall	a0d2933134	New: Ignore Deluge torrents without a title Closes #6885	2024-06-25 18:52:12 -04:00
Mark McDowall	4c622fd412	New: Ability to select Plex Media Server from plex.tv Closes #6887	2024-06-25 15:51:57 -07:00
Bogdan	fb060730c7	Fixed: Exclude invalid releases from Newznab and Torznab parsers	2024-06-25 15:51:41 -07:00
Mark McDowall	6d5ff9c4d6	New: Improve UI status when downloads cannot be imported automatically Closes #6873	2024-06-25 18:51:20 -04:00
Mark McDowall	63bed3e670	New: Parse anime seasons with trailing number in title Closes #6883	2024-06-25 15:51:03 -07:00
Weblate	e684c10432	Multiple Translations updated by Weblate ignore-downstream Co-authored-by: Havok Dan <havokdan@yahoo.com.br> Co-authored-by: MattiaPell <mattiapellegrini16@gmail.com> Co-authored-by: Taylan Tatlı <taylantatli90@gmail.com> Co-authored-by: Weblate <noreply@weblate.org> Translate-URL: https://translate.servarr.com/projects/servarr/sonarr/it/ Translate-URL: https://translate.servarr.com/projects/servarr/sonarr/pt_BR/ Translate-URL: https://translate.servarr.com/projects/servarr/sonarr/tr/ Translation: Servarr/Sonarr	2024-06-25 15:50:56 -07:00
Bogdan	d2509798e9	New: Display stats for delete multiple series modal	2024-06-17 20:40:04 -07:00
Bogdan	6c39855ebe	Fix UpdatePackageProviderFixture for v4 ignore-downstream	2024-06-17 20:39:33 -07:00
Bogdan	a30e9da767	New: Ignore inaccessible folders when getting folders	2024-06-17 20:39:33 -07:00
Mark McDowall	f8e81396d4	Fixed: Importing from IMDb list	2024-06-17 20:39:22 -07:00
Mark McDowall	7fccf590a8	Fixed: Adding series with unknown items in queue	2024-06-17 23:39:13 -04:00
Stephan Sundermann	e1b937e8d5	New: Add TMDB ID support Closes #6866	2024-06-17 23:38:41 -04:00
Bogdan	c331c8bd11	Ignore `Grabbed` from API docs Run application in docs.sh specific to platform	2024-06-10 20:30:26 -07:00
Mark McDowall	52b72925f9	Fixed: Improve error messaging if config file isn't formatted correctly Closes #6860	2024-06-10 20:30:13 -07:00
Mark McDowall	378fedcd9d	Fixed: Skip invalid series paths during validation	2024-06-10 23:30:03 -04:00
Bogdan	a90ab1a8fd	Fixed: Ignore case when resolving indexer by name in release push	2024-06-10 20:29:46 -07:00
Bogdan	0edc5ba99a	Fixed: Ignore case for name validation in providers	2024-06-10 20:29:46 -07:00
Bogdan	ea54ade9bf	New: Refresh cache for tracked queue on series add	2024-06-10 20:29:41 -07:00
Weblate	e07eb05e8b	Multiple Translations updated by Weblate ignore-downstream Co-authored-by: AlbertCoolGuy <Albert.rosenstand@gmail.com> Co-authored-by: Havok Dan <havokdan@yahoo.com.br> Co-authored-by: Weblate <noreply@weblate.org> Co-authored-by: fordas <fordas15@gmail.com> Co-authored-by: xuzhihui <5894940@qq.com> Translate-URL: https://translate.servarr.com/projects/servarr/sonarr/da/ Translate-URL: https://translate.servarr.com/projects/servarr/sonarr/es/ Translate-URL: https://translate.servarr.com/projects/servarr/sonarr/pt_BR/ Translate-URL: https://translate.servarr.com/projects/servarr/sonarr/zh_CN/ Translation: Servarr/Sonarr	2024-06-10 20:29:28 -07:00
Bogdan	d9b771ab0b	Fixed: Error sending Manual Interaction Required when series is unknown	2024-05-31 20:11:31 -04:00
Mark McDowall	6b08e849b8	Search for raw and clean titles for Newznab/Torznab indexers that support raw title searching	2024-05-31 17:10:32 -07:00
Mark McDowall	9c1f48ebc9	Fixed: Include full series title in episode search	2024-05-31 17:10:32 -07:00
Mark McDowall	fd3dd1ab7d	New: Genres and Images for Webhooks and Notifiarr Closes #6822	2024-05-31 17:10:13 -07:00
yammes08	11e5c5a11b	Fixed: SDR Files Being Parsed As HLG	2024-05-31 20:09:53 -04:00
Weblate	48f0291884	Multiple Translations updated by Weblate ignore-downstream Co-authored-by: Ano10 <arnaudthommeray+github@ik.me> Co-authored-by: Weblate <noreply@weblate.org> Co-authored-by: r0bertreh <Robert.reh@live.de> Translate-URL: https://translate.servarr.com/projects/servarr/sonarr/de/ Translate-URL: https://translate.servarr.com/projects/servarr/sonarr/fr/ Translation: Servarr/Sonarr	2024-05-31 17:09:11 -07:00
Mark McDowall	af0e55aef4	Bump version to 4.0.5	2024-05-29 16:23:16 -07:00
Weblate	39a439eb4c	Multiple Translations updated by Weblate ignore-downstream Co-authored-by: Bao Trinh <servarr@baodtrinh.com> Co-authored-by: Havok Dan <havokdan@yahoo.com.br> Co-authored-by: Lizandra Candido da Silva <lizandra.c.s@gmail.com> Co-authored-by: Weblate <noreply@weblate.org> Co-authored-by: fordas <fordas15@gmail.com> Co-authored-by: mm519897405 <baiya@vip.qq.com> Co-authored-by: thegamingcat13 <sandervanbeek2004@gmail.com> Translate-URL: https://translate.servarr.com/projects/servarr/sonarr/es/ Translate-URL: https://translate.servarr.com/projects/servarr/sonarr/nl/ Translate-URL: https://translate.servarr.com/projects/servarr/sonarr/pt_BR/ Translate-URL: https://translate.servarr.com/projects/servarr/sonarr/vi/ Translate-URL: https://translate.servarr.com/projects/servarr/sonarr/zh_CN/ Translation: Servarr/Sonarr	2024-05-29 16:23:04 -07:00
Weblate	66940b283b	Multiple Translations updated by Weblate ignore-downstream Co-authored-by: Havok Dan <havokdan@yahoo.com.br> Co-authored-by: Weblate <noreply@weblate.org> Co-authored-by: fordas <fordas15@gmail.com> Co-authored-by: mm519897405 <baiya@vip.qq.com> Translate-URL: https://translate.servarr.com/projects/servarr/sonarr/es/ Translate-URL: https://translate.servarr.com/projects/servarr/sonarr/pt_BR/ Translate-URL: https://translate.servarr.com/projects/servarr/sonarr/zh_CN/ Translation: Servarr/Sonarr	2024-05-24 06:21:13 -07:00
Mark McDowall	2a662afaef	Fixed: Time for episodes airing today being blank	2024-05-24 06:19:38 -07:00
Weblate	62a9c2519b	Multiple Translations updated by Weblate ignore-downstream Co-authored-by: mm519897405 <baiya@vip.qq.com> Translate-URL: https://translate.servarr.com/projects/servarr/sonarr/zh_CN/ Translation: Servarr/Sonarr	2024-05-22 20:09:18 -07:00
Mark McDowall	ca372bee25	Fixed: Queue and Calendar not loading	2024-05-22 20:07:31 -07:00
Sonarr	0904a0737e	Automated API Docs update ignore-downstream	2024-05-21 17:09:20 -07:00
Bogdan	70bc26dc19	Disable workflows on forks ignore-downstream	2024-05-21 17:06:44 -07:00
Bogdan	a2e0002a08	Replace multiple occurrences in branch env variable ignore-downstream	2024-05-21 17:06:44 -07:00
Bogdan	d7ceb11a64	Fixed: Trimming slashes from UrlBase when using environment variable	2024-05-21 17:06:44 -07:00
Bogdan	cc5b5463f2	Ignore `Grabbed` with STJson	2024-05-21 17:06:36 -07:00
Bogdan	9b4ff657af	Update the wanted section for missing and cutoff unmet	2024-05-21 17:06:36 -07:00
Bogdan	aea50fa47e	Bump Npgsql to 7.0.7 ignore-downstream	2024-05-21 17:06:28 -07:00
Mark McDowall	05edd44ed6	New: Include time for episode/season/series history	2024-05-21 17:06:18 -07:00
Bogdan	4440aa3cac	New: Root folder exists validation for import lists	2024-05-21 17:06:09 -07:00
Bogdan	084fcc2295	Implement equality checks for providers	2024-05-21 17:05:48 -07:00
Weblate	536ff142c3	Multiple Translations updated by Weblate ignore-downstream Co-authored-by: Dani Talens <databio@gmail.com> Co-authored-by: GkhnGRBZ <gkhn.gurbuz@hotmail.com> Co-authored-by: Havok Dan <havokdan@yahoo.com.br> Co-authored-by: Lizandra Candido da Silva <lizandra.c.s@gmail.com> Co-authored-by: Ransack6086 <servarr.jubilant150@slmail.me> Co-authored-by: Weblate <noreply@weblate.org> Co-authored-by: Yi Cao <caoyi06@qq.com> Co-authored-by: fordas <fordas15@gmail.com> Co-authored-by: topnew <sznetim@gmail.com> Translate-URL: https://translate.servarr.com/projects/servarr/sonarr/ca/ Translate-URL: https://translate.servarr.com/projects/servarr/sonarr/es/ Translate-URL: https://translate.servarr.com/projects/servarr/sonarr/fr/ Translate-URL: https://translate.servarr.com/projects/servarr/sonarr/pt/ Translate-URL: https://translate.servarr.com/projects/servarr/sonarr/pt_BR/ Translate-URL: https://translate.servarr.com/projects/servarr/sonarr/tr/ Translate-URL: https://translate.servarr.com/projects/servarr/sonarr/zh_CN/ Translation: Servarr/Sonarr	2024-05-21 17:05:34 -07:00
Mark McDowall	627b2a4289	New: Parse 480i Bluray/Remux as Bluray 480p Closes #6801	2024-05-09 22:04:18 -07:00
Bogdan	9734c2d144	Fixed: Notifications with only On Rename enabled ignore-downstream	2024-05-09 22:04:12 -07:00
Bogdan	c7c1e3ac9e	Refactor PasswordInput to use type password	2024-05-09 22:04:04 -07:00
Bogdan	429444d085	Fixed: Text color for inputs on login page	2024-05-09 22:03:56 -07:00
Mark McDowall	5cb649e9d8	Fixed: Attempt to parse and reject ambiguous dates Closes #6799	2024-05-09 22:03:44 -07:00
Mark McDowall	cac7d239ea	Fixed: Parsing of partial season pack	2024-05-09 22:03:44 -07:00
Sonarr	3940059ea3	Automated API Docs update ignore-downstream	2024-05-09 22:03:31 -07:00
Weblate	20d00fe88c	Multiple Translations updated by Weblate ignore-downstream Co-authored-by: Dani Talens <databio@gmail.com> Co-authored-by: GkhnGRBZ <gkhn.gurbuz@hotmail.com> Co-authored-by: Havok Dan <havokdan@yahoo.com.br> Co-authored-by: Michael5564445 <michaelvelosk@gmail.com> Co-authored-by: Weblate <noreply@weblate.org> Co-authored-by: fordas <fordas15@gmail.com> Translate-URL: https://translate.servarr.com/projects/servarr/sonarr/ca/ Translate-URL: https://translate.servarr.com/projects/servarr/sonarr/es/ Translate-URL: https://translate.servarr.com/projects/servarr/sonarr/pt_BR/ Translate-URL: https://translate.servarr.com/projects/servarr/sonarr/tr/ Translate-URL: https://translate.servarr.com/projects/servarr/sonarr/uk/ Translation: Servarr/Sonarr	2024-05-09 22:03:24 -07:00
Mark McDowall	b4d05214ae	Fixed: Ignore invalid movie tags when writing XBMC metadata Co-authored-by: Bogdan <mynameisbogdan@users.noreply.github.com>	2024-05-08 18:45:19 -07:00
Mark McDowall	cc0a284660	New: Add series tags to Webhook and Notifiarr events	2024-05-08 18:45:19 -07:00
Mark McDowall	f50a263f4f	New: Add Custom Format Score to file in Episode Details	2024-05-08 18:45:03 -07:00
Mark McDowall	29176c8367	New: Has Unmonitored Season filter for Series	2024-05-08 18:44:52 -07:00
Bogdan	1eddf3a152	Use number input for seed ratio	2024-05-08 18:44:36 -07:00
Bogdan	8360dd7a7b	Fixed: Parsing long downloading/seeding values from Transmission	2024-05-08 18:44:27 -07:00
Bogdan	7e8d8500f2	Fixed: Next/previous/last air dates with Postgres DB Closes #6790	2024-05-08 18:43:51 -07:00
Mark McDowall	cae134ec7b	New: Dark theme for login screen Closes #6751	2024-05-08 18:42:54 -07:00
Stevie Robinson	f81bb3ec19	New: Blocklist Custom Filters Closes #6763	2024-05-08 18:42:41 -07:00
Bogdan	128309068d	Fixed: Initialize databases after app folder migrations Co-authored-by: Mark McDowall <mark@mcdowall.ca>	2024-05-08 18:42:15 -07:00
Mickaël Thomas	73a4bdea52	New: Support stoppedUP and stoppedDL states from qBittorrent	2024-05-08 18:41:59 -07:00