github-mirrors/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-04-24 14:08:44 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #7221 from SenorSmartyPants/UserViewThumb

Browse source
This commit is contained in:
Cody Robibero 2022-02-28 20:17:30 -07:00 • committed by GitHub
commit fe99800bde
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Emby.Server.Implementations/Images/BaseDynamicImageProvider.cs
View file

@ -135,7 +135,7 @@ namespace Emby.Server.Implementations.Images
protected virtual IEnumerable<string> GetStripCollageImagePaths(BaseItem primaryItem, IEnumerable<BaseItem> items) protected virtual IEnumerable<string> GetStripCollageImagePaths(BaseItem primaryItem, IEnumerable<BaseItem> items)
{ {
var useBackdrop = primaryItem is CollectionFolder; var useBackdrop = primaryItem is CollectionFolder || primaryItem is UserView;
return items return items
.Select(i => .Select(i =>
{ {

10
Emby.Server.Implementations/Images/DynamicImageProvider.cs
View file

@ -84,16 +84,20 @@ namespace Emby.Server.Implementations.Images
}).GroupBy(x => x.Id) }).GroupBy(x => x.Id)
.Select(x => x.First()); .Select(x => x.First());
List<BaseItem> returnItems;
if (isUsingCollectionStrip) if (isUsingCollectionStrip)
{ {
return items returnItems = items
.Where(i => i.HasImage(ImageType.Primary) || i.HasImage(ImageType.Thumb)) .Where(i => i.HasImage(ImageType.Primary) || i.HasImage(ImageType.Thumb))
.ToList(); .ToList();
returnItems.Shuffle();
return returnItems;
} }
returnItems = items
return items
.Where(i => i.HasImage(ImageType.Primary)) .Where(i => i.HasImage(ImageType.Primary))
.ToList(); .ToList();
returnItems.Shuffle();
return returnItems;
} }
protected override bool Supports(BaseItem item) protected override bool Supports(BaseItem item)