diff --git a/src/NzbDrone.Core/Download/Clients/DownloadStation/DownloadStation.cs b/src/NzbDrone.Core/Download/Clients/DownloadStation/DownloadStation.cs index 7b9c45759..79983115a 100644 --- a/src/NzbDrone.Core/Download/Clients/DownloadStation/DownloadStation.cs +++ b/src/NzbDrone.Core/Download/Clients/DownloadStation/DownloadStation.cs @@ -117,16 +117,13 @@ namespace NzbDrone.Core.Download.Clients.DownloadStation public override void RemoveItem(string downloadId, bool deleteData) { - try + if (deleteData) { - _proxy.RemoveTorrent(ParseDownloadId(downloadId), deleteData, Settings); - _logger.Debug("{0} removed correctly", downloadId); - return; - } - catch (DownloadClientException e) - { - _logger.Error(e); + DeleteItemData(downloadId); } + + _proxy.RemoveTorrent(ParseDownloadId(downloadId), Settings); + _logger.Debug("{0} removed correctly", downloadId); } protected OsPath GetOutputPath(OsPath outputPath, DownloadStationTorrent torrent, string serialNumber) diff --git a/src/NzbDrone.Core/Download/Clients/DownloadStation/Proxies/DownloadStationProxy.cs b/src/NzbDrone.Core/Download/Clients/DownloadStation/Proxies/DownloadStationProxy.cs index 1a6905d0c..48fd0330f 100644 --- a/src/NzbDrone.Core/Download/Clients/DownloadStation/Proxies/DownloadStationProxy.cs +++ b/src/NzbDrone.Core/Download/Clients/DownloadStation/Proxies/DownloadStationProxy.cs @@ -12,7 +12,7 @@ namespace NzbDrone.Core.Download.Clients.DownloadStation.Proxies { IEnumerable GetTorrents(DownloadStationSettings settings); Dictionary GetConfig(DownloadStationSettings settings); - void RemoveTorrent(string downloadId, bool deleteData, DownloadStationSettings settings); + void RemoveTorrent(string downloadId, DownloadStationSettings settings); void AddTorrentFromUrl(string url, string downloadDirectory, DownloadStationSettings settings); void AddTorrentFromData(byte[] torrentData, string filename, string downloadDirectory, DownloadStationSettings settings); IEnumerable GetApiVersion(DownloadStationSettings settings); @@ -99,7 +99,7 @@ namespace NzbDrone.Core.Download.Clients.DownloadStation.Proxies return response.Data; } - public void RemoveTorrent(string downloadId, bool deleteData, DownloadStationSettings settings) + public void RemoveTorrent(string downloadId, DownloadStationSettings settings) { var arguments = new Dictionary { @@ -111,7 +111,6 @@ namespace NzbDrone.Core.Download.Clients.DownloadStation.Proxies }; var response = ProcessRequest(DiskStationApi.DownloadStationTask, arguments, settings, $"remove item {downloadId}"); - _logger.Trace("Item {0} removed from Download Station", downloadId); } public IEnumerable GetApiVersion(DownloadStationSettings settings)