diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2013-04-27 09:05:33 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2013-04-27 09:05:33 -0400 |
| commit | 0bfb755a3895d26144a69eb7f0ea02bba655a15f (patch) | |
| tree | bf8e606c5846e38c57aa320ac0e50a916b8ac19e /MediaBrowser.Controller/Providers | |
| parent | 3eaf25132c65bf287f2206e85a8a1eaa5670ac15 (diff) | |
search hints progress
Diffstat (limited to 'MediaBrowser.Controller/Providers')
| -rw-r--r-- | MediaBrowser.Controller/Providers/MediaInfo/FFProbeAudioInfoProvider.cs | 6 | ||||
| -rw-r--r-- | MediaBrowser.Controller/Providers/Music/LastfmAlbumProvider.cs | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/MediaBrowser.Controller/Providers/MediaInfo/FFProbeAudioInfoProvider.cs b/MediaBrowser.Controller/Providers/MediaInfo/FFProbeAudioInfoProvider.cs index 983286502b..da4250d797 100644 --- a/MediaBrowser.Controller/Providers/MediaInfo/FFProbeAudioInfoProvider.cs +++ b/MediaBrowser.Controller/Providers/MediaInfo/FFProbeAudioInfoProvider.cs @@ -167,7 +167,11 @@ namespace MediaBrowser.Controller.Providers.MediaInfo if (!string.IsNullOrEmpty(val)) { - audio.AddStudios(val.Split(new[] { '/', '|' }, StringSplitOptions.RemoveEmptyEntries)); + var studios = + val.Split(new[] {'/', '|'}, StringSplitOptions.RemoveEmptyEntries) + .Where(i => !string.Equals(i, audio.Artist, StringComparison.OrdinalIgnoreCase) && !string.Equals(i, audio.AlbumArtist, StringComparison.OrdinalIgnoreCase)); + + audio.AddStudios(studios); } } diff --git a/MediaBrowser.Controller/Providers/Music/LastfmAlbumProvider.cs b/MediaBrowser.Controller/Providers/Music/LastfmAlbumProvider.cs index b489991762..df490f5b61 100644 --- a/MediaBrowser.Controller/Providers/Music/LastfmAlbumProvider.cs +++ b/MediaBrowser.Controller/Providers/Music/LastfmAlbumProvider.cs @@ -65,7 +65,7 @@ namespace MediaBrowser.Controller.Providers.Music var folder = (Folder)item; // Get each song, distinct by the combination of AlbumArtist and Album - var songs = folder.Children.OfType<Audio>().DistinctBy(i => (i.AlbumArtist ?? string.Empty) + (i.Album ?? string.Empty), StringComparer.OrdinalIgnoreCase).ToList(); + var songs = folder.RecursiveChildren.OfType<Audio>().DistinctBy(i => (i.AlbumArtist ?? string.Empty) + (i.Album ?? string.Empty), StringComparer.OrdinalIgnoreCase).ToList(); foreach (var song in songs.Where(song => !string.IsNullOrEmpty(song.Album) && !string.IsNullOrEmpty(song.AlbumArtist))) { |