From 372204a684b4d3fc32025c2ed3173ff4c9746e7e Mon Sep 17 00:00:00 2001 From: pdxlocations Date: Tue, 1 Apr 2025 14:57:51 -0700 Subject: [PATCH] mcontact -> contact --- .github/workflows/release.yaml | 2 +- .vscode/launch.json | 2 +- mcontact/main.py | 24 ++++++++++++------------ mcontact/message_handlers/rx_handler.py | 10 +++++----- mcontact/message_handlers/tx_handler.py | 10 +++++----- mcontact/settings.py | 14 +++++++------- mcontact/ui/colors.py | 2 +- mcontact/ui/control_ui.py | 18 +++++++++--------- mcontact/ui/curses_ui.py | 18 +++++++++--------- mcontact/ui/dialog.py | 2 +- mcontact/ui/splash.py | 2 +- mcontact/ui/user_config.py | 6 +++--- mcontact/utilities/db_handler.py | 6 +++--- mcontact/utilities/input_handlers.py | 2 +- mcontact/utilities/interfaces.py | 2 +- mcontact/utilities/utils.py | 4 ++-- pyproject.toml | 4 ++-- 17 files changed, 64 insertions(+), 64 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 8c2c5f7..700c750 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -9,7 +9,7 @@ on: - "[0-9]+.[0-9]+.[0-9]+rc[0-9]+" env: - PACKAGE_NAME: "mcontact" + PACKAGE_NAME: "contact" OWNER: "pdxlocations" jobs: diff --git a/.vscode/launch.json b/.vscode/launch.json index f10e079..6d8c679 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -6,7 +6,7 @@ "type": "debugpy", "request": "launch", "cwd": "${workspaceFolder}", - "module": "mcontact.main", + "module": "contact.main", "args": [] } ] diff --git a/mcontact/main.py b/mcontact/main.py index 4851967..9b861bd 100644 --- a/mcontact/main.py +++ b/mcontact/main.py @@ -18,18 +18,18 @@ import logging import traceback import threading -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 +from contact.utilities.db_handler import init_nodedb, load_messages_from_db +from contact.message_handlers.rx_handler import on_receive +from contact.settings import set_region +from contact.ui.curses_ui import main_ui +from contact.ui.colors import setup_colors +from contact.ui.splash import draw_splash +import contact.ui.default_config as config +from contact.utilities.arg_parser import setup_parser +from contact.utilities.interfaces import initialize_interface +from contact.utilities.input_handlers import get_list_input +from contact.utilities.utils import get_channels, get_node_list, get_nodeNum +import contact.globals as globals # Set ncurses compatibility settings os.environ["NCURSES_NO_UTF8_ACS"] = "1" diff --git a/mcontact/message_handlers/rx_handler.py b/mcontact/message_handlers/rx_handler.py index f461f62..74cc5f9 100644 --- a/mcontact/message_handlers/rx_handler.py +++ b/mcontact/message_handlers/rx_handler.py @@ -1,11 +1,11 @@ import logging import time -from mcontact.utilities.utils import refresh_node_list +from contact.utilities.utils import refresh_node_list from datetime import datetime -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 contact.ui.curses_ui import draw_packetlog_win, draw_node_list, draw_messages_window, draw_channel_list, add_notification +from contact.utilities.db_handler import save_message_to_db, maybe_store_nodeinfo_in_db, get_name_from_database, update_node_info_in_db +import contact.ui.default_config as config +import contact.globals as globals from datetime import datetime diff --git a/mcontact/message_handlers/tx_handler.py b/mcontact/message_handlers/tx_handler.py index 7fe9ed1..45cfc13 100644 --- a/mcontact/message_handlers/tx_handler.py +++ b/mcontact/message_handlers/tx_handler.py @@ -3,16 +3,16 @@ import google.protobuf.json_format from meshtastic import BROADCAST_NUM from meshtastic.protobuf import mesh_pb2, portnums_pb2 -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 +from contact.utilities.db_handler import save_message_to_db, update_ack_nak, get_name_from_database, is_chat_archived, update_node_info_in_db +import contact.ui.default_config as config +import contact.globals as globals ack_naks = {} # Note "onAckNak" has special meaning to the API, thus the nonstandard naming convention # See https://github.com/meshtastic/python/blob/master/meshtastic/mesh_interface.py#L462 def onAckNak(packet): - from mcontact.ui.curses_ui import draw_messages_window + from contact.ui.curses_ui import draw_messages_window request = packet['decoded']['requestId'] if(request not in ack_naks): return @@ -43,7 +43,7 @@ def onAckNak(packet): def on_response_traceroute(packet): """on response for trace route""" - from mcontact.ui.curses_ui import draw_channel_list, draw_messages_window, add_notification + from contact.ui.curses_ui import draw_channel_list, draw_messages_window, add_notification refresh_channels = False refresh_messages = False diff --git a/mcontact/settings.py b/mcontact/settings.py index 2ba7f94..c0ee3ae 100644 --- a/mcontact/settings.py +++ b/mcontact/settings.py @@ -5,13 +5,13 @@ import logging import sys import traceback -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 +import contact.ui.default_config as config +from contact.utilities.input_handlers import get_list_input +from contact.ui.colors import setup_colors +from contact.ui.splash import draw_splash +from contact.ui.control_ui import set_region, settings_menu +from contact.utilities.arg_parser import setup_parser +from contact.utilities.interfaces import initialize_interface def main(stdscr): diff --git a/mcontact/ui/colors.py b/mcontact/ui/colors.py index 3c579d6..cb8c064 100644 --- a/mcontact/ui/colors.py +++ b/mcontact/ui/colors.py @@ -1,5 +1,5 @@ import curses -import mcontact.ui.default_config as config +import contact.ui.default_config as config COLOR_MAP = { "black": curses.COLOR_BLACK, diff --git a/mcontact/ui/control_ui.py b/mcontact/ui/control_ui.py index 1672771..b3c5b9e 100644 --- a/mcontact/ui/control_ui.py +++ b/mcontact/ui/control_ui.py @@ -5,16 +5,16 @@ import os import re import sys -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 +from contact.utilities.save_to_radio import save_changes +from contact.utilities.config_io import config_export, config_import +from contact.utilities.input_handlers import get_repeated_input, get_text_input, get_fixed32_input, get_list_input, get_admin_key_input +from contact.ui.menus import generate_menu_from_protobuf +from contact.ui.colors import get_color +from contact.ui.dialog import dialog +from contact.utilities.control_utils import parse_ini_file, transform_menu_path +from contact.ui.user_config import json_editor -import mcontact.localisations +import contact.localisations # Constants width = 80 diff --git a/mcontact/ui/curses_ui.py b/mcontact/ui/curses_ui.py index b27808f..c71a172 100644 --- a/mcontact/ui/curses_ui.py +++ b/mcontact/ui/curses_ui.py @@ -2,14 +2,14 @@ import curses import textwrap import logging import traceback -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 +from contact.utilities.utils import get_channels, get_readable_duration, get_time_ago, refresh_node_list +from contact.settings import settings_menu +from contact.message_handlers.tx_handler import send_message, send_traceroute +from contact.ui.colors import setup_colors, get_color +from contact.utilities.db_handler import get_name_from_database, update_node_info_in_db, is_chat_archived +import contact.ui.default_config as config +import contact.ui.dialog +import contact.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 - mcontact.ui.dialog.dialog(stdscr, "Traceroute Sent", "Results will appear in messages window.\nNote: Traceroute is limited to once every 30 seconds.") + contact.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/mcontact/ui/dialog.py b/mcontact/ui/dialog.py index 0edd950..ea39b43 100644 --- a/mcontact/ui/dialog.py +++ b/mcontact/ui/dialog.py @@ -1,5 +1,5 @@ import curses -from mcontact.ui.colors import get_color +from contact.ui.colors import get_color def dialog(stdscr, title, message): height, width = stdscr.getmaxyx() diff --git a/mcontact/ui/splash.py b/mcontact/ui/splash.py index fab6739..403bc34 100644 --- a/mcontact/ui/splash.py +++ b/mcontact/ui/splash.py @@ -1,5 +1,5 @@ import curses -from mcontact.ui.colors import get_color +from contact.ui.colors import get_color def draw_splash(stdscr): curses.curs_set(0) diff --git a/mcontact/ui/user_config.py b/mcontact/ui/user_config.py index 9a8f586..eb4e9b6 100644 --- a/mcontact/ui/user_config.py +++ b/mcontact/ui/user_config.py @@ -1,9 +1,9 @@ import os import json import curses -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 +from contact.ui.colors import get_color, setup_colors, COLOR_MAP +from contact.ui.default_config import format_json_single_line_arrays, loaded_config +from contact.utilities.input_handlers import get_list_input width = 60 save_option_text = "Save Changes" diff --git a/mcontact/utilities/db_handler.py b/mcontact/utilities/db_handler.py index 3ca7418..ebd588b 100644 --- a/mcontact/utilities/db_handler.py +++ b/mcontact/utilities/db_handler.py @@ -3,9 +3,9 @@ import time import logging from datetime import datetime -from mcontact.utilities.utils import decimal_to_hex -import mcontact.ui.default_config as config -import mcontact.globals as globals +from contact.utilities.utils import decimal_to_hex +import contact.ui.default_config as config +import contact.globals as globals def get_table_name(channel): # Construct the table name diff --git a/mcontact/utilities/input_handlers.py b/mcontact/utilities/input_handlers.py index e6a12c1..847b9f0 100644 --- a/mcontact/utilities/input_handlers.py +++ b/mcontact/utilities/input_handlers.py @@ -3,7 +3,7 @@ import binascii import curses import ipaddress import re -from mcontact.ui.colors import get_color +from contact.ui.colors import get_color def wrap_text(text, wrap_width): """Wraps text while preserving spaces and breaking long words.""" diff --git a/mcontact/utilities/interfaces.py b/mcontact/utilities/interfaces.py index 5b51eff..6cb0918 100644 --- a/mcontact/utilities/interfaces.py +++ b/mcontact/utilities/interfaces.py @@ -1,6 +1,6 @@ import logging import meshtastic.serial_interface, meshtastic.tcp_interface, meshtastic.ble_interface -import mcontact.globals as globals +import contact.globals as globals def initialize_interface(args): try: diff --git a/mcontact/utilities/utils.py b/mcontact/utilities/utils.py index c51ab27..6392899 100644 --- a/mcontact/utilities/utils.py +++ b/mcontact/utilities/utils.py @@ -1,7 +1,7 @@ -import mcontact.globals as globals +import contact.globals as globals import datetime from meshtastic.protobuf import config_pb2 -import mcontact.ui.default_config as config +import contact.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 96e1754..3798286 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,5 +1,5 @@ [project] -name = "mcontact" +name = "contact" version = "1.3.0" 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] -mcontact = "mcontact.main:start" +contact = "contact.main:start"