3.0.5768.1

This commit is contained in:
Luke Pulverenti
2015-10-17 11:05:12 -04:00
parent 317a487229
commit 034c0b95b2
10 changed files with 113 additions and 54 deletions

View File

@@ -465,6 +465,13 @@ namespace MediaBrowser.Providers.Manager
var url = image.Url;
if (EnableImageStub(item, type))
{
SaveImageStub(item, type, url);
result.UpdateType = result.UpdateType | ItemUpdateType.ImageUpdate;
return true;
}
try
{
var response = await provider.GetImageResponse(url, cancellationToken).ConfigureAwait(false);
@@ -488,6 +495,28 @@ namespace MediaBrowser.Providers.Manager
return false;
}
private bool EnableImageStub(IHasImages item, ImageType type)
{
if (item.LocationType == LocationType.Remote || item.LocationType == LocationType.Virtual)
{
return true;
}
return true;
}
private void SaveImageStub(IHasImages item, ImageType imageType, string url)
{
var newIndex = item.AllowsMultipleImages(imageType) ? item.GetImages(imageType).Count() : 0;
item.SetImage(new ItemImageInfo
{
Path = url,
Type = imageType
}, newIndex);
}
private async Task DownloadBackdrops(IHasImages item, ImageType imageType, int limit, IRemoteImageProvider provider, RefreshResult result, IEnumerable<RemoteImageInfo> images, int minWidth, CancellationToken cancellationToken)
{
foreach (var image in images.Where(i => i.Type == imageType))
@@ -504,6 +533,13 @@ namespace MediaBrowser.Providers.Manager
var url = image.Url;
if (EnableImageStub(item, imageType))
{
SaveImageStub(item, imageType, url);
result.UpdateType = result.UpdateType | ItemUpdateType.ImageUpdate;
return;
}
try
{
var response = await provider.GetImageResponse(url, cancellationToken).ConfigureAwait(false);

View File

@@ -20,6 +20,9 @@ using System.Linq;
using System.Threading;
using System.Threading.Tasks;
using CommonIO;
using MediaBrowser.Controller.Channels;
using MediaBrowser.Controller.LiveTv;
using MediaBrowser.Model.Channels;
using MediaBrowser.Providers.TV;
namespace MediaBrowser.Providers.Movies
@@ -59,6 +62,30 @@ namespace MediaBrowser.Providers.Movies
public bool Supports(IHasImages item)
{
//var channelItem = item as IChannelMediaItem;
//if (channelItem != null)
//{
// if (channelItem.ContentType == ChannelMediaContentType.Movie)
// {
// return true;
// }
// if (channelItem.ContentType == ChannelMediaContentType.MovieExtra)
// {
// if (channelItem.ExtraType == ExtraType.Trailer)
// {
// return true;
// }
// }
//}
// Supports images for tv movies
//var tvProgram = item as LiveTvProgram;
//if (tvProgram != null && tvProgram.IsMovie)
//{
// return true;
//}
return item is Movie || item is BoxSet || item is MusicVideo;
}

View File

@@ -71,15 +71,6 @@ namespace MediaBrowser.Providers.Movies
public IEnumerable<ImageType> GetSupportedImages(IHasImages item)
{
if (item is ChannelVideoItem || item is LiveTvProgram)
{
// Too many channel items to allow backdrops here
return new List<ImageType>
{
ImageType.Primary
};
}
return new List<ImageType>
{
ImageType.Primary,