Merge pull request #677 from clemensv/embeddings-pr

Optional embeddings in blog posts for bare links

Author: poppastring

.gitignore

@@ -215,7 +215,6 @@ source/DasBlog.Web.UI/content
 # dasblog-core test infrasructure
 test_results/
 test_results.xml
-/source/DasBlog.Tests/FunctionalTests/Properties/launchSettings.json
-/source/DasBlog.Web.UI/Properties/ServiceDependencies/dasblog-linux - Zip Deploy/profile.arm.json
-/source/DasBlog.Web.UI/Properties/ServiceDependencies/dasblog-linux - Zip Deploy
-/source/DasBlog.Web.UI/Properties/ServiceDependencies
+source/DasBlog.Tests/FunctionalTests/Properties/launchSettings.json
+source/DasBlog.Web.UI/Properties/ServiceDependencies/*
+source/DasBlog.Web.UI/.config

source/DasBlog.Services/ConfigFile/Interfaces/IOEmbedProviders.cs

@@ -0,0 +1,10 @@
+using System.Collections.Generic;
+
+namespace DasBlog.Services.ConfigFile.Interfaces
+{
+	public interface IOEmbedProviders 
+	{
+		public List<OEmbedProvider> Providers { get; set; }
+	}
+
+}

source/DasBlog.Services/ConfigFile/Interfaces/ISiteConfig.cs

@@ -364,5 +364,8 @@ public interface ISiteConfig
 
         [XmlAnyAttribute]
         XmlAttribute[] anyAttributes { get; set; }
-    }
+		bool EnableRewritingHashtagsToCategoryLinks { get; set; }
+		bool EnableRewritingBareLinksToEmbeddings { get; set; }
+		bool EnableRewritingBareLinksToIcons { get; set; }
+	}
 }

source/DasBlog.Services/ConfigFile/OEmbedProviders.cs

@@ -0,0 +1,58 @@
+using System.Collections.Generic;
+using DasBlog.Services.ConfigFile.Interfaces;
+using System.Text.Json.Serialization;
+using System.Reflection;
+using System;
+
+namespace DasBlog.Services.ConfigFile
+{
+
+	public class OEmbedProviders : IOEmbedProviders
+	{
+		public OEmbedProviders() { }
+
+		[JsonPropertyName("providers")]
+		public List<OEmbedProvider> Providers { get; set; }
+
+	}
+
+	public class OEmbedEndpoint
+	{
+		[JsonPropertyName("schemes")]
+		public List<string> Schemes { get; set; }
+
+		[JsonPropertyName("url")]
+		public string Url { get; set; }
+
+		[JsonPropertyName("discovery")]
+		public bool? Discovery { get; set; }
+
+		[JsonPropertyName("formats")]
+		public List<string> Formats { get; set; }
+	}
+
+	public class OEmbedProvider : IComparer<OEmbedProvider>, IComparable<OEmbedProvider>
+	{
+		[JsonPropertyName("provider_name")]
+		public string Provider_Name { get; set; }
+
+		[JsonPropertyName("provider_url")]
+		public string Provider_Url { get; set; }
+
+		[JsonPropertyName("endpoints")]
+		public List<OEmbedEndpoint> Endpoints { get; set; }
+
+		[JsonPropertyName("usage_count")]
+		public long UsageCount { get; set; }
+
+		public int Compare(OEmbedProvider x, OEmbedProvider y)
+		{
+			return -1 * x.UsageCount.CompareTo(y.UsageCount);
+		}
+
+		public int CompareTo(OEmbedProvider other)
+		{
+			return -1 * UsageCount.CompareTo(other.UsageCount);
+		}
+	}
+}

source/DasBlog.Services/ConfigFile/SiteConfig.cs

@@ -110,7 +110,11 @@ public string Root {
         public bool EnableTrackbackService { get; set; }
         public bool EnablePingbackService { get; set; }
         public bool EnableStartPageCaching { get; set; }
-        public bool EnableBlogrollDescription { get; set; }
+		public bool EnableRewritingHashtagsToCategoryLinks { get; set; }
+		public bool EnableRewritingBareLinksToEmbeddings { get; set; }
+		public bool EnableRewritingBareLinksToIcons { get; set; }
+
+		public bool EnableBlogrollDescription { get; set; }
         public bool EnableUrlRewriting { get; set; }
         public bool EnableCrossposts { get; set; }
         public bool UseUserCulture { get; set; }

source/DasBlog.Services/DasBlog.Services.csproj

@@ -13,9 +13,11 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Coravel" Version="4.1.2" />
+    <PackageReference Include="HtmlAgilityPack" Version="1.11.46" />
     <PackageReference Include="Kveer.XmlRPC" Version="1.2.0" />
     <PackageReference Include="MailKit" Version="2.15.0" />
     <PackageReference Include="Microsoft.Extensions.Options" Version="6.0.0" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
     <PackageReference Include="Quartz.AspNetCore" Version="3.3.3" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
   </ItemGroup>

source/DasBlog.Services/FileManagement/ConfigFilePathsDataOption.cs

@@ -19,5 +19,6 @@ public class ConfigFilePathsDataOption
 		public string BinaryFolder { get; set; }
 
 		public string BinaryUrlRelative { get; set; }
+		public string OEmbedProvidersFilePath { get; set; }
 	}
 }

source/DasBlog.Services/FileManagement/OEmbedProvidersFileService.cs

@@ -0,0 +1,38 @@
+using System;
+using System.IO;
+using DasBlog.Services.ConfigFile;
+using DasBlog.Services.FileManagement.Interfaces;
+using Microsoft.Extensions.Options;
+using Newtonsoft.Json;
+
+namespace DasBlog.Services.FileManagement
+{
+	public class OEmbedProvidersFileService : IConfigFileService<OEmbedProviders>
+	{
+		private readonly ConfigFilePathsDataOption options;
+
+		public OEmbedProvidersFileService(IOptions<ConfigFilePathsDataOption> optionsAccessor)
+		{
+			options = optionsAccessor.Value;
+		}
+
+		public bool SaveConfig(OEmbedProviders config)
+		{
+			var ser = new JsonSerializer();
+			using (var writer = new StreamWriter(options.OEmbedProvidersFilePath))
+			{
+				try
+				{
+					ser.Serialize(writer, config);
+					return true;
+				}
+				catch (Exception e)
+				{
+					// TODO log
+					Console.WriteLine(e);
+					throw;
+				}
+			}
+		}
+	}
+}

source/DasBlog.Services/IDasBlogSettings.cs

@@ -14,6 +14,8 @@ public interface IDasBlogSettings
 		IMetaTags MetaTags { get; set; }
 		ISiteSecurityConfig SecurityConfiguration { get; }
 
+		IOEmbedProviders OEmbedProviders { get; set; }
+
 		string WebRootDirectory { get; }
 
 		string RssUrl { get; }