diff options
Diffstat (limited to 'Pages')
| -rw-r--r-- | Pages/Gallery.razor | 7 | ||||
| -rw-r--r-- | Pages/ViewMedia.razor | 11 |
2 files changed, 10 insertions, 8 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(); 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); |