#72 Fix up issues on Stravaig.FamilyTree.Standardiser

Stravaig-Projects · Jan 9, 2021 · 7a49cac · 7a49cac
1 parent 350dafb
commit 7a49cac
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 12 deletions.
diff --git a/src/Stravaig.FamilyTree.Blazor/Program.cs b/src/Stravaig.FamilyTree.Blazor/Program.cs
@@ -1,12 +1,8 @@
 using System;
 using System.Net.Http;
-using System.Collections.Generic;
 using System.Threading.Tasks;
-using System.Text;
 using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
-using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
 using Stravaig.FamilyTree.Blazor.Services;
 using Stravaig.FamilyTreeGenerator.Requests.Handlers.Services;
 

diff --git a/src/Stravaig.FamilyTree.Standardiser/Application.cs b/src/Stravaig.FamilyTree.Standardiser/Application.cs
@@ -1,10 +1,6 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
 using System.IO;
 using System.Linq;
 using System.Text;
-using System.Text.RegularExpressions;
 using Microsoft.Extensions.Logging;
 using Stravaig.FamilyTree.Standardiser.Extensions;
 using Stravaig.Gedcom;

diff --git a/src/Stravaig.FamilyTree.Standardiser/CommandLineOptions.cs b/src/Stravaig.FamilyTree.Standardiser/CommandLineOptions.cs
@@ -31,7 +31,7 @@ public string DestinationFile
             set
             {
                 var absolutePath = Path.GetFullPath(value);
-                _destinationFile = value;
+                _destinationFile = absolutePath;
             }
         }
     }

diff --git a/src/Stravaig.FamilyTree.Standardiser/FileNamer.cs b/src/Stravaig.FamilyTree.Standardiser/FileNamer.cs
@@ -1,7 +1,6 @@
 using System;
 using System.IO;
 using System.Text.RegularExpressions;
-using System.Xml;
 
 namespace Stravaig.FamilyTree.Standardiser
 {

diff --git a/src/Stravaig.FamilyTree.Standardiser/Program.cs b/src/Stravaig.FamilyTree.Standardiser/Program.cs
@@ -45,8 +45,8 @@ private static ServiceProvider BuildServiceProvider(CommandLineOptions options)
 
         private static void AddApplicationServices(ServiceCollection services, CommandLineOptions options)
         {
-            services.AddSingleton<CommandLineOptions>(options);
-            services.AddSingleton<GedcomDatabase>(p=>
+            services.AddSingleton(options);
+            services.AddSingleton(p=>
             {
                 CommandLineOptions opts = p.GetRequiredService<CommandLineOptions>();
                 return GetDatabase(opts.SourceFile);