diff options
| author | Jake Mannens <jake@asger.xyz> | 2023-09-06 09:30:54 +1000 |
|---|---|---|
| committer | Jake Mannens <jake@asger.xyz> | 2023-09-06 09:30:54 +1000 |
| commit | c1c81ba6a14437e020841f1d454d473bbda6b52b (patch) | |
| tree | c6086bd8f8f4048bf3257ba93503605249d379c1 /Controllers/MediaController.cs | |
| parent | 33a3c4d57d774d98c3836c98ecbd2e1dd5ea84c3 (diff) | |
Moved metadata from Media object to UploadedFile object
Diffstat (limited to 'Controllers/MediaController.cs')
| -rw-r--r-- | Controllers/MediaController.cs | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Controllers/MediaController.cs b/Controllers/MediaController.cs index 8070199..fa6e7ab 100644 --- a/Controllers/MediaController.cs +++ b/Controllers/MediaController.cs @@ -1,6 +1,7 @@ using HyperBooru.Services; using HyperBooru.Util; using Microsoft.AspNetCore.Mvc; +using Microsoft.EntityFrameworkCore; namespace HyperBooru.Controllers; @@ -23,13 +24,15 @@ public class MediaController : Controller { [HttpGet("{mediaId}")] public IActionResult Fetch([FromRoute] Guid mediaId) { - var media = db.Media.First(m => m.Guid == mediaId); + var media = db.Media + .Include(m => m.CurrentUploadedFile) + .First(m => m.Guid == mediaId); if(media is null) return NotFound(); var fs = System.IO.File.OpenRead(mediaService.GetPath(media)); - return new FileStreamResult(fs, media.MimeType); + return new FileStreamResult(fs, media.CurrentUploadedFile.MimeType); } [HttpGet("thumb/{mediaId}")] |
