mirror of
https://github.com/pdxlocations/contact.git
synced 2026-05-08 06:14:26 +02:00
Compare commits
17 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 69cb568d2c | |||
| 68b08787de | |||
| 80ede60153 | |||
| 046ede23a2 | |||
| 0ad39fd6a0 | |||
| 6721874937 | |||
| 8ee21b1973 | |||
| 0760d6d0ca | |||
| cd0b114f13 | |||
| 2d4b407caa | |||
| 80b9311959 | |||
| da5f5bff39 | |||
| bc69c709ff | |||
| 6453865cba | |||
| 090e89d92c | |||
| 07716c1719 | |||
| da5b102047 |
@@ -60,6 +60,7 @@ For smaller displays you may wish to enable `single_pane_mode`:
|
||||
- `CTRL` + `t` or `F4` = With the Node List highlighted, send a traceroute to the selected node
|
||||
- `F5` = Display a node's info
|
||||
- `CTRL` + `f` = With the Node List highlighted, favorite the selected node
|
||||
- `CTRL` + `b` = Enable/Disable Autoresponder Bot (ping / pong)
|
||||
- `CTRL` + `g` = With the Node List highlighted, ignore the selected node
|
||||
- `CTRL` + `d` = With the Channel List hightlighted, archive a chat to reduce UI clutter. Messages will be saved in the db and repopulate if you send or receive a DM from this user.
|
||||
- `CTRL` + `d` = With the Note List highlghted, remove a node from your nodedb.
|
||||
|
||||
+44
-8
@@ -57,6 +57,8 @@ logging.basicConfig(
|
||||
|
||||
app_state.lock = threading.Lock()
|
||||
|
||||
DEFAULT_CLOSE_TIMEOUT_SECONDS = 5.0
|
||||
|
||||
|
||||
# ------------------------------------------------------------------------------
|
||||
# Main Program Logic
|
||||
@@ -72,11 +74,36 @@ def prompt_region_if_unset(args: object, stdscr: Optional[curses.window] = None)
|
||||
interface_state.interface = reconnect_interface(args)
|
||||
|
||||
|
||||
def close_interface(interface: object) -> None:
|
||||
def close_interface(interface: object, timeout_seconds: float = DEFAULT_CLOSE_TIMEOUT_SECONDS) -> bool:
|
||||
if interface is None:
|
||||
return
|
||||
with contextlib.suppress(Exception):
|
||||
interface.close()
|
||||
return True
|
||||
|
||||
close_errors = []
|
||||
|
||||
def _close_target() -> None:
|
||||
try:
|
||||
interface.close()
|
||||
except BaseException as error: # Keep shutdown resilient even for KeyboardInterrupt/SystemExit from libraries.
|
||||
close_errors.append(error)
|
||||
|
||||
close_thread = threading.Thread(target=_close_target, name="meshtastic-interface-close", daemon=True)
|
||||
close_thread.start()
|
||||
close_thread.join(timeout_seconds)
|
||||
|
||||
if close_thread.is_alive():
|
||||
logging.warning("Timed out closing interface after %.1fs; continuing shutdown", timeout_seconds)
|
||||
return False
|
||||
|
||||
if not close_errors:
|
||||
return True
|
||||
|
||||
error = close_errors[0]
|
||||
if isinstance(error, KeyboardInterrupt):
|
||||
logging.info("Interrupted while closing interface; continuing shutdown")
|
||||
return True
|
||||
|
||||
logging.warning("Ignoring error while closing interface: %r", error)
|
||||
return True
|
||||
|
||||
|
||||
def interface_is_ready(interface: object) -> bool:
|
||||
@@ -205,23 +232,32 @@ def start() -> None:
|
||||
setup_parser().print_help()
|
||||
sys.exit(0)
|
||||
|
||||
interrupted = False
|
||||
fatal_error = None
|
||||
|
||||
try:
|
||||
curses.wrapper(main)
|
||||
close_interface(interface_state.interface)
|
||||
except KeyboardInterrupt:
|
||||
interrupted = True
|
||||
logging.info("User exited with Ctrl+C")
|
||||
close_interface(interface_state.interface)
|
||||
sys.exit(0)
|
||||
except Exception as e:
|
||||
fatal_error = e
|
||||
logging.critical("Fatal error", exc_info=True)
|
||||
try:
|
||||
curses.endwin()
|
||||
except Exception:
|
||||
pass
|
||||
print("Fatal error:", e)
|
||||
finally:
|
||||
close_interface(interface_state.interface)
|
||||
|
||||
if fatal_error is not None:
|
||||
print("Fatal error:", fatal_error)
|
||||
traceback.print_exc()
|
||||
sys.exit(1)
|
||||
|
||||
if interrupted:
|
||||
sys.exit(0)
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
start()
|
||||
|
||||
@@ -78,6 +78,7 @@ help.traceroute, "Ctrl+T or F4 = Traceroute", ""
|
||||
help.node_info, "F5 = Full node info", ""
|
||||
help.archive_chat, "Ctrl+D = Archive chat / remove node", ""
|
||||
help.favorite, "Ctrl+F = Favorite", ""
|
||||
help.bot_responder, "Ctrl+B = Toggle Bot Responder", ""
|
||||
help.ignore, "Ctrl+G = Ignore", ""
|
||||
help.search, "Ctrl+/ or / = Search", ""
|
||||
help.help, "Ctrl+K = Help", ""
|
||||
@@ -90,6 +91,11 @@ 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.", ""
|
||||
bot.status.enabled, "Enabled", ""
|
||||
bot.status.disabled, "Disabled", ""
|
||||
bot.dialog.title, "Bot Responder", ""
|
||||
bot.dialog.body, "Bot responder is now {status}.", ""
|
||||
bot.status.message, "Bot responder is now {status}.", ""
|
||||
|
||||
[User Settings]
|
||||
user, "User"
|
||||
@@ -116,10 +122,16 @@ nak_str, "NAK", ""
|
||||
ack_unknown_str, "ACK (unknown)", ""
|
||||
node_sort, "Node sort", ""
|
||||
theme, "Theme", ""
|
||||
ping_bot, "Ping Bot", ""
|
||||
COLOR_CONFIG_DARK, "Theme colors (dark)", ""
|
||||
COLOR_CONFIG_LIGHT, "Theme colors (light)", ""
|
||||
COLOR_CONFIG_GREEN, "Theme colors (green)", ""
|
||||
|
||||
[app_settings.ping_bot]
|
||||
title, "Ping Bot", ""
|
||||
catch_words, "Catch words", "Semicolon-separated bot trigger words."
|
||||
response_word, "Response word", "Bot response word."
|
||||
|
||||
[app_settings.color_config]
|
||||
default, "Default", ""
|
||||
background, "Background", ""
|
||||
|
||||
@@ -0,0 +1,209 @@
|
||||
##field_name, "Nom du champ lisible avec première lettre en majuscule", "Texte d'aide avec [warning]avertissements[/warning], [note]notes[/note], [underline]soulignements[/underline], \033[31mcodes couleur ANSI\033[0m et \nsauts de ligne."
|
||||
Main Menu, "Menu principal", ""
|
||||
User Settings, "Paramètres utilisateur", ""
|
||||
Channels, "Canaux", ""
|
||||
Radio Settings, "Paramètres radio", ""
|
||||
Module Settings, "Paramètres des modules", ""
|
||||
App Settings, "Paramètres de l'application", ""
|
||||
Export Config File, "Exporter le fichier de configuration", ""
|
||||
Load Config File, "Charger le fichier de configuration", ""
|
||||
Config URL, "URL de configuration", ""
|
||||
Reboot, "Redémarrer", ""
|
||||
Reset Node DB, "Réinitialiser la base de données des nœuds", ""
|
||||
Shutdown, "Éteindre", ""
|
||||
Factory Reset, "Réinitialisation d'usine", ""
|
||||
factory_reset_config, "Réinitialiser la configuration d'usine", ""
|
||||
Exit, "Quitter", ""
|
||||
Yes, "Oui", ""
|
||||
No, "Non", ""
|
||||
Cancel, "Annuler", ""
|
||||
|
||||
[ui]
|
||||
save_changes, "Enregistrer les modifications", ""
|
||||
dialog.invalid_input, "Entrée invalide", ""
|
||||
prompt.enter_new_value, "Entrer une nouvelle valeur : ", ""
|
||||
error.value_empty, "La valeur ne peut pas être vide.", ""
|
||||
error.value_exact_length, "La valeur doit comporter exactement {length} caractères.", ""
|
||||
error.value_min_length, "La valeur doit comporter au moins {length} caractères.", ""
|
||||
error.value_max_length, "La valeur ne doit pas dépasser {length} caractères.", ""
|
||||
error.digits_only, "Seuls les chiffres (0-9) sont autorisés.", ""
|
||||
error.number_range, "Entrez un nombre entre {min_value} et {max_value}.", ""
|
||||
error.float_invalid, "Doit être un nombre à virgule flottante valide.", ""
|
||||
prompt.edit_admin_keys, "Modifier jusqu'à 3 clés administrateur :", ""
|
||||
label.admin_key, "Clé administrateur", ""
|
||||
error.admin_key_invalid, "Erreur : chaque clé doit être en Base64 valide et faire 32 octets !", ""
|
||||
prompt.edit_values, "Modifier jusqu'à 3 valeurs :", ""
|
||||
label.value, "Valeur", ""
|
||||
prompt.enter_ip, "Entrez une adresse IP (xxx.xxx.xxx.xxx) :", ""
|
||||
label.current, "Actuel", ""
|
||||
label.new_value, "Nouvelle valeur", ""
|
||||
label.editing, "Modification de {label}", ""
|
||||
label.current_value, "Valeur actuelle :", ""
|
||||
error.ip_invalid, "Adresse IP invalide. Réessayez.", ""
|
||||
prompt.select_foreground_color, "Sélectionner la couleur de premier plan pour {label}", ""
|
||||
prompt.select_background_color, "Sélectionner la couleur d'arrière-plan pour {label}", ""
|
||||
prompt.select_value, "Sélectionner {label}", ""
|
||||
confirm.save_before_exit, "Vous avez des modifications non enregistrées. Enregistrer avant de quitter ?", ""
|
||||
prompt.config_filename, "Entrez un nom de fichier pour le fichier de configuration", ""
|
||||
confirm.overwrite_file, "{filename} existe déjà. Écraser ?", ""
|
||||
dialog.config_saved_title, "Fichier de configuration enregistré :", ""
|
||||
dialog.no_config_files, " Aucun fichier de configuration trouvé. Exportez-en un d'abord.", ""
|
||||
prompt.choose_config_file, "Choisissez un fichier de configuration", ""
|
||||
confirm.load_config_file, "Êtes-vous sûr de vouloir charger {filename} ?", ""
|
||||
prompt.config_url_current, "L'URL de configuration est actuellement : {value}", ""
|
||||
confirm.load_config_url, "Êtes-vous sûr de vouloir charger cette configuration ?", ""
|
||||
confirm.reboot, "Êtes-vous sûr de vouloir redémarrer ?", ""
|
||||
confirm.reset_node_db, "Êtes-vous sûr de vouloir réinitialiser la base de données des nœuds ?", ""
|
||||
confirm.shutdown, "Êtes-vous sûr de vouloir éteindre ?", ""
|
||||
confirm.factory_reset, "Êtes-vous sûr de vouloir effectuer une réinitialisation d'usine ?", ""
|
||||
confirm.factory_reset_config, "Êtes-vous sûr de vouloir réinitialiser la configuration d'usine ?", ""
|
||||
confirm.save_before_exit_section, "Vous avez des modifications non enregistrées dans {section}. Enregistrer avant de quitter ?", ""
|
||||
prompt.select_region, "Sélectionnez votre région :", ""
|
||||
dialog.slow_down_title, "Ralentissez", ""
|
||||
dialog.slow_down_body, "Veuillez attendre 2 secondes entre les messages.", ""
|
||||
dialog.node_details_title, "📡 Détails du nœud : {name}", ""
|
||||
dialog.traceroute_not_sent_title, "Traceroute non envoyé", ""
|
||||
dialog.traceroute_not_sent_body, "Veuillez attendre {seconds} secondes avant d'envoyer un autre traceroute.", ""
|
||||
dialog.traceroute_sent_title, "Traceroute envoyé à : {name}", ""
|
||||
dialog.traceroute_sent_body, "Les résultats apparaîtront dans la fenêtre des messages.", ""
|
||||
dialog.help_title, "Aide - Raccourcis clavier", ""
|
||||
help.scroll, "Haut/Bas = Défilement", ""
|
||||
help.switch_window, "Gauche/Droite = Changer de fenêtre", ""
|
||||
help.jump_windows, "F1/F2/F3 = Aller à Canal/Messages/Nœuds", ""
|
||||
help.enter, "ENTRÉE = Envoyer / Sélectionner", ""
|
||||
help.settings, "` ou F12 = Paramètres", ""
|
||||
help.quit, "ESC = Quitter", ""
|
||||
help.packet_log, "Ctrl+P = Activer/désactiver le journal des paquets", ""
|
||||
help.traceroute, "Ctrl+T ou F4 = Traceroute", ""
|
||||
help.node_info, "F5 = Informations complètes du nœud", ""
|
||||
help.archive_chat, "Ctrl+D = Archiver la discussion / supprimer le nœud", ""
|
||||
help.favorite, "Ctrl+F = Favori", ""
|
||||
help.bot_responder, "Ctrl+B = Activer/désactiver le bot répondeur", ""
|
||||
help.ignore, "Ctrl+G = Ignorer", ""
|
||||
help.search, "Ctrl+/ ou / = Rechercher", ""
|
||||
help.help, "Ctrl+K = Aide", ""
|
||||
help.no_help, "Aucune aide disponible.", ""
|
||||
bot.status.enabled, "Activé", ""
|
||||
bot.status.disabled, "Désactivé", ""
|
||||
bot.dialog.title, "Bot répondeur", ""
|
||||
bot.dialog.body, "Le bot répondeur est maintenant {status}.", ""
|
||||
bot.status.message, "Le bot répondeur est maintenant {status}.", ""
|
||||
|
||||
[User Settings]
|
||||
user, "Utilisateur", ""
|
||||
longName, "Nom long du nœud", "Si vous êtes un opérateur radioamateur agréé et avez activé le mode HAM, cela doit être votre indicatif."
|
||||
shortName, "Nom court du nœud", "Doit contenir jusqu'à 4 octets."
|
||||
isLicensed, "Activer le mode radioamateur (HAM)", "IMPORTANT : lire la documentation Meshtastic avant d'activer."
|
||||
|
||||
[app_settings]
|
||||
title, "Paramètres de l'application", ""
|
||||
channel_list_16ths, "Largeur de la liste des canaux", ""
|
||||
node_list_16ths, "Largeur de la liste des nœuds", ""
|
||||
single_pane_mode, "Mode panneau unique", ""
|
||||
db_file_path, "Chemin du fichier de base de données", ""
|
||||
log_file_path, "Chemin du fichier journal", ""
|
||||
node_configs_file_path, "Chemin des configurations des nœuds", ""
|
||||
language, "Langue", ""
|
||||
message_prefix, "Préfixe des messages", ""
|
||||
sent_message_prefix, "Préfixe des messages envoyés", ""
|
||||
notification_symbol, "Symbole de notification", ""
|
||||
notification_sound, "Son de notification", ""
|
||||
ack_implicit_str, "ACK (implicite)", ""
|
||||
ack_str, "ACK", ""
|
||||
nak_str, "NAK", ""
|
||||
ack_unknown_str, "ACK (inconnu)", ""
|
||||
node_sort, "Tri des nœuds", ""
|
||||
theme, "Thème", ""
|
||||
ping_bot, "Bot Ping", ""
|
||||
|
||||
[app_settings.ping_bot]
|
||||
title, "Bot Ping", ""
|
||||
catch_words, "Mots déclencheurs", "Mots déclencheurs du bot séparés par des points-virgules."
|
||||
response_word, "Mot de réponse", "Mot de réponse du bot."
|
||||
|
||||
[config.device]
|
||||
title, "Appareil", ""
|
||||
role, "Rôle", ""
|
||||
serial_enabled, "Activer la console série", ""
|
||||
button_gpio, "GPIO bouton", ""
|
||||
buzzer_gpio, "GPIO buzzer", ""
|
||||
rebroadcast_mode, "Mode de rediffusion", ""
|
||||
node_info_broadcast_secs, "Intervalle diffusion infos nœud", ""
|
||||
double_tap_as_button_press, "Double tap = bouton", ""
|
||||
is_managed, "Activer mode géré", ""
|
||||
disable_triple_click, "Désactiver triple clic", ""
|
||||
tzdef, "Fuseau horaire", ""
|
||||
led_heartbeat_disabled, "Désactiver LED heartbeat", ""
|
||||
buzzer_mode, "Mode buzzer", ""
|
||||
|
||||
[config.network]
|
||||
title, "Réseau", ""
|
||||
wifi_enabled, "Wi-Fi activé", ""
|
||||
wifi_ssid, "SSID Wi-Fi", ""
|
||||
wifi_psk, "Mot de passe Wi-Fi", ""
|
||||
ntp_server, "Serveur NTP", ""
|
||||
eth_enabled, "Ethernet activé", ""
|
||||
address_mode, "Mode IPv4", ""
|
||||
ip, "Adresse IP", ""
|
||||
gateway, "Passerelle", ""
|
||||
subnet, "Sous-réseau", ""
|
||||
dns, "DNS", ""
|
||||
|
||||
[config.display]
|
||||
title, "Affichage", ""
|
||||
screen_on_secs, "Durée écran actif", ""
|
||||
gps_format, "Format GPS", ""
|
||||
auto_screen_carousel_secs, "Intervalle carrousel", ""
|
||||
compass_north_top, "Toujours nord en haut", ""
|
||||
flip_screen, "Retourner écran", ""
|
||||
units, "Unités préférées", ""
|
||||
|
||||
[config.bluetooth]
|
||||
title, "Bluetooth", ""
|
||||
enabled, "Activé", ""
|
||||
mode, "Mode d'appairage", ""
|
||||
fixed_pin, "Code PIN fixe", ""
|
||||
|
||||
[module.mqtt]
|
||||
title, "MQTT", ""
|
||||
enabled, "Activé", ""
|
||||
address, "Adresse serveur", ""
|
||||
username, "Nom d'utilisateur", ""
|
||||
password, "Mot de passe", ""
|
||||
encryption_enabled, "Chiffrement activé", ""
|
||||
json_enabled, "JSON activé", ""
|
||||
tls_enabled, "TLS activé", ""
|
||||
|
||||
[module.serial]
|
||||
title, "Série", ""
|
||||
enabled, "Activé", ""
|
||||
echo, "Écho", ""
|
||||
rxd, "GPIO réception", ""
|
||||
txd, "GPIO transmission", ""
|
||||
baud, "Débit en bauds", ""
|
||||
timeout, "Délai", ""
|
||||
|
||||
[module.telemetry]
|
||||
title, "Télémétrie", ""
|
||||
device_update_interval, "Intervalle métriques appareil", ""
|
||||
environment_update_interval, "Intervalle métriques environnement", ""
|
||||
environment_measurement_enabled, "Télémétrie environnement activée", ""
|
||||
|
||||
[module.audio]
|
||||
title, "Audio", ""
|
||||
codec2_enabled, "Activé", ""
|
||||
ptt_pin, "GPIO PTT", ""
|
||||
bitrate, "Débit audio", ""
|
||||
|
||||
[module.remote_hardware]
|
||||
title, "Matériel distant", ""
|
||||
enabled, "Activé", ""
|
||||
available_pins, "Broches disponibles", ""
|
||||
|
||||
[module.ambient_lighting]
|
||||
title, "Éclairage ambiant", ""
|
||||
led_state, "État LED", ""
|
||||
current, "Courant", ""
|
||||
red, "Rouge", ""
|
||||
green, "Vert", ""
|
||||
blue, "Bleu", ""
|
||||
@@ -78,6 +78,7 @@ help.traceroute, "Ctrl+T или F4 = Traceroute", ""
|
||||
help.node_info, "F5 = Полная информация об узле", ""
|
||||
help.archive_chat, "Ctrl+D = Архив чата / удалить узел", ""
|
||||
help.favorite, "Ctrl+F = Избранное", ""
|
||||
help.bot_responder, "Ctrl+B = Вкл/выкл автоответчик", ""
|
||||
help.ignore, "Ctrl+G = Игнорировать", ""
|
||||
help.search, "Ctrl+/ или / = Поиск", ""
|
||||
help.help, "Ctrl+K = Справка", ""
|
||||
@@ -90,6 +91,11 @@ confirm.remove_ignored, "Убрать {name} из игнорируемых?", ""
|
||||
confirm.region_unset, "Ваш регион НЕ ЗАДАН. Установить сейчас?", ""
|
||||
dialog.resize_title, "Увеличьте окно", ""
|
||||
dialog.resize_body, "Пожалуйста, увеличьте окно до {rows} строк.", ""
|
||||
bot.status.enabled, "Включен", ""
|
||||
bot.status.disabled, "Выключен", ""
|
||||
bot.dialog.title, "Автоответчик", ""
|
||||
bot.dialog.body, "Автоответчик теперь {status}.", ""
|
||||
bot.status.message, "Автоответчик теперь {status}.", ""
|
||||
|
||||
[User Settings]
|
||||
user, "Пользователь"
|
||||
@@ -116,10 +122,16 @@ nak_str, "NAK", ""
|
||||
ack_unknown_str, "ACK (неизвестный)", ""
|
||||
node_sort, "Сортировка нод", ""
|
||||
theme, "Тема", ""
|
||||
ping_bot, "Пинг-бот", ""
|
||||
COLOR_CONFIG_DARK, "Цвета темы (темная)", ""
|
||||
COLOR_CONFIG_LIGHT, "Цвета темы (светлая)", ""
|
||||
COLOR_CONFIG_GREEN, "Цвета темы (зеленая)", ""
|
||||
|
||||
[app_settings.ping_bot]
|
||||
title, "Пинг-бот", ""
|
||||
catch_words, "Слова-триггеры", "Слова для активации бота, разделенные точкой с запятой."
|
||||
response_word, "Ответное слово", "Ответное слово бота."
|
||||
|
||||
[app_settings.color_config]
|
||||
default, "По умолчанию", ""
|
||||
background, "Фон", ""
|
||||
|
||||
@@ -0,0 +1,87 @@
|
||||
# A basic auto-responder bot that replies to specific messages when bot mode is enabled.
|
||||
import logging
|
||||
import threading
|
||||
import time
|
||||
from typing import Any, Dict
|
||||
|
||||
import contact.ui.default_config as config
|
||||
from contact.utilities.singleton import app_state, interface_state, ui_state
|
||||
from contact.message_handlers.tx_handler import send_message
|
||||
|
||||
BOT_RESPONSE_DELAY_SECONDS = 2.3
|
||||
|
||||
def _get_bot_catch_words() -> set[str]:
|
||||
"""Return normalized bot trigger words from app settings."""
|
||||
raw_words = getattr(config, "ping_bot_catch_words", "ping; test")
|
||||
words = {
|
||||
word.strip().casefold()
|
||||
for word in raw_words.replace(";", ",").split(",")
|
||||
if word.strip()
|
||||
}
|
||||
return words or {"ping"}
|
||||
|
||||
def is_bot_message(message: str) -> bool:
|
||||
"""Return True when the incoming message should trigger an automatic response."""
|
||||
return message.strip().casefold() in _get_bot_catch_words()
|
||||
|
||||
def bot_respond(packet: Dict[str, Any], message: str, send_channel: int) -> bool:
|
||||
"""Send a basic response when bot mode is enabled."""
|
||||
if not ui_state.bot_mode_enabled:
|
||||
return False
|
||||
|
||||
if not is_bot_message(message):
|
||||
""" Only respond to specific messages. """
|
||||
return False
|
||||
|
||||
from_node = packet.get("from")
|
||||
if from_node is None:
|
||||
return False
|
||||
if from_node == interface_state.myNodeNum:
|
||||
return False
|
||||
snr = packet.get('rxSnr', -128)
|
||||
rssi = packet.get('rxRssi', -128)
|
||||
replyIDset = packet.get('replyId', False)
|
||||
hop_start = packet.get('hopStart', 0)
|
||||
hop_limit = packet.get('hopLimit', 0)
|
||||
transport_type = packet.get('transportMechanism', None)
|
||||
hops = hop_start - hop_limit
|
||||
|
||||
details = []
|
||||
if snr != -128:
|
||||
details.append(f"SNR: {snr}")
|
||||
if rssi != -128:
|
||||
details.append(f"RSSI: {rssi}")
|
||||
if hops != 0:
|
||||
details.append(f"Hops: {hops}")
|
||||
if replyIDset:
|
||||
details.append(f"Relay: {replyIDset}")
|
||||
transport_text = str(transport_type).upper() if transport_type is not None else ""
|
||||
for transport_name in ("UDP", "MQTT"):
|
||||
if transport_name in transport_text:
|
||||
details.append(f"Via: {transport_name}")
|
||||
|
||||
response_data_string = getattr(config, "ping_bot_response_word", "Pong!")
|
||||
if details:
|
||||
response_data_string += f" {', '.join(details)}"
|
||||
|
||||
def send_response_delayed() -> None:
|
||||
try:
|
||||
time.sleep(BOT_RESPONSE_DELAY_SECONDS)
|
||||
|
||||
with app_state.lock:
|
||||
if not ui_state.bot_mode_enabled:
|
||||
return
|
||||
|
||||
send_message(response_data_string,channel=send_channel)
|
||||
|
||||
# Import locally to avoid circular import at module import time.
|
||||
from contact.ui.contact_ui import request_ui_redraw
|
||||
|
||||
request_ui_redraw(channels=True, messages=True, scroll_messages_to_bottom=True)
|
||||
logging.info("Bot response sent to %s on channel index %s", from_node, send_channel)
|
||||
except Exception:
|
||||
logging.exception("Bot response send failed for destination %s", from_node)
|
||||
|
||||
threading.Thread(target=send_response_delayed, name="bot-response", daemon=True).start()
|
||||
|
||||
return True
|
||||
@@ -60,6 +60,7 @@ from contact.utilities.db_handler import (
|
||||
import contact.ui.default_config as config
|
||||
|
||||
from contact.utilities.singleton import ui_state, interface_state, app_state, menu_state
|
||||
from contact.message_handlers.bot_handler import bot_respond
|
||||
|
||||
|
||||
def play_sound():
|
||||
@@ -168,6 +169,8 @@ def on_receive(packet: Dict[str, Any], interface: Any) -> None:
|
||||
|
||||
channel_number = ui_state.channel_list.index(packet["from"])
|
||||
|
||||
bot_respond(packet, message_string, channel_number)
|
||||
|
||||
channel_id = ui_state.channel_list[channel_number]
|
||||
|
||||
if channel_id != ui_state.channel_list[ui_state.selected_channel]:
|
||||
|
||||
+108
-56
@@ -2,9 +2,10 @@ import curses
|
||||
import logging
|
||||
import time
|
||||
import traceback
|
||||
from numbers import Real
|
||||
from typing import Union
|
||||
|
||||
from contact.utilities.utils import get_channels, get_readable_duration, get_time_ago, refresh_node_list
|
||||
from contact.utilities.utils import get_channels, get_readable_duration, get_time_ago, refresh_node_list, add_new_message
|
||||
from contact.settings import settings_menu
|
||||
from contact.message_handlers.tx_handler import send_message, send_traceroute
|
||||
from contact.utilities.utils import parse_protobuf
|
||||
@@ -445,6 +446,9 @@ def main_ui(stdscr: curses.window) -> None:
|
||||
elif char == chr(6): # Ctrl + F to toggle favorite
|
||||
handle_ctrl_f(stdscr)
|
||||
|
||||
elif char == chr(2): # Ctrl + B to toggle bot responder
|
||||
handle_ctrl_b(stdscr)
|
||||
|
||||
elif char == chr(7): # Ctrl + G to toggle ignored
|
||||
handle_ctlr_g(stdscr)
|
||||
|
||||
@@ -656,24 +660,27 @@ def handle_f5_key(stdscr: curses.window) -> None:
|
||||
if has_coords:
|
||||
message_parts.append(f"https://maps.google.com/?q={pos['latitude']:.4f},{pos['longitude']:.4f}")
|
||||
|
||||
if any(key in node for key in ["snr", "hopsAway", "lastHeard"]):
|
||||
if any(node.get(key) is not None for key in ["snr", "hopsAway", "lastHeard"]):
|
||||
message_parts.append("")
|
||||
message_parts.append("**🌐 Network Metrics:**")
|
||||
|
||||
if "snr" in node:
|
||||
if node.get("snr") is not None:
|
||||
snr = node["snr"]
|
||||
snr_status = (
|
||||
"🟢 Excellent"
|
||||
if snr > 10
|
||||
else (
|
||||
"🟡 Good"
|
||||
if snr > 3
|
||||
else "🟠 Fair" if snr > -10 else "🔴 Poor" if snr > -20 else "💀 Very Poor"
|
||||
if isinstance(snr, Real):
|
||||
snr_status = (
|
||||
"🟢 Excellent"
|
||||
if snr > 10
|
||||
else (
|
||||
"🟡 Good"
|
||||
if snr > 3
|
||||
else "🟠 Fair" if snr > -10 else "🔴 Poor" if snr > -20 else "💀 Very Poor"
|
||||
)
|
||||
)
|
||||
)
|
||||
message_parts.append(f"• SNR: {snr}dB {snr_status}")
|
||||
message_parts.append(f"• SNR: {snr}dB {snr_status}")
|
||||
else:
|
||||
message_parts.append(f"• SNR: {snr}dB")
|
||||
|
||||
if "hopsAway" in node:
|
||||
if node.get("hopsAway") is not None:
|
||||
hops = node["hopsAway"]
|
||||
hop_emoji = "📡" if hops == 0 else "🔄" if hops == 1 else "⏩"
|
||||
message_parts.append(f"• Hops away: {hop_emoji} {hops}")
|
||||
@@ -686,24 +693,32 @@ def handle_f5_key(stdscr: curses.window) -> None:
|
||||
message_parts.append("")
|
||||
message_parts.append("**📊 Device Metrics:**")
|
||||
|
||||
if "batteryLevel" in metrics:
|
||||
if metrics.get("batteryLevel") is not None:
|
||||
battery = metrics["batteryLevel"]
|
||||
battery_emoji = "🟢" if battery > 50 else "🟡" if battery > 20 else "🔴"
|
||||
battery_emoji = "🔴"
|
||||
if isinstance(battery, Real):
|
||||
battery_emoji = "🟢" if battery > 50 else "🟡" if battery > 20 else "🔴"
|
||||
voltage_info = f" ({metrics['voltage']}v)" if "voltage" in metrics else ""
|
||||
message_parts.append(f"• Battery: {battery_emoji} {battery}%{voltage_info}")
|
||||
|
||||
if "uptimeSeconds" in metrics:
|
||||
if metrics.get("uptimeSeconds") is not None:
|
||||
message_parts.append(f"• Uptime: ⏱️ {get_readable_duration(metrics['uptimeSeconds'])}")
|
||||
|
||||
if "channelUtilization" in metrics:
|
||||
if metrics.get("channelUtilization") is not None:
|
||||
util = metrics["channelUtilization"]
|
||||
util_emoji = "🔴" if util > 80 else "🟡" if util > 50 else "🟢"
|
||||
message_parts.append(f"• Channel utilization: {util_emoji} {util:.2f}%")
|
||||
if isinstance(util, Real):
|
||||
util_emoji = "🔴" if util > 80 else "🟡" if util > 50 else "🟢"
|
||||
message_parts.append(f"• Channel utilization: {util_emoji} {util:.2f}%")
|
||||
else:
|
||||
message_parts.append(f"• Channel utilization: {util}%")
|
||||
|
||||
if "airUtilTx" in metrics:
|
||||
if metrics.get("airUtilTx") is not None:
|
||||
air_util = metrics["airUtilTx"]
|
||||
air_emoji = "🔴" if air_util > 80 else "🟡" if air_util > 50 else "🟢"
|
||||
message_parts.append(f"• Air utilization TX: {air_emoji} {air_util:.2f}%")
|
||||
if isinstance(air_util, Real):
|
||||
air_emoji = "🔴" if air_util > 80 else "🟡" if air_util > 50 else "🟢"
|
||||
message_parts.append(f"• Air utilization TX: {air_emoji} {air_util:.2f}%")
|
||||
else:
|
||||
message_parts.append(f"• Air utilization TX: {air_util}%")
|
||||
|
||||
title = t(
|
||||
"ui.dialog.node_details_title",
|
||||
@@ -789,7 +804,10 @@ def handle_f5_key(stdscr: curses.window) -> None:
|
||||
curses.doupdate()
|
||||
|
||||
dialog_win.timeout(200)
|
||||
char = dialog_win.getch()
|
||||
try:
|
||||
char = dialog_win.getch()
|
||||
except curses.error:
|
||||
continue
|
||||
|
||||
if menu_state.need_redraw:
|
||||
menu_state.need_redraw = False
|
||||
@@ -818,7 +836,7 @@ def handle_f5_key(stdscr: curses.window) -> None:
|
||||
elif char == curses.KEY_RESIZE:
|
||||
continue
|
||||
|
||||
except KeyError:
|
||||
except (IndexError, KeyError):
|
||||
return
|
||||
finally:
|
||||
if dialog_win is not None:
|
||||
@@ -919,6 +937,7 @@ def handle_ctrl_k(stdscr: curses.window) -> None:
|
||||
t("ui.help.node_info", default="F5 = Full node info"),
|
||||
t("ui.help.archive_chat", default="Ctrl+D = Archive chat / remove node"),
|
||||
t("ui.help.favorite", default="Ctrl+F = Favorite"),
|
||||
t("ui.help.bot_responder", default="Ctrl+B = Toggle Bot Responder"),
|
||||
t("ui.help.ignore", default="Ctrl+G = Ignore"),
|
||||
t("ui.help.search", default="Ctrl+/ = Search"),
|
||||
t("ui.help.help", default="Ctrl+K = Help"),
|
||||
@@ -930,6 +949,32 @@ def handle_ctrl_k(stdscr: curses.window) -> None:
|
||||
handle_resize(stdscr, False)
|
||||
|
||||
|
||||
def handle_ctrl_b(stdscr: curses.window) -> None:
|
||||
"""Handle Ctrl + B key events to toggle automatic bot responses."""
|
||||
ui_state.bot_mode_enabled = not ui_state.bot_mode_enabled
|
||||
status = t("ui.bot.status.enabled", default="Enabled") if ui_state.bot_mode_enabled else t(
|
||||
"ui.bot.status.disabled", default="Disabled"
|
||||
)
|
||||
|
||||
curses.curs_set(0)
|
||||
contact.ui.dialog.dialog(
|
||||
t("ui.bot.dialog.title", default="Bot Responder"),
|
||||
t("ui.bot.dialog.body", default="Bot responder is now {status}.", status=status),
|
||||
)
|
||||
|
||||
if ui_state.channel_list:
|
||||
channel_id = ui_state.channel_list[ui_state.selected_channel]
|
||||
add_new_message(
|
||||
channel_id,
|
||||
f"{config.message_prefix} Info: ",
|
||||
t("ui.bot.status.message", default="Bot responder is now {status}.", status=status.lower()),
|
||||
)
|
||||
draw_messages_window(True)
|
||||
|
||||
curses.curs_set(1)
|
||||
handle_resize(stdscr, False)
|
||||
|
||||
|
||||
def handle_ctrl_d() -> None:
|
||||
if ui_state.current_window == 0:
|
||||
if isinstance(ui_state.channel_list[ui_state.selected_channel], int):
|
||||
@@ -1355,41 +1400,48 @@ def search(win: int) -> None:
|
||||
|
||||
search_text = ""
|
||||
entry_win.erase()
|
||||
entry_win.timeout(-1)
|
||||
|
||||
while True:
|
||||
draw_centered_text_field(entry_win, f"Search: {search_text}", 0, get_color("input"))
|
||||
char = entry_win.get_wch()
|
||||
|
||||
if char in (chr(27), chr(curses.KEY_ENTER), chr(10), chr(13)):
|
||||
break
|
||||
elif char == "\t":
|
||||
start_idx = ui_state.selected_node + 1 if win == 2 else ui_state.selected_channel + 1
|
||||
elif char in (curses.KEY_BACKSPACE, chr(127)):
|
||||
if search_text:
|
||||
search_text = search_text[:-1]
|
||||
y, x = entry_win.getyx()
|
||||
entry_win.move(y, x - 1)
|
||||
entry_win.addch(" ") #
|
||||
entry_win.move(y, x - 1)
|
||||
entry_win.erase()
|
||||
entry_win.refresh()
|
||||
elif isinstance(char, str):
|
||||
search_text += char
|
||||
|
||||
search_text_caseless = search_text.casefold()
|
||||
|
||||
l = ui_state.node_list if win == 2 else ui_state.channel_list
|
||||
for i, n in enumerate(l[start_idx:] + l[:start_idx]):
|
||||
if (
|
||||
isinstance(n, int)
|
||||
and search_text_caseless in get_name_from_database(n, "long").casefold()
|
||||
or isinstance(n, int)
|
||||
and search_text_caseless in get_name_from_database(n, "short").casefold()
|
||||
or search_text_caseless in str(n).casefold()
|
||||
):
|
||||
select_func((i + start_idx) % len(l))
|
||||
try:
|
||||
while True:
|
||||
draw_centered_text_field(entry_win, f"Search: {search_text}", 0, get_color("input"))
|
||||
try:
|
||||
char = entry_win.get_wch()
|
||||
except curses.error:
|
||||
break
|
||||
|
||||
if char in (chr(27), chr(curses.KEY_ENTER), chr(10), chr(13)):
|
||||
break
|
||||
elif char == "\t":
|
||||
start_idx = ui_state.selected_node + 1 if win == 2 else ui_state.selected_channel + 1
|
||||
elif char in (curses.KEY_BACKSPACE, chr(127)):
|
||||
if search_text:
|
||||
search_text = search_text[:-1]
|
||||
y, x = entry_win.getyx()
|
||||
entry_win.move(y, x - 1)
|
||||
entry_win.addch(" ") #
|
||||
entry_win.move(y, x - 1)
|
||||
entry_win.erase()
|
||||
entry_win.refresh()
|
||||
elif isinstance(char, str):
|
||||
search_text += char
|
||||
|
||||
search_text_caseless = search_text.casefold()
|
||||
|
||||
l = ui_state.node_list if win == 2 else ui_state.channel_list
|
||||
for i, n in enumerate(l[start_idx:] + l[:start_idx]):
|
||||
if (
|
||||
isinstance(n, int)
|
||||
and search_text_caseless in get_name_from_database(n, "long").casefold()
|
||||
or isinstance(n, int)
|
||||
and search_text_caseless in get_name_from_database(n, "short").casefold()
|
||||
or search_text_caseless in str(n).casefold()
|
||||
):
|
||||
select_func((i + start_idx) % len(l))
|
||||
break
|
||||
finally:
|
||||
entry_win.timeout(200)
|
||||
|
||||
entry_win.erase()
|
||||
|
||||
|
||||
|
||||
@@ -56,9 +56,13 @@ def _get_config_root(preferred_dir: str, fallback_name: str = ".contact_client")
|
||||
|
||||
return fallback_dir
|
||||
|
||||
|
||||
# Pick the root now.
|
||||
config_root = _get_config_root(parent_dir)
|
||||
# Allow overriding config root via environment variable
|
||||
config_root = os.getenv("CONTACT_CONFIG_ROOT")
|
||||
if config_root:
|
||||
if not _is_writable_dir(config_root):
|
||||
raise RuntimeError(f"CONTACT_CONFIG_ROOT={config_root} is not writable")
|
||||
else:
|
||||
config_root = _get_config_root(parent_dir)
|
||||
|
||||
# Paths (derived from the chosen root)
|
||||
json_file_path = os.path.join(config_root, "config.json")
|
||||
@@ -238,6 +242,10 @@ def initialize_config() -> Dict[str, object]:
|
||||
"ack_unknown_str": "[…]",
|
||||
"node_sort": "lastHeard",
|
||||
"theme": "dark",
|
||||
"ping_bot": {
|
||||
"catch_words": "ping; test",
|
||||
"response_word": "Pong!",
|
||||
},
|
||||
"COLOR_CONFIG_DARK": COLOR_CONFIG_DARK,
|
||||
"COLOR_CONFIG_LIGHT": COLOR_CONFIG_LIGHT,
|
||||
"COLOR_CONFIG_GREEN": COLOR_CONFIG_GREEN,
|
||||
@@ -272,7 +280,7 @@ def assign_config_variables(loaded_config: Dict[str, object]) -> None:
|
||||
global notification_symbol, ack_implicit_str, ack_str, nak_str, ack_unknown_str
|
||||
global node_list_16ths, channel_list_16ths, single_pane_mode
|
||||
global theme, COLOR_CONFIG, language
|
||||
global node_sort, notification_sound
|
||||
global node_sort, notification_sound, ping_bot_catch_words, ping_bot_response_word
|
||||
|
||||
channel_list_16ths = loaded_config["channel_list_16ths"]
|
||||
node_list_16ths = loaded_config["node_list_16ths"]
|
||||
@@ -291,6 +299,9 @@ def assign_config_variables(loaded_config: Dict[str, object]) -> None:
|
||||
ack_unknown_str = loaded_config["ack_unknown_str"]
|
||||
node_sort = loaded_config["node_sort"]
|
||||
theme = loaded_config["theme"]
|
||||
ping_bot = loaded_config.get("ping_bot", {})
|
||||
ping_bot_catch_words = ping_bot.get("catch_words", "ping; test")
|
||||
ping_bot_response_word = ping_bot.get("response_word", "Pong!")
|
||||
if theme == "dark":
|
||||
COLOR_CONFIG = loaded_config["COLOR_CONFIG_DARK"]
|
||||
elif theme == "light":
|
||||
|
||||
@@ -2,7 +2,7 @@ import curses
|
||||
|
||||
from contact.utilities.i18n import t_text
|
||||
from contact.ui.colors import get_color
|
||||
from contact.ui.nav_utils import draw_main_arrows
|
||||
from contact.ui.nav_utils import draw_main_arrows, slice_to_width, text_width
|
||||
from contact.utilities.singleton import menu_state, ui_state
|
||||
|
||||
|
||||
@@ -19,10 +19,10 @@ def dialog(title: str, message: str) -> None:
|
||||
|
||||
# Parse message into lines and calculate dimensions
|
||||
message_lines = message.splitlines() or [""]
|
||||
max_line_length = max(len(l) for l in message_lines)
|
||||
max_line_length = max(text_width(l) for l in message_lines)
|
||||
|
||||
# Desired size
|
||||
dialog_width = max(len(title) + 4, max_line_length + 4)
|
||||
dialog_width = max(text_width(title) + 4, max_line_length + 4)
|
||||
desired_height = len(message_lines) + 4
|
||||
|
||||
# Clamp dialog size to the screen (leave a 1-cell margin if possible)
|
||||
@@ -61,7 +61,7 @@ def dialog(title: str, message: str) -> None:
|
||||
|
||||
# Title
|
||||
try:
|
||||
win.addstr(0, 2, title[: max(0, dialog_width - 4)], get_color("settings_default"))
|
||||
win.addstr(0, 2, slice_to_width(title, max(0, dialog_width - 4)), get_color("settings_default"))
|
||||
except curses.error:
|
||||
pass
|
||||
|
||||
@@ -80,9 +80,8 @@ def dialog(title: str, message: str) -> None:
|
||||
if idx >= len(message_lines):
|
||||
break
|
||||
line = message_lines[idx]
|
||||
# Hard-trim lines that don't fit
|
||||
trimmed = line[: max(0, dialog_width - 6)]
|
||||
msg_x = max(0, ((dialog_width - 2) - len(trimmed)) // 2)
|
||||
trimmed = slice_to_width(line, max(0, dialog_width - 4))
|
||||
msg_x = max(0, ((dialog_width - 2) - text_width(trimmed)) // 2)
|
||||
try:
|
||||
msg_win.addstr(1 + i, msg_x, trimmed, get_color("settings_default"))
|
||||
except curses.error:
|
||||
|
||||
@@ -27,6 +27,7 @@ class ChatUIState:
|
||||
current_window: int = 0
|
||||
last_sent_time: float = 0.0
|
||||
last_traceroute_time: float = 0.0
|
||||
bot_mode_enabled: bool = False
|
||||
|
||||
selected_index: int = 0
|
||||
start_index: List[int] = field(default_factory=lambda: [0, 0, 0])
|
||||
|
||||
@@ -309,7 +309,10 @@ def display_menu() -> tuple[Any, Any, List[str]]:
|
||||
else:
|
||||
display_key = key
|
||||
display_key = f"{display_key}"[: w // 2 - 2]
|
||||
display_value = f"{value}"[: w // 2 - 8]
|
||||
if isinstance(value, dict) or (isinstance(value, list) and len(value) != 2):
|
||||
display_value = ">"
|
||||
else:
|
||||
display_value = f"{value}"[: w // 2 - 8]
|
||||
|
||||
color = get_color("settings_default", reverse=(idx == menu_state.selected_index))
|
||||
menu_pad.addstr(idx, 0, f"{display_key:<{w // 2 - 2}} {display_value}".ljust(w - 8), color)
|
||||
|
||||
@@ -31,7 +31,8 @@ def save_message_to_db(channel: str, user_id: str, message_text: str) -> Optiona
|
||||
"""
|
||||
ensure_table_exists(quoted_table_name, schema)
|
||||
|
||||
with sqlite3.connect(config.db_file_path) as db_connection:
|
||||
with sqlite3.connect(config.db_file_path, timeout=10.0) as db_connection:
|
||||
db_connection.execute("PRAGMA busy_timeout=10000")
|
||||
db_cursor = db_connection.cursor()
|
||||
timestamp = int(time.time())
|
||||
|
||||
@@ -53,7 +54,8 @@ def save_message_to_db(channel: str, user_id: str, message_text: str) -> Optiona
|
||||
|
||||
def update_ack_nak(channel: str, timestamp: int, message: str, ack: str) -> None:
|
||||
try:
|
||||
with sqlite3.connect(config.db_file_path) as db_connection:
|
||||
with sqlite3.connect(config.db_file_path, timeout=10.0) as db_connection:
|
||||
db_connection.execute("PRAGMA busy_timeout=10000")
|
||||
db_cursor = db_connection.cursor()
|
||||
update_query = f"""
|
||||
UPDATE {get_table_name(channel)}
|
||||
@@ -76,7 +78,8 @@ def update_ack_nak(channel: str, timestamp: int, message: str, ack: str) -> None
|
||||
def load_messages_from_db() -> None:
|
||||
"""Load messages from the database for all channels and update ui_state.all_messages and ui_state.channel_list."""
|
||||
try:
|
||||
with sqlite3.connect(config.db_file_path) as db_connection:
|
||||
with sqlite3.connect(config.db_file_path, timeout=10.0) as db_connection:
|
||||
db_connection.execute("PRAGMA busy_timeout=10000")
|
||||
db_cursor = db_connection.cursor()
|
||||
|
||||
query = "SELECT name FROM sqlite_master WHERE type='table' AND name LIKE ?"
|
||||
@@ -92,6 +95,7 @@ def load_messages_from_db() -> None:
|
||||
if "ack_type" not in table_columns:
|
||||
update_table_query = f"ALTER TABLE {quoted_table_name} ADD COLUMN ack_type TEXT"
|
||||
db_cursor.execute(update_table_query)
|
||||
db_connection.commit()
|
||||
|
||||
query = f"SELECT user_id, message_text, timestamp, ack_type FROM {quoted_table_name}"
|
||||
|
||||
@@ -228,7 +232,8 @@ def update_node_info_in_db(
|
||||
try:
|
||||
ensure_node_table_exists() # Ensure the table exists before any operation
|
||||
|
||||
with sqlite3.connect(config.db_file_path) as db_connection:
|
||||
with sqlite3.connect(config.db_file_path, timeout=10.0) as db_connection:
|
||||
db_connection.execute("PRAGMA busy_timeout=10000")
|
||||
db_cursor = db_connection.cursor()
|
||||
table_name = f'"{interface_state.myNodeNum}_nodedb"' # Quote in case of numeric names
|
||||
|
||||
@@ -236,6 +241,7 @@ def update_node_info_in_db(
|
||||
if "chat_archived" not in table_columns:
|
||||
update_table_query = f"ALTER TABLE {table_name} ADD COLUMN chat_archived INTEGER"
|
||||
db_cursor.execute(update_table_query)
|
||||
db_connection.commit()
|
||||
|
||||
# Fetch existing values to preserve unchanged fields
|
||||
db_cursor.execute(f"SELECT * FROM {table_name} WHERE user_id = ?", (user_id,))
|
||||
@@ -311,7 +317,8 @@ def ensure_node_table_exists() -> None:
|
||||
def ensure_table_exists(table_name: str, schema: str) -> None:
|
||||
"""Ensure the given table exists in the database."""
|
||||
try:
|
||||
with sqlite3.connect(config.db_file_path) as db_connection:
|
||||
with sqlite3.connect(config.db_file_path, timeout=10.0) as db_connection:
|
||||
db_connection.execute("PRAGMA busy_timeout=10000")
|
||||
db_cursor = db_connection.cursor()
|
||||
create_table_query = f"CREATE TABLE IF NOT EXISTS {table_name} ({schema})"
|
||||
db_cursor.execute(create_table_query)
|
||||
@@ -331,7 +338,8 @@ def get_name_from_database(user_id: int, type: str = "long") -> str:
|
||||
:return: The retrieved name or the hex of the user id
|
||||
"""
|
||||
try:
|
||||
with sqlite3.connect(config.db_file_path) as db_connection:
|
||||
with sqlite3.connect(config.db_file_path, timeout=10.0) as db_connection:
|
||||
db_connection.execute("PRAGMA busy_timeout=10000")
|
||||
db_cursor = db_connection.cursor()
|
||||
|
||||
# Construct table name
|
||||
@@ -359,7 +367,8 @@ def get_name_from_database(user_id: int, type: str = "long") -> str:
|
||||
|
||||
def is_chat_archived(user_id: int) -> int:
|
||||
try:
|
||||
with sqlite3.connect(config.db_file_path) as db_connection:
|
||||
with sqlite3.connect(config.db_file_path, timeout=10.0) as db_connection:
|
||||
db_connection.execute("PRAGMA busy_timeout=10000")
|
||||
db_cursor = db_connection.cursor()
|
||||
table_name = f"{str(interface_state.myNodeNum)}_nodedb"
|
||||
nodeinfo_table = f'"{table_name}"'
|
||||
|
||||
@@ -141,7 +141,8 @@ def seed_demo_messages() -> None:
|
||||
ack_type TEXT
|
||||
"""
|
||||
|
||||
with sqlite3.connect(config.db_file_path) as db_connection:
|
||||
with sqlite3.connect(config.db_file_path, timeout=10.0) as db_connection:
|
||||
db_connection.execute("PRAGMA busy_timeout=10000")
|
||||
cursor = db_connection.cursor()
|
||||
|
||||
for channel_name, rows in _demo_messages().items():
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
[project]
|
||||
name = "contact"
|
||||
version = "1.5.5"
|
||||
version = "1.5.8"
|
||||
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"}
|
||||
|
||||
@@ -0,0 +1,31 @@
|
||||
import unittest
|
||||
import importlib
|
||||
import sys
|
||||
import types
|
||||
from unittest import mock
|
||||
|
||||
import contact.ui.default_config as config
|
||||
|
||||
|
||||
class BotHandlerTests(unittest.TestCase):
|
||||
@classmethod
|
||||
def setUpClass(cls) -> None:
|
||||
sys.modules.setdefault(
|
||||
"contact.message_handlers.tx_handler",
|
||||
types.SimpleNamespace(send_message=mock.Mock()),
|
||||
)
|
||||
cls.bot_handler = importlib.import_module("contact.message_handlers.bot_handler")
|
||||
|
||||
def test_is_bot_message_uses_configured_catch_words(self) -> None:
|
||||
with mock.patch.object(config, "ping_bot_catch_words", "ping; test; pong"):
|
||||
self.assertTrue(self.bot_handler.is_bot_message("PING"))
|
||||
self.assertTrue(self.bot_handler.is_bot_message("test"))
|
||||
self.assertFalse(self.bot_handler.is_bot_message("hello"))
|
||||
|
||||
def test_is_bot_message_ignores_empty_config_values(self) -> None:
|
||||
with mock.patch.object(config, "ping_bot_catch_words", " ; ; "):
|
||||
self.assertTrue(self.bot_handler.is_bot_message("ping"))
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
unittest.main()
|
||||
@@ -200,3 +200,103 @@ class ContactUiTests(unittest.TestCase):
|
||||
contact_ui.refresh_pad(1)
|
||||
|
||||
contact_ui.messages_win.addstr.assert_called_once_with(0, 2, " Primary ", contact_ui.curses.A_BOLD)
|
||||
|
||||
def test_search_ignores_no_input_from_curses(self) -> None:
|
||||
ui_state.node_list = [101]
|
||||
ui_state.selected_node = 0
|
||||
contact_ui.entry_win = mock.Mock()
|
||||
contact_ui.entry_win.get_wch.side_effect = contact_ui.curses.error("no input")
|
||||
|
||||
with mock.patch.object(contact_ui, "draw_centered_text_field"):
|
||||
with mock.patch.object(contact_ui, "get_color", return_value=0):
|
||||
contact_ui.search(2)
|
||||
|
||||
contact_ui.entry_win.timeout.assert_has_calls([mock.call(-1), mock.call(200)])
|
||||
contact_ui.entry_win.erase.assert_called()
|
||||
|
||||
def test_f5_node_details_ignores_no_input_from_curses(self) -> None:
|
||||
stdscr = mock.Mock()
|
||||
ui_state.node_list = [101]
|
||||
ui_state.selected_node = 0
|
||||
ui_state.current_window = 2
|
||||
|
||||
dialog_win = mock.Mock()
|
||||
dialog_win.getch.side_effect = [contact_ui.curses.error("no input"), 27]
|
||||
msg_win = mock.Mock()
|
||||
dialog_win.derwin.return_value = msg_win
|
||||
|
||||
interface = mock.Mock()
|
||||
interface.nodesByNum = {
|
||||
101: {
|
||||
"num": 101,
|
||||
"user": {
|
||||
"longName": "Test Node",
|
||||
"shortName": "TN",
|
||||
"hwModel": "T-Beam",
|
||||
"role": "CLIENT",
|
||||
"publicKey": "abc",
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
with mock.patch("contact.ui.contact_ui.interface_state.interface", interface):
|
||||
with mock.patch.object(contact_ui.curses, "LINES", 24, create=True):
|
||||
with mock.patch.object(contact_ui.curses, "COLS", 80, create=True):
|
||||
with mock.patch.object(contact_ui.curses, "curs_set"):
|
||||
with mock.patch.object(contact_ui.curses, "update_lines_cols"):
|
||||
with mock.patch.object(contact_ui.curses, "doupdate"):
|
||||
with mock.patch.object(contact_ui.curses, "newwin", return_value=dialog_win):
|
||||
with mock.patch.object(contact_ui, "get_color", return_value=0):
|
||||
with mock.patch.object(contact_ui, "refresh_node_selection"):
|
||||
with mock.patch.object(contact_ui, "handle_resize") as handle_resize:
|
||||
contact_ui.handle_f5_key(stdscr)
|
||||
|
||||
self.assertEqual(dialog_win.getch.call_count, 2)
|
||||
handle_resize.assert_called_once_with(stdscr, False)
|
||||
|
||||
def test_f5_node_details_tolerates_none_metrics(self) -> None:
|
||||
stdscr = mock.Mock()
|
||||
ui_state.node_list = [101]
|
||||
ui_state.selected_node = 0
|
||||
ui_state.current_window = 2
|
||||
|
||||
dialog_win = mock.Mock()
|
||||
dialog_win.getch.return_value = 27
|
||||
msg_win = mock.Mock()
|
||||
dialog_win.derwin.return_value = msg_win
|
||||
|
||||
interface = mock.Mock()
|
||||
interface.nodesByNum = {
|
||||
101: {
|
||||
"num": 101,
|
||||
"snr": None,
|
||||
"hopsAway": None,
|
||||
"deviceMetrics": {
|
||||
"batteryLevel": None,
|
||||
"channelUtilization": None,
|
||||
"airUtilTx": None,
|
||||
"uptimeSeconds": None,
|
||||
},
|
||||
"user": {
|
||||
"longName": "Test Node",
|
||||
"shortName": "TN",
|
||||
"hwModel": "T-Beam",
|
||||
"role": "CLIENT",
|
||||
"publicKey": "abc",
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
with mock.patch("contact.ui.contact_ui.interface_state.interface", interface):
|
||||
with mock.patch.object(contact_ui.curses, "LINES", 24, create=True):
|
||||
with mock.patch.object(contact_ui.curses, "COLS", 80, create=True):
|
||||
with mock.patch.object(contact_ui.curses, "curs_set"):
|
||||
with mock.patch.object(contact_ui.curses, "update_lines_cols"):
|
||||
with mock.patch.object(contact_ui.curses, "doupdate"):
|
||||
with mock.patch.object(contact_ui.curses, "newwin", return_value=dialog_win):
|
||||
with mock.patch.object(contact_ui, "get_color", return_value=0):
|
||||
with mock.patch.object(contact_ui, "refresh_node_selection"):
|
||||
with mock.patch.object(contact_ui, "handle_resize") as handle_resize:
|
||||
contact_ui.handle_f5_key(stdscr)
|
||||
|
||||
handle_resize.assert_called_once_with(stdscr, False)
|
||||
|
||||
@@ -0,0 +1,88 @@
|
||||
import unittest
|
||||
from unittest import mock
|
||||
|
||||
from contact.ui import dialog as dialog_module
|
||||
from contact.utilities.singleton import menu_state, ui_state
|
||||
|
||||
|
||||
class _FakeWindow:
|
||||
def __init__(self, height: int, width: int) -> None:
|
||||
self.height = height
|
||||
self.width = width
|
||||
self.children = []
|
||||
self.added_strings = []
|
||||
self._getch_values = [10]
|
||||
|
||||
def erase(self) -> None:
|
||||
return None
|
||||
|
||||
def bkgd(self, *_args) -> None:
|
||||
return None
|
||||
|
||||
def attrset(self, *_args) -> None:
|
||||
return None
|
||||
|
||||
def border(self, *_args) -> None:
|
||||
return None
|
||||
|
||||
def addstr(self, y: int, x: int, text: str, *_args) -> None:
|
||||
self.added_strings.append((y, x, text))
|
||||
|
||||
def derwin(self, height: int, width: int, _y: int, _x: int):
|
||||
child = _FakeWindow(height, width)
|
||||
self.children.append(child)
|
||||
return child
|
||||
|
||||
def noutrefresh(self) -> None:
|
||||
return None
|
||||
|
||||
def keypad(self, *_args) -> None:
|
||||
return None
|
||||
|
||||
def timeout(self, *_args) -> None:
|
||||
return None
|
||||
|
||||
def getch(self) -> int:
|
||||
return self._getch_values.pop(0) if self._getch_values else -1
|
||||
|
||||
def refresh(self) -> None:
|
||||
return None
|
||||
|
||||
def getmaxyx(self):
|
||||
return (self.height, self.width)
|
||||
|
||||
|
||||
class DialogTests(unittest.TestCase):
|
||||
def setUp(self) -> None:
|
||||
self.previous_window = ui_state.current_window
|
||||
self.previous_start_index = list(ui_state.start_index)
|
||||
self.previous_need_redraw = menu_state.need_redraw
|
||||
|
||||
def tearDown(self) -> None:
|
||||
ui_state.current_window = self.previous_window
|
||||
ui_state.start_index = self.previous_start_index
|
||||
menu_state.need_redraw = self.previous_need_redraw
|
||||
|
||||
def test_dialog_renders_full_message_when_width_is_sufficient(self) -> None:
|
||||
root = _FakeWindow(5, 33)
|
||||
ui_state.current_window = 0
|
||||
ui_state.start_index = [0, 0, 0]
|
||||
menu_state.need_redraw = False
|
||||
|
||||
with mock.patch.object(dialog_module, "t_text", side_effect=lambda text: text):
|
||||
with mock.patch.object(dialog_module, "get_color", return_value=0):
|
||||
with mock.patch.object(dialog_module, "draw_main_arrows"):
|
||||
with mock.patch.object(dialog_module.curses, "update_lines_cols"):
|
||||
with mock.patch.object(dialog_module.curses, "doupdate"):
|
||||
with mock.patch.object(dialog_module.curses, "LINES", 24, create=True):
|
||||
with mock.patch.object(dialog_module.curses, "COLS", 80, create=True):
|
||||
with mock.patch.object(dialog_module.curses, "newwin", return_value=root):
|
||||
dialog_module.dialog("Bot Responder", "Bot responder is now Enabled.")
|
||||
|
||||
self.assertTrue(root.children)
|
||||
message_text = [text for _y, _x, text in root.children[0].added_strings]
|
||||
self.assertIn("Bot responder is now Enabled.", message_text)
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
unittest.main()
|
||||
@@ -5,6 +5,7 @@ from unittest import mock
|
||||
|
||||
import contact.ui.default_config as config
|
||||
from contact.utilities import i18n
|
||||
from contact.utilities.ini_utils import parse_ini_file
|
||||
|
||||
from tests.test_support import restore_config, snapshot_config
|
||||
|
||||
@@ -55,3 +56,20 @@ class I18nTests(unittest.TestCase):
|
||||
config.language = "ru"
|
||||
self.assertEqual(i18n.t("missing", default="fallback"), "fallback")
|
||||
self.assertEqual(parse_ini_file.call_count, 2)
|
||||
|
||||
def test_bot_ui_translation_keys_exist_in_all_locales(self) -> None:
|
||||
required_keys = {
|
||||
"ui.help.bot_responder",
|
||||
"ui.bot.status.enabled",
|
||||
"ui.bot.status.disabled",
|
||||
"ui.bot.dialog.title",
|
||||
"ui.bot.dialog.body",
|
||||
"ui.bot.status.message",
|
||||
"app_settings.ping_bot",
|
||||
"app_settings.ping_bot.catch_words",
|
||||
"app_settings.ping_bot.response_word",
|
||||
}
|
||||
|
||||
for language in config.get_localisation_options():
|
||||
field_mapping, _ = parse_ini_file(config.get_localisation_file(language))
|
||||
self.assertTrue(required_keys.issubset(field_mapping), msg=f"Missing bot translation keys in {language}")
|
||||
|
||||
Reference in New Issue
Block a user