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

simplify if statements by using walrus operators (#7671)

Browse Source
This commit is contained in:
Mike Fährmann
2025-07-22 18:34:38 +02:00
parent e8b2a496ba
commit a097a373a9
83 changed files with 239 additions and 466 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
gallery_dl/extractor/common.py
View File

@@ -136,11 +136,10 @@ class Extractor():
if first:
first = False
values = config.accumulate(extr + path, key)
else:
conf = config.get(extr, path[0])
if conf:
values[:0] = config.accumulate(
(self.subcategory,), key, conf=conf)
elif conf := config.get(extr, path[0]):
values[:0] = config.accumulate(
(self.subcategory,), key, conf=conf)
return values
def request(self, url, method="GET", session=None,
@@ -455,8 +454,7 @@ class Extractor():
if ZSTD:
headers["Accept-Encoding"] += ", zstd"
referer = self.config("referer", self.referer)
if referer:
if referer := self.config("referer", self.referer):
if isinstance(referer, str):
headers["Referer"] = referer
elif self.root:
@@ -471,8 +469,7 @@ class Extractor():
custom_ua is not config.get(("extractor",), "user-agent"):
headers["User-Agent"] = custom_ua
custom_headers = self.config("headers")
if custom_headers:
if custom_headers := self.config("headers"):
if isinstance(custom_headers, str):
if custom_headers in HEADERS:
custom_headers = HEADERS[custom_headers]
@@ -482,8 +479,7 @@ class Extractor():
custom_headers = ()
headers.update(custom_headers)
custom_ciphers = self.config("ciphers")
if custom_ciphers:
if custom_ciphers := self.config("ciphers"):
if isinstance(custom_ciphers, list):
ssl_ciphers = ":".join(custom_ciphers)
elif custom_ciphers in CIPHERS:
@@ -491,8 +487,7 @@ class Extractor():
else:
ssl_ciphers = custom_ciphers
source_address = self.config("source-address")
if source_address:
if source_address := self.config("source-address"):
if isinstance(source_address, str):
source_address = (source_address, 0)
else:
@@ -526,10 +521,8 @@ class Extractor():
if self.cookies_domain is None:
return
cookies = self.config("cookies")
if cookies:
select = self.config("cookies-select")
if select:
if cookies := self.config("cookies"):
if select := self.config("cookies-select"):
if select == "rotate":
cookies = cookies[self.cookies_index % len(cookies)]
Extractor.cookies_index += 1
@@ -975,8 +968,7 @@ class BaseExtractor(Extractor):
@classmethod
def update(cls, instances):
extra_instances = config.get(("extractor",), cls.basecategory)
if extra_instances:
if extra_instances := config.get(("extractor",), cls.basecategory):
for category, info in extra_instances.items():
if isinstance(info, dict) and "root" in info:
instances[category] = info
@@ -984,8 +976,7 @@ class BaseExtractor(Extractor):
pattern_list = []
instance_list = cls.instances = []
for category, info in instances.items():
root = info["root"]
if root:
if root := info["root"]:
root = root.rstrip("/")
instance_list.append((category, root, info))