Fix bug on grouple sites parsing and release 1.51.8.38

MonkAlex · Oct 26, 2022 · 44bb5fc · 44bb5fc
1 parent bd530fc
commit 44bb5fc
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,10 @@
 # История версий
+***
+## 1.51.8.38 — 2022-10-27
+
+### Исправлено
+* Доработки на https://readmanga.live/, https://mintmanga.live для глав с дробной нумерацией
+
 ***
 ## 1.51.7.37 — 2022-10-26
 

diff --git a/Sites/Grouple.ru/GroupleChapter.cs b/Sites/Grouple.ru/GroupleChapter.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Globalization;
 using System.Text.RegularExpressions;
 
 namespace Grouple
@@ -28,7 +29,7 @@ public GroupleChapter(Uri uri, string name)
       : base(uri, name)
     {
       this.VolumeNumber = Convert.ToInt32(Regex.Match(uri.ToString(), @"vol[-]?[0-9]+").Value.Remove(0, 3));
-      this.Number = Convert.ToInt32(Regex.Match(uri.ToString(), @"/[-]?[0-9]+", RegexOptions.RightToLeft).Value.Remove(0, 1));
+      this.Number = double.Parse(Regex.Match(uri.ToString(), @"/[-]?[0-9.]+", RegexOptions.RightToLeft).Value.Remove(0, 1), CultureInfo.InvariantCulture);
     }
 
     protected GroupleChapter()
@@ -39,4 +40,4 @@ protected GroupleChapter()
     #endregion
 
   }
-}
+}
diff --git a/Sites/Grouple.ru/GroupleParser.cs b/Sites/Grouple.ru/GroupleParser.cs
@@ -175,7 +175,7 @@ public override async Task UpdateContent(IManga manga)
         document.LoadHtml(page.Content);
         hasCopyrightNotice = Copyrights.Any(c => document.DocumentNode.InnerText.Contains(c));
         var linkNodes = document.DocumentNode
-          .SelectNodes("//div[@class=\"expandable chapters-link\"]//a[@href]")
+          .SelectNodes("//div[@class=\"expandable chapters-link\"]//a[contains(@class, 'chapter-link')]")
           .Reverse()
           .ToList();
         links = linkNodes

diff --git a/Tests/Tests.Entities/Manga/ReadmangaStructure.cs b/Tests/Tests.Entities/Manga/ReadmangaStructure.cs
@@ -17,6 +17,16 @@ public async Task AddEmptyReadmanga()
       Assert.AreEqual(0, chapters);
     }
 
+    [Test]
+    public async Task AddReadmangaWithFractionNumber()
+    {
+      var manga = await Mangas.Create(new Uri($"{Grouple.Constants.ReadmangaHost}vanpanchmen")).ConfigureAwait(false);
+      await new ReadmangaParser().UpdateContent(manga).ConfigureAwait(false);
+
+      var chapters = manga.Volumes.SelectMany(v => v.Container);
+      Assert.IsTrue(chapters.Any(c => c.Number == 209.2));
+    }
+
     [Test]
     public async Task AddSingleReadmanga()
     {

diff --git a/VersionInfo.cs b/VersionInfo.cs
@@ -11,4 +11,4 @@
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
-[assembly: AssemblyVersion("1.51.7.37")]
+[assembly: AssemblyVersion("1.51.8.38")]