diff --git a/.vscode/launch.json b/.vscode/launch.json index b70e770..f10e079 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -6,7 +6,7 @@ "type": "debugpy", "request": "launch", "cwd": "${workspaceFolder}", - "module": "mtcontact.main", + "module": "mcontact.main", "args": [] } ] diff --git a/mtcontact/main.py b/mtcontact/main.py index 51f6fd2..4851967 100644 --- a/mtcontact/main.py +++ b/mtcontact/main.py @@ -18,18 +18,18 @@ import logging import traceback import threading -from mtcontact.utilities.db_handler import init_nodedb, load_messages_from_db -from mtcontact.message_handlers.rx_handler import on_receive -from mtcontact.settings import set_region -from mtcontact.ui.curses_ui import main_ui -from mtcontact.ui.colors import setup_colors -from mtcontact.ui.splash import draw_splash -import mtcontact.ui.default_config as config -from mtcontact.utilities.arg_parser import setup_parser -from mtcontact.utilities.interfaces import initialize_interface -from mtcontact.utilities.input_handlers import get_list_input -from mtcontact.utilities.utils import get_channels, get_node_list, get_nodeNum -import mtcontact.globals as globals +from mcontact.utilities.db_handler import init_nodedb, load_messages_from_db +from mcontact.message_handlers.rx_handler import on_receive +from mcontact.settings import set_region +from mcontact.ui.curses_ui import main_ui +from mcontact.ui.colors import setup_colors +from mcontact.ui.splash import draw_splash +import mcontact.ui.default_config as config +from mcontact.utilities.arg_parser import setup_parser +from mcontact.utilities.interfaces import initialize_interface +from mcontact.utilities.input_handlers import get_list_input +from mcontact.utilities.utils import get_channels, get_node_list, get_nodeNum +import mcontact.globals as globals # Set ncurses compatibility settings os.environ["NCURSES_NO_UTF8_ACS"] = "1" diff --git a/mtcontact/message_handlers/rx_handler.py b/mtcontact/message_handlers/rx_handler.py index b260587..f461f62 100644 --- a/mtcontact/message_handlers/rx_handler.py +++ b/mtcontact/message_handlers/rx_handler.py @@ -1,11 +1,11 @@ import logging import time -from mtcontact.utilities.utils import refresh_node_list +from mcontact.utilities.utils import refresh_node_list from datetime import datetime -from mtcontact.ui.curses_ui import draw_packetlog_win, draw_node_list, draw_messages_window, draw_channel_list, add_notification -from mtcontact.utilities.db_handler import save_message_to_db, maybe_store_nodeinfo_in_db, get_name_from_database, update_node_info_in_db -import mtcontact.ui.default_config as config -import mtcontact.globals as globals +from mcontact.ui.curses_ui import draw_packetlog_win, draw_node_list, draw_messages_window, draw_channel_list, add_notification +from mcontact.utilities.db_handler import save_message_to_db, maybe_store_nodeinfo_in_db, get_name_from_database, update_node_info_in_db +import mcontact.ui.default_config as config +import mcontact.globals as globals from datetime import datetime diff --git a/mtcontact/message_handlers/tx_handler.py b/mtcontact/message_handlers/tx_handler.py index e0772c5..0c0cb2b 100644 --- a/mtcontact/message_handlers/tx_handler.py +++ b/mtcontact/message_handlers/tx_handler.py @@ -3,9 +3,9 @@ import google.protobuf.json_format from meshtastic import BROADCAST_NUM from meshtastic.protobuf import mesh_pb2, portnums_pb2 -from mtcontact.utilities.db_handler import save_message_to_db, update_ack_nak, get_name_from_database, is_chat_archived, update_node_info_in_db -import mtcontact.ui.default_config as config -import mtcontact.globals as globals +from mcontact.utilities.db_handler import save_message_to_db, update_ack_nak, get_name_from_database, is_chat_archived, update_node_info_in_db +import mcontact.ui.default_config as config +import mcontact.globals as globals ack_naks = {} diff --git a/mtcontact/settings.py b/mtcontact/settings.py index cf6593c..2ba7f94 100644 --- a/mtcontact/settings.py +++ b/mtcontact/settings.py @@ -5,13 +5,13 @@ import logging import sys import traceback -import mtcontact.ui.default_config as config -from mtcontact.utilities.input_handlers import get_list_input -from mtcontact.ui.colors import setup_colors -from mtcontact.ui.splash import draw_splash -from mtcontact.ui.control_ui import set_region, settings_menu -from mtcontact.utilities.arg_parser import setup_parser -from mtcontact.utilities.interfaces import initialize_interface +import mcontact.ui.default_config as config +from mcontact.utilities.input_handlers import get_list_input +from mcontact.ui.colors import setup_colors +from mcontact.ui.splash import draw_splash +from mcontact.ui.control_ui import set_region, settings_menu +from mcontact.utilities.arg_parser import setup_parser +from mcontact.utilities.interfaces import initialize_interface def main(stdscr): diff --git a/mtcontact/ui/colors.py b/mtcontact/ui/colors.py index 3891073..3c579d6 100644 --- a/mtcontact/ui/colors.py +++ b/mtcontact/ui/colors.py @@ -1,5 +1,5 @@ import curses -import mtcontact.ui.default_config as config +import mcontact.ui.default_config as config COLOR_MAP = { "black": curses.COLOR_BLACK, diff --git a/mtcontact/ui/control_ui.py b/mtcontact/ui/control_ui.py index 00630cf..1672771 100644 --- a/mtcontact/ui/control_ui.py +++ b/mtcontact/ui/control_ui.py @@ -5,16 +5,16 @@ import os import re import sys -from mtcontact.utilities.save_to_radio import save_changes -from mtcontact.utilities.config_io import config_export, config_import -from mtcontact.utilities.input_handlers import get_repeated_input, get_text_input, get_fixed32_input, get_list_input, get_admin_key_input -from mtcontact.ui.menus import generate_menu_from_protobuf -from mtcontact.ui.colors import get_color -from mtcontact.ui.dialog import dialog -from mtcontact.utilities.control_utils import parse_ini_file, transform_menu_path -from mtcontact.ui.user_config import json_editor +from mcontact.utilities.save_to_radio import save_changes +from mcontact.utilities.config_io import config_export, config_import +from mcontact.utilities.input_handlers import get_repeated_input, get_text_input, get_fixed32_input, get_list_input, get_admin_key_input +from mcontact.ui.menus import generate_menu_from_protobuf +from mcontact.ui.colors import get_color +from mcontact.ui.dialog import dialog +from mcontact.utilities.control_utils import parse_ini_file, transform_menu_path +from mcontact.ui.user_config import json_editor -import mtcontact.localisations +import mcontact.localisations # Constants width = 80 diff --git a/mtcontact/ui/curses_ui.py b/mtcontact/ui/curses_ui.py index ca2f559..b27808f 100644 --- a/mtcontact/ui/curses_ui.py +++ b/mtcontact/ui/curses_ui.py @@ -2,14 +2,14 @@ import curses import textwrap import logging import traceback -from mtcontact.utilities.utils import get_channels, get_readable_duration, get_time_ago, refresh_node_list -from mtcontact.settings import settings_menu -from mtcontact.message_handlers.tx_handler import send_message, send_traceroute -from mtcontact.ui.colors import setup_colors, get_color -from mtcontact.utilities.db_handler import get_name_from_database, update_node_info_in_db, is_chat_archived -import mtcontact.ui.default_config as config -import mtcontact.ui.dialog -import mtcontact.globals as globals +from mcontact.utilities.utils import get_channels, get_readable_duration, get_time_ago, refresh_node_list +from mcontact.settings import settings_menu +from mcontact.message_handlers.tx_handler import send_message, send_traceroute +from mcontact.ui.colors import setup_colors, get_color +from mcontact.utilities.db_handler import get_name_from_database, update_node_info_in_db, is_chat_archived +import mcontact.ui.default_config as config +import mcontact.ui.dialog +import mcontact.globals as globals def handle_resize(stdscr, firstrun): global messages_pad, messages_win, nodes_pad, nodes_win, channel_pad, channel_win, function_win, packetlog_win, entry_win @@ -212,7 +212,7 @@ def main_ui(stdscr): elif char == chr(20): send_traceroute() curses.curs_set(0) # Hide cursor - mtcontact.ui.dialog.dialog(stdscr, "Traceroute Sent", "Results will appear in messages window.\nNote: Traceroute is limited to once every 30 seconds.") + mcontact.ui.dialog.dialog(stdscr, "Traceroute Sent", "Results will appear in messages window.\nNote: Traceroute is limited to once every 30 seconds.") curses.curs_set(1) # Show cursor again handle_resize(stdscr, False) diff --git a/mtcontact/ui/dialog.py b/mtcontact/ui/dialog.py index c5a4c7a..0edd950 100644 --- a/mtcontact/ui/dialog.py +++ b/mtcontact/ui/dialog.py @@ -1,5 +1,5 @@ import curses -from mtcontact.ui.colors import get_color +from mcontact.ui.colors import get_color def dialog(stdscr, title, message): height, width = stdscr.getmaxyx() diff --git a/mtcontact/ui/splash.py b/mtcontact/ui/splash.py index 785b5da..fab6739 100644 --- a/mtcontact/ui/splash.py +++ b/mtcontact/ui/splash.py @@ -1,5 +1,5 @@ import curses -from mtcontact.ui.colors import get_color +from mcontact.ui.colors import get_color def draw_splash(stdscr): curses.curs_set(0) diff --git a/mtcontact/ui/user_config.py b/mtcontact/ui/user_config.py index dc10db8..5e0f938 100644 --- a/mtcontact/ui/user_config.py +++ b/mtcontact/ui/user_config.py @@ -1,9 +1,9 @@ import os import json import curses -from mtcontact.ui.colors import get_color, setup_colors, COLOR_MAP -from mtcontact.ui.default_config import format_json_single_line_arrays, loaded_config -from mtcontact.utilities.input_handlers import get_list_input +from mcontact.ui.colors import get_color, setup_colors, COLOR_MAP +from mcontact.ui.default_config import format_json_single_line_arrays, loaded_config +from mcontact.utilities.input_handlers import get_list_input width = 60 save_option_text = "Save Changes" diff --git a/mtcontact/utilities/db_handler.py b/mtcontact/utilities/db_handler.py index 5a483aa..3ca7418 100644 --- a/mtcontact/utilities/db_handler.py +++ b/mtcontact/utilities/db_handler.py @@ -3,9 +3,9 @@ import time import logging from datetime import datetime -from mtcontact.utilities.utils import decimal_to_hex -import mtcontact.ui.default_config as config -import mtcontact.globals as globals +from mcontact.utilities.utils import decimal_to_hex +import mcontact.ui.default_config as config +import mcontact.globals as globals def get_table_name(channel): # Construct the table name diff --git a/mtcontact/utilities/input_handlers.py b/mtcontact/utilities/input_handlers.py index 2c0ed34..e6a12c1 100644 --- a/mtcontact/utilities/input_handlers.py +++ b/mtcontact/utilities/input_handlers.py @@ -3,7 +3,7 @@ import binascii import curses import ipaddress import re -from mtcontact.ui.colors import get_color +from mcontact.ui.colors import get_color def wrap_text(text, wrap_width): """Wraps text while preserving spaces and breaking long words.""" diff --git a/mtcontact/utilities/interfaces.py b/mtcontact/utilities/interfaces.py index 03aeace..5b51eff 100644 --- a/mtcontact/utilities/interfaces.py +++ b/mtcontact/utilities/interfaces.py @@ -1,6 +1,6 @@ import logging import meshtastic.serial_interface, meshtastic.tcp_interface, meshtastic.ble_interface -import mtcontact.globals as globals +import mcontact.globals as globals def initialize_interface(args): try: diff --git a/mtcontact/utilities/utils.py b/mtcontact/utilities/utils.py index 1997c36..c51ab27 100644 --- a/mtcontact/utilities/utils.py +++ b/mtcontact/utilities/utils.py @@ -1,7 +1,7 @@ -import mtcontact.globals as globals +import mcontact.globals as globals import datetime from meshtastic.protobuf import config_pb2 -import mtcontact.ui.default_config as config +import mcontact.ui.default_config as config def get_channels(): """Retrieve channels from the node and update globals.channel_list and globals.all_messages.""" diff --git a/pyproject.toml b/pyproject.toml index 0a20233..9e49405 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,5 +1,5 @@ [project] -name = "mtcontact" +name = "mcontact" version = "1.2.3" 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 = [ @@ -18,4 +18,4 @@ requires = ["poetry-core>=2.0.0,<3.0.0"] build-backend = "poetry.core.masonry.api" [tool.poetry.scripts] -mtcontact = "mtcontact.main:start" +mcontact = "mcontact.main:start"