Bläddra i källkod

make sure series and episode providers are checking for existence of images

Luke Pulverenti 12 år sedan
förälder
incheckning
466d00b021

+ 13 - 10
MediaBrowser.Controller/Providers/TV/RemoteEpisodeProvider.cs

@@ -215,18 +215,21 @@ namespace MediaBrowser.Controller.Providers.TV
 
                 if (doc.HasChildNodes)
                 {
-                    var p = doc.SafeGetString("//filename");
-                    if (p != null)
+                    if (!episode.HasImage(ImageType.Primary))
                     {
-                        if (!Directory.Exists(episode.MetaLocation)) Directory.CreateDirectory(episode.MetaLocation);
-
-                        try
-                        {
-                            episode.PrimaryImagePath = await _providerManager.DownloadAndSaveImage(episode, TVUtils.BannerUrl + p, Path.GetFileName(p), ConfigurationManager.Configuration.SaveLocalMeta, RemoteSeriesProvider.Current.TvDbResourcePool, cancellationToken);
-                        }
-                        catch (HttpException)
+                        var p = doc.SafeGetString("//filename");
+                        if (p != null)
                         {
-                            status = ProviderRefreshStatus.CompletedWithErrors;
+                            if (!Directory.Exists(episode.MetaLocation)) Directory.CreateDirectory(episode.MetaLocation);
+
+                            try
+                            {
+                                episode.PrimaryImagePath = await _providerManager.DownloadAndSaveImage(episode, TVUtils.BannerUrl + p, Path.GetFileName(p), ConfigurationManager.Configuration.SaveLocalMeta, RemoteSeriesProvider.Current.TvDbResourcePool, cancellationToken);
+                            }
+                            catch (HttpException)
+                            {
+                                status = ProviderRefreshStatus.CompletedWithErrors;
+                            }
                         }
                     }
 

+ 1 - 1
MediaBrowser.Controller/Providers/TV/RemoteSeriesProvider.cs

@@ -214,7 +214,7 @@ namespace MediaBrowser.Controller.Providers.TV
                     series.AirTime = doc.SafeGetString("//Airs_Time");
 
                     string n = doc.SafeGetString("//banner");
-                    if (!string.IsNullOrWhiteSpace(n))
+                    if (!string.IsNullOrWhiteSpace(n) && !series.HasImage(ImageType.Banner))
                     {
                         series.SetImage(ImageType.Banner, await _providerManager.DownloadAndSaveImage(series, TVUtils.BannerUrl + n, "banner" + Path.GetExtension(n), ConfigurationManager.Configuration.SaveLocalMeta, TvDbResourcePool, cancellationToken).ConfigureAwait(false));
                     }

+ 3 - 3
MediaBrowser.Server.Implementations/Library/CoreResolutionIgnoreRule.cs

@@ -1,10 +1,10 @@
-using System.IO;
-using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Library;
+using MediaBrowser.Controller.Resolvers;
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
-using MediaBrowser.Controller.Resolvers;
 
 namespace MediaBrowser.Server.Implementations.Library
 {

+ 1 - 1
MediaBrowser.Server.Implementations/Library/Resolvers/LocalTrailerResolver.cs

@@ -1,8 +1,8 @@
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Library;
+using MediaBrowser.Controller.Resolvers;
 using System;
 using System.IO;
-using MediaBrowser.Controller.Resolvers;
 
 namespace MediaBrowser.Server.Implementations.Library.Resolvers
 {