diff options
Diffstat (limited to 'MediaBrowser.Server.Implementations')
| -rw-r--r-- | MediaBrowser.Server.Implementations/Dto/DtoService.cs | 2 | ||||
| -rw-r--r-- | MediaBrowser.Server.Implementations/Providers/ImageSaver.cs | 11 |
2 files changed, 3 insertions, 10 deletions
diff --git a/MediaBrowser.Server.Implementations/Dto/DtoService.cs b/MediaBrowser.Server.Implementations/Dto/DtoService.cs index 153639a00..fea49880e 100644 --- a/MediaBrowser.Server.Implementations/Dto/DtoService.cs +++ b/MediaBrowser.Server.Implementations/Dto/DtoService.cs @@ -1075,7 +1075,7 @@ namespace MediaBrowser.Server.Implementations.Dto double totalPercentPlayed = 0; // Loop through each recursive child - foreach (var child in folder.GetRecursiveChildren(user, i => !i.IsFolder)) + foreach (var child in folder.GetRecursiveChildren(user, i => !i.IsFolder && i.LocationType != LocationType.Virtual)) { var userdata = _userDataRepository.GetUserData(user.Id, child.GetUserDataKey()); diff --git a/MediaBrowser.Server.Implementations/Providers/ImageSaver.cs b/MediaBrowser.Server.Implementations/Providers/ImageSaver.cs index 5827b211c..331dea402 100644 --- a/MediaBrowser.Server.Implementations/Providers/ImageSaver.cs +++ b/MediaBrowser.Server.Implementations/Providers/ImageSaver.cs @@ -408,7 +408,7 @@ namespace MediaBrowser.Server.Implementations.Providers return new[] { Path.Combine(seriesFolder, imageFilename) }; } - + return new[] { Path.Combine(item.MetaLocation, "fanart" + extension) @@ -426,13 +426,6 @@ 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); @@ -460,7 +453,7 @@ namespace MediaBrowser.Server.Implementations.Providers return new[] { GetSavePathForItemInMixedFolder(item, type, string.Empty, extension) }; } - var filename = Path.GetFileNameWithoutExtension(item.Path) + "-poster" + extension; + var filename = "poster" + extension; return new[] { Path.Combine(item.MetaLocation, filename) }; } |