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

apply filter before range

Browse Source
This commit is contained in:
Mike Fährmann
2017-09-09 14:51:31 +02:00
parent 9b21d3f13c
commit 5704c709fa
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
gallery_dl/job.py
View File

@@ -28,22 +28,22 @@ class Job():
# url predicates # url predicates
predicates = [util.UniquePredicate()] predicates = [util.UniquePredicate()]
image = config.get(("_", "image"), {}) image = config.get(("_", "image"), {})
if "filter" in image:
predicates.append(util.FilterPredicate(image["filter"]))
if "range" in image: if "range" in image:
pred = util.RangePredicate(image["range"]) pred = util.RangePredicate(image["range"])
if pred.lower > 1: if pred.lower > 1:
pred.index += self.extractor.skip(pred.lower - 1) pred.index += self.extractor.skip(pred.lower - 1)
predicates.append(pred) predicates.append(pred)
if "filter" in image:
predicates.append(util.FilterPredicate(image["filter"]))
self.pred_url = util.build_predicate(predicates) self.pred_url = util.build_predicate(predicates)
# queue predicates # queue predicates
predicates = [] predicates = []
chapter = config.get(("_", "chapter"), {}) chapter = config.get(("_", "chapter"), {})
if "range" in chapter:
predicates.append(util.RangePredicate(chapter["range"]))
if "filter" in chapter: if "filter" in chapter:
predicates.append(util.FilterPredicate(chapter["filter"])) predicates.append(util.FilterPredicate(chapter["filter"]))
if "range" in chapter:
predicates.append(util.RangePredicate(chapter["range"]))
self.pred_queue = util.build_predicate(predicates) self.pred_queue = util.build_predicate(predicates)
def run(self): def run(self):