Skip to content

Commit

Permalink
[catbox] add 'album' extractor (#2410)
Browse files Browse the repository at this point in the history
adapted from #2805

- rewrite using GalleryExtractor
- extract more metadata
- match lolisafe names
- add test
  • Loading branch information
mikf committed Aug 18, 2022
1 parent 264f133 commit a799fae
Show file tree
Hide file tree
Showing 3 changed files with 63 additions and 0 deletions.
6 changes: 6 additions & 0 deletions docs/supportedsites.md
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,12 @@ Consider all sites to be NSFW unless otherwise known.
<td>Albums</td>
<td></td>
</tr>
<tr>
<td>Catbox</td>
<td>https://catbox.moe/</td>
<td>Albums</td>
<td></td>
</tr>
<tr>
<td>Comic Vine</td>
<td>https://comicvine.gamespot.com/</td>
Expand Down
1 change: 1 addition & 0 deletions gallery_dl/extractor/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
"behance",
"blogger",
"bunkr",
"catbox",
"comicvine",
"cyberdrop",
"danbooru",
Expand Down
56 changes: 56 additions & 0 deletions gallery_dl/extractor/catbox.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
# -*- coding: utf-8 -*-

# Copyright 2022 Mike Fährmann
#
# 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.

"""Extractors for https://catbox.moe/"""

from .common import GalleryExtractor
from .. import text


class CatboxAlbumExtractor(GalleryExtractor):
"""Extractor for catbox albums"""
category = "catbox"
subcategory = "album"
root = "https://catbox.moe"
filename_fmt = "{filename}.{extension}"
directory_fmt = ("{category}", "{album_name} ({album_id})")
archive_fmt = "{album_id}_{filename}"
pattern = r"(?:https?://)?(?:www\.)?catbox\.moe(/c/[^/?#]+)"
test = (
("https://catbox.moe/c/1igcbe", {
"url": "35866a88c29462814f103bc22ec031eaeb380f8a",
"content": "70ddb9de3872e2d17cc27e48e6bf395e5c8c0b32",
"pattern": r"https://files\.catbox\.moe/\w+\.\w{3}$",
"count": 3,
"keyword": {
"album_id": "1igcbe",
"album_name": "test",
"date": "dt:2022-08-18 00:00:00",
"description": "album test &>",
},
}),
("https://www.catbox.moe/c/cd90s1"),
("https://catbox.moe/c/w7tm47#"),
)

def metadata(self, page):
extr = text.extract_from(page)
return {
"album_id" : self.gallery_url.rpartition("/")[2],
"album_name" : text.unescape(extr("<h1>", "<")),
"date" : text.parse_datetime(extr(
"<p>Created ", "<"), "%B %d %Y"),
"description": text.unescape(extr("<p>", "<")),
}

def images(self, page):
return [
("https://files.catbox.moe/" + path, None)
for path in text.extract_iter(
page, ">https://files.catbox.moe/", "<")
]

0 comments on commit a799fae

Please sign in to comment.