merge #7396: [wikifeet] support redesign

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":[', '],') + "]")
         ]

test/results/wikifeet.py

@@ -23,7 +23,7 @@ __tests__ = (
     "pid"       : int,
     "width"     : int,
     "height"    : int,
-    "shoesize"  : r"re:\d+ US",
+    "shoesize"  : r"re:\d+",
     "type"      : "women",
     "tags"      : list,
 },
@@ -43,7 +43,7 @@ __tests__ = (
     "pid"       : int,
     "width"     : int,
     "height"    : int,
-    "shoesize"  : "12.5 US",
+    "shoesize"  : "22",
     "type"      : "men",
     "tags"      : list,
 },

test/results/wikifeetx.py

@@ -17,13 +17,13 @@ __tests__ = (
 
     "celeb"     : "Tifa_Quinn",
     "celebrity" : "Tifa Quinn",
-    "birthday"  : "[NOT SET]",
+    "birthday"  : "",
     "birthplace": "United States",
     "rating"    : float,
     "pid"       : int,
     "width"     : int,
     "height"    : int,
-    "shoesize"  : "4 US",
+    "shoesize"  : "5",
     "type"      : "women",
     "tags"      : list,
 },