Merge pull request #16 from OUCC/feat/#15-change-dependency

#15 プロジェクトの依存関係を変更
OUCC · Mar 13, 2024 · e3a124c · e3a124c
2 parents d0303d8 + a56c8bb
commit e3a124c
Show file tree

Hide file tree

Showing 11 changed files with 36 additions and 25 deletions.
diff --git a/...cts/Services/IEpubDocumentStoreService.cs → ...cts/Services/IEpubDocumentStoreService.cs b/...cts/Services/IEpubDocumentStoreService.cs → ...cts/Services/IEpubDocumentStoreService.cs
@@ -1,6 +1,6 @@
 using KoeBook.Epub.Models;
 
-namespace KoeBook.Core.Contracts.Services;
+namespace KoeBook.Epub.Contracts.Services;
 
 public interface IEpubDocumentStoreService
 {

diff --git a/Epub/KoeBook.Epub/KoeBook.Epub.csproj b/Epub/KoeBook.Epub/KoeBook.Epub.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
@@ -11,5 +11,9 @@
     <PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />
     <PackageReference Include="NAudio" Version="2.2.1" />
   </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\KoeBook.Core\KoeBook.Core.csproj" />
+  </ItemGroup>
 
 </Project>
diff --git a/Epub/KoeBook.Epub/Models/Paragraph.cs b/Epub/KoeBook.Epub/Models/Paragraph.cs
@@ -1,7 +1,10 @@
-namespace KoeBook.Epub.Models;
+using KoeBook.Core.Models;
+
+namespace KoeBook.Epub.Models;
 
 public sealed class Paragraph : Element
 {
-    public Audio? Audio { get; set; }
+    public ScriptLine? ScriptLine { get; set; }
+    public Audio? Audio => ScriptLine?.Audio;
     public string? Text { get; set; }
 }
diff --git a/...rvices/AnalyzerService _CoverFileBytes.cs → ...rvices/AnalyzerService _CoverFileBytes.cs b/...rvices/AnalyzerService _CoverFileBytes.cs → ...rvices/AnalyzerService _CoverFileBytes.cs
@@ -5,7 +5,7 @@
 using KoeBook.Epub;
 using KoeBook.Epub.Services;
 
-namespace KoeBook.Core.Services;
+namespace KoeBook.Epub.Services;
 
 public partial class AnalyzerService
 {

diff --git a/KoeBook.Core/Services/AnalyzerService.cs → .../KoeBook.Epub/Services/AnalyzerService.cs b/KoeBook.Core/Services/AnalyzerService.cs → .../KoeBook.Epub/Services/AnalyzerService.cs
@@ -1,11 +1,12 @@
 using System.Text;
 using System.Text.RegularExpressions;
+using KoeBook.Core;
 using KoeBook.Core.Contracts.Services;
 using KoeBook.Core.Models;
 using KoeBook.Epub.Contracts.Services;
 using KoeBook.Epub.Models;
 
-namespace KoeBook.Core.Services;
+namespace KoeBook.Epub.Services;
 
 public partial class AnalyzerService(IScraperSelectorService scrapingService, IEpubDocumentStoreService epubDocumentStoreService, ILlmAnalyzerService llmAnalyzerService) : IAnalyzerService
 {
@@ -56,7 +57,9 @@ public async ValueTask<BookScripts> AnalyzeAsync(BookProperties bookProperties,
                         // ルビを置換
                         line = ReplaceBaseTextWithRuby(line, rubyDict);
 
-                        scriptLines.Add(new ScriptLine(paragraph, line, "", ""));
+                        var scriptLine = new ScriptLine(line, "", "");
+                        paragraph.ScriptLine = scriptLine;
+                        scriptLines.Add(scriptLine);
                     }
                 }
             }

diff --git a/...Core/Services/EpubDocumentStoreService.cs → ...Epub/Services/EpubDocumentStoreService.cs b/...Core/Services/EpubDocumentStoreService.cs → ...Epub/Services/EpubDocumentStoreService.cs
@@ -1,8 +1,8 @@
 using System.Threading.Tasks;
-using KoeBook.Core.Contracts.Services;
+using KoeBook.Epub.Contracts.Services;
 using KoeBook.Epub.Models;
 
-namespace KoeBook.Core.Services;
+namespace KoeBook.Epub.Services;
 
 public class EpubDocumentStoreService : IEpubDocumentStoreService
 {

diff --git a/KoeBook.Core/Services/EpubGenerateService.cs → ...Book.Epub/Services/EpubGenerateService.cs b/KoeBook.Core/Services/EpubGenerateService.cs → ...Book.Epub/Services/EpubGenerateService.cs
@@ -1,10 +1,11 @@
-using KoeBook.Core.Contracts.Services;
+using KoeBook.Core;
+using KoeBook.Core.Contracts.Services;
 using KoeBook.Core.Models;
 using KoeBook.Epub;
 using KoeBook.Epub.Contracts.Services;
 using KoeBook.Epub.Models;
 
-namespace KoeBook.Core.Services;
+namespace KoeBook.Epub.Services;
 
 public class EpubGenerateService(ISoundGenerationService soundGenerationService, IEpubDocumentStoreService epubDocumentStoreService, IEpubCreateService epubCreateService) : IEpubGenerateService
 {
@@ -21,7 +22,7 @@ public async ValueTask<string> GenerateEpubAsync(BookScripts bookScripts, string
 
         foreach (var scriptLine in bookScripts.ScriptLines)
         {
-            scriptLine.Paragraph.Audio = new Audio(await _soundGenerationService.GenerateLineSoundAsync(scriptLine, bookScripts.Options, cancellationToken).ConfigureAwait(false));
+            scriptLine.Audio = new Audio(await _soundGenerationService.GenerateLineSoundAsync(scriptLine, bookScripts.Options, cancellationToken).ConfigureAwait(false));
         }
 
         if (await _createService.TryCreateEpubAsync(document, tempDirectory, cancellationToken).ConfigureAwait(false))

diff --git a/KoeBook.Core/KoeBook.Core.csproj b/KoeBook.Core/KoeBook.Core.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
     <RootNamespace>KoeBook.Core</RootNamespace>
@@ -11,10 +11,7 @@
   <ItemGroup>
     <PackageReference Include="Betalgo.OpenAI" Version="7.4.6" />
     <PackageReference Include="FastEnum" Version="1.8.0" />
+    <PackageReference Include="NAudio" Version="2.2.1" />
     <PackageReference Include="System.Security.Cryptography.ProtectedData" Version="8.0.0" />
   </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\Epub\KoeBook.Epub\KoeBook.Epub.csproj" />
-  </ItemGroup>
 </Project>
diff --git a/Epub/KoeBook.Epub/Models/Audio.cs → KoeBook.Core/Models/Audio.cs b/Epub/KoeBook.Epub/Models/Audio.cs → KoeBook.Core/Models/Audio.cs
diff --git a/KoeBook.Core/Models/ScriptLine.cs b/KoeBook.Core/Models/ScriptLine.cs
@@ -5,12 +5,15 @@ namespace KoeBook.Core.Models;
 /// <summary>
 /// 読み上げ1行分
 /// </summary>
-public class ScriptLine(Paragraph paragraph, string text, string character, string style)
+//public class ScriptLine(Paragraph paragraph, string text, string character, string style)
+//{
+//    /// <summary>
+//    /// 読み上げ位置との関連付け
+//    /// </summary>
+//    public Paragraph Paragraph { get; } = paragraph;
+public class ScriptLine(string text, string character, string style)
 {
-    /// <summary>
-    /// 読み上げ位置との関連付け
-    /// </summary>
-    public Paragraph Paragraph { get; } = paragraph;
+    public Audio? Audio { get; set; }
 
     /// <summary>
     /// 読み上げテキスト

diff --git a/KoeBook/Services/CoreMocks/AnalyzerServiceMock.cs b/KoeBook/Services/CoreMocks/AnalyzerServiceMock.cs
@@ -40,9 +40,9 @@ public async ValueTask<BookScripts> AnalyzeAsync(BookProperties bookProperties,
         return new(bookProperties, new(characterMapping))
         {
             ScriptLines = [
-                new(new Paragraph { Text = "a" }, "読み上げテキスト1", "Hoge", "Angry"),
-                new(new Paragraph { Text = "b" }, "読み上げテキスト2", "Fuga", "Sad"),
-                new(new Paragraph { Text = "c" }, "読み上げテキスト3", "Narration", "Narration"),
+                new("読み上げテキスト1", "Hoge", "Angry"),
+                new("読み上げテキスト2", "Fuga", "Sad"),
+                new("読み上げテキスト3", "Narration", "Narration"),
             ],
         };
     }