diff options
Diffstat (limited to 'gallery_dl/extractor/wikifeet.py')
| -rw-r--r-- | gallery_dl/extractor/wikifeet.py | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/gallery_dl/extractor/wikifeet.py b/gallery_dl/extractor/wikifeet.py index f7bfeb2..31dc9cd 100644 --- a/gallery_dl/extractor/wikifeet.py +++ b/gallery_dl/extractor/wikifeet.py @@ -21,11 +21,11 @@ class WikifeetGalleryExtractor(GalleryExtractor): example = "https://www.wikifeet.com/CELEB" def __init__(self, match): - self.root = text.root_from_url(match.group(0)) + self.root = text.root_from_url(match[0]) if "wikifeetx.com" in self.root: self.category = "wikifeetx" self.type = "men" if "://men." in self.root else "women" - self.celeb = match.group(1) + self.celeb = match[1] GalleryExtractor.__init__(self, match, self.root + "/" + self.celeb) def metadata(self, page): @@ -50,9 +50,11 @@ class WikifeetGalleryExtractor(GalleryExtractor): "S": "Soles", "B": "Barefoot", } - ufmt = "https://pics.wikifeet.com/" + self.celeb + "-Feet-{}.jpg" + + gallery = text.extr(page, '"gallery":[', '],') + base = f"https://pics.wikifeet.com/{self.celeb}-Feet-" return [ - (ufmt.format(data["pid"]), { + (f"{base}{data['pid']}.jpg", { "pid" : data["pid"], "width" : data["pw"], "height": data["ph"], @@ -61,6 +63,5 @@ class WikifeetGalleryExtractor(GalleryExtractor): for tag in data["tags"] if tag in tagmap ], }) - for data in - util.json_loads("[" + text.extr(page, '"gallery":[', '],') + "]") + for data in util.json_loads(f"[{gallery}]") ] |