-
Notifications
You must be signed in to change notification settings - Fork 56
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Let's move glob_to_regex into the tree before it vanishes from Synapse #218
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,73 @@ | ||
# -*- coding: utf-8 -*- | ||
# Copyright 2022 The Matrix.org Foundation C.I.C. | ||
# | ||
# Licensed under the Apache License, Version 2.0 (the "License"); | ||
# you may not use this file except in compliance with the License. | ||
# You may obtain a copy of the License at | ||
# | ||
# http://www.apache.org/licenses/LICENSE-2.0 | ||
# | ||
# Unless required by applicable law or agreed to in writing, software | ||
# distributed under the License is distributed on an "AS IS" BASIS, | ||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
# See the License for the specific language governing permissions and | ||
# limitations under the License. | ||
|
||
# Tools in this file were copied from Synapse as these functions will not | ||
# remain publicly accessible in the module, see https://github.com/matrix-org/mjolnir/pull/174 | ||
|
||
import re | ||
from typing import Pattern | ||
|
||
def re_word_boundary(r: str) -> str: | ||
""" | ||
Adds word boundary characters to the start and end of an | ||
expression to require that the match occur as a whole word, | ||
but do so respecting the fact that strings starting or ending | ||
with non-word characters will change word boundaries. | ||
""" | ||
# we can't use \b as it chokes on unicode. however \W seems to be okay | ||
# as shorthand for [^0-9A-Za-z_]. | ||
return r"(^|\W)%s(\W|$)" % (r,) | ||
|
||
_WILDCARD_RUN = re.compile(r"([\?\*]+)") | ||
def glob_to_regex(glob: str, word_boundary: bool = False) -> Pattern: | ||
"""Converts a glob to a compiled regex object. | ||
|
||
Args: | ||
glob: pattern to match | ||
word_boundary: If True, the pattern will be allowed to match at word boundaries | ||
anywhere in the string. Otherwise, the pattern is anchored at the start and | ||
end of the string. | ||
|
||
Returns: | ||
compiled regex pattern | ||
""" | ||
|
||
# Patterns with wildcards must be simplified to avoid performance cliffs | ||
# - The glob `?**?**?` is equivalent to the glob `???*` | ||
# - The glob `???*` is equivalent to the regex `.{3,}` | ||
chunks = [] | ||
for chunk in _WILDCARD_RUN.split(glob): | ||
# No wildcards? re.escape() | ||
if not _WILDCARD_RUN.match(chunk): | ||
chunks.append(re.escape(chunk)) | ||
continue | ||
|
||
# Wildcards? Simplify. | ||
qmarks = chunk.count("?") | ||
if "*" in chunk: | ||
chunks.append(".{%d,}" % qmarks) | ||
else: | ||
chunks.append(".{%d}" % qmarks) | ||
|
||
res = "".join(chunks) | ||
|
||
if word_boundary: | ||
res = re_word_boundary(res) | ||
else: | ||
# \A anchors at start of string, \Z at end of string | ||
res = r"\A" + res + r"\Z" | ||
|
||
return re.compile(res, re.IGNORECASE) | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Note that the match isn't exactly the same with and without
\b
:But not sure if that's relevant enough to care about it.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
At this stage, this is purely copy&paste from Synapse. I think we can refine later if needs be.