adam/mc-webui
1
0
Fork 0
mirror of https://github.com/MarekWo/mc-webui.git synced 2026-08-08 01:32:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix(parser): Fix contacts parsing to include emoji and spaces in names

Browse Source 
Previous regex stopped at first space, causing names like "daniel5120 🔫"
to be parsed as just "daniel5120", breaking DM button visibility checks.

Changed parsing logic to split by 2+ consecutive spaces (column separator
in meshcli output) and extract full contact name before type column.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
This commit is contained in:
MarekWo
2025-12-28 14:59:23 +01:00
parent 40a9b4e3bf
commit 94528c2a96
1 changed files with 24 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/meshcore/cli.py
+24 -14
View File
@@ -125,10 +125,11 @@ def parse_contacts(output: str) -> List[str]:
"""
Parse meshcli contacts output to extract contact names.
Expected formats:
- "ContactName" (simple list)
- "ContactName (type)" (with type info)
- Any line containing contact information
Expected format from meshcli contacts:
ContactName CLI pubkey_prefix path
ContactName 🔫 CLI pubkey_prefix path
Contact name is separated from type column (CLI/REP/ROOM/SENS) by multiple spaces.
Args:
output: Raw output from meshcli contacts command
@@ -139,19 +140,28 @@ def parse_contacts(output: str) -> List[str]:
contacts = []
for line in output.split('\n'):
line = line.strip()
line_stripped = line.strip()
# Skip empty lines and potential headers
if not line or line.startswith('---') or line.lower().startswith('contact'):
# Skip empty lines, headers, and INFO lines
if not line_stripped or line_stripped.startswith('---') or \
line.lower().startswith('contact') or line.startswith('INFO:'):
continue
# Extract contact name (before parentheses or special chars)
# Handle formats like "ContactName" or "ContactName (type)"
name_match = re.match(r'^([^\s()\[\]]+)', line)
if name_match:
contact_name = name_match.group(1).strip()
if contact_name and contact_name not in contacts:
contacts.append(contact_name)
# Split by 2+ consecutive spaces (columns separator in meshcli output)
# Format: "ContactName CLI pubkey path"
parts = re.split(r'\s{2,}', line)
if len(parts) >= 2:
# First part is the contact name (may include emoji and spaces)
contact_name = parts[0].strip()
# Second part should be type (CLI, REP, ROOM, SENS)
contact_type = parts[1].strip()
# Validate that second column looks like a type
if contact_type in ['CLI', 'REP', 'ROOM', 'SENS'] and contact_name:
if contact_name not in contacts:
contacts.append(contact_name)
return contacts