Fixed: ArtistRepo Cleanup

src/NzbDrone.Core/Music/ArtistMetadataRepository.cs

@@ -14,7 +14,7 @@ namespace NzbDrone.Core.Music
         Artist Update(Artist artist);
         Artist Upsert(Artist artist);
         void UpdateMany(List<Artist> artists);
-        ArtistMetadata FindById(string ArtistId);
+        ArtistMetadata FindById(string foreignArtistId);
         List<ArtistMetadata> FindById(List<string> foreignIds);
         void UpsertMany(List<ArtistMetadata> artists);
         void UpsertMany(List<Artist> artists);
@@ -23,7 +23,7 @@ namespace NzbDrone.Core.Music
     public class ArtistMetadataRepository : BasicRepository<ArtistMetadata>, IArtistMetadataRepository
     {
         private readonly Logger _logger;
-        
+
         public ArtistMetadataRepository(IMainDatabase database, IEventAggregator eventAggregator, Logger logger)
             : base(database, eventAggregator)
         {
@@ -83,9 +83,9 @@ namespace NzbDrone.Core.Music
             UpdateMany(artists.Select(x => x.Metadata.Value).ToList());
         }
 
-        public ArtistMetadata FindById(string artistId)
+        public ArtistMetadata FindById(string foreignArtistId)
         {
-            return Query.Where(a => a.ForeignArtistId == artistId).SingleOrDefault();
+            return Query.Where(a => a.ForeignArtistId == foreignArtistId).SingleOrDefault();
         }
 
         public List<ArtistMetadata> FindById(List<string> foreignIds)

src/NzbDrone.Core/Music/ArtistRepository.cs

@@ -1,4 +1,4 @@
-using System.Linq;
+using System.Linq;
 using NzbDrone.Core.Datastore;
 using NzbDrone.Core.Messaging.Events;
 using Marr.Data.QGen;
@@ -10,8 +10,7 @@ namespace NzbDrone.Core.Music
     {
         bool ArtistPathExists(string path);
         Artist FindByName(string cleanTitle);
-        Artist FindById(int dbId);
-        Artist FindById(string spotifyId);
+        Artist FindById(string foreignArtistId);
         Artist GetArtistByMetadataId(int artistMetadataId);
     }
 
@@ -35,11 +34,6 @@ namespace NzbDrone.Core.Music
             return Query.Where<ArtistMetadata>(m => m.ForeignArtistId == foreignArtistId).SingleOrDefault();
         }
 
-        public Artist FindById(int dbId)
-        {
-            return Query.Where(s => s.Id == dbId).SingleOrDefault();
-        }
-
         public Artist FindByName(string cleanName)
         {
             cleanName = cleanName.ToLowerInvariant();

src/NzbDrone.Core/Music/ArtistService.cs

@@ -18,7 +18,7 @@ namespace NzbDrone.Core.Music
         List<Artist> GetArtists(IEnumerable<int> artistIds);
         Artist AddArtist(Artist newArtist);
         List<Artist> AddArtists(List<Artist> newArtists);
-        Artist FindById(string spotifyId);
+        Artist FindById(string foreignArtistId);
         Artist FindByName(string title);
         Artist FindByNameInexact(string title);
         List<Artist> GetCandidates(string title);
@@ -94,9 +94,9 @@ namespace NzbDrone.Core.Music
             _eventAggregator.PublishEvent(new ArtistDeletedEvent(artist, deleteFiles, addImportListExclusion));
         }
 
-        public Artist FindById(string spotifyId)
+        public Artist FindById(string foreignArtistId)
         {
-            return _artistRepository.FindById(spotifyId);
+            return _artistRepository.FindById(foreignArtistId);
         }
 
         public Artist FindByName(string title)
@@ -144,7 +144,7 @@ namespace NzbDrone.Core.Music
         {
             var artists = GetAllArtists();
             var output = new List<Artist>();
-            
+
             foreach (var func in ArtistScoringFunctions(title, title.CleanArtistName()))
             {
                 output.AddRange(FindByStringInexact(artists, func.Item1, func.Item2));