-
Notifications
You must be signed in to change notification settings - Fork 214
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Decode and deduplicate tags during ingestion cleanup
Signed-off-by: Olga Bulat <obulat@gmail.com>
- Loading branch information
Showing
3 changed files
with
82 additions
and
12 deletions.
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,47 @@ | ||
| import logging | ||
| import re | ||
| from urllib.parse import quote, unquote | ||
|
|
||
|
|
||
| DOUBLE_BACKSLASH_ESCAPE = re.compile( | ||
| r"\\(x)([\da-f]{2})|\\(u)([\da-f]{4})", re.IGNORECASE | ||
| ) | ||
| NO_BACKSLASH_ESCAPE = re.compile(r"(u)([\da-f]{4})", re.IGNORECASE) | ||
|
|
||
|
|
||
| def convert_grp(grp: str) -> str | None: | ||
| """ | ||
| Convert a hex value into a character. Return None if the conversion results in | ||
| a character that cannot be used as a URI component. | ||
| """ | ||
| try: | ||
| converted = chr(int(grp, 16)) | ||
| # Decoded strings should be usable as URI components | ||
| quote(converted) | ||
| return converted | ||
| except UnicodeEncodeError: | ||
| return None | ||
|
|
||
|
|
||
| def decode_data(data: str | None = "") -> str: | ||
| if not data: | ||
| return "" | ||
|
|
||
| def replace_func(match): | ||
| """Replace the matched group with the converted character if possible, otherwise return the original string.""" | ||
| prefix, grp = match.groups() | ||
| if converted := convert_grp(grp): | ||
| return converted | ||
| return f"{prefix}{grp}" | ||
|
|
||
| # Handle characters encoded with double backslashes | ||
| if DOUBLE_BACKSLASH_ESCAPE.search(data): | ||
| try: | ||
| decoded_data = data.encode().decode("unicode_escape") | ||
| data = decoded_data | ||
| except (UnicodeDecodeError, UnicodeEncodeError): | ||
| logging.debug(f"Failed to decode data with double backslash: {data}") | ||
| # Handle characters encoded without backslashes | ||
| data = re.sub(NO_BACKSLASH_ESCAPE, replace_func, data) | ||
|
|
||
| return unquote(data) |
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