summaryrefslogtreecommitdiff
path: root/Services
diff options
context:
space:
mode:
authorJake Mannens <jake@asger.xyz>2023-08-29 13:02:41 +1000
committerJake Mannens <jake@asger.xyz>2023-08-29 13:02:41 +1000
commite9f09559b80b83e12727fd24e90d8c7f31d64856 (patch)
treeffb8f6d0f4ccc54618ff73164bcd323635dcea71 /Services
parentda640de1095395e28060211dfc9b6be82924bfd6 (diff)
Added width and height properties to media objects
Diffstat (limited to 'Services')
-rw-r--r--Services/MediaService.cs11
1 files changed, 9 insertions, 2 deletions
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
},