From 28041bf435f97c3442cbcc856799dd7575958352 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Wed, 16 Oct 2013 10:22:26 -0400 Subject: [PATCH] tweaked xbmc image saving --- .../ImageFromMediaLocationProvider.cs | 25 +++---------------- .../Providers/ImageSaver.cs | 20 --------------- 2 files changed, 3 insertions(+), 42 deletions(-) diff --git a/MediaBrowser.Providers/ImageFromMediaLocationProvider.cs b/MediaBrowser.Providers/ImageFromMediaLocationProvider.cs index b44bda7088..cec4089adc 100644 --- a/MediaBrowser.Providers/ImageFromMediaLocationProvider.cs +++ b/MediaBrowser.Providers/ImageFromMediaLocationProvider.cs @@ -243,8 +243,7 @@ namespace MediaBrowser.Providers // Support plex/xbmc convention if (image == null && item is Series) { - image = GetImage(item, args, "show") ?? - GetImage(item, args, "season-all-poster"); + image = GetImage(item, args, "show"); } // Support plex/xbmc convention @@ -306,11 +305,7 @@ namespace MediaBrowser.Providers if (image == null) { // Supprt xbmc conventions - if (item is Series) - { - image = GetImage(item, args, "season-all-banner"); - } - else if (item is Season && item.IndexNumber.HasValue) + if (item is Season && item.IndexNumber.HasValue) { var seasonMarker = item.IndexNumber.Value == 0 ? "-specials" @@ -351,11 +346,7 @@ namespace MediaBrowser.Providers if (image == null) { // Supprt xbmc conventions - if (item is Series) - { - image = GetImage(item, args, "season-all-landscape"); - } - else if (item is Season && item.IndexNumber.HasValue) + if (item is Season && item.IndexNumber.HasValue) { var seasonMarker = item.IndexNumber.Value == 0 ? "-specials" @@ -400,16 +391,6 @@ namespace MediaBrowser.Providers PopulateBackdrops(item, args, backdropFiles, "background", "background-"); PopulateBackdrops(item, args, backdropFiles, "art", "art-"); - if (item is Series) - { - var image = GetImage(item, args, "season-all-fanart"); - - if (image != null) - { - backdropFiles.Add(image.FullName); - } - } - if (item is Season && item.IndexNumber.HasValue) { var seasonMarker = item.IndexNumber.Value == 0 diff --git a/MediaBrowser.Server.Implementations/Providers/ImageSaver.cs b/MediaBrowser.Server.Implementations/Providers/ImageSaver.cs index 0b512839f7..b6a947f12d 100644 --- a/MediaBrowser.Server.Implementations/Providers/ImageSaver.cs +++ b/MediaBrowser.Server.Implementations/Providers/ImageSaver.cs @@ -396,11 +396,6 @@ namespace MediaBrowser.Server.Implementations.Providers if (imageIndex.Value == 0) { - if (item is Series) - { - return new[] { Path.Combine(item.Path, "season-all-fanart" + extension) }; - } - if (item is Season && item.IndexNumber.HasValue) { var seriesFolder = Path.GetDirectoryName(item.Path); @@ -431,11 +426,6 @@ namespace MediaBrowser.Server.Implementations.Providers if (type == ImageType.Primary) { - if (item is Series) - { - return new[] { Path.Combine(item.Path, "season-all-poster" + extension) }; - } - if (item is Season && item.IndexNumber.HasValue) { var seriesFolder = Path.GetDirectoryName(item.Path); @@ -469,11 +459,6 @@ namespace MediaBrowser.Server.Implementations.Providers if (type == ImageType.Banner) { - if (item is Series) - { - return new[] { Path.Combine(item.Path, "season-all-banner" + extension) }; - } - if (item is Season && item.IndexNumber.HasValue) { var seriesFolder = Path.GetDirectoryName(item.Path); @@ -490,11 +475,6 @@ namespace MediaBrowser.Server.Implementations.Providers if (type == ImageType.Thumb) { - if (item is Series) - { - return new[] { Path.Combine(item.Path, "season-all-landscape" + extension) }; - } - if (item is Season && item.IndexNumber.HasValue) { var seriesFolder = Path.GetDirectoryName(item.Path);