diff --git a/docs/supportedsites.md b/docs/supportedsites.md
index 79a36f4f..b2ef02ac 100644
--- a/docs/supportedsites.md
+++ b/docs/supportedsites.md
@@ -73,12 +73,6 @@ Consider all listed sites to potentially be NSFW.
| Albums |
|
-
- | Acidimg |
- https://acidimg.cc/ |
- individual Images |
- |
-
| Adobe Portfolio |
https://www.myportfolio.com/ |
@@ -301,12 +295,6 @@ Consider all listed sites to potentially be NSFW.
Models, Videos, Trending Posts, Popular Videos, Top Models, Posts |
|
-
- | Fappic |
- https://fappic.com/ |
- individual Images |
- |
-
| Flickr |
https://www.flickr.com/ |
@@ -439,24 +427,6 @@ Consider all listed sites to potentially be NSFW.
Folders, Galleries, individual Images, User Profiles |
|
-
- | Imagetwist |
- https://imagetwist.com/ |
- Galleries, individual Images |
- |
-
-
- | Imagevenue |
- https://www.imagevenue.com/ |
- individual Images |
- |
-
-
- | ImgAdult |
- https://imgadult.com/ |
- individual Images |
- |
-
| ImgBB |
https://imgbb.com/ |
@@ -469,28 +439,10 @@ Consider all listed sites to potentially be NSFW.
Galleries, individual Images |
|
-
- | Imgclick |
- http://imgclick.net/ |
- individual Images |
- |
-
| ImgDrive.net |
https://imgdrive.net/ |
- individual Images |
|
-
-
- | Imgspice |
- https://imgspice.com/ |
- individual Images |
- |
-
-
- | ImgTaxi.com |
- https://imgtaxi.com/ |
- individual Images |
|
@@ -505,18 +457,6 @@ Consider all listed sites to potentially be NSFW.
| Albums, Favorites, Favorites Folders, Galleries, individual Images, Personal Posts, Search Results, Subreddits, Tag Searches, User Profiles |
|
-
- | ImgWallet.com |
- https://imgwallet.com/ |
- individual Images |
- |
-
-
- | Imxto |
- https://imx.to/ |
- Galleries, individual Images |
- |
-
| Inkbunny |
https://inkbunny.net/ |
@@ -751,12 +691,6 @@ Consider all listed sites to potentially be NSFW.
Galleries |
|
-
- | Picstate |
- https://picstate.com/ |
- individual Images |
- |
-
| Pictoa |
https://pictoa.com/ |
@@ -787,12 +721,6 @@ Consider all listed sites to potentially be NSFW.
Albums, Files, Filesystems |
|
-
- | Pixhost |
- https://pixhost.to/ |
- Galleries, individual Images |
- |
-
| [pixiv] |
https://www.pixiv.net/ |
@@ -847,12 +775,6 @@ Consider all listed sites to potentially be NSFW.
Galleries, Search Results, Tag Searches |
|
-
- | Postimg |
- https://postimages.org/ |
- Galleries, individual Images |
- |
-
| R34 Vault |
https://rule34vault.com/ |
@@ -955,12 +877,6 @@ Consider all listed sites to potentially be NSFW.
Boards, Likes, Pins, User Pins, related Pins, Search Results |
|
-
- | SilverPic.com |
- https://silverpic.com/ |
- individual Images |
- |
-
| Simply Hentai |
https://www.simply-hentai.com/ |
@@ -1079,12 +995,6 @@ Consider all listed sites to potentially be NSFW.
Posts, Search Results, Tumblrblogs |
|
-
- | Turboimagehost |
- https://www.turboimagehost.com/ |
- Galleries, individual Images |
- |
-
| Twibooru |
https://twibooru.org/ |
@@ -1121,12 +1031,6 @@ Consider all listed sites to potentially be NSFW.
Posts, Threads |
Supported |
-
- | Vipr |
- https://vipr.im/ |
- individual Images |
- |
-
| VK |
https://vk.com/ |
@@ -1995,5 +1899,111 @@ Consider all listed sites to potentially be NSFW.
Albums |
|
+
+
+ | Image Hosting Sites |
+
+
+ | Acidimg |
+ https://acidimg.cc/ |
+ individual Images |
+ |
+
+
+ | Fappic.com |
+ https://fappic.com/ |
+ individual Images |
+ |
+
+
+ | ImageTwist |
+ https://imagetwist.com/ |
+ Galleries, individual Images |
+ |
+
+
+ | Imagevenue |
+ https://www.imagevenue.com/ |
+ individual Images |
+ |
+
+
+ | ImgAdult |
+ https://imgadult.com/ |
+ individual Images |
+ |
+
+
+ | Imgclick |
+ http://imgclick.net/ |
+ individual Images |
+ |
+
+
+ | ImgDrive.net |
+ https://imgdrive.net/ |
+ individual Images |
+ |
+
+
+ | Imgspice |
+ https://imgspice.com/ |
+ individual Images |
+ |
+
+
+ | ImgTaxi.com |
+ https://imgtaxi.com/ |
+ |
+ |
+
+
+ | ImgWallet.com |
+ https://imgwallet.com/ |
+ |
+ |
+
+
+ | IMX.to |
+ https://imx.to/ |
+ Galleries, individual Images |
+ |
+
+
+ | PicState |
+ https://picstate.com/ |
+ individual Images |
+ |
+
+
+ | PiXhost |
+ https://pixhost.to/ |
+ Galleries, individual Images |
+ |
+
+
+ | Postimages |
+ https://postimages.org/ |
+ Galleries, individual Images |
+ |
+
+
+ | SilverPic.com |
+ https://silverpic.com/ |
+ individual Images |
+ |
+
+
+ | TurboImageHost.com |
+ https://www.turboimagehost.com/ |
+ Galleries, individual Images |
+ |
+
+
+ | Vipr.im |
+ https://vipr.im/ |
+ individual Images |
+ |
+
diff --git a/scripts/supportedsites.py b/scripts/supportedsites.py
index ddbcbb46..c40dfce5 100755
--- a/scripts/supportedsites.py
+++ b/scripts/supportedsites.py
@@ -54,6 +54,7 @@ CATEGORY_MAP = {
"exhentai" : "ExHentai",
"fallenangels" : "Fallen Angels Scans",
"fanbox" : "pixivFANBOX",
+ "fappic" : "Fappic.com",
"fashionnova" : "Fashion Nova",
"furaffinity" : "Fur Affinity",
"furry34" : "Furry 34 com",
@@ -80,6 +81,7 @@ CATEGORY_MAP = {
"imagebam" : "ImageBam",
"imagefap" : "ImageFap",
"imagepond" : "ImagePond",
+ "imagetwist" : "ImageTwist",
"imgadult" : "ImgAdult",
"imgbb" : "ImgBB",
"imgbox" : "imgbox",
@@ -91,6 +93,7 @@ CATEGORY_MAP = {
"imgur" : "imgur",
"imgwallet" : "ImgWallet.com",
"imhentai" : "IMHentai",
+ "imxto" : "IMX.to",
"joyreactor" : "JoyReactor",
"itchio" : "itch.io",
"jpgfish" : "JPG Fish",
@@ -126,13 +129,16 @@ CATEGORY_MAP = {
"nudostar" : "NudoStar.TV",
"paheal" : "Rule 34",
"photovogue" : "PhotoVogue",
+ "picstate" : "PicState",
"pidgiwiki" : "PidgiWiki",
"pixeldrain" : "pixeldrain",
+ "pixhost" : "PiXhost",
"pixiv" : "[pixiv]",
"pixiv-novel" : "[pixiv] Novels",
"pornimage" : "Porn Image",
"pornpics" : "PornPics.com",
"pornreactor" : "PornReactor",
+ "postimg" : "Postimages",
"readcomiconline": "Read Comic Online",
"redbust" : "RedBust",
"rbt" : "RebeccaBlackTech",
@@ -166,9 +172,11 @@ CATEGORY_MAP = {
"tiktok" : "TikTok",
"tmohentai" : "TMOHentai",
"tumblrgallery" : "TumblrGallery",
+ "turboimagehost" : "TurboImageHost.com",
"vanillarock" : "もえぴりあ",
"vidyart2" : "/v/idyart2",
"vidyapics" : "Vidya Booru",
+ "vipr" : "Vipr.im",
"visuabusters" : "VISUABUSTERS",
"vk" : "VK",
"vsco" : "VSCO",
@@ -440,6 +448,7 @@ BASE_MAP = {
"gelbooru_v01": "Gelbooru Beta 0.1.11",
"gelbooru_v02": "Gelbooru Beta 0.2",
"hentaicosplays": "Hentai Cosplay Instances",
+ "imagehost" : "Image Hosting Sites",
"IMHentai" : "IMHentai and Mirror Sites",
"jschan" : "jschan Imageboards",
"lolisafe" : "lolisafe and chibisafe",
@@ -614,7 +623,11 @@ def build_extractor_list():
if category in IGNORE_LIST:
continue
if category:
- default[category].append(extr.subcategory)
+ if extr.basecategory == "imagehost":
+ base = categories[extr.basecategory]
+ else:
+ base = default
+ base[category].append(extr.subcategory)
if category not in domains:
domains[category] = domain(extr)
else:
@@ -654,8 +667,10 @@ def build_extractor_list():
domains["wikifeetx"] = "https://www.wikifeetx.com/"
# imgdrive / imgtaxi / imgwallet
- default["imgtaxi"] = default["imgdrive"]
- default["imgwallet"] = default["imgdrive"]
+ base = categories["imagehost"]
+ base["imgtaxi"] = default["imgdrive"]
+ base["imgwallet"] = default["imgdrive"]
+ categories["imagehost"] = {k: base[k] for k in sorted(base)}
domains["imgtaxi"] = "https://imgtaxi.com/"
domains["imgwallet"] = "https://imgwallet.com/"
@@ -689,7 +704,6 @@ def generate_output(columns, categories, domains):
tbody = []
for bcat, base in categories.items():
-
if bcat and base:
name = BASE_MAP.get(bcat) or (bcat.capitalize() + " Instances")
tbody.append(f"""