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

rename all instances of 'kwds' to 'kwdict'

Browse Source
This commit is contained in:
Mike Fährmann
2021-07-19 02:23:20 +02:00
parent 3868ec02d1
commit 1b2f9050fb
2 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
gallery_dl/job.py
View File

@@ -107,23 +107,23 @@ class Job():
def dispatch(self, msg): def dispatch(self, msg):
"""Call the appropriate message handler""" """Call the appropriate message handler"""
if msg[0] == Message.Url: if msg[0] == Message.Url:
_, url, kwds = msg _, url, kwdict = msg
if self.url_key: if self.url_key:
kwds[self.url_key] = url kwdict[self.url_key] = url
if self.pred_url(url, kwds): if self.pred_url(url, kwdict):
self.update_kwdict(kwds) self.update_kwdict(kwdict)
self.handle_url(url, kwds) self.handle_url(url, kwdict)
elif msg[0] == Message.Directory: elif msg[0] == Message.Directory:
self.update_kwdict(msg[1]) self.update_kwdict(msg[1])
self.handle_directory(msg[1]) self.handle_directory(msg[1])
elif msg[0] == Message.Queue: elif msg[0] == Message.Queue:
_, url, kwds = msg _, url, kwdict = msg
if self.url_key: if self.url_key:
kwds[self.url_key] = url kwdict[self.url_key] = url
if self.pred_queue(url, kwds): if self.pred_queue(url, kwdict):
self.handle_queue(url, kwds) self.handle_queue(url, kwdict)
elif msg[0] == Message.Version: elif msg[0] == Message.Version:
if msg[1] != 1: if msg[1] != 1:

10
gallery_dl/util.py
View File

@@ -400,7 +400,7 @@ def compile_expression(expr, name="<expr>", globals=GLOBALS):
def build_predicate(predicates): def build_predicate(predicates):
if not predicates: if not predicates:
return lambda url, kwds: True return lambda url, kwdict: True
elif len(predicates) == 1: elif len(predicates) == 1:
return predicates[0] return predicates[0]
else: else:
@@ -418,7 +418,7 @@ class RangePredicate():
else: else:
self.lower, self.upper = 0, 0 self.lower, self.upper = 0, 0
def __call__(self, url, kwds): def __call__(self, url, _):
self.index += 1 self.index += 1
if self.index > self.upper: if self.index > self.upper:
@@ -483,7 +483,7 @@ class UniquePredicate():
def __init__(self): def __init__(self):
self.urls = set() self.urls = set()
def __call__(self, url, kwds): def __call__(self, url, _):
if url.startswith("text:"): if url.startswith("text:"):
return True return True
if url not in self.urls: if url not in self.urls:
@@ -513,9 +513,9 @@ class ChainPredicate():
def __init__(self, predicates): def __init__(self, predicates):
self.predicates = predicates self.predicates = predicates
def __call__(self, url, kwds): def __call__(self, url, kwdict):
for pred in self.predicates: for pred in self.predicates:
if not pred(url, kwds): if not pred(url, kwdict):
return False return False
return True return True