Moved metadata from Media object to UploadedFile object

1 files changed, 4 insertions, 3 deletions

diff --git a/Pages/Gallery.razor b/Pages/Gallery.razor
index 241bed0..0cf34b5 100644
--- a/Pages/Gallery.razor
+++ b/Pages/Gallery.razor
@@ -13,7 +13,7 @@
     @foreach(var media in displayMedia) {
         // Precalculate thumbnail size to help the browser
         // lay out the images during initial page load
-        int width = media.Width * 200 / media.Height;
+        int width = (int) media.CurrentUploadedFile.Width! * 200 / (int) media.CurrentUploadedFile.Height!;
         <a href="/ViewMedia?m=@(media.Guid)">
             <img src="/media/thumb/@(media.Guid)?h=200" width=@width height="200"/>
         </a>
@@ -81,6 +81,7 @@
         } else {
             queryResult = db.Media
                 .Include(m => m.Tags)
+                .Include(m => m.CurrentUploadedFile)
                 .OrderByDescending(m => m.ObjectId)
                 .ToArray();
         }
@@ -104,8 +105,8 @@
 
     private IEnumerable<Media> FilterMedia(IEnumerable<Media> media) {
         var nsfwTags = tagService.TagsThatImply(HBContext.NsfwTag)
-        .Select(td => td.ObjectId)
-        .ToArray();
+            .Select(td => td.ObjectId)
+            .ToArray();
 
         using var enumerator = media.GetEnumerator();