diff --git a/gallery_dl/extractor/2ch.py b/gallery_dl/extractor/2ch.py
index 40f4e8aa..1f17c993 100644
--- a/gallery_dl/extractor/2ch.py
+++ b/gallery_dl/extractor/2ch.py
@@ -42,7 +42,7 @@ class _2chThreadExtractor(Extractor):
"title" : text.unescape(title)[:50],
}
- yield Message.Directory, thread
+ yield Message.Directory, "", thread
for post in posts:
if files := post.get("files"):
post["post_name"] = post["name"]
diff --git a/gallery_dl/extractor/2chan.py b/gallery_dl/extractor/2chan.py
index 9927b5ab..0e250c9d 100644
--- a/gallery_dl/extractor/2chan.py
+++ b/gallery_dl/extractor/2chan.py
@@ -31,7 +31,7 @@ class _2chanThreadExtractor(Extractor):
f"/{self.board}/res/{self.thread}.htm")
page = self.request(url).text
data = self.metadata(page)
- yield Message.Directory, data
+ yield Message.Directory, "", data
for post in self.posts(page):
if "filename" not in post:
continue
diff --git a/gallery_dl/extractor/2chen.py b/gallery_dl/extractor/2chen.py
index b14a1411..8357bc46 100644
--- a/gallery_dl/extractor/2chen.py
+++ b/gallery_dl/extractor/2chen.py
@@ -31,7 +31,7 @@ class _2chenThreadExtractor(Extractor):
url = f"{self.root}/{self.board}/{self.thread}"
page = self.request(url, encoding="utf-8", notfound="thread").text
data = self.metadata(page)
- yield Message.Directory, data
+ yield Message.Directory, "", data
for post in self.posts(page):
diff --git a/gallery_dl/extractor/35photo.py b/gallery_dl/extractor/35photo.py
index ec5f0cb6..154295e9 100644
--- a/gallery_dl/extractor/35photo.py
+++ b/gallery_dl/extractor/35photo.py
@@ -29,7 +29,7 @@ class _35photoExtractor(Extractor):
url = photo["url"]
if first:
first = False
- yield Message.Directory, photo
+ yield Message.Directory, "", photo
yield Message.Url, url, text.nameext_from_url(url, photo)
def metadata(self):
diff --git a/gallery_dl/extractor/4archive.py b/gallery_dl/extractor/4archive.py
index a8bb5d9c..a6dedde2 100644
--- a/gallery_dl/extractor/4archive.py
+++ b/gallery_dl/extractor/4archive.py
@@ -38,7 +38,7 @@ class _4archiveThreadExtractor(Extractor):
for post in posts:
post.update(data)
post["time"] = int(dt.to_ts(post["date"]))
- yield Message.Directory, post
+ yield Message.Directory, "", post
if "url" in post:
yield Message.Url, post["url"], text.nameext_from_url(
post["filename"], post)
diff --git a/gallery_dl/extractor/4chan.py b/gallery_dl/extractor/4chan.py
index d81f3056..ba248996 100644
--- a/gallery_dl/extractor/4chan.py
+++ b/gallery_dl/extractor/4chan.py
@@ -38,7 +38,7 @@ class _4chanThreadExtractor(Extractor):
"title" : text.unescape(title)[:50],
}
- yield Message.Directory, data
+ yield Message.Directory, "", data
for post in posts:
if "filename" in post:
post.update(data)
diff --git a/gallery_dl/extractor/4chanarchives.py b/gallery_dl/extractor/4chanarchives.py
index c187b41d..16f4b39c 100644
--- a/gallery_dl/extractor/4chanarchives.py
+++ b/gallery_dl/extractor/4chanarchives.py
@@ -40,7 +40,7 @@ class _4chanarchivesThreadExtractor(Extractor):
for post in posts:
post.update(data)
- yield Message.Directory, post
+ yield Message.Directory, "", post
if "url" in post:
yield Message.Url, post["url"], post
diff --git a/gallery_dl/extractor/500px.py b/gallery_dl/extractor/500px.py
index fc92cde9..b74bc907 100644
--- a/gallery_dl/extractor/500px.py
+++ b/gallery_dl/extractor/500px.py
@@ -31,7 +31,7 @@ class _500pxExtractor(Extractor):
photo["extension"] = photo["image_format"]
if data:
photo.update(data)
- yield Message.Directory, photo
+ yield Message.Directory, "", photo
yield Message.Url, url, photo
def metadata(self):
diff --git a/gallery_dl/extractor/8chan.py b/gallery_dl/extractor/8chan.py
index 63747dd2..3230182a 100644
--- a/gallery_dl/extractor/8chan.py
+++ b/gallery_dl/extractor/8chan.py
@@ -91,7 +91,7 @@ class _8chanThreadExtractor(_8chanExtractor):
# download files
posts = thread.pop("posts", ())
- yield Message.Directory, thread
+ yield Message.Directory, "", thread
for post in itertools.chain((thread,), posts):
files = post.pop("files", ())
if not files:
diff --git a/gallery_dl/extractor/8muses.py b/gallery_dl/extractor/8muses.py
index 7cb6eee9..a8d8b44e 100644
--- a/gallery_dl/extractor/8muses.py
+++ b/gallery_dl/extractor/8muses.py
@@ -40,7 +40,7 @@ class _8musesAlbumExtractor(Extractor):
if images := data.get("pictures"):
count = len(images)
album = self._make_album(data["album"])
- yield Message.Directory, {"album": album, "count": count}
+ yield Message.Directory, "", {"album": album, "count": count}
for num, image in enumerate(images, 1):
url = self.root + "/image/fl/" + image["publicUri"]
img = {
diff --git a/gallery_dl/extractor/ao3.py b/gallery_dl/extractor/ao3.py
index 72e875d4..716492e5 100644
--- a/gallery_dl/extractor/ao3.py
+++ b/gallery_dl/extractor/ao3.py
@@ -220,7 +220,7 @@ class Ao3WorkExtractor(Ao3Extractor):
else:
data["series"] = None
- yield Message.Directory, data
+ yield Message.Directory, "", data
for fmt in self.formats:
try:
url = text.urljoin(self.root, fmts[fmt])
diff --git a/gallery_dl/extractor/arcalive.py b/gallery_dl/extractor/arcalive.py
index ac800778..f950d14b 100644
--- a/gallery_dl/extractor/arcalive.py
+++ b/gallery_dl/extractor/arcalive.py
@@ -54,7 +54,7 @@ class ArcalivePostExtractor(ArcaliveExtractor):
f"{self.root}/b/{post['boardSlug']}/{post['id']}"
post["_http_headers"] = {"Referer": post_url + "?p=1"}
- yield Message.Directory, post
+ yield Message.Directory, "", post
for post["num"], file in enumerate(files, 1):
post.update(file)
url = file["url"]
diff --git a/gallery_dl/extractor/artstation.py b/gallery_dl/extractor/artstation.py
index c332ab21..f1b55ce8 100644
--- a/gallery_dl/extractor/artstation.py
+++ b/gallery_dl/extractor/artstation.py
@@ -47,7 +47,7 @@ class ArtstationExtractor(Extractor):
asset.update(data)
adict = asset["asset"]
asset["num"] = num
- yield Message.Directory, asset
+ yield Message.Directory, "", asset
if adict["has_embedded_player"]:
if url := self._extract_embed(asset):
@@ -333,7 +333,7 @@ class ArtstationChallengeExtractor(ArtstationExtractor):
update_url = f"{self.root}/contests/submission_updates.json"
challenge = self.request_json(challenge_url)
- yield Message.Directory, {"challenge": challenge}
+ yield Message.Directory, "", {"challenge": challenge}
params = {"sorting": self.sorting}
for submission in self._pagination(submission_url, params):
diff --git a/gallery_dl/extractor/aryion.py b/gallery_dl/extractor/aryion.py
index cc850204..1dfac590 100644
--- a/gallery_dl/extractor/aryion.py
+++ b/gallery_dl/extractor/aryion.py
@@ -63,7 +63,7 @@ class AryionExtractor(Extractor):
if post := self._parse_post(post_id):
if data:
post.update(data)
- yield Message.Directory, post
+ yield Message.Directory, "", post
yield Message.Url, post["url"], post
elif post is False and self.recursive:
base = self.root + "/g4/view/"
diff --git a/gallery_dl/extractor/audiochan.py b/gallery_dl/extractor/audiochan.py
index 768b2003..e6133839 100644
--- a/gallery_dl/extractor/audiochan.py
+++ b/gallery_dl/extractor/audiochan.py
@@ -63,7 +63,7 @@ class AudiochanExtractor(Extractor):
post["_http_segmented"] = 600000
url = file["stream_url"]
- yield Message.Directory, post
+ yield Message.Directory, "", post
text.nameext_from_name(file["filename"], post)
yield Message.Url, url, post
diff --git a/gallery_dl/extractor/behance.py b/gallery_dl/extractor/behance.py
index 88d9e569..bb0562d8 100644
--- a/gallery_dl/extractor/behance.py
+++ b/gallery_dl/extractor/behance.py
@@ -109,7 +109,7 @@ class BehanceGalleryExtractor(BehanceExtractor):
imgs = self.get_images(data)
data["count"] = len(imgs)
- yield Message.Directory, data
+ yield Message.Directory, "", data
for data["num"], (url, module) in enumerate(imgs, 1):
data["module"] = module
data["extension"] = (module.get("extension") or
diff --git a/gallery_dl/extractor/bellazon.py b/gallery_dl/extractor/bellazon.py
index e94642f9..33f4ad31 100644
--- a/gallery_dl/extractor/bellazon.py
+++ b/gallery_dl/extractor/bellazon.py
@@ -46,7 +46,7 @@ class BellazonExtractor(Extractor):
data = {"post": post}
post["count"] = data["count"] = len(urls)
- yield Message.Directory, data
+ yield Message.Directory, "", data
data["num"] = data["num_internal"] = data["num_external"] = 0
for info, url, url_img in urls:
url = text.unescape(url or url_img)
diff --git a/gallery_dl/extractor/bilibili.py b/gallery_dl/extractor/bilibili.py
index 3f0acff2..fe10150f 100644
--- a/gallery_dl/extractor/bilibili.py
+++ b/gallery_dl/extractor/bilibili.py
@@ -74,7 +74,7 @@ class BilibiliArticleExtractor(BilibiliExtractor):
pass
article["count"] = len(pics)
- yield Message.Directory, article
+ yield Message.Directory, "", article
for article["num"], pic in enumerate(pics, 1):
url = pic["url"]
article.update(pic)
diff --git a/gallery_dl/extractor/blogger.py b/gallery_dl/extractor/blogger.py
index 3552ef90..766272f9 100644
--- a/gallery_dl/extractor/blogger.py
+++ b/gallery_dl/extractor/blogger.py
@@ -72,7 +72,7 @@ class BloggerExtractor(BaseExtractor):
data = {"blog": blog, "post": post}
if metadata:
data.update(metadata)
- yield Message.Directory, data
+ yield Message.Directory, "", data
for data["num"], url in enumerate(files, 1):
data["url"] = url
diff --git a/gallery_dl/extractor/bluesky.py b/gallery_dl/extractor/bluesky.py
index b6b1154c..4403b663 100644
--- a/gallery_dl/extractor/bluesky.py
+++ b/gallery_dl/extractor/bluesky.py
@@ -60,7 +60,7 @@ class BlueskyExtractor(Extractor):
self._prepare(post)
files = self._extract_files(post)
- yield Message.Directory, post
+ yield Message.Directory, "", post
if files:
did = post["author"]["did"]
base = (f"{self.api.service_endpoint(did)}/xrpc"
@@ -336,7 +336,7 @@ class BlueskyInfoExtractor(BlueskyExtractor):
def items(self):
self._metadata_user = True
self.api._did_from_actor(self.groups[0])
- return iter(((Message.Directory, self._user),))
+ return iter(((Message.Directory, "", self._user),))
class BlueskyAvatarExtractor(BlueskyExtractor):
diff --git a/gallery_dl/extractor/booru.py b/gallery_dl/extractor/booru.py
index ae455bf3..4858a4bd 100644
--- a/gallery_dl/extractor/booru.py
+++ b/gallery_dl/extractor/booru.py
@@ -57,7 +57,7 @@ class BooruExtractor(BaseExtractor):
post.update(data)
self._prepare(post)
- yield Message.Directory, post
+ yield Message.Directory, "", post
yield Message.Url, url, post
def skip(self, num):
diff --git a/gallery_dl/extractor/boosty.py b/gallery_dl/extractor/boosty.py
index 75762597..87ab82a6 100644
--- a/gallery_dl/extractor/boosty.py
+++ b/gallery_dl/extractor/boosty.py
@@ -63,7 +63,7 @@ class BoostyExtractor(Extractor):
"count": len(files),
}
- yield Message.Directory, data
+ yield Message.Directory, "", data
for data["num"], file in enumerate(files, 1):
data["file"] = file
url = file["url"]
@@ -260,7 +260,7 @@ class BoostyDirectMessagesExtractor(BoostyExtractor):
"count": len(files),
}
- yield Message.Directory, data
+ yield Message.Directory, "", data
for data["num"], file in enumerate(files, 1):
data["file"] = file
url = file["url"]
diff --git a/gallery_dl/extractor/booth.py b/gallery_dl/extractor/booth.py
index 0be05c42..3c000b19 100644
--- a/gallery_dl/extractor/booth.py
+++ b/gallery_dl/extractor/booth.py
@@ -83,7 +83,7 @@ class BoothItemExtractor(BoothExtractor):
item["count"] = 0
shop["uuid"] = util.NONE
- yield Message.Directory, item
+ yield Message.Directory, "", item
for num, file in enumerate(files, 1):
url = file["url"]
file["num"] = num
diff --git a/gallery_dl/extractor/catbox.py b/gallery_dl/extractor/catbox.py
index de21aca2..2066839c 100644
--- a/gallery_dl/extractor/catbox.py
+++ b/gallery_dl/extractor/catbox.py
@@ -52,5 +52,5 @@ class CatboxFileExtractor(Extractor):
def items(self):
url = text.ensure_http_scheme(self.url)
file = text.nameext_from_url(url, {"url": url})
- yield Message.Directory, file
+ yield Message.Directory, "", file
yield Message.Url, url, file
diff --git a/gallery_dl/extractor/cfake.py b/gallery_dl/extractor/cfake.py
index bd8a23f0..4c374554 100644
--- a/gallery_dl/extractor/cfake.py
+++ b/gallery_dl/extractor/cfake.py
@@ -32,7 +32,7 @@ class CfakeExtractor(Extractor):
kwdict["type_name"] = text.unquote(type_name).replace("_", " ")
kwdict["sub_id"] = text.parse_int(sub_id)
kwdict["page"] = pnum = text.parse_int(pnum, 1)
- yield Message.Directory, {}
+ yield Message.Directory, "", {}
base = f"{self.root}/images/{type}/{type_name}/{type_id}"
if sub_id:
diff --git a/gallery_dl/extractor/chevereto.py b/gallery_dl/extractor/chevereto.py
index 123a3902..45d9471b 100644
--- a/gallery_dl/extractor/chevereto.py
+++ b/gallery_dl/extractor/chevereto.py
@@ -84,7 +84,7 @@ class CheveretoImageExtractor(CheveretoExtractor):
}
text.nameext_from_url(file["url"], file)
- yield Message.Directory, file
+ yield Message.Directory, "", file
yield Message.Url, file["url"], file
@@ -126,7 +126,7 @@ class CheveretoVideoExtractor(CheveretoExtractor):
pass
text.nameext_from_url(file["url"], file)
- yield Message.Directory, file
+ yield Message.Directory, "", file
yield Message.Url, file["url"], file
diff --git a/gallery_dl/extractor/cien.py b/gallery_dl/extractor/cien.py
index 1f724ae0..c68af2e7 100644
--- a/gallery_dl/extractor/cien.py
+++ b/gallery_dl/extractor/cien.py
@@ -70,7 +70,7 @@ class CienArticleExtractor(CienExtractor):
except Exception:
pass
- yield Message.Directory, post
+ yield Message.Directory, "", post
for post["num"], file in enumerate(files, 1):
post.update(file)
if "extension" not in file:
diff --git a/gallery_dl/extractor/civitai.py b/gallery_dl/extractor/civitai.py
index 1d92f8cc..742c561a 100644
--- a/gallery_dl/extractor/civitai.py
+++ b/gallery_dl/extractor/civitai.py
@@ -96,7 +96,7 @@ class CivitaiExtractor(Extractor):
data["model"], data["version"] = \
self._extract_meta_version(post)
- yield Message.Directory, data
+ yield Message.Directory, "", data
for file in self._image_results(images):
file.update(data)
yield Message.Url, file["url"], file
@@ -131,7 +131,7 @@ class CivitaiExtractor(Extractor):
data["extension"] = (
self._video_ext if file.get("type") == "video" else
self._image_ext)
- yield Message.Directory, data
+ yield Message.Directory, "", data
yield Message.Url, url, data
return
@@ -292,7 +292,7 @@ class CivitaiModelExtractor(CivitaiExtractor):
"user" : user,
}
- yield Message.Directory, data
+ yield Message.Directory, "", data
for file in self._extract_files(model, version, user):
file.update(data)
yield Message.Url, file["url"], file
@@ -599,7 +599,7 @@ class CivitaiGeneratedExtractor(CivitaiExtractor):
for gen in self.api.orchestrator_queryGeneratedImages():
gen["date"] = self.parse_datetime_iso(gen["createdAt"])
- yield Message.Directory, gen
+ yield Message.Directory, "", gen
for step in gen.pop("steps", ()):
for image in step.pop("images", ()):
data = {"file": image, **step, **gen}
diff --git a/gallery_dl/extractor/common.py b/gallery_dl/extractor/common.py
index d9780ad2..72ed910f 100644
--- a/gallery_dl/extractor/common.py
+++ b/gallery_dl/extractor/common.py
@@ -800,7 +800,7 @@ class GalleryExtractor(Extractor):
enum = util.enumerate_reversed
images = enum(imgs, 1)
- yield Message.Directory, data
+ yield Message.Directory, "", data
enum_key = self.enum
if assets:
diff --git a/gallery_dl/extractor/cyberdrop.py b/gallery_dl/extractor/cyberdrop.py
index ba3f6262..93d3953d 100644
--- a/gallery_dl/extractor/cyberdrop.py
+++ b/gallery_dl/extractor/cyberdrop.py
@@ -24,7 +24,7 @@ class CyberdropAlbumExtractor(lolisafe.LolisafeAlbumExtractor):
def items(self):
files, data = self.fetch_album(self.album_id)
- yield Message.Directory, data
+ yield Message.Directory, "", data
for data["num"], file in enumerate(files, 1):
file.update(data)
text.nameext_from_url(file["name"], file)
diff --git a/gallery_dl/extractor/cyberfile.py b/gallery_dl/extractor/cyberfile.py
index ad8ca53a..e8c0061f 100644
--- a/gallery_dl/extractor/cyberfile.py
+++ b/gallery_dl/extractor/cyberfile.py
@@ -161,5 +161,5 @@ class CyberfileFileExtractor(CyberfileExtractor):
file["file_url"] = url = extr("openUrl('", "'")
text.nameext_from_url(file["name"] or url, file)
- yield Message.Directory, file
+ yield Message.Directory, "", file
yield Message.Url, url, file
diff --git a/gallery_dl/extractor/danbooru.py b/gallery_dl/extractor/danbooru.py
index 241127c5..5ea33c4c 100644
--- a/gallery_dl/extractor/danbooru.py
+++ b/gallery_dl/extractor/danbooru.py
@@ -63,7 +63,7 @@ class DanbooruExtractor(BaseExtractor):
except KeyError:
if self.external and post["source"]:
post.update(data)
- yield Message.Directory, post
+ yield Message.Directory, "", post
yield Message.Queue, post["source"], post
continue
@@ -106,7 +106,7 @@ class DanbooruExtractor(BaseExtractor):
url = self.root + url
post.update(data)
- yield Message.Directory, post
+ yield Message.Directory, "", post
yield Message.Url, url, post
def items_artists(self):
diff --git a/gallery_dl/extractor/desktopography.py b/gallery_dl/extractor/desktopography.py
index 9ae567ee..be250539 100644
--- a/gallery_dl/extractor/desktopography.py
+++ b/gallery_dl/extractor/desktopography.py
@@ -82,7 +82,7 @@ class DesktopographyEntryExtractor(DesktopographyExtractor):
page = self.request(url).text
entry_data = {"entry": self.entry}
- yield Message.Directory, entry_data
+ yield Message.Directory, "", entry_data
for image_data in text.extract_iter(
page,
diff --git a/gallery_dl/extractor/deviantart.py b/gallery_dl/extractor/deviantart.py
index 9fd28f6c..5bd43d4b 100644
--- a/gallery_dl/extractor/deviantart.py
+++ b/gallery_dl/extractor/deviantart.py
@@ -154,7 +154,7 @@ class DeviantartExtractor(Extractor):
deviation.update(data)
self.prepare(deviation)
- yield Message.Directory, deviation
+ yield Message.Directory, "", deviation
if "content" in deviation:
content = self._extract_content(deviation)
diff --git a/gallery_dl/extractor/directlink.py b/gallery_dl/extractor/directlink.py
index 85358ba8..bbc1ef04 100644
--- a/gallery_dl/extractor/directlink.py
+++ b/gallery_dl/extractor/directlink.py
@@ -40,5 +40,5 @@ class DirectlinkExtractor(Extractor):
data["_http_headers"] = {
"Referer": self.url.encode("latin-1", "ignore")}
- yield Message.Directory, data
+ yield Message.Directory, "", data
yield Message.Url, self.url, data
diff --git a/gallery_dl/extractor/discord.py b/gallery_dl/extractor/discord.py
index 065caeb1..0e7f3093 100644
--- a/gallery_dl/extractor/discord.py
+++ b/gallery_dl/extractor/discord.py
@@ -120,7 +120,7 @@ class DiscordExtractor(Extractor):
text.nameext_from_url(file["url"], file)
file["num"] = num
- yield Message.Directory, message_metadata
+ yield Message.Directory, "", message_metadata
for file in message_metadata["files"]:
message_metadata_file = message_metadata.copy()
diff --git a/gallery_dl/extractor/dynastyscans.py b/gallery_dl/extractor/dynastyscans.py
index db4b8f2a..36423dba 100644
--- a/gallery_dl/extractor/dynastyscans.py
+++ b/gallery_dl/extractor/dynastyscans.py
@@ -105,7 +105,7 @@ class DynastyscansSearchExtractor(DynastyscansBase, Extractor):
self.query = match[1] or ""
def items(self):
- yield Message.Directory, {}
+ yield Message.Directory, "", {}
for image_id in self.images():
image = self._parse_image_page(image_id)
url = image["url"]
diff --git a/gallery_dl/extractor/e621.py b/gallery_dl/extractor/e621.py
index 98446a78..cc6708d5 100644
--- a/gallery_dl/extractor/e621.py
+++ b/gallery_dl/extractor/e621.py
@@ -54,7 +54,7 @@ class E621Extractor(danbooru.DanbooruExtractor):
post["date"] = self.parse_datetime_iso(post["created_at"])
post.update(data)
- yield Message.Directory, post
+ yield Message.Directory, "", post
yield Message.Url, file["url"], post
def items_artists(self):
diff --git a/gallery_dl/extractor/erome.py b/gallery_dl/extractor/erome.py
index 949ad0f6..9ba9c362 100644
--- a/gallery_dl/extractor/erome.py
+++ b/gallery_dl/extractor/erome.py
@@ -110,7 +110,7 @@ class EromeAlbumExtractor(EromeExtractor):
"_http_headers": {"Referer": url},
}
- yield Message.Directory, data
+ yield Message.Directory, "", data
for data["num"], url in enumerate(urls, 1):
yield Message.Url, url, text.nameext_from_url(url, data)
diff --git a/gallery_dl/extractor/everia.py b/gallery_dl/extractor/everia.py
index 3aa42391..ce298002 100644
--- a/gallery_dl/extractor/everia.py
+++ b/gallery_dl/extractor/everia.py
@@ -64,7 +64,7 @@ class EveriaPostExtractor(EveriaExtractor):
"count": len(urls),
}
- yield Message.Directory, data
+ yield Message.Directory, "", data
for data["num"], url in enumerate(urls, 1):
url = text.unquote(url)
yield Message.Url, url, text.nameext_from_url(url, data)
diff --git a/gallery_dl/extractor/exhentai.py b/gallery_dl/extractor/exhentai.py
index d7c2a0d1..9dab9238 100644
--- a/gallery_dl/extractor/exhentai.py
+++ b/gallery_dl/extractor/exhentai.py
@@ -193,7 +193,7 @@ class ExhentaiGalleryExtractor(ExhentaiExtractor):
self.data = data = self.get_metadata(gpage)
self.count = text.parse_int(data["filecount"])
- yield Message.Directory, data
+ yield Message.Directory, "", data
images = itertools.chain(
(self.image_from_page(ipage),), self.images_from_api())
@@ -226,7 +226,7 @@ class ExhentaiGalleryExtractor(ExhentaiExtractor):
yield Message.Queue, url, data
def _items_metadata(self):
- yield Message.Directory, self.metadata_from_api()
+ yield Message.Directory, "", self.metadata_from_api()
def get_metadata(self, page):
"""Extract gallery metadata"""
diff --git a/gallery_dl/extractor/facebook.py b/gallery_dl/extractor/facebook.py
index d751f9a2..7198ff57 100644
--- a/gallery_dl/extractor/facebook.py
+++ b/gallery_dl/extractor/facebook.py
@@ -292,7 +292,7 @@ class FacebookExtractor(Extractor):
else:
retries = 0
photo.update(set_data)
- yield Message.Directory, photo
+ yield Message.Directory, "", photo
yield Message.Url, photo["url"], photo
if not photo["next_photo_id"]:
@@ -408,7 +408,7 @@ class FacebookPhotoExtractor(FacebookExtractor):
directory = self.parse_set_page(set_page)
- yield Message.Directory, directory
+ yield Message.Directory, "", directory
yield Message.Url, photo["url"], photo
if self.author_followups:
@@ -467,7 +467,7 @@ class FacebookVideoExtractor(FacebookExtractor):
if "url" not in video:
return
- yield Message.Directory, video
+ yield Message.Directory, "", video
if self.videos == "ytdl":
yield Message.Url, "ytdl:" + video_url, video
@@ -486,7 +486,7 @@ class FacebookInfoExtractor(FacebookExtractor):
def items(self):
user = self._extract_profile(self.groups[0])
- return iter(((Message.Directory, user),))
+ return iter(((Message.Directory, "", user),))
class FacebookAlbumsExtractor(FacebookExtractor):
@@ -558,7 +558,7 @@ class FacebookAvatarExtractor(FacebookExtractor):
set_page = self.request(set_url).text
directory = self.parse_set_page(set_page)
- yield Message.Directory, directory
+ yield Message.Directory, "", directory
yield Message.Url, avatar["url"], avatar
diff --git a/gallery_dl/extractor/fanbox.py b/gallery_dl/extractor/fanbox.py
index 41b39e5b..69315938 100644
--- a/gallery_dl/extractor/fanbox.py
+++ b/gallery_dl/extractor/fanbox.py
@@ -76,7 +76,7 @@ class FanboxExtractor(Extractor):
item["id"], exc.__class__.__name__, exc)
content_body, post = self._extract_post(item)
- yield Message.Directory, post
+ yield Message.Directory, "", post
yield from self._get_urls_from_post(content_body, post)
def posts(self):
diff --git a/gallery_dl/extractor/fansly.py b/gallery_dl/extractor/fansly.py
index 1dd802d0..ba60b158 100644
--- a/gallery_dl/extractor/fansly.py
+++ b/gallery_dl/extractor/fansly.py
@@ -37,7 +37,7 @@ class FanslyExtractor(Extractor):
post["count"] = len(files)
post["date"] = self.parse_timestamp(post["createdAt"])
- yield Message.Directory, post
+ yield Message.Directory, "", post
for post["num"], file in enumerate(files, 1):
post.update(file)
url = file["url"]
diff --git a/gallery_dl/extractor/fantia.py b/gallery_dl/extractor/fantia.py
index 8f1f5c00..d13ec134 100644
--- a/gallery_dl/extractor/fantia.py
+++ b/gallery_dl/extractor/fantia.py
@@ -48,7 +48,7 @@ class FantiaExtractor(Extractor):
for content in contents:
files = self._process_content(post, content)
- yield Message.Directory, post
+ yield Message.Directory, "", post
if content["visible_status"] != "visible":
self.log.warning(
diff --git a/gallery_dl/extractor/fapachi.py b/gallery_dl/extractor/fapachi.py
index 7ff71b05..a18ce31f 100644
--- a/gallery_dl/extractor/fapachi.py
+++ b/gallery_dl/extractor/fapachi.py
@@ -34,7 +34,7 @@ class FapachiPostExtractor(Extractor):
page = self.request(f"{self.root}/{self.user}/media/{self.id}").text
url = self.root + text.extract(
page, 'data-src="', '"', page.index('class="media-img'))[0]
- yield Message.Directory, data
+ yield Message.Directory, "", data
yield Message.Url, url, text.nameext_from_url(url, data)
diff --git a/gallery_dl/extractor/fapello.py b/gallery_dl/extractor/fapello.py
index 9bd3c39f..afef9427 100644
--- a/gallery_dl/extractor/fapello.py
+++ b/gallery_dl/extractor/fapello.py
@@ -44,7 +44,7 @@ class FapelloPostExtractor(Extractor):
}
url = text.extr(page, 'src="', '"').replace(
".md", "").replace(".th", "")
- yield Message.Directory, data
+ yield Message.Directory, "", data
yield Message.Url, url, text.nameext_from_url(url, data)
diff --git a/gallery_dl/extractor/flickr.py b/gallery_dl/extractor/flickr.py
index 92f37092..1446eb87 100644
--- a/gallery_dl/extractor/flickr.py
+++ b/gallery_dl/extractor/flickr.py
@@ -45,7 +45,7 @@ class FlickrExtractor(Extractor):
else:
photo.update(data)
url = self._file_url(photo)
- yield Message.Directory, photo
+ yield Message.Directory, "", photo
yield Message.Url, url, text.nameext_from_url(url, photo)
def metadata(self):
@@ -114,7 +114,7 @@ class FlickrImageExtractor(FlickrExtractor):
location[key] = value["_content"]
url = self._file_url(photo)
- yield Message.Directory, photo
+ yield Message.Directory, "", photo
yield Message.Url, url, text.nameext_from_url(url, photo)
diff --git a/gallery_dl/extractor/foolfuuka.py b/gallery_dl/extractor/foolfuuka.py
index 8f36194c..3c694896 100644
--- a/gallery_dl/extractor/foolfuuka.py
+++ b/gallery_dl/extractor/foolfuuka.py
@@ -31,7 +31,7 @@ class FoolfuukaExtractor(BaseExtractor):
self.fixup_redirect = False
def items(self):
- yield Message.Directory, self.metadata()
+ yield Message.Directory, "", self.metadata()
for post in self.posts():
media = post["media"]
if not media:
diff --git a/gallery_dl/extractor/foolslide.py b/gallery_dl/extractor/foolslide.py
index 87bdc7a2..d932174b 100644
--- a/gallery_dl/extractor/foolslide.py
+++ b/gallery_dl/extractor/foolslide.py
@@ -58,7 +58,7 @@ class FoolslideChapterExtractor(FoolslideExtractor):
data["count"] = len(imgs)
data["chapter_id"] = text.parse_int(imgs[0]["chapter_id"])
- yield Message.Directory, data
+ yield Message.Directory, "", data
enum = util.enumerate_reversed if self.config(
"page-reverse") else enumerate
for data["page"], image in enum(imgs, 1):
diff --git a/gallery_dl/extractor/furaffinity.py b/gallery_dl/extractor/furaffinity.py
index dc70f003..53d83e9f 100644
--- a/gallery_dl/extractor/furaffinity.py
+++ b/gallery_dl/extractor/furaffinity.py
@@ -54,7 +54,7 @@ class FuraffinityExtractor(Extractor):
if post := self._parse_post(post_id):
if metadata:
post.update(metadata)
- yield Message.Directory, post
+ yield Message.Directory, "", post
yield Message.Url, post["url"], post
if self.external:
diff --git a/gallery_dl/extractor/generic.py b/gallery_dl/extractor/generic.py
index 242f3cb8..99e6ea73 100644
--- a/gallery_dl/extractor/generic.py
+++ b/gallery_dl/extractor/generic.py
@@ -75,7 +75,7 @@ class GenericExtractor(Extractor):
pass
images = enumerate(imgs, 1)
- yield Message.Directory, data
+ yield Message.Directory, "", data
for data["num"], (url, imgdata) in images:
if imgdata:
diff --git a/gallery_dl/extractor/girlsreleased.py b/gallery_dl/extractor/girlsreleased.py
index ec8c4afe..0fbdeffc 100644
--- a/gallery_dl/extractor/girlsreleased.py
+++ b/gallery_dl/extractor/girlsreleased.py
@@ -56,7 +56,7 @@ class GirlsreleasedSetExtractor(GirlsreleasedExtractor):
"count": len(json["images"]),
"url": "https://girlsreleased.com/set/" + json["id"],
}
- yield Message.Directory, data
+ yield Message.Directory, "", data
for data["num"], image in enumerate(json["images"], 1):
text.nameext_from_url(image[5], data)
yield Message.Queue, image[3], data
diff --git a/gallery_dl/extractor/girlswithmuscle.py b/gallery_dl/extractor/girlswithmuscle.py
index 796e51a1..e61e472e 100644
--- a/gallery_dl/extractor/girlswithmuscle.py
+++ b/gallery_dl/extractor/girlswithmuscle.py
@@ -80,7 +80,7 @@ class GirlswithmusclePostExtractor(GirlswithmuscleExtractor):
metadata["type"] = "video"
text.nameext_from_url(url, metadata)
- yield Message.Directory, metadata
+ yield Message.Directory, "", metadata
yield Message.Url, url, metadata
def metadata(self, page):
diff --git a/gallery_dl/extractor/gofile.py b/gallery_dl/extractor/gofile.py
index 0a6c9b94..0aeb9f08 100644
--- a/gallery_dl/extractor/gofile.py
+++ b/gallery_dl/extractor/gofile.py
@@ -39,7 +39,7 @@ class GofileFolderExtractor(Extractor):
self._get_website_token())
folder = self._get_content(self.content_id, password)
- yield Message.Directory, folder
+ yield Message.Directory, "", folder
try:
contents = folder.pop("children")
diff --git a/gallery_dl/extractor/hatenablog.py b/gallery_dl/extractor/hatenablog.py
index 2a41d4a7..7065d7bb 100644
--- a/gallery_dl/extractor/hatenablog.py
+++ b/gallery_dl/extractor/hatenablog.py
@@ -56,7 +56,7 @@ class HatenablogExtractor(Extractor):
"title": title,
"count": len(images),
}
- yield Message.Directory, data
+ yield Message.Directory, "", data
for data["num"], url in enumerate(images, 1):
yield Message.Url, url, text.nameext_from_url(url, data)
diff --git a/gallery_dl/extractor/hentaifoundry.py b/gallery_dl/extractor/hentaifoundry.py
index d894b70a..cd0106bc 100644
--- a/gallery_dl/extractor/hentaifoundry.py
+++ b/gallery_dl/extractor/hentaifoundry.py
@@ -43,7 +43,7 @@ class HentaifoundryExtractor(Extractor):
for post_url in util.advance(self.posts(), self.start_post):
image = self._parse_post(post_url)
image.update(data)
- yield Message.Directory, image
+ yield Message.Directory, "", image
yield Message.Url, image["src"], image
def skip(self, num):
@@ -324,7 +324,7 @@ class HentaifoundryImageExtractor(HentaifoundryExtractor):
f"/{self.index}/?enterAgree=1")
image = self._parse_post(post_url)
image["user"] = self.user
- yield Message.Directory, image
+ yield Message.Directory, "", image
yield Message.Url, image["src"], image
@@ -339,7 +339,7 @@ class HentaifoundryStoriesExtractor(HentaifoundryExtractor):
self._init_site_filters()
for story_html in util.advance(self.stories(), self.start_post):
story = self._parse_story(story_html)
- yield Message.Directory, story
+ yield Message.Directory, "", story
yield Message.Url, story["src"], story
def stories(self):
@@ -364,5 +364,5 @@ class HentaifoundryStoryExtractor(HentaifoundryExtractor):
story_url = (f"{self.root}/stories/user/{self.user}"
f"/{self.index}/x?enterAgree=1")
story = self._parse_story(self.request(story_url).text)
- yield Message.Directory, story
+ yield Message.Directory, "", story
yield Message.Url, story["src"], story
diff --git a/gallery_dl/extractor/hotleak.py b/gallery_dl/extractor/hotleak.py
index 5772ae7c..953cf4e0 100644
--- a/gallery_dl/extractor/hotleak.py
+++ b/gallery_dl/extractor/hotleak.py
@@ -30,7 +30,7 @@ class HotleakExtractor(Extractor):
.replace("_thumb.", ".")
)
post["_http_expected_status"] = (404,)
- yield Message.Directory, post
+ yield Message.Directory, "", post
yield Message.Url, post["url"], post
def posts(self):
diff --git a/gallery_dl/extractor/imagebam.py b/gallery_dl/extractor/imagebam.py
index 14e42f05..66fbdd6c 100644
--- a/gallery_dl/extractor/imagebam.py
+++ b/gallery_dl/extractor/imagebam.py
@@ -56,7 +56,7 @@ class ImagebamGalleryExtractor(ImagebamExtractor):
data["count"] = len(images)
data["gallery_key"] = self.path.rpartition("/")[2]
- yield Message.Directory, data
+ yield Message.Directory, "", data
for data["num"], path in enumerate(images, 1):
image = self._parse_image_page(path)
image.update(data)
@@ -94,5 +94,5 @@ class ImagebamImageExtractor(ImagebamExtractor):
path = ("/view/" if path[10] == "M" else "/image/") + path[10:]
image = self._parse_image_page(path)
- yield Message.Directory, image
+ yield Message.Directory, "", image
yield Message.Url, image["url"], image
diff --git a/gallery_dl/extractor/imagefap.py b/gallery_dl/extractor/imagefap.py
index be2cab07..f7279694 100644
--- a/gallery_dl/extractor/imagefap.py
+++ b/gallery_dl/extractor/imagefap.py
@@ -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
@@ -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):
diff --git a/gallery_dl/extractor/imagehosts.py b/gallery_dl/extractor/imagehosts.py
index 101e7d15..be5104da 100644
--- a/gallery_dl/extractor/imagehosts.py
+++ b/gallery_dl/extractor/imagehosts.py
@@ -74,7 +74,7 @@ class ImagehostImageExtractor(Extractor):
if self._validate is not None:
data["_http_validate"] = self._validate
- yield Message.Directory, data
+ yield Message.Directory, "", data
yield Message.Url, url, data
def get_info(self, page):
diff --git a/gallery_dl/extractor/imgbb.py b/gallery_dl/extractor/imgbb.py
index 0d8b67d5..d9573288 100644
--- a/gallery_dl/extractor/imgbb.py
+++ b/gallery_dl/extractor/imgbb.py
@@ -30,7 +30,7 @@ class ImgbbExtractor(Extractor):
for image in self.posts():
url = image["url"]
text.nameext_from_url(url, image)
- yield Message.Directory, image
+ yield Message.Directory, "", image
yield Message.Url, url, image
def login(self):
diff --git a/gallery_dl/extractor/imgbox.py b/gallery_dl/extractor/imgbox.py
index 5e623521..8ac66f4a 100644
--- a/gallery_dl/extractor/imgbox.py
+++ b/gallery_dl/extractor/imgbox.py
@@ -19,7 +19,7 @@ class ImgboxExtractor(Extractor):
def items(self):
data = self.get_job_metadata()
- yield Message.Directory, data
+ yield Message.Directory, "", data
for image_key in self.get_image_keys():
imgpage = self.request(self.root + "/" + image_key).text
diff --git a/gallery_dl/extractor/imgpile.py b/gallery_dl/extractor/imgpile.py
index 9fc3a9c6..f6342038 100644
--- a/gallery_dl/extractor/imgpile.py
+++ b/gallery_dl/extractor/imgpile.py
@@ -54,7 +54,7 @@ class ImgpilePostExtractor(ImgpileExtractor):
data = {"post": post}
data["count"] = post["count"] = len(files)
- yield Message.Directory, data
+ yield Message.Directory, "", data
for data["num"], file in enumerate(files, 1):
data.update(file)
url = file["url"]
diff --git a/gallery_dl/extractor/imgur.py b/gallery_dl/extractor/imgur.py
index 72f6c3bd..47553887 100644
--- a/gallery_dl/extractor/imgur.py
+++ b/gallery_dl/extractor/imgur.py
@@ -83,7 +83,7 @@ class ImgurImageExtractor(ImgurExtractor):
image.update(image["media"][0])
del image["media"]
url = self._prepare(image)
- yield Message.Directory, image
+ yield Message.Directory, "", image
yield Message.Url, url, image
@@ -119,7 +119,7 @@ class ImgurAlbumExtractor(ImgurExtractor):
image["num"] = num
image["count"] = count
image["album"] = album
- yield Message.Directory, image
+ yield Message.Directory, "", image
yield Message.Url, url, image
diff --git a/gallery_dl/extractor/inkbunny.py b/gallery_dl/extractor/inkbunny.py
index c1b5c01c..547d4eea 100644
--- a/gallery_dl/extractor/inkbunny.py
+++ b/gallery_dl/extractor/inkbunny.py
@@ -48,7 +48,7 @@ class InkbunnyExtractor(Extractor):
del post["keywords"]
del post["files"]
- yield Message.Directory, post
+ yield Message.Directory, "", post
for post["num"], file in enumerate(files, 1):
post.update(file)
post["deleted"] = (file["deleted"] == "t")
diff --git a/gallery_dl/extractor/instagram.py b/gallery_dl/extractor/instagram.py
index 01db25d5..b89369f8 100644
--- a/gallery_dl/extractor/instagram.py
+++ b/gallery_dl/extractor/instagram.py
@@ -88,7 +88,7 @@ class InstagramExtractor(Extractor):
files = post.pop("_files")
post["count"] = len(files)
- yield Message.Directory, post
+ yield Message.Directory, "", post
if "date" in post:
del post["date"]
@@ -759,7 +759,7 @@ class InstagramInfoExtractor(InstagramExtractor):
else:
user = self.api.user_by_name(screen_name)
- return iter(((Message.Directory, user),))
+ return iter(((Message.Directory, "", user),))
class InstagramAvatarExtractor(InstagramExtractor):
diff --git a/gallery_dl/extractor/itaku.py b/gallery_dl/extractor/itaku.py
index 10579c1c..566ee8b6 100644
--- a/gallery_dl/extractor/itaku.py
+++ b/gallery_dl/extractor/itaku.py
@@ -51,7 +51,7 @@ class ItakuExtractor(Extractor):
else:
url = image["image"]
- yield Message.Directory, image
+ yield Message.Directory, "", image
yield Message.Url, url, text.nameext_from_url(url, image)
return
@@ -62,7 +62,7 @@ class ItakuExtractor(Extractor):
post["date"] = self.parse_datetime_iso(post["date_added"])
post["tags"] = [t["name"] for t in post["tags"]]
- yield Message.Directory, post
+ yield Message.Directory, "", post
for post["num"], image in enumerate(images, 1):
post["file"] = image
image["date"] = self.parse_datetime_iso(
diff --git a/gallery_dl/extractor/itchio.py b/gallery_dl/extractor/itchio.py
index 6312e58a..6fefe33f 100644
--- a/gallery_dl/extractor/itchio.py
+++ b/gallery_dl/extractor/itchio.py
@@ -57,5 +57,5 @@ class ItchioGameExtractor(Extractor):
game = {"game": game, "user": user, "id": upload_id}
url = info["url"]
- yield Message.Directory, game
+ yield Message.Directory, "", game
yield Message.Url, url, text.nameext_from_url(url, game)
diff --git a/gallery_dl/extractor/iwara.py b/gallery_dl/extractor/iwara.py
index 9cb0d640..d9d1cf0a 100644
--- a/gallery_dl/extractor/iwara.py
+++ b/gallery_dl/extractor/iwara.py
@@ -47,7 +47,7 @@ class IwaraExtractor(Extractor):
group_info["type"] = "image"
group_info["count"] = len(files)
- yield Message.Directory, group_info
+ yield Message.Directory, "", group_info
for num, file in enumerate(files, 1):
file_info = self.extract_media_info(file, None)
file_id = file_info["file_id"]
@@ -78,7 +78,7 @@ class IwaraExtractor(Extractor):
video["id"], exc.__class__.__name__, exc)
continue
- yield Message.Directory, info
+ yield Message.Directory, "", info
yield Message.Url, f"https:{download_url}", info
def items_user(self, users, key=None):
diff --git a/gallery_dl/extractor/jschan.py b/gallery_dl/extractor/jschan.py
index 9562534d..5dacf70b 100644
--- a/gallery_dl/extractor/jschan.py
+++ b/gallery_dl/extractor/jschan.py
@@ -39,7 +39,7 @@ class JschanThreadExtractor(JschanExtractor):
thread["threadId"] = thread["postId"]
posts = thread.pop("replies", ())
- yield Message.Directory, thread
+ yield Message.Directory, "", thread
for post in itertools.chain((thread,), posts):
if files := post.pop("files", ()):
thread.update(post)
diff --git a/gallery_dl/extractor/kabeuchi.py b/gallery_dl/extractor/kabeuchi.py
index 14cef8b5..88f2e327 100644
--- a/gallery_dl/extractor/kabeuchi.py
+++ b/gallery_dl/extractor/kabeuchi.py
@@ -33,7 +33,7 @@ class KabeuchiUserExtractor(Extractor):
continue
post["date"] = self.parse_datetime_iso(post["created_at"])
- yield Message.Directory, post
+ yield Message.Directory, "", post
for key in keys:
name = post[key]
diff --git a/gallery_dl/extractor/keenspot.py b/gallery_dl/extractor/keenspot.py
index f55a930e..3c1eb24a 100644
--- a/gallery_dl/extractor/keenspot.py
+++ b/gallery_dl/extractor/keenspot.py
@@ -34,7 +34,7 @@ class KeenspotComicExtractor(Extractor):
def items(self):
data = {"comic": self.comic}
- yield Message.Directory, data
+ yield Message.Directory, "", data
with self.request(self.root + "/") as response:
if response.history:
diff --git a/gallery_dl/extractor/kemono.py b/gallery_dl/extractor/kemono.py
index 7339b007..bf35670e 100644
--- a/gallery_dl/extractor/kemono.py
+++ b/gallery_dl/extractor/kemono.py
@@ -182,7 +182,7 @@ class KemonoExtractor(Extractor):
files.append(file)
post["count"] = len(files)
- yield Message.Directory, post
+ yield Message.Directory, "", post
for post["num"], file in enumerate(files, 1):
if "id" in file:
del file["id"]
@@ -440,7 +440,7 @@ class KemonoDiscordExtractor(KemonoExtractor):
post.update(data)
post["date"] = self._parse_datetime(post["published"])
post["count"] = len(files)
- yield Message.Directory, post
+ yield Message.Directory, "", post
for post["num"], file in enumerate(files, 1):
post["hash"] = file["hash"]
diff --git a/gallery_dl/extractor/khinsider.py b/gallery_dl/extractor/khinsider.py
index f22d54e9..8d1497dd 100644
--- a/gallery_dl/extractor/khinsider.py
+++ b/gallery_dl/extractor/khinsider.py
@@ -35,7 +35,7 @@ class KhinsiderSoundtrackExtractor(AsynchronousMixin, Extractor):
raise exception.NotFoundError("soundtrack")
data = self.metadata(page)
- yield Message.Directory, data
+ yield Message.Directory, "", data
if self.config("covers", False):
for num, url in enumerate(self._extract_covers(page), 1):
diff --git a/gallery_dl/extractor/leakgallery.py b/gallery_dl/extractor/leakgallery.py
index f5a1bbdf..2939304c 100644
--- a/gallery_dl/extractor/leakgallery.py
+++ b/gallery_dl/extractor/leakgallery.py
@@ -37,7 +37,7 @@ class LeakgalleryExtractor(Extractor):
media["url"] = url = f"https://cdn.leakgallery.com/{path}"
text.nameext_from_url(url, media)
- yield Message.Directory, media
+ yield Message.Directory, "", media
yield Message.Url, url, media
def _pagination(self, type, base, params=None, creator=None, pnum=1):
@@ -134,7 +134,7 @@ class LeakgalleryPostExtractor(LeakgalleryExtractor):
"url": url,
}
text.nameext_from_url(url, data)
- yield Message.Directory, data
+ yield Message.Directory, "", data
yield Message.Url, url, data
except Exception as exc:
self.log.error("Failed to extract post page %s/%s: %s",
diff --git a/gallery_dl/extractor/lensdump.py b/gallery_dl/extractor/lensdump.py
index b51e6988..a7b13187 100644
--- a/gallery_dl/extractor/lensdump.py
+++ b/gallery_dl/extractor/lensdump.py
@@ -123,5 +123,5 @@ class LensdumpImageExtractor(LensdumpBase, Extractor):
}
text.nameext_from_url(data["url"], data)
- yield Message.Directory, data
+ yield Message.Directory, "", data
yield Message.Url, data["url"], data
diff --git a/gallery_dl/extractor/lexica.py b/gallery_dl/extractor/lexica.py
index 6e548478..fc44f51b 100644
--- a/gallery_dl/extractor/lexica.py
+++ b/gallery_dl/extractor/lexica.py
@@ -36,7 +36,7 @@ class LexicaSearchExtractor(Extractor):
image["filename"] = image["id"]
image["extension"] = "jpg"
image["search_tags"] = tags
- yield Message.Directory, image
+ yield Message.Directory, "", image
yield Message.Url, base + image["id"], image
def posts(self):
diff --git a/gallery_dl/extractor/lightroom.py b/gallery_dl/extractor/lightroom.py
index b557149c..27aa15a2 100644
--- a/gallery_dl/extractor/lightroom.py
+++ b/gallery_dl/extractor/lightroom.py
@@ -35,7 +35,7 @@ class LightroomGalleryExtractor(Extractor):
images = self.images(album)
for img in images:
url = img["url"]
- yield Message.Directory, img
+ yield Message.Directory, "", img
yield Message.Url, url, text.nameext_from_url(url, img)
def metadata(self, album):
diff --git a/gallery_dl/extractor/livedoor.py b/gallery_dl/extractor/livedoor.py
index 66d9dcf3..706194af 100644
--- a/gallery_dl/extractor/livedoor.py
+++ b/gallery_dl/extractor/livedoor.py
@@ -27,7 +27,7 @@ class LivedoorExtractor(Extractor):
def items(self):
for post in self.posts():
if images := self._images(post):
- yield Message.Directory, {"post": post}
+ yield Message.Directory, "", {"post": post}
for image in images:
yield Message.Url, image["url"], image
diff --git a/gallery_dl/extractor/lofter.py b/gallery_dl/extractor/lofter.py
index a6a2d019..b1f58ac0 100644
--- a/gallery_dl/extractor/lofter.py
+++ b/gallery_dl/extractor/lofter.py
@@ -63,7 +63,7 @@ class LofterExtractor(Extractor):
post["id"], post_type)
post["count"] = len(image_urls)
- yield Message.Directory, post
+ yield Message.Directory, "", post
for post["num"], url in enumerate(image_urls, 1):
yield Message.Url, url, text.nameext_from_url(url, post)
diff --git a/gallery_dl/extractor/lolisafe.py b/gallery_dl/extractor/lolisafe.py
index 13c723b0..d17549de 100644
--- a/gallery_dl/extractor/lolisafe.py
+++ b/gallery_dl/extractor/lolisafe.py
@@ -42,7 +42,7 @@ class LolisafeAlbumExtractor(LolisafeExtractor):
def items(self):
files, data = self.fetch_album(self.album_id)
- yield Message.Directory, data
+ yield Message.Directory, "", data
for data["num"], file in enumerate(files, 1):
url = file["file"]
file.update(data)
diff --git a/gallery_dl/extractor/luscious.py b/gallery_dl/extractor/luscious.py
index 14c91bde..2abd1c89 100644
--- a/gallery_dl/extractor/luscious.py
+++ b/gallery_dl/extractor/luscious.py
@@ -58,7 +58,7 @@ class LusciousAlbumExtractor(LusciousExtractor):
def items(self):
album = self.metadata()
- yield Message.Directory, {"album": album}
+ yield Message.Directory, "", {"album": album}
for num, image in enumerate(self.images(), 1):
image["num"] = num
image["album"] = album
diff --git a/gallery_dl/extractor/lynxchan.py b/gallery_dl/extractor/lynxchan.py
index e1184c8c..7cf12828 100644
--- a/gallery_dl/extractor/lynxchan.py
+++ b/gallery_dl/extractor/lynxchan.py
@@ -48,7 +48,7 @@ class LynxchanThreadExtractor(LynxchanExtractor):
thread["postId"] = thread["threadId"]
posts = thread.pop("posts", ())
- yield Message.Directory, thread
+ yield Message.Directory, "", thread
for post in itertools.chain((thread,), posts):
if files := post.pop("files", ()):
thread.update(post)
diff --git a/gallery_dl/extractor/madokami.py b/gallery_dl/extractor/madokami.py
index e9fc4f93..e15b90d7 100644
--- a/gallery_dl/extractor/madokami.py
+++ b/gallery_dl/extractor/madokami.py
@@ -88,5 +88,5 @@ class MadokamiMangaExtractor(MadokamiExtractor):
url = f"{self.root}{ch['path']}"
text.nameext_from_url(url, ch)
- yield Message.Directory, ch
+ yield Message.Directory, "", ch
yield Message.Url, url, ch
diff --git a/gallery_dl/extractor/mangadex.py b/gallery_dl/extractor/mangadex.py
index f3851d07..0a1709d7 100644
--- a/gallery_dl/extractor/mangadex.py
+++ b/gallery_dl/extractor/mangadex.py
@@ -95,7 +95,7 @@ class MangadexCoversExtractor(MangadexExtractor):
name = data["cover"]
text.nameext_from_url(name, data)
data["cover_id"] = data["filename"]
- yield Message.Directory, data
+ yield Message.Directory, "", data
yield Message.Url, f"{base}{name}", data
def _transform_cover(self, cover):
@@ -134,7 +134,7 @@ class MangadexChapterExtractor(MangadexExtractor):
f"available on MangaDex and can instead be read on the "
f"official publisher's website at {data['_external_url']}.")
- yield Message.Directory, data
+ yield Message.Directory, "", data
if self.config("data-saver", False):
path = "data-saver"
diff --git a/gallery_dl/extractor/mangoxo.py b/gallery_dl/extractor/mangoxo.py
index df9f3c6d..60f0de97 100644
--- a/gallery_dl/extractor/mangoxo.py
+++ b/gallery_dl/extractor/mangoxo.py
@@ -91,7 +91,7 @@ class MangoxoAlbumExtractor(MangoxoExtractor):
data = self.metadata(page)
imgs = self.images(url, page)
- yield Message.Directory, data
+ yield Message.Directory, "", data
data["extension"] = None
for data["num"], path in enumerate(imgs, 1):
diff --git a/gallery_dl/extractor/mastodon.py b/gallery_dl/extractor/mastodon.py
index 51546f75..a82b2117 100644
--- a/gallery_dl/extractor/mastodon.py
+++ b/gallery_dl/extractor/mastodon.py
@@ -66,7 +66,7 @@ class MastodonExtractor(BaseExtractor):
status["tags"] = [tag["name"] for tag in status["tags"]]
status["date"] = self.parse_datetime_iso(status["created_at"][:19])
- yield Message.Directory, status
+ yield Message.Directory, "", status
for status["num"], media in enumerate(attachments, 1):
status["media"] = media
url = media["url"]
diff --git a/gallery_dl/extractor/message.py b/gallery_dl/extractor/message.py
index d5c25546..ee61c10a 100644
--- a/gallery_dl/extractor/message.py
+++ b/gallery_dl/extractor/message.py
@@ -20,7 +20,8 @@ class Message():
- Message.Directory:
- Sets the target directory for all following images
- - 2nd element is a dictionary containing general metadata
+ - 2nd element is unused
+ - 3rd element is a dictionary containing general metadata
- Message.Url:
- Image URL and its metadata
diff --git a/gallery_dl/extractor/misskey.py b/gallery_dl/extractor/misskey.py
index 92181948..66dcba65 100644
--- a/gallery_dl/extractor/misskey.py
+++ b/gallery_dl/extractor/misskey.py
@@ -46,7 +46,7 @@ class MisskeyExtractor(BaseExtractor):
note["count"] = len(files)
note["date"] = self.parse_datetime_iso(note["createdAt"])
- yield Message.Directory, note
+ yield Message.Directory, "", note
for note["num"], file in enumerate(files, 1):
file["date"] = self.parse_datetime_iso(file["createdAt"])
note["file"] = file
@@ -134,7 +134,7 @@ class MisskeyInfoExtractor(MisskeyExtractor):
def items(self):
user = self.api.users_show(self.groups[-1])
- return iter(((Message.Directory, user),))
+ return iter(((Message.Directory, "", user),))
class MisskeyAvatarExtractor(MisskeyExtractor):
diff --git a/gallery_dl/extractor/motherless.py b/gallery_dl/extractor/motherless.py
index 1419abf0..c20f138f 100644
--- a/gallery_dl/extractor/motherless.py
+++ b/gallery_dl/extractor/motherless.py
@@ -160,7 +160,7 @@ class MotherlessMediaExtractor(MotherlessExtractor):
def items(self):
file = self._extract_media(self.groups[0])
url = file["url"]
- yield Message.Directory, file
+ yield Message.Directory, "", file
yield Message.Url, url, text.nameext_from_url(url, file)
@@ -197,7 +197,7 @@ class MotherlessGalleryExtractor(MotherlessExtractor):
file["num"] = num
file["thumbnail"] = thumbnail
url = file["url"]
- yield Message.Directory, file
+ yield Message.Directory, "", file
yield Message.Url, url, text.nameext_from_url(url, file)
@@ -235,5 +235,5 @@ class MotherlessGroupExtractor(MotherlessExtractor):
file["uploader"] = uploader
file["group"] = file["group_id"]
url = file["url"]
- yield Message.Directory, file
+ yield Message.Directory, "", file
yield Message.Url, url, text.nameext_from_url(url, file)
diff --git a/gallery_dl/extractor/myportfolio.py b/gallery_dl/extractor/myportfolio.py
index 0223d0b8..3a211228 100644
--- a/gallery_dl/extractor/myportfolio.py
+++ b/gallery_dl/extractor/myportfolio.py
@@ -49,7 +49,7 @@ class MyportfolioGalleryExtractor(Extractor):
data = self.metadata(page)
imgs = self.images(page)
data["count"] = len(imgs)
- yield Message.Directory, data
+ yield Message.Directory, "", data
for data["num"], url in enumerate(imgs, 1):
yield Message.Url, url, text.nameext_from_url(url, data)
diff --git a/gallery_dl/extractor/naverchzzk.py b/gallery_dl/extractor/naverchzzk.py
index e1dc1362..5b567103 100644
--- a/gallery_dl/extractor/naverchzzk.py
+++ b/gallery_dl/extractor/naverchzzk.py
@@ -34,7 +34,7 @@ class NaverChzzkExtractor(Extractor):
data["date"] = self.parse_datetime(
data["createdDate"], "%Y%m%d%H%M%S")
- yield Message.Directory, data
+ yield Message.Directory, "", data
for data["num"], file in enumerate(files, 1):
if extra := file.get("extraJson"):
file.update(util.json_loads(extra))
diff --git a/gallery_dl/extractor/nekohouse.py b/gallery_dl/extractor/nekohouse.py
index 0e281dda..728912b4 100644
--- a/gallery_dl/extractor/nekohouse.py
+++ b/gallery_dl/extractor/nekohouse.py
@@ -42,7 +42,7 @@ class NekohousePostExtractor(NekohouseExtractor):
post["post_id"] = post_id
post["count"] = len(files)
- yield Message.Directory, post
+ yield Message.Directory, "", post
for post["num"], file in enumerate(files, 1):
url = file["url"]
text.nameext_from_url(url, file)
diff --git a/gallery_dl/extractor/newgrounds.py b/gallery_dl/extractor/newgrounds.py
index fd1b5170..d636479b 100644
--- a/gallery_dl/extractor/newgrounds.py
+++ b/gallery_dl/extractor/newgrounds.py
@@ -64,7 +64,7 @@ class NewgroundsExtractor(Extractor):
if url:
if metadata:
post.update(metadata)
- yield Message.Directory, post
+ yield Message.Directory, "", post
post["num"] = 0
yield Message.Url, url, text.nameext_from_url(url, post)
diff --git a/gallery_dl/extractor/nijie.py b/gallery_dl/extractor/nijie.py
index ffe9c890..a6b01c2f 100644
--- a/gallery_dl/extractor/nijie.py
+++ b/gallery_dl/extractor/nijie.py
@@ -59,7 +59,7 @@ class NijieExtractor(AsynchronousMixin, BaseExtractor):
urls = self._extract_images(image_id, page)
data["count"] = len(urls)
- yield Message.Directory, data
+ yield Message.Directory, "", data
for num, url in enumerate(urls):
image = text.nameext_from_url(url, {
"num": num,
diff --git a/gallery_dl/extractor/nitter.py b/gallery_dl/extractor/nitter.py
index 6f292e6d..321883cd 100644
--- a/gallery_dl/extractor/nitter.py
+++ b/gallery_dl/extractor/nitter.py
@@ -97,7 +97,7 @@ class NitterExtractor(BaseExtractor):
files = ()
tweet["count"] = len(files)
- yield Message.Directory, tweet
+ yield Message.Directory, "", tweet
for tweet["num"], file in enumerate(files, 1):
url = file["url"]
file.update(tweet)
diff --git a/gallery_dl/extractor/nozomi.py b/gallery_dl/extractor/nozomi.py
index 6a78a47a..fdd35948 100644
--- a/gallery_dl/extractor/nozomi.py
+++ b/gallery_dl/extractor/nozomi.py
@@ -60,7 +60,7 @@ class NozomiExtractor(Extractor):
if key in post:
del post[key]
- yield Message.Directory, post
+ yield Message.Directory, "", post
for post["num"], image in enumerate(images, 1):
post["filename"] = post["dataid"] = did = image["dataid"]
post["is_video"] = video = \
diff --git a/gallery_dl/extractor/nudostar.py b/gallery_dl/extractor/nudostar.py
index 804c2b03..2eb43401 100644
--- a/gallery_dl/extractor/nudostar.py
+++ b/gallery_dl/extractor/nudostar.py
@@ -67,5 +67,5 @@ class NudostarImageExtractor(NudostarExtractor):
data["num"] = text.parse_int(self.groups[2])
data["url"] = img_url
- yield Message.Directory, data
+ yield Message.Directory, "", data
yield Message.Url, img_url, data
diff --git a/gallery_dl/extractor/paheal.py b/gallery_dl/extractor/paheal.py
index c87a69e7..d56331f7 100644
--- a/gallery_dl/extractor/paheal.py
+++ b/gallery_dl/extractor/paheal.py
@@ -31,7 +31,7 @@ class PahealExtractor(Extractor):
post["width"] = text.parse_int(post["width"])
post["height"] = text.parse_int(post["height"])
post.update(data)
- yield Message.Directory, post
+ yield Message.Directory, "", post
yield Message.Url, post["file_url"], post
def get_metadata(self):
diff --git a/gallery_dl/extractor/patreon.py b/gallery_dl/extractor/patreon.py
index dd3e3339..12dfd48e 100644
--- a/gallery_dl/extractor/patreon.py
+++ b/gallery_dl/extractor/patreon.py
@@ -46,7 +46,7 @@ class PatreonExtractor(Extractor):
for post in self.posts():
- yield Message.Directory, post
+ yield Message.Directory, "", post
if not post.get("current_user_can_view", True):
self.log.warning("Not allowed to view post %s", post["id"])
continue
diff --git a/gallery_dl/extractor/pexels.py b/gallery_dl/extractor/pexels.py
index da2dabac..9e2f40cb 100644
--- a/gallery_dl/extractor/pexels.py
+++ b/gallery_dl/extractor/pexels.py
@@ -48,7 +48,7 @@ class PexelsExtractor(Extractor):
self.log.warning("%s: Unsupported post type", post.get("id"))
continue
- yield Message.Directory, post
+ yield Message.Directory, "", post
yield Message.Url, url, text.nameext_from_url(name, post)
def posts(self):
diff --git a/gallery_dl/extractor/photovogue.py b/gallery_dl/extractor/photovogue.py
index d5bd61d2..cb16b232 100644
--- a/gallery_dl/extractor/photovogue.py
+++ b/gallery_dl/extractor/photovogue.py
@@ -31,7 +31,7 @@ class PhotovogueUserExtractor(Extractor):
photo["title"] = photo["title"].strip()
photo["date"] = self.parse_datetime_iso(photo["date"])
- yield Message.Directory, photo
+ yield Message.Directory, "", photo
yield Message.Url, url, text.nameext_from_url(url, photo)
def photos(self):
diff --git a/gallery_dl/extractor/picarto.py b/gallery_dl/extractor/picarto.py
index 3c49452b..b0fa079f 100644
--- a/gallery_dl/extractor/picarto.py
+++ b/gallery_dl/extractor/picarto.py
@@ -31,7 +31,7 @@ class PicartoGalleryExtractor(Extractor):
for post in self.posts():
post["date"] = self.parse_datetime_iso(post["created_at"])
variations = post.pop("variations", ())
- yield Message.Directory, post
+ yield Message.Directory, "", post
image = post["default_image"]
if not image:
diff --git a/gallery_dl/extractor/pictoa.py b/gallery_dl/extractor/pictoa.py
index 4c85ea61..0dfe304d 100644
--- a/gallery_dl/extractor/pictoa.py
+++ b/gallery_dl/extractor/pictoa.py
@@ -43,7 +43,7 @@ class PictoaImageExtractor(PictoaExtractor):
}
text.nameext_from_url(image_url, data)
- yield Message.Directory, data
+ yield Message.Directory, "", data
yield Message.Url, image_url, data
diff --git a/gallery_dl/extractor/piczel.py b/gallery_dl/extractor/piczel.py
index a54a0c33..6661e7d2 100644
--- a/gallery_dl/extractor/piczel.py
+++ b/gallery_dl/extractor/piczel.py
@@ -32,7 +32,7 @@ class PiczelExtractor(Extractor):
images = post["images"]
del post["images"]
post["count"] = len(images)
- yield Message.Directory, post
+ yield Message.Directory, "", post
for post["num"], image in enumerate(images):
if "id" in image:
del image["id"]
@@ -42,7 +42,7 @@ class PiczelExtractor(Extractor):
else:
post["count"] = 1
- yield Message.Directory, post
+ yield Message.Directory, "", post
post["num"] = 0
url = post["image"]["url"]
yield Message.Url, url, text.nameext_from_url(url, post)
diff --git a/gallery_dl/extractor/pillowfort.py b/gallery_dl/extractor/pillowfort.py
index ad8b9eb3..0b750fe8 100644
--- a/gallery_dl/extractor/pillowfort.py
+++ b/gallery_dl/extractor/pillowfort.py
@@ -51,7 +51,7 @@ class PillowfortExtractor(Extractor):
post["date"] = self.parse_datetime_iso(post["created_at"])
post["post_id"] = post.pop("id")
post["count"] = len(files)
- yield Message.Directory, post
+ yield Message.Directory, "", post
post["num"] = 0
for file in files:
diff --git a/gallery_dl/extractor/pinterest.py b/gallery_dl/extractor/pinterest.py
index 2e3c23bc..7aa32ec7 100644
--- a/gallery_dl/extractor/pinterest.py
+++ b/gallery_dl/extractor/pinterest.py
@@ -63,7 +63,7 @@ class PinterestExtractor(Extractor):
if value := pin.get(key):
pin[key] = value.strip()
- yield Message.Directory, pin
+ yield Message.Directory, "", pin
for pin["num"], file in enumerate(files, 1):
url = file["url"]
text.nameext_from_url(url, pin)
diff --git a/gallery_dl/extractor/pixeldrain.py b/gallery_dl/extractor/pixeldrain.py
index 581c1725..1486976b 100644
--- a/gallery_dl/extractor/pixeldrain.py
+++ b/gallery_dl/extractor/pixeldrain.py
@@ -44,7 +44,7 @@ class PixeldrainFileExtractor(PixeldrainExtractor):
file["date"] = self.parse_datetime_iso(file["date_upload"])
text.nameext_from_url(file["name"], file)
- yield Message.Directory, file
+ yield Message.Directory, "", file
yield Message.Url, file["url"], file
@@ -82,7 +82,7 @@ class PixeldrainAlbumExtractor(PixeldrainExtractor):
del album["files"]
del album["file_count"]
- yield Message.Directory, {"album": album}
+ yield Message.Directory, "", {"album": album}
for num, file in enumerate(files, idx+1):
file["album"] = album
file["num"] = num
@@ -131,7 +131,7 @@ class PixeldrainFolderExtractor(PixeldrainExtractor):
folder = self.metadata(path)
folder["id"] = paths[0]["id"]
- yield Message.Directory, folder
+ yield Message.Directory, "", folder
num = 0
for child in children:
diff --git a/gallery_dl/extractor/pixiv.py b/gallery_dl/extractor/pixiv.py
index 654fec6b..5be4867a 100644
--- a/gallery_dl/extractor/pixiv.py
+++ b/gallery_dl/extractor/pixiv.py
@@ -100,7 +100,7 @@ class PixivExtractor(Extractor):
work["suffix"] = ""
work.update(metadata)
- yield Message.Directory, work
+ yield Message.Directory, "", work
for work["num"], file in enumerate(files):
url = file["url"]
work.update(file)
@@ -892,7 +892,7 @@ class PixivSketchExtractor(Extractor):
post["date"] = dt.parse_iso(post["created_at"])
util.delete_items(post, ("id", "media", "_links"))
- yield Message.Directory, post
+ yield Message.Directory, "", post
post["_http_headers"] = headers
for photo in media:
@@ -973,7 +973,7 @@ class PixivNovelExtractor(PixivExtractor):
novel["rating"] = ratings.get(novel["x_restrict"])
novel["suffix"] = ""
- yield Message.Directory, novel
+ yield Message.Directory, "", novel
try:
content = self.api.novel_webview(novel["id"])["text"]
diff --git a/gallery_dl/extractor/pixnet.py b/gallery_dl/extractor/pixnet.py
index 741d9d8b..2feab954 100644
--- a/gallery_dl/extractor/pixnet.py
+++ b/gallery_dl/extractor/pixnet.py
@@ -83,7 +83,7 @@ class PixnetImageExtractor(PixnetExtractor):
data["blog"] = self.blog
data["user"] = data.pop("author_name")
- yield Message.Directory, data
+ yield Message.Directory, "", data
yield Message.Url, data["url"], data
@@ -100,7 +100,7 @@ class PixnetSetExtractor(PixnetExtractor):
page = self.request(url, encoding="utf-8").text
data = self.metadata(page)
- yield Message.Directory, data
+ yield Message.Directory, "", data
for num, info in enumerate(self._pagination(page), 1):
url, pos = text.extract(info, ' href="', '"')
src, pos = text.extract(info, ' src="', '"', pos)
diff --git a/gallery_dl/extractor/poipiku.py b/gallery_dl/extractor/poipiku.py
index 32ca528d..c3aaabad 100644
--- a/gallery_dl/extractor/poipiku.py
+++ b/gallery_dl/extractor/poipiku.py
@@ -81,7 +81,7 @@ class PoipikuExtractor(Extractor):
"PasswordIcon", ">"):
post["password"] = True
- yield Message.Directory, post
+ yield Message.Directory, "", post
for post["num"], url in enumerate(extract_files(
post, thumb, extr), 1):
yield Message.Url, url, text.nameext_from_url(url, post)
diff --git a/gallery_dl/extractor/poringa.py b/gallery_dl/extractor/poringa.py
index bf11df3f..832bedf3 100644
--- a/gallery_dl/extractor/poringa.py
+++ b/gallery_dl/extractor/poringa.py
@@ -68,7 +68,7 @@ class PoringaExtractor(Extractor):
main_post, '
")),
}
- yield Message.Directory, gif
+ yield Message.Directory, "", gif
yield Message.Url, gif["url"], text.nameext_from_url(gif["url"], gif)
diff --git a/gallery_dl/extractor/postmill.py b/gallery_dl/extractor/postmill.py
index 579b8ecb..e71246aa 100644
--- a/gallery_dl/extractor/postmill.py
+++ b/gallery_dl/extractor/postmill.py
@@ -72,7 +72,7 @@ class PostmillExtractor(BaseExtractor):
urls.append((Message.Queue, url))
data["count"] = len(urls)
- yield Message.Directory, data
+ yield Message.Directory, "", data
for data["num"], (msg, url) in enumerate(urls, 1):
if url.startswith("text:"):
data["filename"], data["extension"] = "", "htm"
diff --git a/gallery_dl/extractor/reactor.py b/gallery_dl/extractor/reactor.py
index 52162a6d..8e974d21 100644
--- a/gallery_dl/extractor/reactor.py
+++ b/gallery_dl/extractor/reactor.py
@@ -38,7 +38,7 @@ class ReactorExtractor(BaseExtractor):
def items(self):
data = self.metadata()
- yield Message.Directory, data
+ yield Message.Directory, "", data
for post in self.posts():
for image in self._parse_post(post):
url = image["url"]
@@ -228,6 +228,6 @@ class ReactorPostExtractor(ReactorExtractor):
pos = post.find('class="uhead">')
for image in self._parse_post(post[pos:]):
if image["num"] == 1:
- yield Message.Directory, image
+ yield Message.Directory, "", image
url = image["url"]
yield Message.Url, url, text.nameext_from_url(url, image)
diff --git a/gallery_dl/extractor/redbust.py b/gallery_dl/extractor/redbust.py
index d294fbc8..acceda4c 100644
--- a/gallery_dl/extractor/redbust.py
+++ b/gallery_dl/extractor/redbust.py
@@ -182,5 +182,5 @@ class RedbustImageExtractor(RedbustExtractor):
"url" : img_url,
})
- yield Message.Directory, data
+ yield Message.Directory, "", data
yield Message.Url, img_url, data
diff --git a/gallery_dl/extractor/reddit.py b/gallery_dl/extractor/reddit.py
index 4581c07b..f0f12663 100644
--- a/gallery_dl/extractor/reddit.py
+++ b/gallery_dl/extractor/reddit.py
@@ -59,7 +59,7 @@ class RedditExtractor(Extractor):
submission["comment"] = None
submission["date"] = self.parse_timestamp(
submission["created_utc"])
- yield Message.Directory, submission
+ yield Message.Directory, "", submission
visited.add(submission["id"])
submission["num"] = 0
@@ -105,14 +105,14 @@ class RedditExtractor(Extractor):
urls.append((url, submission))
elif parentdir:
- yield Message.Directory, comments[0]
+ yield Message.Directory, "", comments[0]
if self.api.comments:
if comments and not submission:
submission = comments[0]
submission.setdefault("num", 0)
if not parentdir:
- yield Message.Directory, submission
+ yield Message.Directory, "", submission
for comment in comments:
media = (embeds and "media_metadata" in comment)
@@ -352,7 +352,7 @@ class RedditImageExtractor(Extractor):
def items(self):
url = f"https://{self.domain}/{self.path}{self.query}"
data = text.nameext_from_url(url)
- yield Message.Directory, data
+ yield Message.Directory, "", data
yield Message.Url, url, data
diff --git a/gallery_dl/extractor/redgifs.py b/gallery_dl/extractor/redgifs.py
index 304ef5c8..164fdf49 100644
--- a/gallery_dl/extractor/redgifs.py
+++ b/gallery_dl/extractor/redgifs.py
@@ -52,7 +52,7 @@ class RedgifsExtractor(Extractor):
gif.update(metadata)
gif["count"] = cnt
gif["date"] = self.parse_timestamp(gif.get("createDate"))
- yield Message.Directory, gif
+ yield Message.Directory, "", gif
for num, gif in enumerate(gifs, enum):
gif["_fallback"] = formats = self._formats(gif)
diff --git a/gallery_dl/extractor/s3ndpics.py b/gallery_dl/extractor/s3ndpics.py
index 87d91a6f..9201a3f2 100644
--- a/gallery_dl/extractor/s3ndpics.py
+++ b/gallery_dl/extractor/s3ndpics.py
@@ -36,7 +36,7 @@ class S3ndpicsExtractor(Extractor):
files = post.pop("files", ())
post["count"] = len(files)
- yield Message.Directory, post
+ yield Message.Directory, "", post
for post["num"], file in enumerate(files, 1):
post["type"] = file["type"]
path = file["url"]
diff --git a/gallery_dl/extractor/sankakucomplex.py b/gallery_dl/extractor/sankakucomplex.py
index eebd412a..cf5af81d 100644
--- a/gallery_dl/extractor/sankakucomplex.py
+++ b/gallery_dl/extractor/sankakucomplex.py
@@ -53,7 +53,7 @@ class SankakucomplexArticleExtractor(SankakucomplexExtractor):
files += self._extract_embeds(content)
data["count"] = len(files)
- yield Message.Directory, data
+ yield Message.Directory, "", data
for num, url in enumerate(files, 1):
file = text.nameext_from_url(url)
if url[0] == "/":
diff --git a/gallery_dl/extractor/scrolller.py b/gallery_dl/extractor/scrolller.py
index 92ec0063..b853f533 100644
--- a/gallery_dl/extractor/scrolller.py
+++ b/gallery_dl/extractor/scrolller.py
@@ -34,7 +34,7 @@ class ScrolllerExtractor(Extractor):
files = self._extract_files(post)
post["count"] = len(files)
- yield Message.Directory, post
+ yield Message.Directory, "", post
for file in files:
url = file["url"]
post.update(file)
diff --git a/gallery_dl/extractor/seiga.py b/gallery_dl/extractor/seiga.py
index 5f0ab7f7..705227df 100644
--- a/gallery_dl/extractor/seiga.py
+++ b/gallery_dl/extractor/seiga.py
@@ -31,7 +31,7 @@ class SeigaExtractor(Extractor):
images = iter(self.get_images())
data = next(images)
- yield Message.Directory, data
+ yield Message.Directory, "", data
for image in util.advance(images, self.start_image):
data.update(image)
data["extension"] = None
diff --git a/gallery_dl/extractor/sexcom.py b/gallery_dl/extractor/sexcom.py
index 4ed4f721..b599f707 100644
--- a/gallery_dl/extractor/sexcom.py
+++ b/gallery_dl/extractor/sexcom.py
@@ -25,7 +25,7 @@ class SexcomExtractor(Extractor):
def items(self):
self.gifs = self.config("gifs", True)
- yield Message.Directory, self.metadata()
+ yield Message.Directory, "", self.metadata()
for pin in map(self._parse_pin, self.pins()):
if not pin:
continue
@@ -345,7 +345,7 @@ class SexcomSearchExtractor(SexcomExtractor):
path = f"{path[:-4]}gif"
pin["url"] = f"{root}{path}"
- yield Message.Directory, pin
+ yield Message.Directory, "", pin
yield Message.Url, pin["url"], pin
if params["page"] >= data["paging"]["numberOfPages"]:
diff --git a/gallery_dl/extractor/shimmie2.py b/gallery_dl/extractor/shimmie2.py
index 2c6a68db..5572b4de 100644
--- a/gallery_dl/extractor/shimmie2.py
+++ b/gallery_dl/extractor/shimmie2.py
@@ -46,7 +46,7 @@ class Shimmie2Extractor(BaseExtractor):
else:
text.nameext_from_url(url, post)
- yield Message.Directory, post
+ yield Message.Directory, "", post
yield Message.Url, url, post
def metadata(self):
diff --git a/gallery_dl/extractor/shopify.py b/gallery_dl/extractor/shopify.py
index e070453e..ad38562f 100644
--- a/gallery_dl/extractor/shopify.py
+++ b/gallery_dl/extractor/shopify.py
@@ -20,7 +20,7 @@ class ShopifyExtractor(BaseExtractor):
def items(self):
data = self.metadata()
- yield Message.Directory, data
+ yield Message.Directory, "", data
for product in self.products():
for num, image in enumerate(product.pop("images"), 1):
diff --git a/gallery_dl/extractor/simpcity.py b/gallery_dl/extractor/simpcity.py
index caefe2ce..4c0dd004 100644
--- a/gallery_dl/extractor/simpcity.py
+++ b/gallery_dl/extractor/simpcity.py
@@ -48,7 +48,7 @@ class SimpcityExtractor(Extractor):
data = {"post": post}
post["count"] = data["count"] = len(urls)
- yield Message.Directory, data
+ yield Message.Directory, "", data
data["num"] = data["num_internal"] = data["num_external"] = 0
for video, inl1, inl2, ext in urls:
diff --git a/gallery_dl/extractor/simplyhentai.py b/gallery_dl/extractor/simplyhentai.py
index b4752093..78d3daf9 100644
--- a/gallery_dl/extractor/simplyhentai.py
+++ b/gallery_dl/extractor/simplyhentai.py
@@ -106,7 +106,7 @@ class SimplyhentaiImageExtractor(Extractor):
})
data["token"] = data["filename"].rpartition("_")[2]
- yield Message.Directory, data
+ yield Message.Directory, "", data
yield Message.Url, url, data
@@ -156,5 +156,5 @@ class SimplyhentaiVideoExtractor(Extractor):
date), "%B %d, %Y %H:%M"),
})
- yield Message.Directory, data
+ yield Message.Directory, "", data
yield Message.Url, video_url, data
diff --git a/gallery_dl/extractor/skeb.py b/gallery_dl/extractor/skeb.py
index c5705ac7..43e518ef 100644
--- a/gallery_dl/extractor/skeb.py
+++ b/gallery_dl/extractor/skeb.py
@@ -57,7 +57,7 @@ class SkebExtractor(Extractor):
files = self._get_files_from_post(response)
post["count"] = len(files)
- yield Message.Directory, post
+ yield Message.Directory, "", post
for post["num"], file in enumerate(files, 1):
post.update(file)
url = file["file_url"]
diff --git a/gallery_dl/extractor/slickpic.py b/gallery_dl/extractor/slickpic.py
index 947740ed..6f723c80 100644
--- a/gallery_dl/extractor/slickpic.py
+++ b/gallery_dl/extractor/slickpic.py
@@ -56,7 +56,7 @@ class SlickpicAlbumExtractor(SlickpicExtractor):
"count": len(imgs),
}
- yield Message.Directory, data
+ yield Message.Directory, "", data
for num, img in enumerate(imgs, 1):
url = img["url_rsz"] + "/o/" + img["fname"]
img = text.nameext_from_url(img["fname"], {
diff --git a/gallery_dl/extractor/smugmug.py b/gallery_dl/extractor/smugmug.py
index 1668634e..902044ca 100644
--- a/gallery_dl/extractor/smugmug.py
+++ b/gallery_dl/extractor/smugmug.py
@@ -81,7 +81,7 @@ class SmugmugAlbumExtractor(SmugmugExtractor):
del album["Uris"]
data = {"Album": album, "User": user}
- yield Message.Directory, data
+ yield Message.Directory, "", data
for image in self.api.album_images(self.album_id, "ImageSizeDetails"):
url = self._select_format(image)
@@ -107,7 +107,7 @@ class SmugmugImageExtractor(SmugmugExtractor):
data = {"Image": image}
text.nameext_from_url(url, data)
- yield Message.Directory, data
+ yield Message.Directory, "", data
yield Message.Url, url, data
diff --git a/gallery_dl/extractor/soundgasm.py b/gallery_dl/extractor/soundgasm.py
index ac1e631e..a4617dd2 100644
--- a/gallery_dl/extractor/soundgasm.py
+++ b/gallery_dl/extractor/soundgasm.py
@@ -26,7 +26,7 @@ class SoundgasmExtractor(Extractor):
def items(self):
for sound in map(self._extract_sound, self.sounds()):
url = sound["url"]
- yield Message.Directory, sound
+ yield Message.Directory, "", sound
yield Message.Url, url, text.nameext_from_url(url, sound)
def _extract_sound(self, url):
diff --git a/gallery_dl/extractor/steamgriddb.py b/gallery_dl/extractor/steamgriddb.py
index 47faede8..c3af7fd6 100644
--- a/gallery_dl/extractor/steamgriddb.py
+++ b/gallery_dl/extractor/steamgriddb.py
@@ -59,7 +59,7 @@ class SteamgriddbExtractor(Extractor):
fake_png = download_fake_png and asset.get("fake_png")
asset["count"] = 2 if fake_png else 1
- yield Message.Directory, asset
+ yield Message.Directory, "", asset
asset["num"] = 1
url = asset["url"]
diff --git a/gallery_dl/extractor/subscribestar.py b/gallery_dl/extractor/subscribestar.py
index 42caf3c7..280c8d72 100644
--- a/gallery_dl/extractor/subscribestar.py
+++ b/gallery_dl/extractor/subscribestar.py
@@ -46,7 +46,7 @@ class SubscribestarExtractor(Extractor):
content, "", "")
data["title"] = text.unescape(text.rextr(content, "", "
"))
- yield Message.Directory, data
+ yield Message.Directory, "", data
for num, item in enumerate(media, 1):
item.update(data)
item["num"] = num
diff --git a/gallery_dl/extractor/tapas.py b/gallery_dl/extractor/tapas.py
index 97cbb680..5f8cb67b 100644
--- a/gallery_dl/extractor/tapas.py
+++ b/gallery_dl/extractor/tapas.py
@@ -90,7 +90,7 @@ class TapasEpisodeExtractor(TapasExtractor):
html = data["html"]
episode["series"] = self._extract_series(html)
episode["date"] = self.parse_datetime_iso(episode["publish_date"])
- yield Message.Directory, episode
+ yield Message.Directory, "", episode
if episode["book"]:
content = text.extr(
diff --git a/gallery_dl/extractor/tenor.py b/gallery_dl/extractor/tenor.py
index cab5761a..c3e4276c 100644
--- a/gallery_dl/extractor/tenor.py
+++ b/gallery_dl/extractor/tenor.py
@@ -49,7 +49,7 @@ class TenorExtractor(Extractor):
gif["description"] = gif.pop("content_description", "")
gif["date"] = self.parse_timestamp(gif["created"])
- yield Message.Directory, gif
+ yield Message.Directory, "", gif
yield Message.Url, url, text.nameext_from_url(url, gif)
def _extract_format(self, gif):
diff --git a/gallery_dl/extractor/thehentaiworld.py b/gallery_dl/extractor/thehentaiworld.py
index 47cc4329..773f3003 100644
--- a/gallery_dl/extractor/thehentaiworld.py
+++ b/gallery_dl/extractor/thehentaiworld.py
@@ -36,12 +36,12 @@ class ThehentaiworldExtractor(Extractor):
if "file_urls" in post:
urls = post["file_urls"]
post["count"] = len(urls)
- yield Message.Directory, post
+ yield Message.Directory, "", post
for post["num"], url in enumerate(urls, 1):
text.nameext_from_url(url, post)
yield Message.Url, url, post
else:
- yield Message.Directory, post
+ yield Message.Directory, "", post
url = post["file_url"]
text.nameext_from_url(url, post)
yield Message.Url, url, post
diff --git a/gallery_dl/extractor/tiktok.py b/gallery_dl/extractor/tiktok.py
index 7d43672d..870a534d 100644
--- a/gallery_dl/extractor/tiktok.py
+++ b/gallery_dl/extractor/tiktok.py
@@ -46,7 +46,7 @@ class TiktokExtractor(Extractor):
post["date"] = self.parse_timestamp(post["createTime"])
original_title = title = post["desc"]
- yield Message.Directory, post
+ yield Message.Directory, "", post
ytdl_media = False
if "imagePost" in post:
@@ -253,7 +253,7 @@ class TiktokUserExtractor(TiktokExtractor):
self.log.warning("Unable to extract 'avatar' URL (%s: %s)",
exc.__class__.__name__, exc)
else:
- yield Message.Directory, avatar
+ yield Message.Directory, "", avatar
yield Message.Url, avatar_url, avatar
with ytdl_instance as ydl:
diff --git a/gallery_dl/extractor/toyhouse.py b/gallery_dl/extractor/toyhouse.py
index 93fa300e..cc29b116 100644
--- a/gallery_dl/extractor/toyhouse.py
+++ b/gallery_dl/extractor/toyhouse.py
@@ -34,7 +34,7 @@ class ToyhouseExtractor(Extractor):
post.update(metadata)
text.nameext_from_url(post["url"], post)
post["id"], _, post["hash"] = post["filename"].partition("_")
- yield Message.Directory, post
+ yield Message.Directory, "", post
yield Message.Url, post["url"], post
def posts(self):
diff --git a/gallery_dl/extractor/tumblr.py b/gallery_dl/extractor/tumblr.py
index e49d038c..5bb5a40b 100644
--- a/gallery_dl/extractor/tumblr.py
+++ b/gallery_dl/extractor/tumblr.py
@@ -87,7 +87,7 @@ class TumblrExtractor(Extractor):
if self.avatar:
url = self.api.avatar(self.blog)
- yield Message.Directory, {"blog": blog}
+ yield Message.Directory, "", {"blog": blog}
yield self._prepare_avatar(url, post.copy(), blog)
post["blog"] = blog
@@ -160,7 +160,7 @@ class TumblrExtractor(Extractor):
del post["extension"]
post["count"] = len(posts)
- yield Message.Directory, post
+ yield Message.Directory, "", post
for num, (msg, url, post) in enumerate(posts, 1):
post["num"] = num
diff --git a/gallery_dl/extractor/tungsten.py b/gallery_dl/extractor/tungsten.py
index 6b56035f..67c0b508 100644
--- a/gallery_dl/extractor/tungsten.py
+++ b/gallery_dl/extractor/tungsten.py
@@ -26,7 +26,7 @@ class TungstenExtractor(Extractor):
post["date"] = self.parse_datetime_iso(post["created_at"])
post["filename"] = url[url.rfind("/")+1:]
post["extension"] = "webp"
- yield Message.Directory, post
+ yield Message.Directory, "", post
yield Message.Url, url, post
def _pagination(self, url, params):
diff --git a/gallery_dl/extractor/twitter.py b/gallery_dl/extractor/twitter.py
index 8cd13dcd..addb5f06 100644
--- a/gallery_dl/extractor/twitter.py
+++ b/gallery_dl/extractor/twitter.py
@@ -124,7 +124,7 @@ class TwitterExtractor(Extractor):
tdata = self._transform_tweet(tweet)
tdata.update(metadata)
tdata["count"] = len(files)
- yield Message.Directory, tdata
+ yield Message.Directory, "", tdata
tdata.pop("source_id", None)
tdata.pop("source_user", None)
@@ -1097,7 +1097,7 @@ class TwitterInfoExtractor(TwitterExtractor):
else:
user = api.user_by_screen_name(screen_name)
- return iter(((Message.Directory, self._transform_user(user)),))
+ return iter(((Message.Directory, "", self._transform_user(user)),))
class TwitterAvatarExtractor(TwitterExtractor):
@@ -1163,7 +1163,7 @@ class TwitterImageExtractor(Extractor):
"_fallback": TwitterExtractor._image_fallback(self, base),
}
- yield Message.Directory, data
+ yield Message.Directory, "", data
yield Message.Url, base + self._size_image, data
diff --git a/gallery_dl/extractor/unsplash.py b/gallery_dl/extractor/unsplash.py
index 728e06b6..b77be959 100644
--- a/gallery_dl/extractor/unsplash.py
+++ b/gallery_dl/extractor/unsplash.py
@@ -45,7 +45,7 @@ class UnsplashExtractor(Extractor):
if "tags" in photo:
photo["tags"] = [t["title"] for t in photo["tags"]]
- yield Message.Directory, photo
+ yield Message.Directory, "", photo
yield Message.Url, url, photo
def metadata(self):
diff --git a/gallery_dl/extractor/uploadir.py b/gallery_dl/extractor/uploadir.py
index d06c2ad3..d80abba8 100644
--- a/gallery_dl/extractor/uploadir.py
+++ b/gallery_dl/extractor/uploadir.py
@@ -53,5 +53,5 @@ class UploadirFileExtractor(Extractor):
data = text.nameext_from_url(name)
data["id"] = self.file_id
- yield Message.Directory, data
+ yield Message.Directory, "", data
yield Message.Url, url, data
diff --git a/gallery_dl/extractor/urlgalleries.py b/gallery_dl/extractor/urlgalleries.py
index 53e348e4..0d8b3d38 100644
--- a/gallery_dl/extractor/urlgalleries.py
+++ b/gallery_dl/extractor/urlgalleries.py
@@ -38,7 +38,7 @@ class UrlgalleriesGalleryExtractor(GalleryExtractor):
data["count"] = len(imgs)
root = self.root
- yield Message.Directory, data
+ yield Message.Directory, "", data
for data["num"], img in enumerate(imgs, 1):
page = self.request(root + img).text
url = text.extr(page, "window.location.href = '", "'")
diff --git a/gallery_dl/extractor/vanillarock.py b/gallery_dl/extractor/vanillarock.py
index a6a10ff3..63fc7fa5 100644
--- a/gallery_dl/extractor/vanillarock.py
+++ b/gallery_dl/extractor/vanillarock.py
@@ -53,7 +53,7 @@ class VanillarockPostExtractor(VanillarockExtractor):
'', '
'))[::2],
}
- yield Message.Directory, data
+ yield Message.Directory, "", data
for data["num"], url in enumerate(imgs, 1):
yield Message.Url, url, text.nameext_from_url(url, data)
diff --git a/gallery_dl/extractor/vichan.py b/gallery_dl/extractor/vichan.py
index 6dbdfb19..86758f3f 100644
--- a/gallery_dl/extractor/vichan.py
+++ b/gallery_dl/extractor/vichan.py
@@ -58,7 +58,7 @@ class VichanThreadExtractor(VichanExtractor):
"num" : 0,
}
- yield Message.Directory, data
+ yield Message.Directory, "", data
for post in posts:
if "filename" in post:
yield process(post, data)
diff --git a/gallery_dl/extractor/vipergirls.py b/gallery_dl/extractor/vipergirls.py
index 622186e8..8f6368b9 100644
--- a/gallery_dl/extractor/vipergirls.py
+++ b/gallery_dl/extractor/vipergirls.py
@@ -75,7 +75,7 @@ class VipergirlsExtractor(Extractor):
data["count"] = len(images)
del data["imagecount"]
- yield Message.Directory, data
+ yield Message.Directory, "", data
if images:
for data["num"], image in enumerate(images, 1):
yield Message.Queue, image.attrib["main_url"], data
diff --git a/gallery_dl/extractor/vk.py b/gallery_dl/extractor/vk.py
index 4b7047b6..e7453fcb 100644
--- a/gallery_dl/extractor/vk.py
+++ b/gallery_dl/extractor/vk.py
@@ -40,7 +40,7 @@ class VkExtractor(Extractor):
sizes = "wzyxrqpo"
data = self.metadata()
- yield Message.Directory, data
+ yield Message.Directory, "", data
for photo in self.photos():
diff --git a/gallery_dl/extractor/vsco.py b/gallery_dl/extractor/vsco.py
index 9714b19c..b8da813b 100644
--- a/gallery_dl/extractor/vsco.py
+++ b/gallery_dl/extractor/vsco.py
@@ -30,7 +30,7 @@ class VscoExtractor(Extractor):
def items(self):
videos = self.config("videos", True)
- yield Message.Directory, {"user": self.user}
+ yield Message.Directory, "", {"user": self.user}
for img in self.images():
if not img:
diff --git a/gallery_dl/extractor/wallhaven.py b/gallery_dl/extractor/wallhaven.py
index 623de8bf..9ea3c364 100644
--- a/gallery_dl/extractor/wallhaven.py
+++ b/gallery_dl/extractor/wallhaven.py
@@ -29,7 +29,7 @@ class WallhavenExtractor(Extractor):
self._transform(wp)
wp.update(metadata)
url = wp["url"]
- yield Message.Directory, wp
+ yield Message.Directory, "", wp
yield Message.Url, url, text.nameext_from_url(url, wp)
def wallpapers(self):
diff --git a/gallery_dl/extractor/wallpapercave.py b/gallery_dl/extractor/wallpapercave.py
index 65fca240..1392164b 100644
--- a/gallery_dl/extractor/wallpapercave.py
+++ b/gallery_dl/extractor/wallpapercave.py
@@ -27,7 +27,7 @@ class WallpapercaveImageExtractor(Extractor):
path = None
for path in text.extract_iter(page, 'class="download" href="', '"'):
image = text.nameext_from_url(path)
- yield Message.Directory, image
+ yield Message.Directory, "", image
yield Message.Url, self.root + path, image
if path is None:
@@ -38,7 +38,7 @@ class WallpapercaveImageExtractor(Extractor):
pass
else:
image = text.nameext_from_url(path)
- yield Message.Directory, image
+ yield Message.Directory, "", image
yield Message.Url, self.root + path, image
if path is None:
@@ -46,5 +46,5 @@ class WallpapercaveImageExtractor(Extractor):
page, 'class="wallpaper" id="wp', ''):
if path := text.rextr(wp, ' src="', '"'):
image = text.nameext_from_url(path)
- yield Message.Directory, image
+ yield Message.Directory, "", image
yield Message.Url, self.root + path, image
diff --git a/gallery_dl/extractor/warosu.py b/gallery_dl/extractor/warosu.py
index 5463448f..b66ba8d6 100644
--- a/gallery_dl/extractor/warosu.py
+++ b/gallery_dl/extractor/warosu.py
@@ -37,7 +37,7 @@ class WarosuThreadExtractor(Extractor):
data["title"] = text.unescape(text.remove_html(
posts[0]["com"]))[:50]
- yield Message.Directory, data
+ yield Message.Directory, "", data
for post in posts:
if "image" in post:
for key in ("w", "h", "no", "time", "tim"):
diff --git a/gallery_dl/extractor/weasyl.py b/gallery_dl/extractor/weasyl.py
index b5b33373..e718e51b 100644
--- a/gallery_dl/extractor/weasyl.py
+++ b/gallery_dl/extractor/weasyl.py
@@ -80,7 +80,7 @@ class WeasylSubmissionExtractor(WeasylExtractor):
def items(self):
data = self.request_submission(self.submitid)
if self.populate_submission(data):
- yield Message.Directory, data
+ yield Message.Directory, "", data
yield Message.Url, data["url"], data
@@ -94,7 +94,7 @@ class WeasylSubmissionsExtractor(WeasylExtractor):
self.owner_login = match[1]
def items(self):
- yield Message.Directory, {"owner_login": self.owner_login}
+ yield Message.Directory, "", {"owner_login": self.owner_login}
yield from self.submissions(self.owner_login)
@@ -113,7 +113,7 @@ class WeasylFolderExtractor(WeasylExtractor):
# Folder names are only on single submission api calls
msg, url, data = next(iter)
details = self.request_submission(data["submitid"])
- yield Message.Directory, details
+ yield Message.Directory, "", details
yield msg, url, data
yield from iter
@@ -131,7 +131,7 @@ class WeasylJournalExtractor(WeasylExtractor):
def items(self):
data = self.retrieve_journal(self.journalid)
- yield Message.Directory, data
+ yield Message.Directory, "", data
yield Message.Url, data["html"], data
@@ -147,7 +147,7 @@ class WeasylJournalsExtractor(WeasylExtractor):
self.owner_login = match[1]
def items(self):
- yield Message.Directory, {"owner_login": self.owner_login}
+ yield Message.Directory, "", {"owner_login": self.owner_login}
url = f"{self.root}/journals/{self.owner_login}"
page = self.request(url).text
@@ -191,7 +191,7 @@ class WeasylFavoriteExtractor(WeasylExtractor):
submission = self.request_submission(submitid)
if self.populate_submission(submission):
submission["user"] = owner_login
- yield Message.Directory, submission
+ yield Message.Directory, "", submission
yield Message.Url, submission["url"], submission
try:
diff --git a/gallery_dl/extractor/webmshare.py b/gallery_dl/extractor/webmshare.py
index 10b5aa51..2cb41bb8 100644
--- a/gallery_dl/extractor/webmshare.py
+++ b/gallery_dl/extractor/webmshare.py
@@ -51,5 +51,5 @@ class WebmshareVideoExtractor(Extractor):
if data["title"] == "webmshare":
data["title"] = ""
- yield Message.Directory, data
+ yield Message.Directory, "", data
yield Message.Url, data["url"], data
diff --git a/gallery_dl/extractor/webtoons.py b/gallery_dl/extractor/webtoons.py
index d943ba2b..bed251b0 100644
--- a/gallery_dl/extractor/webtoons.py
+++ b/gallery_dl/extractor/webtoons.py
@@ -160,7 +160,7 @@ class WebtoonsComicExtractor(WebtoonsBase, Extractor):
page = response.text
if self.config("banners") and (asset := self._asset_banner(page)):
- yield Message.Directory, asset
+ yield Message.Directory, "", asset
yield Message.Url, asset["url"], asset
data = {"_extractor": WebtoonsEpisodeExtractor}
diff --git a/gallery_dl/extractor/weibo.py b/gallery_dl/extractor/weibo.py
index cd18ae4f..abec0f76 100644
--- a/gallery_dl/extractor/weibo.py
+++ b/gallery_dl/extractor/weibo.py
@@ -106,7 +106,7 @@ class WeiboExtractor(Extractor):
status["date"] = self.parse_datetime(
status["created_at"], "%a %b %d %H:%M:%S %z %Y")
status["count"] = len(files)
- yield Message.Directory, status
+ yield Message.Directory, "", status
num = 0
for file in files:
diff --git a/gallery_dl/extractor/wikiart.py b/gallery_dl/extractor/wikiart.py
index fec8ce75..8f3a1c98 100644
--- a/gallery_dl/extractor/wikiart.py
+++ b/gallery_dl/extractor/wikiart.py
@@ -27,7 +27,7 @@ class WikiartExtractor(Extractor):
def items(self):
data = self.metadata()
- yield Message.Directory, data
+ yield Message.Directory, "", data
for painting in self.paintings():
url = painting["image"]
painting.update(data)
diff --git a/gallery_dl/extractor/wikimedia.py b/gallery_dl/extractor/wikimedia.py
index a00185f9..70e42c68 100644
--- a/gallery_dl/extractor/wikimedia.py
+++ b/gallery_dl/extractor/wikimedia.py
@@ -105,7 +105,7 @@ class WikimediaExtractor(BaseExtractor):
info["count"] = len(images)
self.prepare_info(info)
- yield Message.Directory, info
+ yield Message.Directory, "", info
num = 0
for image in images:
diff --git a/gallery_dl/extractor/xasiat.py b/gallery_dl/extractor/xasiat.py
index c86116b1..d4dbea17 100644
--- a/gallery_dl/extractor/xasiat.py
+++ b/gallery_dl/extractor/xasiat.py
@@ -79,7 +79,7 @@ class XasiatAlbumExtractor(XasiatExtractor):
"count": len(urls),
}
- yield Message.Directory, data
+ yield Message.Directory, "", data
for data["num"], url in enumerate(urls, 1):
yield Message.Url, url, text.nameext_from_url(url[:-1], data)
diff --git a/gallery_dl/extractor/xfolio.py b/gallery_dl/extractor/xfolio.py
index c831fc09..8caff85b 100644
--- a/gallery_dl/extractor/xfolio.py
+++ b/gallery_dl/extractor/xfolio.py
@@ -57,7 +57,7 @@ class XfolioWorkExtractor(XfolioExtractor):
files = self._extract_files(html, work)
work["count"] = len(files)
- yield Message.Directory, work
+ yield Message.Directory, "", work
for work["num"], file in enumerate(files, 1):
file.update(work)
yield Message.Url, file["url"], file
diff --git a/gallery_dl/extractor/xhamster.py b/gallery_dl/extractor/xhamster.py
index 313759c0..64113d3b 100644
--- a/gallery_dl/extractor/xhamster.py
+++ b/gallery_dl/extractor/xhamster.py
@@ -36,7 +36,7 @@ class XhamsterGalleryExtractor(XhamsterExtractor):
def items(self):
data = self.metadata()
- yield Message.Directory, data
+ yield Message.Directory, "", data
for num, image in enumerate(self.images(), 1):
url = image["imageURL"]
image.update(data)
diff --git a/gallery_dl/extractor/ytdl.py b/gallery_dl/extractor/ytdl.py
index eb33b65c..ea3b6156 100644
--- a/gallery_dl/extractor/ytdl.py
+++ b/gallery_dl/extractor/ytdl.py
@@ -114,7 +114,7 @@ class YoutubeDLExtractor(Extractor):
info_dict.get("webpage_url") or
self.ytdl_url)
- yield Message.Directory, info_dict
+ yield Message.Directory, "", info_dict
yield Message.Url, url, info_dict
def _process_entries(self, ytdl_module, ytdl_instance, entries):
diff --git a/gallery_dl/job.py b/gallery_dl/job.py
index 6e21762f..e3ebe96e 100644
--- a/gallery_dl/job.py
+++ b/gallery_dl/job.py
@@ -206,22 +206,10 @@ class Job():
msg = None
process = True
- for msg in messages:
- if msg[0] == Message.Url:
- if process is None:
- continue
- _, url, kwdict = msg
- if self.metadata_url:
- kwdict[self.metadata_url] = url
- if self.pred_url(url, kwdict):
- self.update_kwdict(kwdict)
- self.handle_url(url, kwdict)
- if FLAGS.FILE is not None:
- FLAGS.process("FILE")
+ for msg, url, kwdict in messages:
- elif msg[0] == Message.Directory:
- kwdict = msg[1]
- if self.pred_post("", kwdict):
+ if msg == Message.Directory:
+ if self.pred_post(url, kwdict):
process = True
self.update_kwdict(kwdict)
self.handle_directory(kwdict)
@@ -230,10 +218,21 @@ class Job():
if FLAGS.POST is not None:
FLAGS.process("POST")
- elif msg[0] == Message.Queue:
+ elif process is None:
+ continue
+
+ elif msg == Message.Url:
+ if self.metadata_url:
+ kwdict[self.metadata_url] = url
+ if self.pred_url(url, kwdict):
+ self.update_kwdict(kwdict)
+ self.handle_url(url, kwdict)
+ if FLAGS.FILE is not None:
+ FLAGS.process("FILE")
+
+ elif msg == Message.Queue:
if process is None:
continue
- _, url, kwdict = msg
if self.metadata_url:
kwdict[self.metadata_url] = url
if self.pred_queue(url, kwdict):
diff --git a/gallery_dl/update.py b/gallery_dl/update.py
index 273ca189..e51a4b34 100644
--- a/gallery_dl/update.py
+++ b/gallery_dl/update.py
@@ -212,5 +212,5 @@ class UpdateExtractor(Extractor):
url = (f"{self.root}/{path_repo}/releases/download"
f"/{data['tag_name']}/{binary_name}")
- yield Message.Directory, data
+ yield Message.Directory, "", data
yield Message.Url, url, data
diff --git a/test/test_job.py b/test/test_job.py
index 3020ffd4..ec86c6ce 100644
--- a/test/test_job.py
+++ b/test/test_job.py
@@ -377,7 +377,7 @@ class TestExtractor(Extractor):
root = "https://example.org"
user = self.user
- yield Message.Directory, {
+ yield Message.Directory, "", {
"user": user,
"author": user,
}