Merge conflicts

This commit is contained in:
Joseph Milazzo
2017-06-21 20:32:50 -05:00
28 changed files with 834 additions and 64 deletions
@@ -19,6 +19,7 @@ namespace NzbDrone.Core.MediaFiles
void Update(TrackFile trackFile);
void Delete(TrackFile trackFile, DeleteMediaFileReason reason);
List<TrackFile> GetFilesByArtist(int artistId);
List<TrackFile> GetFilesByAlbum(int artistId, int albumId);
List<TrackFile> GetFilesWithoutMediaInfo();
List<string> FilterExistingFiles(List<string> files, Artist artist);
TrackFile Get(int id);
@@ -98,5 +99,10 @@ namespace NzbDrone.Core.MediaFiles
{
return _mediaFileRepository.GetFilesByArtist(artistId);
}
public List<TrackFile> GetFilesByAlbum(int artistId, int albumId)
{
return _mediaFileRepository.GetFilesByArtist(artistId);
}
}
}