2025-08-19 21:13:28 -07:00
190 changed files with 920 additions and 3136 deletions
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@ -6,7 +6,7 @@
  "features": {
    "ghcr.io/devcontainers/features/node:1": {
      "nodeGypDependencies": true,
-      "version": "20",
+      "version": "16",
      "nvmVersion": "latest"
    }
  },
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@ -60,7 +60,6 @@ body:
      - Master
      - Develop
      - Nightly
-      - Plugins (experimental)
      - Other (This issue will be closed)
  validations:
    required: true
--- a/.gitignore
+++ b/.gitignore
@ -158,12 +158,34 @@ Thumbs.db
 /tools/Addins/*
 packages.config.md5sum

+
+# Common IntelliJ Platform excludes
+
+# User specific
+**/.idea/**/workspace.xml
+**/.idea/**/tasks.xml
+**/.idea/shelf/*
+**/.idea/dictionaries
+**/.idea/.idea.Radarr.Posix
+**/.idea/.idea.Radarr.Windows
+
+# Sensitive or high-churn files
+**/.idea/**/dataSources/
+**/.idea/**/dataSources.ids
+**/.idea/**/dataSources.xml
+**/.idea/**/dataSources.local.xml
+**/.idea/**/sqlDataSources.xml
+**/.idea/**/dynamic.xml
+
+# Rider
+# Rider auto-generates .iml files, and contentModel.xml
+**/.idea/**/*.iml
+**/.idea/**/contentModel.xml
+**/.idea/**/modules.xml
+
 # ignore node_modules symlink
 node_modules
 node_modules.nosync

 # API doc generation
 .config/
-
-# Ignore Jetbrains IntelliJ Workspace Directories
-.idea/
--- a/README.md
+++ b/README.md
@ -9,9 +9,6 @@

 Lidarr is a music collection manager for Usenet and BitTorrent users. It can monitor multiple RSS feeds for new tracks from your favorite artists and will grab, sort and rename them. It can also be configured to automatically upgrade the quality of files already downloaded when a better quality format becomes available.

-> [!WARNING]
-> NOTICE - The Lidarr Metadata Server is currently down impacting adding artists, etc. Please follow [GHI 5498](https://github.com/Lidarr/Lidarr/issues/5498) or see Discord for detaila.
-
 ## Major Features Include:

 * Support for major platforms: Windows, Linux, macOS, Raspberry Pi, etc.
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@ -9,7 +9,7 @@ variables:
  testsFolder: './_tests'
  yarnCacheFolder: $(Pipeline.Workspace)/.yarn
  nugetCacheFolder: $(Pipeline.Workspace)/.nuget/packages
-  majorVersion: '2.13.3'
+  majorVersion: '2.9.4'
  minorVersion: $[counter('minorVersion', 1076)]
  lidarrVersion: '$(majorVersion).$(minorVersion)'
  buildName: '$(Build.SourceBranchName).$(lidarrVersion)'
@ -19,7 +19,7 @@ variables:
  nodeVersion: '20.X'
  innoVersion: '6.2.0'
  windowsImage: 'windows-2022'
-  linuxImage: 'ubuntu-22.04'
+  linuxImage: 'ubuntu-20.04'
  macImage: 'macOS-13'

 trigger:
--- a/docs.sh
+++ b/docs.sh
@ -1,18 +1,13 @@
-#!/bin/bash
-set -e
-
-FRAMEWORK="net6.0"
 PLATFORM=$1
-ARCHITECTURE="${2:-x64}"

 if [ "$PLATFORM" = "Windows" ]; then
-  RUNTIME="win-$ARCHITECTURE"
+  RUNTIME="win-x64"
 elif [ "$PLATFORM" = "Linux" ]; then
-  RUNTIME="linux-$ARCHITECTURE"
+  RUNTIME="linux-x64"
 elif [ "$PLATFORM" = "Mac" ]; then
-  RUNTIME="osx-$ARCHITECTURE"
+  RUNTIME="osx-x64"
 else
-  echo "Platform must be provided as first argument: Windows, Linux or Mac"
+  echo "Platform must be provided as first arguement: Windows, Linux or Mac"
  exit 1
 fi

@ -40,7 +35,7 @@ dotnet msbuild -restore $slnFile -p:Configuration=Debug -p:Platform=$platform -p
 dotnet new tool-manifest
 dotnet tool install --version 6.6.2 Swashbuckle.AspNetCore.Cli

-dotnet tool run swagger tofile --output ./src/Lidarr.Api.V1/openapi.json "$outputFolder/$FRAMEWORK/$RUNTIME/$application" v1 &
+dotnet tool run swagger tofile --output ./src/Lidarr.Api.V1/openapi.json "$outputFolder/net6.0/$RUNTIME/$application" v1 &

 sleep 45

--- a/frontend/build/webpack.config.js
+++ b/frontend/build/webpack.config.js
@ -188,7 +188,7 @@ module.exports = (env) => {
                      loose: true,
                      debug: false,
                      useBuiltIns: 'entry',
-                      corejs: '3.41'
+                      corejs: '3.39'
                    }
                  ]
                ]
--- a/frontend/src/Activity/History/Details/HistoryDetails.js
+++ b/frontend/src/Activity/History/Details/HistoryDetails.js
@ -172,8 +172,7 @@ function HistoryDetails(props) {

  if (eventType === 'downloadFailed') {
    const {
-      message,
-      indexer
+      message
    } = data;

    return (
@ -193,14 +192,6 @@ function HistoryDetails(props) {
            null
        }

-        {
-          indexer ? (
-            <DescriptionListItem
-              title={translate('Indexer')}
-              data={indexer}
-            />
-          ) : null}
-
        {
          message ?
            <DescriptionListItem
--- a/frontend/src/Activity/Queue/QueueStatusCell.js
+++ b/frontend/src/Activity/Queue/QueueStatusCell.js
@ -57,40 +57,30 @@ function QueueStatusCell(props) {

  if (status === 'paused') {
    iconName = icons.PAUSED;
-    title = translate('Paused');
+    title = 'Paused';
  }

  if (status === 'queued') {
    iconName = icons.QUEUED;
-    title = translate('Queued');
+    title = 'Queued';
  }

  if (status === 'completed') {
    iconName = icons.DOWNLOADED;
-    title = translate('Downloaded');
-
-    if (trackedDownloadState === 'importBlocked') {
-      title += ` - ${translate('UnableToImportAutomatically')}`;
-      iconKind = kinds.WARNING;
-    }
-
-    if (trackedDownloadState === 'importFailed') {
-      title += ` - ${translate('ImportFailed', { sourceTitle })}`;
-      iconKind = kinds.WARNING;
-    }
+    title = 'Downloaded';

    if (trackedDownloadState === 'importPending') {
-      title += ` - ${translate('WaitingToImport')}`;
+      title += ' - Waiting to Import';
      iconKind = kinds.PURPLE;
    }

    if (trackedDownloadState === 'importing') {
-      title += ` - ${translate('Importing')}`;
+      title += ' - Importing';
      iconKind = kinds.PURPLE;
    }

    if (trackedDownloadState === 'failedPending') {
-      title += ` - ${translate('WaitingToProcess')}`;
+      title += ' - Waiting to Process';
      iconKind = kinds.DANGER;
    }
  }
@ -101,38 +91,36 @@ function QueueStatusCell(props) {

  if (status === 'delay') {
    iconName = icons.PENDING;
-    title = translate('Pending');
+    title = 'Pending';
  }

  if (status === 'downloadClientUnavailable') {
    iconName = icons.PENDING;
    iconKind = kinds.WARNING;
-    title = translate('PendingDownloadClientUnavailable');
+    title = 'Pending - Download client is unavailable';
  }

  if (status === 'failed') {
    iconName = icons.DOWNLOADING;
    iconKind = kinds.DANGER;
-    title = translate('DownloadFailed');
+    title = 'Download failed';
  }

  if (status === 'warning') {
    iconName = icons.DOWNLOADING;
    iconKind = kinds.WARNING;
-    const warningMessage =
-      errorMessage || translate('CheckDownloadClientForDetails');
-    title = translate('DownloadWarning', { warningMessage });
+    title = `Download warning: ${errorMessage || 'check download client for more details'}`;
  }

  if (hasError) {
    if (status === 'completed') {
      iconName = icons.DOWNLOAD;
      iconKind = kinds.DANGER;
-      title = translate('ImportFailed', { sourceTitle });
+      title = `Import failed: ${sourceTitle}`;
    } else {
      iconName = icons.DOWNLOADING;
      iconKind = kinds.DANGER;
-      title = translate('DownloadFailed');
+      title = 'Download failed';
    }
  }

--- a/frontend/src/AddArtist/ArtistMonitorNewItemsOptionsPopoverContent.js
+++ b/frontend/src/AddArtist/ArtistMonitorNewItemsOptionsPopoverContent.js
@ -8,17 +8,17 @@ function ArtistMonitorNewItemsOptionsPopoverContent() {
    <DescriptionList>
      <DescriptionListItem
        title={translate('AllAlbums')}
-        data={translate('MonitorAllAlbums')}
+        data="Monitor all new albums"
      />

      <DescriptionListItem
        title={translate('NewAlbums')}
-        data={translate('MonitorNewAlbumsData')}
+        data="Monitor new albums released after the newest existing album"
      />

      <DescriptionListItem
        title={translate('None')}
-        data={translate('MonitorNoAlbumsData')}
+        data="Don't monitor any new albums"
      />
    </DescriptionList>
  );
--- a/frontend/src/Artist/Edit/EditArtistModalContent.js
+++ b/frontend/src/Artist/Edit/EditArtistModalContent.js
@ -15,7 +15,7 @@ import ModalContent from 'Components/Modal/ModalContent';
 import ModalFooter from 'Components/Modal/ModalFooter';
 import ModalHeader from 'Components/Modal/ModalHeader';
 import Popover from 'Components/Tooltip/Popover';
-import { icons, inputTypes, kinds, sizes, tooltipPositions } from 'Helpers/Props';
+import { icons, inputTypes, kinds, tooltipPositions } from 'Helpers/Props';
 import translate from 'Utilities/String/translate';
 import styles from './EditArtistModalContent.css';

@ -93,7 +93,7 @@ class EditArtistModalContent extends Component {

        <ModalBody>
          <Form {...otherProps}>
-            <FormGroup size={sizes.MEDIUM}>
+            <FormGroup>
              <FormLabel>
                {translate('Monitored')}
              </FormLabel>
@ -107,10 +107,9 @@ class EditArtistModalContent extends Component {
              />
            </FormGroup>

-            <FormGroup size={sizes.MEDIUM}>
+            <FormGroup>
              <FormLabel>
                {translate('MonitorNewItems')}
-
                <Popover
                  anchor={
                    <Icon
@ -133,7 +132,7 @@ class EditArtistModalContent extends Component {
              />
            </FormGroup>

-            <FormGroup size={sizes.MEDIUM}>
+            <FormGroup>
              <FormLabel>
                {translate('QualityProfile')}
              </FormLabel>
@ -147,10 +146,10 @@ class EditArtistModalContent extends Component {
            </FormGroup>

            {
-              showMetadataProfile ?
-                <FormGroup size={sizes.MEDIUM}>
+              showMetadataProfile &&
+                <FormGroup>
                  <FormLabel>
-                    {translate('MetadataProfile')}
+                    Metadata Profile

                    <Popover
                      anchor={
@ -174,11 +173,10 @@ class EditArtistModalContent extends Component {
                    {...metadataProfileId}
                    onChange={onInputChange}
                  />
-                </FormGroup> :
-                null
+                </FormGroup>
            }

-            <FormGroup size={sizes.MEDIUM}>
+            <FormGroup>
              <FormLabel>
                {translate('Path')}
              </FormLabel>
@ -191,7 +189,7 @@ class EditArtistModalContent extends Component {
              />
            </FormGroup>

-            <FormGroup size={sizes.MEDIUM}>
+            <FormGroup>
              <FormLabel>
                {translate('Tags')}
              </FormLabel>
@ -211,7 +209,7 @@ class EditArtistModalContent extends Component {
            kind={kinds.DANGER}
            onPress={onDeleteArtistPress}
          >
-            {translate('Delete')}
+            Delete
          </Button>

          <Button
--- a/frontend/src/Components/Filter/Builder/HistoryEventTypeFilterBuilderRowValue.tsx
+++ b/frontend/src/Components/Filter/Builder/HistoryEventTypeFilterBuilderRowValue.tsx
@ -25,7 +25,7 @@ const EVENT_TYPE_OPTIONS = [
  {
    id: 7,
    get name() {
-      return translate('ImportCompleteFailed');
+      return translate('ImportFailed');
    },
  },
  {
--- a/frontend/src/Components/Form/EnhancedSelectInput.js
+++ b/frontend/src/Components/Form/EnhancedSelectInput.js
@ -20,8 +20,6 @@ import HintedSelectInputSelectedValue from './HintedSelectInputSelectedValue';
 import TextInput from './TextInput';
 import styles from './EnhancedSelectInput.css';

-const MINIMUM_DISTANCE_FROM_EDGE = 10;
-
 function isArrowKey(keyCode) {
  return keyCode === keyCodes.UP_ARROW || keyCode === keyCodes.DOWN_ARROW;
 }
@ -139,9 +137,18 @@ class EnhancedSelectInput extends Component {
  // Listeners

  onComputeMaxHeight = (data) => {
+    const {
+      top,
+      bottom
+    } = data.offsets.reference;
+
    const windowHeight = window.innerHeight;

-    data.styles.maxHeight = windowHeight - MINIMUM_DISTANCE_FROM_EDGE;
+    if ((/^botton/).test(data.placement)) {
+      data.styles.maxHeight = windowHeight - bottom;
+    } else {
+      data.styles.maxHeight = top;
+    }

    return data;
  };
@ -450,10 +457,6 @@ class EnhancedSelectInput extends Component {
                  order: 851,
                  enabled: true,
                  fn: this.onComputeMaxHeight
-                },
-                preventOverflow: {
-                  enabled: true,
-                  boundariesElement: 'viewport'
                }
              }}
            >
--- a/frontend/src/Components/Modal/Modal.css
+++ b/frontend/src/Components/Modal/Modal.css
@ -83,6 +83,13 @@
 }

@media only screen and (max-width: $breakpointMedium) {
+  .modal.small,
+  .modal.medium {
+    width: 90%;
+  }
+}
+
+@media only screen and (max-width: $breakpointSmall) {
  .modalContainer {
    position: fixed;
  }
--- a/frontend/src/Components/SignalRConnector.js
+++ b/frontend/src/Components/SignalRConnector.js
@ -224,58 +224,10 @@ class SignalRConnector extends Component {
    repopulatePage('trackFileUpdated');
  };

-  handleDownloadclient = ({ action, resource }) => {
-    const section = 'settings.downloadClients';
-
-    if (action === 'created' || action === 'updated') {
-      this.props.dispatchUpdateItem({ section, ...resource });
-    } else if (action === 'deleted') {
-      this.props.dispatchRemoveItem({ section, id: resource.id });
-    }
-  };
-
  handleHealth = () => {
    this.props.dispatchFetchHealth();
  };

-  handleImportlist = ({ action, resource }) => {
-    const section = 'settings.importLists';
-
-    if (action === 'created' || action === 'updated') {
-      this.props.dispatchUpdateItem({ section, ...resource });
-    } else if (action === 'deleted') {
-      this.props.dispatchRemoveItem({ section, id: resource.id });
-    }
-  };
-
-  handleIndexer = ({ action, resource }) => {
-    const section = 'settings.indexers';
-
-    if (action === 'created' || action === 'updated') {
-      this.props.dispatchUpdateItem({ section, ...resource });
-    } else if (action === 'deleted') {
-      this.props.dispatchRemoveItem({ section, id: resource.id });
-    }
-  };
-
-  handleMetadata = ({ action, resource }) => {
-    const section = 'settings.metadata';
-
-    if (action === 'updated') {
-      this.props.dispatchUpdateItem({ section, ...resource });
-    }
-  };
-
-  handleNotification = ({ action, resource }) => {
-    const section = 'settings.notifications';
-
-    if (action === 'created' || action === 'updated') {
-      this.props.dispatchUpdateItem({ section, ...resource });
-    } else if (action === 'deleted') {
-      this.props.dispatchRemoveItem({ section, id: resource.id });
-    }
-  };
-
  handleArtist = (body) => {
    const action = body.action;
    const section = 'artist';
--- a/frontend/src/Components/Table/Cells/TableRowCell.css
+++ b/frontend/src/Components/Table/Cells/TableRowCell.css
@ -4,7 +4,7 @@
  line-height: 1.52857143;
 }

-@media only screen and (max-width: $breakpointMedium) {
+@media only screen and (max-width: $breakpointSmall) {
  .cell {
    white-space: nowrap;
  }
--- a/frontend/src/Components/Table/Cells/VirtualTableRowCell.css
+++ b/frontend/src/Components/Table/Cells/VirtualTableRowCell.css
@ -7,7 +7,7 @@
  white-space: nowrap;
 }

-@media only screen and (max-width: $breakpointMedium) {
+@media only screen and (max-width: $breakpointSmall) {
  .cell {
    white-space: nowrap;
  }
--- a/frontend/src/Components/Table/Table.css
+++ b/frontend/src/Components/Table/Table.css
@ -10,7 +10,7 @@
  border-collapse: collapse;
 }

-@media only screen and (max-width: $breakpointMedium) {
+@media only screen and (max-width: $breakpointSmall) {
  .tableContainer {
    min-width: 100%;
    width: fit-content;
--- a/frontend/src/Components/Table/TableHeaderCell.css
+++ b/frontend/src/Components/Table/TableHeaderCell.css
@ -9,7 +9,7 @@
  margin-left: 10px;
 }

-@media only screen and (max-width: $breakpointMedium) {
+@media only screen and (max-width: $breakpointSmall) {
  .headerCell {
    white-space: nowrap;
  }
--- a/frontend/src/Components/Table/TablePager.css
+++ b/frontend/src/Components/Table/TablePager.css
@ -60,7 +60,7 @@
  height: 25px;
 }

-@media only screen and (max-width: $breakpointMedium) {
+@media only screen and (max-width: $breakpointSmall) {
  .pager {
    flex-wrap: wrap;
  }
--- a/frontend/src/Components/Table/VirtualTableHeaderCell.css
+++ b/frontend/src/Components/Table/VirtualTableHeaderCell.css
@ -9,7 +9,7 @@
  margin-left: 10px;
 }

-@media only screen and (max-width: $breakpointMedium) {
+@media only screen and (max-width: $breakpointSmall) {
  .headerCell {
    white-space: nowrap;
  }
--- a/frontend/src/Settings/CustomFormats/CustomFormats/Manage/ManageCustomFormatsModalContent.tsx
+++ b/frontend/src/Settings/CustomFormats/CustomFormats/Manage/ManageCustomFormatsModalContent.tsx
@ -10,11 +10,11 @@ import ModalBody from 'Components/Modal/ModalBody';
 import ModalContent from 'Components/Modal/ModalContent';
 import ModalFooter from 'Components/Modal/ModalFooter';
 import ModalHeader from 'Components/Modal/ModalHeader';
-import Column from 'Components/Table/Column';
 import Table from 'Components/Table/Table';
 import TableBody from 'Components/Table/TableBody';
 import useSelectState from 'Helpers/Hooks/useSelectState';
 import { kinds } from 'Helpers/Props';
+import SortDirection from 'Helpers/Props/SortDirection';
 import {
  bulkDeleteCustomFormats,
  bulkEditCustomFormats,
@ -34,7 +34,7 @@ type OnSelectedChangeCallback = React.ComponentProps<
  typeof ManageCustomFormatsModalRow
 >['onSelectedChange'];

-const COLUMNS: Column[] = [
+const COLUMNS = [
  {
    name: 'name',
    label: () => translate('Name'),
@ -56,6 +56,8 @@ const COLUMNS: Column[] = [

 interface ManageCustomFormatsModalContentProps {
  onModalClose(): void;
+  sortKey?: string;
+  sortDirection?: SortDirection;
 }

 function ManageCustomFormatsModalContent(
--- a/frontend/src/Settings/DownloadClients/DownloadClients/Manage/ManageDownloadClientsModalContent.tsx
+++ b/frontend/src/Settings/DownloadClients/DownloadClients/Manage/ManageDownloadClientsModalContent.tsx
@ -10,11 +10,11 @@ import ModalBody from 'Components/Modal/ModalBody';
 import ModalContent from 'Components/Modal/ModalContent';
 import ModalFooter from 'Components/Modal/ModalFooter';
 import ModalHeader from 'Components/Modal/ModalHeader';
-import Column from 'Components/Table/Column';
 import Table from 'Components/Table/Table';
 import TableBody from 'Components/Table/TableBody';
 import useSelectState from 'Helpers/Hooks/useSelectState';
 import { kinds } from 'Helpers/Props';
+import SortDirection from 'Helpers/Props/SortDirection';
 import {
  bulkDeleteDownloadClients,
  bulkEditDownloadClients,
@ -35,7 +35,7 @@ type OnSelectedChangeCallback = React.ComponentProps<
  typeof ManageDownloadClientsModalRow
 >['onSelectedChange'];

-const COLUMNS: Column[] = [
+const COLUMNS = [
  {
    name: 'name',
    label: () => translate('Name'),
@ -82,6 +82,8 @@ const COLUMNS: Column[] = [

 interface ManageDownloadClientsModalContentProps {
  onModalClose(): void;
+  sortKey?: string;
+  sortDirection?: SortDirection;
 }

 function ManageDownloadClientsModalContent(
--- a/frontend/src/Settings/Indexers/Indexers/Manage/ManageIndexersModalContent.tsx
+++ b/frontend/src/Settings/Indexers/Indexers/Manage/ManageIndexersModalContent.tsx
@ -10,11 +10,11 @@ import ModalBody from 'Components/Modal/ModalBody';
 import ModalContent from 'Components/Modal/ModalContent';
 import ModalFooter from 'Components/Modal/ModalFooter';
 import ModalHeader from 'Components/Modal/ModalHeader';
-import Column from 'Components/Table/Column';
 import Table from 'Components/Table/Table';
 import TableBody from 'Components/Table/TableBody';
 import useSelectState from 'Helpers/Hooks/useSelectState';
 import { kinds } from 'Helpers/Props';
+import SortDirection from 'Helpers/Props/SortDirection';
 import {
  bulkDeleteIndexers,
  bulkEditIndexers,
@ -35,7 +35,7 @@ type OnSelectedChangeCallback = React.ComponentProps<
  typeof ManageIndexersModalRow
 >['onSelectedChange'];

-const COLUMNS: Column[] = [
+const COLUMNS = [
  {
    name: 'name',
    label: () => translate('Name'),
@ -82,6 +82,8 @@ const COLUMNS: Column[] = [

 interface ManageIndexersModalContentProps {
  onModalClose(): void;
+  sortKey?: string;
+  sortDirection?: SortDirection;
 }

 function ManageIndexersModalContent(props: ManageIndexersModalContentProps) {
--- a/frontend/src/Settings/MediaManagement/RootFolder/RootFolder.js
+++ b/frontend/src/Settings/MediaManagement/RootFolder/RootFolder.js
@ -94,9 +94,9 @@ class RootFolder extends Component {
        <ConfirmModal
          isOpen={this.state.isDeleteRootFolderModalOpen}
          kind={kinds.DANGER}
-          title={translate('RemoveRootFolder')}
-          message={translate('RemoveRootFolderArtistsMessageText', { name })}
-          confirmLabel={translate('Remove')}
+          title={translate('DeleteRootFolder')}
+          message={translate('DeleteRootFolderMessageText', { name })}
+          confirmLabel={translate('Delete')}
          onConfirm={this.onConfirmDeleteRootFolder}
          onCancel={this.onDeleteRootFolderModalClose}
        />
--- a/frontend/src/Settings/Quality/Definition/QualityDefinition.css
+++ b/frontend/src/Settings/Quality/Definition/QualityDefinition.css
@ -24,7 +24,7 @@
  height: 20px;
 }

-.track {
+.bar {
  top: 9px;
  margin: 0 5px;
  height: 3px;
@ -36,7 +36,7 @@
  }
 }

-.thumb {
+.handle {
  top: 1px;
  z-index: 0 !important;
  width: 18px;
--- a/frontend/src/Settings/Quality/Definition/QualityDefinition.css.d.ts
+++ b/frontend/src/Settings/Quality/Definition/QualityDefinition.css.d.ts
@ -1,6 +1,8 @@
 // This file is automatically generated.
 // Please do not change this file!
 interface CssExports {
+  'bar': string;
+  'handle': string;
  'kilobitsPerSecond': string;
  'quality': string;
  'qualityDefinition': string;
@ -8,9 +10,7 @@ interface CssExports {
  'sizeLimit': string;
  'sizes': string;
  'slider': string;
-  'thumb': string;
  'title': string;
-  'track': string;
 }
 export const cssExports: CssExports;
 export default cssExports;
--- a/frontend/src/Settings/Quality/Definition/QualityDefinition.js
+++ b/frontend/src/Settings/Quality/Definition/QualityDefinition.js
@ -55,27 +55,6 @@ class QualityDefinition extends Component {
    };
  }

-  //
-  // Control
-
-  trackRenderer(props, state) {
-    return (
-      <div
-        {...props}
-        className={styles.track}
-      />
-    );
-  }
-
-  thumbRenderer(props, state) {
-    return (
-      <div
-        {...props}
-        className={styles.thumb}
-      />
-    );
-  }
-
  //
  // Listeners

@ -195,7 +174,6 @@ class QualityDefinition extends Component {

        <div className={styles.sizeLimit}>
          <ReactSlider
-            className={styles.slider}
            min={slider.min}
            max={slider.max}
            step={slider.step}
@ -204,9 +182,9 @@ class QualityDefinition extends Component {
            withTracks={true}
            allowCross={false}
            snapDragDisabled={true}
-            pearling={true}
-            renderThumb={this.thumbRenderer}
-            renderTrack={this.trackRenderer}
+            className={styles.slider}
+            trackClassName={styles.bar}
+            thumbClassName={styles.handle}
            onChange={this.onSliderChange}
            onAfterChange={this.onAfterSliderChange}
          />
--- a/frontend/src/Store/Actions/artistIndexActions.js
+++ b/frontend/src/Store/Actions/artistIndexActions.js
@ -151,7 +151,7 @@ export const defaultState = {
    {
      name: 'genres',
      label: () => translate('Genres'),
-      isSortable: true,
+      isSortable: false,
      isVisible: false
    },
    {
--- a/frontend/src/Store/Actions/historyActions.js
+++ b/frontend/src/Store/Actions/historyActions.js
@ -150,7 +150,7 @@ export const defaultState = {
    },
    {
      key: 'importFailed',
-      label: () => translate('ImportCompleteFailed'),
+      label: () => translate('ImportFailed'),
      filters: [
        {
          key: 'eventType',
--- a/frontend/src/System/Logs/Files/LogFiles.js
+++ b/frontend/src/System/Logs/Files/LogFiles.js
@ -1,8 +1,8 @@
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import Alert from 'Components/Alert';
+import Link from 'Components/Link/Link';
 import LoadingIndicator from 'Components/Loading/LoadingIndicator';
-import InlineMarkdown from 'Components/Markdown/InlineMarkdown';
 import PageContent from 'Components/Page/PageContent';
 import PageContentBody from 'Components/Page/PageContentBody';
 import PageToolbar from 'Components/Page/Toolbar/PageToolbar';
@ -77,16 +77,15 @@ class LogFiles extends Component {
        <PageContentBody>
          <Alert>
            <div>
-              {translate('LogFilesLocation', {
-                location
-              })}
+              Log files are located in: {location}
            </div>

-            {currentLogView === 'Log Files' ? (
+            {
+              currentLogView === 'Log Files' &&
                <div>
-                <InlineMarkdown data={translate('TheLogLevelDefault')} />
+                  The log level defaults to 'Info' and can be changed in <Link to="/settings/general">General Settings</Link>
                </div>
-            ) : null}
+            }
          </Alert>

          {
--- a/frontend/src/System/Updates/Updates.tsx
+++ b/frontend/src/System/Updates/Updates.tsx
@ -270,7 +270,7 @@ function Updates() {

        {generalSettingsError ? (
          <Alert kind={kinds.DANGER}>
-            {translate('FailedToFetchSettings')}
+            {translate('FailedToUpdateSettings')}
          </Alert>
        ) : null}

--- a/frontend/src/index.ts
+++ b/frontend/src/index.ts
@ -23,13 +23,12 @@ const error = console.error;
 function logError(...parameters: any[]) {
  const filter = parameters.find((parameter) => {
    return (
-      typeof parameter === 'string' &&
-      (parameter.includes(
+      parameter.includes(
        'Support for defaultProps will be removed from function components in a future major release'
      ) ||
      parameter.includes(
        'findDOMNode is deprecated and will be removed in the next major release'
-        ))
+      )
    );
  });

--- a/package.json
+++ b/package.json
@ -109,7 +109,7 @@
    "babel-loader": "9.2.1",
    "babel-plugin-inline-classnames": "2.0.1",
    "babel-plugin-transform-react-remove-prop-types": "0.4.24",
-    "core-js": "3.41.0",
+    "core-js": "3.39.0",
    "css-loader": "6.7.3",
    "css-modules-typescript-loader": "4.0.1",
    "eslint": "8.57.1",
--- a/src/Lidarr.Api.V1/DownloadClient/DownloadClientController.cs
+++ b/src/Lidarr.Api.V1/DownloadClient/DownloadClientController.cs
@ -1,7 +1,5 @@
-using FluentValidation;
 using Lidarr.Http;
 using NzbDrone.Core.Download;
-using NzbDrone.SignalR;

 namespace Lidarr.Api.V1.DownloadClient
 {
@ -11,10 +9,9 @@ namespace Lidarr.Api.V1.DownloadClient
        public static readonly DownloadClientResourceMapper ResourceMapper = new ();
        public static readonly DownloadClientBulkResourceMapper BulkResourceMapper = new ();

-        public DownloadClientController(IBroadcastSignalRMessage signalRBroadcaster, IDownloadClientFactory downloadClientFactory)
-            : base(signalRBroadcaster, downloadClientFactory, "downloadclient", ResourceMapper, BulkResourceMapper)
+        public DownloadClientController(IDownloadClientFactory downloadClientFactory)
+            : base(downloadClientFactory, "downloadclient", ResourceMapper, BulkResourceMapper)
        {
-            SharedValidator.RuleFor(c => c.Priority).InclusiveBetween(1, 50);
        }
    }
 }
--- a/src/Lidarr.Api.V1/Health/HealthResource.cs
+++ b/src/Lidarr.Api.V1/Health/HealthResource.cs
@ -1,6 +1,7 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 using Lidarr.Http.REST;
+using NzbDrone.Common.Http;
 using NzbDrone.Core.HealthCheck;

 namespace Lidarr.Api.V1.Health
@ -10,7 +11,7 @@ namespace Lidarr.Api.V1.Health
        public string Source { get; set; }
        public HealthCheckResult Type { get; set; }
        public string Message { get; set; }
-        public string WikiUrl { get; set; }
+        public HttpUri WikiUrl { get; set; }
    }

    public static class HealthResourceMapper
@ -28,7 +29,7 @@ namespace Lidarr.Api.V1.Health
                Source = model.Source.Name,
                Type = model.Type,
                Message = model.Message,
-                WikiUrl = model.WikiUrl.FullUri
+                WikiUrl = model.WikiUrl
            };
        }

--- a/src/Lidarr.Api.V1/ImportLists/ImportListController.cs
+++ b/src/Lidarr.Api.V1/ImportLists/ImportListController.cs
@ -3,7 +3,6 @@ using Lidarr.Http;
 using NzbDrone.Core.ImportLists;
 using NzbDrone.Core.Validation;
 using NzbDrone.Core.Validation.Paths;
-using NzbDrone.SignalR;

 namespace Lidarr.Api.V1.ImportLists
 {
@ -13,12 +12,11 @@ namespace Lidarr.Api.V1.ImportLists
        public static readonly ImportListResourceMapper ResourceMapper = new ();
        public static readonly ImportListBulkResourceMapper BulkResourceMapper = new ();

-        public ImportListController(IBroadcastSignalRMessage signalRBroadcaster,
-            IImportListFactory importListFactory,
+        public ImportListController(IImportListFactory importListFactory,
                                    RootFolderExistsValidator rootFolderExistsValidator,
                                    QualityProfileExistsValidator qualityProfileExistsValidator,
                                    MetadataProfileExistsValidator metadataProfileExistsValidator)
-            : base(signalRBroadcaster, importListFactory, "importlist", ResourceMapper, BulkResourceMapper)
+            : base(importListFactory, "importlist", ResourceMapper, BulkResourceMapper)
        {
            SharedValidator.RuleFor(c => c.RootFolderPath).Cascade(CascadeMode.Stop)
                .IsValidPath()
--- a/src/Lidarr.Api.V1/Indexers/IndexerController.cs
+++ b/src/Lidarr.Api.V1/Indexers/IndexerController.cs
@ -1,8 +1,6 @@
-using FluentValidation;
 using Lidarr.Http;
 using NzbDrone.Core.Indexers;
 using NzbDrone.Core.Validation;
-using NzbDrone.SignalR;

 namespace Lidarr.Api.V1.Indexers
 {
@ -12,12 +10,9 @@ namespace Lidarr.Api.V1.Indexers
        public static readonly IndexerResourceMapper ResourceMapper = new ();
        public static readonly IndexerBulkResourceMapper BulkResourceMapper = new ();

-        public IndexerController(IBroadcastSignalRMessage signalRBroadcaster,
-            IndexerFactory indexerFactory,
-            DownloadClientExistsValidator downloadClientExistsValidator)
-            : base(signalRBroadcaster, indexerFactory, "indexer", ResourceMapper, BulkResourceMapper)
+        public IndexerController(IndexerFactory indexerFactory, DownloadClientExistsValidator downloadClientExistsValidator)
+            : base(indexerFactory, "indexer", ResourceMapper, BulkResourceMapper)
        {
-            SharedValidator.RuleFor(c => c.Priority).InclusiveBetween(1, 50);
            SharedValidator.RuleFor(c => c.DownloadClientId).SetValidator(downloadClientExistsValidator);
        }
    }
--- a/src/Lidarr.Api.V1/Lidarr.Api.V1.csproj
+++ b/src/Lidarr.Api.V1/Lidarr.Api.V1.csproj
@ -13,7 +13,7 @@
    <PackageReference Include="System.Reflection.TypeExtensions" Version="4.7.0" />
    <PackageReference Include="FluentValidation" Version="9.5.4" />
    <PackageReference Include="Ical.Net" Version="4.3.1" />
-    <PackageReference Include="NLog" Version="5.4.0" />
+    <PackageReference Include="NLog" Version="5.3.4" />
    <PackageReference Include="System.IO.Abstractions" Version="17.0.24" />
  </ItemGroup>
 </Project>
--- a/src/Lidarr.Api.V1/Metadata/MetadataController.cs
+++ b/src/Lidarr.Api.V1/Metadata/MetadataController.cs
@ -2,7 +2,6 @@ using System;
 using Lidarr.Http;
 using Microsoft.AspNetCore.Mvc;
 using NzbDrone.Core.Extras.Metadata;
-using NzbDrone.SignalR;

 namespace Lidarr.Api.V1.Metadata
 {
@ -12,8 +11,8 @@ namespace Lidarr.Api.V1.Metadata
        public static readonly MetadataResourceMapper ResourceMapper = new ();
        public static readonly MetadataBulkResourceMapper BulkResourceMapper = new ();

-        public MetadataController(IBroadcastSignalRMessage signalRBroadcaster, IMetadataFactory metadataFactory)
-            : base(signalRBroadcaster, metadataFactory, "metadata", ResourceMapper, BulkResourceMapper)
+        public MetadataController(IMetadataFactory metadataFactory)
+            : base(metadataFactory, "metadata", ResourceMapper, BulkResourceMapper)
        {
        }

--- a/src/Lidarr.Api.V1/Notifications/NotificationController.cs
+++ b/src/Lidarr.Api.V1/Notifications/NotificationController.cs
@ -2,7 +2,6 @@ using System;
 using Lidarr.Http;
 using Microsoft.AspNetCore.Mvc;
 using NzbDrone.Core.Notifications;
-using NzbDrone.SignalR;

 namespace Lidarr.Api.V1.Notifications
 {
@ -12,8 +11,8 @@ namespace Lidarr.Api.V1.Notifications
        public static readonly NotificationResourceMapper ResourceMapper = new ();
        public static readonly NotificationBulkResourceMapper BulkResourceMapper = new ();

-        public NotificationController(IBroadcastSignalRMessage signalRBroadcaster, NotificationFactory notificationFactory)
-            : base(signalRBroadcaster, notificationFactory, "notification", ResourceMapper, BulkResourceMapper)
+        public NotificationController(NotificationFactory notificationFactory)
+            : base(notificationFactory, "notification", ResourceMapper, BulkResourceMapper)
        {
        }

--- a/src/Lidarr.Api.V1/ProviderControllerBase.cs
+++ b/src/Lidarr.Api.V1/ProviderControllerBase.cs
@ -7,19 +7,12 @@ using Lidarr.Http.REST.Attributes;
 using Microsoft.AspNetCore.Mvc;
 using NzbDrone.Common.Extensions;
 using NzbDrone.Common.Serializer;
-using NzbDrone.Core.Datastore.Events;
-using NzbDrone.Core.Messaging.Events;
 using NzbDrone.Core.ThingiProvider;
-using NzbDrone.Core.ThingiProvider.Events;
 using NzbDrone.Core.Validation;
-using NzbDrone.SignalR;

 namespace Lidarr.Api.V1
 {
-    public abstract class ProviderControllerBase<TProviderResource, TBulkProviderResource, TProvider, TProviderDefinition> : RestControllerWithSignalR<TProviderResource, TProviderDefinition>,
-        IHandle<ProviderAddedEvent<TProvider>>,
-        IHandle<ProviderUpdatedEvent<TProvider>>,
-        IHandle<ProviderDeletedEvent<TProvider>>
+    public abstract class ProviderControllerBase<TProviderResource, TBulkProviderResource, TProvider, TProviderDefinition> : RestController<TProviderResource>
        where TProviderDefinition : ProviderDefinition, new()
        where TProvider : IProvider
        where TProviderResource : ProviderResource<TProviderResource>, new()
@ -29,13 +22,11 @@ namespace Lidarr.Api.V1
        private readonly ProviderResourceMapper<TProviderResource, TProviderDefinition> _resourceMapper;
        private readonly ProviderBulkResourceMapper<TBulkProviderResource, TProviderDefinition> _bulkResourceMapper;

-        protected ProviderControllerBase(IBroadcastSignalRMessage signalRBroadcaster,
-            IProviderFactory<TProvider,
+        protected ProviderControllerBase(IProviderFactory<TProvider,
            TProviderDefinition> providerFactory,
            string resource,
            ProviderResourceMapper<TProviderResource, TProviderDefinition> resourceMapper,
            ProviderBulkResourceMapper<TBulkProviderResource, TProviderDefinition> bulkResourceMapper)
-            : base(signalRBroadcaster)
        {
            _providerFactory = providerFactory;
            _resourceMapper = resourceMapper;
@ -270,24 +261,6 @@ namespace Lidarr.Api.V1
            return Content(data.ToJson(), "application/json");
        }

-        [NonAction]
-        public virtual void Handle(ProviderAddedEvent<TProvider> message)
-        {
-            BroadcastResourceChange(ModelAction.Created, message.Definition.Id);
-        }
-
-        [NonAction]
-        public virtual void Handle(ProviderUpdatedEvent<TProvider> message)
-        {
-            BroadcastResourceChange(ModelAction.Updated, message.Definition.Id);
-        }
-
-        [NonAction]
-        public virtual void Handle(ProviderDeletedEvent<TProvider> message)
-        {
-            BroadcastResourceChange(ModelAction.Deleted, message.ProviderId);
-        }
-
        protected virtual void Validate(TProviderDefinition definition, bool includeWarnings)
        {
            var validationResult = definition.Settings.Validate();
--- a/src/Lidarr.Api.V1/Queue/QueueController.cs
+++ b/src/Lidarr.Api.V1/Queue/QueueController.cs
@ -302,7 +302,7 @@ namespace Lidarr.Api.V1.Queue

            if (blocklist)
            {
-                _failedDownloadService.MarkAsFailed(trackedDownload, skipRedownload);
+                _failedDownloadService.MarkAsFailed(trackedDownload.DownloadItem.DownloadId, skipRedownload);
            }

            if (!removeFromClient && !blocklist && !changeCategory)
--- a/src/Lidarr.Api.V1/RemotePathMappings/RemotePathMappingController.cs
+++ b/src/Lidarr.Api.V1/RemotePathMappings/RemotePathMappingController.cs
@ -4,7 +4,6 @@ using Lidarr.Http;
 using Lidarr.Http.REST;
 using Lidarr.Http.REST.Attributes;
 using Microsoft.AspNetCore.Mvc;
-using NzbDrone.Common.Extensions;
 using NzbDrone.Core.RemotePathMappings;
 using NzbDrone.Core.Validation.Paths;

@ -28,22 +27,11 @@ namespace Lidarr.Api.V1.RemotePathMappings
            SharedValidator.RuleFor(c => c.RemotePath)
                           .NotEmpty();

-            SharedValidator.RuleFor(c => c.RemotePath)
-                .Must(remotePath => remotePath.IsNotNullOrWhiteSpace() && !remotePath.StartsWith(" "))
-                .WithMessage("Remote Path '{PropertyValue}' must not start with a space");
-
-            SharedValidator.RuleFor(c => c.RemotePath)
-                .Must(remotePath => remotePath.IsNotNullOrWhiteSpace() && !remotePath.EndsWith(" "))
-                .WithMessage("Remote Path '{PropertyValue}' must not end with a space");
-
            SharedValidator.RuleFor(c => c.LocalPath)
                           .Cascade(CascadeMode.Stop)
                           .IsValidPath()
                           .SetValidator(mappedNetworkDriveValidator)
-                .SetValidator(pathExistsValidator)
-                .SetValidator(new SystemFolderValidator())
-                .NotEqual("/")
-                .WithMessage("Cannot be set to '/'");
+                           .SetValidator(pathExistsValidator);
        }

        public override RemotePathMappingResource GetResourceById(int id)
@ -53,7 +41,7 @@ namespace Lidarr.Api.V1.RemotePathMappings

        [RestPostById]
        [Consumes("application/json")]
-        public ActionResult<RemotePathMappingResource> CreateMapping([FromBody] RemotePathMappingResource resource)
+        public ActionResult<RemotePathMappingResource> CreateMapping(RemotePathMappingResource resource)
        {
            var model = resource.ToModel();

@ -74,7 +62,7 @@ namespace Lidarr.Api.V1.RemotePathMappings
        }

        [RestPutById]
-        public ActionResult<RemotePathMappingResource> UpdateMapping([FromBody] RemotePathMappingResource resource)
+        public ActionResult<RemotePathMappingResource> UpdateMapping(RemotePathMappingResource resource)
        {
            var mapping = resource.ToModel();

--- a/src/Lidarr.Api.V1/System/Backup/BackupController.cs
+++ b/src/Lidarr.Api.V1/System/Backup/BackupController.cs
@ -92,7 +92,7 @@ namespace Lidarr.Api.V1.System.Backup
        }

        [HttpPost("restore/upload")]
-        [RequestFormLimits(MultipartBodyLengthLimit = 5000000000)]
+        [RequestFormLimits(MultipartBodyLengthLimit = 1000000000)]
        public object UploadAndRestore()
        {
            var files = Request.Form.Files;
--- a/src/Lidarr.Api.V1/Tags/TagController.cs
+++ b/src/Lidarr.Api.V1/Tags/TagController.cs
@ -1,5 +1,4 @@
 using System.Collections.Generic;
-using FluentValidation;
 using Lidarr.Http;
 using Lidarr.Http.REST;
 using Lidarr.Http.REST.Attributes;
@ -24,8 +23,6 @@ namespace Lidarr.Api.V1.Tags
            : base(signalRBroadcaster)
        {
            _tagService = tagService;
-
-            SharedValidator.RuleFor(c => c.Label).NotEmpty();
        }

        public override TagResource GetResourceById(int id)
--- a/src/Lidarr.Api.V1/openapi.json
+++ b/src/Lidarr.Api.V1/openapi.json
@ -9808,8 +9808,7 @@
            "nullable": true
          },
          "wikiUrl": {
-            "type": "string",
-            "nullable": true
+            "$ref": "#/components/schemas/HttpUri"
          }
        },
        "additionalProperties": false
@ -10063,6 +10062,48 @@
        },
        "additionalProperties": false
      },
+      "HttpUri": {
+        "type": "object",
+        "properties": {
+          "fullUri": {
+            "type": "string",
+            "nullable": true,
+            "readOnly": true
+          },
+          "scheme": {
+            "type": "string",
+            "nullable": true,
+            "readOnly": true
+          },
+          "host": {
+            "type": "string",
+            "nullable": true,
+            "readOnly": true
+          },
+          "port": {
+            "type": "integer",
+            "format": "int32",
+            "nullable": true,
+            "readOnly": true
+          },
+          "path": {
+            "type": "string",
+            "nullable": true,
+            "readOnly": true
+          },
+          "query": {
+            "type": "string",
+            "nullable": true,
+            "readOnly": true
+          },
+          "fragment": {
+            "type": "string",
+            "nullable": true,
+            "readOnly": true
+          }
+        },
+        "additionalProperties": false
+      },
      "ImportListBulkResource": {
        "type": "object",
        "properties": {
@ -12881,7 +12922,6 @@
          "downloading",
          "downloadFailed",
          "downloadFailedPending",
-          "importBlocked",
          "importPending",
          "importing",
          "importFailed",
--- a/src/Lidarr.Http/Authentication/AuthenticationController.cs
+++ b/src/Lidarr.Http/Authentication/AuthenticationController.cs
@ -1,14 +1,9 @@
 using System.Collections.Generic;
-using System.IO;
 using System.Security.Claims;
-using System.Security.Cryptography;
 using System.Threading.Tasks;
-using System.Xml;
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
-using NLog;
-using NzbDrone.Common.EnvironmentInfo;
 using NzbDrone.Common.Extensions;
 using NzbDrone.Core.Authentication;
 using NzbDrone.Core.Configuration;
@ -21,15 +16,11 @@ namespace Lidarr.Http.Authentication
    {
        private readonly IAuthenticationService _authService;
        private readonly IConfigFileProvider _configFileProvider;
-        private readonly IAppFolderInfo _appFolderInfo;
-        private readonly Logger _logger;

-        public AuthenticationController(IAuthenticationService authService, IConfigFileProvider configFileProvider, IAppFolderInfo appFolderInfo, Logger logger)
+        public AuthenticationController(IAuthenticationService authService, IConfigFileProvider configFileProvider)
        {
            _authService = authService;
            _configFileProvider = configFileProvider;
-            _appFolderInfo = appFolderInfo;
-            _logger = logger;
        }

        [HttpPost("login")]
@ -54,23 +45,7 @@ namespace Lidarr.Http.Authentication
                IsPersistent = resource.RememberMe == "on"
            };

-            try
-            {
            await HttpContext.SignInAsync(AuthenticationType.Forms.ToString(), new ClaimsPrincipal(new ClaimsIdentity(claims, "Cookies", "user", "identifier")), authProperties);
-            }
-            catch (CryptographicException e)
-            {
-                if (e.InnerException is XmlException)
-                {
-                    _logger.Error(e, "Failed to authenticate user due to corrupt XML. Please remove all XML files from {0} and restart Lidarr", Path.Combine(_appFolderInfo.AppDataFolder, "asp"));
-                }
-                else
-                {
-                    _logger.Error(e, "Failed to authenticate user. {0}", e.Message);
-                }
-
-                return Unauthorized();
-            }

            if (returnUrl.IsNullOrWhiteSpace() || !Url.IsLocalUrl(returnUrl))
            {
--- a/src/Lidarr.Http/Authentication/AuthenticationService.cs
+++ b/src/Lidarr.Http/Authentication/AuthenticationService.cs
@ -77,7 +77,7 @@ namespace Lidarr.Http.Authentication

        private void LogSuccess(HttpRequest context, string username)
        {
-            _authLogger.Debug("Auth-Success ip {0} username '{1}'", context.GetRemoteIP(), username);
+            _authLogger.Info("Auth-Success ip {0} username '{1}'", context.GetRemoteIP(), username);
        }

        private void LogLogout(HttpRequest context, string username)
--- a/src/Lidarr.Http/Lidarr.Http.csproj
+++ b/src/Lidarr.Http/Lidarr.Http.csproj
@ -5,7 +5,7 @@
  <ItemGroup>
    <PackageReference Include="FluentValidation" Version="9.5.4" />
    <PackageReference Include="ImpromptuInterface" Version="7.0.1" />
-    <PackageReference Include="NLog" Version="5.4.0" />
+    <PackageReference Include="NLog" Version="5.3.4" />
  </ItemGroup>
  <ItemGroup>
    <ProjectReference Include="..\NzbDrone.Core\Lidarr.Core.csproj" />
--- a/src/NzbDrone.Automation.Test/AutomationTest.cs
+++ b/src/NzbDrone.Automation.Test/AutomationTest.cs
@ -40,16 +40,15 @@ namespace NzbDrone.Automation.Test
            var service = ChromeDriverService.CreateDefaultService();

            // Timeout as windows automation tests seem to take alot longer to get going
-            driver = new ChromeDriver(service, options, TimeSpan.FromMinutes(3));
+            driver = new ChromeDriver(service, options, new TimeSpan(0, 3, 0));

            driver.Manage().Window.Size = new System.Drawing.Size(1920, 1080);
-            driver.Manage().Window.FullScreen();

            _runner = new NzbDroneRunner(LogManager.GetCurrentClassLogger(), null);
            _runner.KillAll();
            _runner.Start(true);

-            driver.Navigate().GoToUrl("http://localhost:8686");
+            driver.Url = "http://localhost:8686";

            var page = new PageBase(driver);
            page.WaitForNoSpinner();
@ -69,7 +68,7 @@ namespace NzbDrone.Automation.Test
        {
            try
            {
-                var image = (driver as ITakesScreenshot).GetScreenshot();
+                var image = ((ITakesScreenshot)driver).GetScreenshot();
                image.SaveAsFile($"./{name}_test_screenshot.png", ScreenshotImageFormat.Png);
            }
            catch (Exception ex)
--- a/src/NzbDrone.Automation.Test/Lidarr.Automation.Test.csproj
+++ b/src/NzbDrone.Automation.Test/Lidarr.Automation.Test.csproj
@ -4,7 +4,7 @@
  </PropertyGroup>
  <ItemGroup>
    <PackageReference Include="Selenium.Support" Version="3.141.0" />
-    <PackageReference Include="Selenium.WebDriver.ChromeDriver" Version="134.0.6998.16500" />
+    <PackageReference Include="Selenium.WebDriver.ChromeDriver" Version="111.0.5563.6400" />
  </ItemGroup>
  <ItemGroup>
    <ProjectReference Include="..\NzbDrone.Test.Common\Lidarr.Test.Common.csproj" />
--- a/src/NzbDrone.Automation.Test/PageModel/PageBase.cs
+++ b/src/NzbDrone.Automation.Test/PageModel/PageBase.cs
@ -1,17 +1,19 @@
 using System;
 using System.Threading;
 using OpenQA.Selenium;
+using OpenQA.Selenium.Remote;
 using OpenQA.Selenium.Support.UI;

 namespace NzbDrone.Automation.Test.PageModel
 {
    public class PageBase
    {
-        private readonly IWebDriver _driver;
+        private readonly RemoteWebDriver _driver;

-        public PageBase(IWebDriver driver)
+        public PageBase(RemoteWebDriver driver)
        {
            _driver = driver;
+            driver.Manage().Window.Maximize();
        }

        public IWebElement FindByClass(string className, int timeout = 5)
--- a/src/NzbDrone.Common/Disk/DiskProviderBase.cs
+++ b/src/NzbDrone.Common/Disk/DiskProviderBase.cs
@ -3,7 +3,6 @@ using System.Collections.Generic;
 using System.IO;
 using System.IO.Abstractions;
 using System.Linq;
-using System.Threading;
 using NLog;
 using NzbDrone.Common.EnsureThat;
 using NzbDrone.Common.EnvironmentInfo;
@ -307,26 +306,9 @@ namespace NzbDrone.Common.Disk
        {
            Ensure.That(path, () => path).IsValidPath(PathValidationType.CurrentOs);

-            var files = GetFiles(path, recursive).ToList();
+            var files = GetFiles(path, recursive);

-            files.ForEach(RemoveReadOnly);
-
-            var attempts = 0;
-
-            while (attempts < 3 && files.Any())
-            {
-                EmptyFolder(path);
-
-                if (GetFiles(path, recursive).Any())
-                {
-                    // Wait for IO operations to complete  after emptying the folder since they aren't always
-                    // instantly removed and it can lead to false positives that files are still present.
-                    Thread.Sleep(3000);
-                }
-
-                attempts++;
-                files = GetFiles(path, recursive).ToList();
-            }
+            files.ToList().ForEach(RemoveReadOnly);

            _fileSystem.Directory.Delete(path, recursive);
        }
--- a/src/NzbDrone.Common/Disk/DiskTransferService.cs
+++ b/src/NzbDrone.Common/Disk/DiskTransferService.cs
@ -21,7 +21,7 @@ namespace NzbDrone.Common.Disk
        private readonly IDiskProvider _diskProvider;
        private readonly Logger _logger;

-        private static readonly string[] ReflinkFilesystems = { "btrfs", "xfs", "zfs" };
+        private static readonly string[] _reflinkFilesystems = { "btrfs", "xfs" };

        public DiskTransferService(IDiskProvider diskProvider, Logger logger)
        {
@ -343,7 +343,7 @@ namespace NzbDrone.Common.Disk
            var targetDriveFormat = targetMount?.DriveFormat ?? string.Empty;

            var isCifs = targetDriveFormat == "cifs";
-            var tryReflink = sourceDriveFormat == targetDriveFormat && ReflinkFilesystems.Contains(sourceDriveFormat);
+            var tryReflink = sourceDriveFormat == targetDriveFormat && _reflinkFilesystems.Contains(sourceDriveFormat);

            if (mode.HasFlag(TransferMode.Copy))
            {
--- a/src/NzbDrone.Common/Disk/FileSystemLookupService.cs
+++ b/src/NzbDrone.Common/Disk/FileSystemLookupService.cs
@ -17,6 +17,37 @@ namespace NzbDrone.Common.Disk
        private readonly IDiskProvider _diskProvider;
        private readonly IRuntimeInfo _runtimeInfo;

+        private readonly HashSet<string> _setToRemove = new HashSet<string>
+                                                        {
+                                                            // Windows
+                                                            "boot",
+                                                            "bootmgr",
+                                                            "cache",
+                                                            "msocache",
+                                                            "recovery",
+                                                            "$recycle.bin",
+                                                            "recycler",
+                                                            "system volume information",
+                                                            "temporary internet files",
+                                                            "windows",
+
+                                                            // OS X
+                                                            ".fseventd",
+                                                            ".spotlight",
+                                                            ".trashes",
+                                                            ".vol",
+                                                            "cachedmessages",
+                                                            "caches",
+                                                            "trash",
+
+                                                            // QNAP
+                                                            ".@__thumb",
+
+                                                            // Synology
+                                                            "@eadir",
+                                                            "#recycle"
+                                                        };
+
        public FileSystemLookupService(IDiskProvider diskProvider, IRuntimeInfo runtimeInfo)
        {
            _diskProvider = diskProvider;
@ -127,7 +158,7 @@ namespace NzbDrone.Common.Disk
                                           })
                                           .ToList();

-            directories.RemoveAll(d => SpecialFolders.IsSpecialFolder(d.Name));
+            directories.RemoveAll(d => _setToRemove.Contains(d.Name.ToLowerInvariant()));

            return directories;
        }
--- a/src/NzbDrone.Common/Disk/SpecialFolders.cs
+++ b/src/NzbDrone.Common/Disk/SpecialFolders.cs
@ -1,47 +0,0 @@
-using System.Collections.Generic;
-
-namespace NzbDrone.Common.Disk;
-
-public static class SpecialFolders
-{
-    private static readonly HashSet<string> _specialFolders = new HashSet<string>
-    {
-        // Windows
-        "boot",
-        "bootmgr",
-        "cache",
-        "msocache",
-        "recovery",
-        "$recycle.bin",
-        "recycler",
-        "system volume information",
-        "temporary internet files",
-        "windows",
-
-        // OS X
-        ".fseventd",
-        ".spotlight",
-        ".trashes",
-        ".vol",
-        "cachedmessages",
-        "caches",
-        "trash",
-
-        // QNAP
-        ".@__thumb",
-
-        // Synology
-        "@eadir",
-        "#recycle"
-    };
-
-    public static bool IsSpecialFolder(string folder)
-    {
-        if (folder == null)
-        {
-            return false;
-        }
-
-        return _specialFolders.Contains(folder.ToLowerInvariant());
-    }
-}
--- a/src/NzbDrone.Common/Http/Dispatchers/ManagedHttpDispatcher.cs
+++ b/src/NzbDrone.Common/Http/Dispatchers/ManagedHttpDispatcher.cs
@ -141,7 +141,7 @@ namespace NzbDrone.Common.Http.Dispatchers
            }
            catch (OperationCanceledException ex) when (cts.IsCancellationRequested)
            {
-                throw new WebException("Http request timed out", ex, WebExceptionStatus.Timeout, null);
+                throw new WebException("Http request timed out", ex.InnerException, WebExceptionStatus.Timeout, null);
            }
        }

--- a/src/NzbDrone.Common/Instrumentation/CleansingClefLogLayout.cs
+++ b/src/NzbDrone.Common/Instrumentation/CleansingClefLogLayout.cs
@ -1,21 +0,0 @@
-using System.Text;
-using NLog;
-using NLog.Layouts.ClefJsonLayout;
-using NzbDrone.Common.EnvironmentInfo;
-
-namespace NzbDrone.Common.Instrumentation;
-
-public class CleansingClefLogLayout : CompactJsonLayout
-{
-    protected override void RenderFormattedMessage(LogEventInfo logEvent, StringBuilder target)
-    {
-        base.RenderFormattedMessage(logEvent, target);
-
-        if (RuntimeInfo.IsProduction)
-        {
-            var result = CleanseLogMessage.Cleanse(target.ToString());
-            target.Clear();
-            target.Append(result);
-        }
-    }
-}
--- a/src/NzbDrone.Common/Instrumentation/CleansingConsoleLogLayout.cs
+++ b/src/NzbDrone.Common/Instrumentation/CleansingConsoleLogLayout.cs
@ -1,26 +0,0 @@
-using System.Text;
-using NLog;
-using NLog.Layouts;
-using NzbDrone.Common.EnvironmentInfo;
-
-namespace NzbDrone.Common.Instrumentation;
-
-public class CleansingConsoleLogLayout : SimpleLayout
-{
-    public CleansingConsoleLogLayout(string format)
-        : base(format)
-    {
-    }
-
-    protected override void RenderFormattedMessage(LogEventInfo logEvent, StringBuilder target)
-    {
-        base.RenderFormattedMessage(logEvent, target);
-
-        if (RuntimeInfo.IsProduction)
-        {
-            var result = CleanseLogMessage.Cleanse(target.ToString());
-            target.Clear();
-            target.Append(result);
-        }
-    }
-}
--- a/src/NzbDrone.Common/Instrumentation/CleansingFileTarget.cs
+++ b/src/NzbDrone.Common/Instrumentation/CleansingFileTarget.cs
@ -4,7 +4,7 @@ using NLog.Targets;

 namespace NzbDrone.Common.Instrumentation
 {
-    public class CleansingFileTarget : FileTarget
+    public class NzbDroneFileTarget : FileTarget
    {
        protected override void RenderFormattedMessage(LogEventInfo logEvent, StringBuilder target)
        {
--- a/src/NzbDrone.Common/Instrumentation/NzbDroneLogger.cs
+++ b/src/NzbDrone.Common/Instrumentation/NzbDroneLogger.cs
@ -3,6 +3,7 @@ using System.Diagnostics;
 using System.IO;
 using NLog;
 using NLog.Config;
+using NLog.Layouts.ClefJsonLayout;
 using NLog.Targets;
 using NzbDrone.Common.EnvironmentInfo;
 using NzbDrone.Common.Extensions;
@ -12,11 +13,9 @@ namespace NzbDrone.Common.Instrumentation
 {
    public static class NzbDroneLogger
    {
-        private const string FileLogLayout = @"${date:format=yyyy-MM-dd HH\:mm\:ss.f}|${level}|${logger}|${message}${onexception:inner=${newline}${newline}[v${assembly-version}] ${exception:format=ToString}${newline}${exception:format=Data}${newline}}";
-        private const string ConsoleFormat = "[${level}] ${logger}: ${message} ${onexception:inner=${newline}${newline}[v${assembly-version}] ${exception:format=ToString}${newline}${exception:format=Data}${newline}}";
-
-        private static readonly CleansingConsoleLogLayout CleansingConsoleLayout  = new (ConsoleFormat);
-        private static readonly CleansingClefLogLayout ClefLogLayout = new ();
+        private const string FILE_LOG_LAYOUT = @"${date:format=yyyy-MM-dd HH\:mm\:ss.f}|${level}|${logger}|${message}${onexception:inner=${newline}${newline}[v${assembly-version}] ${exception:format=ToString}${newline}${exception:format=Data}${newline}}";
+        public const string ConsoleLogLayout = "[${level}] ${logger}: ${message} ${onexception:inner=${newline}${newline}[v${assembly-version}] ${exception:format=ToString}${newline}${exception:format=Data}${newline}}";
+        public static CompactJsonLayout ClefLogLayout = new CompactJsonLayout();

        private static bool _isConfigured;

@ -119,7 +118,11 @@ namespace NzbDrone.Common.Instrumentation
                ? formatEnumValue
                : ConsoleLogFormat.Standard;

-            ConfigureConsoleLayout(coloredConsoleTarget, logFormat);
+            coloredConsoleTarget.Layout = logFormat switch
+            {
+                ConsoleLogFormat.Clef => ClefLogLayout,
+                _ => ConsoleLogLayout
+            };

            var loggingRule = new LoggingRule("*", level, coloredConsoleTarget);

@ -136,7 +139,7 @@ namespace NzbDrone.Common.Instrumentation

        private static void RegisterAppFile(IAppFolderInfo appFolderInfo, string name, string fileName, int maxArchiveFiles, LogLevel minLogLevel)
        {
-            var fileTarget = new CleansingFileTarget();
+            var fileTarget = new NzbDroneFileTarget();

            fileTarget.Name = name;
            fileTarget.FileName = Path.Combine(appFolderInfo.GetLogFolder(), fileName);
@ -149,7 +152,7 @@ namespace NzbDrone.Common.Instrumentation
            fileTarget.MaxArchiveFiles = maxArchiveFiles;
            fileTarget.EnableFileDelete = true;
            fileTarget.ArchiveNumbering = ArchiveNumberingMode.Rolling;
-            fileTarget.Layout = FileLogLayout;
+            fileTarget.Layout = FILE_LOG_LAYOUT;

            var loggingRule = new LoggingRule("*", minLogLevel, fileTarget);

@ -168,7 +171,7 @@ namespace NzbDrone.Common.Instrumentation
            fileTarget.ConcurrentWrites = false;
            fileTarget.ConcurrentWriteAttemptDelay = 50;
            fileTarget.ConcurrentWriteAttempts = 100;
-            fileTarget.Layout = FileLogLayout;
+            fileTarget.Layout = FILE_LOG_LAYOUT;

            var loggingRule = new LoggingRule("*", LogLevel.Trace, fileTarget);

@ -213,15 +216,6 @@ namespace NzbDrone.Common.Instrumentation
        {
            return GetLogger(obj.GetType());
        }
-
-        public static void ConfigureConsoleLayout(ColoredConsoleTarget target, ConsoleLogFormat format)
-        {
-            target.Layout = format switch
-            {
-                ConsoleLogFormat.Clef => NzbDroneLogger.ClefLogLayout,
-                _ => NzbDroneLogger.CleansingConsoleLayout
-            };
-        }
    }

    public enum ConsoleLogFormat
--- a/src/NzbDrone.Common/Lidarr.Common.csproj
+++ b/src/NzbDrone.Common/Lidarr.Common.csproj
@ -6,17 +6,17 @@
  </PropertyGroup>
  <ItemGroup>
    <PackageReference Include="DryIoc.dll" Version="5.4.3" />
-    <PackageReference Include="IPAddressRange" Version="6.2.0" />
+    <PackageReference Include="IPAddressRange" Version="6.1.0" />
    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.1" />
    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-    <PackageReference Include="NLog" Version="5.4.0" />
+    <PackageReference Include="NLog" Version="5.3.4" />
    <PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="6.0.2" />
-    <PackageReference Include="NLog.Layouts.ClefJsonLayout" Version="1.0.3" />
+    <PackageReference Include="NLog.Layouts.ClefJsonLayout" Version="1.0.2" />
    <PackageReference Include="Sentry" Version="4.0.2" />
    <PackageReference Include="SharpZipLib" Version="1.4.2" />
    <PackageReference Include="System.IO.Abstractions" Version="17.0.24" />
    <PackageReference Include="System.Text.Json" Version="6.0.10" />
-    <PackageReference Include="System.ValueTuple" Version="4.6.1" />
+    <PackageReference Include="System.ValueTuple" Version="4.5.0" />
    <PackageReference Include="System.Data.SQLite.Core.Servarr" Version="1.0.115.5-18" />
    <PackageReference Include="System.Runtime.Loader" Version="4.3.0" />
    <PackageReference Include="System.Configuration.ConfigurationManager" Version="6.0.1" />
--- a/src/NzbDrone.Common/PathEqualityComparer.cs
+++ b/src/NzbDrone.Common/PathEqualityComparer.cs
@ -1,4 +1,3 @@
-using System;
 using System.Collections.Generic;
 using NzbDrone.Common.EnvironmentInfo;
 using NzbDrone.Common.Extensions;
@ -7,7 +6,7 @@ namespace NzbDrone.Common
 {
    public class PathEqualityComparer : IEqualityComparer<string>
    {
-        public static readonly PathEqualityComparer Instance = new ();
+        public static readonly PathEqualityComparer Instance = new PathEqualityComparer();

        private PathEqualityComparer()
        {
@ -19,8 +18,6 @@ namespace NzbDrone.Common
        }

        public int GetHashCode(string obj)
-        {
-            try
        {
            if (OsInfo.IsWindows)
            {
@ -29,10 +26,5 @@ namespace NzbDrone.Common

            return obj.CleanFilePath().Normalize().GetHashCode();
        }
-            catch (ArgumentException ex)
-            {
-                throw new ArgumentException($"Invalid path: {obj}", ex);
-            }
-        }
    }
 }
--- a/src/NzbDrone.Common/Processes/ProcessProvider.cs
+++ b/src/NzbDrone.Common/Processes/ProcessProvider.cs
@ -6,7 +6,6 @@ using System.ComponentModel;
 using System.Diagnostics;
 using System.IO;
 using System.Linq;
-using System.Text;
 using NLog;
 using NzbDrone.Common.EnvironmentInfo;
 using NzbDrone.Common.Model;
@ -118,9 +117,7 @@ namespace NzbDrone.Common.Processes
                UseShellExecute = false,
                RedirectStandardError = true,
                RedirectStandardOutput = true,
-                RedirectStandardInput = true,
-                StandardOutputEncoding = Encoding.UTF8,
-                StandardErrorEncoding = Encoding.UTF8
+                RedirectStandardInput = true
            };

            if (environmentVariables != null)
--- a/src/NzbDrone.Core.Test/DiskSpace/DiskSpaceServiceFixture.cs
+++ b/src/NzbDrone.Core.Test/DiskSpace/DiskSpaceServiceFixture.cs
@ -103,7 +103,6 @@ namespace NzbDrone.Core.Test.DiskSpace
        [TestCase("/var/lib/docker")]
        [TestCase("/some/place/docker/aufs")]
        [TestCase("/etc/network")]
-        [TestCase("/Volumes/.timemachine/ABC123456-A1BC-12A3B45678C9/2025-05-13-181401.backup")]
        public void should_not_check_diskspace_for_irrelevant_mounts(string path)
        {
            var mount = new Mock<IMount>();
--- a/src/NzbDrone.Core.Test/Download/CompletedDownloadServiceTests/ImportFixture.cs
+++ b/src/NzbDrone.Core.Test/Download/CompletedDownloadServiceTests/ImportFixture.cs
@ -183,8 +183,6 @@ namespace NzbDrone.Core.Test.Download.CompletedDownloadServiceTests
        {
            GivenArtistMatch();

-            var tracks = Builder<Track>.CreateListOfSize(3).BuildList();
-
            _trackedDownload.RemoteAlbum.Albums = new List<Album>
            {
                CreateAlbum(1, 3)
@ -194,9 +192,9 @@ namespace NzbDrone.Core.Test.Download.CompletedDownloadServiceTests
                  .Setup(v => v.ProcessPath(It.IsAny<string>(), It.IsAny<ImportMode>(), It.IsAny<Artist>(), It.IsAny<DownloadClientItem>()))
                  .Returns(new List<ImportResult>
                           {
-                               new ImportResult(new ImportDecision<LocalTrack>(new LocalTrack { Path = @"C:\TestPath\Droned.S01E01.mkv".AsOsAgnostic(), Tracks = new List<Track> { tracks[0] } })),
-                               new ImportResult(new ImportDecision<LocalTrack>(new LocalTrack { Path = @"C:\TestPath\Droned.S01E01.mkv".AsOsAgnostic(), Tracks = new List<Track> { tracks[1] } })),
-                               new ImportResult(new ImportDecision<LocalTrack>(new LocalTrack { Path = @"C:\TestPath\Droned.S01E01.mkv".AsOsAgnostic(), Tracks = new List<Track> { tracks[2] } })),
+                               new ImportResult(new ImportDecision<LocalTrack>(new LocalTrack { Path = @"C:\TestPath\Droned.S01E01.mkv".AsOsAgnostic() })),
+                               new ImportResult(new ImportDecision<LocalTrack>(new LocalTrack { Path = @"C:\TestPath\Droned.S01E01.mkv".AsOsAgnostic() })),
+                               new ImportResult(new ImportDecision<LocalTrack>(new LocalTrack { Path = @"C:\TestPath\Droned.S01E01.mkv".AsOsAgnostic() })),
                               new ImportResult(new ImportDecision<LocalTrack>(new LocalTrack { Path = @"C:\TestPath\Droned.S01E01.mkv".AsOsAgnostic() }), "Test Failure")
                           });

@ -292,9 +290,6 @@ namespace NzbDrone.Core.Test.Download.CompletedDownloadServiceTests
        [Test]
        public void should_mark_as_imported_if_all_tracks_were_imported()
        {
-            var track1 = new Track { Id = 1 };
-            var track2 = new Track { Id = 2 };
-
            _trackedDownload.RemoteAlbum.Albums = new List<Album>
            {
                CreateAlbum(1, 2)
@ -306,11 +301,11 @@ namespace NzbDrone.Core.Test.Download.CompletedDownloadServiceTests
                           {
                               new ImportResult(
                                   new ImportDecision<LocalTrack>(
-                                       new LocalTrack { Path = @"C:\TestPath\Droned.S01E01.mkv".AsOsAgnostic(), Tracks = new List<Track> { track1 } })),
+                                       new LocalTrack { Path = @"C:\TestPath\Droned.S01E01.mkv".AsOsAgnostic() })),

                               new ImportResult(
                                   new ImportDecision<LocalTrack>(
-                                       new LocalTrack { Path = @"C:\TestPath\Droned.S01E02.mkv".AsOsAgnostic(), Tracks = new List<Track> { track2 } }))
+                                       new LocalTrack { Path = @"C:\TestPath\Droned.S01E02.mkv".AsOsAgnostic() }))
                           });

            Subject.Import(_trackedDownload);
@ -372,13 +367,11 @@ namespace NzbDrone.Core.Test.Download.CompletedDownloadServiceTests
        {
            GivenABadlyNamedDownload();

-            var track1 = new Track { Id = 1 };
-
            Mocker.GetMock<IDownloadedTracksImportService>()
                  .Setup(v => v.ProcessPath(It.IsAny<string>(), It.IsAny<ImportMode>(), It.IsAny<Artist>(), It.IsAny<DownloadClientItem>()))
                  .Returns(new List<ImportResult>
                           {
-                               new ImportResult(new ImportDecision<LocalTrack>(new LocalTrack { Path = @"C:\TestPath\Droned.S01E01.mkv".AsOsAgnostic(), Tracks = new List<Track> { track1 } }))
+                               new ImportResult(new ImportDecision<LocalTrack>(new LocalTrack { Path = @"C:\TestPath\Droned.S01E01.mkv".AsOsAgnostic() }))
                           });

            Mocker.GetMock<IArtistService>()
--- a/src/NzbDrone.Core.Test/Download/DownloadClientTests/Blackhole/ScanWatchFolderFixture.cs
+++ b/src/NzbDrone.Core.Test/Download/DownloadClientTests/Blackhole/ScanWatchFolderFixture.cs
@ -99,22 +99,5 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.Blackhole

            VerifySingleItem(DownloadItemStatus.Completed);
        }
-
-        [TestCase("@eaDir")]
-        [TestCase(".@__thumb")]
-        public void GetItems_should_not_include_special_subfolders(string folderName)
-        {
-            GivenCompletedItem();
-
-            var targetDir = Path.Combine(_completedDownloadFolder, folderName);
-
-            Mocker.GetMock<IDiskProvider>()
-                .Setup(c => c.GetDirectories(_completedDownloadFolder))
-                .Returns(new[] { targetDir });
-
-            var items = Subject.GetItems(_completedDownloadFolder, TimeSpan.FromMilliseconds(50)).ToList();
-
-            items.Count.Should().Be(0);
-        }
    }
 }
--- a/src/NzbDrone.Core.Test/HealthCheck/Checks/DownloadClientRootFolderCheckFixture.cs
+++ b/src/NzbDrone.Core.Test/HealthCheck/Checks/DownloadClientRootFolderCheckFixture.cs
@ -76,19 +76,6 @@ namespace NzbDrone.Core.Test.HealthCheck.Checks
            Subject.Check().ShouldBeWarning(wikiFragment: "downloads-in-root-folder");
        }

-        [Test]
-        public void should_return_warning_if_downloading_inside_root_folder()
-        {
-            var rootFolderPath = "c:\\Test".AsOsAgnostic();
-            var downloadRootPath = "c:\\Test\\Downloads".AsOsAgnostic();
-
-            GivenRootFolder(rootFolderPath);
-
-            _clientStatus.OutputRootFolders = new List<OsPath> { new (downloadRootPath) };
-
-            Subject.Check().ShouldBeWarning();
-        }
-
        [Test]
        public void should_return_ok_if_not_downloading_to_root_folder()
        {
@ -100,7 +87,7 @@ namespace NzbDrone.Core.Test.HealthCheck.Checks
        }

        [Test]
-        [TestCaseSource(nameof(DownloadClientExceptions))]
+        [TestCaseSource("DownloadClientExceptions")]
        public void should_return_ok_if_client_throws_downloadclientexception(Exception ex)
        {
            _downloadClient.Setup(s => s.GetStatus())
--- a/src/NzbDrone.Core.Test/ImportListTests/Spotify/SpotifyMappingFixture.cs
+++ b/src/NzbDrone.Core.Test/ImportListTests/Spotify/SpotifyMappingFixture.cs
@ -80,7 +80,7 @@ namespace NzbDrone.Core.Test.ImportListTests
        }

        [Test]
-        [Ignore("Pending mapping fixes", Until = "2025-10-20 00:00:00Z")]
+        [Ignore("Pending mapping fixes", Until = "2025-04-20 00:00:00Z")]
        public void map_artist_should_work()
        {
            UseRealHttp();
@ -159,7 +159,7 @@ namespace NzbDrone.Core.Test.ImportListTests
        }

        [Test]
-        [Ignore("Pending mapping fixes", Until = "2025-10-20 00:00:00Z")]
+        [Ignore("Pending mapping fixes", Until = "2025-04-20 00:00:00Z")]
        public void map_album_should_work()
        {
            UseRealHttp();
--- a/src/NzbDrone.Core.Test/MetadataSource/SkyHook/SkyHookProxyFixture.cs
+++ b/src/NzbDrone.Core.Test/MetadataSource/SkyHook/SkyHookProxyFixture.cs
@ -14,7 +14,6 @@ using NzbDrone.Core.Test.Framework;
 namespace NzbDrone.Core.Test.MetadataSource.SkyHook
 {
    [TestFixture]
-    [Ignore("Waiting for metadata to be back again", Until = "2025-09-01 00:00:00Z")]
    public class SkyHookProxyFixture : CoreTest<SkyHookProxy>
    {
        private MetadataProfile _metadataProfile;
--- a/src/NzbDrone.Core.Test/MetadataSource/SkyHook/SkyHookProxySearchFixture.cs
+++ b/src/NzbDrone.Core.Test/MetadataSource/SkyHook/SkyHookProxySearchFixture.cs
@ -12,7 +12,6 @@ using NzbDrone.Test.Common;
 namespace NzbDrone.Core.Test.MetadataSource.SkyHook
 {
    [TestFixture]
-    [Ignore("Waiting for metadata to be back again", Until = "2025-09-01 00:00:00Z")]
    public class SkyHookProxySearchFixture : CoreTest<SkyHookProxy>
    {
        [SetUp]
--- a/src/NzbDrone.Core.Test/OrganizerTests/FileNameBuilderTests/CleanTitleFixture.cs
+++ b/src/NzbDrone.Core.Test/OrganizerTests/FileNameBuilderTests/CleanTitleFixture.cs
@ -64,7 +64,7 @@ namespace NzbDrone.Core.Test.OrganizerTests.FileNameBuilderTests
        }

        [TestCase("Florence + the Machine", "Florence + the Machine")]
-        [TestCase("Beyoncé X10", "Beyonce X10")]
+        [TestCase("Beyoncé X10", "Beyoncé X10")]
        [TestCase("Girlfriends' Guide to Divorce", "Girlfriends Guide to Divorce")]
        [TestCase("Rule #23: Never Lie to the Kids", "Rule #23 Never Lie to the Kids")]
        [TestCase("Anne Hathaway/Florence + The Machine", "Anne Hathaway Florence + The Machine")]
@ -81,7 +81,6 @@ namespace NzbDrone.Core.Test.OrganizerTests.FileNameBuilderTests
        [TestCase("[a] title", "a title")]
        [TestCase("backslash \\ backlash", "backslash backlash")]
        [TestCase("I'm the Boss", "Im the Boss")]
-        [TestCase("Joker: Folie à deux", "Joker Folie a deux")]
        public void should_get_expected_title_back(string name, string expected)
        {
            _artist.Name = name;
--- a/src/NzbDrone.Core.Test/ParserTests/QualityParserFixture.cs
+++ b/src/NzbDrone.Core.Test/ParserTests/QualityParserFixture.cs
@ -129,9 +129,6 @@ namespace NzbDrone.Core.Test.ParserTests
        [TestCase("Green Day - Father Of All [FLAC (M4A) 24-bit Lossless]", null, 0, 0)]
        [TestCase("Green_Day-Father_Of_All_FLAC_M4A_24_bit_Lossless", null, 0, 0)]
        [TestCase("Green.Day-Father.Of.All.FLAC.M4A.24.bit.Lossless", null, 0, 0)]
-        [TestCase("Linkin Park - Studio Collection 2000-2012 (2013) [WEB FLAC24-44.1]", null, 0, 0)]
-        [TestCase("Linkin Park - Studio Collection 2000-2012 (2013) [WEB FLAC24bit]", null, 0, 0)]
-        [TestCase("Linkin Park - Studio Collection 2000-2012 (2013) [WEB FLAC24-bit]", null, 0, 0)]
        public void should_parse_flac_24bit_quality(string title, string desc, int bitrate, int sampleSize)
        {
            ParseAndVerifyQuality(title, desc, bitrate, Quality.FLAC_24, sampleSize);
--- a/src/NzbDrone.Core/Blocklisting/BlocklistService.cs
+++ b/src/NzbDrone.Core/Blocklisting/BlocklistService.cs
@ -185,9 +185,7 @@ namespace NzbDrone.Core.Blocklisting
                Indexer = message.Data.GetValueOrDefault("indexer"),
                Protocol = (DownloadProtocol)Convert.ToInt32(message.Data.GetValueOrDefault("protocol")),
                Message = message.Message,
-                TorrentInfoHash = message.TrackedDownload?.Protocol == DownloadProtocol.Torrent
-                    ? message.TrackedDownload.DownloadItem.DownloadId
-                    : message.Data.GetValueOrDefault("torrentInfoHash", null)
+                TorrentInfoHash = message.Data.GetValueOrDefault("torrentInfoHash")
            };

            if (Enum.TryParse(message.Data.GetValueOrDefault("indexerFlags"), true, out IndexerFlags flags))
--- a/src/NzbDrone.Core/Configuration/ConfigFileProvider.cs
+++ b/src/NzbDrone.Core/Configuration/ConfigFileProvider.cs
@ -263,21 +263,7 @@ namespace NzbDrone.Core.Configuration
        }

        public string UiFolder => BuildInfo.IsDebug ? Path.Combine("..", "UI") : "UI";
-
-        public string InstanceName
-        {
-            get
-            {
-                var instanceName = _appOptions.InstanceName ?? GetValue("InstanceName", BuildInfo.AppName);
-
-                if (instanceName.Contains(BuildInfo.AppName, StringComparison.OrdinalIgnoreCase))
-                {
-                    return instanceName;
-                }
-
-                return BuildInfo.AppName;
-            }
-        }
+        public string InstanceName => _appOptions.InstanceName ?? GetValue("InstanceName", BuildInfo.AppName);

        public bool UpdateAutomatically => _updateOptions.Automatically ?? GetValueBoolean("UpdateAutomatically", OsInfo.IsWindows, false);

--- a/src/NzbDrone.Core/CustomFormats/Specifications/SizeSpecification.cs
+++ b/src/NzbDrone.Core/CustomFormats/Specifications/SizeSpecification.cs
@ -11,7 +11,6 @@ namespace NzbDrone.Core.CustomFormats
        {
            RuleFor(c => c.Min).GreaterThanOrEqualTo(0);
            RuleFor(c => c.Max).GreaterThan(c => c.Min);
-            RuleFor(c => c.Max).LessThanOrEqualTo(double.MaxValue);
        }
    }

--- a/src/NzbDrone.Core/Datastore/BasicRepository.cs
+++ b/src/NzbDrone.Core/Datastore/BasicRepository.cs
@ -252,7 +252,7 @@ namespace NzbDrone.Core.Datastore

        protected void Delete(SqlBuilder builder)
        {
-            var sql = builder.AddDeleteTemplate(typeof(TModel));
+            var sql = builder.AddDeleteTemplate(typeof(TModel)).LogQuery();

            using (var conn = _database.OpenConnection())
            {
--- a/src/NzbDrone.Core/DecisionEngine/DownloadDecisionComparer.cs
+++ b/src/NzbDrone.Core/DecisionEngine/DownloadDecisionComparer.cs
@ -163,7 +163,7 @@ namespace NzbDrone.Core.DecisionEngine
                    return 10;
                }

-                return Math.Round(Math.Log10(age)) * -1;
+                return 1;
            });
        }

--- a/src/NzbDrone.Core/DecisionEngine/Specifications/FreeSpaceSpecification.cs
+++ b/src/NzbDrone.Core/DecisionEngine/Specifications/FreeSpaceSpecification.cs
@ -20,7 +20,7 @@ namespace NzbDrone.Core.DecisionEngine.Specifications
            _logger = logger;
        }

-        public SpecificationPriority Priority => SpecificationPriority.Disk;
+        public SpecificationPriority Priority => SpecificationPriority.Default;
        public RejectionType Type => RejectionType.Permanent;

        public Decision IsSatisfiedBy(RemoteAlbum subject, SearchCriteriaBase searchCriteria)
--- a/src/NzbDrone.Core/DiskSpace/DiskSpaceService.cs
+++ b/src/NzbDrone.Core/DiskSpace/DiskSpaceService.cs
@ -21,7 +21,7 @@ namespace NzbDrone.Core.DiskSpace
        private readonly IRootFolderService _rootFolderService;
        private readonly Logger _logger;

-        private static readonly Regex _regexSpecialDrive = new Regex(@"^/var/lib/(docker|rancher|kubelet)(/|$)|^/(boot|etc)(/|$)|/docker(/var)?/aufs(/|$)|/\.timemachine", RegexOptions.Compiled);
+        private static readonly Regex _regexSpecialDrive = new Regex("^/var/lib/(docker|rancher|kubelet)(/|$)|^/(boot|etc)(/|$)|/docker(/var)?/aufs(/|$)", RegexOptions.Compiled);

        public DiskSpaceService(IDiskProvider diskProvider,
                                IRootFolderService rootFolderService,
@ -38,10 +38,7 @@ namespace NzbDrone.Core.DiskSpace

            var optionalRootFolders = GetFixedDisksRootPaths().Except(importantRootFolders).Distinct().ToList();

-            var diskSpace = GetDiskSpace(importantRootFolders)
-                .Concat(GetDiskSpace(optionalRootFolders, true))
-                .OrderBy(d => d.Path, StringComparer.OrdinalIgnoreCase)
-                .ToList();
+            var diskSpace = GetDiskSpace(importantRootFolders).Concat(GetDiskSpace(optionalRootFolders, true)).ToList();

            return diskSpace;
        }
@ -57,7 +54,7 @@ namespace NzbDrone.Core.DiskSpace
        private IEnumerable<string> GetFixedDisksRootPaths()
        {
            return _diskProvider.GetMounts()
-                .Where(d => d.DriveType is DriveType.Fixed or DriveType.Network)
+                .Where(d => d.DriveType == DriveType.Fixed)
                .Where(d => !_regexSpecialDrive.IsMatch(d.RootDirectory))
                .Select(d => d.RootDirectory);
        }
--- a/src/NzbDrone.Core/Download/Aggregation/RemoteAlbumAggregationService.cs
+++ b/src/NzbDrone.Core/Download/Aggregation/RemoteAlbumAggregationService.cs
@ -25,11 +25,6 @@ namespace NzbDrone.Core.Download.Aggregation

        public RemoteAlbum Augment(RemoteAlbum remoteAlbum)
        {
-            if (remoteAlbum == null)
-            {
-                return null;
-            }
-
            foreach (var augmenter in _augmenters)
            {
                try
--- a/src/NzbDrone.Core/Download/Clients/Aria2/Aria2.cs
+++ b/src/NzbDrone.Core/Download/Clients/Aria2/Aria2.cs
@ -9,7 +9,6 @@ using NzbDrone.Common.Extensions;
 using NzbDrone.Common.Http;
 using NzbDrone.Core.Blocklisting;
 using NzbDrone.Core.Configuration;
-using NzbDrone.Core.Localization;
 using NzbDrone.Core.MediaFiles.TorrentInfo;
 using NzbDrone.Core.Parser.Model;
 using NzbDrone.Core.RemotePathMappings;
@ -29,10 +28,9 @@ namespace NzbDrone.Core.Download.Clients.Aria2
                        IConfigService configService,
                        IDiskProvider diskProvider,
                        IRemotePathMappingService remotePathMappingService,
-                        ILocalizationService localizationService,
                        IBlocklistService blocklistService,
                        Logger logger)
-            : base(torrentFileInfoReader, httpClient, configService, diskProvider, remotePathMappingService, localizationService, blocklistService, logger)
+            : base(torrentFileInfoReader, httpClient, configService, diskProvider, remotePathMappingService, blocklistService, logger)
        {
            _proxy = proxy;
        }
--- a/src/NzbDrone.Core/Download/Clients/Blackhole/ScanWatchFolder.cs
+++ b/src/NzbDrone.Core/Download/Clients/Blackhole/ScanWatchFolder.cs
@ -52,13 +52,7 @@ namespace NzbDrone.Core.Download.Clients.Blackhole
        {
            foreach (var folder in _diskScanService.FilterPaths(watchFolder, _diskProvider.GetDirectories(watchFolder)))
            {
-                var folderName = Path.GetFileName(folder);
-                var title = FileNameBuilder.CleanFileName(folderName);
-
-                if (SpecialFolders.IsSpecialFolder(folderName))
-                {
-                    continue;
-                }
+                var title = FileNameBuilder.CleanFileName(Path.GetFileName(folder));

                var newWatchItem = new WatchFolderItem
                {
--- a/src/NzbDrone.Core/Download/Clients/Blackhole/TorrentBlackhole.cs
+++ b/src/NzbDrone.Core/Download/Clients/Blackhole/TorrentBlackhole.cs
@ -9,7 +9,6 @@ using NzbDrone.Common.Extensions;
 using NzbDrone.Common.Http;
 using NzbDrone.Core.Blocklisting;
 using NzbDrone.Core.Configuration;
-using NzbDrone.Core.Localization;
 using NzbDrone.Core.MediaFiles.TorrentInfo;
 using NzbDrone.Core.Organizer;
 using NzbDrone.Core.Parser.Model;
@ -31,10 +30,9 @@ namespace NzbDrone.Core.Download.Clients.Blackhole
                                IConfigService configService,
                                IDiskProvider diskProvider,
                                IRemotePathMappingService remotePathMappingService,
-                                ILocalizationService localizationService,
                                IBlocklistService blocklistService,
                                Logger logger)
-            : base(torrentFileInfoReader, httpClient, configService, diskProvider, remotePathMappingService, localizationService, blocklistService, logger)
+            : base(torrentFileInfoReader, httpClient, configService, diskProvider, remotePathMappingService, blocklistService, logger)
        {
            _scanWatchFolder = scanWatchFolder;

--- a/src/NzbDrone.Core/Download/Clients/Blackhole/UsenetBlackhole.cs
+++ b/src/NzbDrone.Core/Download/Clients/Blackhole/UsenetBlackhole.cs
@ -7,7 +7,6 @@ using NzbDrone.Common.Disk;
 using NzbDrone.Common.Extensions;
 using NzbDrone.Common.Http;
 using NzbDrone.Core.Configuration;
-using NzbDrone.Core.Localization;
 using NzbDrone.Core.Organizer;
 using NzbDrone.Core.Parser.Model;
 using NzbDrone.Core.RemotePathMappings;
@ -26,9 +25,8 @@ namespace NzbDrone.Core.Download.Clients.Blackhole
                               IDiskProvider diskProvider,
                               IRemotePathMappingService remotePathMappingService,
                               IValidateNzbs nzbValidationService,
-                               ILocalizationService localizationService,
                               Logger logger)
-            : base(httpClient, configService, diskProvider, remotePathMappingService, nzbValidationService, localizationService, logger)
+            : base(httpClient, configService, diskProvider, remotePathMappingService, nzbValidationService, logger)
        {
            _scanWatchFolder = scanWatchFolder;

--- a/src/NzbDrone.Core/Download/Clients/Deluge/Deluge.cs
+++ b/src/NzbDrone.Core/Download/Clients/Deluge/Deluge.cs
@ -9,7 +9,6 @@ using NzbDrone.Common.Extensions;
 using NzbDrone.Common.Http;
 using NzbDrone.Core.Blocklisting;
 using NzbDrone.Core.Configuration;
-using NzbDrone.Core.Localization;
 using NzbDrone.Core.MediaFiles.TorrentInfo;
 using NzbDrone.Core.Parser.Model;
 using NzbDrone.Core.RemotePathMappings;
@ -28,10 +27,9 @@ namespace NzbDrone.Core.Download.Clients.Deluge
                      IConfigService configService,
                      IDiskProvider diskProvider,
                      IRemotePathMappingService remotePathMappingService,
-                      ILocalizationService localizationService,
                      IBlocklistService blocklistService,
                      Logger logger)
-            : base(torrentFileInfoReader, httpClient, configService, diskProvider, remotePathMappingService, localizationService, blocklistService, logger)
+            : base(torrentFileInfoReader, httpClient, configService, diskProvider, remotePathMappingService, blocklistService, logger)
        {
            _proxy = proxy;
        }
--- a/src/NzbDrone.Core/Download/Clients/DownloadStation/TorrentDownloadStation.cs
+++ b/src/NzbDrone.Core/Download/Clients/DownloadStation/TorrentDownloadStation.cs
@ -11,7 +11,6 @@ using NzbDrone.Common.Http;
 using NzbDrone.Core.Blocklisting;
 using NzbDrone.Core.Configuration;
 using NzbDrone.Core.Download.Clients.DownloadStation.Proxies;
-using NzbDrone.Core.Localization;
 using NzbDrone.Core.MediaFiles.TorrentInfo;
 using NzbDrone.Core.Parser.Model;
 using NzbDrone.Core.RemotePathMappings;
@ -38,10 +37,9 @@ namespace NzbDrone.Core.Download.Clients.DownloadStation
                                      IConfigService configService,
                                      IDiskProvider diskProvider,
                                      IRemotePathMappingService remotePathMappingService,
-                                      ILocalizationService localizationService,
                                      IBlocklistService blocklistService,
                                      Logger logger)
-            : base(torrentFileInfoReader, httpClient, configService, diskProvider, remotePathMappingService, localizationService, blocklistService, logger)
+            : base(torrentFileInfoReader, httpClient, configService, diskProvider, remotePathMappingService, blocklistService, logger)
        {
            _dsInfoProxy = dsInfoProxy;
            _dsTaskProxySelector = dsTaskProxySelector;
--- a/src/NzbDrone.Core/Download/Clients/DownloadStation/UsenetDownloadStation.cs
+++ b/src/NzbDrone.Core/Download/Clients/DownloadStation/UsenetDownloadStation.cs
@ -9,7 +9,6 @@ using NzbDrone.Common.Extensions;
 using NzbDrone.Common.Http;
 using NzbDrone.Core.Configuration;
 using NzbDrone.Core.Download.Clients.DownloadStation.Proxies;
-using NzbDrone.Core.Localization;
 using NzbDrone.Core.Parser.Model;
 using NzbDrone.Core.RemotePathMappings;
 using NzbDrone.Core.ThingiProvider;
@ -35,9 +34,8 @@ namespace NzbDrone.Core.Download.Clients.DownloadStation
                                     IDiskProvider diskProvider,
                                     IRemotePathMappingService remotePathMappingService,
                                     IValidateNzbs nzbValidationService,
-                                     ILocalizationService localizationService,
                                     Logger logger)
-            : base(httpClient, configService, diskProvider, remotePathMappingService, nzbValidationService, localizationService, logger)
+            : base(httpClient, configService, diskProvider, remotePathMappingService, nzbValidationService, logger)
        {
            _dsInfoProxy = dsInfoProxy;
            _dsTaskProxySelector = dsTaskProxySelector;
--- a/src/NzbDrone.Core/Download/Clients/Flood/Flood.cs
+++ b/src/NzbDrone.Core/Download/Clients/Flood/Flood.cs
@ -9,7 +9,6 @@ using NzbDrone.Common.Http;
 using NzbDrone.Core.Blocklisting;
 using NzbDrone.Core.Configuration;
 using NzbDrone.Core.Download.Clients.Flood.Models;
-using NzbDrone.Core.Localization;
 using NzbDrone.Core.MediaFiles.TorrentInfo;
 using NzbDrone.Core.Parser.Model;
 using NzbDrone.Core.RemotePathMappings;
@ -29,10 +28,9 @@ namespace NzbDrone.Core.Download.Clients.Flood
                        IConfigService configService,
                        IDiskProvider diskProvider,
                        IRemotePathMappingService remotePathMappingService,
-                        ILocalizationService localizationService,
                        IBlocklistService blocklistService,
                        Logger logger)
-            : base(torrentFileInfoReader, httpClient, configService, diskProvider, remotePathMappingService, localizationService, blocklistService, logger)
+            : base(torrentFileInfoReader, httpClient, configService, diskProvider, remotePathMappingService, blocklistService, logger)
        {
            _proxy = proxy;
            _downloadSeedConfigProvider = downloadSeedConfigProvider;
--- a/src/NzbDrone.Core/Download/Clients/FreeboxDownload/TorrentFreeboxDownload.cs
+++ b/src/NzbDrone.Core/Download/Clients/FreeboxDownload/TorrentFreeboxDownload.cs
@ -9,7 +9,6 @@ using NzbDrone.Common.Http;
 using NzbDrone.Core.Blocklisting;
 using NzbDrone.Core.Configuration;
 using NzbDrone.Core.Download.Clients.FreeboxDownload.Responses;
-using NzbDrone.Core.Localization;
 using NzbDrone.Core.MediaFiles.TorrentInfo;
 using NzbDrone.Core.Parser.Model;
 using NzbDrone.Core.RemotePathMappings;
@ -26,10 +25,9 @@ namespace NzbDrone.Core.Download.Clients.FreeboxDownload
            IConfigService configService,
            IDiskProvider diskProvider,
            IRemotePathMappingService remotePathMappingService,
-            ILocalizationService localizationService,
            IBlocklistService blocklistService,
            Logger logger)
-            : base(torrentFileInfoReader, httpClient, configService, diskProvider, remotePathMappingService, localizationService, blocklistService, logger)
+            : base(torrentFileInfoReader, httpClient, configService, diskProvider, remotePathMappingService, blocklistService, logger)
        {
            _proxy = proxy;
        }
--- a/src/NzbDrone.Core/Download/Clients/Hadouken/Hadouken.cs
+++ b/src/NzbDrone.Core/Download/Clients/Hadouken/Hadouken.cs
@ -8,7 +8,6 @@ using NzbDrone.Common.Http;
 using NzbDrone.Core.Blocklisting;
 using NzbDrone.Core.Configuration;
 using NzbDrone.Core.Download.Clients.Hadouken.Models;
-using NzbDrone.Core.Localization;
 using NzbDrone.Core.MediaFiles.TorrentInfo;
 using NzbDrone.Core.Parser.Model;
 using NzbDrone.Core.RemotePathMappings;
@ -26,10 +25,9 @@ namespace NzbDrone.Core.Download.Clients.Hadouken
                        IConfigService configService,
                        IDiskProvider diskProvider,
                        IRemotePathMappingService remotePathMappingService,
-                        ILocalizationService localizationService,
                        IBlocklistService blocklistService,
                        Logger logger)
-            : base(torrentFileInfoReader, httpClient, configService, diskProvider, remotePathMappingService, localizationService, blocklistService, logger)
+            : base(torrentFileInfoReader, httpClient, configService, diskProvider, remotePathMappingService, blocklistService, logger)
        {
            _proxy = proxy;
        }
--- a/src/NzbDrone.Core/Download/Clients/NzbVortex/NzbVortex.cs
+++ b/src/NzbDrone.Core/Download/Clients/NzbVortex/NzbVortex.cs
@ -8,7 +8,6 @@ using NzbDrone.Common.Disk;
 using NzbDrone.Common.Extensions;
 using NzbDrone.Common.Http;
 using NzbDrone.Core.Configuration;
-using NzbDrone.Core.Localization;
 using NzbDrone.Core.Parser.Model;
 using NzbDrone.Core.RemotePathMappings;
 using NzbDrone.Core.Validation;
@ -25,9 +24,8 @@ namespace NzbDrone.Core.Download.Clients.NzbVortex
                       IDiskProvider diskProvider,
                       IRemotePathMappingService remotePathMappingService,
                       IValidateNzbs nzbValidationService,
-                       ILocalizationService localizationService,
                       Logger logger)
-            : base(httpClient, configService, diskProvider, remotePathMappingService, nzbValidationService, localizationService, logger)
+            : base(httpClient, configService, diskProvider, remotePathMappingService, nzbValidationService, logger)
        {
            _proxy = proxy;
        }
--- a/src/NzbDrone.Core/Download/Clients/Nzbget/Nzbget.cs
+++ b/src/NzbDrone.Core/Download/Clients/Nzbget/Nzbget.cs
@ -10,7 +10,6 @@ using NzbDrone.Common.Extensions;
 using NzbDrone.Common.Http;
 using NzbDrone.Core.Configuration;
 using NzbDrone.Core.Exceptions;
-using NzbDrone.Core.Localization;
 using NzbDrone.Core.Parser.Model;
 using NzbDrone.Core.RemotePathMappings;
 using NzbDrone.Core.Validation;
@ -29,9 +28,8 @@ namespace NzbDrone.Core.Download.Clients.Nzbget
                      IDiskProvider diskProvider,
                      IRemotePathMappingService remotePathMappingService,
                      IValidateNzbs nzbValidationService,
-                      ILocalizationService localizationService,
                      Logger logger)
-            : base(httpClient, configService, diskProvider, remotePathMappingService, nzbValidationService, localizationService, logger)
+            : base(httpClient, configService, diskProvider, remotePathMappingService, nzbValidationService, logger)
        {
            _proxy = proxy;
        }
--- a/src/NzbDrone.Core/Download/Clients/Pneumatic/Pneumatic.cs
+++ b/src/NzbDrone.Core/Download/Clients/Pneumatic/Pneumatic.cs
@ -9,7 +9,6 @@ using NzbDrone.Common.Extensions;
 using NzbDrone.Common.Http;
 using NzbDrone.Core.Configuration;
 using NzbDrone.Core.Indexers;
-using NzbDrone.Core.Localization;
 using NzbDrone.Core.Organizer;
 using NzbDrone.Core.Parser.Model;
 using NzbDrone.Core.RemotePathMappings;
@ -24,9 +23,8 @@ namespace NzbDrone.Core.Download.Clients.Pneumatic
                         IConfigService configService,
                         IDiskProvider diskProvider,
                         IRemotePathMappingService remotePathMappingService,
-                         ILocalizationService localizationService,
                         Logger logger)
-            : base(configService, diskProvider, remotePathMappingService, localizationService, logger)
+            : base(configService, diskProvider, remotePathMappingService, logger)
        {
            _httpClient = httpClient;
        }
--- a/src/NzbDrone.Core/Download/Clients/QBittorrent/QBittorrent.cs
+++ b/src/NzbDrone.Core/Download/Clients/QBittorrent/QBittorrent.cs
@ -10,7 +10,6 @@ using NzbDrone.Common.Extensions;
 using NzbDrone.Common.Http;
 using NzbDrone.Core.Blocklisting;
 using NzbDrone.Core.Configuration;
-using NzbDrone.Core.Localization;
 using NzbDrone.Core.MediaFiles.TorrentInfo;
 using NzbDrone.Core.Parser.Model;
 using NzbDrone.Core.RemotePathMappings;
@ -36,10 +35,9 @@ namespace NzbDrone.Core.Download.Clients.QBittorrent
                           IDiskProvider diskProvider,
                           IRemotePathMappingService remotePathMappingService,
                           ICacheManager cacheManager,
-                           ILocalizationService localizationService,
                           IBlocklistService blocklistService,
                           Logger logger)
-            : base(torrentFileInfoReader, httpClient, configService, diskProvider, remotePathMappingService, localizationService, blocklistService, logger)
+            : base(torrentFileInfoReader, httpClient, configService, diskProvider, remotePathMappingService, blocklistService, logger)
        {
            _proxySelector = proxySelector;

--- a/src/NzbDrone.Core/Download/Clients/Sabnzbd/Sabnzbd.cs
+++ b/src/NzbDrone.Core/Download/Clients/Sabnzbd/Sabnzbd.cs
@ -10,7 +10,6 @@ using NzbDrone.Common.Extensions;
 using NzbDrone.Common.Http;
 using NzbDrone.Core.Configuration;
 using NzbDrone.Core.Exceptions;
-using NzbDrone.Core.Localization;
 using NzbDrone.Core.Parser.Model;
 using NzbDrone.Core.RemotePathMappings;
 using NzbDrone.Core.Validation;
@ -27,9 +26,8 @@ namespace NzbDrone.Core.Download.Clients.Sabnzbd
                       IDiskProvider diskProvider,
                       IRemotePathMappingService remotePathMappingService,
                       IValidateNzbs nzbValidationService,
-                       ILocalizationService localizationService,
                       Logger logger)
-            : base(httpClient, configService, diskProvider, remotePathMappingService, nzbValidationService, localizationService, logger)
+            : base(httpClient, configService, diskProvider, remotePathMappingService, nzbValidationService, logger)
        {
            _proxy = proxy;
        }
--- a/src/NzbDrone.Core/Download/Clients/Transmission/Transmission.cs
+++ b/src/NzbDrone.Core/Download/Clients/Transmission/Transmission.cs
@ -8,7 +8,6 @@ using NzbDrone.Common.Extensions;
 using NzbDrone.Common.Http;
 using NzbDrone.Core.Blocklisting;
 using NzbDrone.Core.Configuration;
-using NzbDrone.Core.Localization;
 using NzbDrone.Core.MediaFiles.TorrentInfo;
 using NzbDrone.Core.RemotePathMappings;

@ -25,10 +24,9 @@ namespace NzbDrone.Core.Download.Clients.Transmission
                            IConfigService configService,
                            IDiskProvider diskProvider,
                            IRemotePathMappingService remotePathMappingService,
-                            ILocalizationService localizationService,
                            IBlocklistService blocklistService,
                            Logger logger)
-            : base(proxy, torrentFileInfoReader, httpClient, configService, diskProvider, remotePathMappingService, localizationService, blocklistService, logger)
+            : base(proxy, torrentFileInfoReader, httpClient, configService, diskProvider, remotePathMappingService, blocklistService, logger)
        {
        }

--- a/src/NzbDrone.Core/Download/Clients/Transmission/TransmissionBase.cs
+++ b/src/NzbDrone.Core/Download/Clients/Transmission/TransmissionBase.cs
@ -9,7 +9,6 @@ using NzbDrone.Common.Extensions;
 using NzbDrone.Common.Http;
 using NzbDrone.Core.Blocklisting;
 using NzbDrone.Core.Configuration;
-using NzbDrone.Core.Localization;
 using NzbDrone.Core.MediaFiles.TorrentInfo;
 using NzbDrone.Core.Parser.Model;
 using NzbDrone.Core.RemotePathMappings;
@ -29,10 +28,9 @@ namespace NzbDrone.Core.Download.Clients.Transmission
            IConfigService configService,
            IDiskProvider diskProvider,
            IRemotePathMappingService remotePathMappingService,
-            ILocalizationService localizationService,
            IBlocklistService blocklistService,
            Logger logger)
-            : base(torrentFileInfoReader, httpClient, configService, diskProvider, remotePathMappingService, localizationService, blocklistService, logger)
+            : base(torrentFileInfoReader, httpClient, configService, diskProvider, remotePathMappingService, blocklistService, logger)
        {
            _proxy = proxy;
        }
@ -103,11 +101,7 @@ namespace NzbDrone.Core.Download.Clients.Transmission
                if (!torrent.ErrorString.IsNullOrWhiteSpace())
                {
                    item.Status = DownloadItemStatus.Warning;
-                    item.Message = _localizationService.GetLocalizedString("DownloadClientItemErrorMessage", new Dictionary<string, object>
-                    {
-                        { "clientName", Name },
-                        { "message", torrent.ErrorString }
-                    });
+                    item.Message = torrent.ErrorString;
                }
                else if (torrent.TotalSize == 0)
                {
--- a/src/NzbDrone.Core/Download/Clients/Vuze/Vuze.cs
+++ b/src/NzbDrone.Core/Download/Clients/Vuze/Vuze.cs
@ -5,7 +5,6 @@ using NzbDrone.Common.Http;
 using NzbDrone.Core.Blocklisting;
 using NzbDrone.Core.Configuration;
 using NzbDrone.Core.Download.Clients.Transmission;
-using NzbDrone.Core.Localization;
 using NzbDrone.Core.MediaFiles.TorrentInfo;
 using NzbDrone.Core.RemotePathMappings;

@ -24,10 +23,9 @@ namespace NzbDrone.Core.Download.Clients.Vuze
                    IConfigService configService,
                    IDiskProvider diskProvider,
                    IRemotePathMappingService remotePathMappingService,
-                    ILocalizationService localizationService,
                    IBlocklistService blocklistService,
                    Logger logger)
-            : base(proxy, torrentFileInfoReader, httpClient, configService, diskProvider, remotePathMappingService, localizationService, blocklistService, logger)
+            : base(proxy, torrentFileInfoReader, httpClient, configService, diskProvider, remotePathMappingService, blocklistService, logger)
        {
        }

--- a/Show more
+++ b/Show more