Merge branch 'main' into feat/#31-2

kc3hack · Feb 24, 2024 · 1532925 · 1532925
2 parents 2adf310 + c0e9d24
commit 1532925
Showing 1 changed file with 1 addition and 45 deletions.
diff --git a/Epub/KoeBook.Epub/ScrapingAozora.cs b/Epub/KoeBook.Epub/ScrapingAozora.cs
@@ -106,7 +106,6 @@ public async Task<EpubDocument> ScrapingAsync(string url, string coverFilePath,
                         checkSection(document, chapterNum);
                         document.Chapters[chapterNum].Sections[sectionNum].Elements.Add(new Paragraph());
                     }
-
                 }
                 else if (element.TagName == "DIV")
                 {
@@ -180,7 +179,6 @@ public async Task<EpubDocument> ScrapingAsync(string url, string coverFilePath,
                                             }
                                             document.Chapters[chapterNum].Sections[sectionNum].Elements.Add(new Paragraph());
                                         }
-
                                     }
                                 }
                             }
@@ -251,7 +249,6 @@ public async Task<EpubDocument> ScrapingAsync(string url, string coverFilePath,
                             }
                         }
                     }
-
                 }
                 else if (element.TagName == "IMG")
                 {
@@ -333,7 +330,6 @@ public async Task<EpubDocument> ScrapingAsync(string url, string coverFilePath,
                                 paragraph.Text = TextProcess(element) + "の画像";
                             }
                         }
-
                     }
                     else if (element.ClassName == "notes")
                     {
@@ -490,7 +486,6 @@ public async Task<EpubDocument> ScrapingAsync(string url, string coverFilePath,
                                     paragraph2.Text += split[^1];
                                 }
                             }
-
                         }
                         else
                         {
@@ -504,48 +499,12 @@ public async Task<EpubDocument> ScrapingAsync(string url, string coverFilePath,
                 }
             }
 
+            // 末尾の空のparagraphを削除
             document.Chapters[^1].Sections[^1].Elements.RemoveAt(document.Chapters[^1].Sections[^1].Elements.Count - 1);
 
-            if (checkEpubDocument(document))
-            {
-                Console.WriteLine("Success");
-            }
-            else
-            {
-                Console.WriteLine("False");
-            }
             return document;
         }
 
-        private bool checkEpubDocument(EpubDocument document)
-        {
-            foreach (var chapter in document.Chapters)
-            {
-                foreach (var section in chapter.Sections)
-                {
-                    foreach (var element in section.Elements)
-                    {
-                        if (element is Paragraph paragraph)
-                        {
-                            if (paragraph.Text == null)
-                            {
-                                Console.WriteLine($"{document.Chapters.IndexOf(chapter)}, {chapter.Sections.IndexOf(section)}, {section.Elements.IndexOf(element)}");
-                                return false;
-                            }
-                        }
-                        else if (element is Picture picture)
-                        {
-                            if (picture.PictureFilePath == null)
-                            {
-                                Console.WriteLine($"{document.Chapters.IndexOf(chapter)}, {chapter.Sections.IndexOf(section)}, {section.Elements.IndexOf(element)}");
-                                return false;
-                            }
-                        }
-                    }
-                }
-            }
-            return true;
-        }
 
         private static string TextProcess(IElement element)
         {
@@ -655,8 +614,5 @@ private static string GetCardUrl(string url)
 
         [System.Text.RegularExpressions.GeneratedRegex(@"http.{1,}/([^/]{0,}\.[^/]{1,})")]
         private static partial System.Text.RegularExpressions.Regex FileUrlToFileName();
-
-        [System.Text.RegularExpressions.GeneratedRegex(@"<ruby><rb>(.{1,})</rb><rp>（</rp><rt>(.{1,})</rt><rp>）</rp></ruby>")]
-        private static partial System.Text.RegularExpressions.Regex RubyToText();
     }
 }