testing using libvips

.github/workflows/release.yaml

@@ -33,5 +33,7 @@ jobs:
                   file: AobaServer/Dockerfile
                   context: .
                   push: true
-          tags: git.kaisei.app/amatsugu/aoba:${{ env.VERSION }}
+                  tags: |
+                      git.kaisei.app/amatsugu/aoba:${{ env.VERSION }}
+                      git.kaisei.app/amatsugu/aoba:latest
                   build-args: VERSION=${{ env.VERSION }}

AobaClient/assets/style/colors.scss

@@ -1,5 +1,6 @@
 $mainBGColor: #584577;
 $featureColor: #ce2d4f;
+$focusColor: #ff3862;
 $accentColor: #f0eaf8;
 
 $mainTextColor: #eee;

AobaClient/assets/style/main.scss

@@ -157,3 +157,41 @@ form {
 	padding: 5px;
 	user-select: all;
 }
+
+.contextMenu {
+	backdrop-filter: blur(10px) brightness(0.5) grayscale(1);
+	position: absolute;
+	z-index: 100;
+
+	.itemList {
+		display: flex;
+		flex-direction: column;
+		max-width: 300px;
+	}
+
+	.contextItem {
+		border-left: 4px solid $featureColor;
+		$size: 30px;
+		display: grid;
+		grid-template-columns: $size 1fr auto;
+		height: $size;
+		transition: border 0.1s ease-out;
+		cursor: default;
+
+		&.clickable {
+			cursor: pointer;
+		}
+
+		.label {
+			display: flex;
+			align-items: center;
+			padding: 5px 10px;
+		}
+
+		&:hover {
+			background-color: $accentColor;
+			color: $invertTextColor;
+			border-left: 10px solid $focusColor;
+		}
+	}
+}

AobaClient/src/components/basic/input.rs

@@ -7,7 +7,7 @@ pub struct InputProps {
 	pub label: Option<String>,
 	pub placeholder: Option<String>,
 	pub name: String,
-	pub oninput: Option<EventHandler<FormEvent>>,
+	pub oninput: Option<EventHandler<Event<FormData>>>,
 	pub required: Option<bool>,
 }
 
@@ -25,6 +25,9 @@ pub fn Input(props: InputProps) -> Element {
 					if let Some(mut s) = props.value {
 						s.set(e.value());
 					}
+					if let Some(handler) = props.oninput{
+						handler.call(e);
+					}
 				},
 				name: props.name,
 				placeholder: ph,

AobaClient/src/components/context_menu.rs

@@ -0,0 +1,97 @@
+use core::str;
+
+use dioxus::prelude::*;
+
+mod props {
+	use dioxus::prelude::*;
+
+	#[derive(PartialEq, Clone, Props)]
+	pub struct ContextMenu {
+		pub top: f64,
+		pub left: f64,
+		pub items: Element,
+	}
+
+	#[derive(PartialEq, Clone, Props, Default)]
+	pub struct ContextMenuItem {
+		pub name: String,
+		pub sub_items: Option<Element>,
+		pub onclick: Option<EventHandler<MouseEvent>>,
+	}
+}
+
+#[derive(Clone, Copy, Default)]
+pub struct ContextMenuRenderer {
+	pub menu: Signal<Option<Element>>,
+}
+
+impl ContextMenuRenderer {
+	pub fn close(&mut self) {
+		self.menu.set(None);
+	}
+
+	pub fn render(&self) -> Element {
+		if let Some(menu) = self.menu.cloned() {
+			rsx! {
+				{menu}
+			}
+		} else {
+			rsx! {}
+		}
+	}
+}
+
+#[component]
+pub fn ContextMenuRoot() -> Element {
+	let renderer = use_context::<ContextMenuRenderer>();
+	rsx! {
+		{renderer.render()}
+	}
+}
+
+#[component]
+pub fn ContextMenu(props: props::ContextMenu) -> Element {
+	rsx! {
+		div {
+			class: "contextMenu",
+			style: "left: {props.left}px; top: {props.top}px;",
+			ItemList { items: props.items }
+		}
+	}
+}
+
+#[component]
+fn ItemList(items: Element) -> Element {
+	rsx! {
+		div{
+			class: "itemList",
+			{items}
+		}
+	}
+}
+
+#[component]
+pub fn ContextMenuItem(props: props::ContextMenuItem) -> Element {
+	let mut renderer = use_context::<ContextMenuRenderer>();
+	if let Some(_sub) = props.sub_items {
+		todo!("Sub Menu");
+	}
+	rsx! {
+		div{
+			onclick: move |e|{
+				if let Some(handler) = props.onclick{
+					handler.call(e);
+				}
+				renderer.close();
+			},
+			class: "contextItem",
+			div {
+				class: "icon"
+			},
+			div {
+				class: "label",
+				{props.name}
+			}
+		}
+	}
+}

AobaClient/src/components/media_grid.rs

@@ -51,8 +51,11 @@ pub fn MediaGrid(props: MediaGridProps) -> Element {
 			Ok(result) => rsx! {
 				div {
 					class: "mediaGrid",
+					// oncontextmenu: oncontext,
 					{result.items.iter().map(|itm| rsx!{
-						MediaItem { item: Some(itm.clone()) }
+						MediaItem {
+							item: itm.clone()
+						}
 					})},
 				}
 			},
@@ -69,7 +72,7 @@ pub fn MediaGrid(props: MediaGridProps) -> Element {
 			div{
 				class: "mediaGrid",
 				{(0..50).map(|_| rsx!{
-					MediaItem {}
+					MediaItem { }
 				})}
 			}
 		},

AobaClient/src/components/media_item.rs

@@ -1,25 +1,72 @@
 use dioxus::prelude::*;
+use web_sys::window;
 
-use crate::{HOST, rpc::aoba::MediaModel};
+use crate::{
+	HOST,
+	components::{ContextMenu, ContextMenuItem, ContextMenuRenderer},
+	rpc::aoba::MediaModel,
+};
 
 #[derive(PartialEq, Clone, Props)]
 pub struct MediaItemProps {
 	pub item: Option<MediaModel>,
+	// pub oncontextmenu: Option<EventHandler<Event<MouseData>>>,
 }
 
 #[component]
 pub fn MediaItem(props: MediaItemProps) -> Element {
+	let mut ct_renderer = use_context::<ContextMenuRenderer>();
+
 	if let Some(item) = props.item {
 		let mtype = item.media_type().as_str_name();
 		let filename = item.file_name;
 		let id = item.id.unwrap().value;
 		let thumb = item.thumb_url;
 		let url = item.media_url;
+		let download = format!("{HOST}{url}");
+
+		let oncontext = move |event: Event<MouseData>| {
+			println!("ContextMenu");
+			event.prevent_default();
+			event.stop_propagation();
+			let data = event.data();
+			if data.modifiers().ctrl() {
+				return;
+			}
+			let pos = data.coordinates().client();
+			let left = pos.x;
+			let top = pos.y;
+			let download = download.clone();
+
+			let menu: Element = rsx! {
+				ContextMenu {
+					left: left,
+					top: top,
+					items: rsx! {
+						ContextMenuItem {
+							name: "Details",
+						},
+						ContextMenuItem {
+							name: "Download",
+							onclick: move |_|{
+								_ = window().unwrap().open_with_url_and_target(&download, "_blank");
+							}
+						},
+						ContextMenuItem {
+							name: "Delete",
+						},
+					},
+				}
+			};
+			ct_renderer.menu.set(Some(menu));
+		};
+
 		return rsx! {
 			a {
 				class: "mediaItem",
-				href: "{HOST}/{url}",
+				href: "{HOST}{url}",
 				target: "_blank",
+				oncontextmenu: oncontext,
 				"data-id" : id,
 				img { src: "{HOST}{thumb}" }
 				span { class: "info",
@@ -29,7 +76,7 @@ pub fn MediaItem(props: MediaItemProps) -> Element {
 						span { "{item.view_count}" }
 					}
 				}
-			}
+			},
 		};
 	} else {
 		return rsx! {

AobaClient/src/components/mod.rs

@@ -1,10 +1,12 @@
 pub mod basic;
+mod context_menu;
 mod media_grid;
 mod media_item;
 mod metrics_token;
 mod navbar;
 mod notif;
 mod search;
+pub use context_menu::*;
 pub use media_grid::*;
 pub use media_item::*;
 pub use metrics_token::*;

AobaClient/src/layouts/main_layout.rs

@@ -1,6 +1,11 @@
 use dioxus::prelude::*;
 
-use crate::{Route, components::Navbar, contexts::AuthContext, views::Login};
+use crate::{
+	Route,
+	components::{ContextMenuRenderer, ContextMenuRoot, Navbar},
+	contexts::AuthContext,
+	views::Login,
+};
 
 #[component]
 pub fn MainLayout() -> Element {
@@ -8,12 +13,24 @@ pub fn MainLayout() -> Element {
 
 	if auth_context.jwt.cloned().is_none() {
 		return rsx! {
-			Login {}
+			Login { }
 		};
 	}
 
+	let mut ct_renderer = use_context::<ContextMenuRenderer>();
+
 	return rsx! {
-		Navbar {}
+		ContextMenuRoot {  }
-		div { id: "content", Outlet::<Route> {} }
+		Navbar { }
+		div {
+			id: "content",
+			onclick: move |_| {
+				ct_renderer.close();
+			},
+			oncontextmenu: move |_| {
+				ct_renderer.close();
+			},
+			Outlet::<Route> { }
+		}
 	};
 }

AobaClient/src/main.rs

@@ -11,6 +11,8 @@ use contexts::AuthContext;
 use dioxus::prelude::*;
 use route::Route;
 
+use crate::components::ContextMenuRenderer;
+
 #[cfg(debug_assertions)]
 pub const HOST: &'static str = "http://localhost:8081";
 #[cfg(debug_assertions)]
@@ -30,7 +32,8 @@ fn main() {
 
 #[component]
 fn App() -> Element {
-	let _auth_state = use_context_provider(|| AuthContext::new());
+	use_context_provider(|| AuthContext::new());
+	use_context_provider(|| ContextMenuRenderer::default());
 	rsx! {
 		document::Link { rel: "icon", href: FAVICON }
 		document::Link { rel: "preconnect", href: "https://fonts.googleapis.com" }
@@ -41,6 +44,7 @@ fn App() -> Element {
 			rel: "stylesheet",
 			href: "https://fonts.googleapis.com/css2?family=Noto+Sans:ital,wght@0,100..900;1,100..900&display=swap",
 		}
-		Router::<Route> {}
+
+		Router::<Route> { }
 	}
 }

AobaCore/Services/AobaService.cs

@@ -40,6 +40,11 @@ public class AobaService(IMongoDatabase db)
 		return new PagedResult<Media>(items, page, pageSize, total);
 	}
 
+	public async Task<List<Media>> FindMediaWithExtAsync(string ext, CancellationToken cancellationToken = default)
+	{
+		var filter = Builders<Media>.Filter.Eq(m => m.Ext, ext);
+		return await _media.Find(filter).ToListAsync();
+	}
 
 	public Task AddMediaAsync(Media media, CancellationToken cancellationToken = default)
 	{
@@ -53,6 +58,13 @@ public class AobaService(IMongoDatabase db)
 		await _media.UpdateOneAsync(m => m.MediaId == mediaId, upate, cancellationToken: cancellationToken);
 	}
 
+	public async Task RemoveThumbnailAsync(ObjectId mediaId, ThumbnailSize size, CancellationToken cancellationToken = default)
+	{
+		var upate = Builders<Media>.Update.Unset(m => m.Thumbnails[size]);
+
+		await _media.UpdateOneAsync(m => m.MediaId == mediaId, upate, cancellationToken: cancellationToken);
+	}
+
 	public async Task<ObjectId> GetThumbnailIdAsync(ObjectId mediaId, ThumbnailSize size, CancellationToken cancellationToken = default)
 	{
 		var thumb = await _media.Find(m => m.MediaId == mediaId).Project(m => m.Thumbnails[size]).FirstOrDefaultAsync(cancellationToken);

AobaCore/Services/ThumbnailService.cs

@@ -16,6 +16,7 @@ using SixLabors.ImageSharp.Processing;
 
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Linq;
 using System.Net.Http.Headers;
 using System.Text;
@@ -27,6 +28,28 @@ public class ThumbnailService(IMongoDatabase db, AobaService aobaService)
 {
 	private readonly GridFSBucket _gridfs = new GridFSBucket(db);
 
+	public async Task<Error?> DeleteThumbnailAsync(ObjectId mediaId, ThumbnailSize size)
+	{
+		var thumbId = await aobaService.GetThumbnailIdAsync(mediaId, size);
+		if (thumbId == default)
+			return null;
+		try
+		{
+			await _gridfs.DeleteAsync(thumbId);
+			await aobaService.RemoveThumbnailAsync(mediaId, size);
+		}
+		catch (GridFSFileNotFoundException)
+		{
+			//Ignore if the file was not found (somehow already deleted)
+			await aobaService.RemoveThumbnailAsync(mediaId, size);
+		}
+		catch (Exception e)
+		{
+			return new ExceptionError(e);
+		}
+		return null;
+	}
+
 	/// <summary>
 	///
 	/// </summary>
@@ -36,6 +59,7 @@ public class ThumbnailService(IMongoDatabase db, AobaService aobaService)
 	/// <returns></returns>
 	public async Task<Maybe<Stream>> GetOrCreateThumbnailAsync(ObjectId mediaId, ThumbnailSize size, CancellationToken cancellationToken = default)
 	{
+
 		var existingThumb = await GetThumbnailAsync(mediaId, size, cancellationToken);
 		if (existingThumb != null)
 			return existingThumb;
@@ -132,7 +156,7 @@ public class ThumbnailService(IMongoDatabase db, AobaService aobaService)
 		return result;
 	}
 
-	public Maybe<Stream> GenerateVideoThumbnail(Stream data, ThumbnailSize size, CancellationToken cancellationToken = default)
+	public static Maybe<Stream> GenerateVideoThumbnail(Stream data, ThumbnailSize size, CancellationToken cancellationToken = default)
 	{
 		var w = (int)size;
 		var fn = ObjectId.GenerateNewId().ToString();
@@ -166,6 +190,47 @@ public class ThumbnailService(IMongoDatabase db, AobaService aobaService)
 		}
 	}
 
+	public static Maybe<Stream> GenerateAvifThumbnail(Stream data, ThumbnailSize size, CancellationToken cancellationToken)
+	{
+		var w = (int)size;
+		var fn = ObjectId.GenerateNewId().ToString();
+		var inFilePath = $"/tmp/{fn}.avif";
+		var outFilePath = $"/tmp/{fn}.webp";
+		using var source = new FileStream(inFilePath, FileMode.CreateNew);
+		data.CopyTo(source);
+		source.Flush();
+		source.Dispose();
+		data.Dispose();
+		try
+		{
+			var process = Process.Start(new ProcessStartInfo
+			{
+				FileName = "vips",
+				Arguments = $"smartcrop \"{inFilePath}\" \"{outFilePath}\"[Q=75] {w} {w}",
+				WorkingDirectory = "/tmp"
+			});
+			if (process == null)
+				return new Error("Failed to run vips command");
+			process.WaitForExit();
+			if (process.ExitCode != 0)
+				return new Error("Failed to convert");
+			var output = new MemoryStream();
+			using var oFile = File.OpenRead(outFilePath);
+			oFile.CopyTo(output);
+			output.Position = 0;
+			return output;
+		}
+		catch(Exception ex)
+		{
+			return ex;
+		}
+		finally
+		{
+			File.Delete(inFilePath);
+			File.Delete(outFilePath);
+		}
+	}
+
 	public async Task<Maybe<Stream>> GenerateDocumentThumbnailAsync(Stream data, ThumbnailSize size, CancellationToken cancellationToken = default)
 	{
 		return new NotImplementedException();

AobaServer/Controllers/Api/MediaApi.cs

@@ -22,6 +22,7 @@ public class MediaApi(AobaService aoba) : ControllerBase
 		if (media.HasError)
 			return Problem(detail: media.Error.Message, statusCode: StatusCodes.Status400BadRequest);
 
+
 		return Ok(new
 		{
 			media = media.Value,

AobaServer/Dockerfile

@@ -32,7 +32,7 @@ RUN dx bundle --platform web
 # Server Build
 # This stage is used when running from VS in fast mode (Default for Debug configuration)
 FROM mcr.microsoft.com/dotnet/aspnet:9.0 AS base
-RUN apt-get update && apt-get install -y ffmpeg
+RUN apt-get update && apt-get install -y ffmpeg #libvips libvips-tools
 USER $APP_UID
 WORKDIR /app
 EXPOSE 8080

AobaServer/Program.cs

@@ -121,6 +121,9 @@ builder.Services.AddAuthentication(options =>
 
 
 builder.Services.AddAoba();
+#if DEBUG
+builder.Services.AddHostedService<DebugService>();
+#endif
 builder.Services.Configure<FormOptions>(opt =>
 {
 	opt.ValueLengthLimit = int.MaxValue;

AobaServer/Services/DebugService.cs

@@ -0,0 +1,19 @@
+
+using AobaCore.Services;
+
+namespace AobaServer.Services;
+
+public class DebugService(AobaService aobaService, ThumbnailService thumbnailService) : BackgroundService
+{
+	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);
+			}
+		}
+	}
+}