Merge pull request #1027 from qdraw/feature/202301_thumbnail_improvments

Feature/202301 thumbnail improvments
qdraw · Jan 23, 2023 · baca8a0 · baca8a0
2 parents 8dfd371 + 4174684
commit baca8a0
Show file tree

Hide file tree

Showing 5 changed files with 103 additions and 10 deletions.
diff --git a/starsky/starsky.feature.thumbnail/Interfaces/IDatabaseThumbnailGenerationService.cs b/starsky/starsky.feature.thumbnail/Interfaces/IDatabaseThumbnailGenerationService.cs
@@ -1,8 +1,9 @@
+using System;
 using System.Threading.Tasks;
 
 namespace starsky.feature.thumbnail.Interfaces;
 
 public interface IDatabaseThumbnailGenerationService
 {
-	Task StartBackgroundQueue();
+	Task StartBackgroundQueue(DateTime startTime, TimeSpan timeout);
 }
diff --git a/starsky/starsky.feature.thumbnail/Services/DatabaseThumbnailGenerationService.cs b/starsky/starsky.feature.thumbnail/Services/DatabaseThumbnailGenerationService.cs
@@ -43,7 +43,7 @@ public DatabaseThumbnailGenerationService(IQuery query, IWebLogger logger, IWebS
 		_updateStatusGeneratedThumbnailService = updateStatusGeneratedThumbnailService;
 	}
 
-	public async Task StartBackgroundQueue()
+	public async Task StartBackgroundQueue(DateTime startTime, TimeSpan timeout)
 	{
 		var thumbnailItems = await _thumbnailQuery.UnprocessedGeneratedThumbnails();
 		var queryItems = await _query.GetObjectsByFileHashAsync(thumbnailItems.Select(p => p.FileHash).ToList());
@@ -53,15 +53,30 @@ public async Task StartBackgroundQueue()
 			// When the CPU is to high its gives a Error 500
 			await _bgTaskQueue.QueueBackgroundWorkItemAsync(async _ =>
 			{
-				await WorkThumbnailGeneration(chuckedItems.ToList(), queryItems);
+				await FilterAndWorkThumbnailGeneration(startTime, timeout,
+					chuckedItems.ToList(), queryItems);
 			}, "DatabaseThumbnailGenerationService");
 		}
 	}
 
+	internal async Task<IEnumerable<ThumbnailItem>> FilterAndWorkThumbnailGeneration(
+		DateTime startTime, TimeSpan timeout,
+		List<ThumbnailItem> chuckedItems,
+		List<FileIndexItem> queryItems)
+	{
+		if ( startTime.Add(timeout) < DateTime.UtcNow )
+			return await WorkThumbnailGeneration(chuckedItems, queryItems);
+
+		_logger.LogInformation("Cancel job due timeout");
+		return new List<ThumbnailItem>();
+	}
+
 	internal async Task<IEnumerable<ThumbnailItem>> WorkThumbnailGeneration(
 		List<ThumbnailItem> chuckedItems,
 		List<FileIndexItem> fileIndexItems)
 	{
+		var resultData = new List<FileIndexItem>();
+
 		foreach ( var item in chuckedItems )
 		{
 			var fileIndexItem = fileIndexItems.FirstOrDefault(p => p.FileHash == item.FileHash);
@@ -81,9 +96,10 @@ internal async Task<IEnumerable<ThumbnailItem>> WorkThumbnailGeneration(
 			await _updateStatusGeneratedThumbnailService.UpdateStatusAsync(
 				generationResultModels);
 			fileIndexItem.SetLastEdited();
+			resultData.Add(fileIndexItem);
 		}
 
-		var filteredData = fileIndexItems
+		var filteredData = resultData
 			.Where(p => p.Status == FileIndexItem.ExifStatus.Ok).ToList();
 
 		if ( !filteredData.Any() )

diff --git a/starsky/starsky.feature.thumbnail/Services/PeriodicThumbnailScanHostedService.cs b/starsky/starsky.feature.thumbnail/Services/PeriodicThumbnailScanHostedService.cs
@@ -6,6 +6,7 @@
 using Microsoft.Extensions.Hosting;
 using starsky.feature.thumbnail.Interfaces;
 using starsky.foundation.injection;
+using starsky.foundation.platform.Extensions;
 using starsky.foundation.platform.Interfaces;
 using starsky.foundation.platform.Models;
 
@@ -78,10 +79,10 @@ await timer.WaitForNextTickAsync(cancellationToken))
 		{
 			await using var asyncScope = _factory.CreateAsyncScope();
 			var service = asyncScope.ServiceProvider.GetRequiredService<IDatabaseThumbnailGenerationService>();
-			await service.StartBackgroundQueue(); 
+			await service.StartBackgroundQueue(DateTime.UtcNow, Period);
 			_executionCount++;
 			_logger.LogInformation(
-				$"Executed {nameof(PeriodicThumbnailScanHostedService)} - Count: {_executionCount}");
+				$"Executed {nameof(PeriodicThumbnailScanHostedService)} - Count: {_executionCount} ({DateTime.UtcNow:hh:mm:ss})");
 			return true;
 		}
 		catch (Exception ex)

diff --git a/starsky/starskytest/FakeMocks/FakeIDatabaseThumbnailGenerationService.cs b/starsky/starskytest/FakeMocks/FakeIDatabaseThumbnailGenerationService.cs
@@ -1,3 +1,4 @@
+using System;
 using System.Threading.Tasks;
 using starsky.feature.thumbnail.Interfaces;
 
@@ -7,7 +8,7 @@ public class FakeIDatabaseThumbnailGenerationService : IDatabaseThumbnailGenerat
 {
 	public int Count { get; set; }
 
-	public Task StartBackgroundQueue()
+	public Task StartBackgroundQueue(DateTime startTime, TimeSpan timeout)
 	{
 		Count++;
 		return Task.CompletedTask;

diff --git a/.../starskytest/starsky.feature.thumbnail/Services/DatabaseThumbnailGenerationServiceTest.cs b/.../starskytest/starsky.feature.thumbnail/Services/DatabaseThumbnailGenerationServiceTest.cs
@@ -1,3 +1,4 @@
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
@@ -24,8 +25,9 @@ public async Task StartBackgroundQueue_NoContentSoNotFired()
 			bgTaskQueue,
 			new UpdateStatusGeneratedThumbnailService(new FakeIThumbnailQuery())
 		);
-
-		await databaseThumbnailGenerationService.StartBackgroundQueue();
+
+		await databaseThumbnailGenerationService.StartBackgroundQueue(
+			DateTime.UtcNow, TimeSpan.FromMinutes(1));
 
 		Assert.AreEqual(0,bgTaskQueue.Count());
 	}
@@ -47,10 +49,12 @@ public async Task StartBackgroundQueue_OneItemSoTrigger()
 			new UpdateStatusGeneratedThumbnailService(new FakeIThumbnailQuery())
 		);
 
-		await databaseThumbnailGenerationService.StartBackgroundQueue();
+		await databaseThumbnailGenerationService.StartBackgroundQueue(
+			DateTime.UtcNow, TimeSpan.FromMinutes(1));
 
 		Assert.AreEqual(1,bgTaskQueue.Count());
 	}
+
 
 	[TestMethod]
 	public async Task WorkThumbnailGeneration_ZeroItems()
@@ -143,4 +147,74 @@ public async Task WorkThumbnailGeneration_MatchItem()
 		Assert.AreEqual(1,result.Count);
 		Assert.AreEqual(null,result.FirstOrDefault()!.Large);
 	}
+
+	[TestMethod]
+	public async Task FilterWorkThumbnailGeneration_MatchItem()
+	{
+		var bgTaskQueue = new FakeThumbnailBackgroundTaskQueue();
+		var thumbnailQuery = new FakeIThumbnailQuery(new List<ThumbnailItem>
+		{
+			new ThumbnailItem("12",null,null,null,null)
+		});
+
+		var databaseThumbnailGenerationService = new DatabaseThumbnailGenerationService(
+			new FakeIQuery(), new FakeIWebLogger(), new FakeIWebSocketConnectionsService(),
+			new FakeIThumbnailService(),
+			thumbnailQuery,
+			bgTaskQueue,
+			new UpdateStatusGeneratedThumbnailService(new FakeIThumbnailQuery())
+		);
+
+		var result = (await databaseThumbnailGenerationService.FilterAndWorkThumbnailGeneration(
+			new DateTime(2000,01,01), TimeSpan.FromHours(1),  
+			new List<ThumbnailItem>
+			{
+				new ThumbnailItem("23478928939438234",null,null,null,null)
+			}, new List<FileIndexItem>
+			{
+				new FileIndexItem()
+				{
+					FileHash = "23478928939438234",
+					Status = FileIndexItem.ExifStatus.Ok
+				}
+			})).ToList();
+
+		Assert.AreEqual(1,result.Count);
+		Assert.AreEqual(null,result.FirstOrDefault()!.Large);
+	}
+
+
+	[TestMethod]
+	public async Task FilterWorkThumbnailGeneration_Timeout()
+	{
+		var bgTaskQueue = new FakeThumbnailBackgroundTaskQueue();
+		var thumbnailQuery = new FakeIThumbnailQuery(new List<ThumbnailItem>
+		{
+			new ThumbnailItem("12",null,null,null,null)
+		});
+
+		var databaseThumbnailGenerationService = new DatabaseThumbnailGenerationService(
+			new FakeIQuery(), new FakeIWebLogger(), new FakeIWebSocketConnectionsService(),
+			new FakeIThumbnailService(),
+			thumbnailQuery,
+			bgTaskQueue,
+			new UpdateStatusGeneratedThumbnailService(new FakeIThumbnailQuery())
+		);
+
+		var result = (await databaseThumbnailGenerationService.FilterAndWorkThumbnailGeneration(
+			new DateTime(3000,01,01), TimeSpan.FromHours(1),  
+			new List<ThumbnailItem>
+			{
+				new ThumbnailItem("2437998234",null,null,null,null)
+			}, new List<FileIndexItem>
+			{
+				new FileIndexItem()
+				{
+					FileHash = "2437998234",
+					Status = FileIndexItem.ExifStatus.Ok
+				}
+			})).ToList();
+
+		Assert.AreEqual(0,result.Count);
+	}
 }