diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2013-10-17 11:35:39 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2013-10-17 11:35:39 -0400 |
| commit | 005b6c92aac4ee618fc1efa86ec5f1d9687b531e (patch) | |
| tree | 00812c2bcc8f68d0b54c5288da854594784d1184 | |
| parent | 6d68612e47403fc8ded1066675f2cdda2708b473 (diff) | |
xbmc image fixes
| -rw-r--r-- | MediaBrowser.Providers/TV/SeriesPostScanTask.cs | 4 | ||||
| -rw-r--r-- | MediaBrowser.Server.Implementations/Providers/ImageSaver.cs | 13 |
2 files changed, 12 insertions, 5 deletions
diff --git a/MediaBrowser.Providers/TV/SeriesPostScanTask.cs b/MediaBrowser.Providers/TV/SeriesPostScanTask.cs index ef9862294..b17ff6268 100644 --- a/MediaBrowser.Providers/TV/SeriesPostScanTask.cs +++ b/MediaBrowser.Providers/TV/SeriesPostScanTask.cs @@ -160,7 +160,7 @@ namespace MediaBrowser.Providers.TV } } - var anyRemoved = await RemoveObsoleteMissingEpsiodes(series, existingEpisodes, cancellationToken).ConfigureAwait(false); + var anyRemoved = await RemoveObsoleteMissingEpisodes(series, existingEpisodes, cancellationToken).ConfigureAwait(false); if (hasChanges || anyRemoved) { @@ -236,7 +236,7 @@ namespace MediaBrowser.Providers.TV /// <summary> /// Removes the virtual entry after a corresponding physical version has been added /// </summary> - private async Task<bool> RemoveObsoleteMissingEpsiodes(Series series, List<Episode> existingEpisodes, CancellationToken cancellationToken) + private async Task<bool> RemoveObsoleteMissingEpisodes(Series series, List<Episode> existingEpisodes, CancellationToken cancellationToken) { var physicalEpisodes = existingEpisodes .Where(i => i.LocationType != LocationType.Virtual) diff --git a/MediaBrowser.Server.Implementations/Providers/ImageSaver.cs b/MediaBrowser.Server.Implementations/Providers/ImageSaver.cs index b6a947f12..5827b211c 100644 --- a/MediaBrowser.Server.Implementations/Providers/ImageSaver.cs +++ b/MediaBrowser.Server.Implementations/Providers/ImageSaver.cs @@ -197,7 +197,7 @@ namespace MediaBrowser.Server.Implementations.Providers { if (_config.Configuration.ImageSavingConvention == ImageSavingConvention.Legacy || !saveLocally) { - return new[] { GetLegacySavePath(item, type, imageIndex, mimeType, saveLocally) }; + return new[] { GetStandardSavePath(item, type, imageIndex, mimeType, saveLocally) }; } return GetCompatibleSavePaths(item, type, imageIndex, mimeType); @@ -303,7 +303,7 @@ namespace MediaBrowser.Server.Implementations.Providers /// or /// imageIndex /// </exception> - private string GetLegacySavePath(BaseItem item, ImageType type, int? imageIndex, string mimeType, bool saveLocally) + private string GetStandardSavePath(BaseItem item, ImageType type, int? imageIndex, string mimeType, bool saveLocally) { string filename; @@ -426,6 +426,13 @@ namespace MediaBrowser.Server.Implementations.Providers if (type == ImageType.Primary) { + if (item is Series) + { + var imageFilename = "poster" + extension; + + return new[] { Path.Combine(item.Path, imageFilename) }; + } + if (item is Season && item.IndexNumber.HasValue) { var seriesFolder = Path.GetDirectoryName(item.Path); @@ -490,7 +497,7 @@ namespace MediaBrowser.Server.Implementations.Providers } // All other paths are the same - return new[] { GetLegacySavePath(item, type, imageIndex, mimeType, true) }; + return new[] { GetStandardSavePath(item, type, imageIndex, mimeType, true) }; } /// <summary> |