github/gallery-dl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge #4626: [imgbb] fix 'user' extraction, add 'displayname'

Browse Source
This commit is contained in:
Mike Fährmann
2023-10-09 15:31:23 +02:00
parent 67ba4ee842 a2daa9befe
commit 2e350dd82a
1 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
gallery_dl/extractor/imgbb.py
View File

@@ -124,12 +124,14 @@ class ImgbbAlbumExtractor(ImgbbExtractor):
self.page_url = "https://ibb.co/album/" + self.album_id self.page_url = "https://ibb.co/album/" + self.album_id
def metadata(self, page): def metadata(self, page):
album, pos = text.extract(page, '"og:title" content="', '"') album , pos = text.extract(page, '"og:title" content="', '"')
user , pos = text.extract(page, 'rel="author">', '<', pos) displayname, pos = text.extract(page, '"user":{"name":"', '"', pos)
username , pos = text.extract(page, ',"username":"', '"', pos)
return { return {
"album_id" : self.album_id, "album_id" : self.album_id,
"album_name": text.unescape(album), "album_name" : text.unescape(album),
"user" : user.lower() if user else "", "user" : username.lower() if username else "",
"displayname": displayname or "",
} }
def images(self, page): def images(self, page):
@@ -158,7 +160,12 @@ class ImgbbUserExtractor(ImgbbExtractor):
self.page_url = "https://{}.imgbb.com/".format(self.user) self.page_url = "https://{}.imgbb.com/".format(self.user)
def metadata(self, page): def metadata(self, page):
return {"user": self.user} displayname, pos = text.extract(page, '"user":{"name":"', '"')
username , pos = text.extract(page, ',"username":"', '"', pos)
return {
"user" : username or self.user,
"displayname": displayname or "",
}
def images(self, page): def images(self, page):
user = text.extr(page, '.obj.resource={"id":"', '"') user = text.extr(page, '.obj.resource={"id":"', '"')
@@ -185,11 +192,12 @@ class ImgbbImageExtractor(ImgbbExtractor):
image = { image = {
"id" : self.image_id, "id" : self.image_id,
"title" : text.unescape(extr('"og:title" content="', '"')), "title" : text.unescape(extr(
'"og:title" content="', ' hosted at ImgBB"')),
"url" : extr('"og:image" content="', '"'), "url" : extr('"og:image" content="', '"'),
"width" : text.parse_int(extr('"og:image:width" content="', '"')), "width" : text.parse_int(extr('"og:image:width" content="', '"')),
"height": text.parse_int(extr('"og:image:height" content="', '"')), "height": text.parse_int(extr('"og:image:height" content="', '"')),
"user" : extr('rel="author">', '<').lower(), "user" : extr(',"username":"', '"').lower(),
} }
image["extension"] = text.ext_from_url(image["url"]) image["extension"] = text.ext_from_url(image["url"])