cache thumbnails

AobaCore/Models/MediaThumbnail.cs

@@ -0,0 +1,19 @@
+using MongoDB.Bson;
+using MongoDB.Bson.Serialization.Attributes;
+
+namespace AobaCore.Models;
+
+public record MediaThumbnail
+{
+	[BsonId]
+	public required ObjectId Id { get; init; }
+	public Dictionary<ThumbnailSize, ObjectId> Sizes { get; set; } = [];
+}
+
+public enum ThumbnailSize
+{
+	Small = 128,
+	Medium = 256,
+	Large = 512,
+	ExtraLarge = 1024
+}

AobaCore/Models/MeidaThumbnail.cs

@@ -1,5 +0,0 @@
-namespace AobaCore.Models;
-
-internal class MeidaThumbnail
-{
-}

AobaCore/Services/AobaIndexCreationService.cs

@@ -2,6 +2,9 @@
 
 using Microsoft.Extensions.Hosting;
 
+using MongoDB.Bson;
+using MongoDB.Bson.Serialization;
+using MongoDB.Bson.Serialization.Serializers;
 using MongoDB.Driver;
 
 namespace AobaCore.Services;
@@ -12,6 +15,7 @@ public class AobaIndexCreationService(IMongoDatabase db): BackgroundService
 
 	protected override async Task ExecuteAsync(CancellationToken stoppingToken)
 	{
+		BsonSerializer.RegisterSerializer(new EnumSerializer<ThumbnailSize>(BsonType.String));
 		var textKeys = Builders<Media>.IndexKeys
 			.Text(m => m.Filename);
 

AobaCore/Services/ThumbnailService.cs

@@ -1,5 +1,7 @@
 using AobaCore.Models;
 
+using MaybeError.Errors;
+
 using MongoDB.Bson;
 using MongoDB.Driver;
 using MongoDB.Driver.GridFS;
@@ -10,6 +12,7 @@ using SixLabors.ImageSharp.Processing;
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Net.Http.Headers;
 using System.Text;
 using System.Threading.Tasks;
 
@@ -17,30 +20,83 @@ namespace AobaCore.Services;
 public class ThumbnailService(IMongoDatabase db, AobaService aobaService)
 {
 	private readonly GridFSBucket _gridfs = new GridFSBucket(db);
-	private readonly IMongoCollection<MeidaThumbnail> _thumbnails = db.GetCollection<MeidaThumbnail>("thumbs");
+	private readonly IMongoCollection<MediaThumbnail> _thumbnails = db.GetCollection<MediaThumbnail>("thumbs");
 
-	public async Task<Stream?> GetThumbnailAsync(ObjectId id, CancellationToken cancellationToken = default)
+
+	/// <summary>
+	/// 
+	/// </summary>
+	/// <param name="id">File id</param>
+	/// <param name="size"></param>
+	/// <param name="cancellationToken"></param>
+	/// <returns></returns>
+	public async Task<Maybe<Stream>> GetOrCreateThumbnailAsync(ObjectId id, ThumbnailSize size, CancellationToken cancellationToken = default)
 	{
-		var media = await aobaService.GetMediaAsync(id);
+		var existingThumb = await GetThumbnailAsync(id, size, cancellationToken);
+		if (existingThumb != null)
+			return existingThumb;
+
+		var media = await aobaService.GetMediaFromFileAsync(id, cancellationToken);
+
 		if (media == null)
-			return null;
+			return new Error("Media does not exist");
-		if (media.MediaType != MediaType.Image)
+
-			return null;
+		try
-		using var file = await _gridfs.OpenDownloadStreamAsync(media.MediaId, new GridFSDownloadOptions { Seekable = true });
-		return await GenerateThumbnailAsync(file, cancellationToken);
-	}
-	public async Task<Stream?> GetThumbnailFromFileAsync(ObjectId id, CancellationToken cancellationToken = default)
 		{
-		var media = await aobaService.GetMediaFromFileAsync(id);
+
-		if (media == null)
+			var mediaData = await _gridfs.OpenDownloadStreamAsync(media.MediaId, new GridFSDownloadOptions { Seekable = true }, cancellationToken);
-			return null;
+			var thumb = await GenerateThumbnailAsync(mediaData, size, media.MediaType, media.Ext, cancellationToken);
-		if (media.MediaType != MediaType.Image)
+
-			return null;
+			if (thumb.HasError)
-		using var file = await _gridfs.OpenDownloadStreamAsync(media.MediaId, new GridFSDownloadOptions { Seekable = true });
+				return thumb.Error;
-		return await GenerateThumbnailAsync(file, cancellationToken);
+			cancellationToken.ThrowIfCancellationRequested();
+
+			var thumbId = await _gridfs.UploadFromStreamAsync($"{media.Filename}.webp", thumb, cancellationToken: CancellationToken.None);
+			var update = Builders<MediaThumbnail>.Update.Set(t => t.Sizes[size], thumbId);
+			await _thumbnails.UpdateOneAsync(t => t.Id == id, update, cancellationToken: CancellationToken.None);
+			thumb.Value.Position = 0;
+			return thumb;
+		} catch (Exception ex) {
+			return ex;
 		}
 		
-	public async Task<Stream> GenerateThumbnailAsync(Stream stream, CancellationToken cancellationToken = default) 
+
+		
+	}
+
+	/// <summary>
+	/// 
+	/// </summary>
+	/// <param name="id">File Id</param>
+	/// <param name="size"></param>
+	/// <param name="cancellationToken"></param>
+	/// <returns></returns>
+	public async Task<Stream?> GetThumbnailAsync(ObjectId id, ThumbnailSize size, CancellationToken cancellationToken = default)
+	{
+		var thumb = await _thumbnails.Find(t => t.Id == id).FirstOrDefaultAsync(cancellationToken);
+		if (thumb == null) 
+			return null;
+
+		if (!thumb.Sizes.TryGetValue(size, out var tid))
+			return null;
+
+		var thumbData = await _gridfs.OpenDownloadStreamAsync(tid, cancellationToken: cancellationToken);
+		return thumbData;
+	}
+
+
+	public async Task<Maybe<Stream>> GenerateThumbnailAsync(Stream stream, ThumbnailSize size, MediaType type, string ext, CancellationToken cancellationToken = default)
+	{
+		return type switch
+		{
+			MediaType.Image => await GenerateImageThumbnailAsync(stream, size, cancellationToken),
+			MediaType.Video => await GenerateVideoThumbnailAsync(stream, size, cancellationToken),
+			MediaType.Text or MediaType.Code => await GenerateDocumentThumbnailAsync(stream, size, cancellationToken),
+			_ => new Error($"No Thumbnail for {type}"),
+		};
+	}
+
+	public async Task<Stream> GenerateImageThumbnailAsync(Stream stream, ThumbnailSize size, CancellationToken cancellationToken = default) 
 	{
 		var img = Image.Load(stream);
 		img.Mutate(o =>
@@ -57,4 +113,14 @@ public class ThumbnailService(IMongoDatabase db, AobaService aobaService)
 		result.Position = 0;
 		return result;
 	}
+
+	public async Task<Maybe<Stream>> GenerateVideoThumbnailAsync(Stream data, ThumbnailSize size, CancellationToken cancellationToken = default)
+	{
+		return new NotImplementedException();
+	}
+
+	public async Task<Maybe<Stream>> GenerateDocumentThumbnailAsync(Stream data, ThumbnailSize size, CancellationToken cancellationToken = default)
+	{
+		return new NotImplementedException();
+	}
 }

AobaServer/Controllers/MediaController.cs

@@ -1,4 +1,5 @@
-using AobaCore.Services;
+using AobaCore.Models;
+using AobaCore.Services;
 
 using HeyRed.Mime;
 
@@ -44,11 +45,21 @@ public class MediaController(AobaService aobaService, ILogger<MediaController> l
 	}
 
 	[HttpGet("thumb/{id}")]
-	public async Task<IActionResult> ThumbAsync(ObjectId id, [FromServices] ThumbnailService thumbnailService, CancellationToken cancellationToken)
+	[ResponseCache(Duration = int.MaxValue)]
+	public async Task<IActionResult> ThumbAsync(ObjectId id, [FromServices] ThumbnailService thumbnailService, [FromQuery] ThumbnailSize size = ThumbnailSize.Medium, CancellationToken cancellationToken = default)
 	{
-		var thumb = await thumbnailService.GetThumbnailFromFileAsync(id, cancellationToken);
+		var thumb = await thumbnailService.GetOrCreateThumbnailAsync(id, size, cancellationToken);
-		if (thumb == null)
+		if (thumb.HasError)
-			return NotFound();
+		{
+			logger.LogError("Failed to generate thumbnail: {}", thumb.Error);
+			return DefaultThumbnailAsync();
+		}
 		return File(thumb, "image/webp", true);
 	}
+
+	[NonAction]
+	private IActionResult DefaultThumbnailAsync()
+	{
+		return NoContent();
+	}
 }