[imgbb] Fix user extraction, add displayname

mikf · Oct 5, 2023 · b846f56 · b846f56
1 parent 85357c1
commit b846f56
Showing 1 changed file with 14 additions and 8 deletions.
diff --git a/gallery_dl/extractor/imgbb.py b/gallery_dl/extractor/imgbb.py
@@ -124,12 +124,14 @@ def __init__(self, match):
         self.page_url = "https://ibb.co/album/" + self.album_id
 
     def metadata(self, page):
-        album, pos = text.extract(page, '"og:title" content="', '"')
-        user , pos = text.extract(page, 'rel="author">', '<', pos)
+        album      , pos = text.extract(page, '"og:title" content="', '"')
+        user       , pos = text.extract(page, ',"username":"', '"', pos)
+        displayname, pos = text.extract(page, '"user":{"name":"', '"')
         return {
-            "album_id"  : self.album_id,
-            "album_name": text.unescape(album),
-            "user"      : user.lower() if user else "",
+            "album_id"   : self.album_id,
+            "album_name" : text.unescape(album),
+            "user"       : user.lower() if user else "",
+            "displayname": displayname if displayname else "",
         }
 
     def images(self, page):
@@ -158,7 +160,11 @@ def __init__(self, match):
         self.page_url = "https://{}.imgbb.com/".format(self.user)
 
     def metadata(self, page):
-        return {"user": self.user}
+        displayname, pos = text.extract(page, '"user":{"name":"', '"')
+        return {
+            "user"       : self.user,
+            "displayname": displayname if displayname else "",
+        }
 
     def images(self, page):
         user = text.extr(page, '.obj.resource={"id":"', '"')
@@ -185,11 +191,11 @@ def items(self):
 
         image = {
             "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="', '"'),
             "width" : text.parse_int(extr('"og:image:width" 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"])