added missing thumbnail deletion on media delete

AobaClient/src/components/media_grid.rs

@@ -1,7 +1,7 @@
 use dioxus::prelude::*;
 
 use crate::{
-	components::{MediaItem, MediaItemPlaceHolder},
+	components::{MediaClassChangeEvent, MediaItem, MediaItemPlaceHolder},
 	rpc::{
 		aoba::{MediaModel, PageFilter},
 		get_rpc_client,
@@ -9,7 +9,8 @@ use crate::{
 };
 
 #[derive(PartialEq, Clone, Props)]
-pub struct MediaGridProps {
+pub struct MediaGridProps
+{
 	pub query: Signal<String>,
 	pub max_page: Signal<i32>,
 	pub total_items: Signal<i32>,
@@ -18,19 +19,21 @@ pub struct MediaGridProps {
 	pub on_page_loaded: Option<EventHandler<PaginationInfo>>,
 }
 
-pub struct PaginationInfo {
+pub struct PaginationInfo
+{
 	pub total_pages: i32,
 	pub total_items: i32,
 }
 
 #[component]
-pub fn MediaGrid(props: MediaGridProps) -> Element {
+pub fn MediaGrid(props: MediaGridProps) -> Element
+{
 	let mut error_display = use_signal(|| {
 		rsx! {}
 	});
 	let mut items = use_signal::<Option<Vec<MediaModel>>>(|| None);
 	let media_result = use_resource(use_reactive!(|(props)| async move {
-		items.set(None);
+		// items.set(None);
 		let mut client = get_rpc_client();
 		let request = PageFilter {
 			page_size: Some(props.page_size.cloned()),
@@ -38,24 +41,32 @@ pub fn MediaGrid(props: MediaGridProps) -> Element {
 			query: Some(props.query.cloned()),
 		};
 		let result = client.list_media(request).await;
-		if let Ok(items) = result {
+		if let Ok(items) = result
+		{
 			let res = items.into_inner();
 
 			return Ok(res);
-		} else {
+		}
+		else
+		{
 			let err = result.err().unwrap();
 			let message = err.message();
 			return Err(format!("Failed to load results: {message}"));
 		}
 	}));
 
-	use_effect(move || match media_result() {
+	use_effect(move || match media_result()
-		Some(value) => match value {
+	{
-			Ok(result) => {
+		Some(value) => match value
-				if let Some(pagination) = result.pagination {
+		{
+			Ok(result) =>
+			{
+				if let Some(pagination) = result.pagination
+				{
 					let total_pages = pagination.total_pages;
 					let total_items = pagination.total_items;
-					if let Some(handler) = props.on_page_loaded {
+					if let Some(handler) = props.on_page_loaded
+					{
 						handler.call(PaginationInfo {
 							total_pages,
 							total_items,
@@ -71,7 +82,8 @@ pub fn MediaGrid(props: MediaGridProps) -> Element {
 				}
 			}),
 		},
-		_ => {}
+		_ =>
+		{}
 	});
 
 	rsx! {
@@ -79,7 +91,35 @@ pub fn MediaGrid(props: MediaGridProps) -> Element {
 			class: "mediaGrid",
 			{error_display}
 			{match items(){
-				Some(itms) => rsx!{MediaList { items: itms }},
+				Some(itms) => rsx!{
+					MediaList {
+						items: itms,
+						on_item_deleted: move |id|{
+							if let Some(cur) = items.cloned(){
+								let filtered = cur.iter()
+									.filter(|i| i.id.clone().expect("No id").value != id)
+									.map(|i|i.clone())
+									.collect();
+								items.set(Some(filtered));
+							}
+						},
+						on_class_changed: move |e: MediaClassChangeEvent|{
+							if let Some(cur) = items.cloned(){
+								let updated = cur.iter()
+									.map(|i|{
+										let mut itm = i.clone();
+										let id = itm.id.clone().expect("No id").value;
+										if id == e.id{
+											itm.class = e.class;
+										}
+										return itm;
+									})
+									.collect();
+								items.set(Some(updated));
+							}
+						}
+					}
+				},
 				None => rsx!{PlaceholderGrid { count: props.page_size.cloned() as usize }}
 			}}
 		}
@@ -87,7 +127,8 @@ pub fn MediaGrid(props: MediaGridProps) -> Element {
 }
 
 #[component]
-fn PlaceholderGrid(count: usize) -> Element {
+fn PlaceholderGrid(count: usize) -> Element
+{
 	rsx! {
 		div{
 			class: "mediaGrid",
@@ -99,12 +140,18 @@ fn PlaceholderGrid(count: usize) -> Element {
 }
 
 #[component]
-fn MediaList(items: Vec<MediaModel>) -> Element {
+fn MediaList(
+	items: Vec<MediaModel>,
+	on_item_deleted: Option<EventHandler<String>>,
+	on_class_changed: Option<EventHandler<MediaClassChangeEvent>>,
+) -> Element
+{
 	rsx! {
-		{items.iter().enumerate().map(|(index, itm)| rsx!{
+		{items.iter().map(|itm| rsx!{
 			MediaItem {
 				item: itm.clone(),
-				index
+				on_deleted: on_item_deleted,
+				on_class_changed: on_class_changed
 			}
 		})}
 	}

AobaClient/src/components/media_item.rs

@@ -13,17 +13,16 @@ use crate::{
 
 pub struct MediaClassChangeEvent
 {
-	pub index: usize,
+	pub id: String,
-	pub class: String,
+	pub class: i32,
 }
 
 #[derive(PartialEq, Clone, Props)]
 pub struct MediaItemProps
 {
 	pub item: MediaModel,
-	pub index: usize,
 	pub on_class_changed: Option<EventHandler<MediaClassChangeEvent>>,
-	pub on_deleted: Option<EventHandler<usize>>,
+	pub on_deleted: Option<EventHandler<String>>,
 }
 
 #[component]
@@ -35,12 +34,12 @@ pub fn MediaItem(props: MediaItemProps) -> Element
 	let id = item.id.unwrap().value;
 	let thumb = item.thumb_url;
 	let class = item.class;
-	let mut class_signal = use_signal(|| match class
+	let class_string = match class
 	{
 		1 => "blur",
 		2 => "secret",
 		_ => "",
-	});
+	};
 	let url = item.media_url;
 	let download = format!("{HOST}{url}");
 
@@ -48,7 +47,7 @@ pub fn MediaItem(props: MediaItemProps) -> Element
 		ContextMenu{
 			ContextMenuTrigger{
 				a {
-					class: "mediaItem {class_signal()}",
+					class: "mediaItem {class_string}",
 					href: "{HOST}{url}",
 					target: "_blank",
 					"data-id" : id.clone(),
@@ -94,14 +93,16 @@ pub fn MediaItem(props: MediaItemProps) -> Element
 					}
 				},
 				{
-					if class_signal() != "" {
+					if class != 0 {
 						rsx!{ContextMenuItem {
 							index: 2 as usize,
 							value: "{id}",
 							on_select: move |id: String|{
 								spawn(async move {
-									if let Ok(_) = set_class(id, 0).await{
+									if let Ok(_) = set_class(&id, 0).await{
-										class_signal.set("");
+										if let Some(handler) = props.on_class_changed{
+											handler.call(MediaClassChangeEvent { id, class: 0 });
+										}
 									}
 								});
 							},
@@ -116,14 +117,16 @@ pub fn MediaItem(props: MediaItemProps) -> Element
 					}else{rsx!{}}
 				}
 				{
-					if class_signal() != "blur" {
+					if class != 1 {
 						rsx!{ContextMenuItem {
-							index: 2 as usize,
+							index: 3 as usize,
 							value: "{id}",
 							on_select: move |id: String|{
 								spawn(async move {
-									if let Ok(_) = set_class(id, 1).await{
+									if let Ok(_) = set_class(&id, 1).await{
-										class_signal.set("blur");
+										if let Some(handler) = props.on_class_changed{
+											handler.call(MediaClassChangeEvent { id, class: 1 });
+										}
 									}
 								});
 							},
@@ -138,14 +141,16 @@ pub fn MediaItem(props: MediaItemProps) -> Element
 					}else{rsx!{}}
 				}
 				{
-					if class_signal() != "secret" {
+					if class != 3 {
 						rsx!{ContextMenuItem {
-							index: 2 as usize,
+							index: 4 as usize,
 							value: "{id}",
 							on_select: move |id: String|{
 								spawn(async move {
-									if let Ok(_) = set_class(id, 2).await{
+									if let Ok(_) = set_class(&id, 2).await{
-										class_signal.set("secret");
+										if let Some(handler) = props.on_class_changed{
+											handler.call(MediaClassChangeEvent { id, class: 2 });
+										}
 									}
 								});
 							},
@@ -160,8 +165,17 @@ pub fn MediaItem(props: MediaItemProps) -> Element
 					}else{rsx!{}}
 				}
 				ContextMenuItem {
-					index: 2 as usize,
+					index: 5 as usize,
-					value: "",
+					value: "{id}",
+					on_select: move |id: String|{
+						spawn(async move {
+							if let Ok(_) = delete_media(id.clone()).await{
+								if let Some(handler) = props.on_deleted {
+									handler.call(id);
+								}
+							}
+						});
+					},
 					div{
 						class: "contextItem",
 						div{
@@ -192,13 +206,19 @@ pub fn MediaItemPlaceHolder() -> Element
 	};
 }
 
-async fn set_class(id: String, class: i32) -> Result<Response<()>, Status>
+async fn delete_media(id: String) -> Result<Response<()>, Status>
+{
+	let mut client = get_rpc_client();
+	return client.delete_media(Id { value: id }).await;
+}
+
+async fn set_class(id: &String, class: i32) -> Result<Response<()>, Status>
 {
 	let mut client = get_rpc_client();
 	return client
 		.set_media_class(SetMediaClassRequest {
 			class: class,
-			id: Some(Id { value: id }),
+			id: Some(Id { value: id.clone() }),
 		})
 		.await;
 }

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="Microsoft.Extensions.Hosting.Abstractions" Version="10.0.7" />
-		<PackageReference Include="MongoDB.Driver" Version="3.7.1" />
+		<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
@@ -133,6 +144,23 @@ public class AobaService(IMongoDatabase db)
 		}
 	}
 
+	public async Task DeleteFilesAsync(IEnumerable<ObjectId> mediaIds, CancellationToken cancellationToken = default)
+	{
+		foreach (var id in mediaIds)
+		{
+			try
+			{
+				cancellationToken.ThrowIfCancellationRequested();
+				await _gridFs.DeleteAsync(id, CancellationToken.None);
+				await _media.DeleteOneAsync(m => m.MediaId == id, CancellationToken.None);
+			}
+			catch (GridFSFileNotFoundException)
+			{
+				//ignore if file was not found
+			}
+		}
+	}
+
 	
 
 	public async Task DeriveTagsAsync(CancellationToken cancellationToken = default)

AobaCore/Services/ThumbnailService.cs

@@ -10,13 +10,17 @@ 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;
 using System.Collections.Generic;
 using System.Diagnostics;
+using System.Drawing;
 using System.Linq;
 using System.Net.Http.Headers;
 using System.Text;
@@ -50,6 +54,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 +140,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 +178,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 +287,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" Version="2.80.0" />
-    <PackageReference Include="Grpc.AspNetCore.Web" Version="2.76.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.AspNetCore.Authentication.JwtBearer" Version="10.0.7" />
-    <PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.17.0" />
+    <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.Extensions.Hosting" Version="1.15.3" />
-	<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.15.1" />
+	<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.15.2" />
-	  <PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.15.0" />
+	  <PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.15.1" />
   </ItemGroup>
 
   <ItemGroup>

AobaServer/Proto/Aoba.proto

@@ -8,6 +8,7 @@ import "Proto/Types.proto";
 service AobaRpc {
   rpc GetMedia (Id) returns (MediaResponse);
   rpc DeleteMedia (Id) returns (google.protobuf.Empty);
+  rpc DeleteMediaBulk (IdList) returns (google.protobuf.Empty);
   rpc UpdateMedia (google.protobuf.Empty) returns (google.protobuf.Empty);
   rpc ListMedia(PageFilter) returns (ListResponse);
   rpc GetUser(Id) returns (UserResponse);

AobaServer/Proto/Types.proto

@@ -40,6 +40,10 @@ message Id {
 	string value = 1;
 }
 
+message IdList {
+	repeated Id value = 1;
+}
+
 message MediaResponse {
 	optional MediaModel value = 1;
 }

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)
 	{
@@ -57,4 +57,32 @@ public class AobaRpcService(AobaService aobaService, AccountsService accountsSer
 		};
 	}
 
+	public override async Task<Empty> DeleteMedia(Id request, ServerCallContext context)
+	{
+		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);
+		//todo: clean up orphaned thumbnails
-		foreach (var item in mediaItems)
-		{
-			foreach (var size in item.Thumbnails.Keys)
-			{
-				await thumbnailService.DeleteThumbnailAsync(item.MediaId, size);
-			}
-		}
 	}
 }

AobaServer/Utils/ProtoExtensions.cs

@@ -70,4 +70,9 @@ public static class ProtoExtensions
 	{
 		return id.Value.ToObjectId();
 	}
+
+	public static IEnumerable<ObjectId> ToObjectId(this IdList id)
+	{
+		return id.Value.Select(v => v.ToObjectId());
+	}
 }