github/gallery-dl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[imagefap] flake8, cleanup, tests

Browse Source
This commit is contained in:
Mike Fährmann
2024-03-07 01:29:19 +01:00
parent f8b037ed40
commit 05331f9cf1
2 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
gallery_dl/extractor/imagefap.py
View File

@@ -173,8 +173,8 @@ class ImagefapFolderExtractor(ImagefapExtractor):
def galleries(self, folder_id): def galleries(self, folder_id):
"""Yield gallery IDs and titles of a folder""" """Yield gallery IDs and titles of a folder"""
folder="Uncategorized"
if folder_id == "-1": if folder_id == "-1":
folder_name = "Uncategorized"
if self._id: if self._id:
url = "{}/usergallery.php?userid={}&folderid=-1".format( url = "{}/usergallery.php?userid={}&folderid=-1".format(
self.root, self.user) self.root, self.user)
@@ -182,26 +182,28 @@ class ImagefapFolderExtractor(ImagefapExtractor):
url = "{}/profile/{}/galleries?folderid=-1".format( url = "{}/profile/{}/galleries?folderid=-1".format(
self.root, self.user) self.root, self.user)
else: else:
folder_name = None
url = "{}/organizer/{}/".format(self.root, folder_id) url = "{}/organizer/{}/".format(self.root, folder_id)
params = {"page": 0} params = {"page": 0}
while True: extr = text.extract_from(self.request(url, params=params).text)
extr = text.extract_from(self.request(url, params=params).text) if not folder_name:
cnt = 0 folder_name = extr("class'blk_galleries'><b>", "</b>")
if folder_id != -1 and params["page"] == 0: while True:
folder = extr('class\'blk_galleries\'><b>','</b>') cnt = 0
while True: while True:
gid = extr('<a href="/gallery/', '"') gid = extr('<a href="/gallery/', '"')
if not gid: if not gid:
break break
yield gid, extr("<b>", "<"), folder yield gid, extr("<b>", "<"), folder_name
cnt += 1 cnt += 1
if cnt < 20: if cnt < 20:
break break
params["page"] += 1 params["page"] += 1
extr = text.extract_from(self.request(url, params=params).text)
class ImagefapUserExtractor(ImagefapExtractor): class ImagefapUserExtractor(ImagefapExtractor):

8
test/results/imagefap.py
View File

@@ -124,7 +124,11 @@ __tests__ = (
"#url" : "https://www.imagefap.com/usergallery.php?userid=1981976&folderid=409758", "#url" : "https://www.imagefap.com/usergallery.php?userid=1981976&folderid=409758",
"#category": ("", "imagefap", "folder"), "#category": ("", "imagefap", "folder"),
"#class" : imagefap.ImagefapFolderExtractor, "#class" : imagefap.ImagefapFolderExtractor,
"#sha1_url": "37822523e6e4a56feb9dea35653760c86b44ff89", "#urls" : "https://www.imagefap.com/gallery/7876223",
"folder" : "Softcore",
"gallery_id": "7876223",
"title" : "Kelsi Monroe in lingerie",
}, },
{ {
@@ -140,6 +144,8 @@ __tests__ = (
"#class" : imagefap.ImagefapFolderExtractor, "#class" : imagefap.ImagefapFolderExtractor,
"#pattern" : imagefap.ImagefapGalleryExtractor.pattern, "#pattern" : imagefap.ImagefapGalleryExtractor.pattern,
"#range" : "1-40", "#range" : "1-40",
"folder": "Uncategorized",
}, },
{ {