diff options
Diffstat (limited to 'gallery_dl/extractor/imagefap.py')
| -rw-r--r-- | gallery_dl/extractor/imagefap.py | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/gallery_dl/extractor/imagefap.py b/gallery_dl/extractor/imagefap.py index 993af7c..f727969 100644 --- a/gallery_dl/extractor/imagefap.py +++ b/gallery_dl/extractor/imagefap.py @@ -39,7 +39,7 @@ class ImagefapExtractor(Extractor): class ImagefapGalleryExtractor(ImagefapExtractor): """Extractor for image galleries from imagefap.com""" subcategory = "gallery" - pattern = BASE_PATTERN + r"/(?:gallery\.php\?gid=|gallery/|pictures/)(\d+)" + pattern = rf"{BASE_PATTERN}/(?:gallery\.php\?gid=|gallery/|pictures/)(\d+)" example = "https://www.imagefap.com/gallery/12345" def __init__(self, match): @@ -51,7 +51,7 @@ class ImagefapGalleryExtractor(ImagefapExtractor): url = f"{self.root}/gallery/{self.gid}" page = self.request(url).text data = self.get_job_metadata(page) - yield Message.Directory, data + yield Message.Directory, "", data for url, image in self.get_images(): data.update(image) yield Message.Url, url, data @@ -110,7 +110,7 @@ class ImagefapGalleryExtractor(ImagefapExtractor): class ImagefapImageExtractor(ImagefapExtractor): """Extractor for single images from imagefap.com""" subcategory = "image" - pattern = BASE_PATTERN + r"/photo/(\d+)" + pattern = rf"{BASE_PATTERN}/photo/(\d+)" example = "https://www.imagefap.com/photo/12345" def __init__(self, match): @@ -119,7 +119,7 @@ class ImagefapImageExtractor(ImagefapExtractor): def items(self): url, data = self.get_image() - yield Message.Directory, data + yield Message.Directory, "", data yield Message.Url, url, data def get_image(self): @@ -148,9 +148,9 @@ class ImagefapImageExtractor(ImagefapExtractor): class ImagefapFolderExtractor(ImagefapExtractor): """Extractor for imagefap user folders""" subcategory = "folder" - pattern = (BASE_PATTERN + r"/(?:organizer/|" - r"(?:usergallery\.php\?user(id)?=([^&#]+)&" - r"|profile/([^/?#]+)/galleries\?)folderid=)(\d+|-1)") + pattern = (rf"{BASE_PATTERN}/(?:organizer/|" + rf"(?:usergallery\.php\?user(id)?=([^&#]+)&" + rf"|profile/([^/?#]+)/galleries\?)folderid=)(\d+|-1)") example = "https://www.imagefap.com/organizer/12345" def __init__(self, match): @@ -206,9 +206,9 @@ class ImagefapFolderExtractor(ImagefapExtractor): class ImagefapUserExtractor(ImagefapExtractor): """Extractor for an imagefap user profile""" subcategory = "user" - pattern = (BASE_PATTERN + - r"/(?:profile(?:\.php\?user=|/)([^/?#]+)(?:/galleries)?" - r"|usergallery\.php\?userid=(\d+))(?:$|#)") + pattern = (rf"{BASE_PATTERN}/(?:" + rf"profile(?:\.php\?user=|/)([^/?#]+)(?:/galleries)?|" + rf"usergallery\.php\?userid=(\d+))(?:$|#)") example = "https://www.imagefap.com/profile/USER" def __init__(self, match): |