don't keep retrying season images over and over when they come back 404

This commit is contained in:
Luke Pulverenti 2013-12-08 13:38:32 -05:00
parent fe42a6d1d9
commit 803de20bb9
6 changed files with 31 additions and 15 deletions

View File

@ -325,6 +325,7 @@ namespace MediaBrowser.Providers.Movies
{
continue;
}
break;
}
}
}

View File

@ -203,6 +203,7 @@ namespace MediaBrowser.Providers.Music
{
continue;
}
break;
}
}
}

View File

@ -328,6 +328,7 @@ namespace MediaBrowser.Providers.Music
{
continue;
}
break;
}
}
}

View File

@ -143,6 +143,7 @@ namespace MediaBrowser.Providers.TV
{
continue;
}
break;
}
}
}

View File

@ -264,6 +264,7 @@ namespace MediaBrowser.Providers.TV
{
continue;
}
break;
}
}
}

View File

@ -1,4 +1,5 @@
using MediaBrowser.Common.IO;
using System.Net;
using MediaBrowser.Common.IO;
using MediaBrowser.Controller.Configuration;
using MediaBrowser.Controller.Entities;
using MediaBrowser.Controller.Entities.TV;
@ -6,6 +7,7 @@ using MediaBrowser.Controller.Library;
using MediaBrowser.Controller.Providers;
using MediaBrowser.Model.Entities;
using MediaBrowser.Model.Logging;
using MediaBrowser.Model.Net;
using MediaBrowser.Model.Providers;
using System;
using System.Collections.Generic;
@ -159,24 +161,12 @@ namespace MediaBrowser.Providers.TV
{
if (!item.HasImage(ImageType.Primary))
{
var image = images.FirstOrDefault(i => i.Type == ImageType.Primary);
if (image != null)
{
await _providerManager.SaveImage(item, image.Url, TvdbSeriesProvider.Current.TvDbResourcePool, ImageType.Primary, null, cancellationToken)
.ConfigureAwait(false);
}
await SaveImage(item, images, ImageType.Primary, cancellationToken).ConfigureAwait(false);
}
if (ConfigurationManager.Configuration.DownloadSeasonImages.Banner && !item.HasImage(ImageType.Banner))
{
var image = images.FirstOrDefault(i => i.Type == ImageType.Banner);
if (image != null)
{
await _providerManager.SaveImage(item, image.Url, TvdbSeriesProvider.Current.TvDbResourcePool, ImageType.Banner, null, cancellationToken)
.ConfigureAwait(false);
}
await SaveImage(item, images, ImageType.Banner, cancellationToken).ConfigureAwait(false);
}
if (ConfigurationManager.Configuration.DownloadSeasonImages.Backdrops && item.BackdropImagePaths.Count < backdropLimit)
@ -196,5 +186,26 @@ namespace MediaBrowser.Providers.TV
}
}
}
private async Task SaveImage(BaseItem item, List<RemoteImageInfo> images, ImageType type, CancellationToken cancellationToken)
{
foreach (var image in images.Where(i => i.Type == type))
{
try
{
await _providerManager.SaveImage(item, image.Url, TvdbSeriesProvider.Current.TvDbResourcePool, type, null, cancellationToken).ConfigureAwait(false);
break;
}
catch (HttpException ex)
{
// Sometimes fanart has bad url's in their xml
if (ex.StatusCode.HasValue && ex.StatusCode.Value == HttpStatusCode.NotFound)
{
continue;
}
break;
}
}
}
}
}