open-source-mirrors
/
Lidarr
mirror of https://github.com/Lidarr/Lidarr
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed all issues from merging

Browse Source
pull/7/head
Joseph Milazzo 8 years ago
parent e7f72a9d08
commit b4279a455e
3 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File

4
src/NzbDrone.Core/MetadataSource/SkyHook/SkyHookProxy.cs
Unescape View File

@ -77,7 +77,7 @@ namespace NzbDrone.Core.MetadataSource.SkyHook
public Tuple<Artist, List<Album>> GetArtistInfo(string foreignArtistId) public Tuple<Artist, List<Album>> GetArtistInfo(string foreignArtistId)
{ {
_logger.Debug("Getting Artist with SpotifyId of {0}", foreignArtistId); _logger.Debug("Getting Artist with LidarrAPI.MetadataID of {0}", foreignArtistId);
// We need to perform a direct lookup of the artist // We need to perform a direct lookup of the artist
var httpRequest = _requestBuilder.Create() var httpRequest = _requestBuilder.Create()
@ -296,7 +296,7 @@ namespace NzbDrone.Core.MetadataSource.SkyHook
Artist artist = new Artist(); Artist artist = new Artist();
artist.Name = resource.ArtistName; artist.Name = resource.ArtistName;
artist.ForeignArtistId = resource.Id; // TODO: Rename spotifyId to LidarrId artist.ForeignArtistId = resource.Id;
artist.Genres = resource.Genres; artist.Genres = resource.Genres;
artist.Overview = resource.Overview; artist.Overview = resource.Overview;
artist.NameSlug = Parser.Parser.CleanArtistTitle(artist.Name); artist.NameSlug = Parser.Parser.CleanArtistTitle(artist.Name);

28
src/NzbDrone.Core/Music/TrackRepository.cs
Unescape View File

@ -13,11 +13,11 @@ namespace NzbDrone.Core.Music
{ {
public interface ITrackRepository : IBasicRepository<Track> public interface ITrackRepository : IBasicRepository<Track>
{ {
Track Find(int artistId, int albumId, int trackNumber); Track Find(string artistId, string albumId, int trackNumber);
List<Track> GetTracks(int artistId); List<Track> GetTracks(string artistId);
List<Track> GetTracks(int artistId, int albumId); List<Track> GetTracks(string artistId, string albumId);
List<Track> GetTracksByFileId(int fileId); List<Track> GetTracksByFileId(int fileId);
List<Track> TracksWithFiles(int artistId); List<Track> TracksWithFiles(string artistId);
PagingSpec<Track> TracksWithoutFiles(PagingSpec<Track> pagingSpec); PagingSpec<Track> TracksWithoutFiles(PagingSpec<Track> pagingSpec);
PagingSpec<Track> TracksWhereCutoffUnmet(PagingSpec<Track> pagingSpec, List<QualitiesBelowCutoff> qualitiesBelowCutoff); PagingSpec<Track> TracksWhereCutoffUnmet(PagingSpec<Track> pagingSpec, List<QualitiesBelowCutoff> qualitiesBelowCutoff);
void SetMonitoredFlat(Track episode, bool monitored); void SetMonitoredFlat(Track episode, bool monitored);
@ -37,24 +37,24 @@ namespace NzbDrone.Core.Music
_logger = logger; _logger = logger;
} }
public Track Find(int artistId, int albumId, int trackNumber) public Track Find(string artistId, string albumId, int trackNumber)
{ {
return Query.Where(s => s.ArtistId == artistId) return Query.Where(s => s.ForeignTrackId == artistId)
.AndWhere(s => s.AlbumId == albumId) .AndWhere(s => s.Album.ForeignAlbumId == albumId)
.AndWhere(s => s.TrackNumber == trackNumber) .AndWhere(s => s.TrackNumber == trackNumber)
.SingleOrDefault(); .SingleOrDefault();
} }
public List<Track> GetTracks(int artistId) public List<Track> GetTracks(string artistId)
{ {
return Query.Where(s => s.ArtistId == artistId).ToList(); return Query.Where(s => s.ForeignTrackId == artistId).ToList();
} }
public List<Track> GetTracks(int artistId, int albumId) public List<Track> GetTracks(string artistId, string albumId)
{ {
return Query.Where(s => s.ArtistId == artistId) return Query.Where(s => s.ForeignTrackId == artistId)
.AndWhere(s => s.AlbumId == albumId) .AndWhere(s => s.Album.ForeignAlbumId == albumId)
.ToList(); .ToList();
} }
@ -63,10 +63,10 @@ namespace NzbDrone.Core.Music
return Query.Where(e => e.TrackFileId == fileId).ToList(); return Query.Where(e => e.TrackFileId == fileId).ToList();
} }
public List<Track> TracksWithFiles(int artistId) public List<Track> TracksWithFiles(string artistId)
{ {
return Query.Join<Track, TrackFile>(JoinType.Inner, e => e.TrackFile, (e, ef) => e.TrackFileId == ef.Id) return Query.Join<Track, TrackFile>(JoinType.Inner, e => e.TrackFile, (e, ef) => e.TrackFileId == ef.Id)
.Where(e => e.ArtistId == artistId); .Where(e => e.ForeignTrackId == artistId);
} }
public PagingSpec<Track> TracksWhereCutoffUnmet(PagingSpec<Track> pagingSpec, List<QualitiesBelowCutoff> qualitiesBelowCutoff) public PagingSpec<Track> TracksWhereCutoffUnmet(PagingSpec<Track> pagingSpec, List<QualitiesBelowCutoff> qualitiesBelowCutoff)

18
src/NzbDrone.Core/Music/TrackService.cs
Unescape View File

@ -15,12 +15,12 @@ namespace NzbDrone.Core.Music
{ {
Track GetTrack(int id); Track GetTrack(int id);
List<Track> GetTracks(IEnumerable<int> ids); List<Track> GetTracks(IEnumerable<int> ids);
Track FindTrack(int artistId, int albumId, int trackNumber); Track FindTrack(string artistId, string albumId, int trackNumber);
Track FindTrackByTitle(int artistId, int albumId, string releaseTitle); Track FindTrackByTitle(string artistId, string albumId, string releaseTitle);
List<Track> GetTracksByArtist(int artistId); List<Track> GetTracksByArtist(string artistId);
List<Track> GetTracksByAlbum(int artistId, int albumId); List<Track> GetTracksByAlbum(string artistId, string albumId);
//List<Track> GetTracksByAlbumTitle(string artistId, string albumTitle); //List<Track> GetTracksByAlbumTitle(string artistId, string albumTitle);
List<Track> TracksWithFiles(int artistId); List<Track> TracksWithFiles(string artistId);
//PagingSpec<Track> TracksWithoutFiles(PagingSpec<Track> pagingSpec); //PagingSpec<Track> TracksWithoutFiles(PagingSpec<Track> pagingSpec);
List<Track> GetTracksByFileId(int trackFileId); List<Track> GetTracksByFileId(int trackFileId);
void UpdateTrack(Track track); void UpdateTrack(Track track);
@ -65,12 +65,12 @@ namespace NzbDrone.Core.Music
return _trackRepository.GetTracks(artistId).ToList(); return _trackRepository.GetTracks(artistId).ToList();
} }
public List<Track> GetTracksByAlbum(int artistId, int albumId) public List<Track> GetTracksByAlbum(string artistId, string albumId)
{ {
return _trackRepository.GetTracks(artistId, albumId); return _trackRepository.GetTracks(artistId, albumId);
} }
public Track FindTrackByTitle(int artistId, int albumId, string releaseTitle) public Track FindTrackByTitle(string artistId, string albumId, string releaseTitle)
{ {
// TODO: can replace this search mechanism with something smarter/faster/better // TODO: can replace this search mechanism with something smarter/faster/better
var normalizedReleaseTitle = Parser.Parser.NormalizeEpisodeTitle(releaseTitle).Replace(".", " "); var normalizedReleaseTitle = Parser.Parser.NormalizeEpisodeTitle(releaseTitle).Replace(".", " ");
@ -96,7 +96,7 @@ namespace NzbDrone.Core.Music
return null; return null;
} }
public List<Track> TracksWithFiles(int artistId) public List<Track> TracksWithFiles(string artistId)
{ {
return _trackRepository.TracksWithFiles(artistId); return _trackRepository.TracksWithFiles(artistId);
} }
@ -154,7 +154,7 @@ namespace NzbDrone.Core.Music
public void HandleAsync(ArtistDeletedEvent message) public void HandleAsync(ArtistDeletedEvent message)
{ {
var tracks = GetTracksByArtist(message.Artist.Id); var tracks = GetTracksByArtist(message.Artist.ForeignArtistId);
_trackRepository.DeleteMany(tracks); _trackRepository.DeleteMany(tracks);
} }

Write Preview
Loading…
Cancel
Save