From f8b037ed40806fb16225727c6a4e25fabf1c6331 Mon Sep 17 00:00:00 2001 From: termvacycurtocs <161976827+termvacycurtocs@users.noreply.github.com> Date: Sat, 2 Mar 2024 22:15:45 +0100 Subject: [PATCH] [Imagefap] Add folder metadata [Imagefap] Add "folder" metadata when downloading a folder or user profile. No additional request is made to the server. Use for example with the following configuration : "parent-metadata": true "directory":["{category}", "{uploader}", "{folder}", "{gallery_id} {title}"] --- gallery_dl/extractor/imagefap.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/gallery_dl/extractor/imagefap.py b/gallery_dl/extractor/imagefap.py index 3bdcfdfd..e1be8c9d 100644 --- a/gallery_dl/extractor/imagefap.py +++ b/gallery_dl/extractor/imagefap.py @@ -161,17 +161,19 @@ class ImagefapFolderExtractor(ImagefapExtractor): self.user = user or profile def items(self): - for gallery_id, name in self.galleries(self.folder_id): + for gallery_id, name, folder in self.galleries(self.folder_id): url = "{}/gallery/{}".format(self.root, gallery_id) data = { "gallery_id": gallery_id, "title" : text.unescape(name), + "folder" : text.unescape(folder), "_extractor": ImagefapGalleryExtractor, } yield Message.Queue, url, data def galleries(self, folder_id): """Yield gallery IDs and titles of a folder""" + folder="Uncategorized" if folder_id == "-1": if self._id: url = "{}/usergallery.php?userid={}&folderid=-1".format( @@ -187,11 +189,14 @@ class ImagefapFolderExtractor(ImagefapExtractor): 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\'>','') + while True: gid = extr('", "<") + yield gid, extr("", "<"), folder cnt += 1 if cnt < 20: