forked from iarv/contact
Compare commits
5 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
0005aaf438 | ||
|
|
f39a09646a | ||
|
|
055aaeb633 | ||
|
|
edd86c1d4b | ||
|
|
df4ed16bae |
@@ -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."""
|
||||
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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, "Пользователь"
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -8,7 +8,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 +18,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
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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"}
|
||||
|
||||
@@ -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
|
||||
|
||||
54
contact/utilities/ini_utils.py
Normal file
54
contact/utilities/ini_utils.py
Normal file
@@ -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
|
||||
@@ -1,6 +1,6 @@
|
||||
[project]
|
||||
name = "contact"
|
||||
version = "1.4.11"
|
||||
version = "1.4.13"
|
||||
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"}
|
||||
|
||||
Reference in New Issue
Block a user