[chevereto] support 'img.kiwi' and 'deltaporno.com' (#4664, #1381)

docs/supportedsites.md

@@ -1007,6 +1007,18 @@ Consider all sites to be NSFW unless otherwise known.
     <td>Albums, individual Images, User Profiles</td>
     <td></td>
 </tr>
+<tr>
+    <td>IMG.Kiwi</td>
+    <td>https://img.kiwi/</td>
+    <td>Albums, individual Images, User Profiles</td>
+    <td></td>
+</tr>
+<tr>
+    <td>DeltaPorno</td>
+    <td>https://gallery.deltaporno.com/</td>
+    <td>Albums, individual Images, User Profiles</td>
+    <td></td>
+</tr>
 
 <tr>
     <td colspan="4"><strong>Danbooru Instances</strong></td>

gallery_dl/extractor/chevereto.py

@@ -42,6 +42,14 @@ BASE_PATTERN = CheveretoExtractor.update({
         "root": "https://pixl.li",
         "pattern": r"pixl\.(?:li|is)",
     },
+    "imgkiwi": {
+        "root": "https://img.kiwi",
+        "pattern": r"img\.kiwi",
+    },
+    "deltaporno": {
+        "root": "https://gallery.deltaporno.com",
+        "pattern": r"gallery\.deltaporno\.com",
+    },
 })
 
 

scripts/supportedsites.py

@@ -35,6 +35,7 @@ CATEGORY_MAP = {
     "bbc"            : "BBC",
     "comicvine"      : "Comic Vine",
     "coomerparty"    : "Coomer",
+    "deltaporno"     : "DeltaPorno",
     "deviantart"     : "DeviantArt",
     "drawfriends"    : "Draw Friends",
     "dynastyscans"   : "Dynasty Reader",
@@ -65,6 +66,7 @@ CATEGORY_MAP = {
     "imgbb"          : "ImgBB",
     "imgbox"         : "imgbox",
     "imagechest"     : "ImageChest",
+    "imgkiwi"        : "IMG.Kiwi",
     "imgth"          : "imgth",
     "imgur"          : "imgur",
     "joyreactor"     : "JoyReactor",

test/results/deltaporno.py

@@ -0,0 +1,41 @@
+# -*- coding: utf-8 -*-
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 as
+# published by the Free Software Foundation.
+
+from gallery_dl.extractor import chevereto
+
+
+__tests__ = (
+{
+    "#url"     : "https://gallery.deltaporno.com/image/7af6c7e241c600cd83dffdb22d4a1bb83336ede3b04bf406b36abf7b6f7dc4d8.8Gchu",
+    "#category": ("chevereto", "deltaporno", "image"),
+    "#class"   : chevereto.CheveretoImageExtractor,
+    "#urls"        : "https://gallery.deltaporno.com/images/2023/02/16/7af6c7e241c600cd83dffdb22d4a1bb83336ede3b04bf406b36abf7b6f7dc4d82e43ec48389730d4.jpg",
+    "#sha1_content": "f7e2a138b00c0742ccd77ab4031703bd8cc5b5a7",
+
+    "album"    : "Urmumanddad321 nude",
+    "extension": "jpg",
+    "filename" : "7af6c7e241c600cd83dffdb22d4a1bb83336ede3b04bf406b36abf7b6f7dc4d82e43ec48389730d4",
+    "id"       : "8Gchu",
+    "url"      : "https://gallery.deltaporno.com/images/2023/02/16/7af6c7e241c600cd83dffdb22d4a1bb83336ede3b04bf406b36abf7b6f7dc4d82e43ec48389730d4.jpg",
+    "user"     : "delta",
+},
+
+{
+    "#url"     : "https://gallery.deltaporno.com/album/urmumanddad321-nude.RqCYu",
+    "#category": ("chevereto", "deltaporno", "album"),
+    "#class"   : chevereto.CheveretoAlbumExtractor,
+    "#pattern" : chevereto.CheveretoImageExtractor.pattern,
+    "#count"   : 28,
+    "#sha1_url": "fab8121bce72a9db2d1ed1e7520317a7a454d6c5",
+},
+
+{
+    "#url"     : "https://gallery.deltaporno.com/delta",
+    "#category": ("chevereto", "deltaporno", "user"),
+    "#class"   : chevereto.CheveretoUserExtractor,
+},
+
+)

test/results/imgkiwi.py

@@ -0,0 +1,51 @@
+# -*- coding: utf-8 -*-
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 as
+# published by the Free Software Foundation.
+
+from gallery_dl.extractor import chevereto
+
+
+__tests__ = (
+{
+    "#url"     : "https://img.kiwi/image/79de2c41-70f9-4a87-bd6d-00fe9997c0c4.JR2wZz",
+    "#category": ("chevereto", "imgkiwi", "image"),
+    "#class"   : chevereto.CheveretoImageExtractor,
+    "#urls"        : "https://img.kiwi/images/2023/02/28/11ac1ebf28a2eae8265026b28e9c4413.jpg",
+    "#sha1_content": "9ea704a77e2038b9008350682cfad53a614a60bd",
+
+    "album"    : "Kins3y Wolansk1",
+    "extension": "jpg",
+    "filename" : "11ac1ebf28a2eae8265026b28e9c4413",
+    "id"       : "JR2wZz",
+    "url"      : "https://img.kiwi/images/2023/02/28/11ac1ebf28a2eae8265026b28e9c4413.jpg",
+    "user"     : "johnirl",
+},
+
+{
+    "#url"     : "https://img.kiwi/album/kins3y-wolansk1.8Jxc",
+    "#category": ("chevereto", "imgkiwi", "album"),
+    "#class"   : chevereto.CheveretoAlbumExtractor,
+    "#pattern" : chevereto.CheveretoImageExtractor.pattern,
+    "#count"   : 19,
+},
+
+{
+    "#url"     : "https://img.kiwi/johnirl",
+    "#category": ("chevereto", "imgkiwi", "user"),
+    "#class"   : chevereto.CheveretoUserExtractor,
+    "#pattern" : chevereto.CheveretoImageExtractor.pattern,
+    "#range"   : "1-20",
+    "#count"   : 20,
+},
+
+{
+    "#url"     : "https://img.kiwi/johnirl/albums",
+    "#category": ("chevereto", "imgkiwi", "user"),
+    "#class"   : chevereto.CheveretoUserExtractor,
+    "#pattern" : chevereto.CheveretoAlbumExtractor.pattern,
+    "#count"   : 50,
+},
+
+)