paradizelost/paperless-ngx
1
0
Fork 0
mirror of https://github.com/paperless-ngx/paperless-ngx.git synced 2026-01-18 22:14:22 -06:00
Code Issues Packages Projects Releases Wiki Activity

Consolidate

Browse Source
This commit is contained in:
shamoon
2026-01-05 11:19:35 -08:00
parent 99294d93f9
commit 9d489200d9
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/documents/matching.py
View File

@@ -23,6 +23,7 @@ from documents.models import Workflow
from documents.models import WorkflowTrigger from documents.models import WorkflowTrigger
from documents.permissions import get_objects_for_user_owner_aware from documents.permissions import get_objects_for_user_owner_aware
from documents.regex import safe_regex_search from documents.regex import safe_regex_search
from documents.utils import normalize_nfc
if TYPE_CHECKING: if TYPE_CHECKING:
from django.db.models import QuerySet from django.db.models import QuerySet
@@ -35,7 +36,7 @@ logger = logging.getLogger("paperless.matching")
def _normalize_glob_value(value: str) -> str: def _normalize_glob_value(value: str) -> str:
"""Normalize strings for glob-style matching (case-insensitive).""" """Normalize strings for glob-style matching (case-insensitive)."""
return unicodedata.normalize("NFC", str(value)).casefold() return (normalize_nfc(value) or "").casefold()
def _normalized_fnmatch(name: str, pattern: str) -> bool: def _normalized_fnmatch(name: str, pattern: str) -> bool:
@@ -52,7 +53,7 @@ def _glob_regex_variants(pattern: str) -> list[str]:
regexes = set() regexes = set()
for normalized in { for normalized in {
unicodedata.normalize("NFC", pattern), normalize_nfc(pattern) or "",
unicodedata.normalize("NFD", pattern), unicodedata.normalize("NFD", pattern),
}: }:
regex = fnmatch_translate(normalized).lstrip("^").rstrip("$") regex = fnmatch_translate(normalized).lstrip("^").rstrip("$")