github/lidarr
1
0
Fork 0
mirror of https://github.com/lidarr/lidarr.git synced 2025-07-16 10:03:51 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fixed: Minor Cleanup

Browse source 
Co-Authored-By: Mark McDowall <markus101@users.noreply.github.com>
This commit is contained in:
Qstick 2019-09-10 23:54:16 -04:00
parent ce1da8665f
commit 3e10c994df
2 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/NzbDrone.Core/DecisionEngine/Specifications/QueueSpecification.cs
View file

@ -33,10 +33,9 @@ namespace NzbDrone.Core.DecisionEngine.Specifications
public Decision IsSatisfiedBy(RemoteAlbum subject, SearchCriteriaBase searchCriteria) public Decision IsSatisfiedBy(RemoteAlbum subject, SearchCriteriaBase searchCriteria)
{ {
var queue = _queueService.GetQueue(); var queue = _queueService.GetQueue();
var matchingAlbum = queue.Where(q => q.RemoteAlbum != null && var matchingAlbum = queue.Where(q => q.RemoteAlbum?.Artist != null &&
q.RemoteAlbum.Artist != null && q.RemoteAlbum.Artist.Id == subject.Artist.Id &&
q.RemoteAlbum.Artist.Id == subject.Artist.Id && q.RemoteAlbum.Albums.Select(e => e.Id).Intersect(subject.Albums.Select(e => e.Id)).Any())
q.RemoteAlbum.Albums.Select(e => e.Id).Intersect(subject.Albums.Select(e => e.Id)).Any())
.ToList(); .ToList();

11
src/NzbDrone.Core/DecisionEngine/Specifications/RssSync/HistorySpecification.cs
View file

@ -54,6 +54,12 @@ namespace NzbDrone.Core.DecisionEngine.Specifications.RssSync
if (mostRecent != null && mostRecent.EventType == HistoryEventType.Grabbed) if (mostRecent != null && mostRecent.EventType == HistoryEventType.Grabbed)
{ {
var recent = mostRecent.Date.After(DateTime.UtcNow.AddHours(-12)); var recent = mostRecent.Date.After(DateTime.UtcNow.AddHours(-12));
if (!recent && cdhEnabled)
{
continue;
}
// The artist will be the same as the one in history since it's the same album. // The artist will be the same as the one in history since it's the same album.
// Instead of fetching the artist from the DB reuse the known artist. // Instead of fetching the artist from the DB reuse the known artist.
var preferredWordScore = _preferredWordServiceCalculator.Calculate(subject.Artist, mostRecent.SourceTitle); var preferredWordScore = _preferredWordServiceCalculator.Calculate(subject.Artist, mostRecent.SourceTitle);
@ -72,11 +78,6 @@ namespace NzbDrone.Core.DecisionEngine.Specifications.RssSync
subject.ParsedAlbumInfo.Quality, subject.ParsedAlbumInfo.Quality,
subject.PreferredWordScore); subject.PreferredWordScore);
if (!recent && cdhEnabled)
{
continue;
}
if (!cutoffUnmet) if (!cutoffUnmet)
{ {
if (recent) if (recent)