From e9f09559b80b83e12727fd24e90d8c7f31d64856 Mon Sep 17 00:00:00 2001 From: Jake Mannens Date: Tue, 29 Aug 2023 13:02:41 +1000 Subject: Added width and height properties to media objects --- Controllers/MediaController.cs | 6 +- Media.cs | 2 + Migrations/20230829010104_MediaSize.Designer.cs | 264 ++++++++++++++++++++++++ Migrations/20230829010104_MediaSize.cs | 40 ++++ Migrations/HBContextModelSnapshot.cs | 6 + Pages/ViewMedia.razor | 3 +- Services/MediaService.cs | 11 +- Todo.md | 1 + 8 files changed, 328 insertions(+), 5 deletions(-) create mode 100644 Migrations/20230829010104_MediaSize.Designer.cs create mode 100644 Migrations/20230829010104_MediaSize.cs diff --git a/Controllers/MediaController.cs b/Controllers/MediaController.cs index 6e04670..674b406 100644 --- a/Controllers/MediaController.cs +++ b/Controllers/MediaController.cs @@ -56,13 +56,15 @@ public class MediaController : Controller { if(w > image.Width || h > image.Height) return BadRequest("Requested thumbnail size is larger than original media"); - int width = (int)(w is not null ? w : image.Width * h / image.Height); + #pragma warning disable CS8629 + int width = (int)(w is not null ? w : image.Width * h / image.Height); int height = (int)(h is not null ? h : image.Height * w / image.Width); + #pragma warning restore CS8629 var thumbPath = mediaService.GetPath(media, width, height); if(!System.IO.File.Exists(thumbPath)) { - image.Resize(new MagickGeometry(width, height)); + image.Resize(width, height); image.Write(thumbPath); } diff --git a/Media.cs b/Media.cs index 47aa73b..d4f9b5b 100644 --- a/Media.cs +++ b/Media.cs @@ -11,6 +11,8 @@ public class Media : HBObject { public string MimeType { get; set; } public string? ShortDescription { get; set; } public string? LongDescription { get; set; } + public int Width { get; set; } + public int Height { get; set; } public virtual List UploadedFiles { get; set; } = new(); public bool IsIngest => Tags diff --git a/Migrations/20230829010104_MediaSize.Designer.cs b/Migrations/20230829010104_MediaSize.Designer.cs new file mode 100644 index 0000000..29c27bc --- /dev/null +++ b/Migrations/20230829010104_MediaSize.Designer.cs @@ -0,0 +1,264 @@ +// +using System; +using HyperBooru; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; +using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata; + +#nullable disable + +namespace HyperBooru.Migrations +{ + [DbContext(typeof(HBContext))] + [Migration("20230829010104_MediaSize")] + partial class MediaSize + { + /// + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder + .HasAnnotation("ProductVersion", "7.0.10") + .HasAnnotation("Relational:MaxIdentifierLength", 63); + + NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder); + + modelBuilder.Entity("HyperBooru.HBObject", b => + { + b.Property("ObjectId") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("ObjectId")); + + b.Property("Guid") + .HasColumnType("uuid"); + + b.HasKey("ObjectId"); + + b.HasIndex("Guid"); + + b.ToTable("Objects", (string)null); + + b.UseTptMappingStrategy(); + }); + + modelBuilder.Entity("HyperBooru.UploadedFile", b => + { + b.Property("UploadedFileId") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("UploadedFileId")); + + b.Property("CreateTime") + .HasColumnType("timestamp with time zone"); + + b.Property("Filename") + .HasColumnType("text"); + + b.Property("LastAccessTime") + .HasColumnType("timestamp with time zone"); + + b.Property("LastWriteTime") + .HasColumnType("timestamp with time zone"); + + b.Property("MediaObjectId") + .HasColumnType("integer"); + + b.Property("OriginalChecksum") + .IsRequired() + .HasColumnType("text"); + + b.Property("UploadTime") + .HasColumnType("timestamp with time zone"); + + b.HasKey("UploadedFileId"); + + b.HasIndex("MediaObjectId"); + + b.ToTable("UploadedFiles", (string)null); + }); + + modelBuilder.Entity("TagDefinitionTagDefinition", b => + { + b.Property("ImplicitTagsObjectId") + .HasColumnType("integer"); + + b.Property("TagDefinitionObjectId") + .HasColumnType("integer"); + + b.HasKey("ImplicitTagsObjectId", "TagDefinitionObjectId"); + + b.HasIndex("TagDefinitionObjectId"); + + b.ToTable("TagDefinitionTagDefinition"); + }); + + modelBuilder.Entity("HyperBooru.Media", b => + { + b.HasBaseType("HyperBooru.HBObject"); + + b.Property("Checksum") + .IsRequired() + .HasColumnType("text"); + + b.Property("Height") + .HasColumnType("integer"); + + b.Property("LongDescription") + .HasColumnType("text"); + + b.Property("MimeType") + .IsRequired() + .HasColumnType("text"); + + b.Property("ShortDescription") + .HasColumnType("text"); + + b.Property("Width") + .HasColumnType("integer"); + + b.ToTable("Media", (string)null); + }); + + modelBuilder.Entity("HyperBooru.Tag", b => + { + b.HasBaseType("HyperBooru.HBObject"); + + b.Property("CreateTime") + .HasColumnType("timestamp with time zone"); + + b.Property("TagDefinitionId") + .HasColumnType("integer"); + + b.Property("TargetObjectId") + .HasColumnType("integer"); + + b.HasIndex("TagDefinitionId"); + + b.HasIndex("TargetObjectId"); + + b.ToTable("Tags", (string)null); + }); + + modelBuilder.Entity("HyperBooru.TagDefinition", b => + { + b.HasBaseType("HyperBooru.HBObject"); + + b.Property("Alias") + .HasColumnType("text"); + + b.Property("Name") + .IsRequired() + .HasColumnType("text"); + + b.Property("Namespace") + .HasColumnType("text"); + + b.Property("Source") + .HasColumnType("integer"); + + b.ToTable("TagDefinitions", (string)null); + + b.HasData( + new + { + ObjectId = -1, + Guid = new Guid("ebdad4f8-455a-4351-8017-1d4854d6fa38"), + Name = "nsfw", + Source = 0 + }, + new + { + ObjectId = -2, + Guid = new Guid("ea212801-5bcc-4c0e-814f-fb9d30db58bc"), + Name = "ingest", + Source = 0 + }); + }); + + modelBuilder.Entity("HyperBooru.UploadedFile", b => + { + b.HasOne("HyperBooru.Media", "Media") + .WithMany("UploadedFiles") + .HasForeignKey("MediaObjectId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Media"); + }); + + modelBuilder.Entity("TagDefinitionTagDefinition", b => + { + b.HasOne("HyperBooru.TagDefinition", null) + .WithMany() + .HasForeignKey("ImplicitTagsObjectId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("HyperBooru.TagDefinition", null) + .WithMany() + .HasForeignKey("TagDefinitionObjectId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("HyperBooru.Media", b => + { + b.HasOne("HyperBooru.HBObject", null) + .WithOne() + .HasForeignKey("HyperBooru.Media", "ObjectId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("HyperBooru.Tag", b => + { + b.HasOne("HyperBooru.HBObject", null) + .WithOne() + .HasForeignKey("HyperBooru.Tag", "ObjectId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("HyperBooru.TagDefinition", "TagDefinition") + .WithMany() + .HasForeignKey("TagDefinitionId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("HyperBooru.HBObject", "Target") + .WithMany("Tags") + .HasForeignKey("TargetObjectId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("TagDefinition"); + + b.Navigation("Target"); + }); + + modelBuilder.Entity("HyperBooru.TagDefinition", b => + { + b.HasOne("HyperBooru.HBObject", null) + .WithOne() + .HasForeignKey("HyperBooru.TagDefinition", "ObjectId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("HyperBooru.HBObject", b => + { + b.Navigation("Tags"); + }); + + modelBuilder.Entity("HyperBooru.Media", b => + { + b.Navigation("UploadedFiles"); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/Migrations/20230829010104_MediaSize.cs b/Migrations/20230829010104_MediaSize.cs new file mode 100644 index 0000000..734064c --- /dev/null +++ b/Migrations/20230829010104_MediaSize.cs @@ -0,0 +1,40 @@ +using Microsoft.EntityFrameworkCore.Migrations; + +#nullable disable + +namespace HyperBooru.Migrations +{ + /// + public partial class MediaSize : Migration + { + /// + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.AddColumn( + name: "Height", + table: "Media", + type: "integer", + nullable: false, + defaultValue: 0); + + migrationBuilder.AddColumn( + name: "Width", + table: "Media", + type: "integer", + nullable: false, + defaultValue: 0); + } + + /// + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropColumn( + name: "Height", + table: "Media"); + + migrationBuilder.DropColumn( + name: "Width", + table: "Media"); + } + } +} diff --git a/Migrations/HBContextModelSnapshot.cs b/Migrations/HBContextModelSnapshot.cs index e00f2d8..c6aef7a 100644 --- a/Migrations/HBContextModelSnapshot.cs +++ b/Migrations/HBContextModelSnapshot.cs @@ -102,6 +102,9 @@ namespace HyperBooru.Migrations .IsRequired() .HasColumnType("text"); + b.Property("Height") + .HasColumnType("integer"); + b.Property("LongDescription") .HasColumnType("text"); @@ -112,6 +115,9 @@ namespace HyperBooru.Migrations b.Property("ShortDescription") .HasColumnType("text"); + b.Property("Width") + .HasColumnType("integer"); + b.ToTable("Media", (string)null); }); diff --git a/Pages/ViewMedia.razor b/Pages/ViewMedia.razor index 60ae43f..935b4ca 100644 --- a/Pages/ViewMedia.razor +++ b/Pages/ViewMedia.razor @@ -10,7 +10,7 @@
- +
@if(infoEditMode) { @@ -30,6 +30,7 @@

Title: @(media.ShortDescription ?? "None")

Description:
@(media.LongDescription ?? "None")

} +

Resolution: @(media.Width)x@(media.Height)

Upload history

diff --git a/Services/MediaService.cs b/Services/MediaService.cs index 0ca2c1b..1f2b165 100644 --- a/Services/MediaService.cs +++ b/Services/MediaService.cs @@ -1,4 +1,5 @@ -using Microsoft.EntityFrameworkCore; +using ImageMagick; +using Microsoft.EntityFrameworkCore; using MimeDetective; using MimeDetective.Definitions; using System.Security.Cryptography; @@ -120,13 +121,17 @@ public class MediaService : IMediaService { CreateTime = createTime }; + // Determine the MIME type fileData.Seek(0, SeekOrigin.Begin); var defs = inspector.Inspect(fileData); - var mime = defs.ByMimeType().FirstOrDefault()?.MimeType; if(mime is null) throw new MediaCreateException("Unsupported file type"); + // Read the image with ImageMagick to determine the width and height + fileData.Seek(0, SeekOrigin.Begin); + using var magickImage = new MagickImage(fileData); + var media = db.Media .FirstOrDefault(m => m.Checksum == hash); @@ -137,6 +142,8 @@ public class MediaService : IMediaService { media = new() { Checksum = hash, MimeType = mime, + Width = magickImage.Width, + Height = magickImage.Height, UploadedFiles = new() { fileRecord }, diff --git a/Todo.md b/Todo.md index 9a985fa..ee1aad3 100644 --- a/Todo.md +++ b/Todo.md @@ -6,6 +6,7 @@ - UserService listeners don't seem to be removed after disposal # Short-term Features + - Store original filesize as part of uploaded files - Progressive page loading - Media metadata (width, height, etc) - Proper thumbnail generation -- cgit v1.3