give more opportunities to compare images/pdf between each stage of splitting

This commit is contained in:
xenofem 2024-02-16 16:29:55 -05:00
parent 25f44473c4
commit fd6e1f0eb4

View file

@ -562,6 +562,10 @@ def collate_from_paths(srcs, dest, start_index, exclude):
if len(descendant_files_ignore(lo_res_dir, exclude)) == len(descendant_files_ignore(hi_res_dir, exclude)): if len(descendant_files_ignore(lo_res_dir, exclude)) == len(descendant_files_ignore(hi_res_dir, exclude)):
return collate_from_paths([hi_res_dir], dest, start_index, exclude) return collate_from_paths([hi_res_dir], dest, start_index, exclude)
images_vs_pdf = try_collate_images_vs_pdf(srcs, dest, start_index, exclude)
if images_vs_pdf != False:
return images_vs_pdf
for regexes in SPLITS: for regexes in SPLITS:
split_attempt = try_collate_split_regex(srcs, dest, start_index, exclude, **regexes) split_attempt = try_collate_split_regex(srcs, dest, start_index, exclude, **regexes)
if split_attempt != False: if split_attempt != False:
@ -576,10 +580,6 @@ def collate_from_paths(srcs, dest, start_index, exclude):
else: else:
return None return None
images_vs_pdf = try_collate_images_vs_pdf(srcs, dest, start_index, exclude)
if images_vs_pdf != False:
return images_vs_pdf
return None return None
def self_and_parents(path): def self_and_parents(path):