From 5704c709fae0ecf0067c6f557be580a4446c690a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mike=20F=C3=A4hrmann?= Date: Sat, 9 Sep 2017 14:51:31 +0200 Subject: [PATCH] apply filter before range --- gallery_dl/job.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gallery_dl/job.py b/gallery_dl/job.py index 102c15b8..42894401 100644 --- a/gallery_dl/job.py +++ b/gallery_dl/job.py @@ -28,22 +28,22 @@ class Job(): # url predicates predicates = [util.UniquePredicate()] image = config.get(("_", "image"), {}) + if "filter" in image: + predicates.append(util.FilterPredicate(image["filter"])) if "range" in image: pred = util.RangePredicate(image["range"]) if pred.lower > 1: pred.index += self.extractor.skip(pred.lower - 1) predicates.append(pred) - if "filter" in image: - predicates.append(util.FilterPredicate(image["filter"])) self.pred_url = util.build_predicate(predicates) # queue predicates predicates = [] chapter = config.get(("_", "chapter"), {}) - if "range" in chapter: - predicates.append(util.RangePredicate(chapter["range"])) if "filter" in chapter: predicates.append(util.FilterPredicate(chapter["filter"])) + if "range" in chapter: + predicates.append(util.RangePredicate(chapter["range"])) self.pred_queue = util.build_predicate(predicates) def run(self):