New upstream version 1.25.3.upstream/1.25.3

1 files changed, 24 insertions, 2 deletions

diff --git a/gallery_dl/extractor/imagefap.py b/gallery_dl/extractor/imagefap.py
index 497f1ef..c91347e 100644
--- a/gallery_dl/extractor/imagefap.py
+++ b/gallery_dl/extractor/imagefap.py
@@ -49,14 +49,16 @@ class ImagefapGalleryExtractor(ImagefapExtractor):
         ("https://www.imagefap.com/gallery/7102714", {
             "pattern": r"https://cdnh?\.imagefap\.com"
                        r"/images/full/\d+/\d+/\d+\.jpg",
-            "keyword": "2ba96e84c2952c4750e9fa94a3f2b1f965cec2f3",
+            "keyword": "bdcb75b1e4b9dddc718f3d66e1a58afa9d81a38b",
             "content": "694a0a57385980a6f90fbc296cadcd6c11ba2dab",
         }),
         ("https://www.imagefap.com/gallery/7876223", {
             "pattern": r"https://cdnh?\.imagefap\.com"
                        r"/images/full/\d+/\d+/\d+\.jpg",
             "keyword": {
+                "categories": ["Asses", "Softcore", "Pornstars"],
                 "count": 44,
+                "description": "",
                 "gallery_id": 7876223,
                 "image_id": int,
                 "num": int,
@@ -67,6 +69,21 @@ class ImagefapGalleryExtractor(ImagefapExtractor):
             },
             "count": 44,
         }),
+        # description (#3905)
+        ("https://www.imagefap.com/gallery/6180555", {
+            "range": "1",
+            "keyword": {
+                "categories": ["Amateur", "Softcore", "Homemade"],
+                "count": 36,
+                "description": "Nude and dressed sluts showing off the goods",
+                "gallery_id": 6180555,
+                "image_id": int,
+                "num": int,
+                "tags": []  ,
+                "title": "Dressed or Undressed MG*",
+                "uploader": "splitopen",
+            },
+        }),
         ("https://www.imagefap.com/pictures/7102714"),
         ("https://www.imagefap.com/gallery.php?gid=7102714"),
         ("https://beta.imagefap.com/gallery.php?gid=7102714"),
@@ -92,9 +109,14 @@ class ImagefapGalleryExtractor(ImagefapExtractor):
 
         data = {
             "gallery_id": text.parse_int(self.gid),
-            "tags": extr('name="keywords" content="', '"').split(", "),
             "uploader": extr("porn picture gallery by ", " to see hottest"),
             "title": text.unescape(extr("<title>", "<")),
+            "description": text.unescape(extr(
+                'id="gdesc_text"', '<').partition(">")[2]),
+            "categories": text.split_html(extr(
+                'id="cnt_cats"', '</div>'))[1::2],
+            "tags": text.split_html(extr(
+                'id="cnt_tags"', '</div>'))[1::2],
             "count": text.parse_int(extr(' 1 of ', ' pics"')),
         }