Feat: [Experimental] Video support

ImmichFrame.Core.Tests/Logic/Pool/AlbumAssetsPoolTests.cs

@@ -12,22 +12,22 @@ public class AlbumAssetsPoolTests
     private Mock<IApiCache> _mockApiCache;
     private Mock<ImmichApi> _mockImmichApi;
     private Mock<IAccountSettings> _mockAccountSettings;
-    private TestableAlbumAssetsPool _albumAssetsPool;
-
-    private class TestableAlbumAssetsPool(IApiCache apiCache, ImmichApi immichApi, IAccountSettings accountSettings)
-        : AlbumAssetsPool(apiCache, immichApi, accountSettings)
-    {
-        // Expose LoadAssets for testing
-        public Task<IEnumerable<AssetResponseDto>> TestLoadAssets(CancellationToken ct = default) => base.LoadAssets(ct);
-    }
+    private AlbumAssetsPool _albumAssetsPool;
 
     [SetUp]
     public void Setup()
     {
         _mockApiCache = new Mock<IApiCache>();
+
+        _mockApiCache
+            .Setup(m => m.GetOrAddAsync(
+                It.IsAny<string>(),
+                It.IsAny<Func<Task<IEnumerable<AssetResponseDto>>>>()))
+            .Returns<string, Func<Task<IEnumerable<AssetResponseDto>>>>((_, factory) => factory());
+
         _mockImmichApi = new Mock<ImmichApi>("", null);
         _mockAccountSettings = new Mock<IAccountSettings>();
-        _albumAssetsPool = new TestableAlbumAssetsPool(_mockApiCache.Object, _mockImmichApi.Object, _mockAccountSettings.Object);
+        _albumAssetsPool = new AlbumAssetsPool(_mockApiCache.Object, _mockImmichApi.Object, _mockAccountSettings.Object);
 
         _mockAccountSettings.SetupGet(s => s.Albums).Returns(new List<Guid>());
         _mockAccountSettings.SetupGet(s => s.ExcludedAlbums).Returns(new List<Guid>());
@@ -45,7 +45,7 @@ public async Task LoadAssets_ReturnsAssetsPresentIIncludedNotExcludedAlbums()
         var assetA = CreateAsset("A"); // In album1
         var assetB = CreateAsset("B"); // In album1 and excludedAlbum
         var assetC = CreateAsset("C"); // In excludedAlbum only
-        var assetD = CreateAsset("D"); // In album1 only (but not B)
+        var assetD = CreateAsset("D"); // In album1 only
 
         _mockAccountSettings.SetupGet(s => s.Albums).Returns(new List<Guid> { album1Id });
         _mockAccountSettings.SetupGet(s => s.ExcludedAlbums).Returns(new List<Guid> { excludedAlbumId });
@@ -56,7 +56,7 @@ public async Task LoadAssets_ReturnsAssetsPresentIIncludedNotExcludedAlbums()
             .ReturnsAsync(new AlbumResponseDto { Assets = new List<AssetResponseDto> { assetB, assetC } });
 
         // Act
-        var result = (await _albumAssetsPool.TestLoadAssets()).ToList();
+        var result = (await _albumAssetsPool.GetAssets(25)).ToList();
 
         // Assert
         Assert.That(result.Count, Is.EqualTo(2));
@@ -75,7 +75,7 @@ public async Task LoadAssets_NoIncludedAlbums_ReturnsEmpty()
             .ReturnsAsync(new AlbumResponseDto { Assets = new List<AssetResponseDto> { CreateAsset("excluded_only") } });
 
 
-        var result = (await _albumAssetsPool.TestLoadAssets()).ToList();
+        var result = (await _albumAssetsPool.GetAssets(25)).ToList();
         Assert.That(result, Is.Empty);
     }
 
@@ -89,7 +89,7 @@ public async Task LoadAssets_NoExcludedAlbums_ReturnsAlbums()
         _mockImmichApi.Setup(api => api.GetAlbumInfoAsync(album1Id, null, null, It.IsAny<CancellationToken>()))
             .ReturnsAsync(new AlbumResponseDto { Assets = new List<AssetResponseDto> { CreateAsset("A") } });
 
-        var result = (await _albumAssetsPool.TestLoadAssets()).ToList();
+        var result = (await _albumAssetsPool.GetAssets(25)).ToList();
         Assert.That(result.Count, Is.EqualTo(1));
         Assert.That(result.Any(a => a.Id == "A"));
     }
@@ -99,7 +99,7 @@ public async Task LoadAssets_NullAlbums_ReturnsEmpty()
     {
         _mockAccountSettings.SetupGet(s => s.Albums).Returns((List<Guid>)null);
 
-        var result = (await _albumAssetsPool.TestLoadAssets()).ToList();
+        var result = (await _albumAssetsPool.GetAssets(25)).ToList();
         Assert.That(result, Is.Empty);
 
         // the absence of an error, whereas before a null pointer exception would be thrown, indicates success.
@@ -110,7 +110,7 @@ public async Task LoadAssets_NullExcludedAlbums_Succeeds()
     {
         _mockAccountSettings.SetupGet(s => s.ExcludedAlbums).Returns((List<Guid>)null);
 
-        var result = (await _albumAssetsPool.TestLoadAssets()).ToList();
+        var result = (await _albumAssetsPool.GetAssets(25)).ToList();
         Assert.That(result, Is.Empty);
 
         // the absence of an error, whereas before a null pointer exception would be thrown, indicates success.

ImmichFrame.Core.Tests/Logic/Pool/AllAssetsPoolTests.cs

@@ -37,20 +37,36 @@ public void Setup()
                 It.IsAny<Func<Task<AssetStatsResponseDto>>>() // For GetAssetCount
             ))
             .Returns<string, Func<Task<AssetStatsResponseDto>>>(async (key, factory) => await factory());
+
+        _mockApiCache.Setup(c => c.GetOrAddAsync(
+            It.IsAny<string>(),
+            It.IsAny<Func<Task<IEnumerable<AssetResponseDto>>>>()
+        ))
+        .Returns<string, Func<Task<IEnumerable<AssetResponseDto>>>>(async (key, factory) => await factory());
     }
 
-    private List<AssetResponseDto> CreateSampleAssets(int count, string idPrefix = "asset")
+    private List<AssetResponseDto> CreateSampleAssets(int count, string idPrefix, AssetTypeEnum type, int? rating = null)
     {
         return Enumerable.Range(0, count)
-            .Select(i => new AssetResponseDto { Id = $"{idPrefix}{i}", Type = AssetTypeEnum.IMAGE })
+            .Select(i => new AssetResponseDto { Id = $"{idPrefix}{i}", Type = type, ExifInfo = new ExifResponseDto { Rating = rating } })
             .ToList();
     }
 
+    private List<AssetResponseDto> CreateSampleImageAssets(int count, string idPrefix = "asset", int? rating = null)
+    {
+        return CreateSampleAssets(count, idPrefix, AssetTypeEnum.IMAGE, rating);
+    }
+
+    private List<AssetResponseDto> CreateSampleVideoAssets(int count, string idPrefix = "asset", int? rating = null)
+    {
+        return CreateSampleAssets(count, idPrefix, AssetTypeEnum.VIDEO, rating);
+    }
+
     [Test]
-    public async Task GetAssetCount_CallsApiAndCache()
+    public async Task GetAssetCount_CallsApiAndCache_OnlyImages()
     {
         // Arrange
-        var stats = new AssetStatsResponseDto { Images = 100 };
+        var stats = new AssetStatsResponseDto { Images = 100, Videos = 40 };
         _mockImmichApi.Setup(api => api.GetAssetStatisticsAsync(null, false, null, It.IsAny<CancellationToken>())).ReturnsAsync(stats);
 
         // Act
@@ -63,29 +79,81 @@ public async Task GetAssetCount_CallsApiAndCache()
     }
 
     [Test]
-    public async Task GetAssets_CallsSearchRandomAsync_WithCorrectParameters()
+    public async Task GetAssetCount_CallsApiAndCache_WithVideos()
+    {
+        // Arrange
+        var stats = new AssetStatsResponseDto { Images = 100, Videos = 40 };
+        _mockImmichApi.Setup(api => api.GetAssetStatisticsAsync(null, false, null, It.IsAny<CancellationToken>())).ReturnsAsync(stats);
+
+        _mockAccountSettings.SetupGet(s => s.ShowVideos).Returns(true);
+
+        // Act
+        var count = await _allAssetsPool.GetAssetCount();
+
+        // Assert
+        Assert.That(count, Is.EqualTo(140));
+        _mockImmichApi.Verify(api => api.GetAssetStatisticsAsync(null, false, null, It.IsAny<CancellationToken>()), Times.Once);
+        _mockApiCache.Verify(cache => cache.GetOrAddAsync(nameof(AllAssetsPool), It.IsAny<Func<Task<AssetStatsResponseDto>>>()), Times.Once);
+    }
+
+    [Test]
+    public async Task GetAssets_CallsSearchRandomAsync_WithCorrectParameters_OnlyImages()
     {
         // Arrange
-        var requestedCount = 5;
+        var requestedImageCount = 5;
+        var requestedVideoCount = 8;
+        var rating = 3;
         _mockAccountSettings.SetupGet(s => s.ShowArchived).Returns(true);
         _mockAccountSettings.SetupGet(s => s.Rating).Returns(3);
-        var returnedAssets = CreateSampleAssets(requestedCount);
+        var returnedAssets = CreateSampleImageAssets(requestedImageCount, rating: rating);
+        returnedAssets.AddRange(CreateSampleVideoAssets(requestedVideoCount, rating: rating));
         _mockImmichApi.Setup(api => api.SearchRandomAsync(It.IsAny<RandomSearchDto>(), It.IsAny<CancellationToken>()))
-            .ReturnsAsync(returnedAssets);
+            .ReturnsAsync(returnedAssets.Where(a => a.Type == AssetTypeEnum.IMAGE).ToList());
 
         // Act
-        var assets = await _allAssetsPool.GetAssets(requestedCount);
+        var assets = await _allAssetsPool.GetAssets(requestedImageCount);
 
         // Assert
-        Assert.That(assets.Count(), Is.EqualTo(requestedCount));
+        Assert.That(assets.Count(), Is.EqualTo(requestedImageCount));
         _mockImmichApi.Verify(api => api.SearchRandomAsync(
             It.Is<RandomSearchDto>(dto =>
-                dto.Size == requestedCount &&
+                dto.Size == requestedImageCount &&
                 dto.Type == AssetTypeEnum.IMAGE &&
                 dto.WithExif == true &&
                 dto.WithPeople == true &&
                 dto.Visibility == AssetVisibility.Archive && // ShowArchived = true
-                dto.Rating == 3
+                dto.Rating == rating
+            ), It.IsAny<CancellationToken>()), Times.Once);
+    }
+
+    [Test]
+    public async Task GetAssets_CallsSearchRandomAsync_WithCorrectParameters_ImagesAndVideos()
+    {
+        // Arrange
+        var requestedImageCount = 5;
+        var requestedVideoCount = 8;
+        var rating = 3;
+        _mockAccountSettings.SetupGet(s => s.ShowArchived).Returns(true);
+        _mockAccountSettings.SetupGet(s => s.ShowVideos).Returns(true);
+        _mockAccountSettings.SetupGet(s => s.Rating).Returns(3);
+        var returnedAssets = CreateSampleImageAssets(requestedImageCount, rating: rating);
+        returnedAssets.AddRange(CreateSampleVideoAssets(requestedVideoCount, rating: rating));
+        _mockImmichApi.Setup(api => api.SearchRandomAsync(It.IsAny<RandomSearchDto>(), It.IsAny<CancellationToken>()))
+            .ReturnsAsync(returnedAssets.ToList());
+
+        // Act
+        var assets = await _allAssetsPool.GetAssets(requestedImageCount + requestedVideoCount);
+
+        // Assert
+        Assert.That(assets.Count(), Is.EqualTo(requestedImageCount + requestedVideoCount));
+        _mockImmichApi.Verify(api => api.SearchRandomAsync(
+            It.Is<RandomSearchDto>(dto =>
+                dto.Size == (requestedImageCount + requestedVideoCount) &&
+                dto.Type == null &&
+                dto.WithExif == true &&
+                dto.WithPeople == true &&
+                dto.Visibility == AssetVisibility.Archive && // ShowArchived = true
+                dto.Rating == rating
             ), It.IsAny<CancellationToken>()), Times.Once);
     }
 
@@ -108,7 +176,7 @@ public async Task GetAssets_AppliesDateFilters_FromDays()
     public async Task GetAssets_ExcludesAssetsFromExcludedAlbums()
     {
         // Arrange
-        var mainAssets = CreateSampleAssets(3, "main"); // main0, main1, main2
+        var mainAssets = CreateSampleImageAssets(3, "main"); // main0, main1, main2
         var excludedAsset = new AssetResponseDto { Id = "excluded1", Type = AssetTypeEnum.IMAGE };
         var assetsToReturnFromSearch = new List<AssetResponseDto>(mainAssets) { excludedAsset };
 
@@ -136,7 +204,7 @@ public async Task GetAssets_NullExcludedAlbums_Succeeds()
         _mockAccountSettings.SetupGet(s => s.ExcludedAlbums).Returns((List<Guid>)null);
 
         // Create a set of assets to verify that the code was actually exercised (minimize risk of false positives)
-        var allAssets = CreateSampleAssets(5, "asset");
+        var allAssets = CreateSampleImageAssets(5, "asset");
 
         _mockImmichApi.Setup(api => api.SearchRandomAsync(It.IsAny<RandomSearchDto>(), It.IsAny<CancellationToken>()))
             .ReturnsAsync(allAssets);