fix compile error

AobaCore/AobaCore.csproj

@@ -10,13 +10,13 @@
 		<PackageReference Include="FFMpegCore" Version="5.4.0" />
 		<PackageReference Include="Fido2.Models" Version="4.0.1" />
 		<PackageReference Include="Isopoh.Cryptography.Argon2" Version="2.0.0" />
-		<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.5" />
+		<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.7" />
 		<PackageReference Include="MaybeError" Version="1.2.0" />
-		<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="10.0.5" />
-		<PackageReference Include="MongoDB.Driver" Version="3.7.1" />
+		<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="10.0.7" />
+		<PackageReference Include="MongoDB.Driver" Version="3.8.0" />
 		<PackageReference Include="MongoDB.Driver.Core.Extensions.DiagnosticSources" Version="3.0.0" />
 		<PackageReference Include="SixLabors.ImageSharp.Drawing" Version="2.1.7" />
-		<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.17.0" />
+		<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.18.0" />
 		<PackageReference Include="ZLinq" Version="1.5.6" />
 	</ItemGroup>
 

AobaCore/Models/Media.cs

@@ -36,6 +36,9 @@ public class Media
 			{ ".ico", MediaType.Image },
 			{ ".gif", MediaType.Image },
 			{ ".mp3", MediaType.Audio },
+			{ ".ogg", MediaType.Audio },
+			{ ".wav", MediaType.Audio },
+			{ ".aac", MediaType.Audio },
 			{ ".flac", MediaType.Audio },
 			{ ".alac", MediaType.Audio },
 			{ ".mp4", MediaType.Video },

AobaCore/Services/AobaService.cs

@@ -25,6 +25,11 @@ public class AobaService(IMongoDatabase db)
 		return await _media.Find(m => m.MediaId == id).FirstOrDefaultAsync(cancellationToken);
 	}
 
+	public async Task<List<Media>> GetMediaAsync(IEnumerable<ObjectId> ids, CancellationToken cancellationToken = default)
+	{
+		return await _media.Find(m => ids.Contains(m.MediaId)).ToListAsync(cancellationToken);
+	}
+
 	public async Task<PagedResult<Media>> FindMediaAsync(string? query, ObjectId userId, int page = 1, int pageSize = 100, CancellationToken cancellationToken = default)
 	{
 		var filters = new List<FilterDefinition<Media>>()
@@ -87,6 +92,12 @@ public class AobaService(IMongoDatabase db)
 	}
 
 
+	public async Task SetMediaTypeAsync(ObjectId mediaId, MediaType type, CancellationToken cancellationToken = default)
+	{
+		var update = Builders<Media>.Update.Set(m => m.MediaType, type);
+		await _media.UpdateOneAsync(m => m.MediaId == mediaId, update, null, cancellationToken);
+	}
+
 	public async Task<Maybe<Media>> UploadFileAsync(Stream data, string filename, ObjectId owner, CancellationToken cancellationToken = default)
 	{
 		try

AobaCore/Services/ThumbnailService.cs

@@ -10,8 +10,11 @@ using MongoDB.Bson;
 using MongoDB.Driver;
 using MongoDB.Driver.GridFS;
 
+using SixLabors.Fonts;
 using SixLabors.ImageSharp;
+using SixLabors.ImageSharp.Drawing.Processing;
 using SixLabors.ImageSharp.Formats;
+using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Processing;
 
 using System;
@@ -50,6 +53,23 @@ public class ThumbnailService(IMongoDatabase db, AobaService aobaService)
 		return null;
 	}
 
+	public async Task<Error?> DeleteThumbnailDirectAsync(ObjectId thumbnailId)
+	{
+		try
+		{
+			await _gridfs.DeleteAsync(thumbnailId);
+		}
+		catch (GridFSFileNotFoundException)
+		{
+			//Ignore if the file was not found (somehow already deleted)
+		}
+		catch (Exception e)
+		{
+			return new ExceptionError(e);
+		}
+		return null;
+	}
+
 	/// <summary>
 	///
 	/// </summary>
@@ -119,7 +139,8 @@ public class ThumbnailService(IMongoDatabase db, AobaService aobaService)
 		{
 			MediaType.Image => await GenerateImageThumbnailAsync(stream, size, ext, cancellationToken),
 			MediaType.Video => GenerateVideoThumbnail(stream, size, cancellationToken),
-			MediaType.Text or MediaType.Code => await GenerateDocumentThumbnailAsync(stream, size, cancellationToken),
+			MediaType.Audio => GenerateAudioThumbnail(stream, size, ext, cancellationToken),
+			MediaType.Text or MediaType.Code => await GenerateTextThumbnailAsync(stream, size, cancellationToken),
 			_ => new Error($"No Thumbnail for {type}"),
 		};
 	}
@@ -156,6 +177,40 @@ public class ThumbnailService(IMongoDatabase db, AobaService aobaService)
 		return result;
 	}
 
+	public static Maybe<Stream> GenerateAudioThumbnail(Stream data, ThumbnailSize size, string ext, CancellationToken cancellationToken = default)
+	{
+
+		var w = (int)size;
+		var fn = ObjectId.GenerateNewId().ToString();
+		var filePath = $"/tmp/{fn}{ext}";
+
+		using var source = new FileStream(filePath, FileMode.CreateNew);
+		data.CopyTo(source);
+		source.Flush();
+		source.Dispose();
+		data.Dispose();
+		//ffmpeg -i test.wav -lavfi "showspectrumpic=s=512x512:legend=0:color=plasma:scale=log" output3.png
+		try
+		{
+			var output = new MemoryStream();
+			FFMpegArguments.FromFileInput(filePath, false)
+				.OutputToPipe(new StreamPipeSink(output), opt =>
+				{
+					opt.WithCustomArgument("-lavfi \"showspectrumpic=s=512x512:legend=0:color=plasma:scale=log\"").ForceFormat("webp");
+				}).ProcessSynchronously();
+			output.Position = 0;
+			return output;
+		}
+		catch (Exception ex)
+		{
+			return ex;
+		}
+		finally
+		{
+			File.Delete(filePath);
+		}
+	}
+
 	public static Maybe<Stream> GenerateVideoThumbnail(Stream data, ThumbnailSize size, CancellationToken cancellationToken = default)
 	{
 		var w = (int)size;
@@ -231,8 +286,23 @@ public class ThumbnailService(IMongoDatabase db, AobaService aobaService)
 		}
 	}
 
-	public async Task<Maybe<Stream>> GenerateDocumentThumbnailAsync(Stream data, ThumbnailSize size, CancellationToken cancellationToken = default)
+	public async Task<Maybe<Stream>> GenerateTextThumbnailAsync(Stream data, ThumbnailSize size, CancellationToken cancellationToken = default)
 	{
+		//var w = (int)size;
+		//using var image = new Image<Rgba32>(w, w);
+		//var reader = new StreamReader(data);
+		//var text = new char[500];
+		//reader.ReadBlock(text, 0, text.Length);
+		//image.Mutate(op =>
+		//{
+		//	op.BackgroundColor(Color.Black);
+		//	var font = new Font(), 11);
+		//	var textOpts = new RichTextOptions(font);
+		//	op.DrawText(, new string(text), new Brush
+		//	{
+				
+		//	});
+		//});
 		return new NotImplementedException();
 	}
 }

AobaServer/AobaServer.csproj

@@ -10,22 +10,22 @@
 
   <ItemGroup>
     <PackageReference Include="Fido2.AspNet" Version="4.0.1" />
-    <PackageReference Include="Grpc.AspNetCore" Version="2.76.0" />
-    <PackageReference Include="Grpc.AspNetCore.Web" Version="2.76.0" />
+    <PackageReference Include="Grpc.AspNetCore" Version="2.80.0" />
+    <PackageReference Include="Grpc.AspNetCore.Web" Version="2.80.0" />
     <PackageReference Include="Grpc.Tools" Version="2.80.0">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
     <PackageReference Include="Isopoh.Cryptography.Argon2" Version="2.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="10.0.5" />
-    <PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.17.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="10.0.7" />
+    <PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.18.0" />
     <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.23.0" />
     <PackageReference Include="MimeTypesMap" Version="1.0.9" />
-	<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.15.2" />
+	<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.15.3" />
 	<PackageReference Include="OpenTelemetry.Exporter.Prometheus.AspNetCore" Version="1.9.0-beta.2" />
-	<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.15.2" />
-	<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.15.1" />
-	  <PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.15.0" />
+	<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.15.3" />
+	<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.15.2" />
+	  <PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.15.1" />
   </ItemGroup>
 
   <ItemGroup>

AobaServer/Services/AobaRpcService.cs

@@ -13,7 +13,7 @@ using System.Text.Json;
 
 namespace AobaServer.Services;
 
-public class AobaRpcService(AobaService aobaService, AccountsService accountsService, AuthConfigService authConfig) : AobaRpc.AobaRpcBase
+public class AobaRpcService(AobaService aobaService, ThumbnailService thumbnailService, AccountsService accountsService, AuthConfigService authConfig) : AobaRpc.AobaRpcBase
 {
 	public override async Task<MediaResponse> GetMedia(Id request, ServerCallContext context)
 	{
@@ -59,13 +59,30 @@ public class AobaRpcService(AobaService aobaService, AccountsService accountsSer
 
 	public override async Task<Empty> DeleteMedia(Id request, ServerCallContext context)
 	{
-		await aobaService.DeleteFileAsync(request.ToObjectId(), context.CancellationToken);
+		var media = await aobaService.GetMediaAsync(request.ToObjectId());
+		if (media == null)
+			return new Empty();
+		await aobaService.DeleteFileAsync(media.MediaId, context.CancellationToken);
+		foreach (var (_, id) in media.Thumbnails)
+		{
+			await thumbnailService.DeleteThumbnailDirectAsync(id);
+		}
 		return new Empty();
 	}
 
 	public override async Task<Empty> DeleteMediaBulk(IdList request, ServerCallContext context)
 	{
+		var media = await aobaService.GetMediaAsync(request.ToObjectId(), context.CancellationToken);
+		if(media.Count == 0)
+			return new Empty();
 		await aobaService.DeleteFilesAsync(request.ToObjectId(), context.CancellationToken);
+		foreach (var item in media)
+		{
+			foreach (var (_, id) in item.Thumbnails)
+			{
+				await thumbnailService.DeleteThumbnailDirectAsync(id);
+			}
+		}
 		return new Empty();
 	}
 }

AobaServer/Services/DebugService.cs

@@ -1,4 +1,5 @@
 
+using AobaCore.Models;
 using AobaCore.Services;
 
 namespace AobaServer.Services;
@@ -7,13 +8,6 @@ public class DebugService(AobaService aobaService, ThumbnailService thumbnailSer
 {
 	protected override async Task ExecuteAsync(CancellationToken stoppingToken)
 	{
-		var mediaItems = await aobaService.FindMediaWithExtAsync(".avif", stoppingToken);
-		foreach (var item in mediaItems)
-		{
-			foreach (var size in item.Thumbnails.Keys)
-			{
-				await thumbnailService.DeleteThumbnailAsync(item.MediaId, size);
-			}
-		}
+		//todo: clean up orphaned thumbnails
 	}
 }