mirror of
https://github.com/mikf/gallery-dl.git
synced 2024-11-22 02:32:33 +01:00
[catbox] add 'file' extractor (#3570)
This commit is contained in:
parent
8e1e8a5bea
commit
bd5d08abbc
@ -118,7 +118,7 @@ Consider all sites to be NSFW unless otherwise known.
|
||||
<tr>
|
||||
<td>Catbox</td>
|
||||
<td>https://catbox.moe/</td>
|
||||
<td>Albums</td>
|
||||
<td>Albums, Files</td>
|
||||
<td></td>
|
||||
</tr>
|
||||
<tr>
|
||||
|
@ -1,6 +1,6 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
|
||||
# Copyright 2022 Mike Fährmann
|
||||
# Copyright 2022-2023 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
|
||||
@ -8,7 +8,7 @@
|
||||
|
||||
"""Extractors for https://catbox.moe/"""
|
||||
|
||||
from .common import GalleryExtractor
|
||||
from .common import GalleryExtractor, Extractor, Message
|
||||
from .. import text
|
||||
|
||||
|
||||
@ -54,3 +54,26 @@ class CatboxAlbumExtractor(GalleryExtractor):
|
||||
for path in text.extract_iter(
|
||||
page, ">https://files.catbox.moe/", "<")
|
||||
]
|
||||
|
||||
|
||||
class CatboxFileExtractor(Extractor):
|
||||
"""Extractor for catbox files"""
|
||||
category = "catbox"
|
||||
subcategory = "file"
|
||||
archive_fmt = "{filename}"
|
||||
pattern = r"(?:https?://)?(?:files|litter|de)\.catbox\.moe/([^/?#]+)"
|
||||
test = (
|
||||
("https://files.catbox.moe/8ih3y7.png", {
|
||||
"pattern": r"^https://files\.catbox\.moe/8ih3y7\.png$",
|
||||
"content": "0c8768055e4e20e7c7259608b67799171b691140",
|
||||
"count": 1,
|
||||
}),
|
||||
("https://litter.catbox.moe/t8v3n9.png"),
|
||||
("https://de.catbox.moe/bjdmz1.jpg"),
|
||||
)
|
||||
|
||||
def items(self):
|
||||
url = text.ensure_http_scheme(self.url)
|
||||
file = text.nameext_from_url(url, {"url": url})
|
||||
yield Message.Directory, file
|
||||
yield Message.Url, url, file
|
||||
|
Loading…
Reference in New Issue
Block a user