github/lidarr
1
0
Fork 0
mirror of https://github.com/lidarr/lidarr.git synced 2025-07-14 00:53:57 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fixed: Null reference error when import list adds new album to existing artist

Browse source 
(cherry picked from commit 5e3045db86748d0ab407a6785007cb6bbd4f46a6)
(cherry picked from commit 21d867c35c3805d82b95b0ecbdacb3ab4fec49dd)
This commit is contained in:
Thomas White 2022-07-25 21:17:14 +01:00 • committed by ta264
parent 93bb1d44b8
commit a059b584db
2 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/NzbDrone.Core.Test/ImportListTests/ImportListSyncServiceFixture.cs
View file

@ -89,14 +89,14 @@ namespace NzbDrone.Core.Test.ImportListTests
{ {
Mocker.GetMock<IArtistService>() Mocker.GetMock<IArtistService>()
.Setup(v => v.FindById(_importListReports.First().ArtistMusicBrainzId)) .Setup(v => v.FindById(_importListReports.First().ArtistMusicBrainzId))
.Returns(new Artist { ForeignArtistId = _importListReports.First().ArtistMusicBrainzId }); .Returns(new Artist { Id = 1, ForeignArtistId = _importListReports.First().ArtistMusicBrainzId });
} }
private void WithExistingAlbum() private void WithExistingAlbum()
{ {
Mocker.GetMock<IAlbumService>() Mocker.GetMock<IAlbumService>()
.Setup(v => v.FindById(_importListReports.First().AlbumMusicBrainzId)) .Setup(v => v.FindById(_importListReports.First().AlbumMusicBrainzId))
.Returns(new Album { ForeignAlbumId = _importListReports.First().AlbumMusicBrainzId }); .Returns(new Album { Id = 1, ForeignAlbumId = _importListReports.First().AlbumMusicBrainzId });
} }
private void WithExcludedArtist() private void WithExcludedArtist()
@ -215,6 +215,7 @@ namespace NzbDrone.Core.Test.ImportListTests
public void should_add_if_existing_artist_but_new_album() public void should_add_if_existing_artist_but_new_album()
{ {
WithAlbumId(); WithAlbumId();
WithArtistId();
WithExistingArtist(); WithExistingArtist();
Subject.Execute(new ImportListSyncCommand()); Subject.Execute(new ImportListSyncCommand());

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

@ -1,4 +1,5 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics;
using System.Linq; using System.Linq;
using NLog; using NLog;
using NzbDrone.Common.Extensions; using NzbDrone.Common.Extensions;
@ -243,8 +244,9 @@ namespace NzbDrone.Core.ImportLists
} }
}; };
if (importList.ShouldMonitor == ImportListMonitorType.SpecificAlbum) if (importList.ShouldMonitor == ImportListMonitorType.SpecificAlbum && toAddArtist.AddOptions != null)
{ {
Debug.Assert(toAddArtist.Id == 0, "new artist added but ID is not 0");
toAddArtist.AddOptions.AlbumsToMonitor.Add(toAdd.ForeignAlbumId); toAddArtist.AddOptions.AlbumsToMonitor.Add(toAdd.ForeignAlbumId);
} }