mirror
/
Lidarr
mirror of https://github.com/lidarr/Lidarr
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixed: Delete data when removing torrent from Download Station 

fixes #1676
This commit is contained in:
Marcelo Castagna 2017-02-13 16:17:52 -03:00 committed by Taloth
parent cf306f4aba
commit 45d8b1e2ad
2 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/NzbDrone.Core/Download/Clients/DownloadStation/DownloadStation.cs
View File

@ -117,16 +117,13 @@ namespace NzbDrone.Core.Download.Clients.DownloadStation
public override void RemoveItem(string downloadId, bool deleteData) public override void RemoveItem(string downloadId, bool deleteData)
{ {
try if (deleteData)
{ {
_proxy.RemoveTorrent(ParseDownloadId(downloadId), deleteData, Settings); DeleteItemData(downloadId);
_logger.Debug("{0} removed correctly", downloadId);
return;
}
catch (DownloadClientException e)
{
_logger.Error(e);
} }
_proxy.RemoveTorrent(ParseDownloadId(downloadId), Settings);
_logger.Debug("{0} removed correctly", downloadId);
} }
protected OsPath GetOutputPath(OsPath outputPath, DownloadStationTorrent torrent, string serialNumber) protected OsPath GetOutputPath(OsPath outputPath, DownloadStationTorrent torrent, string serialNumber)

5
src/NzbDrone.Core/Download/Clients/DownloadStation/Proxies/DownloadStationProxy.cs
View File

@ -12,7 +12,7 @@ namespace NzbDrone.Core.Download.Clients.DownloadStation.Proxies
{ {
IEnumerable<DownloadStationTorrent> GetTorrents(DownloadStationSettings settings); IEnumerable<DownloadStationTorrent> GetTorrents(DownloadStationSettings settings);
Dictionary<string, object> GetConfig(DownloadStationSettings settings); Dictionary<string, object> 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 AddTorrentFromUrl(string url, string downloadDirectory, DownloadStationSettings settings);
void AddTorrentFromData(byte[] torrentData, string filename, string downloadDirectory, DownloadStationSettings settings); void AddTorrentFromData(byte[] torrentData, string filename, string downloadDirectory, DownloadStationSettings settings);
IEnumerable<int> GetApiVersion(DownloadStationSettings settings); IEnumerable<int> GetApiVersion(DownloadStationSettings settings);
@ -99,7 +99,7 @@ namespace NzbDrone.Core.Download.Clients.DownloadStation.Proxies
return response.Data; return response.Data;
} }
public void RemoveTorrent(string downloadId, bool deleteData, DownloadStationSettings settings) public void RemoveTorrent(string downloadId, DownloadStationSettings settings)
{ {
var arguments = new Dictionary<string, object> var arguments = new Dictionary<string, object>
{ {
@ -111,7 +111,6 @@ namespace NzbDrone.Core.Download.Clients.DownloadStation.Proxies
}; };
var response = ProcessRequest(DiskStationApi.DownloadStationTask, arguments, settings, $"remove item {downloadId}"); var response = ProcessRequest(DiskStationApi.DownloadStationTask, arguments, settings, $"remove item {downloadId}");
_logger.Trace("Item {0} removed from Download Station", downloadId);
} }
public IEnumerable<int> GetApiVersion(DownloadStationSettings settings) public IEnumerable<int> GetApiVersion(DownloadStationSettings settings)