From e96cf084093abc0487265ed91a4cbfa8aaf2f42e Mon Sep 17 00:00:00 2001 From: Joseph Milazzo Date: Tue, 20 Jun 2017 08:03:13 -0500 Subject: [PATCH] Back to a stable build. Fixedtrackrepo.findtracks --- src/NzbDrone.Common/Cloud/SonarrCloudRequestBuilder.cs | 2 +- src/NzbDrone.Core/MediaFiles/DiskScanService.cs | 4 ++-- src/NzbDrone.Core/MediaFiles/MediaFileRepository.cs | 2 +- src/NzbDrone.Core/MediaFiles/MediaFileService.cs | 4 ++-- src/NzbDrone.Core/MediaFiles/MediaFileTableCleanupService.cs | 4 ++-- .../MediaFiles/MediaInfo/UpdateMediaInfoService.cs | 2 +- src/NzbDrone.Core/MediaFiles/TrackFile.cs | 3 ++- .../MediaFiles/TrackImport/ImportApprovedTracks.cs | 2 +- src/NzbDrone.Core/Music/RefreshTrackService.cs | 2 +- src/NzbDrone.Core/Music/TrackRepository.cs | 2 +- 10 files changed, 14 insertions(+), 13 deletions(-) diff --git a/src/NzbDrone.Common/Cloud/SonarrCloudRequestBuilder.cs b/src/NzbDrone.Common/Cloud/SonarrCloudRequestBuilder.cs index ca8385242..698d3b4a4 100644 --- a/src/NzbDrone.Common/Cloud/SonarrCloudRequestBuilder.cs +++ b/src/NzbDrone.Common/Cloud/SonarrCloudRequestBuilder.cs @@ -20,7 +20,7 @@ namespace NzbDrone.Common.Cloud //Search = new HttpRequestBuilder("https://api.spotify.com/{version}/{route}/") // TODO: maybe use {version} // .SetSegment("version", "v1") // .CreateFactory(); - Search = new HttpRequestBuilder("http://localhost:5000/{route}/") // TODO: maybe use {version} + Search = new HttpRequestBuilder("http://localhost:3000/{route}/") // TODO: maybe use {version} .CreateFactory(); InternalSearch = new HttpRequestBuilder("https://itunes.apple.com/WebObjects/MZStore.woa/wa/{route}") //viewArtist or search diff --git a/src/NzbDrone.Core/MediaFiles/DiskScanService.cs b/src/NzbDrone.Core/MediaFiles/DiskScanService.cs index 773b94519..db2f389f4 100644 --- a/src/NzbDrone.Core/MediaFiles/DiskScanService.cs +++ b/src/NzbDrone.Core/MediaFiles/DiskScanService.cs @@ -87,7 +87,7 @@ namespace NzbDrone.Core.MediaFiles return; } - _logger.ProgressInfo("Scanning disk for {0}", artist.ArtistName); + _logger.ProgressInfo("Scanning disk for {0}", artist.Name); if (!_diskProvider.FolderExists(artist.Path)) { @@ -136,7 +136,7 @@ namespace NzbDrone.Core.MediaFiles private void CompletedScanning(Artist artist) { - _logger.Info("Completed scanning disk for {0}", artist.ArtistName); + _logger.Info("Completed scanning disk for {0}", artist.Name); _eventAggregator.PublishEvent(new ArtistScannedEvent(artist)); } diff --git a/src/NzbDrone.Core/MediaFiles/MediaFileRepository.cs b/src/NzbDrone.Core/MediaFiles/MediaFileRepository.cs index 9cd818dcb..4337b0073 100644 --- a/src/NzbDrone.Core/MediaFiles/MediaFileRepository.cs +++ b/src/NzbDrone.Core/MediaFiles/MediaFileRepository.cs @@ -27,7 +27,7 @@ namespace NzbDrone.Core.MediaFiles public List GetFilesByArtist(string artistId) { - return Query.Where(c => c.SpotifyTrackId == artistId).ToList(); + return Query.Where(c => c.ForeignTrackId == artistId).ToList(); } } } \ No newline at end of file diff --git a/src/NzbDrone.Core/MediaFiles/MediaFileService.cs b/src/NzbDrone.Core/MediaFiles/MediaFileService.cs index 5c61ce535..a03d3b0a4 100644 --- a/src/NzbDrone.Core/MediaFiles/MediaFileService.cs +++ b/src/NzbDrone.Core/MediaFiles/MediaFileService.cs @@ -69,7 +69,7 @@ namespace NzbDrone.Core.MediaFiles public List FilterExistingFiles(List files, Artist artist) { - var artistFiles = GetFilesByArtist(artist.SpotifyId).Select(f => Path.Combine(artist.Path, f.RelativePath)).ToList(); + var artistFiles = GetFilesByArtist(artist.ForeignArtistId).Select(f => Path.Combine(artist.Path, f.RelativePath)).ToList(); if (!artistFiles.Any()) return files; @@ -89,7 +89,7 @@ namespace NzbDrone.Core.MediaFiles public void HandleAsync(ArtistDeletedEvent message) { - var files = GetFilesByArtist(message.Artist.SpotifyId); + var files = GetFilesByArtist(message.Artist.ForeignArtistId); _mediaFileRepository.DeleteMany(files); } diff --git a/src/NzbDrone.Core/MediaFiles/MediaFileTableCleanupService.cs b/src/NzbDrone.Core/MediaFiles/MediaFileTableCleanupService.cs index a46844f54..69b3b9f0d 100644 --- a/src/NzbDrone.Core/MediaFiles/MediaFileTableCleanupService.cs +++ b/src/NzbDrone.Core/MediaFiles/MediaFileTableCleanupService.cs @@ -31,8 +31,8 @@ namespace NzbDrone.Core.MediaFiles public void Clean(Artist artist, List filesOnDisk) { - var artistFiles = _mediaFileService.GetFilesByArtist(artist.SpotifyId); - var tracks = _trackService.GetTracksByArtist(artist.SpotifyId); + var artistFiles = _mediaFileService.GetFilesByArtist(artist.ForeignArtistId); + var tracks = _trackService.GetTracksByArtist(artist.ForeignArtistId); var filesOnDiskKeys = new HashSet(filesOnDisk, PathEqualityComparer.Instance); diff --git a/src/NzbDrone.Core/MediaFiles/MediaInfo/UpdateMediaInfoService.cs b/src/NzbDrone.Core/MediaFiles/MediaInfo/UpdateMediaInfoService.cs index 60cf5bf01..a45ec726b 100644 --- a/src/NzbDrone.Core/MediaFiles/MediaInfo/UpdateMediaInfoService.cs +++ b/src/NzbDrone.Core/MediaFiles/MediaInfo/UpdateMediaInfoService.cs @@ -65,7 +65,7 @@ namespace NzbDrone.Core.MediaFiles.MediaInfo return; } - var allMediaFiles = _mediaFileService.GetFilesByArtist(message.Artist.SpotifyId); + var allMediaFiles = _mediaFileService.GetFilesByArtist(message.Artist.ForeignArtistId); var filteredMediaFiles = allMediaFiles.Where(c => c.MediaInfo == null || c.MediaInfo.SchemaRevision < CURRENT_MEDIA_INFO_SCHEMA_REVISION).ToList(); UpdateMediaInfo(message.Artist, filteredMediaFiles); diff --git a/src/NzbDrone.Core/MediaFiles/TrackFile.cs b/src/NzbDrone.Core/MediaFiles/TrackFile.cs index e08555b77..ecc51c7be 100644 --- a/src/NzbDrone.Core/MediaFiles/TrackFile.cs +++ b/src/NzbDrone.Core/MediaFiles/TrackFile.cs @@ -12,7 +12,8 @@ namespace NzbDrone.Core.MediaFiles { public class TrackFile : ModelBase { - public string SpotifyTrackId { get; set; } + public string ForeignTrackId { get; set; } + public string ForeignArtistId { get; set; } public int AlbumId { get; set; } public string RelativePath { get; set; } public string Path { get; set; } diff --git a/src/NzbDrone.Core/MediaFiles/TrackImport/ImportApprovedTracks.cs b/src/NzbDrone.Core/MediaFiles/TrackImport/ImportApprovedTracks.cs index 09abac393..a6ff0b9be 100644 --- a/src/NzbDrone.Core/MediaFiles/TrackImport/ImportApprovedTracks.cs +++ b/src/NzbDrone.Core/MediaFiles/TrackImport/ImportApprovedTracks.cs @@ -73,7 +73,7 @@ namespace NzbDrone.Core.MediaFiles.TrackImport var trackFile = new TrackFile(); trackFile.DateAdded = DateTime.UtcNow; - trackFile.SpotifyTrackId = localTrack.Artist.SpotifyId; + trackFile.ForeignArtistId = localTrack.Artist.ForeignArtistId; trackFile.Path = localTrack.Path.CleanFilePath(); trackFile.Size = _diskProvider.GetFileSize(localTrack.Path); trackFile.Quality = localTrack.Quality; diff --git a/src/NzbDrone.Core/Music/RefreshTrackService.cs b/src/NzbDrone.Core/Music/RefreshTrackService.cs index 77592e4f3..58754cf44 100644 --- a/src/NzbDrone.Core/Music/RefreshTrackService.cs +++ b/src/NzbDrone.Core/Music/RefreshTrackService.cs @@ -33,7 +33,7 @@ namespace NzbDrone.Core.Music var successCount = 0; var failCount = 0; - var existingTracks = _trackService.GetTracksByAlbum(album.ArtistId, album.Id); + var existingTracks = _trackService.GetTracksByAlbum(album.ForeignAlbumId, album.ForeignAlbumId); //var albums = artist.Albums; var updateList = new List(); diff --git a/src/NzbDrone.Core/Music/TrackRepository.cs b/src/NzbDrone.Core/Music/TrackRepository.cs index 4657b3dad..0572ec800 100644 --- a/src/NzbDrone.Core/Music/TrackRepository.cs +++ b/src/NzbDrone.Core/Music/TrackRepository.cs @@ -48,7 +48,7 @@ namespace NzbDrone.Core.Music public List GetTracks(string artistId) { - return Query.Where(s => s.ForeignTrackId == artistId).ToList(); + return Query.Join(JoinType.Inner, s => s.Artist, (track, artist) => track.ArtistId == artist.Id).ToList(); } public List GetTracks(string artistId, string albumId)