Add media url to MediaModel+Start work on tonenized search query model

added additonal file types

AobaClient/assets/style/main.scss

@@ -2,6 +2,8 @@
 @import "colors";
 * {
 	box-sizing: border-box;
+	scrollbar-color: $accentColor transparent;
+	scrollbar-width: thin;
 }
 
 :root {
@@ -18,6 +20,7 @@
 .stickyTop {
 	top: 0;
 	position: sticky;
+	z-index: 100;
 }
 
 body {
@@ -34,6 +37,8 @@ body {
 #content {
 	grid-area: Content;
 	overflow-x: hidden;
+	overflow-y: auto;
+	height: 100dvh;
 	padding: 10px;
 	/* margin-left: $navBarSize; */
 }

AobaClient/src/components/media_item.rs

@@ -14,8 +14,13 @@ pub fn MediaItem(props: MediaItemProps) -> Element {
 		let filename = item.file_name;
 		let id = item.id.unwrap().value;
 		let thumb = item.thumb_url;
+		let url = item.media_url;
 		return rsx! {
-			a { class: "mediaItem", href: "{HOST}/m/{id}", target: "_blank",
+			a {
+				class: "mediaItem",
+				href: "{HOST}/{url}",
+				target: "_blank",
+				"data-id" : id,
 				img { src: "{HOST}{thumb}" }
 				span { class: "info",
 					span { class: "name", "{filename}" }

AobaCore/Models/Media.cs

@@ -1,6 +1,8 @@
 using MongoDB.Bson;
 using MongoDB.Bson.Serialization.Attributes;
 
+using SixLabors.ImageSharp;
+
 namespace AobaCore.Models;
 
 [BsonIgnoreExtraElements]
@@ -16,23 +18,27 @@ public class Media
 	public ObjectId Owner { get; set; }
 	public DateTime UploadDate { get; set; }
 	public string[] Tags { get; set; } = [];
+	public Size? Dimensions { get; set; }
 	public Dictionary<ThumbnailSize, ObjectId> Thumbnails { get; set; } = [];
 
 
 	public static readonly Dictionary<string, MediaType> KnownTypes = new()
 		{
 			{ ".jpg", MediaType.Image },
-			{ ".avif", MediaType.Image },
 			{ ".jpeg", MediaType.Image },
+			{ ".jxr", MediaType.Image },
+			{ ".avif", MediaType.Image },
 			{ ".png", MediaType.Image },
 			{ ".apng", MediaType.Image },
 			{ ".webp", MediaType.Image },
+			{ ".qoi", MediaType.Image },
 			{ ".ico", MediaType.Image },
 			{ ".gif", MediaType.Image },
 			{ ".mp3", MediaType.Audio },
 			{ ".flac", MediaType.Audio },
 			{ ".alac", MediaType.Audio },
 			{ ".mp4", MediaType.Video },
+			{ ".m4v", MediaType.Video },
 			{ ".webm", MediaType.Video },
 			{ ".mov", MediaType.Video },
 			{ ".avi", MediaType.Video },
@@ -79,7 +85,7 @@ public class Media
 	{
 		return this switch
 		{
-			//Media { MediaType: MediaType.Raw or MediaType.Text or MediaType.Code} => $"/i/dl/{MediaId}/{Filename}",
+			Media { MediaType: MediaType.Raw or MediaType.Text or MediaType.Code } => $"/m/{MediaId}/{Uri.EscapeDataString(Filename)}",
 			_ => $"/m/{MediaId}"
 		};
 	}

AobaCore/Services/AobaService.cs

@@ -10,7 +10,7 @@ using MongoDB.Driver.GridFS;
 
 namespace AobaCore.Services;
 
-public class AobaService(IMongoDatabase db, ThumbnailService thumbnailService, ILogger<AobaService> logger)
+public class AobaService(IMongoDatabase db)
 {
 	private readonly IMongoCollection<Media> _media = db.GetCollection<Media>("media");
 	private readonly GridFSBucket _gridFs = new(db);

AobaServer/Controllers/MediaController.cs

@@ -14,10 +14,11 @@ namespace AobaServer.Controllers;
 public class MediaController(AobaService aobaService, ILogger<MediaController> logger) : Controller
 {
 	[HttpGet("{id}")]
+	[HttpGet("{id}/*")]
 	[ResponseCache(Duration = int.MaxValue)]
 	public async Task<IActionResult> MediaAsync(ObjectId id, [FromServices] MongoClient client, CancellationToken cancellationToken)
 	{
-		var file = await aobaService.GetFileStreamAsync(id, cancellationToken: cancellationToken);
+		var file = await aobaService.GetFileStreamAsync(id, seekable: true, cancellationToken: cancellationToken);
 		if (file.HasError)
 		{
 			logger.LogError(file.Error.Exception, "Failed to load media stream");
@@ -58,6 +59,7 @@ public class MediaController(AobaService aobaService, ILogger<MediaController> l
 	}
 
 	[HttpGet("/t/{id}")]
+	[ResponseCache(Duration = int.MaxValue)]
 	public async Task<IActionResult> ThumbAsync(ObjectId id, [FromServices] ThumbnailService thumbnailService, CancellationToken cancellationToken = default)
 	{
 		var thumb = await thumbnailService.GetThumbnailByFileIdAsync(id, cancellationToken);

AobaServer/Proto/Types.proto

@@ -82,6 +82,7 @@ message MediaModel {
 	int32 viewCount = 5;
 	Id owner = 6;
 	string thumbUrl = 7;
+	string mediaUrl = 8;
 }
 
 enum MediaType {
@@ -99,3 +100,14 @@ message ShareXResponse {
 		string error = 2;
 	}
 }
+
+
+message SearchQuery {
+	optional string queryText = 1;
+	repeated Filter filters = 2;
+}
+
+message Filter {
+	string key = 1;
+	repeated string values = 2;
+}

AobaServer/Utils/ProtoExtensions.cs

@@ -56,6 +56,7 @@ public static class ProtoExtensions
 			Owner = media.Owner.ToId(),
 			ViewCount = media.ViewCount,
 			ThumbUrl = thumbUrl,
+			MediaUrl = media.GetMediaUrl()
 		};
 	}