Fixed: Lidarr stuck if Deluge didn't return an infohash.

This commit is contained in:
Qstick
2017-10-28 22:57:03 -04:00
parent 641f8a88fa
commit 4725f4b2bd
3 changed files with 9 additions and 7 deletions
@@ -57,6 +57,11 @@ namespace NzbDrone.Core.Download.Clients.Deluge
{ {
var actualHash = _proxy.AddTorrentFromFile(filename, fileContent, Settings); var actualHash = _proxy.AddTorrentFromFile(filename, fileContent, Settings);
if (actualHash.IsNullOrWhiteSpace())
{
throw new DownloadClientException("Deluge failed to add torrent " + filename);
}
if (!Settings.TvCategory.IsNullOrWhiteSpace()) if (!Settings.TvCategory.IsNullOrWhiteSpace())
{ {
_proxy.SetLabel(actualHash, Settings.TvCategory, Settings); _proxy.SetLabel(actualHash, Settings.TvCategory, Settings);
@@ -86,8 +86,7 @@ namespace NzbDrone.Core.Download.Pending
{ {
if (matchingReport.Reason != reason) if (matchingReport.Reason != reason)
{ {
_logger.Debug("This release is already pending with reason {0}, changing to {1}", matchingReport.Reason, reason); _logger.Debug("The release {0} is already pending with reason {1}, changing to {2}", decision.RemoteAlbum, matchingReport.Reason, reason); matchingReport.Reason = reason;
matchingReport.Reason = reason;
_repository.Update(matchingReport); _repository.Update(matchingReport);
sameReason = false; sameReason = false;
} }
@@ -95,13 +94,11 @@ namespace NzbDrone.Core.Download.Pending
if (sameReason) if (sameReason)
{ {
_logger.Debug("This release is already pending with reason {0}, not adding again", reason); _logger.Debug("The release {0} is already pending with reason {1}, not adding again", decision.RemoteAlbum, reason); return;
return;
} }
} }
_logger.Debug("Adding release to pending releases with reason {0}", reason); _logger.Debug("Adding release {0} to pending releases with reason {1}", decision.RemoteAlbum, reason); Insert(decision, reason);
Insert(decision, reason);
} }
public List<ReleaseInfo> GetPending() public List<ReleaseInfo> GetPending()
@@ -78,7 +78,7 @@ namespace NzbDrone.Core.Download
{ {
if (ex is DownloadClientUnavailableException || ex is DownloadClientAuthenticationException) if (ex is DownloadClientUnavailableException || ex is DownloadClientAuthenticationException)
{ {
_logger.Debug("Failed to send release to download client, storing until later"); _logger.Debug(ex, "Failed to send release to download client, storing until later. " + remoteAlbum);
failed.Add(report); failed.Add(report);
if (downloadProtocol == DownloadProtocol.Usenet) if (downloadProtocol == DownloadProtocol.Usenet)