New upstream version 1.29.5.upstream/1.29.5

1 files changed, 8 insertions, 7 deletions

diff --git a/gallery_dl/extractor/wikifeet.py b/gallery_dl/extractor/wikifeet.py
index d3586c0..f7bfeb2 100644
--- a/gallery_dl/extractor/wikifeet.py
+++ b/gallery_dl/extractor/wikifeet.py
@@ -33,12 +33,12 @@ class WikifeetGalleryExtractor(GalleryExtractor):
         return {
             "celeb"     : self.celeb,
             "type"      : self.type,
-            "rating"    : text.parse_float(extr('"ratingValue": "', '"')),
-            "celebrity" : text.unescape(extr("times'>", "</h1>")),
-            "shoesize"  : text.remove_html(extr("Shoe Size:", "edit")),
-            "birthplace": text.remove_html(extr("Birthplace:", "edit")),
-            "birthday"  : text.parse_datetime(text.remove_html(
-                extr("Birth Date:", "edit")), "%Y-%m-%d"),
+            "birthplace": text.unescape(extr('"bplace":"', '"')),
+            "birthday"  : text.parse_datetime(text.unescape(
+                extr('"bdate":"', '"'))[:10], "%Y-%m-%d"),
+            "shoesize"  : text.unescape(extr('"ssize":', ',')),
+            "rating"    : text.parse_float(extr('"score":', ',')),
+            "celebrity" : text.unescape(extr('"cname":"', '"')),
         }
 
     def images(self, page):
@@ -61,5 +61,6 @@ class WikifeetGalleryExtractor(GalleryExtractor):
                     for tag in data["tags"] if tag in tagmap
                 ],
             })
-            for data in util.json_loads(text.extr(page, "['gdata'] = ", ";"))
+            for data in
+            util.json_loads("[" + text.extr(page, '"gallery":[', '],') + "]")
         ]