lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change RemoveImages to array, improve download test

Browse Source
This commit is contained in:
Joe Rogers 2021-11-02 16:16:06 +01:00
parent 7da6bd905a
commit 7fcf01235c
No known key found for this signature in database
GPG Key ID: 0074AD57B8FDBBB4
3 changed files with 35 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MediaBrowser.Controller/Entities/BaseItem.cs
View File

@ -2345,7 +2345,7 @@ namespace MediaBrowser.Controller.Entities
RemoveImages(new List<ItemImageInfo> { image }); RemoveImages(new List<ItemImageInfo> { image });
} }
public void RemoveImages(List<ItemImageInfo> deletedImages) public void RemoveImages(IEnumerable<ItemImageInfo> deletedImages)
{ {
ImageInfos = ImageInfos.Except(deletedImages).ToArray(); ImageInfos = ImageInfos.Except(deletedImages).ToArray();
} }

20
MediaBrowser.Providers/Manager/ItemImageProvider.cs
View File

@ -103,16 +103,16 @@ namespace MediaBrowser.Providers.Manager
ImageRefreshOptions refreshOptions, ImageRefreshOptions refreshOptions,
CancellationToken cancellationToken) CancellationToken cancellationToken)
{ {
List<ItemImageInfo> oldBackdropImages = new List<ItemImageInfo>(); var oldBackdropImages = Array.Empty<ItemImageInfo>();
if (refreshOptions.IsReplacingImage(ImageType.Backdrop)) if (refreshOptions.IsReplacingImage(ImageType.Backdrop))
{ {
oldBackdropImages = item.GetImages(ImageType.Backdrop).ToList(); oldBackdropImages = item.GetImages(ImageType.Backdrop).ToArray();
} }
List<ItemImageInfo> oldScreenshotImages = new List<ItemImageInfo>(); var oldScreenshotImages = Array.Empty<ItemImageInfo>();
if (refreshOptions.IsReplacingImage(ImageType.Screenshot)) if (refreshOptions.IsReplacingImage(ImageType.Screenshot))
{ {
oldScreenshotImages = item.GetImages(ImageType.Screenshot).ToList(); oldScreenshotImages = item.GetImages(ImageType.Screenshot).ToArray();
} }
var result = new RefreshResult { UpdateType = ItemUpdateType.None }; var result = new RefreshResult { UpdateType = ItemUpdateType.None };
@ -121,8 +121,8 @@ namespace MediaBrowser.Providers.Manager
var typeOptions = libraryOptions.GetTypeOptions(typeName) ?? new TypeOptions { Type = typeName }; var typeOptions = libraryOptions.GetTypeOptions(typeName) ?? new TypeOptions { Type = typeName };
// track library limits, adding buffer to allow lazy replacing of current images // track library limits, adding buffer to allow lazy replacing of current images
var backdropLimit = typeOptions.GetLimit(ImageType.Backdrop) + oldBackdropImages.Count; var backdropLimit = typeOptions.GetLimit(ImageType.Backdrop) + oldBackdropImages.Length;
var screenshotLimit = typeOptions.GetLimit(ImageType.Screenshot) + oldScreenshotImages.Count; var screenshotLimit = typeOptions.GetLimit(ImageType.Screenshot) + oldScreenshotImages.Length;
var downloadedImages = new List<ImageType>(); var downloadedImages = new List<ImageType>();
foreach (var provider in providers) foreach (var provider in providers)
@ -140,12 +140,12 @@ namespace MediaBrowser.Providers.Manager
} }
// only delete existing multi-images if new ones were added // only delete existing multi-images if new ones were added
if (oldBackdropImages.Count > 0 && oldBackdropImages.Count < item.GetImages(ImageType.Backdrop).Count()) if (oldBackdropImages.Length > 0 && oldBackdropImages.Length < item.GetImages(ImageType.Backdrop).Count())
{ {
PruneImages(item, oldBackdropImages); PruneImages(item, oldBackdropImages);
} }
if (oldScreenshotImages.Count > 0 && oldScreenshotImages.Count < item.GetImages(ImageType.Screenshot).Count()) if (oldScreenshotImages.Length > 0 && oldScreenshotImages.Length < item.GetImages(ImageType.Screenshot).Count())
{ {
PruneImages(item, oldScreenshotImages); PruneImages(item, oldScreenshotImages);
} }
@ -366,9 +366,9 @@ namespace MediaBrowser.Providers.Manager
return options.IsEnabled(type); return options.IsEnabled(type);
} }
private void PruneImages(BaseItem item, List<ItemImageInfo> images) private void PruneImages(BaseItem item, ItemImageInfo[] images)
{ {
for (var i = 0; i < images.Count; i++) for (var i = 0; i < images.Length; i++)
{ {
var image = images[i]; var image = images[i];

39
tests/Jellyfin.Providers.Tests/Manager/ItemImageProviderTests.cs
View File

@ -409,21 +409,23 @@ namespace Jellyfin.Providers.Tests.Manager
} }
[Theory] [Theory]
[MemberData(nameof(GetImageTypesWithCount))] [InlineData(ImageType.Primary, 0, false)] // singular type only fetches if type is missing from item, no caching
public async void RefreshImages_EmptyNonStubItemPopulatedProviderRemote_DownloadsImages(ImageType imageType, int imageCount) [InlineData(ImageType.Backdrop, 0, false)] // empty item, no cache to check
[InlineData(ImageType.Backdrop, 1, false)] // populated item, cached so no download
[InlineData(ImageType.Backdrop, 1, true)] // populated item, forced to download
public async void RefreshImages_NonStubItemPopulatedProviderRemote_DownloadsIfNecessary(ImageType imageType, int initialImageCount, bool fullRefresh)
{ {
// Has to exist for querying DateModified time on file, results stored but not checked so not populating var targetImageCount = 1;
BaseItem.FileSystem ??= Mock.Of<IFileSystem>();
// Set path and media source manager so images will be downloaded (EnableImageStub will return false) // Set path and media source manager so images will be downloaded (EnableImageStub will return false)
var item = new MovieWithScreenshots var item = GetItemWithImages(imageType, initialImageCount, false);
{ item.Path = "non-empty path";
Path = "non-empty path"
};
BaseItem.MediaSourceManager = Mock.Of<IMediaSourceManager>(); BaseItem.MediaSourceManager = Mock.Of<IMediaSourceManager>();
var libraryOptions = GetLibraryOptions(item, imageType, imageCount); // seek 2 so it won't short-circuit out of downloading when populated
var libraryOptions = GetLibraryOptions(item, imageType, 2);
var content = "Content";
var remoteProvider = new Mock<IRemoteImageProvider>(MockBehavior.Strict); var remoteProvider = new Mock<IRemoteImageProvider>(MockBehavior.Strict);
remoteProvider.Setup(rp => rp.Name).Returns("MockRemoteProvider"); remoteProvider.Setup(rp => rp.Name).Returns("MockRemoteProvider");
remoteProvider.Setup(rp => rp.GetSupportedImages(item)) remoteProvider.Setup(rp => rp.GetSupportedImages(item))
@ -433,13 +435,19 @@ namespace Jellyfin.Providers.Tests.Manager
{ {
ReasonPhrase = url, ReasonPhrase = url,
StatusCode = HttpStatusCode.OK, StatusCode = HttpStatusCode.OK,
Content = new StringContent("Content", Encoding.UTF8, "image/jpeg") Content = new StringContent(content, Encoding.UTF8, "image/jpeg")
}); });
var refreshOptions = new ImageRefreshOptions(null); var refreshOptions = fullRefresh
? new ImageRefreshOptions(null)
{
ImageRefreshMode = MetadataRefreshMode.FullRefresh,
ReplaceAllImages = true
}
: new ImageRefreshOptions(null);
var remoteInfo = new List<RemoteImageInfo>(); var remoteInfo = new List<RemoteImageInfo>();
for (int i = 0; i < imageCount; i++) for (int i = 0; i < targetImageCount; i++)
{ {
remoteInfo.Add(new RemoteImageInfo remoteInfo.Add(new RemoteImageInfo
{ {
@ -457,13 +465,14 @@ namespace Jellyfin.Providers.Tests.Manager
callbackItem.SetImagePath(callbackType, callbackItem.AllowsMultipleImages(callbackType) ? callbackItem.GetImages(callbackType).Count() : 0, new FileSystemMetadata())) callbackItem.SetImagePath(callbackType, callbackItem.AllowsMultipleImages(callbackType) ? callbackItem.GetImages(callbackType).Count() : 0, new FileSystemMetadata()))
.Returns(Task.CompletedTask); .Returns(Task.CompletedTask);
var fileSystem = new Mock<IFileSystem>(); var fileSystem = new Mock<IFileSystem>();
// match reported file size to image content length - condition for skipping already downloaded multi-images
fileSystem.Setup(fs => fs.GetFileInfo(It.IsAny<string>())) fileSystem.Setup(fs => fs.GetFileInfo(It.IsAny<string>()))
.Returns(new FileSystemMetadata { Length = 1 }); .Returns(new FileSystemMetadata { Length = content.Length });
var itemImageProvider = GetItemImageProvider(providerManager.Object, fileSystem); var itemImageProvider = GetItemImageProvider(providerManager.Object, fileSystem);
var result = await itemImageProvider.RefreshImages(item, libraryOptions, new List<IImageProvider> { remoteProvider.Object }, refreshOptions, CancellationToken.None); var result = await itemImageProvider.RefreshImages(item, libraryOptions, new List<IImageProvider> { remoteProvider.Object }, refreshOptions, CancellationToken.None);
Assert.True(result.UpdateType.HasFlag(ItemUpdateType.ImageUpdate)); Assert.Equal(initialImageCount == 0 || fullRefresh, result.UpdateType.HasFlag(ItemUpdateType.ImageUpdate));
Assert.Equal(imageCount, item.GetImages(imageType).Count()); Assert.Equal(targetImageCount, item.GetImages(imageType).Count());
} }
[Theory] [Theory]