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

Fixed: History being lost per Track on Merge

This commit is contained in:
Qstick 2020-01-01 14:26:09 -05:00
parent 6060270f14
commit c39eaabb14
3 changed files with 30 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/NzbDrone.Core/History/HistoryRepository.cs
View File

@ -16,6 +16,7 @@ namespace NzbDrone.Core.History
List<History> FindByDownloadId(string downloadId);
List<History> GetByArtist(int artistId, HistoryEventType? eventType);
List<History> GetByAlbum(int albumId, HistoryEventType? eventType);
List<History> GetByTrack(int trackId, HistoryEventType? eventType);
List<History> FindDownloadHistory(int idArtistId, QualityModel quality);
void DeleteForArtist(int artistId);
void DeleteForAlbum(int albumId);
@ -83,6 +84,21 @@ namespace NzbDrone.Core.History
return query;
}
public List<History> GetByTrack(int trackId, HistoryEventType? eventType)
{
var query = Query.Join<History, Track>(JoinType.Inner, h => h.Track, (h, e) => h.TrackId == e.Id)
.Where(h => h.TrackId == trackId);
if (eventType.HasValue)
{
query.AndWhere(h => h.EventType == eventType);
}
query.OrderByDescending(h => h.Date);
return query;
}
public List<History> FindDownloadHistory(int idArtistId, QualityModel quality)
{
return Query.Where(h =>

6
src/NzbDrone.Core/History/HistoryService.cs
View File

@ -24,6 +24,7 @@ namespace NzbDrone.Core.History
History Get(int historyId);
List<History> GetByArtist(int artistId, HistoryEventType? eventType);
List<History> GetByAlbum(int albumId, HistoryEventType? eventType);
List<History> GetByTrack(int trackId, HistoryEventType? eventType);
List<History> Find(string downloadId, HistoryEventType eventType);
List<History> FindByDownloadId(string downloadId);
List<History> Since(DateTime date, HistoryEventType? eventType);
@ -82,6 +83,11 @@ namespace NzbDrone.Core.History
return _historyRepository.GetByAlbum(albumId, eventType);
}
public List<History> GetByTrack(int trackId, HistoryEventType? eventType)
{
return _historyRepository.GetByTrack(trackId, eventType);
}
public List<History> Find(string downloadId, HistoryEventType eventType)
{
return _historyRepository.FindByDownloadId(downloadId).Where(c => c.EventType == eventType).ToList();

8
src/NzbDrone.Core/Music/Services/RefreshTrackService.cs
View File

@ -1,4 +1,5 @@
using NLog;
using NzbDrone.Core.History;
using NzbDrone.Core.MediaFiles;
using System;
using System.Collections.Generic;
@ -15,14 +16,17 @@ namespace NzbDrone.Core.Music
{
private readonly ITrackService _trackService;
private readonly IAudioTagService _audioTagService;
private readonly IHistoryService _historyService;
private readonly Logger _logger;
public RefreshTrackService(ITrackService trackService,
IAudioTagService audioTagService,
IHistoryService historyService,
Logger logger)
{
_trackService = trackService;
_audioTagService = audioTagService;
_historyService = historyService;
_logger = logger;
}
@ -52,6 +56,10 @@ namespace NzbDrone.Core.Music
mergeTarget.TrackFileId = trackToMerge.TrackFileId;
}
var items = _historyService.GetByTrack(trackToMerge.Id, null);
items.ForEach(x => x.TrackId = mergeTarget.Id);
_historyService.UpdateMany(items);
if (!updateList.Contains(mergeTarget))
{
updateList.Add(mergeTarget);