From 0220b18017f3e5cad4893ed8ad343ae0a408cb2d Mon Sep 17 00:00:00 2001 From: Roger Far Date: Sat, 16 May 2020 20:20:37 -0600 Subject: [PATCH] Fixed issue with deleting torrents and a null reference error. --- server/RdtClient.Data/Data/TorrentData.cs | 4 ++-- server/RdtClient.Service/Services/Torrents.cs | 6 ++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/server/RdtClient.Data/Data/TorrentData.cs b/server/RdtClient.Data/Data/TorrentData.cs index a6c5a94..c8ffbc1 100644 --- a/server/RdtClient.Data/Data/TorrentData.cs +++ b/server/RdtClient.Data/Data/TorrentData.cs @@ -67,7 +67,7 @@ namespace RdtClient.Data.Data var results = await _dataContext.Torrents .AsNoTracking() .Include(m => m.Downloads) - .FirstOrDefaultAsync(m => m.Hash == hash); + .FirstOrDefaultAsync(m => m.Hash.ToLower() == hash.ToLower()); if (results != null) { @@ -86,7 +86,7 @@ namespace RdtClient.Data.Data { TorrentId = Guid.NewGuid(), RdId = realDebridId, - Hash = hash, + Hash = hash.ToLower(), Status = TorrentStatus.RealDebrid, AutoDownload = autoDownload, AutoDelete = autoDelete diff --git a/server/RdtClient.Service/Services/Torrents.cs b/server/RdtClient.Service/Services/Torrents.cs index d044885..f15fc4e 100644 --- a/server/RdtClient.Service/Services/Torrents.cs +++ b/server/RdtClient.Service/Services/Torrents.cs @@ -142,10 +142,9 @@ namespace RdtClient.Service.Services var newTorrent = await _torrentData.Add(rdTorrent.Id, rdTorrent.Hash, false, false); await GetById(newTorrent.TorrentId); } - - if (rdTorrent.Files == null) + else if (rdTorrent.Files == null) { - var rdTorrent2 = await _rdtClient.GetTorrentInfoAsync(rdTorrent.Id); + var rdTorrent2 = await RdNetClient.GetTorrentInfoAsync(rdTorrent.Id); await Update(torrent, rdTorrent2); } else @@ -360,7 +359,6 @@ namespace RdtClient.Service.Services if (!rdTorrent.Files.Any(m => m.Selected)) { var fileIds = rdTorrent.Files - .Where(m => m.Bytes > 1024 * 10) .Select(m => m.Id.ToString()) .ToArray();