なろうServiceのリファクタリング

Epub/KoeBook.Epub/Models/Chapter.cs

@@ -2,6 +2,6 @@
 
 public class Chapter
 {
-    public List<Section> Sections = [];
+    public List<Section> Sections { get; init; } = [];
     public string? Title { get; set; }
 }

Epub/KoeBook.Epub/TagNames.cs

@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace KoeBook.Epub
+{
+    internal static class TagNames
+    {
+        public const string Anchor = "A";
+        public const string Ruby = "RUBY";
+        public const string BreakRow = "BR";
+    }
+}

KoeBook.Core/EbookException.cs

@@ -1,5 +1,6 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Runtime.Serialization;
+using FastEnumUtility;
 
 namespace KoeBook.Core;
 
@@ -13,7 +14,7 @@ public class EbookException : Exception
 
     public EbookException(ExceptionType exceptionType, string? message = null, Exception? innerException = null) : base(null, innerException)
     {
-        Message = message;
+        Message = message ?? exceptionType.GetEnumMemberValue();
         ExceptionType = exceptionType;
     }
 
@@ -54,5 +55,11 @@ public enum ExceptionType
     UnexpectedStructure,
 
     [EnumMember(Value = "HTTPリクエストエラー")]
-    HttpResponseError
+    HttpResponseError,
+
+    /// <summary>
+    /// 無効なURLです
+    /// </summary>
+    [EnumMember(Value = "無効なURLです")]
+    InvalidUrl,
 }

KoeBook.Core/Utilities/JsonOptions.cs

@@ -0,0 +1,10 @@
+using System.Text.Json;
+
+namespace KoeBook.Core.Utilities;
+
+public static class JsonOptions
+{
+    public static JsonSerializerOptions Default => JsonSerializerOptions.Default;
+
+    public static JsonSerializerOptions Web { get; } = new JsonSerializerOptions(JsonSerializerDefaults.Web);
+}

KoeBook.Core/Utilities/UriCreationOptions.cs

@@ -0,0 +1,9 @@
+namespace KoeBook.Core.Utilities;
+
+public static class UriOptions
+{
+    /// <summary>
+    /// 正規化を行わないでUriを作成します
+    /// </summary>
+    public static UriCreationOptions RawUri => new() { DangerousDisablePathAndQueryCanonicalization = true };
+}

KoeBook.Test/DiTestBase.cs

@@ -0,0 +1,22 @@
+using KoeBook.Core;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
+
+namespace KoeBook.Test;
+
+public class DiTestBase
+{
+    protected IHost Host { get; } = CreateDefaultBuilder().Build();
+
+    protected T GetService<T>() where T : notnull
+    {
+        return Host.Services.GetRequiredService<T>();
+    }
+
+    protected static IHostBuilder CreateDefaultBuilder()
+    {
+        return Microsoft.Extensions.Hosting.Host
+            .CreateDefaultBuilder()
+            .UseCoreStartup();
+    }
+}

KoeBook.Test/Epub/ScrapingNaroServiceTest.cs

@@ -0,0 +1,47 @@
+using KoeBook.Core;
+using KoeBook.Epub.Contracts.Services;
+using KoeBook.Epub.Services;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
+
+namespace KoeBook.Test.Epub;
+
+public class ScrapingNaroServiceTest : DiTestBase
+{
+    private readonly ScrapingNaroService _scrapingNaroService;
+
+    public ScrapingNaroServiceTest()
+    {
+        _scrapingNaroService = Host.Services
+            .GetServices<IScrapingService>()
+            .OfType<ScrapingNaroService>()
+            .Single();
+    }
+
+    [Theory]
+    [InlineData("https://ncode.syosetu.com/n0000a", "n0000a")]
+    [InlineData("https://ncode.syosetu.com/n0000a/", "n0000a")]
+    [InlineData("https://ncode.syosetu.com/n0000a/123", "n0000a")]
+    [InlineData("https://ncode.syosetu.com/n0000a/123/", "n0000a")]
+    [InlineData("https://ncode.syosetu.com/novelview/infotop/ncode/n0000a", "n0000a")]
+    [InlineData("https://ncode.syosetu.com/novelview/infotop/ncode/n0000a/", "n0000a")]
+    public void GetNcode_Success(string url, string? expected)
+    {
+        var result = ScrapingNaroService.GetNcode(url);
+
+        Assert.Equal(expected, result);
+    }
+
+    [Theory]
+    [InlineData("https://ncode.syosetu.com/n0000あ")]
+    [InlineData("https://ncode.syosetu.com/n0000あ/")]
+    [InlineData("https://ncode.syosetu.com/n0000aあ/123")]
+    [InlineData("https://ncode.syosetu.com/n0000aあ/123/")]
+    public void GetNcode_Error(string url)
+    {
+        var exception = Record.Exception(() => ScrapingNaroService.GetNcode(url));
+
+        var ebookException = Assert.IsType<EbookException>(exception);
+        Assert.Equal(ExceptionType.InvalidUrl, ebookException.ExceptionType);
+    }
+}

KoeBook.Test/KoeBook.Test.csproj

@@ -11,6 +11,7 @@
 
   <ItemGroup>
     <PackageReference Include="coverlet.collector" Version="6.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
     <PackageReference Include="xunit" Version="2.5.3" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.5.3" />
@@ -25,4 +26,7 @@
     <Using Include="Xunit" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Compile Include="../KoeBook/Startup.cs" />
+  </ItemGroup>
 </Project>

KoeBook/App.xaml.cs

@@ -58,11 +58,9 @@ public App()
         Host = Microsoft.Extensions.Hosting.Host
             .CreateDefaultBuilder()
             .UseContentRoot(AppContext.BaseDirectory)
+            .UseCoreStartup()
             .ConfigureServices((context, services) =>
             {
-                // System
-                services.AddSingleton(TimeProvider.System);
-
                 // Default Activation Handler
                 services.AddTransient<ActivationHandler<LaunchActivatedEventArgs>, DefaultActivationHandler>();
 
@@ -85,34 +83,6 @@ public App()
                 services.AddSingleton<IDialogService, DialogService>();
                 services.AddSingleton<IDisplayStateChangeService, DisplayStateChangeService>();
 
-                // Core Services
-                services.AddHttpClient()
-                    .ConfigureHttpClientDefaults(builder =>
-                    {
-                        builder.SetHandlerLifetime(TimeSpan.FromMinutes(5));
-                    });
-                services.AddSingleton<IFileService, FileService>();
-                services.AddSingleton<ISecretSettingsService, SecretSettingsService>();
-                services.AddSingleton<IStyleBertVitsClientService, StyleBertVitsClientService>();
-                services.AddSingleton<ISoundGenerationSelectorService, SoundGenerationSelectorService>();
-                services.AddSingleton<ISoundGenerationService, SoundGenerationService>();
-                services.AddSingleton<IEpubGenerateService, EpubGenerateService>();
-                services.AddSingleton<IEpubDocumentStoreService, EpubDocumentStoreService>();
-                services.AddSingleton<IAnalyzerService, AnalyzerService>();
-                services.AddSingleton<ILlmAnalyzerService, ChatGptAnalyzerService>();
-                services.AddSingleton<OpenAI.Interfaces.IOpenAIService, MyOpenAiService>();
-
-                // Epub Services
-                services
-                    .AddKeyedSingleton<IScrapingClientService, ScrapingClientService>(nameof(ScrapingAozoraService))
-                    .AddKeyedSingleton<IScrapingClientService, ScrapingClientService>(nameof(ScrapingNaroService))
-                    .AddSingleton<IScraperSelectorService, ScraperSelectorService>()
-                    .AddSingleton<IScrapingService, ScrapingAozoraService>()
-                    .AddSingleton<IScrapingService, ScrapingNaroService>();
-                services.AddSingleton<IEpubCreateService, EpubCreateService>();
-                services.AddSingleton<ISplitBraceService, SplitBraceService>();
-                services.AddSingleton<IFileExtensionService, FileExtensionService>();
-
                 // Views and ViewModels
                 services.AddTransient<SettingsViewModel>();
                 services.AddTransient<SettingsPage>();

KoeBook/Startup.cs

@@ -0,0 +1,53 @@
+using KoeBook.Core.Contracts.Services;
+using KoeBook.Core.Services;
+using KoeBook.Epub.Contracts.Services;
+using KoeBook.Epub.Services;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
+
+namespace KoeBook.Core;
+
+internal static class Startup
+{
+    /// <summary>
+    /// System, Core, Epub のDIを登録します
+    /// </summary>
+    public static IHostBuilder UseCoreStartup(this IHostBuilder builder)
+    {
+        builder.ConfigureServices((context, services) =>
+        {
+            // System
+            services.AddSingleton(TimeProvider.System);
+
+            // Core Services
+            services.AddHttpClient()
+                .ConfigureHttpClientDefaults(builder =>
+                {
+                    builder.SetHandlerLifetime(TimeSpan.FromMinutes(5));
+                });
+            services.AddSingleton<IFileService, FileService>();
+            services.AddSingleton<ISecretSettingsService, SecretSettingsService>();
+            services.AddSingleton<IStyleBertVitsClientService, StyleBertVitsClientService>();
+            services.AddSingleton<ISoundGenerationSelectorService, SoundGenerationSelectorService>();
+            services.AddSingleton<ISoundGenerationService, SoundGenerationService>();
+            services.AddSingleton<IEpubGenerateService, EpubGenerateService>();
+            services.AddSingleton<IEpubDocumentStoreService, EpubDocumentStoreService>();
+            services.AddSingleton<IAnalyzerService, AnalyzerService>();
+            services.AddSingleton<ILlmAnalyzerService, ChatGptAnalyzerService>();
+            services.AddSingleton<OpenAI.Interfaces.IOpenAIService, MyOpenAiService>();
+
+            // Epub Services
+            services
+                .AddKeyedSingleton<IScrapingClientService, ScrapingClientService>(nameof(ScrapingAozoraService))
+                .AddKeyedSingleton<IScrapingClientService, ScrapingClientService>(nameof(ScrapingNaroService))
+                .AddSingleton<IScraperSelectorService, ScraperSelectorService>()
+                .AddSingleton<IScrapingService, ScrapingAozoraService>()
+                .AddSingleton<IScrapingService, ScrapingNaroService>();
+            services.AddSingleton<IEpubCreateService, EpubCreateService>();
+            services.AddSingleton<ISplitBraceService, SplitBraceService>();
+            services.AddSingleton<IFileExtensionService, FileExtensionService>();
+        });
+
+        return builder;
+    }
+}