adam/mc-webui
1
0
Fork 0
mirror of https://github.com/MarekWo/mc-webui.git synced 2026-07-21 09:03:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

feat(console): accept 'direct' keyword in change_path

Browse Source 
Setting a contact's path to Direct means 0 hops with an empty path body. The hex parser had no way to express that — empty/non-hex input always failed validation, and reset_path forces Flood instead.

Add a 'direct' keyword that bypasses hex parsing and sends an empty path with hash_size=1, producing out_path_len=0 (Direct). Update the usage block and the help entry to document it and to point at reset_path for the Flood case.

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
This commit is contained in:
MarekWo
2026-05-06 21:04:59 +02:00
parent 8f144c6e97
commit cf5e95579c
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/main.py
+12 -4
View File
@@ -845,7 +845,13 @@ def _execute_console_command(args: list) -> str:
elif cmd == 'change_path' and len(args) >= 3: elif cmd == 'change_path' and len(args) >= 3:
name = args[1] name = args[1]
# Recombine remaining args so space-separated input ("d1 90 05 54") works # Recombine remaining args so space-separated input ("d1 90 05 54") works
raw = ' '.join(args[2:]) raw = ' '.join(args[2:]).strip()
# Special keyword: 'direct' sets the path to Direct (0 hops, empty path)
if raw.lower() == 'direct':
result = device_manager.change_path(name, '', hash_size=1)
if result.get('success'):
return result.get('message', 'OK')
return f"Error: {result.get('error')}"
if ',' in raw: if ',' in raw:
chunks = [c.strip() for c in raw.split(',') if c.strip()] chunks = [c.strip() for c in raw.split(',') if c.strip()]
first_len = len(chunks[0]) if chunks else 0 first_len = len(chunks[0]) if chunks else 0
@@ -869,11 +875,13 @@ def _execute_console_command(args: list) -> str:
return f"Error: {result.get('error')}" return f"Error: {result.get('error')}"
elif cmd == 'change_path': elif cmd == 'change_path':
return ("Usage: change_path <name> <hops>\n" return ("Usage: change_path <name> <hops|direct>\n"
" hops: comma-separated hex, e.g. d1,90,05,54 (1-byte hops)\n" " hops: comma-separated hex, e.g. d1,90,05,54 (1-byte hops)\n"
" 5e34,d1ac (2-byte hops)\n" " 5e34,d1ac (2-byte hops)\n"
" 5e346e,d1ac2c (3-byte hops)\n" " 5e346e,d1ac2c (3-byte hops)\n"
" Spaces or continuous hex also accepted.") " direct: set path to Direct (0 hops)\n"
" Spaces or continuous hex also accepted.\n"
" (Use reset_path to set the path to Flood.)")
elif cmd == 'advert_path' and len(args) >= 2: elif cmd == 'advert_path' and len(args) >= 2:
name = ' '.join(args[1:]) name = ' '.join(args[1:])
@@ -1274,7 +1282,7 @@ def _execute_console_command(args: list) -> str:
" path <name> — Show path to contact\n" " path <name> — Show path to contact\n"
" disc_path <name> — Discover new path\n" " disc_path <name> — Discover new path\n"
" reset_path <name> — Reset path to flood\n" " reset_path <name> — Reset path to flood\n"
" change_path <name> <hops> — Change path (e.g. d1,90,05,54 or 5e34,d1ac)\n" " change_path <name> <hops|direct> — Change path (e.g. d1,90,05,54 or direct)\n"
" advert_path <name> — Get path from advert\n" " advert_path <name> — Get path from advert\n"
" share_contact <name> — Share contact with mesh\n" " share_contact <name> — Share contact with mesh\n"
" export_contact <name> — Export contact URI\n" " export_contact <name> — Export contact URI\n"