#72 Fix up issues in Stravaig.FamilyTreeGenerator

Stravaig-Projects · Jan 9, 2021 · aeeb295 · aeeb295
1 parent ff4743d
commit aeeb295
Show file tree

Hide file tree

Showing 29 changed files with 36 additions and 46 deletions.
diff --git a/src/.idea/.idea.Gedcom/.idea/contentModel.xml b/src/.idea/.idea.Gedcom/.idea/contentModel.xml
diff --git a/src/Gedcom.sln.DotSettings b/src/Gedcom.sln.DotSettings
@@ -6,5 +6,7 @@
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Namer/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Naturalisation/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Organiser/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Paramore/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Serialiser/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Standardiser/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Stravaig/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
diff --git a/src/Stravaig.FamilyTree.Blazor/Program.cs b/src/Stravaig.FamilyTree.Blazor/Program.cs
@@ -4,7 +4,7 @@
 using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
 using Microsoft.Extensions.DependencyInjection;
 using Stravaig.FamilyTree.Blazor.Services;
-using Stravaig.FamilyTreeGenerator.Requests.Handlers.Services;
+using Stravaig.FamilyTree.Common.Humaniser;
 
 namespace Stravaig.FamilyTree.Blazor
 {

diff --git a/src/Stravaig.FamilyTree.Blazor/Shared/Relationship.razor b/src/Stravaig.FamilyTree.Blazor/Shared/Relationship.razor
@@ -1,4 +1,4 @@
-@using Stravaig.FamilyTreeGenerator.Requests.Handlers.Services
+@using Stravaig.FamilyTree.Common.Humaniser
 @RelationshipName
 @code {
   [Parameter]

diff --git a/src/Stravaig.FamilyTree.Blazor/Shared/VirtualPages/PersonPage.razor b/src/Stravaig.FamilyTree.Blazor/Shared/VirtualPages/PersonPage.razor
@@ -3,7 +3,6 @@
 @using Stravaig.FamilyTree.Blazor.Shared.Date
 @using Stravaig.FamilyTree.Blazor.Shared.Timeline
 @using Stravaig.FamilyTree.Common.Footnotes
-@using Stravaig.FamilyTreeGenerator.Requests.Handlers.Services
 @using Stravaig.FamilyTree.Blazor.Services
 
 <h1>@Subject.NameWithoutMarker</h1>

diff --git a/src/Stravaig.FamilyTree.Common/Extensions/IEnumerableGedcomIndividualRecordExtensions.cs b/src/Stravaig.FamilyTree.Common/Extensions/IEnumerableGedcomIndividualRecordExtensions.cs
@@ -4,6 +4,8 @@
 
 namespace Stravaig.FamilyTree.Common.Extensions
 {
+    // ReSharper disable once InconsistentNaming
+    // It is named after the interface it is extending.
     public static class IEnumerableGedcomIndividualRecordExtensions
     {
         public static IEnumerable<GedcomIndividualRecord> OrderByStandardSort(

diff --git a/src/Stravaig.FamilyTree.Common/Humaniser/EnglishLanguageRelationshipRenderer.cs b/src/Stravaig.FamilyTree.Common/Humaniser/EnglishLanguageRelationshipRenderer.cs
@@ -1,6 +1,6 @@
 using Stravaig.Gedcom.Model;
 
-namespace Stravaig.FamilyTreeGenerator.Requests.Handlers.Services
+namespace Stravaig.FamilyTree.Common.Humaniser
 {
     public class EnglishLanguageRelationshipRenderer : IRelationshipRenderer
     {

diff --git a/src/Stravaig.FamilyTree.Common/Humaniser/IRelationshipRenderer.cs b/src/Stravaig.FamilyTree.Common/Humaniser/IRelationshipRenderer.cs
@@ -1,6 +1,6 @@
 using Stravaig.Gedcom.Model;
 
-namespace Stravaig.FamilyTreeGenerator.Requests.Handlers.Services
+namespace Stravaig.FamilyTree.Common.Humaniser
 {
     public interface IRelationshipRenderer
     {

diff --git a/src/Stravaig.FamilyTreeGenerator/Extensions/GedcomDateRecordFileNameExtensions.cs b/src/Stravaig.FamilyTreeGenerator/Extensions/GedcomDateRecordFileNameExtensions.cs
@@ -1,5 +1,4 @@
 using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
 using System.Globalization;
 using System.Text;
 using Stravaig.Gedcom.Model;

diff --git a/src/Stravaig.FamilyTreeGenerator/Extensions/StringExtensions.cs b/src/Stravaig.FamilyTreeGenerator/Extensions/StringExtensions.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.Linq;
 using System.Text;
 using Stravaig.Gedcom.Extensions;
@@ -11,7 +10,7 @@ namespace Stravaig.FamilyTreeGenerator.Extensions
 {
     public static class StringExtensions
     {
-        private const char ellipsis = (char) 0x2026; // …
+        private const char Ellipsis = (char) 0x2026; // …
         public static string MakeFileNameSafe(this string target)
         {
             if (target == null)
@@ -36,7 +35,7 @@ public static string MakeFileNameSafe(this string target)
                 result = result.Replace("--", "-");
             } while (result.Length < len);
             if (len > 100)
-                result = result.Substring(0, 99) + ellipsis;
+                result = result.Substring(0, 99) + Ellipsis;
             return result;
         }
 

diff --git a/src/Stravaig.FamilyTreeGenerator/Extensions/TextWriterExtensions.cs b/src/Stravaig.FamilyTreeGenerator/Extensions/TextWriterExtensions.cs
@@ -1,6 +1,5 @@
 using System;
 using System.IO;
-using System.IO.Compression;
 using Stravaig.Gedcom.Extensions;
 
 namespace Stravaig.FamilyTreeGenerator.Extensions

diff --git a/src/Stravaig.FamilyTreeGenerator/Program.cs b/src/Stravaig.FamilyTreeGenerator/Program.cs
@@ -1,6 +1,5 @@
 using System;
 using System.IO;
-using System.Text;
 using CommandLine;
 using Humanizer;
 using Microsoft.Extensions.DependencyInjection;
@@ -9,7 +8,7 @@
 using Paramore.Brighter.Extensions.DependencyInjection;
 using Paramore.Brighter.Policies.Handlers;
 using Polly;
-using Polly.Registry;
+using Stravaig.FamilyTree.Common.Humaniser;
 using Stravaig.FamilyTreeGenerator.Requests;
 using Stravaig.FamilyTreeGenerator.Requests.Handlers;
 using Stravaig.FamilyTreeGenerator.Requests.Handlers.Services;
@@ -105,8 +104,8 @@ private static void AddApplicationServices(ServiceCollection services, CommandLi
             services.AddTransient<IResidenceRenderer, ResidenceMarkdownRenderer>();
             services.AddTransient<IOccupationRenderer, OccupationMarkdownRenderer>();
 
-            services.AddSingleton<CommandLineOptions>(options);
-            services.AddSingleton<GedcomDatabase>(p=>
+            services.AddSingleton(options);
+            services.AddSingleton(p=>
             {
                 CommandLineOptions opts = p.GetRequiredService<CommandLineOptions>();
                 return GetDatabase(opts.SourceFile);

diff --git a/src/Stravaig.FamilyTreeGenerator/Requests/Handlers/ApplicationHandler.cs b/src/Stravaig.FamilyTreeGenerator/Requests/Handlers/ApplicationHandler.cs
@@ -12,24 +12,19 @@ namespace Stravaig.FamilyTreeGenerator.Requests.Handlers
 {
     public class ApplicationHandler : RequestHandler<Application>
     {
-
         private readonly ILogger<ApplicationHandler> _logger;
         private readonly GedcomDatabase _database;
-        private readonly CommandLineOptions _options;
         private readonly IAmACommandProcessor _commander;
         private readonly Dictionary<GedcomPointer, SourceEntry> _sources;
-
-
+
         public ApplicationHandler(
             ILogger<ApplicationHandler> logger,
             IAmACommandProcessor commander,
-            GedcomDatabase database,
-            CommandLineOptions options)
+            GedcomDatabase database)
         {
             _logger = logger;
             _commander = commander;
             _database = database;
-            _options = options;
             _sources = new Dictionary<GedcomPointer, SourceEntry>();
         }
 

diff --git a/src/Stravaig.FamilyTreeGenerator/Requests/Handlers/Glue/RenderPersonAsJsonHandlerBase.cs b/src/Stravaig.FamilyTreeGenerator/Requests/Handlers/Glue/RenderPersonAsJsonHandlerBase.cs
@@ -3,9 +3,7 @@
 using Microsoft.Extensions.Logging;
 using Newtonsoft.Json;
 using Paramore.Brighter;
-using Stravaig.FamilyTreeGenerator.Extensions;
 using Stravaig.FamilyTreeGenerator.Services;
-using Stravaig.Gedcom;
 using Stravaig.Gedcom.Model;
 using Stravaig.Gedcom.Model.Extensions;
 

diff --git a/...lyTreeGenerator/Requests/Handlers/Glue/RenderPersonIndexByMultipleLocationsBaseHandler.cs b/...lyTreeGenerator/Requests/Handlers/Glue/RenderPersonIndexByMultipleLocationsBaseHandler.cs
@@ -1,4 +1,3 @@
-using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@@ -59,7 +58,7 @@ protected override void WriteIndex(TextWriter writer, GedcomIndividualRecord[] p
 
                     var localeGroups = stateGroup
                         .GroupBy(pl => string.Join(", ",
-                            pl.Location.TakeWhile(l => l != stateGroup.Key) ?? Array.Empty<string>()))
+                            pl.Location.TakeWhile(l => l != stateGroup.Key)))
                         .OrderBy(g => g.Key);
                     foreach (var localeGroup in localeGroups)
                     {

diff --git a/src/Stravaig.FamilyTreeGenerator/Requests/Handlers/RenderIndividualAsMarkdownHandler.cs b/src/Stravaig.FamilyTreeGenerator/Requests/Handlers/RenderIndividualAsMarkdownHandler.cs
@@ -7,6 +7,7 @@
 using Microsoft.Extensions.Logging;
 using Paramore.Brighter;
 using Stravaig.FamilyTree.Common.Extensions;
+using Stravaig.FamilyTree.Common.Humaniser;
 using Stravaig.FamilyTreeGenerator.Extensions;
 using Stravaig.FamilyTreeGenerator.Requests.Handlers.Services;
 using Stravaig.FamilyTreeGenerator.Services;
@@ -16,10 +17,11 @@
 
 namespace Stravaig.FamilyTreeGenerator.Requests.Handlers
 {
+    // ReSharper disable once ClassNeverInstantiated.Global
+    // Instantiated by Paramore Brighter
     public class RenderIndividualAsMarkdownHandler : RequestHandler<RenderIndividual>, IDisposable
     {
         private readonly ILogger<RenderIndividualAsMarkdownHandler> _logger;
-        private readonly IDateRenderer _dateRenderer;
         private readonly IStaticFootnoteOrganiser _footnoteOrganiser;
         private readonly IAssociatesOrganiser _associatesOrganiser;
         private readonly ITimelineRenderer _timelineRenderer;
@@ -33,7 +35,6 @@ public class RenderIndividualAsMarkdownHandler : RequestHandler<RenderIndividual
 
         public RenderIndividualAsMarkdownHandler(
             ILogger<RenderIndividualAsMarkdownHandler> logger,
-            IDateRenderer dateRenderer,
             IStaticFootnoteOrganiser footnoteOrganiser,
             IAssociatesOrganiser associatesOrganiser,
             ITimelineRenderer timelineRenderer,
@@ -44,7 +45,6 @@ public class RenderIndividualAsMarkdownHandler : RequestHandler<RenderIndividual
             IFileNamer fileNamer)
         {
             _logger = logger;
-            _dateRenderer = dateRenderer;
             _footnoteOrganiser = footnoteOrganiser;
             _associatesOrganiser = associatesOrganiser;
             _timelineRenderer = timelineRenderer;

diff --git a/src/Stravaig.FamilyTreeGenerator/Requests/Handlers/RenderMarriageByDateIndexHandler.cs b/src/Stravaig.FamilyTreeGenerator/Requests/Handlers/RenderMarriageByDateIndexHandler.cs
@@ -86,7 +86,7 @@ private void RenderPartnershipLine(TextWriter writer, Entry entry)
             if (entry.Event.Place != null)
             {
                 writer.Write(" at ");
-                writer.Write(GedcomPlaceRecordExtensions.NormalisedPlaceName((IPlace) entry.Event));
+                writer.Write(entry.Event.NormalisedPlaceName());
             }
 
             writer.WriteLine(".");

diff --git a/src/Stravaig.FamilyTreeGenerator/Requests/Handlers/RenderMarriageByNameIndexHandler.cs b/src/Stravaig.FamilyTreeGenerator/Requests/Handlers/RenderMarriageByNameIndexHandler.cs
@@ -84,7 +84,7 @@ private void RenderPartnershipLine(TextWriter writer, Entry entry)
             if (entry.Event.Place != null)
             {
                 writer.Write(" at ");
-                writer.Write(GedcomPlaceRecordExtensions.NormalisedPlaceName((IPlace) entry.Event));
+                writer.Write(entry.Event.NormalisedPlaceName());
             }
 
             writer.WriteLine(".");

diff --git a/src/Stravaig.FamilyTreeGenerator/Requests/Handlers/RenderPersonAncestorsAsJsonHandler.cs b/src/Stravaig.FamilyTreeGenerator/Requests/Handlers/RenderPersonAncestorsAsJsonHandler.cs
@@ -1,8 +1,7 @@
 using System.Linq;
 using Microsoft.Extensions.Logging;
 using Stravaig.FamilyTree.Common.Extensions;
-using Stravaig.FamilyTreeGenerator.Extensions;
-using Stravaig.FamilyTreeGenerator.Requests.Handlers.Services;
+using Stravaig.FamilyTree.Common.Humaniser;
 using Stravaig.FamilyTreeGenerator.Services;
 using Stravaig.Gedcom.Model;
 using Stravaig.Gedcom.Model.Extensions;
@@ -13,13 +12,16 @@ public class RenderPersonAncestorsAsJsonHandler : RenderPersonAsJsonHandlerBase
     {
         private class PersonModel
         {
+            // ReSharper disable UnusedAutoPropertyAccessor.Local
+            // Used by JSON Serialiser
             public string Id { get; set; }
             public string Name { get; set; }
             public string Gender { get; set; }
             public string Relationship { get; set; }
             public string DateOfBirth { get; set; }
             public string DateOfDeath { get; set; }
             public PersonModel[] Parents { get; set; }
+            // ReSharper restore UnusedAutoPropertyAccessor.Local
         }
 
         private readonly IRelationshipRenderer _relationshipRenderer;

diff --git a/src/Stravaig.FamilyTreeGenerator/Requests/Handlers/RenderPersonDescendantsAsJsonHandler.cs b/src/Stravaig.FamilyTreeGenerator/Requests/Handlers/RenderPersonDescendantsAsJsonHandler.cs
@@ -1,25 +1,29 @@
 using System.Linq;
 using Microsoft.Extensions.Logging;
 using Stravaig.FamilyTree.Common.Extensions;
-using Stravaig.FamilyTreeGenerator.Extensions;
-using Stravaig.FamilyTreeGenerator.Requests.Handlers.Services;
+using Stravaig.FamilyTree.Common.Humaniser;
 using Stravaig.FamilyTreeGenerator.Services;
 using Stravaig.Gedcom.Model;
 using Stravaig.Gedcom.Model.Extensions;
 
 namespace Stravaig.FamilyTreeGenerator.Requests.Handlers
 {
+    // ReSharper disable once ClassNeverInstantiated.Global
+    // Instantiated by Paramore Brighter
     public class RenderPersonDescendantsAsJsonHandler : RenderPersonAsJsonHandlerBase
     {
         private class PersonModel
         {
+            // Used by JSON Serialiser
+            // ReSharper disable UnusedAutoPropertyAccessor.Local
             public string Id { get; set; }
             public string Name { get; set; }
             public string Gender { get; set; }
             public string Relationship { get; set; }
             public string DateOfBirth { get; set; }
             public string DateOfDeath { get; set; }
             public PersonModel[] Children { get; set; }
+            // ReSharper restore UnusedAutoPropertyAccessor.Local
         }
 
         private readonly IRelationshipRenderer _relationshipRenderer;

diff --git a/src/Stravaig.FamilyTreeGenerator/Requests/Handlers/RenderPersonFamilyTreeAsJsonHandler.cs b/src/Stravaig.FamilyTreeGenerator/Requests/Handlers/RenderPersonFamilyTreeAsJsonHandler.cs
@@ -2,8 +2,7 @@
 using Microsoft.Extensions.Logging;
 using Newtonsoft.Json;
 using Stravaig.FamilyTree.Common.Extensions;
-using Stravaig.FamilyTreeGenerator.Extensions;
-using Stravaig.FamilyTreeGenerator.Requests.Handlers.Services;
+using Stravaig.FamilyTree.Common.Humaniser;
 using Stravaig.FamilyTreeGenerator.Services;
 using Stravaig.Gedcom.Model;
 using Stravaig.Gedcom.Model.Extensions;

diff --git a/src/Stravaig.FamilyTreeGenerator/Requests/Handlers/RenderPersonIndexBaseHandler.cs b/src/Stravaig.FamilyTreeGenerator/Requests/Handlers/RenderPersonIndexBaseHandler.cs
@@ -1,9 +1,7 @@
 using System.IO;
 using System.Text;
-using System.Threading;
 using Humanizer;
 using Microsoft.Extensions.Logging;
-using Microsoft.VisualBasic;
 using Paramore.Brighter;
 using Stravaig.FamilyTreeGenerator.Services;
 using Stravaig.Gedcom.Model;

diff --git a/....FamilyTreeGenerator/Requests/Handlers/RenderPersonIndexByDateOfBirthAsMarkdownHandler.cs b/....FamilyTreeGenerator/Requests/Handlers/RenderPersonIndexByDateOfBirthAsMarkdownHandler.cs
@@ -1,11 +1,8 @@
 using System.IO;
 using System.Linq;
-using System.Text;
 using Humanizer;
 using Microsoft.Extensions.Logging;
-using Paramore.Brighter;
 using Stravaig.FamilyTree.Common.Extensions;
-using Stravaig.FamilyTreeGenerator.Extensions;
 using Stravaig.FamilyTreeGenerator.Requests.Handlers.Services;
 using Stravaig.FamilyTreeGenerator.Services;
 using Stravaig.Gedcom.Model;

diff --git a/...travaig.FamilyTreeGenerator/Requests/Handlers/RenderPersonIndexByNameAsMarkdownHandler.cs b/...travaig.FamilyTreeGenerator/Requests/Handlers/RenderPersonIndexByNameAsMarkdownHandler.cs
@@ -2,7 +2,6 @@
 using System.Linq;
 using Microsoft.Extensions.Logging;
 using Stravaig.FamilyTree.Common.Extensions;
-using Stravaig.FamilyTreeGenerator.Extensions;
 using Stravaig.FamilyTreeGenerator.Requests.Handlers.Services;
 using Stravaig.FamilyTreeGenerator.Services;
 using Stravaig.Gedcom.Model;

diff --git a/src/Stravaig.FamilyTreeGenerator/Requests/Handlers/Services/IIndividualNameRenderer.cs b/src/Stravaig.FamilyTreeGenerator/Requests/Handlers/Services/IIndividualNameRenderer.cs
@@ -1,4 +1,3 @@
-using System;
 using Stravaig.Gedcom.Model;
 
 namespace Stravaig.FamilyTreeGenerator.Requests.Handlers.Services

diff --git a/src/Stravaig.FamilyTreeGenerator/Requests/Handlers/Services/TimelineMarkdownRenderer.cs b/src/Stravaig.FamilyTreeGenerator/Requests/Handlers/Services/TimelineMarkdownRenderer.cs
@@ -1,8 +1,8 @@
-using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Text;
+using Stravaig.FamilyTree.Common.Humaniser;
 using Stravaig.FamilyTreeGenerator.Extensions;
 using Stravaig.FamilyTreeGenerator.Services;
 using Stravaig.Gedcom.Extensions;

diff --git a/src/Stravaig.FamilyTreeGenerator/Requests/RenderIndividual.cs b/src/Stravaig.FamilyTreeGenerator/Requests/RenderIndividual.cs
@@ -1,5 +1,4 @@
 using System;
-using Stravaig.Gedcom;
 using Stravaig.Gedcom.Model;
 
 namespace Stravaig.FamilyTreeGenerator.Requests

diff --git a/src/Stravaig.FamilyTreeGenerator/Requests/RenderPersonIndex.cs b/src/Stravaig.FamilyTreeGenerator/Requests/RenderPersonIndex.cs
@@ -1,4 +1,3 @@
-using Stravaig.Gedcom;
 using Stravaig.Gedcom.Model;
 
 namespace Stravaig.FamilyTreeGenerator.Requests

diff --git a/src/Stravaig.FamilyTreeGenerator/Stravaig.FamilyTreeGenerator.csproj.DotSettings b/src/Stravaig.FamilyTreeGenerator/Stravaig.FamilyTreeGenerator.csproj.DotSettings
@@ -0,0 +1,2 @@
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=requests_005Chandlers_005Cglue/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>