New: Delete files for Select Series

Closes #5110

frontend/src/Commands/CommandNames.ts

@@ -5,6 +5,7 @@ enum CommandNames {
   ClearLog = 'ClearLog',
   CutoffUnmetEpisodeSearch = 'CutoffUnmetEpisodeSearch',
   DeleteLogFiles = 'DeleteLogFiles',
+  DeleteSeriesFiles = 'DeleteSeriesFiles',
   DeleteUpdateLogFiles = 'DeleteUpdateLogFiles',
   DownloadedEpisodesScan = 'DownloadedEpisodesScan',
   EpisodeSearch = 'EpisodeSearch',

frontend/src/Components/Form/Select/LanguageSelectInput.tsx

@@ -18,9 +18,6 @@ export interface LanguageSelectInputProps {
   includeNoChange?: boolean;
   includeNoChangeDisabled?: boolean;
   includeMixed?: boolean;
-  includeAny?: boolean;
-  includeOriginal?: boolean;
-  includeUnknown?: boolean;
   isDisabled?: boolean;
   onChange: (payload: LanguageSelectInputOnChangeProps) => void;
 }
@@ -30,16 +27,13 @@ export default function LanguageSelectInput({
   includeNoChange = false,
   includeNoChangeDisabled,
   includeMixed = false,
-  includeAny = true,
-  includeOriginal = false,
-  includeUnknown = false,
   onChange,
   ...otherProps
 }: LanguageSelectInputProps) {
   const { data: items = [] } = useFilteredLanguages({
-    Any: !includeAny,
-    Original: !includeOriginal,
-    Unknown: !includeUnknown,
+    includeAny: true,
+    includeOriginal: true,
+    includeUnknown: true,
   });
 
   const values = useMemo(() => {

frontend/src/Helpers/Hooks/useTheme.ts

@@ -2,18 +2,10 @@ import { useEffect, useState } from 'react';
 import { useUiSettingsValues } from 'Settings/UI/useUiSettings';
 import themes from 'Styles/Themes';
 
-const useTheme = (): 'dark' | 'light' => {
+const useTheme = () => {
   const { theme } = useUiSettingsValues();
   const selectedTheme = theme ?? window.Sonarr.theme;
-  const [resolvedTheme, setResolvedTheme] = useState(() => {
-    if (selectedTheme === 'auto') {
-      return window.matchMedia('(prefers-color-scheme: dark)').matches
-        ? 'dark'
-        : 'light';
-    }
-
-    return selectedTheme;
-  });
+  const [resolvedTheme, setResolvedTheme] = useState(selectedTheme);
 
   useEffect(() => {
     if (selectedTheme !== 'auto') {

frontend/src/InteractiveImport/Language/SelectLanguageModalContent.tsx

@@ -32,8 +32,8 @@ function SelectLanguageModalContent(props: SelectLanguageModalContentProps) {
     isFetched: isPopulated,
     error,
   } = useFilteredLanguages({
-    Any: true,
-    Original: true,
+    includeAny: true,
+    includeOriginal: true,
   });
 
   const [languageIds, setLanguageIds] = useState(props.languageIds);

frontend/src/Language/useLanguages.ts

@@ -4,9 +4,9 @@ import Language from 'Language/Language';
 
 interface LanguageFilter {
   [key: string]: boolean | undefined;
-  Any: boolean;
-  Original?: boolean;
-  Unknown?: boolean;
+  includeAny: boolean;
+  includeOriginal?: boolean;
+  includeUnknown?: boolean;
 }
 
 const PATH = '/language';
@@ -22,14 +22,12 @@ export const useLanguages = () => {
 };
 
 export const useFilteredLanguages = (
-  excludeLanguages: LanguageFilter = { Any: true }
+  excludeLanguages: LanguageFilter = { includeAny: true }
 ) => {
   const { data, isFetching, isFetched, error } = useLanguages();
 
   const filteredItems = useMemo(() => {
-    if (!data) {
-      return [];
-    }
+    if (!data) return [];
 
     return data.filter((lang) => !excludeLanguages[lang.name]);
   }, [data, excludeLanguages]);

frontend/src/Series/Index/Select/Delete/DeleteSeriesModalContent.tsx

@@ -1,6 +1,4 @@
-import { orderBy } from 'lodash';
-import React, { useCallback, useMemo, useState } from 'react';
-import { useSelect } from 'App/Select/SelectContext';
+import React, { useCallback, useState } from 'react';
 import FormGroup from 'Components/Form/FormGroup';
 import FormInputGroup from 'Components/Form/FormInputGroup';
 import FormLabel from 'Components/Form/FormLabel';
@@ -10,15 +8,15 @@ import ModalContent from 'Components/Modal/ModalContent';
 import ModalFooter from 'Components/Modal/ModalFooter';
 import ModalHeader from 'Components/Modal/ModalHeader';
 import { inputTypes, kinds } from 'Helpers/Props';
-import Series from 'Series/Series';
 import {
   setSeriesDeleteOptions,
   useSeriesDeleteOptions,
 } from 'Series/seriesOptionsStore';
-import useSeries, { useBulkDeleteSeries } from 'Series/useSeries';
+import { useBulkDeleteSeries } from 'Series/useSeries';
 import { InputChanged } from 'typings/inputs';
-import formatBytes from 'Utilities/Number/formatBytes';
 import translate from 'Utilities/String/translate';
+import SeriesDeleteList from './SeriesDeleteList';
+import useSelectedSeriesStats from './useSelectedSeriesStats';
 import styles from './DeleteSeriesModalContent.css';
 
 export interface DeleteSeriesModalContentProps {
@@ -29,19 +27,10 @@ function DeleteSeriesModalContent({
   onModalClose,
 }: DeleteSeriesModalContentProps) {
   const { addImportListExclusion } = useSeriesDeleteOptions();
-  const { data: allSeries } = useSeries();
   const { bulkDeleteSeries } = useBulkDeleteSeries();
   const [deleteFiles, setDeleteFiles] = useState(false);
-  const { useSelectedIds } = useSelect<Series>();
-  const seriesIds = useSelectedIds();
-
-  const series = useMemo((): Series[] => {
-    const seriesList = seriesIds.map((id) => {
-      return allSeries.find((s) => s.id === id);
-    }) as Series[];
-
-    return orderBy(seriesList, ['sortTitle']);
-  }, [allSeries, seriesIds]);
+  const { series, seriesIds, totalEpisodeFileCount, totalSizeOnDisk } =
+    useSelectedSeriesStats();
 
   const onDeleteFilesChange = useCallback(
     ({ value }: InputChanged<boolean>) => {
@@ -78,23 +67,6 @@ function DeleteSeriesModalContent({
     onModalClose,
   ]);
 
-  const { totalEpisodeFileCount, totalSizeOnDisk } = useMemo(() => {
-    return series.reduce(
-      (acc, { statistics = {} }) => {
-        const { episodeFileCount = 0, sizeOnDisk = 0 } = statistics;
-
-        acc.totalEpisodeFileCount += episodeFileCount;
-        acc.totalSizeOnDisk += sizeOnDisk;
-
-        return acc;
-      },
-      {
-        totalEpisodeFileCount: 0,
-        totalSizeOnDisk: 0,
-      }
-    );
-  }, [series]);
-
   return (
     <ModalContent onModalClose={onModalClose}>
       <ModalHeader>{translate('DeleteSelectedSeries')}</ModalHeader>
@@ -145,45 +117,13 @@ function DeleteSeriesModalContent({
               })}
         </div>
 
-        <ul>
-          {series.map(({ title, path, statistics = {} }) => {
-            const { episodeFileCount = 0, sizeOnDisk = 0 } = statistics;
-
-            return (
-              <li key={title}>
-                <span>{title}</span>
-
-                {deleteFiles && (
-                  <span>
-                    <span className={styles.pathContainer}>
-                      -<span className={styles.path}>{path}</span>
-                    </span>
-
-                    {!!episodeFileCount && (
-                      <span className={styles.statistics}>
-                        (
-                        {translate('DeleteSeriesFolderEpisodeCount', {
-                          episodeFileCount,
-                          size: formatBytes(sizeOnDisk),
-                        })}
-                        )
-                      </span>
-                    )}
-                  </span>
-                )}
-              </li>
-            );
-          })}
-        </ul>
-
-        {deleteFiles && !!totalEpisodeFileCount ? (
-          <div className={styles.deleteFilesMessage}>
-            {translate('DeleteSeriesFolderEpisodeCount', {
-              episodeFileCount: totalEpisodeFileCount,
-              size: formatBytes(totalSizeOnDisk),
-            })}
-          </div>
-        ) : null}
+        <SeriesDeleteList
+          series={series}
+          showFileDetails={deleteFiles}
+          totalEpisodeFileCount={totalEpisodeFileCount}
+          totalSizeOnDisk={totalSizeOnDisk}
+          styles={styles}
+        />
       </ModalBody>
 
       <ModalFooter>

frontend/src/Series/Index/Select/Delete/Files/DeleteSeriesFilesModal.tsx

@@ -0,0 +1,22 @@
+import React from 'react';
+import Modal from 'Components/Modal/Modal';
+import DeleteSeriesModalContent, {
+  DeleteSeriesFilesModalContentProps,
+} from './DeleteSeriesFilesModalContent';
+
+interface DeleteSeriesFilesModalProps
+  extends DeleteSeriesFilesModalContentProps {
+  isOpen: boolean;
+}
+
+function DeleteSeriesFilesModal(props: DeleteSeriesFilesModalProps) {
+  const { isOpen, onModalClose } = props;
+
+  return (
+    <Modal isOpen={isOpen} onModalClose={onModalClose}>
+      <DeleteSeriesModalContent onModalClose={onModalClose} />
+    </Modal>
+  );
+}
+
+export default DeleteSeriesFilesModal;

frontend/src/Series/Index/Select/Delete/Files/DeleteSeriesFilesModalContent.css

@@ -0,0 +1,23 @@
+.message {
+  margin-bottom: 10px;
+}
+
+.pathContainer {
+  margin-left: 5px;
+}
+
+.path {
+  margin-left: 5px;
+  color: var(--dangerColor);
+  font-weight: bold;
+}
+
+.statistics {
+  margin-left: 5px;
+  color: var(--warningColor);
+}
+
+.deleteFilesMessage {
+  margin-top: 20px;
+  color: var(--warningColor);
+}

frontend/src/Series/Index/Select/Delete/Files/DeleteSeriesFilesModalContent.css.d.ts

@@ -0,0 +1,11 @@
+// This file is automatically generated.
+// Please do not change this file!
+interface CssExports {
+  'deleteFilesMessage': string;
+  'message': string;
+  'path': string;
+  'pathContainer': string;
+  'statistics': string;
+}
+export const cssExports: CssExports;
+export default cssExports;

frontend/src/Series/Index/Select/Delete/Files/DeleteSeriesFilesModalContent.tsx

@@ -0,0 +1,66 @@
+import React, { useCallback } from 'react';
+import CommandNames from 'Commands/CommandNames';
+import { useExecuteCommand } from 'Commands/useCommands';
+import Button from 'Components/Link/Button';
+import ModalBody from 'Components/Modal/ModalBody';
+import ModalContent from 'Components/Modal/ModalContent';
+import ModalFooter from 'Components/Modal/ModalFooter';
+import ModalHeader from 'Components/Modal/ModalHeader';
+import { kinds } from 'Helpers/Props';
+import translate from 'Utilities/String/translate';
+import SeriesDeleteList from '../SeriesDeleteList';
+import useSelectedSeriesStats from '../useSelectedSeriesStats';
+import styles from './DeleteSeriesFilesModalContent.css';
+
+export interface DeleteSeriesFilesModalContentProps {
+  onModalClose(): void;
+}
+
+function DeleteSeriesFilesModalContent({
+  onModalClose,
+}: DeleteSeriesFilesModalContentProps) {
+  const { series, seriesIds, totalEpisodeFileCount, totalSizeOnDisk } =
+    useSelectedSeriesStats();
+  const executeCommand = useExecuteCommand();
+
+  const onDeleteSeriesConfirmed = useCallback(() => {
+    executeCommand({
+      name: CommandNames.DeleteSeriesFiles,
+      seriesIds,
+    });
+
+    onModalClose();
+  }, [seriesIds, executeCommand, onModalClose]);
+
+  return (
+    <ModalContent onModalClose={onModalClose}>
+      <ModalHeader>{translate('DeleteSelectedSeriesFiles')}</ModalHeader>
+
+      <ModalBody>
+        <div className={styles.message}>
+          {translate('DeleteSeriesFilesConfirmation', {
+            count: series.length,
+          })}
+        </div>
+
+        <SeriesDeleteList
+          series={series}
+          showFileDetails={true}
+          totalEpisodeFileCount={totalEpisodeFileCount}
+          totalSizeOnDisk={totalSizeOnDisk}
+          styles={styles}
+        />
+      </ModalBody>
+
+      <ModalFooter>
+        <Button onPress={onModalClose}>{translate('Cancel')}</Button>
+
+        <Button kind={kinds.DANGER} onPress={onDeleteSeriesConfirmed}>
+          {translate('Delete')}
+        </Button>
+      </ModalFooter>
+    </ModalContent>
+  );
+}
+
+export default DeleteSeriesFilesModalContent;

frontend/src/Series/Index/Select/Delete/SeriesDeleteList.tsx

@@ -0,0 +1,73 @@
+import React from 'react';
+import Series from 'Series/Series';
+import formatBytes from 'Utilities/Number/formatBytes';
+import translate from 'Utilities/String/translate';
+
+interface SeriesDeleteListStyles {
+  pathContainer: string;
+  path: string;
+  statistics: string;
+  deleteFilesMessage: string;
+}
+
+interface SeriesDeleteListProps {
+  series: Series[];
+  showFileDetails: boolean;
+  totalEpisodeFileCount: number;
+  totalSizeOnDisk: number;
+  styles: SeriesDeleteListStyles;
+}
+
+function SeriesDeleteList({
+  series,
+  showFileDetails,
+  totalEpisodeFileCount,
+  totalSizeOnDisk,
+  styles,
+}: SeriesDeleteListProps) {
+  return (
+    <>
+      <ul>
+        {series.map(({ title, path, statistics = {} }) => {
+          const { episodeFileCount = 0, sizeOnDisk = 0 } = statistics;
+
+          return (
+            <li key={title}>
+              <span>{title}</span>
+
+              {showFileDetails ? (
+                <span>
+                  <span className={styles.pathContainer}>
+                    -<span className={styles.path}>{path}</span>
+                  </span>
+
+                  {episodeFileCount ? (
+                    <span className={styles.statistics}>
+                      (
+                      {translate('DeleteSeriesFolderEpisodeCount', {
+                        episodeFileCount,
+                        size: formatBytes(sizeOnDisk),
+                      })}
+                      )
+                    </span>
+                  ) : null}
+                </span>
+              ) : null}
+            </li>
+          );
+        })}
+      </ul>
+
+      {showFileDetails && totalEpisodeFileCount ? (
+        <div className={styles.deleteFilesMessage}>
+          {translate('DeleteSeriesFolderEpisodeCount', {
+            episodeFileCount: totalEpisodeFileCount,
+            size: formatBytes(totalSizeOnDisk),
+          })}
+        </div>
+      ) : null}
+    </>
+  );
+}
+
+export default SeriesDeleteList;

frontend/src/Series/Index/Select/Delete/useSelectedSeriesStats.ts

@@ -0,0 +1,45 @@
+import { useMemo } from 'react';
+import { useSelect } from 'App/Select/SelectContext';
+import Series from 'Series/Series';
+import useSeries from 'Series/useSeries';
+import sortByProp from 'Utilities/Array/sortByProp';
+
+function useSelectedSeriesStats() {
+  const { data: allSeries } = useSeries();
+  const { useSelectedIds } = useSelect<Series>();
+  const seriesIds = useSelectedIds();
+
+  const series = useMemo((): Series[] => {
+    const seriesList = seriesIds.map((id) => {
+      return allSeries.find((s) => s.id === id);
+    }) as Series[];
+
+    return seriesList.sort(sortByProp('sortTitle'));
+  }, [allSeries, seriesIds]);
+
+  const { totalEpisodeFileCount, totalSizeOnDisk } = useMemo(() => {
+    return series.reduce(
+      (acc, { statistics = {} }) => {
+        const { episodeFileCount = 0, sizeOnDisk = 0 } = statistics;
+
+        acc.totalEpisodeFileCount += episodeFileCount;
+        acc.totalSizeOnDisk += sizeOnDisk;
+
+        return acc;
+      },
+      {
+        totalEpisodeFileCount: 0,
+        totalSizeOnDisk: 0,
+      }
+    );
+  }, [series]);
+
+  return {
+    series,
+    seriesIds,
+    totalEpisodeFileCount,
+    totalSizeOnDisk,
+  };
+}
+
+export default useSelectedSeriesStats;

frontend/src/Series/Index/Select/SeriesIndexSelectFooter.tsx

@@ -14,6 +14,7 @@ import {
 } from 'Series/useSeries';
 import translate from 'Utilities/String/translate';
 import DeleteSeriesModal from './Delete/DeleteSeriesModal';
+import DeleteSeriesFilesModal from './Delete/Files/DeleteSeriesFilesModal';
 import EditSeriesModal from './Edit/EditSeriesModal';
 import OrganizeSeriesModal from './Organize/OrganizeSeriesModal';
 import ChangeMonitoringModal from './SeasonPass/ChangeMonitoringModal';
@@ -34,6 +35,9 @@ function SeriesIndexSelectFooter() {
   const { updateSeriesMonitor, isUpdatingSeriesMonitor } =
     useUpdateSeriesMonitor();
   const { isBulkDeleting, bulkDeleteError } = useBulkDeleteSeries();
+  const isDeleteFilesCommandExecuting = useCommandExecuting(
+    CommandNames.DeleteSeriesFiles
+  );
 
   const isOrganizingSeries = useCommandExecuting(CommandNames.RenameSeries);
 
@@ -46,6 +50,7 @@ function SeriesIndexSelectFooter() {
   const [isTagsModalOpen, setIsTagsModalOpen] = useState(false);
   const [isMonitoringModalOpen, setIsMonitoringModalOpen] = useState(false);
   const [isDeleteModalOpen, setIsDeleteModalOpen] = useState(false);
+  const [isDeleteFilesModalOpen, setIsDeleteFilesModalOpen] = useState(false);
   const [isSavingSeries, setIsSavingSeries] = useState(false);
   const [isSavingTags, setIsSavingTags] = useState(false);
   const [isSavingMonitoring, setIsSavingMonitoring] = useState(false);
@@ -132,6 +137,14 @@ function SeriesIndexSelectFooter() {
     setIsDeleteModalOpen(false);
   }, []);
 
+  const onDeleteFilesPress = useCallback(() => {
+    setIsDeleteFilesModalOpen(true);
+  }, []);
+
+  const onDeleteFilesModalClose = useCallback(() => {
+    setIsDeleteFilesModalOpen(false);
+  }, []);
+
   useEffect(() => {
     if (!isSaving) {
       setIsSavingSeries(false);
@@ -195,6 +208,15 @@ function SeriesIndexSelectFooter() {
           >
             {translate('Delete')}
           </SpinnerButton>
+
+          <SpinnerButton
+            kind={kinds.DANGER}
+            isSpinning={isDeleteFilesCommandExecuting}
+            isDisabled={!anySelected || isDeleteFilesCommandExecuting}
+            onPress={onDeleteFilesPress}
+          >
+            {translate('DeleteFiles')}
+          </SpinnerButton>
         </div>
       </div>
 
@@ -229,6 +251,11 @@ function SeriesIndexSelectFooter() {
         isOpen={isDeleteModalOpen}
         onModalClose={onDeleteModalClose}
       />
+
+      <DeleteSeriesFilesModal
+        isOpen={isDeleteFilesModalOpen}
+        onModalClose={onDeleteFilesModalClose}
+      />
     </PageContentFooter>
   );
 }

frontend/src/Settings/MetadataSource/TheTvdb.tsx

@@ -1,17 +1,14 @@
 import React from 'react';
 import InlineMarkdown from 'Components/Markdown/InlineMarkdown';
-import useTheme from 'Helpers/Hooks/useTheme';
 import translate from 'Utilities/String/translate';
 import styles from './TheTvdb.css';
 
 function TheTvdb() {
-  const theme = useTheme();
-
   return (
     <div className={styles.container}>
       <img
         className={styles.image}
-        src={`${window.Sonarr.urlBase}/Content/Images/thetvdb-${theme}.png`}
+        src={`${window.Sonarr.urlBase}/Content/Images/thetvdb.png`}
       />
 
       <div className={styles.info}>

frontend/src/Settings/UI/UISettings.tsx

@@ -67,9 +67,9 @@ function UISettings() {
     isFetched: isLanguagesPopulated,
     error: languagesError,
   } = useFilteredLanguages({
-    Any: true,
-    Original: true,
-    Unknown: true,
+    includeAny: true,
+    includeOriginal: true,
+    includeUnknown: true,
   });
 
   const {
@@ -258,8 +258,6 @@ function UISettings() {
                   name="uiLanguage"
                   helpText={translate('UiLanguageHelpText')}
                   helpTextWarning={translate('BrowserReloadRequired')}
-                  includeOriginal={false}
-                  includeUnknown={false}
                   onChange={handleInputChange}
                   {...settings.uiLanguage}
                   errors={

src/NzbDrone.Core.Test/MediaFiles/MediaFileDeletionService/DeleteEpisodeFileFixture.cs

@@ -5,6 +5,7 @@ using NUnit.Framework;
 using NzbDrone.Common.Disk;
 using NzbDrone.Core.Exceptions;
 using NzbDrone.Core.MediaFiles;
+using NzbDrone.Core.RootFolders;
 using NzbDrone.Core.Test.Framework;
 using NzbDrone.Core.Tv;
 using NzbDrone.Test.Common;
@@ -41,6 +42,10 @@ namespace NzbDrone.Core.Test.MediaFiles.MediaFileDeletionService
 
         private void GivenRootFolderExists()
         {
+            Mocker.GetMock<IRootFolderService>()
+                .Setup(s => s.GetBestRootFolderPath(_series.Path))
+                .Returns(ROOT_FOLDER);
+
             Mocker.GetMock<IDiskProvider>()
                   .Setup(s => s.FolderExists(ROOT_FOLDER))
                   .Returns(true);

src/NzbDrone.Core/Localization/Core/en.json

@@ -364,6 +364,7 @@
   "DeleteEpisodeFromDisk": "Delete episode from disk",
   "DeleteEpisodesFiles": "Delete {episodeFileCount} Episode Files",
   "DeleteEpisodesFilesHelpText": "Delete the episode files and series folder",
+  "DeleteFiles": "Delete Files",
   "DeleteImportList": "Delete Import List",
   "DeleteImportListExclusion": "Delete Import List Exclusion",
   "DeleteImportListExclusionMessageText": "Are you sure you want to delete this import list exclusion?",
@@ -391,6 +392,8 @@
   "DeleteSelectedIndexers": "Delete Indexer(s)",
   "DeleteSelectedIndexersMessageText": "Are you sure you want to delete {count} selected indexer(s)?",
   "DeleteSelectedSeries": "Delete Selected Series",
+  "DeleteSelectedSeriesFiles": "Delete Selected Series Files",
+  "DeleteSeriesFilesConfirmation": "Are you sure you want to delete all tracked episode files for {count} selected series?",
   "DeleteSeriesFolder": "Delete Series Folder",
   "DeleteSeriesFolderConfirmation": "The series folder `{path}` and all of its content will be deleted.",
   "DeleteSeriesFolderCountConfirmation": "Are you sure you want to delete {count} selected series?",

src/NzbDrone.Core/MediaFiles/Commands/DeleteSeriesFilesCommand.cs

@@ -0,0 +1,18 @@
+using System.Collections.Generic;
+using NzbDrone.Core.Messaging.Commands;
+
+namespace NzbDrone.Core.MediaFiles.Commands
+{
+    public class DeleteSeriesFilesCommand : Command
+    {
+        public List<int> SeriesIds { get; set; }
+
+        public override bool SendUpdatesToClient => true;
+        public override bool RequiresDiskAccess => true;
+
+        public DeleteSeriesFilesCommand()
+        {
+            SeriesIds = new List<int>();
+        }
+    }
+}

src/NzbDrone.Core/MediaFiles/MediaFileDeletionService.cs

@@ -4,11 +4,15 @@ using System.Net;
 using NLog;
 using NzbDrone.Common.Disk;
 using NzbDrone.Common.Extensions;
+using NzbDrone.Common.Instrumentation.Extensions;
 using NzbDrone.Core.Configuration;
 using NzbDrone.Core.Exceptions;
+using NzbDrone.Core.MediaFiles.Commands;
 using NzbDrone.Core.MediaFiles.Events;
 using NzbDrone.Core.Messaging;
+using NzbDrone.Core.Messaging.Commands;
 using NzbDrone.Core.Messaging.Events;
+using NzbDrone.Core.RootFolders;
 using NzbDrone.Core.Tv;
 using NzbDrone.Core.Tv.Events;
 
@@ -20,6 +24,7 @@ namespace NzbDrone.Core.MediaFiles
     }
 
     public class MediaFileDeletionService : IDeleteMediaFiles,
+                                            IExecute<DeleteSeriesFilesCommand>,
                                             IHandleAsync<SeriesDeletedEvent>,
                                             IHandle<EpisodeFileDeletedEvent>
     {
@@ -27,7 +32,9 @@ namespace NzbDrone.Core.MediaFiles
         private readonly IRecycleBinProvider _recycleBinProvider;
         private readonly IMediaFileService _mediaFileService;
         private readonly ISeriesService _seriesService;
+        private readonly IRootFolderService _rootFolderService;
         private readonly IConfigService _configService;
+        private readonly ICommandResultReporter _commandResultReporter;
         private readonly IEventAggregator _eventAggregator;
         private readonly Logger _logger;
 
@@ -35,7 +42,9 @@ namespace NzbDrone.Core.MediaFiles
                                         IRecycleBinProvider recycleBinProvider,
                                         IMediaFileService mediaFileService,
                                         ISeriesService seriesService,
+                                        IRootFolderService rootFolderService,
                                         IConfigService configService,
+                                        ICommandResultReporter commandResultReporter,
                                         IEventAggregator eventAggregator,
                                         Logger logger)
         {
@@ -43,7 +52,9 @@ namespace NzbDrone.Core.MediaFiles
             _recycleBinProvider = recycleBinProvider;
             _mediaFileService = mediaFileService;
             _seriesService = seriesService;
+            _rootFolderService = rootFolderService;
             _configService = configService;
+            _commandResultReporter = commandResultReporter;
             _eventAggregator = eventAggregator;
             _logger = logger;
         }
@@ -51,7 +62,7 @@ namespace NzbDrone.Core.MediaFiles
         public void DeleteEpisodeFile(Series series, EpisodeFile episodeFile)
         {
             var fullPath = Path.Combine(series.Path, episodeFile.RelativePath);
-            var rootFolder = _diskProvider.GetParentFolder(series.Path);
+            var rootFolder = _rootFolderService.GetBestRootFolderPath(series.Path);
 
             if (!_diskProvider.FolderExists(rootFolder))
             {
@@ -88,6 +99,81 @@ namespace NzbDrone.Core.MediaFiles
             _eventAggregator.PublishEvent(new DeleteCompletedEvent());
         }
 
+        public void Execute(DeleteSeriesFilesCommand message)
+        {
+            foreach (var seriesId in message.SeriesIds)
+            {
+                try
+                {
+                    var series = _seriesService.GetSeries(seriesId);
+                    var mediaFiles = _mediaFileService.GetFilesBySeries(seriesId);
+
+                    _logger.ProgressDebug("{0}: Deleting episode files}", series.Title);
+
+                    if (mediaFiles.Count == 0)
+                    {
+                        _logger.Debug("No files found for series: {0}", series.Title);
+                        continue;
+                    }
+
+                    var rootFolder = _rootFolderService.GetBestRootFolderPath(series.Path);
+
+                    if (!_diskProvider.FolderExists(rootFolder))
+                    {
+                        _logger.Warn("Series' root folder ({0}) doesn't exist.", rootFolder);
+                        _commandResultReporter.Report(CommandResult.Indeterminate);
+                        continue;
+                    }
+
+                    if (_diskProvider.GetDirectories(rootFolder).Empty())
+                    {
+                        _logger.Warn("Series' root folder ({0}) is empty.", rootFolder);
+                        _commandResultReporter.Report(CommandResult.Indeterminate);
+                        continue;
+                    }
+
+                    if (!_diskProvider.FolderExists(series.Path))
+                    {
+                        _logger.Warn("Series' folder ({0}) does not exist.", series.Path);
+                        _commandResultReporter.Report(CommandResult.Indeterminate);
+                        continue;
+                    }
+
+                    foreach (var episodeFile in mediaFiles)
+                    {
+                        var fullPath = Path.Combine(series.Path, episodeFile.RelativePath);
+
+                        if (_diskProvider.FileExists(fullPath))
+                        {
+                            _logger.Info("Deleting episode file: {0}", fullPath);
+
+                            var subfolder = _diskProvider.GetParentFolder(series.Path).GetRelativePath(_diskProvider.GetParentFolder(fullPath));
+
+                            try
+                            {
+                                _recycleBinProvider.DeleteFile(fullPath, subfolder);
+                            }
+                            catch (Exception e)
+                            {
+                                _logger.Error(e, "Unable to delete episode file");
+                                _commandResultReporter.Report(CommandResult.Indeterminate);
+                                continue;
+                            }
+
+                            _mediaFileService.Delete(episodeFile, DeleteMediaFileReason.Manual);
+                        }
+                    }
+
+                    _logger.ProgressDebug("{0}: Deleted episode files", series.Title);
+                }
+                catch (Exception ex)
+                {
+                    _logger.Warn(ex, "Unable to delete files for series with ID: {0}", seriesId);
+                    _commandResultReporter.Report(CommandResult.Indeterminate);
+                }
+            }
+        }
+
         public void HandleAsync(SeriesDeletedEvent message)
         {
             if (message.DeleteFiles)

src/NzbDrone.Core/Tv/RefreshSeriesService.cs

@@ -231,7 +231,7 @@ namespace NzbDrone.Core.Tv
                         _logger.Error("Series '{0}' (tvdbid {1}) was not found, it may have been removed from TheTVDB.", series.Title, series.TvdbId);
 
                         // Mark the result as indeterminate so it's not marked as a full success,
-                        // // but we can still process other series if needed.
+                        // but we can still process other series if needed.
                         _commandResultReporter.Report(CommandResult.Indeterminate);
                     }
                     catch (Exception e)

src/Sonarr.Api.V5/EpisodeFiles/EpisodeFileController.cs

@@ -135,7 +135,7 @@ public class EpisodeFileController : RestControllerWithSignalR<EpisodeFileResour
             _mediaFileDeletionService.DeleteEpisodeFile(series, episodeFile);
         }
 
-        return new { };
+        return NoContent();
     }
 
     [HttpPut("bulk")]

src/Sonarr.Api.V5/Queue/QueueActionController.cs

@@ -31,7 +31,7 @@ namespace Sonarr.Api.V5.Queue
 
             await _downloadService.DownloadReport(pendingRelease.RemoteEpisode, null);
 
-            return new { };
+            return NoContent();
         }
 
         [HttpPost("grab/bulk")]
@@ -50,7 +50,7 @@ namespace Sonarr.Api.V5.Queue
                 await _downloadService.DownloadReport(pendingRelease.RemoteEpisode, null);
             }
 
-            return new { };
+            return NoContent();
         }
     }
 }

src/Sonarr.Api.V5/Series/SeriesEditorController.cs

@@ -109,6 +109,6 @@ public class SeriesEditorController : Controller
     {
         _seriesService.DeleteSeries(resource.SeriesIds, resource.DeleteFiles, resource.AddImportListExclusion);
 
-        return new { };
+        return NoContent();
     }
 }