From e88eacab090b279d2847285ec09f30c4885fdc2a Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Mon, 29 Apr 2013 10:16:57 -0400 Subject: restored image checks in fan art album provider --- .../Providers/Music/FanArtAlbumProvider.cs | 28 +++++++++++++++++----- 1 file changed, 22 insertions(+), 6 deletions(-) (limited to 'MediaBrowser.Controller') diff --git a/MediaBrowser.Controller/Providers/Music/FanArtAlbumProvider.cs b/MediaBrowser.Controller/Providers/Music/FanArtAlbumProvider.cs index ac9d0ae54..c814c6bbf 100644 --- a/MediaBrowser.Controller/Providers/Music/FanArtAlbumProvider.cs +++ b/MediaBrowser.Controller/Providers/Music/FanArtAlbumProvider.cs @@ -31,16 +31,32 @@ namespace MediaBrowser.Controller.Providers.Music return item is MusicAlbum; } - public override async Task FetchAsync(BaseItem item, bool force, CancellationToken cancellationToken) + /// + /// Needses the refresh internal. + /// + /// The item. + /// The provider info. + /// true if XXXX, false otherwise + protected override bool NeedsRefreshInternal(BaseItem item, BaseProviderInfo providerInfo) { - var mbid = item.GetProviderId(MetadataProviders.Musicbrainz); - if (mbid == null) + if (string.IsNullOrEmpty(item.GetProviderId(MetadataProviders.Musicbrainz))) + { + return false; + } + + if (!ConfigurationManager.Configuration.DownloadMusicAlbumImages.Disc && + !ConfigurationManager.Configuration.DownloadMusicAlbumImages.Primary) { - Logger.Warn("No Musicbrainz id associated with album {0}", item.Name); - SetLastRefreshed(item, DateTime.UtcNow); - return true; + return false; } + return base.NeedsRefreshInternal(item, providerInfo); + } + + public override async Task FetchAsync(BaseItem item, bool force, CancellationToken cancellationToken) + { + var mbid = item.GetProviderId(MetadataProviders.Musicbrainz); + cancellationToken.ThrowIfCancellationRequested(); var url = string.Format("http://api.fanart.tv/webservice/album/{0}/{1}/xml/all/1/1", APIKey, item.GetProviderId(MetadataProviders.Musicbrainz)); -- cgit v1.2.3