[batoto] support more mirror domains (#5042)

mikf · Jan 9, 2024 · 887ade3 · 887ade3
1 parent 0a382a5
commit 887ade3
Show file tree

Hide file tree

Showing 2 changed files with 123 additions and 14 deletions.
diff --git a/gallery_dl/extractor/batoto.py b/gallery_dl/extractor/batoto.py
@@ -10,8 +10,11 @@
 from .. import text, exception
 import re
 
-BASE_PATTERN = (r"(?:https?://)?"
-                r"(?:(?:ba|d|w)to\.to|(?:batotoo|mangatoto)\.com)")
+BASE_PATTERN = (r"(?:https?://)?(?:"
+                r"(?:ba|d|h|m|w)to\.to|"
+                r"(?:(?:manga|read)toto|batocomic|[xz]bato)\.(?:com|net|org)|"
+                r"comiko\.(?:net|org)|"
+                r"bat(?:otoo|o?two)\.com)")
 
 
 class BatotoBase():

diff --git a/test/results/batoto.py b/test/results/batoto.py
@@ -42,6 +42,19 @@
     "chapter": 5,
 },
 
+{
+    "#url"     : "https://bato.to/title/86408/1681030",
+    "#category": ("", "batoto", "chapter"),
+    "#class"   : batoto.BatotoChapterExtractor,
+},
+
+{
+    "#url"     : "https://bato.to/chapter/1681030",
+    "#comment" : "v2 URL",
+    "#category": ("", "batoto", "chapter"),
+    "#class"   : batoto.BatotoChapterExtractor,
+},
+
 {
     "#url"     : "https://bato.to/title/113742-futsutsuka-na-akujo-de-wa-gozaimasu-ga-suuguu-chouso-torikae-den-official",
     "#category": ("", "batoto", "manga"),
@@ -84,51 +97,144 @@
 },
 
 {
-    "#url"     : "https://bato.to/title/86408/1681030",
+    "#url"     : "https://bato.to/title/86408-i-shall-master-this-family-official",
+    "#category": ("", "batoto", "manga"),
+    "#class"   : batoto.BatotoMangaExtractor,
+},
+
+{
+    "#url"     : "https://bato.to/series/86408/i-shall-master-this-family-official",
+    "#comment" : "v2 URL",
+    "#category": ("", "batoto", "manga"),
+    "#class"   : batoto.BatotoMangaExtractor,
+},
+
+{
+    "#url"     : "https://dto.to/title/86408/1681030",
+    "#category": ("", "batoto", "chapter"),
+    "#class"   : batoto.BatotoChapterExtractor,
+},
+{
+    "#url"     : "https://hto.to/title/86408/1681030",
+    "#category": ("", "batoto", "chapter"),
+    "#class"   : batoto.BatotoChapterExtractor,
+},
+{
+    "#url"     : "https://mto.to/title/86408/1681030",
+    "#category": ("", "batoto", "chapter"),
+    "#class"   : batoto.BatotoChapterExtractor,
+},
+{
+    "#url"     : "https://wto.to/title/86408/1681030",
     "#category": ("", "batoto", "chapter"),
     "#class"   : batoto.BatotoChapterExtractor,
 },
 
 {
-    "#url"     : "https://bato.to/chapter/1681030",
+    "#url"     : "https://mangatoto.com/title/86408/1681030",
+    "#category": ("", "batoto", "chapter"),
+    "#class"   : batoto.BatotoChapterExtractor,
+},
+{
+    "#url"     : "https://mangatoto.net/title/86408/1681030",
+    "#category": ("", "batoto", "chapter"),
+    "#class"   : batoto.BatotoChapterExtractor,
+},
+{
+    "#url"     : "https://mangatoto.org/title/86408/1681030",
     "#category": ("", "batoto", "chapter"),
     "#class"   : batoto.BatotoChapterExtractor,
 },
 
 {
-    "#url"     : "https://dto.to/title/86408/1681030",
+    "#url"     : "https://batocomic.com/title/86408/1681030",
+    "#category": ("", "batoto", "chapter"),
+    "#class"   : batoto.BatotoChapterExtractor,
+},
+{
+    "#url"     : "https://batocomic.net/title/86408/1681030",
+    "#category": ("", "batoto", "chapter"),
+    "#class"   : batoto.BatotoChapterExtractor,
+},
+{
+    "#url"     : "https://batocomic.org/title/86408/1681030",
     "#category": ("", "batoto", "chapter"),
     "#class"   : batoto.BatotoChapterExtractor,
 },
 
 {
-    "#url"     : "https://wto.to/title/86408/1681030",
+    "#url"     : "https://readtoto.com/title/86408/1681030",
+    "#category": ("", "batoto", "chapter"),
+    "#class"   : batoto.BatotoChapterExtractor,
+},
+{
+    "#url"     : "https://readtoto.net/title/86408/1681030",
+    "#category": ("", "batoto", "chapter"),
+    "#class"   : batoto.BatotoChapterExtractor,
+},
+{
+    "#url"     : "https://readtoto.org/title/86408/1681030",
     "#category": ("", "batoto", "chapter"),
     "#class"   : batoto.BatotoChapterExtractor,
 },
 
 {
-    "#url"     : "https://batotoo.com/title/86408/1681030",
+    "#url"     : "https://xbato.com/title/86408/1681030",
+    "#category": ("", "batoto", "chapter"),
+    "#class"   : batoto.BatotoChapterExtractor,
+},
+{
+    "#url"     : "https://xbato.net/title/86408/1681030",
+    "#category": ("", "batoto", "chapter"),
+    "#class"   : batoto.BatotoChapterExtractor,
+},
+{
+    "#url"     : "https://xbato.org/title/86408/1681030",
     "#category": ("", "batoto", "chapter"),
     "#class"   : batoto.BatotoChapterExtractor,
 },
 
 {
-    "#url"     : "https://mangatoto.com/title/86408/1681030",
+    "#url"     : "https://zbato.com/title/86408/1681030",
+    "#category": ("", "batoto", "chapter"),
+    "#class"   : batoto.BatotoChapterExtractor,
+},
+{
+    "#url"     : "https://zbato.net/title/86408/1681030",
+    "#category": ("", "batoto", "chapter"),
+    "#class"   : batoto.BatotoChapterExtractor,
+},
+{
+    "#url"     : "https://zbato.org/title/86408/1681030",
     "#category": ("", "batoto", "chapter"),
     "#class"   : batoto.BatotoChapterExtractor,
 },
 
 {
-    "#url"     : "https://bato.to/title/86408-i-shall-master-this-family-official",
-    "#category": ("", "batoto", "manga"),
-    "#class"   : batoto.BatotoMangaExtractor,
+    "#url"     : "https://comiko.net/title/86408/1681030",
+    "#category": ("", "batoto", "chapter"),
+    "#class"   : batoto.BatotoChapterExtractor,
+},
+{
+    "#url"     : "https://comiko.org/title/86408/1681030",
+    "#category": ("", "batoto", "chapter"),
+    "#class"   : batoto.BatotoChapterExtractor,
 },
 
 {
-    "#url"     : "https://bato.to/series/86408/i-shall-master-this-family-official",
-    "#category": ("", "batoto", "manga"),
-    "#class"   : batoto.BatotoMangaExtractor,
+    "#url"     : "https://batotoo.com/title/86408/1681030",
+    "#category": ("", "batoto", "chapter"),
+    "#class"   : batoto.BatotoChapterExtractor,
+},
+{
+    "#url"     : "https://batotwo.com/title/86408/1681030",
+    "#category": ("", "batoto", "chapter"),
+    "#class"   : batoto.BatotoChapterExtractor,
+},
+{
+    "#url"     : "https://battwo.com/title/86408/1681030",
+    "#category": ("", "batoto", "chapter"),
+    "#class"   : batoto.BatotoChapterExtractor,
 },
 
 )