From 0579726d8018ddf65d70cabea12ae36e79cb55e5 Mon Sep 17 00:00:00 2001 From: Parasiteoflife <57022988+parasiteoflife@users.noreply.github.com> Date: Sun, 20 Apr 2025 21:53:57 -0500 Subject: [PATCH 1/2] fix: Wikifeet - support redesign --- gallery_dl/extractor/wikifeet.py | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/gallery_dl/extractor/wikifeet.py b/gallery_dl/extractor/wikifeet.py index d3586c01..14b5b64e 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'>", "")), - "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":"', '"'))), + "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":[', '],') + "]") ] From b71b5af38aff82c977d6e0163914ff3040f1d6cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mike=20F=C3=A4hrmann?= Date: Mon, 21 Apr 2025 17:32:54 +0200 Subject: [PATCH 2/2] [wikifeet] fix 'bdate' parsing and update 'shoesize' test results --- gallery_dl/extractor/wikifeet.py | 10 +++++----- test/results/wikifeet.py | 4 ++-- test/results/wikifeetx.py | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/gallery_dl/extractor/wikifeet.py b/gallery_dl/extractor/wikifeet.py index 14b5b64e..f7bfeb2d 100644 --- a/gallery_dl/extractor/wikifeet.py +++ b/gallery_dl/extractor/wikifeet.py @@ -34,11 +34,11 @@ class WikifeetGalleryExtractor(GalleryExtractor): "celeb" : self.celeb, "type" : self.type, "birthplace": text.unescape(extr('"bplace":"', '"')), - "birthday": text.parse_datetime(text.unescape( - extr('"bdate":"', '"'))), - "shoesize": text.unescape(extr('"ssize":', ',')), - "rating": text.parse_float(extr('"score":', ',')), - "celebrity": text.unescape(extr('"cname":"', '"')), + "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): diff --git a/test/results/wikifeet.py b/test/results/wikifeet.py index 2a8b849b..0e897042 100644 --- a/test/results/wikifeet.py +++ b/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, }, diff --git a/test/results/wikifeetx.py b/test/results/wikifeetx.py index a3d2be6e..4ba7f4a3 100644 --- a/test/results/wikifeetx.py +++ b/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, },