")[2].split())
raise exception.AbortExtraction(f"'{msg}'")
self.log.warning("HTTP redirect to %s", response.url)
diff --git a/gallery_dl/extractor/inkbunny.py b/gallery_dl/extractor/inkbunny.py
index 435f98e0..45ae52ed 100644
--- a/gallery_dl/extractor/inkbunny.py
+++ b/gallery_dl/extractor/inkbunny.py
@@ -109,8 +109,7 @@ class InkbunnyPoolExtractor(InkbunnyExtractor):
def __init__(self, match):
InkbunnyExtractor.__init__(self, match)
- pid = match[1]
- if pid:
+ if pid := match[1]:
self.pool_id = pid
self.orderby = "pool_order"
else:
@@ -142,8 +141,7 @@ class InkbunnyFavoriteExtractor(InkbunnyExtractor):
def __init__(self, match):
InkbunnyExtractor.__init__(self, match)
- uid = match[1]
- if uid:
+ if uid := match[1]:
self.user_id = uid
self.orderby = self.config("orderby", "fav_datetime")
else:
@@ -218,8 +216,7 @@ class InkbunnySearchExtractor(InkbunnyExtractor):
params["dayslimit"] = pop("days", None)
params["username"] = pop("artist", None)
- favsby = pop("favsby", None)
- if favsby:
+ if favsby := pop("favsby", None):
# get user_id from user profile
url = f"{self.root}/{favsby}"
page = self.request(url).text
diff --git a/gallery_dl/extractor/instagram.py b/gallery_dl/extractor/instagram.py
index 40e9758e..6213e9ac 100644
--- a/gallery_dl/extractor/instagram.py
+++ b/gallery_dl/extractor/instagram.py
@@ -55,8 +55,7 @@ class InstagramExtractor(Extractor):
self.login()
data = self.metadata()
- videos = self.config("videos", True)
- if videos:
+ if videos := self.config("videos", True):
videos_dash = (videos != "merged")
videos_headers = {"User-Agent": "Mozilla/5.0"}
previews = self.config("previews", False)
@@ -91,8 +90,7 @@ class InstagramExtractor(Extractor):
for file in files:
file.update(post)
- url = file.get("video_url")
- if url:
+ if url := file.get("video_url"):
if videos:
file["_http_headers"] = videos_headers
text.nameext_from_url(url, file)
@@ -144,8 +142,7 @@ class InstagramExtractor(Extractor):
if www_claim is not None:
self.www_claim = www_claim
- csrf_token = response.cookies.get("csrftoken")
- if csrf_token:
+ if csrf_token := response.cookies.get("csrftoken"):
self.csrf_token = csrf_token
return response
@@ -164,8 +161,7 @@ class InstagramExtractor(Extractor):
if "items" in post: # story or highlight
items = post["items"]
reel_id = str(post["id"]).rpartition(":")[2]
- expires = post.get("expiring_at")
- if expires:
+ if expires := post.get("expiring_at"):
post_url = f"{self.root}/stories/{post['user']['username']}/"
else:
post_url = f"{self.root}/stories/highlights/{reel_id}/"
@@ -193,20 +189,17 @@ class InstagramExtractor(Extractor):
caption = post["caption"]
data["description"] = caption["text"] if caption else ""
- tags = self._find_tags(data["description"])
- if tags:
+ if tags := self._find_tags(data["description"]):
data["tags"] = sorted(set(tags))
- location = post.get("location")
- if location:
+ if location := post.get("location"):
slug = location["short_name"].replace(" ", "-").lower()
data["location_id"] = location["pk"]
data["location_slug"] = slug
data["location_url"] = \
f"{self.root}/explore/locations/{location['pk']}/{slug}/"
- coauthors = post.get("coauthor_producers")
- if coauthors:
+ if coauthors := post.get("coauthor_producers"):
data["coauthors"] = [
{"id" : user["pk"],
"username" : user["username"],
@@ -214,8 +207,7 @@ class InstagramExtractor(Extractor):
for user in coauthors
]
- items = post.get("carousel_media")
- if items:
+ if items := post.get("carousel_media"):
data["sidecar_media_id"] = data["post_id"]
data["sidecar_shortcode"] = data["post_shortcode"]
else:
@@ -237,8 +229,7 @@ class InstagramExtractor(Extractor):
data["post_shortcode"])
continue
- video_versions = item.get("video_versions")
- if video_versions:
+ if video_versions := item.get("video_versions"):
video = max(
video_versions,
key=lambda x: (x["width"], x["height"], x["type"]),
@@ -281,8 +272,7 @@ class InstagramExtractor(Extractor):
"edge_sidecar_to_children" not in post:
post = self.api.media(post["id"])[0]
- pinned = post.get("pinned_for_users", ())
- if pinned:
+ if pinned := post.get("pinned_for_users", ()):
for index, user in enumerate(pinned):
pinned[index] = int(user["id"])
@@ -306,19 +296,16 @@ class InstagramExtractor(Extractor):
}
data["date"] = data["post_date"]
- tags = self._find_tags(data["description"])
- if tags:
+ if tags := self._find_tags(data["description"]):
data["tags"] = sorted(set(tags))
- location = post.get("location")
- if location:
+ if location := post.get("location"):
data["location_id"] = location["id"]
data["location_slug"] = location["slug"]
data["location_url"] = (f"{self.root}/explore/locations/"
f"{location['id']}/{location['slug']}/")
- coauthors = post.get("coauthor_producers")
- if coauthors:
+ if coauthors := post.get("coauthor_producers"):
data["coauthors"] = [
{"id" : user["id"],
"username": user["username"]}
@@ -365,32 +352,28 @@ class InstagramExtractor(Extractor):
def _extract_tagged_users(self, src, dest):
dest["tagged_users"] = tagged_users = []
- edges = src.get("edge_media_to_tagged_user")
- if edges:
+ if edges := src.get("edge_media_to_tagged_user"):
for edge in edges["edges"]:
user = edge["node"]["user"]
tagged_users.append({"id" : user["id"],
"username" : user["username"],
"full_name": user["full_name"]})
- usertags = src.get("usertags")
- if usertags:
+ if usertags := src.get("usertags"):
for tag in usertags["in"]:
user = tag["user"]
tagged_users.append({"id" : user["pk"],
"username" : user["username"],
"full_name": user["full_name"]})
- mentions = src.get("reel_mentions")
- if mentions:
+ if mentions := src.get("reel_mentions"):
for mention in mentions:
user = mention["user"]
tagged_users.append({"id" : user.get("pk"),
"username" : user["username"],
"full_name": user["full_name"]})
- stickers = src.get("story_bloks_stickers")
- if stickers:
+ if stickers := src.get("story_bloks_stickers"):
for sticker in stickers:
sticker = sticker["bloks_sticker"]
if sticker["bloks_sticker_type"] == "mention":
@@ -698,8 +681,7 @@ class InstagramAvatarExtractor(InstagramExtractor):
url = user.get("profile_pic_url_hd") or user["profile_pic_url"]
avatar = {"url": url, "width": 0, "height": 0}
- pk = user.get("profile_pic_id")
- if pk:
+ if pk := user.get("profile_pic_id"):
pk = pk.partition("_")[0]
code = shortcode_from_id(pk)
else:
@@ -753,8 +735,7 @@ class InstagramRestAPI():
def highlights_media(self, user_id, chunk_size=5):
reel_ids = [hl["id"] for hl in self.highlights_tray(user_id)]
- order = self.extractor.config("order-posts")
- if order:
+ if order := self.extractor.config("order-posts"):
if order in ("desc", "reverse"):
reel_ids.reverse()
elif order in ("id", "id_asc"):
diff --git a/gallery_dl/extractor/itaku.py b/gallery_dl/extractor/itaku.py
index e188abb2..d8ba4f66 100644
--- a/gallery_dl/extractor/itaku.py
+++ b/gallery_dl/extractor/itaku.py
@@ -39,8 +39,7 @@ class ItakuExtractor(Extractor):
sections = []
for s in post["sections"]:
- group = s["group"]
- if group:
+ if group := s["group"]:
sections.append(group["title"] + "/" + s["title"])
else:
sections.append(s["title"])
diff --git a/gallery_dl/extractor/jschan.py b/gallery_dl/extractor/jschan.py
index 6a3f4abb..5f3e75a3 100644
--- a/gallery_dl/extractor/jschan.py
+++ b/gallery_dl/extractor/jschan.py
@@ -41,8 +41,7 @@ class JschanThreadExtractor(JschanExtractor):
yield Message.Directory, thread
for post in itertools.chain((thread,), posts):
- files = post.pop("files", ())
- if files:
+ if files := post.pop("files", ()):
thread.update(post)
thread["count"] = len(files)
for num, file in enumerate(files):
diff --git a/gallery_dl/extractor/keenspot.py b/gallery_dl/extractor/keenspot.py
index 35aa3b57..f55a930e 100644
--- a/gallery_dl/extractor/keenspot.py
+++ b/gallery_dl/extractor/keenspot.py
@@ -75,8 +75,7 @@ class KeenspotComicExtractor(Extractor):
self._image = '
'
return "http://brawlinthefamily.keenspot.com/comic/theshowdown/"
- url = text.extr(page, '
'):
data["_multi"] = self._extract_images_art(art_images, data)
return data
@@ -544,8 +542,7 @@ class NewgroundsSearchExtractor(NewgroundsExtractor):
self.query = text.parse_query(query)
def posts(self):
- suitabilities = self.query.get("suitabilities")
- if suitabilities:
+ if suitabilities := self.query.get("suitabilities"):
data = {"view_suitability_" + s: "on"
for s in suitabilities.split(",")}
self.request(self.root + "/suitabilities",
diff --git a/gallery_dl/extractor/nitter.py b/gallery_dl/extractor/nitter.py
index ceb44ab9..69d82999 100644
--- a/gallery_dl/extractor/nitter.py
+++ b/gallery_dl/extractor/nitter.py
@@ -30,8 +30,7 @@ class NitterExtractor(BaseExtractor):
def items(self):
retweets = self.config("retweets", False)
- videos = self.config("videos", True)
- if videos:
+ if videos := self.config("videos", True):
ytdl = (videos == "ytdl")
videos = True
self.cookies.set("hlsPlayback", "on", domain=self.cookies_domain)
@@ -42,8 +41,7 @@ class NitterExtractor(BaseExtractor):
self.log.debug("Skipping %s (retweet)", tweet["tweet_id"])
continue
- attachments = tweet.pop("_attach", "")
- if attachments:
+ if attachments := tweet.pop("_attach", ""):
files = []
for url in text.extract_iter(
attachments, 'href="', '"'):
diff --git a/gallery_dl/extractor/oauth.py b/gallery_dl/extractor/oauth.py
index ad4367cf..2d9a061c 100644
--- a/gallery_dl/extractor/oauth.py
+++ b/gallery_dl/extractor/oauth.py
@@ -74,8 +74,7 @@ class OAuthBase(Extractor):
"""Open 'url' in browser amd return response parameters"""
url += "?" + urllib.parse.urlencode(params)
- browser = self.config("browser", True)
- if browser:
+ if browser := self.config("browser", True):
try:
import webbrowser
browser = webbrowser.get()
@@ -83,8 +82,7 @@ class OAuthBase(Extractor):
browser = None
if browser and browser.open(url):
- name = getattr(browser, "name", None)
- if name:
+ if name := getattr(browser, "name", None):
self.log.info("Opening URL with %s:", name.capitalize())
else:
self.log.info("Please open this URL in your browser:")
diff --git a/gallery_dl/extractor/patreon.py b/gallery_dl/extractor/patreon.py
index c019218b..11e2418b 100644
--- a/gallery_dl/extractor/patreon.py
+++ b/gallery_dl/extractor/patreon.py
@@ -295,12 +295,10 @@ class PatreonExtractor(Extractor):
if bootstrap:
return util.json_loads(bootstrap + "}")
- bootstrap = text.extr(page, "window.patreon.bootstrap,", "});")
- if bootstrap:
+ if bootstrap := text.extr(page, "window.patreon.bootstrap,", "});"):
return util.json_loads(bootstrap + "}")
- data = text.extr(page, "window.patreon = {", "};\n")
- if data:
+ if data := text.extr(page, "window.patreon = {", "};\n"):
try:
return util.json_loads(f"{{{data}}}")["bootstrap"]
except Exception:
@@ -340,8 +338,7 @@ class PatreonCreatorExtractor(PatreonExtractor):
if creator and creator.startswith("id:"):
return creator[3:]
- campaign_id = query.get("c") or query.get("campaign_id")
- if campaign_id:
+ if campaign_id := query.get("c") or query.get("campaign_id"):
return campaign_id
if user_id := query.get("u"):
diff --git a/gallery_dl/extractor/philomena.py b/gallery_dl/extractor/philomena.py
index 9cc099b8..8891dc06 100644
--- a/gallery_dl/extractor/philomena.py
+++ b/gallery_dl/extractor/philomena.py
@@ -165,12 +165,10 @@ class PhilomenaAPI():
def _pagination(self, endpoint, params):
extr = self.extractor
- api_key = extr.config("api-key")
- if api_key:
+ if api_key := extr.config("api-key"):
params["key"] = api_key
- filter_id = extr.config("filter")
- if filter_id:
+ if filter_id := extr.config("filter"):
params["filter_id"] = filter_id
elif not api_key:
params["filter_id"] = extr.config_instance("filter_id") or "2"
diff --git a/gallery_dl/extractor/pinterest.py b/gallery_dl/extractor/pinterest.py
index 7ceb613c..9c335ad7 100644
--- a/gallery_dl/extractor/pinterest.py
+++ b/gallery_dl/extractor/pinterest.py
@@ -60,8 +60,7 @@ class PinterestExtractor(Extractor):
"closeup_description",
"closeup_unified_description",
):
- value = pin.get(key)
- if value:
+ if value := pin.get(key):
pin[key] = value.strip()
yield Message.Directory, pin
@@ -93,8 +92,7 @@ class PinterestExtractor(Extractor):
if story_pin_data and self.stories:
return self._extract_story(pin, story_pin_data)
- carousel_data = pin.get("carousel_data")
- if carousel_data:
+ if carousel_data := pin.get("carousel_data"):
return self._extract_carousel(pin, carousel_data)
videos = pin.get("videos")
@@ -270,8 +268,7 @@ class PinterestUserExtractor(PinterestExtractor):
def items(self):
for board in self.api.boards(self.user):
- url = board.get("url")
- if url:
+ if url := board.get("url"):
board["_extractor"] = PinterestBoardExtractor
yield Message.Queue, self.root + url, board
diff --git a/gallery_dl/extractor/pixeldrain.py b/gallery_dl/extractor/pixeldrain.py
index 4e76f2ee..73f4b1fb 100644
--- a/gallery_dl/extractor/pixeldrain.py
+++ b/gallery_dl/extractor/pixeldrain.py
@@ -21,8 +21,7 @@ class PixeldrainExtractor(Extractor):
archive_fmt = "{id}"
def _init(self):
- api_key = self.config("api-key")
- if api_key:
+ if api_key := self.config("api-key"):
self.session.auth = util.HTTPBasicAuth("", api_key)
def parse_datetime(self, date_string):
diff --git a/gallery_dl/extractor/pixiv.py b/gallery_dl/extractor/pixiv.py
index 477a9cd1..b430e23d 100644
--- a/gallery_dl/extractor/pixiv.py
+++ b/gallery_dl/extractor/pixiv.py
@@ -89,8 +89,7 @@ class PixivExtractor(Extractor):
if tag["is_registered"]]
if self.meta_captions and not work.get("caption") and \
not work.get("_mypixiv") and not work.get("_ajax"):
- body = self._request_ajax("/illust/" + str(work["id"]))
- if body:
+ if body := self._request_ajax("/illust/" + str(work["id"])):
work["caption"] = self._sanitize_ajax_caption(
body["illustComment"])
@@ -293,8 +292,7 @@ class PixivExtractor(Extractor):
def _extract_ajax_url(self, body):
try:
- original = body["urls"]["original"]
- if original:
+ if original := body["urls"]["original"]:
return original
except Exception:
pass
@@ -699,8 +697,7 @@ class PixivRankingExtractor(PixivExtractor):
except KeyError:
raise exception.AbortExtraction(f"Invalid mode '{mode}'")
- date = query.get("date")
- if date:
+ if date := query.get("date"):
if len(date) == 8 and date.isdecimal():
date = f"{date[0:4]}-{date[4:6]}-{date[6:8]}"
else:
diff --git a/gallery_dl/extractor/reddit.py b/gallery_dl/extractor/reddit.py
index 3ea20c1b..c87430b1 100644
--- a/gallery_dl/extractor/reddit.py
+++ b/gallery_dl/extractor/reddit.py
@@ -33,8 +33,7 @@ class RedditExtractor(Extractor):
previews = self.config("previews", True)
embeds = self.config("embeds", True)
- videos = self.config("videos", True)
- if videos:
+ if videos := self.config("videos", True):
if videos == "ytdl":
self._extract_video = self._extract_video_ytdl
elif videos == "dash":
@@ -139,8 +138,7 @@ class RedditExtractor(Extractor):
)):
continue
- match = match_submission(url)
- if match:
+ if match := match_submission(url):
extra.append(match[1])
elif not match_user(url) and not match_subreddit(url):
if previews and "comment" not in data and \
@@ -181,8 +179,7 @@ class RedditExtractor(Extractor):
submission["id"], item["media_id"], data.get("status"))
continue
src = data["s"]
- url = src.get("u") or src.get("gif") or src.get("mp4")
- if url:
+ if url := src.get("u") or src.get("gif") or src.get("mp4"):
yield url.partition("?")[0].replace("/preview.", "/i.", 1)
else:
self.log.error(
@@ -202,8 +199,7 @@ class RedditExtractor(Extractor):
submission["id"], mid, data.get("status"))
continue
src = data["s"]
- url = src.get("u") or src.get("gif") or src.get("mp4")
- if url:
+ if url := src.get("u") or src.get("gif") or src.get("mp4"):
yield url.partition("?")[0].replace("/preview.", "/i.", 1)
else:
self.log.error(
@@ -242,8 +238,7 @@ class RedditExtractor(Extractor):
try:
for image in post["preview"]["images"]:
- variants = image.get("variants")
- if variants:
+ if variants := image.get("variants"):
if "gif" in variants:
yield variants["gif"]["source"]["url"]
if "mp4" in variants:
diff --git a/gallery_dl/extractor/redgifs.py b/gallery_dl/extractor/redgifs.py
index 07fe0ae9..4098c54b 100644
--- a/gallery_dl/extractor/redgifs.py
+++ b/gallery_dl/extractor/redgifs.py
@@ -40,8 +40,7 @@ class RedgifsExtractor(Extractor):
for gif in self.gifs():
- gallery = gif.get("gallery")
- if gallery:
+ if gallery := gif.get("gallery"):
gifs = self.api.gallery(gallery)["gifs"]
enum = 1
cnt = len(gifs)
@@ -71,8 +70,7 @@ class RedgifsExtractor(Extractor):
def _formats(self, gif):
urls = gif["urls"]
for fmt in self.formats:
- url = urls.get(fmt)
- if url:
+ if url := urls.get(fmt):
url = url.replace("//thumbs2.", "//thumbs3.", 1)
text.nameext_from_url(url, gif)
yield url
diff --git a/gallery_dl/extractor/rule34xyz.py b/gallery_dl/extractor/rule34xyz.py
index d63f9cc8..05915ba7 100644
--- a/gallery_dl/extractor/rule34xyz.py
+++ b/gallery_dl/extractor/rule34xyz.py
@@ -39,8 +39,7 @@ class Rule34xyzExtractor(BooruExtractor):
}
def _init(self):
- formats = self.config("format")
- if formats:
+ if formats := self.config("format"):
if isinstance(formats, str):
formats = formats.split(",")
self.formats = formats
diff --git a/gallery_dl/extractor/sankaku.py b/gallery_dl/extractor/sankaku.py
index dc201e65..1c93cbfb 100644
--- a/gallery_dl/extractor/sankaku.py
+++ b/gallery_dl/extractor/sankaku.py
@@ -78,8 +78,7 @@ class SankakuExtractor(BooruExtractor):
def _tags(self, post, page):
tags = collections.defaultdict(list)
for tag in self.api.tags(post["id"]):
- name = tag["name"]
- if name:
+ if name := tag["name"]:
tags[tag["type"]].append(name.lower().replace(" ", "_"))
types = self.TAG_TYPES
for type, values in tags.items():
@@ -315,8 +314,7 @@ class SankakuAPI():
params["lang"] = "en"
params["limit"] = str(self.extractor.per_page)
- refresh = self.extractor.config("refresh", False)
- if refresh:
+ if refresh := self.extractor.config("refresh", False):
offset = expires = 0
from time import time
@@ -330,8 +328,7 @@ class SankakuAPI():
for post in posts:
if not expires:
- url = post["file_url"]
- if url:
+ if url := post["file_url"]:
expires = text.parse_int(
text.extr(url, "e=", "&")) - 60
diff --git a/gallery_dl/extractor/shimmie2.py b/gallery_dl/extractor/shimmie2.py
index 936cb4df..9afa7060 100644
--- a/gallery_dl/extractor/shimmie2.py
+++ b/gallery_dl/extractor/shimmie2.py
@@ -19,13 +19,11 @@ class Shimmie2Extractor(BaseExtractor):
archive_fmt = "{id}"
def _init(self):
- cookies = self.config_instance("cookies")
- if cookies:
+ if cookies := self.config_instance("cookies"):
domain = self.root.rpartition("/")[2]
self.cookies_update_dict(cookies, domain=domain)
- file_url = self.config_instance("file_url")
- if file_url:
+ if file_url := self.config_instance("file_url"):
self.file_url_fmt = file_url
if self.category == "giantessbooru":
diff --git a/gallery_dl/extractor/simplyhentai.py b/gallery_dl/extractor/simplyhentai.py
index a7393561..d6541b2b 100644
--- a/gallery_dl/extractor/simplyhentai.py
+++ b/gallery_dl/extractor/simplyhentai.py
@@ -90,8 +90,7 @@ class SimplyhentaiImageExtractor(Extractor):
url = extr('"image":"' , '&')
url = extr(""content":"", "&") or url
- tags = text.extr(descr, " tagged with ", " online for free ")
- if tags:
+ if tags := text.extr(descr, " tagged with ", " online for free "):
tags = tags.split(", ")
tags[-1] = tags[-1].partition(" ")[2]
else:
diff --git a/gallery_dl/extractor/skeb.py b/gallery_dl/extractor/skeb.py
index f892156e..1caafd1f 100644
--- a/gallery_dl/extractor/skeb.py
+++ b/gallery_dl/extractor/skeb.py
@@ -162,8 +162,7 @@ class SkebExtractor(Extractor):
})
if self.article and "article_image_url" in resp:
- url = resp["article_image_url"]
- if url:
+ if url := resp["article_image_url"]:
files.append({
"content_category": "article",
"file_id" : "article",
diff --git a/gallery_dl/extractor/subscribestar.py b/gallery_dl/extractor/subscribestar.py
index 874a015b..989e6cc9 100644
--- a/gallery_dl/extractor/subscribestar.py
+++ b/gallery_dl/extractor/subscribestar.py
@@ -115,8 +115,7 @@ class SubscribestarExtractor(Extractor):
}
def check_errors(response):
- errors = response.json().get("errors")
- if errors:
+ if errors := response.json().get("errors"):
self.log.debug(errors)
try:
msg = f'"{errors.popitem()[1]}"'
@@ -146,8 +145,7 @@ class SubscribestarExtractor(Extractor):
def _media_from_post(self, html):
media = []
- gallery = text.extr(html, 'data-gallery="', '"')
- if gallery:
+ if gallery := text.extr(html, 'data-gallery="', '"'):
for item in util.json_loads(text.unescape(gallery)):
if "/previews" in item["url"]:
self._warn_preview()
diff --git a/gallery_dl/extractor/szurubooru.py b/gallery_dl/extractor/szurubooru.py
index c0b9a7e0..190ccbf6 100644
--- a/gallery_dl/extractor/szurubooru.py
+++ b/gallery_dl/extractor/szurubooru.py
@@ -26,10 +26,8 @@ class SzurubooruExtractor(booru.BooruExtractor):
"Content-Type": "application/json",
}
- username = self.config("username")
- if username:
- token = self.config("token")
- if token:
+ if username := self.config("username"):
+ if token := self.config("token"):
value = username + ":" + token
self.headers["Authorization"] = "Token " + \
binascii.b2a_base64(value.encode())[:-1].decode()
diff --git a/gallery_dl/extractor/tumblr.py b/gallery_dl/extractor/tumblr.py
index ea579686..d9f1ea28 100644
--- a/gallery_dl/extractor/tumblr.py
+++ b/gallery_dl/extractor/tumblr.py
@@ -34,8 +34,7 @@ class TumblrExtractor(Extractor):
def __init__(self, match):
Extractor.__init__(self, match)
- name = match[2]
- if name:
+ if name := match[2]:
self.blog = name + ".tumblr.com"
else:
self.blog = match[1] or match[3]
@@ -139,8 +138,7 @@ class TumblrExtractor(Extractor):
if url and url.startswith("https://a.tumblr.com/"):
posts.append(self._prepare(url, post.copy()))
- url = post.get("video_url") # type "video"
- if url:
+ if url := post.get("video_url"): # type "video"
posts.append(self._prepare(
self._original_video(url), post.copy()))
@@ -160,8 +158,7 @@ class TumblrExtractor(Extractor):
posts.append(self._prepare(url, post.copy()))
if self.external: # external links
- url = post.get("permalink_url") or post.get("url")
- if url:
+ if url := post.get("permalink_url") or post.get("url"):
post["extension"] = None
posts.append((Message.Queue, url, post.copy()))
del post["extension"]
@@ -191,8 +188,7 @@ class TumblrExtractor(Extractor):
types = types.split(",")
types = frozenset(types)
- invalid = types - POST_TYPES
- if invalid:
+ if invalid := types - POST_TYPES:
types = types & POST_TYPES
self.log.warning("Invalid post types: '%s'",
"', '".join(sorted(invalid)))
@@ -504,8 +500,7 @@ class TumblrAPI(oauth.OAuth1API):
f"{t.hour:02}:{t.minute:02}:{t.second:02}")
# hourly rate limit
- reset = response.headers.get("x-ratelimit-perhour-reset")
- if reset:
+ if reset := response.headers.get("x-ratelimit-perhour-reset"):
self.log.info("Hourly API rate limit exceeded")
self.extractor.wait(seconds=reset)
continue
diff --git a/gallery_dl/extractor/twibooru.py b/gallery_dl/extractor/twibooru.py
index cf67135b..4f9fe845 100644
--- a/gallery_dl/extractor/twibooru.py
+++ b/gallery_dl/extractor/twibooru.py
@@ -159,12 +159,10 @@ class TwibooruAPI():
def _pagination(self, endpoint, params):
extr = self.extractor
- api_key = extr.config("api-key")
- if api_key:
+ if api_key := extr.config("api-key"):
params["key"] = api_key
- filter_id = extr.config("filter")
- if filter_id:
+ if filter_id := extr.config("filter"):
params["filter_id"] = filter_id
elif not api_key:
params["filter_id"] = "2"
diff --git a/gallery_dl/extractor/twitter.py b/gallery_dl/extractor/twitter.py
index b8770724..7252d056 100644
--- a/gallery_dl/extractor/twitter.py
+++ b/gallery_dl/extractor/twitter.py
@@ -278,8 +278,7 @@ class TwitterExtractor(Extractor):
bvals = {bval["key"]: bval["value"]
for bval in card["binding_values"]}
- cbl = self.cards_blacklist
- if cbl:
+ if cbl := self.cards_blacklist:
if name in cbl:
return
if "vanity_url" in bvals:
@@ -339,8 +338,8 @@ class TwitterExtractor(Extractor):
response = self.request(url, fatal=False)
if response.status_code >= 400:
continue
- url = text.extr(response.text, 'name="twitter:image" value="', '"')
- if url:
+ if url := text.extr(
+ response.text, 'name="twitter:image" value="', '"'):
files.append({"url": url})
def _transform_tweet(self, tweet):
@@ -411,12 +410,10 @@ class TwitterExtractor(Extractor):
content = tget("full_text") or tget("text") or ""
entities = legacy["entities"]
- hashtags = entities.get("hashtags")
- if hashtags:
+ if hashtags := entities.get("hashtags"):
tdata["hashtags"] = [t["text"] for t in hashtags]
- mentions = entities.get("user_mentions")
- if mentions:
+ if mentions := entities.get("user_mentions"):
tdata["mentions"] = [{
"id": text.parse_int(u["id_str"]),
"name": u["screen_name"],
@@ -424,8 +421,7 @@ class TwitterExtractor(Extractor):
} for u in mentions]
content = text.unescape(content)
- urls = entities.get("urls")
- if urls:
+ if urls := entities.get("urls"):
for url in urls:
try:
content = content.replace(url["url"], url["expanded_url"])
@@ -496,8 +492,7 @@ class TwitterExtractor(Extractor):
}
descr = user["description"]
- urls = entities["description"].get("urls")
- if urls:
+ if urls := entities["description"].get("urls"):
for url in urls:
try:
descr = descr.replace(url["url"], url["expanded_url"])
@@ -922,8 +917,7 @@ class TwitterTweetExtractor(TwitterExtractor):
self.tweet_id = match[2]
def tweets(self):
- conversations = self.config("conversations")
- if conversations:
+ if conversations := self.config("conversations"):
self._accessible = (conversations == "accessible")
return self._tweets_conversation(self.tweet_id)
@@ -1563,8 +1557,7 @@ class TwitterAPI():
headers=self.headers, fatal=None)
# update 'x-csrf-token' header (#1170)
- csrf_token = response.cookies.get("ct0")
- if csrf_token:
+ if csrf_token := response.cookies.get("ct0"):
self.headers["x-csrf-token"] = csrf_token
remaining = int(response.headers.get("x-rate-limit-remaining", 6))
@@ -1639,8 +1632,7 @@ class TwitterAPI():
def _pagination_legacy(self, endpoint, params):
extr = self.extractor
- cursor = extr._init_cursor()
- if cursor:
+ if cursor := extr._init_cursor():
params["cursor"] = cursor
original_retweets = (extr.retweets == "original")
bottom = ("cursor-bottom-", "sq-cursor-bottom")
@@ -1721,8 +1713,7 @@ class TwitterAPI():
yield tweet
if "quoted_status_id_str" in tweet:
- quoted = tweets.get(tweet["quoted_status_id_str"])
- if quoted:
+ if quoted := tweets.get(tweet["quoted_status_id_str"]):
quoted = quoted.copy()
quoted["author"] = users[quoted["user_id_str"]]
quoted["quoted_by"] = tweet["user"]["screen_name"]
@@ -1742,8 +1733,7 @@ class TwitterAPI():
pinned_tweet = extr.pinned
params = {"variables": None}
- cursor = extr._init_cursor()
- if cursor:
+ if cursor := extr._init_cursor():
variables["cursor"] = cursor
if features is None:
features = self.features_pagination
@@ -1792,8 +1782,7 @@ class TwitterAPI():
except LookupError:
extr.log.debug(data)
- user = extr._user_obj
- if user:
+ if user := extr._user_obj:
user = user["legacy"]
if user.get("blocked_by"):
if self.headers["x-twitter-auth-type"] and \
@@ -1942,8 +1931,7 @@ class TwitterAPI():
def _pagination_users(self, endpoint, variables, path=None):
extr = self.extractor
- cursor = extr._init_cursor()
- if cursor:
+ if cursor := extr._init_cursor():
variables["cursor"] = cursor
params = {
"variables": None,
@@ -2018,8 +2006,7 @@ def _login_impl(extr, username, password):
method="POST", fatal=None)
# update 'x-csrf-token' header (#5945)
- csrf_token = response.cookies.get("ct0")
- if csrf_token:
+ if csrf_token := response.cookies.get("ct0"):
headers["x-csrf-token"] = csrf_token
try:
diff --git a/gallery_dl/extractor/vipergirls.py b/gallery_dl/extractor/vipergirls.py
index 58ec70bd..e53ecf48 100644
--- a/gallery_dl/extractor/vipergirls.py
+++ b/gallery_dl/extractor/vipergirls.py
@@ -25,8 +25,7 @@ class VipergirlsExtractor(Extractor):
cookies_names = ("vg_userid", "vg_password")
def _init(self):
- domain = self.config("domain")
- if domain:
+ if domain := self.config("domain"):
pos = domain.find("://")
if pos >= 0:
self.root = domain.rstrip("/")
@@ -45,8 +44,7 @@ class VipergirlsExtractor(Extractor):
forum_title = root[1].attrib["title"]
thread_title = root[2].attrib["title"]
- like = self.config("like")
- if like:
+ if like := self.config("like"):
user_hash = root[0].get("hash")
if len(user_hash) < 16:
self.log.warning("Login required to like posts")
diff --git a/gallery_dl/extractor/vk.py b/gallery_dl/extractor/vk.py
index c618d041..0f323e1b 100644
--- a/gallery_dl/extractor/vk.py
+++ b/gallery_dl/extractor/vk.py
@@ -112,8 +112,7 @@ class VkExtractor(Extractor):
if offset_next >= total:
# the last chunk of photos also contains the first few photos
# again if 'total' is not a multiple of 10
- extra = total - offset_next
- if extra:
+ if extra := total - offset_next:
del photos[extra:]
yield from photos
diff --git a/gallery_dl/extractor/wallpapercave.py b/gallery_dl/extractor/wallpapercave.py
index 10417fd1..65fca240 100644
--- a/gallery_dl/extractor/wallpapercave.py
+++ b/gallery_dl/extractor/wallpapercave.py
@@ -44,8 +44,7 @@ class WallpapercaveImageExtractor(Extractor):
if path is None:
for wp in text.extract_iter(
page, 'class="wallpaper" id="wp', ''):
- path = text.rextr(wp, ' src="', '"')
- if path:
+ if path := text.rextr(wp, ' src="', '"'):
image = text.nameext_from_url(path)
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 e78fd949..8ae2a49a 100644
--- a/gallery_dl/extractor/warosu.py
+++ b/gallery_dl/extractor/warosu.py
@@ -94,8 +94,7 @@ class WarosuThreadExtractor(Extractor):
"", "<").rstrip().rpartition(".")[0])
extr("
", "")
- url = extr("
")
- if url:
+ if url := extr(""):
if url[0] == "/":
data["image"] = self.root + url
elif "warosu." not in url:
diff --git a/gallery_dl/extractor/weibo.py b/gallery_dl/extractor/weibo.py
index 22144181..823e8e03 100644
--- a/gallery_dl/extractor/weibo.py
+++ b/gallery_dl/extractor/weibo.py
@@ -111,8 +111,7 @@ class WeiboExtractor(Extractor):
self.log.warning("Unknown media type '%s'", type)
return
- pic_ids = status.get("pic_ids")
- if pic_ids:
+ if pic_ids := status.get("pic_ids"):
pics = status["pic_infos"]
for pic_id in pic_ids:
pic = pics[pic_id]
@@ -187,17 +186,15 @@ class WeiboExtractor(Extractor):
yield from statuses
# videos, newvideo
- cursor = data.get("next_cursor")
- if cursor:
+ if cursor := data.get("next_cursor"):
if cursor == -1:
return
params["cursor"] = cursor
continue
# album
- since_id = data.get("since_id")
- if since_id:
- params["sinceid"] = data["since_id"]
+ if since_id := data.get("since_id"):
+ params["sinceid"] = since_id
continue
# home, article
diff --git a/gallery_dl/extractor/ytdl.py b/gallery_dl/extractor/ytdl.py
index 34e0daf7..eb33b65c 100644
--- a/gallery_dl/extractor/ytdl.py
+++ b/gallery_dl/extractor/ytdl.py
@@ -82,8 +82,7 @@ class YoutubeDLExtractor(Extractor):
ytdl_module, self, user_opts, extr_opts)
# transfer cookies to ytdl
- cookies = self.cookies
- if cookies:
+ if cookies := self.cookies:
set_cookie = ytdl_instance.cookiejar.set_cookie
for cookie in cookies:
set_cookie(cookie)
diff --git a/gallery_dl/extractor/zerochan.py b/gallery_dl/extractor/zerochan.py
index 1f146236..3341594e 100644
--- a/gallery_dl/extractor/zerochan.py
+++ b/gallery_dl/extractor/zerochan.py
@@ -173,8 +173,7 @@ class ZerochanTagExtractor(ZerochanExtractor):
self.posts = self.posts_api
self.session.headers["User-Agent"] = util.USERAGENT
- exts = self.config("extensions")
- if exts:
+ if exts := self.config("extensions"):
if isinstance(exts, str):
exts = exts.split(",")
self.exts = exts
diff --git a/gallery_dl/job.py b/gallery_dl/job.py
index fb7c3eeb..3176eb45 100644
--- a/gallery_dl/job.py
+++ b/gallery_dl/job.py
@@ -48,15 +48,13 @@ class Job():
self.kwdict = {}
self.kwdict_eval = False
- cfgpath = self._build_config_path(parent)
- if cfgpath:
+ if cfgpath := self._build_config_path(parent):
if isinstance(cfgpath, list):
extr.config = extr._config_shared
extr.config_accumulate = extr._config_shared_accumulate
extr._cfgpath = cfgpath
- actions = extr.config("actions")
- if actions:
+ if actions := extr.config("actions"):
from .actions import LoggerAdapter, parse_logging
self._logger_adapter = LoggerAdapter
self._logger_actions = parse_logging(actions)
@@ -89,8 +87,7 @@ class Job():
"current_git_head": util.git_head()
}
# user-supplied metadata
- kwdict = extr.config("keywords")
- if kwdict:
+ if kwdict := extr.config("keywords"):
if extr.config("keywords-eval"):
self.kwdict_eval = []
for key, value in kwdict.items():
@@ -260,8 +257,7 @@ class Job():
if self.extractor.config(target + "-unique"):
predicates.append(util.UniquePredicate())
- pfilter = self.extractor.config(target + "-filter")
- if pfilter:
+ if pfilter := self.extractor.config(target + "-filter"):
try:
pred = util.FilterPredicate(pfilter, target)
except (SyntaxError, ValueError, TypeError) as exc:
@@ -269,8 +265,7 @@ class Job():
else:
predicates.append(pred)
- prange = self.extractor.config(target + "-range")
- if prange:
+ if prange := self.extractor.config(target + "-range"):
try:
pred = util.RangePredicate(prange)
except ValueError as exc:
@@ -411,12 +406,10 @@ class DownloadJob(Job):
return
self.visited.add(url)
- cls = kwdict.get("_extractor")
- if cls:
+ if cls := kwdict.get("_extractor"):
extr = cls.from_url(url)
else:
- extr = extractor.find(url)
- if extr:
+ if extr := extractor.find(url):
if self._extractor_filter is None:
self._extractor_filter = self._build_extractor_filter()
if not self._extractor_filter(extr):
@@ -432,8 +425,7 @@ class DownloadJob(Job):
else:
extr._parentdir = pextr._parentdir
- pmeta = pextr.config2("parent-metadata", "metadata-parent")
- if pmeta:
+ if pmeta := pextr.config2("parent-metadata", "metadata-parent"):
if isinstance(pmeta, str):
data = self.kwdict.copy()
if kwdict:
@@ -486,8 +478,7 @@ class DownloadJob(Job):
self.archive.finalize()
self.archive.close()
- pathfmt = self.pathfmt
- if pathfmt:
+ if pathfmt := self.pathfmt:
hooks = self.hooks
if "post-after" in hooks:
for callback in hooks["post-after"]:
@@ -523,8 +514,7 @@ class DownloadJob(Job):
def download(self, url):
"""Download 'url'"""
scheme = url.partition(":")[0]
- downloader = self.get_downloader(scheme)
- if downloader:
+ if downloader := self.get_downloader(scheme):
try:
return downloader.download(url, self.pathfmt)
except OSError as exc:
@@ -570,8 +560,7 @@ class DownloadJob(Job):
# monkey-patch method to do nothing and always return True
self.download = pathfmt.fix_extension
- archive_path = cfg("archive")
- if archive_path:
+ if archive_path := cfg("archive"):
archive_table = cfg("archive-table")
archive_prefix = cfg("archive-prefix")
if archive_prefix is None:
@@ -608,8 +597,7 @@ class DownloadJob(Job):
self._archive_write_file = ("file" in events)
self._archive_write_skip = ("skip" in events)
- skip = cfg("skip", True)
- if skip:
+ if skip := cfg("skip", True):
self._skipexc = None
if skip == "enumerate":
pathfmt.check_file = pathfmt._enum_file
@@ -623,8 +611,7 @@ class DownloadJob(Job):
self._skipexc = SystemExit
self._skipmax = text.parse_int(smax)
- skip_filter = cfg("skip-filter")
- if skip_filter:
+ if skip_filter := cfg("skip-filter"):
self._skipftr = util.compile_filter(skip_filter)
else:
self._skipftr = None
@@ -637,8 +624,7 @@ class DownloadJob(Job):
if not cfg("postprocess", True):
return
- postprocessors = extr.config_accumulate("postprocessors")
- if postprocessors:
+ if postprocessors := extr.config_accumulate("postprocessors"):
self.hooks = collections.defaultdict(list)
pp_log = self.get_logger("postprocessor")
@@ -867,8 +853,7 @@ class UrlJob(Job):
stdout_write("| " + url + "\n")
def handle_queue(self, url, kwdict):
- cls = kwdict.get("_extractor")
- if cls:
+ if cls := kwdict.get("_extractor"):
extr = cls.from_url(url)
else:
extr = extractor.find(url)
@@ -981,8 +966,7 @@ class DataJob(Job):
self.data.append((Message.Queue, url, self.filter(kwdict)))
def handle_queue_resolve(self, url, kwdict):
- cls = kwdict.get("_extractor")
- if cls:
+ if cls := kwdict.get("_extractor"):
extr = cls.from_url(url)
else:
extr = extractor.find(url)
diff --git a/gallery_dl/output.py b/gallery_dl/output.py
index a31f9d30..e4937f4e 100644
--- a/gallery_dl/output.py
+++ b/gallery_dl/output.py
@@ -121,8 +121,7 @@ class PathfmtProxy():
return pathfmt.__dict__.get(name) if pathfmt else None
def __str__(self):
- pathfmt = object.__getattribute__(self, "job").pathfmt
- if pathfmt:
+ if pathfmt := object.__getattribute__(self, "job").pathfmt:
return pathfmt.path or pathfmt.directory
return ""
@@ -235,8 +234,7 @@ def configure_logging(loglevel):
minlevel = handler.level
# file logging handler
- handler = setup_logging_handler("logfile", lvl=loglevel)
- if handler:
+ if handler := setup_logging_handler("logfile", lvl=loglevel):
root.addHandler(handler)
if minlevel > handler.level:
minlevel = handler.level
@@ -394,8 +392,7 @@ class PipeOutput(NullOutput):
class TerminalOutput():
def __init__(self):
- shorten = config.get(("output",), "shorten", True)
- if shorten:
+ if shorten := config.get(("output",), "shorten", True):
func = shorten_string_eaw if shorten == "eaw" else shorten_string
limit = shutil.get_terminal_size().columns - OFFSET
sep = CHAR_ELLIPSIES
@@ -460,8 +457,7 @@ class CustomOutput():
if isinstance(fmt_success, list):
off_success, fmt_success = fmt_success
- shorten = config.get(("output",), "shorten", True)
- if shorten:
+ if shorten := config.get(("output",), "shorten", True):
func = shorten_string_eaw if shorten == "eaw" else shorten_string
width = shutil.get_terminal_size().columns
diff --git a/gallery_dl/path.py b/gallery_dl/path.py
index e46cdc08..795564d5 100644
--- a/gallery_dl/path.py
+++ b/gallery_dl/path.py
@@ -202,8 +202,7 @@ class PathFormat():
"""Build directory path and create it if necessary"""
self.kwdict = kwdict
- segments = self.build_directory(kwdict)
- if segments:
+ if segments := self.build_directory(kwdict):
self.directory = directory = self.basedirectory + self.clean_path(
os.sep.join(segments) + os.sep)
else:
diff --git a/gallery_dl/postprocessor/common.py b/gallery_dl/postprocessor/common.py
index 3099547b..8da84176 100644
--- a/gallery_dl/postprocessor/common.py
+++ b/gallery_dl/postprocessor/common.py
@@ -22,8 +22,7 @@ class PostProcessor():
return self.__class__.__name__
def _init_archive(self, job, options, prefix=None):
- archive_path = options.get("archive")
- if archive_path:
+ if archive_path := options.get("archive"):
extr = job.extractor
archive_table = options.get("archive-table")
diff --git a/gallery_dl/postprocessor/compare.py b/gallery_dl/postprocessor/compare.py
index 58ad063b..c3d328d7 100644
--- a/gallery_dl/postprocessor/compare.py
+++ b/gallery_dl/postprocessor/compare.py
@@ -21,8 +21,7 @@ class ComparePP(PostProcessor):
self._compare = self._compare_size
self._equal_exc = self._equal_cnt = 0
- equal = options.get("equal")
- if equal:
+ if equal := options.get("equal"):
equal, _, emax = equal.partition(":")
self._equal_max = text.parse_int(emax)
if equal == "abort":
diff --git a/gallery_dl/postprocessor/metadata.py b/gallery_dl/postprocessor/metadata.py
index 701173f6..c74f92fb 100644
--- a/gallery_dl/postprocessor/metadata.py
+++ b/gallery_dl/postprocessor/metadata.py
@@ -55,8 +55,7 @@ class MetadataPP(PostProcessor):
self._json_encode = self._make_encoder(options, 4).encode
ext = "json"
- base_directory = options.get("base-directory")
- if base_directory:
+ if base_directory := options.get("base-directory"):
if base_directory is True:
self._base = lambda p: p.basedirectory
else:
@@ -181,8 +180,7 @@ class MetadataPP(PostProcessor):
try:
pathfmt.directory_formatters = self._directory_formatters
pathfmt.directory_conditions = ()
- segments = pathfmt.build_directory(pathfmt.kwdict)
- if segments:
+ if segments := pathfmt.build_directory(pathfmt.kwdict):
directory = pathfmt.clean_path(os.sep.join(segments) + os.sep)
else:
directory = "." + os.sep
@@ -244,8 +242,7 @@ class MetadataPP(PostProcessor):
fp.write(self._json_encode(kwdict) + "\n")
def _make_filter(self, options):
- include = options.get("include")
- if include:
+ if include := options.get("include"):
if isinstance(include, str):
include = include.split(",")
return lambda d: {k: d[k] for k in include if k in d}
diff --git a/gallery_dl/postprocessor/mtime.py b/gallery_dl/postprocessor/mtime.py
index d6a2d7a1..b1269dd5 100644
--- a/gallery_dl/postprocessor/mtime.py
+++ b/gallery_dl/postprocessor/mtime.py
@@ -17,8 +17,7 @@ class MtimePP(PostProcessor):
def __init__(self, job, options):
PostProcessor.__init__(self, job)
- value = options.get("value")
- if value:
+ if value := options.get("value"):
self._get = formatter.parse(value, None, util.identity).format_map
else:
key = options.get("key", "date")
diff --git a/gallery_dl/postprocessor/ugoira.py b/gallery_dl/postprocessor/ugoira.py
index c2b74191..33ebb75c 100644
--- a/gallery_dl/postprocessor/ugoira.py
+++ b/gallery_dl/postprocessor/ugoira.py
@@ -296,8 +296,7 @@ class UgoiraPP(PostProcessor):
def _exec(self, args):
self.log.debug(args)
out = None if self.output else subprocess.DEVNULL
- retcode = util.Popen(args, stdout=out, stderr=out).wait()
- if retcode:
+ if retcode := util.Popen(args, stdout=out, stderr=out).wait():
output.stderr_write("\n")
self.log.error("Non-zero exit status when running %s (%s)",
args, retcode)
diff --git a/gallery_dl/util.py b/gallery_dl/util.py
index 339acbfd..4027ac6f 100644
--- a/gallery_dl/util.py
+++ b/gallery_dl/util.py
@@ -320,20 +320,17 @@ def dump_response(response, fp, headers=False, content=True, hide_auth=True):
res_headers = response.headers.copy()
if hide_auth:
- authorization = req_headers.get("Authorization")
- if authorization:
+ if authorization := req_headers.get("Authorization"):
atype, sep, _ = str(authorization).partition(" ")
req_headers["Authorization"] = f"{atype} ***" if sep else "***"
- cookie = req_headers.get("Cookie")
- if cookie:
+ if cookie := req_headers.get("Cookie"):
req_headers["Cookie"] = ";".join(
c.partition("=")[0] + "=***"
for c in cookie.split(";")
)
- set_cookie = res_headers.get("Set-Cookie")
- if set_cookie:
+ if set_cookie := res_headers.get("Set-Cookie"):
res_headers["Set-Cookie"] = re(r"(^|, )([^ =]+)=[^,;]*").sub(
r"\1\2=***", set_cookie)
@@ -377,14 +374,11 @@ def extract_headers(response):
headers = response.headers
data = dict(headers)
- hcd = headers.get("content-disposition")
- if hcd:
- name = text.extr(hcd, 'filename="', '"')
- if name:
+ if hcd := headers.get("content-disposition"):
+ if name := text.extr(hcd, 'filename="', '"'):
text.nameext_from_url(name, data)
- hlm = headers.get("last-modified")
- if hlm:
+ if hlm := headers.get("last-modified"):
data["date"] = datetime.datetime(*parsedate_tz(hlm)[:6])
return data
diff --git a/gallery_dl/ytdl.py b/gallery_dl/ytdl.py
index 75899473..cfc6b501 100644
--- a/gallery_dl/ytdl.py
+++ b/gallery_dl/ytdl.py
@@ -258,8 +258,7 @@ def parse_command_line(module, argv):
None if opts.match_filter is None
else module.match_filter_func(opts.match_filter))
- cookiesfrombrowser = getattr(opts, "cookiesfrombrowser", None)
- if cookiesfrombrowser:
+ if cookiesfrombrowser := getattr(opts, "cookiesfrombrowser", None):
pattern = util.re(r"""(?x)
(?P[^+:]+)
(?:\s*\+\s*(?P[^:]+))?