marcus/scour
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

removeDuplicateGradients: Compile at most one regex per master gradient

Browse source 
Regex compilation is by far the most expensive part of
removeDuplicateGradients.  This commit reduces the pain a bit by
trading "many small regexes" to "few larger regexes", which avoid some
of the compilation overhead.

Signed-off-by: Niels Thykier <niels@thykier.net>
This commit is contained in:
Niels Thykier 2020-05-19 18:04:48 +00:00
parent 9e3a5f2e40
commit 36ee0932a4
No known key found for this signature in database
GPG key ID: A65B78DBE67C7AAC
1 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
scour/scour.py
View file

@ -1576,6 +1576,7 @@ def removeDuplicateGradients(doc):
# get a collection of all elements that are referenced and their referencing elements # get a collection of all elements that are referenced and their referencing elements
referencedIDs = findReferencedElements(doc.documentElement) referencedIDs = findReferencedElements(doc.documentElement)
for master_id, duplicates_ids, duplicates in gradients_to_remove: for master_id, duplicates_ids, duplicates in gradients_to_remove:
funcIRI = None
for dup_id, dupGrad in zip(duplicates_ids, duplicates): for dup_id, dupGrad in zip(duplicates_ids, duplicates):
# if the duplicate gradient no longer has a parent that means it was # if the duplicate gradient no longer has a parent that means it was
# already re-mapped to another master gradient # already re-mapped to another master gradient
@ -1585,7 +1586,10 @@ def removeDuplicateGradients(doc):
# With --keep-unreferenced-defs, we can end up with # With --keep-unreferenced-defs, we can end up with
# unreferenced gradients. See GH#156. # unreferenced gradients. See GH#156.
if dup_id in referencedIDs: if dup_id in referencedIDs:
funcIRI = re.compile('url\\([\'"]?#' + dup_id + '[\'"]?\\)') # matches url(#a), url('#a') and url("#a") if funcIRI is None:
# matches url(#<ANY_DUP_ID>), url('#<ANY_DUP_ID>') and url("#<ANY_DUP_ID>")
dup_id_regex = "|".join(duplicates_ids)
funcIRI = re.compile('url\\([\'"]?#(?:' + dup_id_regex + ')[\'"]?\\)')
for elem in referencedIDs[dup_id]: for elem in referencedIDs[dup_id]:
# find out which attribute referenced the duplicate gradient # find out which attribute referenced the duplicate gradient
for attr in ['fill', 'stroke']: for attr in ['fill', 'stroke']: