#51 coverfilepathの削除

OUCC · May 3, 2024 · a984402 · a984402
1 parent 0b333f2
commit a984402
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 11 deletions.
diff --git a/Epub/KoeBook.Epub/Contracts/Services/IScraperSelectorService.cs b/Epub/KoeBook.Epub/Contracts/Services/IScraperSelectorService.cs
@@ -12,5 +12,5 @@ public interface IScraperSelectorService
     /// </summary>
     public bool IsMatchSites(string url);
 
-    public ValueTask<EpubDocument> ScrapingAsync(string url, string coverFillePath, string tempDirectory, Guid id, CancellationToken ct);
+    public ValueTask<EpubDocument> ScrapingAsync(string url, string tempDirectory, Guid id, CancellationToken ct);
 }
diff --git a/Epub/KoeBook.Epub/Contracts/Services/IScrapingService.cs b/Epub/KoeBook.Epub/Contracts/Services/IScrapingService.cs
@@ -6,5 +6,5 @@ public interface IScrapingService
 {
     public bool IsMatchSite(Uri url);
 
-    public ValueTask<EpubDocument> ScrapingAsync(string url, string coverFillePath, string tempDirectory, Guid id, CancellationToken ct);
+    public ValueTask<EpubDocument> ScrapingAsync(string url, string tempDirectory, Guid id, CancellationToken ct);
 }
diff --git a/Epub/KoeBook.Epub/Models/EpubDocument.cs b/Epub/KoeBook.Epub/Models/EpubDocument.cs
@@ -4,7 +4,7 @@
 
 namespace KoeBook.Epub.Models;
 
-public class EpubDocument(string title, string author, string coverFilePath, Guid id)
+public class EpubDocument(string title, string author, Guid id, string coverFilePath = "")
 {
     public string Title { get; set; } = title;
     public string Author { get; set; } = author;

diff --git a/Epub/KoeBook.Epub/Services/AiStoryAnalyzerService.cs b/Epub/KoeBook.Epub/Services/AiStoryAnalyzerService.cs
@@ -11,7 +11,7 @@ public partial class AiStoryAnalyzerService(ISplitBraceService splitBraceService
 
     public EpubDocument CreateEpubDocument(AiStory aiStory, Guid id)
     {
-        return new EpubDocument(aiStory.Title, "AI", "", id)
+        return new EpubDocument(aiStory.Title, "AI", id)
         {
             Chapters = [new Chapter()
             {

diff --git a/Epub/KoeBook.Epub/Services/AnalyzerService.cs b/Epub/KoeBook.Epub/Services/AnalyzerService.cs
@@ -34,7 +34,7 @@ public async ValueTask<BookScripts> AnalyzeAsync(BookProperties bookProperties,
             switch (bookProperties)
             {
                 case { SourceType: SourceType.Url or SourceType.FilePath, Source: string uri }:
-                    document = await _scrapingService.ScrapingAsync(uri, coverFilePath, tempDirectory, bookProperties.Id, cancellationToken);
+                    document = await _scrapingService.ScrapingAsync(uri, tempDirectory, bookProperties.Id, cancellationToken);
                     break;
                 case { SourceType: SourceType.AiStory, Source: AiStory aiStory }:
                     document = _aiStoryAnalyzerService.CreateEpubDocument(aiStory, bookProperties.Id);

diff --git a/Epub/KoeBook.Epub/Services/ScraperSelectorService.cs b/Epub/KoeBook.Epub/Services/ScraperSelectorService.cs
@@ -21,14 +21,14 @@ public bool IsMatchSites(string url)
         }
     }
 
-    public async ValueTask<EpubDocument> ScrapingAsync(string url, string coverFillePath, string tempDirectory, Guid id, CancellationToken ct)
+    public async ValueTask<EpubDocument> ScrapingAsync(string url, string tempDirectory, Guid id, CancellationToken ct)
     {
         var uri = new Uri(url);
 
         foreach (var service in _scrapingServices)
         {
             if (service.IsMatchSite(uri))
-                return await service.ScrapingAsync(url, coverFillePath, tempDirectory, id, ct);
+                return await service.ScrapingAsync(url, tempDirectory, id, ct);
         }
 
         throw new ArgumentException("対応するURLではありません");

diff --git a/Epub/KoeBook.Epub/Services/ScrapingAozoraService.cs b/Epub/KoeBook.Epub/Services/ScrapingAozoraService.cs
@@ -22,7 +22,7 @@ public bool IsMatchSite(Uri uri)
             return uri.Host == "www.aozora.gr.jp";
         }
 
-        public async ValueTask<EpubDocument> ScrapingAsync(string url, string coverFilePath, string imageDirectory, Guid id, CancellationToken ct)
+        public async ValueTask<EpubDocument> ScrapingAsync(string url, string imageDirectory, Guid id, CancellationToken ct)
         {
             var config = Configuration.Default.WithDefaultLoader();
             using var context = BrowsingContext.New(config);
@@ -37,7 +37,7 @@ public async ValueTask<EpubDocument> ScrapingAsync(string url, string coverFileP
                 ?? throw new EbookException(ExceptionType.WebScrapingFailed, $"著者の取得に失敗しました。\n以下のリンクから正しい小説のリンクを取得してください。\n{GetCardUrl(url)}");
 
             // EpubDocument の生成
-            var document = new EpubDocument(TextReplace(bookTitle.InnerHtml), TextReplace(bookAuther.InnerHtml), coverFilePath, id);
+            var document = new EpubDocument(TextReplace(bookTitle.InnerHtml), TextReplace(bookAuther.InnerHtml), id);
 
             var (contentsIds, hasChapter, hasSection) = LoadToc(doc, document);
 

diff --git a/Epub/KoeBook.Epub/Services/ScrapingNaroService.cs b/Epub/KoeBook.Epub/Services/ScrapingNaroService.cs
@@ -25,7 +25,7 @@ public bool IsMatchSite(Uri uri)
             return uri.Host == "ncode.syosetu.com";
         }
 
-        public async ValueTask<EpubDocument> ScrapingAsync(string url, string coverFilePath, string imageDirectory, Guid id, CancellationToken ct)
+        public async ValueTask<EpubDocument> ScrapingAsync(string url, string imageDirectory, Guid id, CancellationToken ct)
         {
             var ncode = GetNcode(url);
             var novelInfo = await GetNovelInfoAsync(ncode, ct).ConfigureAwait(false);
@@ -53,7 +53,7 @@ public async ValueTask<EpubDocument> ScrapingAsync(string url, string coverFileP
                 ? bookAuthorTag.InnerHtml
                 : bookAuthorElement.InnerHtml.Replace("作者：", "");
 
-            var document = new EpubDocument(bookTitle, bookAuthor, coverFilePath, id);
+            var document = new EpubDocument(bookTitle, bookAuthor, id);
             if (novelInfo.IsSerial) // 連載の時
             {
                 async IAsyncEnumerable<(string? title, Section section)> LoadDetailsAsync(IBrowsingContext context, NovelInfo novelInfo, string imageDirectory, [EnumeratorCancellation] CancellationToken ct)