bump version

Display Human-Readable IP's and Actually Save Nested Configs

contact/__main__.py

@@ -33,6 +33,8 @@ from contact.ui.splash import draw_splash
 from contact.utilities.arg_parser import setup_parser
 from contact.utilities.db_handler import init_nodedb, load_messages_from_db
 from contact.utilities.input_handlers import get_list_input
+from contact.utilities.i18n import t
+from contact.ui.dialog import dialog
 from contact.utilities.interfaces import initialize_interface
 from contact.utilities.utils import get_channels, get_nodeNum, get_node_list
 from contact.utilities.singleton import ui_state, interface_state, app_state
@@ -85,6 +87,7 @@ def main(stdscr: curses.window) -> None:
     output_capture = io.StringIO()
     try:
         setup_colors()
+        ensure_min_rows(stdscr)
         draw_splash(stdscr)
 
         args = setup_parser().parse_args()
@@ -120,6 +123,24 @@ def main(stdscr: curses.window) -> None:
         raise
 
 
+def ensure_min_rows(stdscr: curses.window, min_rows: int = 11) -> None:
+    while True:
+        rows, _ = stdscr.getmaxyx()
+        if rows >= min_rows:
+            return
+        dialog(
+            t("ui.dialog.resize_title", default="Resize Terminal"),
+            t(
+                "ui.dialog.resize_body",
+                default="Please resize the terminal to at least {rows} rows.",
+                rows=min_rows,
+            ),
+        )
+        curses.update_lines_cols()
+        stdscr.clear()
+        stdscr.refresh()
+
+
 def start() -> None:
     """Entry point for the application."""
 

contact/localisations/en.ini

@@ -86,6 +86,8 @@ confirm.remove_favorite, "Remove {name} from Favorites?", ""
 confirm.set_ignored, "Set {name} as Ignored?", ""
 confirm.remove_ignored, "Remove {name} from Ignored?", ""
 confirm.region_unset, "Your region is UNSET.  Set it now?", ""
+dialog.resize_title, "Resize Terminal", ""
+dialog.resize_body, "Please resize the terminal to at least {rows} rows.", ""
 
 [User Settings]
 user, "User"

contact/localisations/ru.ini

@@ -86,6 +86,8 @@ confirm.remove_favorite, "Удалить {name} из избранного?", ""
 confirm.set_ignored, "Игнорировать {name}?", ""
 confirm.remove_ignored, "Убрать {name} из игнорируемых?", ""
 confirm.region_unset, "Ваш регион НЕ ЗАДАН. Установить сейчас?", ""
+dialog.resize_title, "Увеличьте окно", ""
+dialog.resize_body, "Пожалуйста, увеличьте окно до {rows} строк.", ""
 
 [User Settings]
 user, "Пользователь"

contact/message_handlers/rx_handler.py

@@ -5,9 +5,10 @@ import shutil
 import time
 import subprocess
 import threading
+from typing import Any, Dict, Optional
  # Debounce notification sounds so a burst of queued messages only plays once.
 _SOUND_DEBOUNCE_SECONDS = 0.8
-_sound_timer: threading.Timer | None = None
+_sound_timer: Optional[threading.Timer] = None
 _sound_timer_lock = threading.Lock()
 _last_sound_request = 0.0
 
@@ -42,8 +43,6 @@ def schedule_notification_sound(delay: float = _SOUND_DEBOUNCE_SECONDS) -> None:
         _sound_timer = threading.Timer(delay, _fire, args=(now,))
         _sound_timer.daemon = True
         _sound_timer.start()
-from typing import Any, Dict
-
 from contact.utilities.utils import (
     refresh_node_list,
     add_new_message,

contact/settings.py

@@ -8,6 +8,8 @@ import traceback
 import contact.ui.default_config as config
 from contact.utilities.input_handlers import get_list_input
 from contact.utilities.i18n import t
+from contact.ui.dialog import dialog
+from contact.utilities.i18n import t
 from contact.ui.colors import setup_colors
 from contact.ui.splash import draw_splash
 from contact.ui.control_ui import set_region, settings_menu
@@ -20,6 +22,7 @@ def main(stdscr: curses.window) -> None:
     try:
         with contextlib.redirect_stdout(output_capture), contextlib.redirect_stderr(output_capture):
             setup_colors()
+            ensure_min_rows(stdscr)
             draw_splash(stdscr)
             curses.curs_set(0)
             stdscr.keypad(True)
@@ -50,6 +53,24 @@ def main(stdscr: curses.window) -> None:
         raise
 
 
+def ensure_min_rows(stdscr: curses.window, min_rows: int = 11) -> None:
+    while True:
+        rows, _ = stdscr.getmaxyx()
+        if rows >= min_rows:
+            return
+        dialog(
+            t("ui.dialog.resize_title", default="Resize Terminal"),
+            t(
+                "ui.dialog.resize_body",
+                default="Please resize the terminal to at least {rows} rows.",
+                rows=min_rows,
+            ),
+        )
+        curses.update_lines_cols()
+        stdscr.clear()
+        stdscr.refresh()
+
+
 logging.basicConfig(  # Run `tail -f client.log` in another terminal to view live
     filename=config.log_file_path,
     level=logging.WARNING,  # DEBUG, INFO, WARNING, ERROR, CRITICAL)

contact/ui/control_ui.py

@@ -1,5 +1,6 @@
 import base64
 import curses
+import ipaddress
 import logging
 import os
 import sys
@@ -8,7 +9,9 @@ from typing import List
 from contact.utilities.save_to_radio import save_changes
 import contact.ui.default_config as config
 from contact.utilities.config_io import config_export, config_import
-from contact.utilities.control_utils import parse_ini_file, transform_menu_path
+from contact.utilities.control_utils import transform_menu_path
+from contact.utilities.i18n import t
+from contact.utilities.ini_utils import parse_ini_file
 from contact.utilities.input_handlers import (
     get_repeated_input,
     get_text_input,
@@ -16,7 +19,6 @@ from contact.utilities.input_handlers import (
     get_list_input,
     get_admin_key_input,
 )
-from contact.utilities.i18n import t
 from contact.ui.colors import get_color
 from contact.ui.dialog import dialog
 from contact.ui.menus import generate_menu_from_protobuf
@@ -121,6 +123,22 @@ def display_menu() -> tuple[object, object]:
         full_key = ".".join(transformed_path + [option])
         display_name = field_mapping.get(full_key, option)
 
+        if full_key.startswith("config.network.ipv4_config.") and option in {"ip", "gateway", "subnet", "dns"}:
+            if isinstance(current_value, int):
+                try:
+                    current_value = str(
+                        ipaddress.IPv4Address(int(current_value).to_bytes(4, "little", signed=False))
+                    )
+                except ipaddress.AddressValueError:
+                    pass
+            elif isinstance(current_value, str) and current_value.isdigit():
+                try:
+                    current_value = str(
+                        ipaddress.IPv4Address(int(current_value).to_bytes(4, "little", signed=False))
+                    )
+                except ipaddress.AddressValueError:
+                    pass
+
         display_option = f"{display_name}"[: w // 2 - 2]
         display_value = f"{current_value}"[: w // 2 - 4]
 

contact/ui/nav_utils.py

@@ -29,8 +29,6 @@ save_option = "Save Changes"
 
 def get_save_option_label() -> str:
     return t("ui.save_changes", default=save_option)
-MIN_HEIGHT_FOR_HELP = 20
-
 
 def move_highlight(
     old_idx: int, options: List[str], menu_win: curses.window, menu_pad: curses.window, **kwargs: Any
@@ -181,9 +179,6 @@ def update_help_window(
 ) -> object:  # returns a curses window
     """Handles rendering the help window consistently."""
 
-    if curses.LINES < MIN_HEIGHT_FOR_HELP:
-        return None
-
     # Clamp target position and width to the current terminal size
     help_x = max(0, help_x)
     help_y = max(0, help_y)

contact/ui/user_config.py

@@ -6,7 +6,7 @@ from typing import Any, List, Dict, Optional
 from contact.ui.colors import get_color, setup_colors, COLOR_MAP
 import contact.ui.default_config as config
 from contact.ui.nav_utils import move_highlight, draw_arrows, update_help_window
-from contact.utilities.control_utils import parse_ini_file
+from contact.utilities.ini_utils import parse_ini_file
 from contact.utilities.input_handlers import get_list_input
 from contact.utilities.i18n import t
 from contact.utilities.singleton import menu_state

contact/utilities/control_utils.py

@@ -1,55 +1,7 @@
-from typing import Optional, Tuple, Dict, List
+from typing import List
 import re
 
 
-def parse_ini_file(ini_file_path: str) -> Tuple[Dict[str, str], Dict[str, str]]:
-    """Parses an INI file and returns a mapping of keys to human-readable names and help text."""
-
-    field_mapping: Dict[str, str] = {}
-    help_text: Dict[str, str] = {}
-    current_section: Optional[str] = None
-
-    with open(ini_file_path, "r", encoding="utf-8") as f:
-        for line in f:
-            line = line.strip()
-
-            # Skip empty lines and comments
-            if not line or line.startswith(";") or line.startswith("#"):
-                continue
-
-            # Handle sections like [config.device]
-            if line.startswith("[") and line.endswith("]"):
-                current_section = line[1:-1]
-                continue
-
-            # Parse lines like: key, "Human-readable name", "helptext"
-            parts = [p.strip().strip('"') for p in line.split(",", 2)]
-            if len(parts) >= 2:
-                key = parts[0]
-
-                # If key is 'title', map directly to the section
-                if key == "title":
-                    full_key = current_section
-                else:
-                    full_key = f"{current_section}.{key}" if current_section else key
-
-                # Use the provided human-readable name or fallback to key
-                human_readable_name = parts[1] if parts[1] else key
-                field_mapping[full_key] = human_readable_name
-
-                # Handle help text or default
-                help = parts[2] if len(parts) == 3 and parts[2] else "No help available."
-                help_text[full_key] = help
-
-            else:
-                # Handle cases with only the key present
-                full_key = f"{current_section}.{key}" if current_section else key
-                field_mapping[full_key] = key
-                help_text[full_key] = "No help available."
-
-    return field_mapping, help_text
-
-
 def transform_menu_path(menu_path: List[str]) -> List[str]:
     """Applies path replacements and normalizes entries in the menu path."""
     path_replacements = {"Radio Settings": "config", "Module Settings": "module"}

contact/utilities/i18n.py

@@ -1,7 +1,7 @@
 from typing import Optional
 
 import contact.ui.default_config as config
-from contact.utilities.control_utils import parse_ini_file
+from contact.utilities.ini_utils import parse_ini_file
 
 _translations = {}
 _language = None

contact/utilities/ini_utils.py

@@ -0,0 +1,54 @@
+from typing import Optional, Tuple, Dict
+from contact.utilities import i18n
+
+
+def parse_ini_file(ini_file_path: str) -> Tuple[Dict[str, str], Dict[str, str]]:
+    """Parses an INI file and returns a mapping of keys to human-readable names and help text."""
+    try:
+        default_help = i18n.t("ui.help.no_help", default="No help available.")
+    except Exception:
+        default_help = "No help available."
+
+    field_mapping: Dict[str, str] = {}
+    help_text: Dict[str, str] = {}
+    current_section: Optional[str] = None
+
+    with open(ini_file_path, "r", encoding="utf-8") as f:
+        for line in f:
+            line = line.strip()
+
+            # Skip empty lines and comments
+            if not line or line.startswith(";") or line.startswith("#"):
+                continue
+
+            # Handle sections like [config.device]
+            if line.startswith("[") and line.endswith("]"):
+                current_section = line[1:-1]
+                continue
+
+            # Parse lines like: key, "Human-readable name", "helptext"
+            parts = [p.strip().strip('"') for p in line.split(",", 2)]
+            if len(parts) >= 2:
+                key = parts[0]
+
+                # If key is 'title', map directly to the section
+                if key == "title":
+                    full_key = current_section
+                else:
+                    full_key = f"{current_section}.{key}" if current_section else key
+
+                # Use the provided human-readable name or fallback to key
+                human_readable_name = parts[1] if parts[1] else key
+                field_mapping[full_key] = human_readable_name
+
+                # Handle help text or default
+                help = parts[2] if len(parts) == 3 and parts[2] else default_help
+                help_text[full_key] = help
+
+            else:
+                # Handle cases with only the key present
+                full_key = f"{current_section}.{key}" if current_section else key
+                field_mapping[full_key] = key
+                help_text[full_key] = default_help
+
+    return field_mapping, help_text

contact/utilities/input_handlers.py

@@ -462,7 +462,10 @@ from contact.utilities.singleton import menu_state  # Ensure this is imported
 
 def get_fixed32_input(current_value: int) -> int:
     original_value = current_value
-    ip_string = str(ipaddress.IPv4Address(current_value))
+    try:
+        ip_string = str(ipaddress.IPv4Address(int(current_value).to_bytes(4, "little", signed=False)))
+    except Exception:
+        ip_string = str(ipaddress.IPv4Address(current_value))
     height = 10
     width = get_dialog_width()
     start_y = max(0, (curses.LINES - height) // 2)
@@ -524,7 +527,7 @@ def get_fixed32_input(current_value: int) -> int:
             if len(octets) == 4 and all(octet.isdigit() and 0 <= int(octet) <= 255 for octet in octets):
                 curses.noecho()
                 curses.curs_set(0)
-                return int(ipaddress.ip_address(user_input))
+                return int.from_bytes(ipaddress.IPv4Address(user_input).packed, "little", signed=False)
             else:
                 fixed32_win.addstr(
                     7,
@@ -536,7 +539,7 @@ def get_fixed32_input(current_value: int) -> int:
                 curses.napms(1500)
                 user_input = ""
 
-        elif key in (curses.KEY_BACKSPACE, 127):
+        elif key in (curses.KEY_BACKSPACE, curses.KEY_DC, 127, 8, "\b", "\x7f"):
             user_input = user_input[:-1]
 
         else:

contact/utilities/save_to_radio.py

@@ -112,16 +112,23 @@ def save_changes(interface, modified_settings, menu_state):
         else:
             config_category = None
 
+        # Resolve the target config container, including nested sub-messages (e.g., network.ipv4_config)
+        config_container = None
+        if hasattr(node.localConfig, config_category):
+            config_container = getattr(node.localConfig, config_category)
+        elif hasattr(node.moduleConfig, config_category):
+            config_container = getattr(node.moduleConfig, config_category)
+        else:
+            logging.warning(f"Config category '{config_category}' not found in config.")
+            return
+
+        if len(menu_state.menu_path) >= 4:
+            nested_key = menu_state.menu_path[3]
+            if hasattr(config_container, nested_key):
+                config_container = getattr(config_container, nested_key)
+
         for config_item, new_value in modified_settings.items():
-            # Check if the category exists in localConfig
-            if hasattr(node.localConfig, config_category):
-                config_subcategory = getattr(node.localConfig, config_category)
-            # Check if the category exists in moduleConfig
-            elif hasattr(node.moduleConfig, config_category):
-                config_subcategory = getattr(node.moduleConfig, config_category)
-            else:
-                logging.warning(f"Config category '{config_category}' not found in config.")
-                continue
+            config_subcategory = config_container
 
             # Check if the config_item exists in the subcategory
             if hasattr(config_subcategory, config_item):

contact/utilities/telemetry_beautifier.py

@@ -68,19 +68,19 @@ def get_chunks(data):
                 # Leave it string as last resort
                 value = value
 
-        match key:
+        # Python 3.9-compatible alternative to match/case.
+        if key == "uptime_seconds":
             # convert seconds to hours, for our sanity
-            case "uptime_seconds":
-                value = round(value / 60 / 60, 1)
+            value = round(value / 60 / 60, 1)
+        elif key in ("longitude_i", "latitude_i"):
             # Convert position to degrees (humanize), as per Meshtastic protobuf comment for this telemetry
             # truncate to 6th digit after floating point, which would be still accurate
-            case "longitude_i" | "latitude_i":
-                value = round(value * 1e-7, 6)
+            value = round(value * 1e-7, 6)
+        elif key == "wind_direction":
             # Convert wind direction from degrees to abbreviation
-            case "wind_direction":
-                value = humanize_wind_direction(value)
-            case "time":
-                value = datetime.datetime.fromtimestamp(int(value)).strftime("%d.%m.%Y %H:%m")
+            value = humanize_wind_direction(value)
+        elif key == "time":
+            value = datetime.datetime.fromtimestamp(int(value)).strftime("%d.%m.%Y %H:%m")
 
         if key in sensors:
             parsed+= f"{sensors[key.strip()]['icon']}{value}{sensors[key]['unit']}  "

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "contact"
-version = "1.4.11"
+version = "1.4.16"
 description = "This Python curses client for Meshtastic is a terminal-based client designed to manage device settings, enable mesh chat communication, and handle configuration backups and restores."
 authors = [
     {name = "Ben Lipsey",email = "ben@pdxlocations.com"}