amorfo77/paperless-ngx
1
0
Fork 0
mirror of https://github.com/paperless-ngx/paperless-ngx.git synced 2026-04-20 06:49:27 +00:00
Code Issues Projects Releases Wiki Activity

Normalize

Browse Source
This commit is contained in:
shamoon
2026-04-19 13:32:10 -07:00
parent 37134f4756
commit dea7b2c77b
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/documents/search/_query.py
View File

@@ -336,7 +336,7 @@ def rewrite_natural_date_keywords(query: str, tz: tzinfo) -> str:
- Compact 14-digit dates (YYYYMMDDHHmmss)
- Whoosh relative ranges ([-7 days to now], [now-1h TO now+2h])
- 8-digit dates with field awareness (created:20240115)
- Natural keywords (field:today, field:last_week, etc.)
- Natural keywords (field:today, field:"previous quarter", etc.)
Args:
query: Raw user query string
@@ -355,7 +355,7 @@ def rewrite_natural_date_keywords(query: str, tz: tzinfo) -> str:
def _replace(m: regex.Match[str]) -> str:
field = m.group("field")
keyword = m.group("quoted") or m.group("bare")
keyword = (m.group("quoted") or m.group("bare")).lower()
if field in _DATE_ONLY_FIELDS:
return f"{field}:{_date_only_range(keyword, tz)}"
return f"{field}:{_datetime_range(keyword, tz)}"

5
src/documents/tests/search/test_query.py
View File

@@ -110,7 +110,6 @@ class TestCreatedDateField:
pytest.param(
"created",
"previous year",
"2026-03-23T00:00:00Z",
"2025-01-01T00:00:00Z",
"2026-01-01T00:00:00Z",
id="previous_year",
@@ -135,7 +134,7 @@ class TestCreatedDateField:
def test_this_month_december_wraps_to_next_year(self) -> None:
# December: next month must roll over to January 1 of next year
lo, hi = _range(
rewrite_natural_date_keywords("created:this_month", UTC),
rewrite_natural_date_keywords("created:this month", UTC),
"created",
)
assert lo == "2026-12-01T00:00:00Z"
@@ -145,7 +144,7 @@ class TestCreatedDateField:
def test_last_month_january_wraps_to_previous_year(self) -> None:
# January: last month must roll back to December 1 of previous year
lo, hi = _range(
rewrite_natural_date_keywords("created:last_month", UTC),
rewrite_natural_date_keywords("created:previous month", UTC),
"created",
)
assert lo == "2025-12-01T00:00:00Z"