diff options
| -rw-r--r-- | morphlib/artifactsplitrule.py | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/morphlib/artifactsplitrule.py b/morphlib/artifactsplitrule.py index bc92e5fb..125f5b93 100644 --- a/morphlib/artifactsplitrule.py +++ b/morphlib/artifactsplitrule.py @@ -150,9 +150,10 @@ class SplitRules(collections.Iterable): def partition(self, iterable): '''Match many files or artifacts. - It's the common case to take a bunch of filenames and determine - which artifact each should go to, so rather than implement this - logic in multiple places, it's here as a convenience method. + This function takes an iterable of file names, and groups them + using the rules that have been added to this object. + + This is a convenience function that uses the match() method internally. ''' @@ -230,10 +231,11 @@ def unify_chunk_matches(morphology): name = morphology['name'] for suffix, patterns in DEFAULT_CHUNK_RULES: ca_name = name + suffix - # Default rules are replaced by explicit ones - if ca_name in split_rules.artifacts: - break - split_rules.add(ca_name, FileMatch(patterns)) + # Explicit rules override the default rules. This is an all-or-nothing + # override: there is no way to extend the default split rules right now + # without duplicating them in the chunk morphology. + if ca_name not in split_rules.artifacts: + split_rules.add(ca_name, FileMatch(patterns)) return split_rules @@ -267,9 +269,11 @@ def unify_stratum_matches(morphology): for suffix, patterns in DEFAULT_STRATUM_RULES: sta_name = morphology['name'] + suffix - if sta_name in match_split_rules.artifacts: - break - match_split_rules.add(sta_name, ArtifactMatch(patterns)) + # Explicit rules override the default rules. This is an all-or-nothing + # override: there is no way to extend the default split rules right now + # without duplicating them in the chunk morphology. + if sta_name not in match_split_rules.artifacts: + match_split_rules.add(sta_name, ArtifactMatch(patterns)) # Construct a new SplitRules with the assignments before matches return SplitRules(itertools.chain(assignment_split_rules, |