From 596f79318b41b7da60da0f82794f56f306842973 Mon Sep 17 00:00:00 2001 From: Jake Mannens Date: Wed, 16 Aug 2023 14:19:33 +1000 Subject: Fixed most existing dialogs --- Pages/Component/MediaTagTable.razor | 69 ++++++++++++++++++++--------------- Pages/Component/TagSelectDialog.razor | 49 +++++++++++++++---------- Pages/TagDefinitions.razor | 11 ++++-- Pages/ViewMedia.razor | 21 +++++++++-- Pages/ViewMedia.razor.css | 4 ++ Services/TagService.cs | 21 ++++++----- Tag.cs | 5 +++ wwwroot/css/site.css | 2 +- 8 files changed, 116 insertions(+), 66 deletions(-) diff --git a/Pages/Component/MediaTagTable.razor b/Pages/Component/MediaTagTable.razor index 1bd4de4..d4a4283 100644 --- a/Pages/Component/MediaTagTable.razor +++ b/Pages/Component/MediaTagTable.razor @@ -9,24 +9,27 @@ Tag Name - @foreach(var tag in userTags) { - bool isImplicit = IsImplicit(tag); + @foreach(var tagDef in tagDefs) { - @if(isImplicit) { - @tag.Namespace + @if(implicitTags[tagDef.Guid]) { + @tagDef.Namespace } else { - @tag.Namespace + @tagDef.Namespace } - @if(isImplicit) { - @tag.Name + @if(implicitTags[tagDef.Guid]) { + @tagDef.Name } else { - @tag.Name + @tagDef.Name + } + + + @if(!implicitTags[tagDef.Guid]) { + Delete(tagDef))>Delete } - Delete(tag))>Delete } @@ -35,32 +38,38 @@ [Parameter] public Media Media { get; set; } - private IEnumerable userTags { - get { - using var db = dbFactory.CreateDbContext(); - if(db.Entry(Media).State == EntityState.Detached) - db.Attach(Media); - return GetTagRecursive( - Media.Tags - .Select(t => t.TagDefinition)) - .Where(td => td.Source == TagSource.UserTag) - .OrderBy(td => td.Namespace) - .ThenBy(td => td.Name) - .ToArray(); - } - } + private TagDefinition[] tagDefs; + private Dictionary implicitTags; - public void Refresh() => StateHasChanged(); + protected override void OnInitialized() => LoadTagDefs(); - private void Delete(TagDefinition tagDef) { - tagService.RemoveTag(Media, tagDef); + public void Refresh() { + LoadTagDefs(); StateHasChanged(); } - private bool IsImplicit(TagDefinition tagDef) => - !Media.Tags - .Select(t => t.TagDefinition.Guid) - .Contains(tagDef.Guid); + private void Delete(TagDefinition tagDef) { + tagService.RemoveTag(Media.Guid, tagDef.Guid); + Refresh(); + } + + private void LoadTagDefs() { + using var db = dbFactory.CreateDbContext(); + var media = db.Media.First(m => m.ObjectId == Media.ObjectId); + + tagDefs = GetTagRecursive( + media.Tags + .Select(t => t.TagDefinition)) + .Where(td => td.Source == TagSource.UserTag) + .OrderBy(td => td.Namespace) + .ThenBy(td => td.Name) + .ToArray(); + + implicitTags = new(tagDefs + .Select(td => new KeyValuePair( + td.Guid, + !media.Tags.Select(t => t.TagDefinition.Guid).Contains(td.Guid)))); +} private IEnumerable GetTagRecursive(IEnumerable tagDefs) => tagDefs diff --git a/Pages/Component/TagSelectDialog.razor b/Pages/Component/TagSelectDialog.razor index 590c8f2..ebf6d58 100644 --- a/Pages/Component/TagSelectDialog.razor +++ b/Pages/Component/TagSelectDialog.razor @@ -1,13 +1,20 @@ -@inject HBContext db +@inject IDbContextFactory dbFactory +@implements IDisposable
- @foreach(var tagDef in tagDefinitions) { - Checked(tagDef, e.Value))/> - + @for(int i = 0; i < tagDefinitions.Count(); i++) { + var local = i; + + }
@@ -28,32 +35,34 @@ set => visible = dialog.Visible = value; } - private bool visible; + private (TagDefinition tagDefinition, bool selected)[] tagDefinitions; - private Dialog dialog; + private HBContext db; - private IEnumerable tagDefinitions => db.TagDefinitions - .Where(td => td.Source == TagSource.UserTag) - .OrderBy(td => td.Name); + private Dialog dialog; - private List selected = new(); + private bool visible; public void Show() => Visible = true; public void Hide() => Visible = false; + protected override void OnInitialized() { + db = dbFactory.CreateDbContext(); + tagDefinitions = db.TagDefinitions + .Where(td => td.Source == TagSource.UserTag) + .OrderBy(td => td.Name) + .Select(td => new Tuple(td, false).ToValueTuple()) + .ToArray(); + } + private async void Submit() { - await OnSubmit.InvokeAsync(selected.ToArray()); - selected.Clear(); + await OnSubmit.InvokeAsync( + tagDefinitions.Select(e => e.tagDefinition).ToArray()); + for(int i = 0; i < tagDefinitions.Count(); i++) + tagDefinitions[i].selected = false; Hide(); StateHasChanged(); } - private void Checked(TagDefinition tagDef, object? isChecked) { - if(isChecked is bool && (bool) isChecked == true) - if (!selected.Contains(tagDef)) - selected.Add(tagDef); - else - if (selected.Contains(tagDef)) - selected.Remove(tagDef); - } + public void Dispose() => db.Dispose(); } diff --git a/Pages/TagDefinitions.razor b/Pages/TagDefinitions.razor index e48402b..b28ef0c 100644 --- a/Pages/TagDefinitions.razor +++ b/Pages/TagDefinitions.razor @@ -8,18 +8,19 @@ - + @foreach(var tagDef in tagDefinitions) { + TagSourceMap.TryGetValue(tagDef.Source, out var source); - - + +
Guid Source Namespace NameImplicit Tags
@tagDef.Guid@tagDef.Source@(source ?? tagDef.Source.ToString()) @tagDef.Namespace @tagDef.Name PromptToDelete(tagDef))> Delete @@ -54,6 +55,10 @@ @code { + private readonly Dictionary TagSourceMap = new() { + { TagSource.UserTag, "User" } + }; + private Dialog createTagDialog; private Dialog deleteTagDialog; diff --git a/Pages/ViewMedia.razor b/Pages/ViewMedia.razor index 8436159..68cc313 100644 --- a/Pages/ViewMedia.razor +++ b/Pages/ViewMedia.razor @@ -1,6 +1,7 @@ @page "/ViewMedia" @inject IDbContextFactory dbFactory @inject ITagService tagService +@implements IDisposable @title @@ -14,7 +15,7 @@

Title: @(@media.ShortDescription ?? "None")

Description: @(media.LongDescription ?? "None")

-

Upload history

+

Upload history

@@ -84,9 +85,11 @@ private TagSelectDialog tagDialog; private MediaTagTable mediaTagTable; + private HBContext db; + protected override void OnInitialized() { - using var db = dbFactory.CreateDbContext(); - media = db.Media.AsNoTracking().First(m => m.Guid == MediaId); + db = dbFactory.CreateDbContext(); + media = db.Media.First(m => m.Guid == MediaId); if(media is null) throw new ArgumentException("Media not found!"); @@ -101,6 +104,18 @@ } private void SetIngest(bool ingest) { + var ingestTag = db.TagDefinitions + .First(td => td.Source == TagSource.Internal && td.Name == "ingest"); + + if(!ingest) + media.Tags.RemoveAll(t => t.TagDefinition.Guid == ingestTag.Guid); + else + if(!media.IsIngest) + media.Tags.Add(new(ingestTag)); + + db.SaveChanges(); StateHasChanged(); } + + public void Dispose() => db.Dispose(); } diff --git a/Pages/ViewMedia.razor.css b/Pages/ViewMedia.razor.css index abf8e08..8a59041 100644 --- a/Pages/ViewMedia.razor.css +++ b/Pages/ViewMedia.razor.css @@ -24,6 +24,10 @@ div#metadata-fileinfo > table td { font-size: 8pt; } +p#metadata-uploadhistory { + margin-top: 30px; +} + div.button-container { display: flex; justify-content: flex-end; diff --git a/Services/TagService.cs b/Services/TagService.cs index e0dcf64..e0d1072 100644 --- a/Services/TagService.cs +++ b/Services/TagService.cs @@ -4,7 +4,9 @@ using Microsoft.EntityFrameworkCore; namespace HyperBooru.Services; public interface ITagService { + public void AddTag(Guid obj, Guid tagDef); public void AddTag(HBObject obj, TagDefinition tagDef); + public void RemoveTag(Guid obj, Guid tagDef); public void RemoveTag(HBObject obj, TagDefinition tagDef); public void AddImplicitTag(TagDefinition tagDef, TagDefinition implicitTagDef); public void RemoveImplicitTag(TagDefinition tagDef, TagDefinition implicitTagDef); @@ -18,22 +20,23 @@ public class TagService : ITagService { public TagService(IDbContextFactory dbFactory) => this.dbFactory = dbFactory; - public void AddTag(HBObject obj, TagDefinition tagDef) { + public void AddTag(Guid obj, Guid tagDef) { using var db = dbFactory.CreateDbContext(); - db.Entry(obj).State = EntityState.Unchanged; - bool alreadyTagged = obj.Tags - .Select(t => t.TagDefinition.Guid) - .Contains(tagDef.Guid); + var tag = db.TagDefinitions.First(td => td.Guid == tagDef); - obj.Tags.Add(new() { - TagDefinition = tagDef, - Target = obj - }); + db.Objects + .Where(o => !o.Tags.Select(t => t.TagDefinition.Guid).Contains(tagDef)) + .FirstOrDefault(o => o.Guid == obj)? + .Tags + .Add(new(tag)); db.SaveChanges(); } + public void AddTag(HBObject obj, TagDefinition tagDef) => + AddTag(obj.Guid, tagDef.Guid); + public void RemoveTag(Guid obj, Guid tagDef) { using var db = dbFactory.CreateDbContext(); diff --git a/Tag.cs b/Tag.cs index c662c42..0f7fed2 100644 --- a/Tag.cs +++ b/Tag.cs @@ -19,4 +19,9 @@ public class Tag : HBObject { public virtual TagDefinition TagDefinition { get; set; } public DateTime CreateTime { get; set; } = DateTime.Now; public virtual HBObject Target { get; set; } + + public Tag() {} + + public Tag(TagDefinition tagDef) => + this.TagDefinition = tagDef; } \ No newline at end of file diff --git a/wwwroot/css/site.css b/wwwroot/css/site.css index 65147c2..21f9a94 100644 --- a/wwwroot/css/site.css +++ b/wwwroot/css/site.css @@ -1,5 +1,5 @@ #blazor-error-ui { - background: lightyellow; + background: #555; bottom: 0; box-shadow: 0 -1px 2px rgba(0, 0, 0, 0.2); display: none; -- cgit v1.3