github/lidarr
1
0
Fork 0
mirror of https://github.com/lidarr/lidarr.git synced 2025-08-20 21:43:33 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

New: Less logging when no import lists are enabled

Browse source 
(cherry picked from commit 7be4840f028f24e3920bd395a4e15eb5e643e46f)

Closes #4036
This commit is contained in:
Mark McDowall 2023-08-18 23:47:19 -07:00 • committed by Bogdan
commit f9b8d7720c
1 changed files with 35 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

62
src/NzbDrone.Core/ImportLists/ImportListSyncService.cs
View file

@ -59,68 +59,78 @@ namespace NzbDrone.Core.ImportLists
private List<Album> SyncAll() private List<Album> SyncAll()
{ {
if (_importListFactory.AutomaticAddEnabled().Empty())
{
_logger.Debug("No import lists with automatic add enabled");
return new List<Album>();
}
_logger.ProgressInfo("Starting Import List Sync"); _logger.ProgressInfo("Starting Import List Sync");
var rssReleases = _listFetcherAndParser.Fetch(); var listItems = _listFetcherAndParser.Fetch().ToList();
var reports = rssReleases.ToList(); return ProcessListItems(listItems);
return ProcessReports(reports);
} }
private List<Album> SyncList(ImportListDefinition definition) private List<Album> SyncList(ImportListDefinition definition)
{ {
_logger.ProgressInfo("Starting Import List Refresh for List {0}", definition.Name); _logger.ProgressInfo($"Starting Import List Refresh for List {definition.Name}");
var rssReleases = _listFetcherAndParser.FetchSingleList(definition); var listItems = _listFetcherAndParser.FetchSingleList(definition).ToList();
var reports = rssReleases.ToList(); return ProcessListItems(listItems);
return ProcessReports(reports);
} }
private List<Album> ProcessReports(List<ImportListItemInfo> reports) private List<Album> ProcessListItems(List<ImportListItemInfo> items)
{ {
var processed = new List<Album>(); var processed = new List<Album>();
var artistsToAdd = new List<Artist>(); var artistsToAdd = new List<Artist>();
var albumsToAdd = new List<Album>(); var albumsToAdd = new List<Album>();
_logger.ProgressInfo("Processing {0} list items", reports.Count); if (items.Count == 0)
{
_logger.ProgressInfo("No list items to process");
return new List<Album>();
}
_logger.ProgressInfo("Processing {0} list items", items.Count);
var reportNumber = 1; var reportNumber = 1;
var listExclusions = _importListExclusionService.All().ToDictionary(x => x.ForeignId); var listExclusions = _importListExclusionService.All().ToDictionary(x => x.ForeignId);
foreach (var report in reports) foreach (var item in items)
{ {
_logger.ProgressTrace("Processing list item {0}/{1}", reportNumber++, reports.Count); _logger.ProgressTrace("Processing list item {0}/{1}", reportNumber++, items.Count);
var importList = _importListFactory.Get(report.ImportListId); var importList = _importListFactory.Get(item.ImportListId);
if (report.Album.IsNotNullOrWhiteSpace() || report.AlbumMusicBrainzId.IsNotNullOrWhiteSpace()) if (item.Album.IsNotNullOrWhiteSpace() || item.AlbumMusicBrainzId.IsNotNullOrWhiteSpace())
{ {
if (report.AlbumMusicBrainzId.IsNullOrWhiteSpace() || report.ArtistMusicBrainzId.IsNullOrWhiteSpace()) if (item.AlbumMusicBrainzId.IsNullOrWhiteSpace() || item.ArtistMusicBrainzId.IsNullOrWhiteSpace())
{ {
MapAlbumReport(report); MapAlbumReport(item);
} }
ProcessAlbumReport(importList, report, listExclusions, albumsToAdd, artistsToAdd); ProcessAlbumReport(importList, item, listExclusions, albumsToAdd, artistsToAdd);
} }
else if (report.Artist.IsNotNullOrWhiteSpace() || report.ArtistMusicBrainzId.IsNotNullOrWhiteSpace()) else if (item.Artist.IsNotNullOrWhiteSpace() || item.ArtistMusicBrainzId.IsNotNullOrWhiteSpace())
{ {
if (report.ArtistMusicBrainzId.IsNullOrWhiteSpace()) if (item.ArtistMusicBrainzId.IsNullOrWhiteSpace())
{ {
MapArtistReport(report); MapArtistReport(item);
} }
ProcessArtistReport(importList, report, listExclusions, artistsToAdd); ProcessArtistReport(importList, item, listExclusions, artistsToAdd);
} }
} }
var addedArtists = _addArtistService.AddArtists(artistsToAdd, false, true); var addedArtists = _addArtistService.AddArtists(artistsToAdd, false, true);
var addedAlbums = _addAlbumService.AddAlbums(albumsToAdd, false, true); var addedAlbums = _addAlbumService.AddAlbums(albumsToAdd, false, true);
var message = string.Format($"Import List Sync Completed. Items found: {reports.Count}, Artists added: {addedArtists.Count}, Albums added: {addedAlbums.Count}"); var message = string.Format($"Import List Sync Completed. Items found: {items.Count}, Artists added: {addedArtists.Count}, Albums added: {addedAlbums.Count}");
_logger.ProgressInfo(message); _logger.ProgressInfo(message);
@ -136,8 +146,7 @@ namespace NzbDrone.Core.ImportLists
private void MapAlbumReport(ImportListItemInfo report) private void MapAlbumReport(ImportListItemInfo report)
{ {
var albumQuery = report.AlbumMusicBrainzId.IsNotNullOrWhiteSpace() ? $"lidarr:{report.AlbumMusicBrainzId}" : report.Album; var albumQuery = report.AlbumMusicBrainzId.IsNotNullOrWhiteSpace() ? $"lidarr:{report.AlbumMusicBrainzId}" : report.Album;
var mappedAlbum = _albumSearchService.SearchForNewAlbum(albumQuery, report.Artist) var mappedAlbum = _albumSearchService.SearchForNewAlbum(albumQuery, report.Artist).FirstOrDefault();
.FirstOrDefault();
// Break if we are looking for an album and cant find it. This will avoid us from adding the artist and possibly getting it wrong. // Break if we are looking for an album and cant find it. This will avoid us from adding the artist and possibly getting it wrong.
if (mappedAlbum == null) if (mappedAlbum == null)
@ -250,8 +259,7 @@ namespace NzbDrone.Core.ImportLists
private void MapArtistReport(ImportListItemInfo report) private void MapArtistReport(ImportListItemInfo report)
{ {
var mappedArtist = _artistSearchService.SearchForNewArtist(report.Artist) var mappedArtist = _artistSearchService.SearchForNewArtist(report.Artist).FirstOrDefault();
.FirstOrDefault();
report.ArtistMusicBrainzId = mappedArtist?.Metadata.Value?.ForeignArtistId; report.ArtistMusicBrainzId = mappedArtist?.Metadata.Value?.ForeignArtistId;
report.Artist = mappedArtist?.Metadata.Value?.Name; report.Artist = mappedArtist?.Metadata.Value?.Name;
} }