added woodpecker, updated build to update latest

.github/workflows/.woodpecker.yaml

@@ -0,0 +1,46 @@
+pipeline:
+    build-and-push:
+        image: plugins/docker
+        settings:
+            dockerfile: AobaServer/Dockerfile
+            context: .
+            repo: git.kaisei.app/amatsugu/aoba
+            tags: latest
+            username:
+                from_secret: docker_user
+            password:
+                from_secret: docker_pass
+
+    deploy:
+        image: appleboy/ssh
+        settings:
+            host: your-app-host.internal
+            username: deploy
+            key:
+                from_secret: ssh_key
+            port: 22
+            script:
+                - docker pull git.kaisei.app/amatsugu/aoba:latest
+
+                # Run temporary container on docker network, no port binding
+                - docker run -d --rm \
+                  --name aoba-temp \
+                  --network aoba-net \
+                  git.kaisei.app/amatsugu/aoba:latest
+
+                # Wait for it to become healthy
+                - sleep 3
+                - curl -f http://aoba-temp:8080 --connect-timeout 2 || (echo "Health check failed" && docker stop aoba-temp && exit 1)
+
+                # Stop old container (bound to host port)
+                - docker stop aoba || true
+
+                # Start new container on network and bind to host port 8080
+                - docker run -d --rm \
+                  --name aoba \
+                  --network aoba-net \
+                  -p 9432:8080 \
+                  git.kaisei.app/amatsugu/aoba:latest
+
+                # Stop temp container
+                - docker stop aoba-temp || true

.github/workflows/release.yaml

@@ -1,37 +1,39 @@
 name: "Build and Push Image"
 
 on:
-  push:
-    tags:
-      - "v*"
+    push:
+        tags:
+            - "v*"
 
 jobs:
-  build-and-push:
-    runs-on: ubuntu-latest
+    build-and-push:
+        runs-on: ubuntu-latest
 
-    steps:
-      - name: Checkou code
-        uses: actions/checkout@v4
-      
-      - name: Set up Docker Build
-        uses: docker/setup-buildx-action@v3
+        steps:
+            - name: Checkou code
+              uses: actions/checkout@v4
 
-      - name: Login
-        uses: docker/login-action@v3
-        with:
-          registry: git.kaisei.app
-          username: ${{ secrets.DOCKER_USER }}
-          password: ${{ secrets.DOCKER_PASS }}
+            - name: Set up Docker Build
+              uses: docker/setup-buildx-action@v3
 
-      - name: Extract tag version
-        id: extract_tag
-        run: echo "VERSION=${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV
+            - name: Login
+              uses: docker/login-action@v3
+              with:
+                  registry: git.kaisei.app
+                  username: ${{ secrets.DOCKER_USER }}
+                  password: ${{ secrets.DOCKER_PASS }}
 
-      - name: Build and Push
-        uses: docker/build-push-action@v5
-        with:
-          file: AobaServer/Dockerfile
-          context: .
-          push: true
-          tags: git.kaisei.app/amatsugu/aoba:${{ env.VERSION }}
-          build-args: VERSION=${{ env.VERSION }}
+            - name: Extract tag version
+              id: extract_tag
+              run: echo "VERSION=${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV
+
+            - name: Build and Push
+              uses: docker/build-push-action@v5
+              with:
+                  file: AobaServer/Dockerfile
+                  context: .
+                  push: true
+                  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,8 +1,9 @@
-$mainBGColor: #584577;
-$featureColor: #ce2d4f;
-$accentColor: #f0eaf8;
-
-$mainTextColor: #eee;
-$brightTextColor: #fff;
-$invertTextColor: #222;
-$invertBrightTextColor: #000;
+$mainBGColor: #584577;
+$featureColor: #ce2d4f;
+$focusColor: #ff3862;
+$accentColor: #f0eaf8;
+
+$mainTextColor: #eee;
+$brightTextColor: #fff;
+$invertTextColor: #222;
+$invertBrightTextColor: #000;

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>,
 }
 
@@ -22,9 +22,12 @@ pub fn Input(props: InputProps) -> Element {
 				r#type: props.r#type.unwrap_or("text".into()),
 				value: props.value,
 				oninput: move |e| {
-				    if let Some(mut s) = props.value {
-				        s.set(e.value());
-				    }
+					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 {}
-		div { id: "content", Outlet::<Route> {} }
+		ContextMenuRoot {  }
+		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/AobaCore.csproj

@@ -8,9 +8,7 @@
 
 	<ItemGroup>
 		<PackageReference Include="FFMpegCore" Version="5.2.0" />
-		<PackageReference Include="HeyRed.ImageSharp.Heif" Version="2.1.3" />
 		<PackageReference Include="Isopoh.Cryptography.Argon2" Version="2.0.0" />
-		<PackageReference Include="LibHeif.Native" Version="1.15.1" />
 		<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.7" />
 		<PackageReference Include="MaybeError" Version="1.1.0" />
 		<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.7" />

AobaCore/Services/AobaService.cs

@@ -79,6 +79,10 @@ public class AobaService(IMongoDatabase db)
 		{
 			return ex;
 		}
+		finally
+		{
+			data.Dispose();
+		}
 	}
 
 	public async Task<MaybeEx<GridFSDownloadStream, GridFSException>> GetFileStreamAsync(ObjectId mediaId, bool seekable = false, CancellationToken cancellationToken = default)

AobaCore/Services/ThumbnailService.cs

@@ -3,8 +3,6 @@
 using FFMpegCore;
 using FFMpegCore.Pipes;
 
-using HeyRed.ImageSharp.Heif.Formats.Avif;
-using HeyRed.ImageSharp.Heif.Formats.Heif;
 
 using MaybeError.Errors;
 
@@ -102,26 +100,22 @@ public class ThumbnailService(IMongoDatabase db, AobaService aobaService)
 		};
 	}
 
-	private static Image LoadImageAsync(Stream stream, string ext)
+	private static Maybe<Image> LoadImage(Stream stream, string ext)
 	{
 		if (ext is ".heif" or ".avif")
 		{
-			var decoderOptions = new DecoderOptions()
-			{
-				Configuration = new Configuration(
-					new AvifConfigurationModule(),
-					new HeifConfigurationModule())
-			};
-			return Image.Load(decoderOptions, stream);
+			return new Error("Unsupported image type");
 		}
 		else
 			return Image.Load(stream);
 	}
 
-	public static async Task<Stream> GenerateImageThumbnailAsync(Stream stream, ThumbnailSize size, string ext, CancellationToken cancellationToken = default)
+	public static async Task<Maybe<Stream>> GenerateImageThumbnailAsync(Stream stream, ThumbnailSize size, string ext, CancellationToken cancellationToken = default)
 	{
-		var img = LoadImageAsync(stream, ext);
-		img.Mutate(o =>
+		var img = LoadImage(stream, ext);
+		if (img.HasError)
+			return img.Error;
+		img.Value.Mutate(o =>
 		{
 			var size =
 			o.Resize(new ResizeOptions
@@ -132,7 +126,8 @@ public class ThumbnailService(IMongoDatabase db, AobaService aobaService)
 			});
 		});
 		var result = new MemoryStream();
-		await img.SaveAsWebpAsync(result, cancellationToken);
+		await img.Value.SaveAsWebpAsync(result, cancellationToken);
+		img.Value.Dispose();
 		result.Position = 0;
 		return result;
 	}

AobaServer/AobaServer.csproj

@@ -24,7 +24,7 @@
 	<PackageReference Include="OpenTelemetry.Exporter.Prometheus.AspNetCore" Version="1.9.0-beta.2" />
 	<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.12.0" />
 	<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.12.0" />
-	<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.12.0" />
+	  <PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.12.0" />
   </ItemGroup>
 
   <ItemGroup>

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,