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

[imgbb] fix flake8 and username order

Browse Source
This commit is contained in:
Mike Fährmann
2023-10-09 15:29:17 +02:00
parent b846f56c3a
commit a2daa9befe
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
gallery_dl/extractor/imgbb.py
View File

@@ -125,13 +125,13 @@ class ImgbbAlbumExtractor(ImgbbExtractor):
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, ',"username":"', '"', pos) displayname, pos = text.extract(page, '"user":{"name":"', '"', pos)
displayname, pos = text.extract(page, '"user":{"name":"', '"') 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 if displayname else "", "displayname": displayname or "",
} }
def images(self, page): def images(self, page):
@@ -161,9 +161,10 @@ class ImgbbUserExtractor(ImgbbExtractor):
def metadata(self, page): def metadata(self, page):
displayname, pos = text.extract(page, '"user":{"name":"', '"') displayname, pos = text.extract(page, '"user":{"name":"', '"')
username , pos = text.extract(page, ',"username":"', '"', pos)
return { return {
"user" : self.user, "user" : username or self.user,
"displayname": displayname if displayname else "", "displayname": displayname or "",
} }
def images(self, page): def images(self, page):
@@ -191,7 +192,8 @@ class ImgbbImageExtractor(ImgbbExtractor):
image = { image = {
"id" : self.image_id, "id" : self.image_id,
"title" : text.unescape(extr('"og:title" content="', ' hosted at ImgBB"')), "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="', '"')),