mirror/Lidarr
1
0
Fork 0
mirror of https://github.com/lidarr/Lidarr synced 2025-02-20 13:06:57 +00:00
Code Issues Releases Wiki Activity

Back to a stable build. Fixedtrackrepo.findtracks

Browse source
This commit is contained in:
Joseph Milazzo 2017-06-20 08:03:13 -05:00
parent b4279a455e
commit e96cf08409
10 changed files with 14 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/NzbDrone.Common/Cloud/SonarrCloudRequestBuilder.cs
View file

@ -20,7 +20,7 @@ public LidarrCloudRequestBuilder()
//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

4
src/NzbDrone.Core/MediaFiles/DiskScanService.cs
View file

@ -87,7 +87,7 @@ public void Scan(Artist artist)
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 @@ private void CleanMediaFiles(Artist artist, List<string> mediaFileList)
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));
}

2
src/NzbDrone.Core/MediaFiles/MediaFileRepository.cs
View file

@ -27,7 +27,7 @@ public List<TrackFile> GetFilesWithoutMediaInfo()
public List<TrackFile> GetFilesByArtist(string artistId)
{
return Query.Where(c => c.SpotifyTrackId == artistId).ToList();
return Query.Where(c => c.ForeignTrackId == artistId).ToList();
}
}
}

4
src/NzbDrone.Core/MediaFiles/MediaFileService.cs
View file

@ -69,7 +69,7 @@ public List<TrackFile> GetFilesWithoutMediaInfo()
public List<string> FilterExistingFiles(List<string> 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 @@ public List<TrackFile> Get(IEnumerable<int> ids)
public void HandleAsync(ArtistDeletedEvent message)
{
var files = GetFilesByArtist(message.Artist.SpotifyId);
var files = GetFilesByArtist(message.Artist.ForeignArtistId);
_mediaFileRepository.DeleteMany(files);
}

4
src/NzbDrone.Core/MediaFiles/MediaFileTableCleanupService.cs
View file

@ -31,8 +31,8 @@ public MediaFileTableCleanupService(IMediaFileService mediaFileService,
public void Clean(Artist artist, List<string> 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<string>(filesOnDisk, PathEqualityComparer.Instance);

2
src/NzbDrone.Core/MediaFiles/MediaInfo/UpdateMediaInfoService.cs
View file

@ -65,7 +65,7 @@ public void Handle(ArtistScannedEvent message)
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);

3
src/NzbDrone.Core/MediaFiles/TrackFile.cs
View file

@ -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; }

2
src/NzbDrone.Core/MediaFiles/TrackImport/ImportApprovedTracks.cs
View file

@ -73,7 +73,7 @@ public List<ImportResult> Import(List<ImportDecision> decisions, bool newDownloa
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;

2
src/NzbDrone.Core/Music/RefreshTrackService.cs
View file

@ -33,7 +33,7 @@ public void RefreshTrackInfo(Album album, IEnumerable<Track> remoteTracks)
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<Track>();

2
src/NzbDrone.Core/Music/TrackRepository.cs
View file

@ -48,7 +48,7 @@ public Track Find(string artistId, string albumId, int trackNumber)
public List<Track> GetTracks(string artistId)
{
return Query.Where(s => s.ForeignTrackId == artistId).ToList();
return Query.Join<Track, Artist>(JoinType.Inner, s => s.Artist, (track, artist) => track.ArtistId == artist.Id).ToList();
}
public List<Track> GetTracks(string artistId, string albumId)