[imagefap] flake8, cleanup, tests

gallery_dl/extractor/imagefap.py

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

test/results/imagefap.py

@@ -124,7 +124,11 @@ __tests__ = (
     "#url"     : "https://www.imagefap.com/usergallery.php?userid=1981976&folderid=409758",
     "#category": ("", "imagefap", "folder"),
     "#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,
     "#pattern" : imagefap.ImagefapGalleryExtractor.pattern,
     "#range"   : "1-40",
+
+    "folder": "Uncategorized",
 },
 
 {