Merge pull request #219 from MartinZikmund/feature/cleanup-feed-confi…

…guration

Adjust feed configuration to use appsettings

global.json

@@ -1,7 +1,7 @@
 {
   "sdk": {
     "version": "8.0.0",
-    "allowPrerelease": true,
+    "allowPrerelease": false,
     "rollForward": "latestMinor"
   }
 }

src/web/MZikmund.Web.Configuration/ConfigSections/AuthorOptions.cs

@@ -13,4 +13,6 @@ public class AuthorOptions
 	public string Email { get; set; } = "";
 
 	public string PasswordHash { get; set; } = "";
+
+	public string FullName => $"{FirstName} {LastName}";
 }

src/web/MZikmund.Web.Configuration/ConfigSections/GeneralOptions.cs

@@ -14,6 +14,8 @@ public class GeneralOptions
 
 	public string TitleFormatString { get; set; } = "";
 
+	public string DefaultCulture { get; set; } = "";
+
 	public Uri Url { get; set; } = null!;
 
 	public Uri WasmAppUrl { get; set; } = null!;

src/web/MZikmund.Web.Core/Syndication/FeedGenerator.cs

@@ -10,41 +10,46 @@
 using EwSyndicationLink = Edi.SyndicationFeed.ReaderWriter.SyndicationLink;
 using EwSyndicationCategory = Edi.SyndicationFeed.ReaderWriter.SyndicationCategory;
 using EwSyndicationPerson = Edi.SyndicationFeed.ReaderWriter.SyndicationPerson;
+using Microsoft.Extensions.Options;
+using MZikmund.Web.Configuration.ConfigSections;
+using MZikmund.Web.Configuration;
+using System.Reflection;
 
 namespace MZikmund.Web.Core.Syndication;
 
 public class FeedGenerator : IFeedGenerator
 {
-	public FeedGenerator(IHttpContextAccessor httpContextAccessor)
+	public FeedGenerator(
+		IHttpContextAccessor httpContextAccessor,
+		ISiteConfiguration siteConfiguration)
 	{
-		//TODO: Move all values into configuration
 		var baseUrl = httpContextAccessor.HttpContext.Request.GetBaseUrl();
 		HostUrl = baseUrl!;
-		HeadTitle = "Martin Zikmund";
-		HeadDescription = "Open-source enthusiast and Microsoft MVP. Passionate speaker, avid climber, and Lego aficionado.";
-		Copyright = $"©{DateTimeOffset.UtcNow.Year} Martin Zikmund";
-		Generator = "MZikmund";
-		GeneratorVersion = "0.1";
+		HeadTitle = siteConfiguration.General.DefaultTitle;
+		HeadDescription = siteConfiguration.General.DefaultDescription;
+		Copyright = $"©{DateTimeOffset.UtcNow.Year} {siteConfiguration.Author.FullName}";
+		Generator = siteConfiguration.General.EngineName;
+		GeneratorVersion = Assembly.GetEntryAssembly()?.GetName()?.Version?.ToString() ?? "0.1";
 		TrackBackUrl = baseUrl!;
-		Language = "en-US";
+		Language = siteConfiguration.General.DefaultCulture;
 	}
 
 	//TODO: Hide properties, use a private feed configuration class instead
-	public string HostUrl { get; set; }
+	public string HostUrl { get; }
 
-	public string HeadTitle { get; set; }
+	public string HeadTitle { get; }
 
-	public string HeadDescription { get; set; }
+	public string HeadDescription { get; }
 
-	public string Copyright { get; set; }
+	public string Copyright { get; }
 
-	public string Generator { get; set; }
+	public string Generator { get; }
 
-	public string TrackBackUrl { get; set; }
+	public string TrackBackUrl { get; }
 
-	public string GeneratorVersion { get; set; }
+	public string GeneratorVersion { get; }
 
-	public string Language { get; set; }
+	public string Language { get; }
 
 	public async Task<string> GetRssAsync(IEnumerable<FeedEntry> feedEntries, string id)
 	{

src/web/MZikmund.Web/appsettings.json

@@ -12,6 +12,7 @@
 		"DefaultTitle": "Martin Zikmund — Open-source Developer, Speaker",
 		"DefaultDescription": "Open-source enthusiast and Microsoft MVP. Passionate speaker, avid climber, and Lego aficionado.",
 		"DefaultKeywords": "software, open-source, development, IT, climbing, Lego",
+		"DefaultCulture": "en-US",
 		"TitleFormatString": "{0} | Martin Zikmund",
 		"Url": "https://mzikmund.dev",
 		"WasmAppUrl": "https://mzikmund.app",