make skipping sources in splits actually work
This commit is contained in:
parent
812f5e7a61
commit
cf17ec85a7
1 changed files with 4 additions and 2 deletions
|
@ -598,20 +598,22 @@ class Collator:
|
||||||
early_srcs = []
|
early_srcs = []
|
||||||
middle_srcs = []
|
middle_srcs = []
|
||||||
late_srcs = []
|
late_srcs = []
|
||||||
|
skipped_srcs = []
|
||||||
for src in srcs:
|
for src in srcs:
|
||||||
if earlier and earlier.search(nname(src)):
|
if earlier and earlier.search(nname(src)):
|
||||||
early_srcs.append(src)
|
early_srcs.append(src)
|
||||||
elif later and later.search(nname(src)):
|
elif later and later.search(nname(src)):
|
||||||
late_srcs.append(src)
|
late_srcs.append(src)
|
||||||
elif skip and skip.search(nname(src)):
|
elif skip and skip.search(nname(src)):
|
||||||
pass
|
skipped_srcs.append(src)
|
||||||
else:
|
else:
|
||||||
middle_srcs.append(src)
|
middle_srcs.append(src)
|
||||||
|
|
||||||
if sum(1 for l in [early_srcs, middle_srcs, late_srcs] if l) <= 1:
|
if sum(1 for l in [early_srcs, middle_srcs, late_srcs, skipped_srcs] if l) <= 1:
|
||||||
return False
|
return False
|
||||||
|
|
||||||
debug(f'Splitting sources based on regex: {[early_srcs, middle_srcs, late_srcs]}')
|
debug(f'Splitting sources based on regex: {[early_srcs, middle_srcs, late_srcs]}')
|
||||||
|
debug(f'Skipping sources based on regex: {skipped_srcs}')
|
||||||
|
|
||||||
early_page_collation = self.collate_from_paths(early_srcs)
|
early_page_collation = self.collate_from_paths(early_srcs)
|
||||||
if early_page_collation is None:
|
if early_page_collation is None:
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue