From b303a2fc0f37244d5f45bb2189238991118356e8 Mon Sep 17 00:00:00 2001
From: Jake Mannens <jake@asger.xyz>
Date: Wed, 6 Sep 2023 09:30:54 +1000
Subject: Moved metadata from Media object to UploadedFile object

---
 Pages/ViewMedia.razor | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'Pages/ViewMedia.razor')

diff --git a/Pages/ViewMedia.razor b/Pages/ViewMedia.razor
index 91f33e6..e8914a0 100644
--- a/Pages/ViewMedia.razor
+++ b/Pages/ViewMedia.razor
@@ -18,8 +18,8 @@
     <div id="image-container">
         <img
             src="/media/@(media.Guid)"
-            width=@media.Width
-            height=@media.Height
+            width=@media.CurrentUploadedFile.Width
+            height=@media.CurrentUploadedFile.Height
             onclick="toggleSidebar()"/>
     </div>
     <div id="metadata">
@@ -42,7 +42,7 @@
                     <p>Title: <i>@(media.ShortDescription ?? "None")</i></p>
                     <p class="newlines">Description:<br/><i>@(media.LongDescription ?? "None")</i></p>
                 }
-                <p>Resolution: @(media.Width)x@(media.Height)</p>
+                <p>Resolution: @(media.CurrentUploadedFile.Width)x@(media.CurrentUploadedFile.Height)</p>
                 <p class="heading">Upload history</p>
                 <hr/>
                 <table id="uploaded-files" class="data-table">
@@ -66,10 +66,10 @@
                             <td title=@file.Filename>@file.Filename</td>
                             <td title=@file.Length>@file.Length.ToBytesSI()</td>
                             <td
-                                title=@(file.OriginalChecksum + (file.ChecksumVerified ? " (verified)" : ""))
+                                title=@(file.Checksum + (file.ChecksumVerified ? " (verified)" : ""))
                                 class=@(file.ChecksumVerified ? "verified" : null)>
                                 
-                                @file.OriginalChecksum.Substring(0, 8)
+                                @file.Checksum.Substring(0, 8)
                             </td>
                         </tr>
                     }
@@ -154,6 +154,7 @@
         media = db.Media
             .Include(m => m.Tags)
             .ThenInclude(t => t.TagDefinition)
+            .Include(m => m.CurrentUploadedFile)
             .Include(m => m.UploadedFiles)
             .Include(m => m.OcrData)
             .First(m => m.Guid == MediaId);
-- 
cgit v1.3