impulsivefps
/
Lemontropia-Suite
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: add comma to loot regex patterns for items like 'Dominax Original Garter, Adjusted (L)' 

- Add comma (,) to character class in PATTERN_LOOT_EN and PATTERN_LOOT_SV
- Add comma (,) to PATTERN_LOOT_NO_VALUE_EN and PATTERN_LOOT_NO_VALUE_SV
- Fixes items with commas in their names not being tracked
This commit is contained in:
LemonNexus 2026-02-10 15:13:21 +00:00
parent e4fd75e2a7
commit 6d8f710244
1 changed files with 83 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/log_watcher.py
View File

@ -117,14 +117,14 @@ class LogWatcher:
# Swedish: "Du fick Shrapnel x (4627) Värde: 0.4627 PED" # Swedish: "Du fick Shrapnel x (4627) Värde: 0.4627 PED"
PATTERN_LOOT_EN = re.compile( PATTERN_LOOT_EN = re.compile(
r'^(\d{4}-\d{2}-\d{2}\s+\d{2}:\d{2}:\d{2})\s+\[System\]:?\s*\[?\]?\s*' r'^(\d{4}-\d{2}-\d{2}\s+\d{2}:\d{2}:\d{2})\s+\[System\]:?\s*\[?\]?\s*'
r'You\s+received\s+\[?([\w\s\-()]+?)\]?\s+x\s*\((\d+)\)\s*' r'You\s+received\s+\[?([\w\s\-(),]+?)\]?\s+x\s*\((\d+)\)\s*'
r'Value:\s+(\d+(?:\.\d+)?)\s+PED', r'Value:\s+(\d+(?:\.\d+)?)\s+PED',
re.IGNORECASE re.IGNORECASE
) )
PATTERN_LOOT_SV = re.compile( PATTERN_LOOT_SV = re.compile(
r'^(\d{4}-\d{2}-\d{2}\s+\d{2}:\d{2}:\d{2})\s+\[System\]\s+\[?\]?\s*' r'^(\d{4}-\d{2}-\d{2}\s+\d{2}:\d{2}:\d{2})\s+\[System\]\s+\[?\]?\s*'
r'Du\s+fick\s+([\w\s\-()]+?)\s+x\s*\((\d+)\)\s*' r'Du\s+fick\s+([\w\s\-(),]+?)\s+x\s*\((\d+)\)\s*'
r'Värde:\s+(\d+(?:\.\d+)?)\s+PED', r'Värde:\s+(\d+(?:\.\d+)?)\s+PED',
re.IGNORECASE re.IGNORECASE
) )
@ -133,13 +133,13 @@ class LogWatcher:
# English: "You received Animal Thyroid Oil x 5" # English: "You received Animal Thyroid Oil x 5"
PATTERN_LOOT_NO_VALUE_EN = re.compile( PATTERN_LOOT_NO_VALUE_EN = re.compile(
r'^(\d{4}-\d{2}-\d{2}\s+\d{2}:\d{2}:\d{2})\s+\[System\]:?\s*\[?\]?\s*' r'^(\d{4}-\d{2}-\d{2}\s+\d{2}:\d{2}:\d{2})\s+\[System\]:?\s*\[?\]?\s*'
r'You\s+received\s+\[?([\w\s\-()]+?)\]?\s+x\s*(\d+)', r'You\s+received\s+\[?([\w\s\-(),]+?)\]?\s+x\s*(\d+)',
re.IGNORECASE re.IGNORECASE
) )
PATTERN_LOOT_NO_VALUE_SV = re.compile( PATTERN_LOOT_NO_VALUE_SV = re.compile(
r'^(\d{4}-\d{2}-\d{2}\s+\d{2}:\d{2}:\d{2})\s+\[System\]\s+\[?\]?\s*' r'^(\d{4}-\d{2}-\d{2}\s+\d{2}:\d{2}:\d{2})\s+\[System\]\s+\[?\]?\s*'
r'Du\s+fick\s+([\w\s\-()]+?)\s+x\s*(\d+)', r'Du\s+fick\s+([\w\s\-(),]+?)\s+x\s*(\d+)',
re.IGNORECASE re.IGNORECASE
) )