Pull request #33: fix: improve unit recognition

Merge in FRAG/50ohm.de from fix/improve-unit-recognition to main

* commit 'b183ef39f1d200b7ebb299aece1cc66065eb4729':
  fix: parse percentage as unit
  fix: improve unit recognition
This commit is contained in:
Tim Grelka DA2TG
2025-06-24 22:04:12 +02:00
committed by Tim Grelka
2 changed files with 9 additions and 1 deletions
+5 -1
View File
@@ -35,13 +35,15 @@ class Unit(SpanToken):
prefixes = ["p", "n", "μ", "m", "k", "M", "G"]
pattern = re.compile(
r"(?P<value>[0-9,]+) ?(?P<prefix>"
# Check for word boundary at start of value ensures only numeric values are caught.
r"\b(?P<value>[0-9,]+) ?(?P<prefix>"
# Group all prefixes together in a capture group
# Empty string at end of list is required so the group always exists in the resulting match
+ "|".join(prefixes + [""])
+ ")(?P<unit>"
# Group all units together in a capture group.
+ "|".join(units)
# Word boundary check at end of unit to ensure proper handling of units like A, Ah etc.
+ r")(?!\w)"
)
@@ -50,6 +52,8 @@ class Unit(SpanToken):
unit: str
def __init__(self, match: re.Match):
print("pattern", self.pattern)
self.value = match.group("value")
self.prefix = match.group("prefix") or ""
self.unit = match.group("unit")