tedkulp/Readarr
1
0
Fork 0
mirror of https://github.com/Readarr/Readarr.git synced 2026-04-24 22:35:39 -04:00
Code Issues Projects Releases Wiki Activity

Fixed: Cleanup 11 more tests

Browse Source
This commit is contained in:
Qstick
2017-12-30 01:09:10 -05:00
parent d8c89f5bbd
commit ec12bede9d
10 changed files with 96 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/NzbDrone.Core/Music/AddArtistService.cs
+36 -24
View File
@@ -45,40 +45,30 @@ namespace NzbDrone.Core.Music
{
Ensure.That(newArtist, () => newArtist).IsNotNull();
// Called for artist creation from API, duplicated call when called from Lidarr. Fix this.
newArtist = AddSkyhookData(newArtist);
if (string.IsNullOrWhiteSpace(newArtist.Path))
{
var folderName = _fileNameBuilder.GetArtistFolder(newArtist);
newArtist.Path = Path.Combine(newArtist.RootFolderPath, folderName);
}
newArtist.CleanName = newArtist.Name.CleanArtistName();
newArtist.SortName = ArtistNameNormalizer.Normalize(newArtist.Name, newArtist.ForeignArtistId); // There is no Sort Title
newArtist.Added = DateTime.UtcNow;
var validationResult = _addArtistValidator.Validate(newArtist);
if (!validationResult.IsValid)
{
throw new ValidationException(validationResult.Errors);
}
newArtist = SetPropertiesAndValidate(newArtist);
_logger.Info("Adding Artist {0} Path: [{1}]", newArtist, newArtist.Path);
newArtist = _artistService.AddArtist(newArtist);
_artistService.AddArtist(newArtist);
return newArtist;
}
public List<Artist> AddArtists(List<Artist> newArtists)
{
newArtists.ForEach(artist =>
{
AddArtist(artist);
});
var added = DateTime.UtcNow;
var artistsToAdd = new List<Artist>();
return newArtists;
foreach (var s in newArtists)
{
// TODO: Verify if adding skyhook data will be slow
var artist = AddSkyhookData(s);
artist = SetPropertiesAndValidate(artist);
artist.Added = added;
artistsToAdd.Add(artist);
}
return _artistService.AddArtists(artistsToAdd);
}
private Artist AddSkyhookData(Artist newArtist)
@@ -108,5 +98,27 @@ namespace NzbDrone.Core.Music
return artist;
}
private Artist SetPropertiesAndValidate(Artist newArtist)
{
if (string.IsNullOrWhiteSpace(newArtist.Path))
{
var folderName = _fileNameBuilder.GetArtistFolder(newArtist);
newArtist.Path = Path.Combine(newArtist.RootFolderPath, folderName);
}
newArtist.CleanName = newArtist.Name.CleanArtistName();
newArtist.SortName = ArtistNameNormalizer.Normalize(newArtist.Name, newArtist.ForeignArtistId);
newArtist.Added = DateTime.UtcNow;
var validationResult = _addArtistValidator.Validate(newArtist);
if (!validationResult.IsValid)
{
throw new ValidationException(validationResult.Errors);
}
return newArtist;
}
}
}