From 7bc3919cabff51806068659be03884913054cff8 Mon Sep 17 00:00:00 2001 From: Jake Mannens Date: Tue, 5 Sep 2023 01:07:12 +1000 Subject: Added Trim() to remove whitespace from key fields --- Services/MediaService.cs | 4 ++-- Services/OcrService.cs | 4 ++-- Services/TagService.cs | 10 ++++++++++ 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/Services/MediaService.cs b/Services/MediaService.cs index 00eeab5..ccc3283 100644 --- a/Services/MediaService.cs +++ b/Services/MediaService.cs @@ -88,8 +88,8 @@ public class MediaService : IMediaService { if(string.IsNullOrEmpty(longDescription)) longDescription = null; - m.ShortDescription = shortDescription; - m.LongDescription = longDescription; + m.ShortDescription = shortDescription?.Trim(); + m.LongDescription = longDescription?.Trim(); db.SaveChanges(); } diff --git a/Services/OcrService.cs b/Services/OcrService.cs index f13c0ad..2f65e43 100644 --- a/Services/OcrService.cs +++ b/Services/OcrService.cs @@ -99,8 +99,8 @@ public class OcrService : IHostedService { engine.SetVariable("debug_file", NullFile); o.Timestamp = DateTime.UtcNow; - o.Text = engine.Process(image).GetText(); - o.SearchableText = SpaceRegex.Replace(o.Text.ToLower(), " "); + o.Text = engine.Process(image).GetText().Trim(); + o.SearchableText = SpaceRegex.Replace(o.Text.ToLower(), " ").Trim(); m.OcrData = o; db.SaveChanges(); diff --git a/Services/TagService.cs b/Services/TagService.cs index a3c4b29..56aba04 100644 --- a/Services/TagService.cs +++ b/Services/TagService.cs @@ -131,6 +131,11 @@ public class TagService : ITagService { if(string.IsNullOrEmpty(alias)) alias = null; + // Remove leading and trailing whitespace + name = name.Trim(); + @namespace = @namespace?.Trim(); + alias = alias?.Trim(); + TagDefinition tagDef = new() { Source = TagSource.UserTag, Namespace = @namespace, @@ -180,6 +185,11 @@ public class TagService : ITagService { if(string.IsNullOrEmpty(alias)) alias = null; + // Remove leading and trailing whitespace + name = name.Trim(); + @namespace = @namespace?.Trim(); + alias = alias?.Trim(); + var tag = db.TagDefinitions.First(td => td.Guid == tagDef); TagDefinition? nameExisting = db.TagDefinitions.FirstOrDefault(td => td.Name.ToLower() == name.ToLower()); -- cgit v1.3