bump version

* rename state

* changes

* not working changes

* working changes

* not working changes

* working changes

* comments

.github/workflows/release.yaml

@@ -0,0 +1,143 @@
+name: release
+
+on:
+  push:
+    tags:
+      - "[0-9]+.[0-9]+.[0-9]+"
+      - "[0-9]+.[0-9]+.[0-9]+a[0-9]+"
+      - "[0-9]+.[0-9]+.[0-9]+b[0-9]+"
+      - "[0-9]+.[0-9]+.[0-9]+rc[0-9]+"
+
+env:
+  PACKAGE_NAME: "contact"
+  OWNER: "pdxlocations"
+
+jobs:
+  details:
+    runs-on: ubuntu-latest
+    outputs:
+      new_version: ${{ steps.release.outputs.new_version }}
+      suffix: ${{ steps.release.outputs.suffix }}
+      tag_name: ${{ steps.release.outputs.tag_name }}
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Extract tag and Details
+        id: release
+        run: |
+          if [ "${{ github.ref_type }}" = "tag" ]; then
+            TAG_NAME=${GITHUB_REF#refs/tags/}
+            NEW_VERSION=$(echo $TAG_NAME | awk -F'-' '{print $1}')
+            SUFFIX=$(echo $TAG_NAME | grep -oP '[a-z]+[0-9]+' || echo "")
+            echo "new_version=$NEW_VERSION" >> "$GITHUB_OUTPUT"
+            echo "suffix=$SUFFIX" >> "$GITHUB_OUTPUT"
+            echo "tag_name=$TAG_NAME" >> "$GITHUB_OUTPUT"
+            echo "Version is $NEW_VERSION"
+            echo "Suffix is $SUFFIX"
+            echo "Tag name is $TAG_NAME"
+          else
+            echo "No tag found"
+            exit 1
+          fi
+
+  check_pypi:
+    needs: details
+    runs-on: ubuntu-latest
+    steps:
+      - name: Fetch information from PyPI
+        run: |
+          response=$(curl -s https://pypi.org/pypi/${{ env.PACKAGE_NAME }}/json || echo "{}")
+          latest_previous_version=$(echo $response | jq --raw-output "select(.releases != null) | .releases | keys_unsorted | last")
+          if [ -z "$latest_previous_version" ]; then
+            echo "Package not found on PyPI."
+            latest_previous_version="0.0.0"
+          fi
+          echo "Latest version on PyPI: $latest_previous_version"
+          echo "latest_previous_version=$latest_previous_version" >> $GITHUB_ENV
+
+      - name: Compare versions and exit if not newer
+        run: |
+          NEW_VERSION=${{ needs.details.outputs.new_version }}
+          LATEST_VERSION=$latest_previous_version
+          if [ "$(printf '%s\n' "$LATEST_VERSION" "$NEW_VERSION" | sort -rV | head -n 1)" != "$NEW_VERSION" ] || [ "$NEW_VERSION" == "$LATEST_VERSION" ]; then
+            echo "The new version $NEW_VERSION is not greater than the latest version $LATEST_VERSION on PyPI."
+            exit 1
+          else
+            echo "The new version $NEW_VERSION is greater than the latest version $LATEST_VERSION on PyPI."
+          fi
+
+  setup_and_build:
+    needs: [details, check_pypi]
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Set up Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: "3.12"
+
+      - name: Install Poetry
+        run: |
+          curl -sSL https://install.python-poetry.org | python3 -
+          echo "$HOME/.local/bin" >> $GITHUB_PATH
+
+      - name: Set project version with Poetry
+        run: |
+          poetry version ${{ needs.details.outputs.new_version }}
+
+      - name: Install dependencies
+        run: poetry install --sync --no-interaction
+
+      - name: Build source and wheel distribution
+        run: |
+          poetry build
+
+      - name: Upload artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: dist
+          path: dist/
+
+  pypi_publish:
+    name: Upload release to PyPI
+    needs: [setup_and_build, details]
+    runs-on: ubuntu-latest
+    environment:
+      name: release
+    permissions:
+      id-token: write
+    steps:
+      - name: Download artifacts
+        uses: actions/download-artifact@v4
+        with:
+          name: dist
+          path: dist/
+
+      - name: Publish distribution to PyPI
+        uses: pypa/gh-action-pypi-publish@release/v1
+
+  github_release:
+    name: Create GitHub Release
+    needs: [setup_and_build, details]
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+    steps:
+      - name: Checkout Code
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Download artifacts
+        uses: actions/download-artifact@v4
+        with:
+          name: dist
+          path: dist/
+
+      - name: Create GitHub Release
+        id: create_release
+        env:
+          GH_TOKEN: ${{ github.token }}
+        run: |
+          gh release create ${{ needs.details.outputs.tag_name }} dist/* --title ${{ needs.details.outputs.tag_name }} --generate-notes

.gitignore

@@ -7,4 +7,5 @@ client.db
 client.log
 settings.log
 config.json
-default_config.log
+default_config.log
+dist/

.vscode/launch.json

@@ -0,0 +1,13 @@
+{
+    "version": "0.1.0",
+    "configurations": [
+        {
+            "name": "Python Debugger: Current File",
+            "type": "debugpy",
+            "request": "launch",
+            "cwd": "${workspaceFolder}",
+            "module": "contact.__main__",
+            "args": []
+        }
+    ]
+}

README.md

@@ -9,7 +9,7 @@ This Python curses client for Meshtastic is a terminal-based client designed to
 <img width="846" alt="Contact - Main UI Screenshot" src="https://github.com/user-attachments/assets/d2996bfb-2c6d-46a8-b820-92a9143375f4">
 
 <br><br>
-The settings dialogue can be accessed within the client or may be run standalone to configure your node by launching `settings.py`
+The settings dialogue can be accessed within the client or may be run standalone to configure your node by launching `contact --settings` or 'contact -c`
 
 <img width="441" alt="Contact - Settings Dialogue" src="https://github.com/user-attachments/assets/dd47f52a-d4d8-4e40-8001-9ea53d87f816" />
 
@@ -48,17 +48,18 @@ Optional arguments to specify a device to connect to and how.
 - `--port`, `--serial`, `-s`: The port to connect to via serial, e.g. `/dev/ttyUSB0`.
 - `--host`, `--tcp`, `-t`: The hostname or IP address to connect to using TCP, will default to localhost if no host is passed.
 - `--ble`, `-b`: The BLE device MAC address or name to connect to.
+- `--settings`, `--set`, `--control`, `-c`: Launch directly into the settings.
 
 If no connection arguments are specified, the client will attempt a serial connection and then a TCP connection to localhost.
 
 ### Example Usage
 
 ```sh
-python main.py --port /dev/ttyUSB0
-python main.py --host 192.168.1.1
-python main.py --ble BlAddressOfDevice
+contact --port /dev/ttyUSB0
+contact --host 192.168.1.1
+contact --ble BlAddressOfDevice
 ```
 To quickly connect to localhost, use:
 ```sh
-python main.py -t
-```
+contact -t
+```

contact/__main__.py

@@ -3,7 +3,8 @@
 '''
 Contact - A Console UI for Meshtastic by http://github.com/pdxlocations
 Powered by Meshtastic.org
-V 1.2.2
+
+Meshtastic® is a registered trademark of Meshtastic LLC. Meshtastic software components are released under various licenses, see GitHub for details. No warranty is provided - use at your own risk.
 '''
 
 import contextlib
@@ -13,21 +14,22 @@ from pubsub import pub
 import sys
 import io
 import logging
+import subprocess
 import traceback
 import threading
 
-from utilities.db_handler import init_nodedb, load_messages_from_db
-from message_handlers.rx_handler import on_receive
-from settings import set_region
-from ui.curses_ui import main_ui
-from ui.colors import setup_colors
-from ui.splash import draw_splash
-import ui.default_config as config
-from utilities.arg_parser import setup_parser
-from utilities.interfaces import initialize_interface
-from utilities.input_handlers import get_list_input
-from utilities.utils import get_channels, get_node_list, get_nodeNum
-import 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.contact_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"
@@ -56,6 +58,11 @@ def main(stdscr):
             parser = setup_parser()
             args = parser.parse_args()
 
+            # Check if --settings was passed and run settings.py as a subprocess
+            if getattr(args, 'settings', False):
+                subprocess.run([sys.executable, "-m", "contact.settings"], check=True)
+                return
+
             logging.info("Initializing interface %s", args)
             with globals.lock:
                 globals.interface = initialize_interface(args)
@@ -85,7 +92,7 @@ def main(stdscr):
         logging.error("Console output before crash:\n%s", console_output)
         raise  # Re-raise only unexpected errors
 
-if __name__ == "__main__":
+def start():
     log_file = config.log_file_path
     log_f = open(log_file, "a", buffering=1)  # Enable line-buffering for immediate log writes
 
@@ -101,4 +108,7 @@ if __name__ == "__main__":
         except Exception as e:
             logging.error("Fatal error in curses wrapper: %s", e)
             logging.error("Traceback: %s", traceback.format_exc())
-            sys.exit(1)  # Exit with an error code
+            sys.exit(1)  # Exit with an error code
+
+if __name__ == "__main__":
+    start()

contact/localisations/en.ini

@@ -24,9 +24,9 @@ serial_enabled, "Enable serial console", ""
 button_gpio, "Button GPIO", "GPIO pin for user button."
 buzzer_gpio, "Buzzer GPIO", "GPIO pin for user buzzer."
 rebroadcast_mode, "Rebroadcast mode", "This setting defines the device's behavior for how messages are rebroadcast."
-node_info_broadcast_secs, "Nodeinfo broadcast interval", "This is the number of seconds between NodeInfo message broadcasts. Femtofox will still send nodeinfo in response to new nodes on the mesh."
+node_info_broadcast_secs, "Nodeinfo broadcast interval", "This is the number of seconds between NodeInfo message broadcasts. Will also send a nodeinfo in response to new nodes on the mesh."
 double_tap_as_button_press, "Double tap as button press", "This option will enable a double tap, when a supported accelerometer is attached to the device, to be treated as a button press."
-is_managed, "Enable managed mode", "Enabling Managed Mode blocks smartphone apps and web UI from changing configuration. [note]This setting is not required for remote node administration.[/note]Before enabling, verify that node can be controlled via Remote Admin to [warning]prevent being locked out.[/warning]"
+is_managed, "Enable managed mode", "Enabling Managed Mode blocks smartphone apps and web UI from changing configuration. [note]This setting is not required for remote node administration.[/note] Before enabling, verify that node can be controlled via Remote Admin to [warning]prevent being locked out.[/warning]"
 disable_triple_click, "Disable triple button press", ""
 tzdef, "Timezone", "Uses the TZ Database format to display the correct local time on the device display and in its logs."
 led_heartbeat_disabled, "Disable LED heartbeat", "On certain hardware models, this disables the blinking heartbeat LED."
@@ -78,6 +78,13 @@ dns, "IPv4 DNS server", ""
 rsyslog_server, "RSyslog server", ""
 enabled_protocols, "Enabled protocols", ""
 
+[config.network.ipv4_config]
+title, "IPv4 Config", ""
+ip, "IP", ""
+gateway, "Gateway", ""
+subnet, "Subnet", ""
+dns, "DNS", ""
+
 [config.display]
 title, "Display"
 screen_on_secs, "Screen on duration", "How long the screen remains on in seconds after the user button is pressed or messages are received."
@@ -105,6 +112,35 @@ theme, "Theme", ""
 alert_enabled, "Alert enabled", ""
 banner_enabled, "Banner enabled", ""
 ring_tone_id, "Ring tone ID", ""
+language, "Language", ""
+node_filter, "Node Filter", ""
+node_highlight, "Node Highlight", ""
+calibration_data, "Calibration Data", ""
+map_data, "Map Data", ""
+
+[config.device_ui.node_filter]
+title, "Node Filter"
+unknown_switch, "Unknown Switch", ""
+offline_switch, "Offline Switch", ""
+public_key_switch, "Public Key Switch", ""
+hops_away, "Hops Away", ""
+position_switch, "Position Switch", ""
+node_name, "Node Name", ""
+channel, "Channel", ""
+
+[config.device_ui.node_highlight]
+title, "Node Highlight"
+chat_switch, "Chat Switch", ""
+position_switch, "Position Switch", ""
+telemetry_switch, "Telemetry Switch", ""
+iaq_switch, "IAQ Switch", ""
+node_name, "Node Name", ""
+
+[config.device_ui.map_data]
+title, "Map Data"
+home, "Home", ""
+style, "Style", ""
+follow_gps, "Follow GPS", ""
 
 [config.lora]
 title, "LoRa"
@@ -115,7 +151,7 @@ spread_factor, "Spread factor", "Indicates the number of chirps per symbol. Only
 coding_rate, "Coding rate", "The proportion of each LoRa transmission that contains actual data - the rest is used for error correction."
 frequency_offset, "Frequency offset", "This parameter is for advanced users with advanced test equipment."
 region, "Region", "Sets the region for your node. As long as this is not set, the node will display a message and not transmit any packets."
-hop_limit, "Hop limit", "The maximum number of intermediate nodes between Femtofox and a node it is sending to. Does not impact received messages.\n[warning]Excessive hop limit increases congestion![/warning]\nMust be between 0-7."
+hop_limit, "Hop limit", "The maximum number of intermediate nodes between our node and a node it is sending to. Does not impact received messages.\n[warning]Excessive hop limit increases congestion![/warning]\nMust be between 0-7."
 tx_enabled, "Enable TX", "Enables/disables the radio chip. Useful for hot-swapping antennas."
 tx_power, "TX power in dBm", "[warning]Setting a 33db radio above 8db will permanently damage it. ERP above 27db violates EU law. ERP above 36db violates US (unlicensed) law.[/warning] If 0, will use the max continuous power legal in region. Must be 0-30 (0=automatic)."
 channel_num, "Frequency slot", "Determines the exact frequency the radio transmits and receives. If unset or set to 0, determined automatically by the primary channel name."
@@ -139,7 +175,7 @@ private_key, "Private key", "The private key of the device, used to create a sha
 is_managed, "Enable managed mode", "Enabling Managed Mode blocks smartphone apps and web UI from changing configuration. [note]This setting is not required for remote node administration.[/note]Before enabling, verify that node can be controlled via Remote Admin to [warning]prevent being locked out.[/warning]"
 serial_enabled, "Enable serial console", ""
 debug_log_api_enabled, "Enable debug log", "Set this to true to continue outputting live debug logs over serial or Bluetooth when the API is active."
-admin_channel_enabled, "Enable legacy admin channel", "If the node you Femtofox needs to administer or be administered by is running 2.4.x or earlier, you should set this to enabled. Requires a secondary channel named 'admin' be present on both nodes."
+admin_channel_enabled, "Enable legacy admin channel", "If the node you need to administer or be administered by is running 2.4.x or earlier, you should set this to enabled. Requires a secondary channel named 'admin' be present on both nodes."
 admin_key, "Admin keys", "The public key(s) authorized to send administrative messages to this node. Only messages signed by these keys will be accepted for administrative control. Up to 3."
 
 [module.mqtt]

contact/message_handlers/rx_handler.py

@@ -1,11 +1,11 @@
 import logging
 import time
-from utilities.utils import refresh_node_list
+from contact.utilities.utils import refresh_node_list
 from datetime import datetime
-from ui.curses_ui import draw_packetlog_win, draw_node_list, draw_messages_window, draw_channel_list, add_notification
-from utilities.db_handler import save_message_to_db, maybe_store_nodeinfo_in_db, get_name_from_database, update_node_info_in_db
-import ui.default_config as config
-import globals
+from contact.ui.contact_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

contact/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 utilities.db_handler import save_message_to_db, update_ack_nak, get_name_from_database, is_chat_archived, update_node_info_in_db
-import ui.default_config as config
-import 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 ui.curses_ui import draw_messages_window
+    from contact.ui.contact_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 ui.curses_ui import draw_channel_list, draw_messages_window, add_notification
+    from contact.ui.contact_ui import draw_channel_list, draw_messages_window, add_notification
 
     refresh_channels = False
     refresh_messages = False

contact/settings.py

@@ -5,13 +5,13 @@ import logging
 import sys
 import traceback
 
-import ui.default_config as config
-from utilities.input_handlers import get_list_input
-from ui.colors import setup_colors
-from ui.splash import draw_splash
-from ui.control_ui import set_region, settings_menu
-from utilities.arg_parser import setup_parser
-from 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):

contact/ui/colors.py

@@ -1,5 +1,5 @@
 import curses
-import ui.default_config as config
+import contact.ui.default_config as config
 
 COLOR_MAP = {
     "black": curses.COLOR_BLACK,

contact/ui/contact_ui.py

@@ -1,15 +1,17 @@
 import curses
 import textwrap
+import time
 import logging
 import traceback
-from utilities.utils import get_channels, get_readable_duration, get_time_ago, refresh_node_list
-from settings import settings_menu
-from message_handlers.tx_handler import send_message, send_traceroute
-from ui.colors import setup_colors, get_color
-from utilities.db_handler import get_name_from_database, update_node_info_in_db, is_chat_archived
-import ui.default_config as config
-import ui.dialog
-import 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
+from contact.utilities.input_handlers import get_list_input
+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 +214,7 @@ def main_ui(stdscr):
         elif char == chr(20):
             send_traceroute()
             curses.curs_set(0)  # Hide cursor
-            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)
 
@@ -293,10 +295,79 @@ def main_ui(stdscr):
                     draw_channel_list()
                     draw_messages_window()
 
+            if(globals.current_window == 2):
+                curses.curs_set(0)
+                confirmation = get_list_input(f"Remove {get_name_from_database(globals.node_list[globals.selected_node])} from nodedb?", "No", ["Yes", "No"])
+                if confirmation == "Yes":
+                    globals.interface.localNode.removeNode(globals.node_list[globals.selected_node])
+
+                    # Directly modifying the interface from client code - good? Bad? If it's stupid but it works, it's not supid?
+                    del(globals.interface.nodesByNum[globals.node_list[globals.selected_node]])
+
+                    # Convert to "!hex" representation that interface.nodes uses
+                    hexid = f"!{hex(globals.node_list[globals.selected_node])[2:]}"
+                    del(globals.interface.nodes[hexid])
+
+                    globals.node_list.pop(globals.selected_node)
+
+                    draw_messages_window()
+                    draw_node_list()
+                else:
+                    draw_messages_window()
+                curses.curs_set(1)
+                continue
+
+        # ^/
         elif char == chr(31):
             if(globals.current_window == 2 or globals.current_window == 0):
                 search(globals.current_window)
 
+        # ^F
+        elif char == chr(6):
+            if globals.current_window == 2:
+                selectedNode = globals.interface.nodesByNum[globals.node_list[globals.selected_node]]
+
+                curses.curs_set(0)
+
+                if 'isFavorite' not in selectedNode or selectedNode['isFavorite'] == False:
+                    confirmation = get_list_input(f"Set {get_name_from_database(globals.node_list[globals.selected_node])} as Favorite?", None, ["Yes", "No"])
+                    if confirmation == "Yes":
+                        globals.interface.localNode.setFavorite(globals.node_list[globals.selected_node])
+                        # Maybe we shouldn't be modifying the nodedb, but maybe it should update itself
+                        globals.interface.nodesByNum[globals.node_list[globals.selected_node]]['isFavorite'] = True
+
+                        refresh_node_list()
+
+                else:
+                    confirmation = get_list_input(f"Remove {get_name_from_database(globals.node_list[globals.selected_node])} from Favorites?", None, ["Yes", "No"])
+                    if confirmation == "Yes":
+                        globals.interface.localNode.removeFavorite(globals.node_list[globals.selected_node])
+                        # Maybe we shouldn't be modifying the nodedb, but maybe it should update itself
+                        globals.interface.nodesByNum[globals.node_list[globals.selected_node]]['isFavorite'] = False
+
+                        refresh_node_list()
+
+                handle_resize(stdscr, False)
+
+        elif char == chr(7):
+            if globals.current_window == 2:
+                selectedNode = globals.interface.nodesByNum[globals.node_list[globals.selected_node]]
+
+                curses.curs_set(0)
+
+                if 'isIgnored' not in selectedNode or selectedNode['isIgnored'] == False:
+                    confirmation = get_list_input(f"Set {get_name_from_database(globals.node_list[globals.selected_node])} as Ignored?", "No", ["Yes", "No"])
+                    if confirmation == "Yes":
+                        globals.interface.localNode.setIgnored(globals.node_list[globals.selected_node])
+                        globals.interface.nodesByNum[globals.node_list[globals.selected_node]]['isIgnored'] = True
+                else:
+                    confirmation = get_list_input(f"Remove {get_name_from_database(globals.node_list[globals.selected_node])} from Ignored?", "No", ["Yes", "No"])
+                    if confirmation == "Yes":
+                        globals.interface.localNode.removeIgnored(globals.node_list[globals.selected_node])
+                        globals.interface.nodesByNum[globals.node_list[globals.selected_node]]['isIgnored'] = False
+
+                handle_resize(stdscr, False)
+
         else:
             # Append typed character to input text
             if(isinstance(char, str)):
@@ -411,7 +482,12 @@ def draw_node_list():
         node = globals.interface.nodesByNum[node_num]
         secure = 'user' in node and 'publicKey' in node['user'] and node['user']['publicKey']
         node_str = f"{'🔐' if secure else '🔓'} {get_name_from_database(node_num, 'long')}".ljust(box_width - 2)[:box_width - 2]
-        nodes_pad.addstr(i, 1, node_str, get_color("node_list", reverse=globals.selected_node == i and globals.current_window == 2))
+        color = "node_list"
+        if 'isFavorite' in node and node['isFavorite']:
+            color = "node_favorite"
+        if 'isIgnored' in node and node['isIgnored']:
+            color = "node_ignored"
+        nodes_pad.addstr(i, 1, node_str, get_color(color, reverse=globals.selected_node == i and globals.current_window == 2))
 
     nodes_win.attrset(get_color("window_frame_selected") if globals.current_window == 2 else get_color("window_frame"))
     nodes_win.box()
@@ -421,9 +497,9 @@ def draw_node_list():
     refresh_pad(2)
 
     # Restore cursor to input field
-    entry_win.move(1, len("Input: ") + len(input_text)+1)
-    entry_win.refresh()
+    entry_win.keypad(True)
     curses.curs_set(1)
+    entry_win.refresh()
 
 def select_channel(idx):
     old_selected_channel = globals.selected_channel
@@ -522,9 +598,9 @@ def draw_packetlog_win():
         packetlog_win.refresh()
 
     # Restore cursor to input field
-    entry_win.move(1, len("Input: ") + len(input_text)+1)
-    entry_win.refresh()
+    entry_win.keypad(True)
     curses.curs_set(1)
+    entry_win.refresh()
 
 def search(win):
     start_idx = globals.selected_node
@@ -618,7 +694,7 @@ def draw_node_details():
     draw_centered_text_field(function_win, nodestr, 0, get_color("commands"))
 
 def draw_help():
-    cmds = ["↑→↓← = Select", "    ENTER = Send", "    ` = Settings", "    ^P = Packet Log", "    ESC = Quit", "    ^t = Traceroute", "    ^d = Archive Chat"]
+    cmds = ["↑→↓← = Select", "    ENTER = Send", "    ` = Settings", "    ^P = Packet Log", "    ESC = Quit", "    ^t = Traceroute", "    ^d = Archive Chat", "    ^f = Favorite", "    ^g = Ignore"]
     function_str = ""
     for s in cmds:
         if(len(function_str) + len(s) < function_win.getmaxyx()[1] - 2):
@@ -672,9 +748,18 @@ def refresh_pad(window):
 
 def highlight_line(highlight, window, line):
     pad = nodes_pad
+
     color = get_color("node_list")
     select_len = nodes_win.getmaxyx()[1] - 2
 
+    if window == 2:
+        node_num = globals.node_list[line]
+        node = globals.interface.nodesByNum[node_num]
+        if 'isFavorite' in node and node['isFavorite']:
+            color = get_color("node_favorite")
+        if 'isIgnored' in node and node['isIgnored']:
+            color = get_color("node_ignored")
+
     if(window == 0):
         pad = channel_pad
         color = get_color("channel_selected" if (line == globals.selected_channel and highlight == False) else "channel_list")
@@ -703,4 +788,4 @@ def draw_centered_text_field(win, text, y_offset, color):
 
 def draw_debug(value):
     function_win.addstr(1, 1, f"debug: {value}    ")
-    function_win.refresh()
+    function_win.refresh()

contact/ui/control_ui.py

@@ -5,14 +5,18 @@ import os
 import re
 import sys
 
-from utilities.save_to_radio import save_changes
-from utilities.config_io import config_export, config_import
-from utilities.input_handlers import get_repeated_input, get_text_input, get_fixed32_input, get_list_input, get_admin_key_input
-from ui.menus import generate_menu_from_protobuf
-from ui.colors import get_color
-from ui.dialog import dialog
-from utilities.control_utils import parse_ini_file, transform_menu_path
-from 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
+from contact.ui.ui_state import MenuState
+
+state = MenuState()
+
 
 # Constants
 width = 80
@@ -27,20 +31,18 @@ parent_dir = os.path.abspath(os.path.join(script_dir, os.pardir))
 
 # Paths
 locals_dir = os.path.dirname(os.path.abspath(sys.argv[0]))  # Current script directory
-translation_file = os.path.join(locals_dir, "localisations", "en.ini")
-config_folder = os.path.join(parent_dir, "node-configs")
+translation_file = os.path.join(parent_dir, "localisations", "en.ini")
+
+config_folder = os.path.join(locals_dir, "node-configs")
 
 # Load translations
 field_mapping, help_text = parse_ini_file(translation_file)
 
 
-def display_menu(current_menu, menu_path, selected_index, show_save_option, help_text):
+def display_menu(state):
+
     min_help_window_height = 6
-    num_items = len(current_menu) + (1 if show_save_option else 0)
-        # Track visible range
-    global start_index
-    if 'start_index' not in globals():
-        start_index = [0]  # Initialize if not set
+    num_items = len(state.current_menu) + (1 if state.show_save_option else 0)
 
     # Determine the available height for the menu
     max_menu_height = curses.LINES 
@@ -60,18 +62,18 @@ def display_menu(current_menu, menu_path, selected_index, show_save_option, help
     menu_win.border()
     menu_win.keypad(True)
 
-    menu_pad = curses.newpad(len(current_menu) + 1, width - 8)
+    menu_pad = curses.newpad(len(state.current_menu) + 1, width - 8)
     menu_pad.bkgd(get_color("background"))
 
-    header = " > ".join(word.title() for word in menu_path)
+    header = " > ".join(word.title() for word in state.menu_path)
     if len(header) > width - 4:
         header = header[:width - 7] + "..."
     menu_win.addstr(1, 2, header, get_color("settings_breadcrumbs", bold=True))
 
-    transformed_path = transform_menu_path(menu_path)
+    transformed_path = transform_menu_path(state.menu_path)
 
-    for idx, option in enumerate(current_menu):
-        field_info = current_menu[option]
+    for idx, option in enumerate(state.current_menu):
+        field_info = state.current_menu[option]
         current_value = field_info[1] if isinstance(field_info, tuple) else ""
         full_key = '.'.join(transformed_path + [option])
         display_name = field_mapping.get(full_key, option)
@@ -80,35 +82,41 @@ def display_menu(current_menu, menu_path, selected_index, show_save_option, help
         display_value = f"{current_value}"[:width // 2 - 4]
 
         try:
-            color = get_color("settings_sensitive" if option in sensitive_settings else "settings_default", reverse=(idx == selected_index))
+            color = get_color("settings_sensitive" if option in sensitive_settings else "settings_default", reverse=(idx == state.selected_index))
             menu_pad.addstr(idx, 0, f"{display_option:<{width // 2 - 2}} {display_value}".ljust(width - 8), color)
         except curses.error:
             pass
 
-    if show_save_option:
+    if state.show_save_option:
         save_position = menu_height - 2
-        menu_win.addstr(save_position, (width - len(save_option)) // 2, save_option, get_color("settings_save", reverse=(selected_index == len(current_menu))))
+        menu_win.addstr(save_position, (width - len(save_option)) // 2, save_option, get_color("settings_save", reverse=(state.selected_index == len(state.current_menu))))
 
     # Draw help window with dynamically updated max_help_lines
-    draw_help_window(start_y, start_x, menu_height, max_help_lines, current_menu, selected_index, transformed_path)
+    draw_help_window(start_y, start_x, menu_height, max_help_lines, transformed_path, state)
 
     menu_win.refresh()
     menu_pad.refresh(
-        start_index[-1], 0,
+        state.start_index[-1], 0,
         menu_win.getbegyx()[0] + 3, menu_win.getbegyx()[1] + 4,
-        menu_win.getbegyx()[0] + 3 + menu_win.getmaxyx()[0] - 5 - (2 if show_save_option else 0),
-        menu_win.getbegyx()[1] + menu_win.getmaxyx()[1] - 8
+        menu_win.getbegyx()[0] + 3 + menu_win.getmaxyx()[0] - 5 - (2 if state.show_save_option else 0),
+        menu_win.getbegyx()[1] + menu_win.getmaxyx()[1] - 4
     )
 
+    max_index = num_items + (1 if state.show_save_option else 0) - 1
+    visible_height = menu_win.getmaxyx()[0] - 5 - (2 if state.show_save_option else 0)
+
+    draw_arrows(menu_win, visible_height, max_index, state)
+
     return menu_win, menu_pad
 
-def draw_help_window(menu_start_y, menu_start_x, menu_height, max_help_lines, current_menu, selected_index, transformed_path):
+
+def draw_help_window(menu_start_y, menu_start_x, menu_height, max_help_lines, transformed_path, state):
     global help_win
 
     if 'help_win' not in globals():
         help_win = None  # Initialize if it does not exist
 
-    selected_option = list(current_menu.keys())[selected_index] if current_menu else None
+    selected_option = list(state.current_menu.keys())[state.selected_index] if state.current_menu else None
     help_y = menu_start_y + menu_height
 
     help_win = update_help_window(help_win, help_text, transformed_path, selected_option, max_help_lines, width, help_y, menu_start_x)
@@ -151,7 +159,6 @@ def update_help_window(help_win, help_text, transformed_path, selected_option, m
     return help_win
 
 
-
 def get_wrapped_help_text(help_text, transformed_path, selected_option, width, max_lines):
     """Fetches and formats help text for display, ensuring it fits within the allowed lines."""
     
@@ -244,94 +251,116 @@ def get_wrapped_help_text(help_text, transformed_path, selected_option, width, m
     return wrapped_help
 
 
-def move_highlight(old_idx, new_idx, options, show_save_option, menu_win, menu_pad, help_win, help_text, menu_path, max_help_lines):
-    if old_idx == new_idx:  # No-op
+def move_highlight(old_idx, options, menu_win, menu_pad, help_win, help_text, max_help_lines, state):
+    if old_idx == state.selected_index:  # No-op
         return
 
-    max_index = len(options) + (1 if show_save_option else 0) - 1
-    visible_height = menu_win.getmaxyx()[0] - 5 - (2 if show_save_option else 0)
+    max_index = len(options) + (1 if state.show_save_option else 0) - 1
+    visible_height = menu_win.getmaxyx()[0] - 5 - (2 if state.show_save_option else 0)
 
-    # Adjust start_index only when moving out of visible range
-    if new_idx < start_index[-1]:  # Moving above the visible area
-        start_index[-1] = new_idx
-    elif new_idx >= start_index[-1] + visible_height:  # Moving below the visible area
-        start_index[-1] = new_idx - visible_height 
+    # Adjust state.start_index only when moving out of visible range
+    if state.selected_index == max_index and state.show_save_option:
+        pass
+    elif state.selected_index < state.start_index[-1]:  # Moving above the visible area
+        state.start_index[-1] = state.selected_index
+    elif state.selected_index >= state.start_index[-1] + visible_height:  # Moving below the visible area
+        state.start_index[-1] = state.selected_index - visible_height
+    pass
 
-    # Ensure start_index is within bounds
-    start_index[-1] = max(0, min(start_index[-1], max_index - visible_height + 1))
+    # Ensure state.start_index is within bounds
+    state.start_index[-1] = max(0, min(state.start_index[-1], max_index - visible_height + 1))
 
     # Clear old selection
-    if show_save_option and old_idx == max_index:
+    if state.show_save_option and old_idx == max_index:
         menu_win.chgat(menu_win.getmaxyx()[0] - 2, (width - len(save_option)) // 2, len(save_option), get_color("settings_save"))
     else:
         menu_pad.chgat(old_idx, 0, menu_pad.getmaxyx()[1], get_color("settings_sensitive") if options[old_idx] in sensitive_settings else get_color("settings_default"))
 
     # Highlight new selection
-    if show_save_option and new_idx == max_index:
+    if state.show_save_option and state.selected_index == max_index:
         menu_win.chgat(menu_win.getmaxyx()[0] - 2, (width - len(save_option)) // 2, len(save_option), get_color("settings_save", reverse=True))
     else:
-        menu_pad.chgat(new_idx, 0, menu_pad.getmaxyx()[1], get_color("settings_sensitive", reverse=True) if options[new_idx] in sensitive_settings else get_color("settings_default", reverse=True))
+        menu_pad.chgat(state.selected_index, 0, menu_pad.getmaxyx()[1], get_color("settings_sensitive", reverse=True) if options[state.selected_index] in sensitive_settings else get_color("settings_default", reverse=True))
 
     menu_win.refresh()
     
     # Refresh pad only if scrolling is needed
-    menu_pad.refresh(start_index[-1], 0,
+    menu_pad.refresh(state.start_index[-1], 0,
                      menu_win.getbegyx()[0] + 3, menu_win.getbegyx()[1] + 4,
                      menu_win.getbegyx()[0] + 3 + visible_height, 
-                     menu_win.getbegyx()[1] + menu_win.getmaxyx()[1] - 8)
+                     menu_win.getbegyx()[1] + menu_win.getmaxyx()[1] - 4)
 
     # Update help window
-    transformed_path = transform_menu_path(menu_path)
-    selected_option = options[new_idx] if new_idx < len(options) else None
+    transformed_path = transform_menu_path(state.menu_path)
+    selected_option = options[state.selected_index] if state.selected_index < len(options) else None
     help_y = menu_win.getbegyx()[0] + menu_win.getmaxyx()[0]
     help_win = update_help_window(help_win, help_text, transformed_path, selected_option, max_help_lines, width, help_y, menu_win.getbegyx()[1])
 
+    draw_arrows(menu_win, visible_height, max_index, state)
+
+
+def draw_arrows(win, visible_height, max_index, state):
+
+    # vh = visible_height + (1 if show_save_option else 0)
+    mi = max_index - (2 if state.show_save_option else 0) 
+
+    if visible_height < mi:
+        if state.start_index[-1] > 0:
+            win.addstr(3, 2, "▲", get_color("settings_default"))
+        else:
+            win.addstr(3, 2, " ", get_color("settings_default"))
+
+        if mi - state.start_index[-1] >= visible_height + (0 if state.show_save_option else 1) :
+            win.addstr(visible_height + 3, 2, "▼", get_color("settings_default"))
+        else:
+            win.addstr(visible_height + 3, 2, " ", get_color("settings_default"))
+        
 
 def settings_menu(stdscr, interface):
     curses.update_lines_cols()
 
     menu = generate_menu_from_protobuf(interface)
-    current_menu = menu["Main Menu"]
-    menu_path = ["Main Menu"]
-    menu_index = []
-    selected_index = 0
+    state.current_menu = menu["Main Menu"]
+    state.menu_path = ["Main Menu"]
+
+
     modified_settings = {}
     
     need_redraw = True
-    show_save_option = False
+    state.show_save_option = False
 
     while True:
         if(need_redraw):
-            options = list(current_menu.keys())
+            options = list(state.current_menu.keys())
 
-            show_save_option = (
-                len(menu_path) > 2 and ("Radio Settings" in menu_path or "Module Settings" in menu_path)
+            state.show_save_option = (
+                len(state.menu_path) > 2 and ("Radio Settings" in state.menu_path or "Module Settings" in state.menu_path)
             ) or (
-                len(menu_path) == 2 and "User Settings" in menu_path 
+                len(state.menu_path) == 2 and "User Settings" in state.menu_path 
             ) or (
-                len(menu_path) == 3 and "Channels" in menu_path
+                len(state.menu_path) == 3 and "Channels" in state.menu_path
             )
 
             # Display the menu
-            menu_win, menu_pad = display_menu(current_menu, menu_path, selected_index, show_save_option, help_text)
+            menu_win, menu_pad = display_menu(state)
 
             need_redraw = False
 
         # Capture user input
         key = menu_win.getch()
 
-        max_index = len(options) + (1 if show_save_option else 0) - 1
+        max_index = len(options) + (1 if state.show_save_option else 0) - 1
         # max_help_lines = 4
 
         if key == curses.KEY_UP:
-            old_selected_index = selected_index
-            selected_index = max_index if selected_index == 0 else selected_index - 1
-            move_highlight(old_selected_index, selected_index, options, show_save_option, menu_win, menu_pad, help_win, help_text, menu_path,max_help_lines)
+            old_selected_index = state.selected_index
+            state.selected_index = max_index if state.selected_index == 0 else state.selected_index - 1
+            move_highlight(old_selected_index, options, menu_win, menu_pad, help_win, help_text, max_help_lines, state)
             
         elif key == curses.KEY_DOWN:
-            old_selected_index = selected_index
-            selected_index = 0 if selected_index == max_index else selected_index + 1
-            move_highlight(old_selected_index, selected_index, options, show_save_option, menu_win, menu_pad, help_win, help_text, menu_path, max_help_lines)
+            old_selected_index = state.selected_index
+            state.selected_index = 0 if state.selected_index == max_index else state.selected_index + 1
+            move_highlight(old_selected_index, options, menu_win, menu_pad, help_win, help_text, max_help_lines, state)
 
         elif key == curses.KEY_RESIZE:
             need_redraw = True
@@ -343,41 +372,36 @@ def settings_menu(stdscr, interface):
             menu_win.refresh()
             help_win.refresh()
 
-        elif key == ord("\t") and show_save_option:
-            old_selected_index = selected_index
-            selected_index = max_index
-            move_highlight(old_selected_index, selected_index, options, show_save_option, menu_win, menu_pad, help_win, help_text, menu_path, max_help_lines)
+        elif key == ord("\t") and state.show_save_option:
+            old_selected_index = state.selected_index
+            state.selected_index = max_index
+            move_highlight(old_selected_index, options, menu_win, menu_pad, help_win, help_text, max_help_lines, state)
 
         elif key == curses.KEY_RIGHT or key == ord('\n'):
             need_redraw = True
-            start_index.append(0)
+            state.start_index.append(0)
             menu_win.erase()
             help_win.erase()
 
-            # draw_help_window(menu_win.getbegyx()[0], menu_win.getbegyx()[1], menu_win.getmaxyx()[0], max_help_lines, current_menu, selected_index, transform_menu_path(menu_path))
+            # draw_help_window(menu_win.getbegyx()[0], menu_win.getbegyx()[1], menu_win.getmaxyx()[0], max_help_lines, state.current_menu, selected_index, transform_menu_path(state.menu_path))
 
             menu_win.refresh()
             help_win.refresh()
 
-            # Get the parent directory of the script
-            app_directory = os.path.abspath(os.path.join(os.path.dirname(__file__), os.pardir))
-            config_folder = "node-configs"
-
-            if show_save_option and selected_index == len(options):
-                save_changes(interface, menu_path, modified_settings)
+            if state.show_save_option and state.selected_index == len(options):
+                save_changes(interface, modified_settings, state)
                 modified_settings.clear()
                 logging.info("Changes Saved")
 
-                if len(menu_path) > 1:
-                    menu_path.pop()
-                    current_menu = menu["Main Menu"]
-                    for step in menu_path[1:]:
-                        current_menu = current_menu.get(step, {})
-                    selected_index = 0
-
+                if len(state.menu_path) > 1:
+                    state.menu_path.pop()
+                    state.current_menu = menu["Main Menu"]
+                    for step in state.menu_path[1:]:
+                        state.current_menu = state.current_menu.get(step, {})
+                    state.selected_index = 0
                 continue
 
-            selected_option = options[selected_index]
+            selected_option = options[state.selected_index]
 
             if selected_option == "Exit":
                 break
@@ -386,27 +410,27 @@ def settings_menu(stdscr, interface):
                 filename = get_text_input("Enter a filename for the config file")
                 if not filename:
                     logging.info("Export aborted: No filename provided.")
-                    start_index.pop()
+                    state.start_index.pop()
                     continue  # Go back to the menu
                 if not filename.lower().endswith(".yaml"):
                     filename += ".yaml"
 
                 try:
                     config_text = config_export(interface)
-                    yaml_file_path = os.path.join(app_directory, config_folder, filename)
+                    yaml_file_path = os.path.join(config_folder, filename)
 
                     if os.path.exists(yaml_file_path):
                         overwrite = get_list_input(f"{filename} already exists. Overwrite?", None, ["Yes", "No"])
                         if overwrite == "No":
                             logging.info("Export cancelled: User chose not to overwrite.")
-                            start_index.pop()
+                            state.start_index.pop()
                             continue  # Return to menu
                     os.makedirs(os.path.dirname(yaml_file_path), exist_ok=True)
                     with open(yaml_file_path, "w", encoding="utf-8") as file:
                         file.write(config_text)
                     logging.info(f"Config file saved to {yaml_file_path}")
                     dialog(stdscr, "Config File Saved:", yaml_file_path)
-                    start_index.pop()
+                    state.start_index.pop()
                     continue
                 except PermissionError:
                     logging.error(f"Permission denied: Unable to write to {yaml_file_path}")
@@ -414,18 +438,17 @@ def settings_menu(stdscr, interface):
                     logging.error(f"OS error while saving config: {e}")
                 except Exception as e:
                     logging.error(f"Unexpected error: {e}")
-                start_index.pop()
+                state.start_index.pop()
                 continue
                 
             elif selected_option == "Load Config File":
-                folder_path = os.path.join(app_directory, config_folder)
 
                 # Check if folder exists and is not empty
-                if not os.path.exists(folder_path) or not any(os.listdir(folder_path)):
+                if not os.path.exists(config_folder) or not any(os.listdir(config_folder)):
                     dialog(stdscr, "", " No config files found. Export a config first.")
                     continue  # Return to menu
 
-                file_list = [f for f in os.listdir(folder_path) if os.path.isfile(os.path.join(folder_path, f))]
+                file_list = [f for f in os.listdir(config_folder) if os.path.isfile(os.path.join(config_folder, f))]
 
                 # Ensure file_list is not empty before proceeding
                 if not file_list:
@@ -434,11 +457,11 @@ def settings_menu(stdscr, interface):
 
                 filename = get_list_input("Choose a config file", None, file_list)
                 if filename:
-                    file_path = os.path.join(app_directory, config_folder, filename)
+                    file_path = os.path.join(config_folder, filename)
                     overwrite = get_list_input(f"Are you sure you want to load {filename}?", None, ["Yes", "No"])
                     if overwrite == "Yes":
                         config_import(interface, file_path)
-                start_index.pop()
+                state.start_index.pop()
                 continue
 
             elif selected_option == "Config URL":
@@ -450,7 +473,7 @@ def settings_menu(stdscr, interface):
                     if overwrite == "Yes":
                         interface.localNode.setURL(new_value)
                         logging.info(f"New Config URL sent to node")
-                start_index.pop()
+                state.start_index.pop()
                 continue
 
             elif selected_option == "Reboot":
@@ -458,7 +481,7 @@ def settings_menu(stdscr, interface):
                 if confirmation == "Yes":
                     interface.localNode.reboot()
                     logging.info(f"Node Reboot Requested by menu")
-                start_index.pop()
+                state.start_index.pop()
                 continue
 
             elif selected_option == "Reset Node DB":
@@ -466,7 +489,7 @@ def settings_menu(stdscr, interface):
                 if confirmation == "Yes":
                     interface.localNode.resetNodeDb()
                     logging.info(f"Node DB Reset Requested by menu")
-                start_index.pop()
+                state.start_index.pop()
                 continue
 
             elif selected_option == "Shutdown":
@@ -474,7 +497,7 @@ def settings_menu(stdscr, interface):
                 if confirmation == "Yes":
                     interface.localNode.shutdown()
                     logging.info(f"Node Shutdown Requested by menu")
-                start_index.pop()
+                state.start_index.pop()
                 continue
 
             elif selected_option == "Factory Reset":
@@ -482,22 +505,28 @@ def settings_menu(stdscr, interface):
                 if confirmation == "Yes":
                     interface.localNode.factoryReset()
                     logging.info(f"Factory Reset Requested by menu")
-                start_index.pop()
+                state.start_index.pop()
                 continue
 
             elif selected_option == "App Settings":
                 menu_win.clear()
                 menu_win.refresh()
-                json_editor(stdscr)  # Open the App Settings menu
+                state.menu_path.append("App Settings")
+                state.menu_index.append(state.selected_index)
+                json_editor(stdscr, state)  # Open the App Settings menu
+                state.current_menu = menu["Main Menu"]
+                state.menu_path = ["Main Menu"]
+                state.start_index.pop()
+                state.selected_index = 4
                 continue
                 # need_redraw = True
                 
-            field_info = current_menu.get(selected_option)
+            field_info = state.current_menu.get(selected_option)
             if isinstance(field_info, tuple):
                 field, current_value = field_info
 
                 # Transform the menu path to get the full key
-                transformed_path = transform_menu_path(menu_path)
+                transformed_path = transform_menu_path(state.menu_path)
                 full_key = '.'.join(transformed_path + [selected_option])
 
                 # Fetch human-readable name from field_mapping
@@ -507,70 +536,73 @@ def settings_menu(stdscr, interface):
                     if selected_option in ['longName', 'shortName']:
                         new_value = get_text_input(f"{human_readable_name} is currently: {current_value}")
                         new_value = current_value if new_value is None else new_value
-                        current_menu[selected_option] = (field, new_value)
+                        state.current_menu[selected_option] = (field, new_value)
 
                     elif selected_option == 'isLicensed':
                         new_value = get_list_input(f"{human_readable_name} is currently: {current_value}", str(current_value),  ["True", "False"])
                         new_value = new_value == "True"
-                        current_menu[selected_option] = (field, new_value)
+                        state.current_menu[selected_option] = (field, new_value)
 
-                    for option, (field, value) in current_menu.items():
+                    for option, (field, value) in state.current_menu.items():
                         modified_settings[option] = value
 
-                    start_index.pop()
+                    state.start_index.pop()
 
                 elif selected_option in ['latitude', 'longitude', 'altitude']:
                     new_value = get_text_input(f"{human_readable_name} is currently: {current_value}")
                     new_value = current_value if new_value is None else new_value
-                    current_menu[selected_option] = (field, new_value)
+                    state.current_menu[selected_option] = (field, new_value)
 
                     for option in ['latitude', 'longitude', 'altitude']:
-                        if option in current_menu:
-                            modified_settings[option] = current_menu[option][1]
+                        if option in state.current_menu:
+                            modified_settings[option] = state.current_menu[option][1]
 
-                    start_index.pop()
+                    state.start_index.pop()
 
                 elif selected_option == "admin_key":
                     new_values = get_admin_key_input(current_value)
                     new_value = current_value if new_values is None else [base64.b64decode(key) for key in new_values]
-                    start_index.pop()
+                    state.start_index.pop()
 
                 elif field.type == 8:  # Handle boolean type
-                    new_value = get_list_input(human_readable_name, str(current_value),  ["True", "False"])
-                    new_value = new_value == "True" or new_value is True
-                    start_index.pop()
+                    new_value = get_list_input(human_readable_name, str(current_value), ["True", "False"])
+                    if new_value == "Not Set":
+                        pass  # Leave it as-is
+                    else:
+                        new_value = new_value == "True" or new_value is True
+                    state.start_index.pop()
 
                 elif field.label == field.LABEL_REPEATED:  # Handle repeated field - Not currently used
                     new_value = get_repeated_input(current_value)
                     new_value = current_value if new_value is None else new_value.split(", ")
-                    start_index.pop()
+                    state.start_index.pop()
 
                 elif field.enum_type:  # Enum field
                     enum_options = {v.name: v.number for v in field.enum_type.values}
                     new_value_name = get_list_input(human_readable_name, current_value, list(enum_options.keys()))
                     new_value = enum_options.get(new_value_name, current_value)
-                    start_index.pop()
+                    state.start_index.pop()
 
                 elif field.type == 7: # Field type 7 corresponds to FIXED32
                     new_value = get_fixed32_input(current_value)
-                    start_index.pop()
+                    state.start_index.pop()
 
                 elif field.type == 13: # Field type 13 corresponds to UINT32
                     new_value = get_text_input(f"{human_readable_name} is currently: {current_value}")
                     new_value = current_value if new_value is None else int(new_value)
-                    start_index.pop()
+                    state.start_index.pop()
 
                 elif field.type == 2: # Field type 13 corresponds to INT64
                     new_value = get_text_input(f"{human_readable_name} is currently: {current_value}")
                     new_value = current_value if new_value is None else float(new_value)
-                    start_index.pop()
+                    state.start_index.pop()
 
                 else:  # Handle other field types
                     new_value = get_text_input(f"{human_readable_name} is currently: {current_value}")
                     new_value = current_value if new_value is None else new_value
-                    start_index.pop()
+                    state.start_index.pop()
                 
-                for key in menu_path[3:]:  # Skip "Main Menu"
+                for key in state.menu_path[3:]:  # Skip "Main Menu"
                     modified_settings = modified_settings.setdefault(key, {})
 
                 # Add the new value to the appropriate level
@@ -581,12 +613,12 @@ def settings_menu(stdscr, interface):
                     enum_value_descriptor = field.enum_type.values_by_number.get(new_value)
                     new_value = enum_value_descriptor.name if enum_value_descriptor else new_value
 
-                current_menu[selected_option] = (field, new_value)
+                state.current_menu[selected_option] = (field, new_value)
             else:
-                current_menu = current_menu[selected_option]
-                menu_path.append(selected_option)
-                menu_index.append(selected_index)
-                selected_index = 0
+                state.current_menu = state.current_menu[selected_option]
+                state.menu_path.append(selected_option)
+                state.menu_index.append(state.selected_index)
+                state.selected_index = 0
 
 
         elif key == curses.KEY_LEFT:
@@ -596,22 +628,22 @@ def settings_menu(stdscr, interface):
             help_win.erase()
 
             # max_help_lines = 4
-            # draw_help_window(menu_win.getbegyx()[0], menu_win.getbegyx()[1], menu_win.getmaxyx()[0], max_help_lines, current_menu, selected_index, transform_menu_path(menu_path))
+            # draw_help_window(menu_win.getbegyx()[0], menu_win.getbegyx()[1], menu_win.getmaxyx()[0], max_help_lines, state.current_menu, selected_index, transform_menu_path(state.menu_path))
 
             menu_win.refresh()
             help_win.refresh()
 
-            if len(menu_path) < 2:
+            if len(state.menu_path) < 2:
                 modified_settings.clear()
 
             # Navigate back to the previous menu
-            if len(menu_path) > 1:
-                menu_path.pop()
-                current_menu = menu["Main Menu"]
-                for step in menu_path[1:]:
-                    current_menu = current_menu.get(step, {})
-                selected_index = menu_index.pop()
-                start_index.pop()
+            if len(state.menu_path) > 1:
+                state.menu_path.pop()
+                state.current_menu = menu["Main Menu"]
+                for step in state.menu_path[1:]:
+                    state.current_menu = state.current_menu.get(step, {})
+                state.selected_index = state.menu_index.pop()
+                state.start_index.pop()
                 
         elif key == 27:  # Escape key
             menu_win.erase()

contact/ui/default_config.py

@@ -65,7 +65,9 @@ def initialize_config():
         "settings_save": ["green", "black"],
         "settings_breadcrumbs": ["white", "black"],
         "settings_warning": ["red", "black"],
-        "settings_note": ["green", "black"]
+        "settings_note": ["green", "black"],
+        "node_favorite": ["green", "black"],
+        "node_ignored": ["red", "black"]
     }
     COLOR_CONFIG_LIGHT = {
         "default": ["black", "white"],
@@ -89,7 +91,9 @@ def initialize_config():
         "settings_save": ["green", "white"],
         "settings_breadcrumbs": ["black", "white"],
         "settings_warning": ["red", "white"],
-        "settings_note": ["green", "white"]
+        "settings_note": ["green", "white"],
+        "node_favorite": ["green", "white"],
+        "node_ignored": ["red", "white"]
     }
     COLOR_CONFIG_GREEN = {
         "default": ["green", "black"],
@@ -115,7 +119,9 @@ def initialize_config():
         "settings_save": ["green", "black"],
         "settings_breadcrumbs": ["green", "black"],
         "settings_warning": ["green", "black"],
-        "settings_note": ["green", "black"]
+        "settings_note": ["green", "black"],
+        "node_favorite": ["cyan", "white"],
+        "node_ignored": ["red", "white"]
     }
     default_config_variables = {
         "db_file_path": db_file_path,

contact/ui/dialog.py

@@ -1,5 +1,5 @@
 import curses
-from ui.colors import get_color
+from contact.ui.colors import get_color
 
 def dialog(stdscr, title, message):
     height, width = stdscr.getmaxyx()

contact/ui/splash.py

@@ -1,5 +1,5 @@
 import curses
-from ui.colors import get_color
+from contact.ui.colors import get_color
 
 def draw_splash(stdscr):
     curses.curs_set(0)

contact/ui/ui_state.py

@@ -0,0 +1,8 @@
+class MenuState:
+    def __init__(self):
+        self.menu_index = []        # Row we left the previous menus
+        self.start_index = [0]      # Row to start the menu if it doesn't all fit
+        self.selected_index = 0     # Selected Row
+        self.current_menu = {}      # Contents of the current menu
+        self.menu_path = []         # Menu Path
+        self.show_save_option = False

contact/ui/user_config.py

@@ -0,0 +1,373 @@
+import os
+import json
+import curses
+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 = 80
+save_option = "Save Changes"
+sensitive_settings = []
+
+def edit_color_pair(key, current_value):
+
+    """
+    Allows the user to select a foreground and background color for a key.
+    """
+    color_list = [" "] + list(COLOR_MAP.keys())
+    fg_color = get_list_input(f"Select Foreground Color for {key}", current_value[0], color_list)
+    bg_color = get_list_input(f"Select Background Color for {key}", current_value[1], color_list)
+
+    return [fg_color, bg_color]
+
+def edit_value(key, current_value, state):
+
+    height = 10
+    input_width = width - 16  # Allow space for "New Value: "
+    start_y = (curses.LINES - height) // 2
+    start_x = (curses.COLS - width) // 2
+
+    # Create a centered window
+    edit_win = curses.newwin(height, width, start_y, start_x)
+    edit_win.bkgd(get_color("background"))
+    edit_win.attrset(get_color("window_frame"))
+    edit_win.border()
+
+    # Display instructions
+    edit_win.addstr(1, 2, f"Editing {key}", get_color("settings_default", bold=True))
+    edit_win.addstr(3, 2, "Current Value:", get_color("settings_default"))
+
+    wrap_width = width - 4  # Account for border and padding
+    wrapped_lines = [current_value[i:i+wrap_width] for i in range(0, len(current_value), wrap_width)]
+
+    for i, line in enumerate(wrapped_lines[:4]):  # Limit display to fit the window height
+        edit_win.addstr(4 + i, 2, line, get_color("settings_default"))
+
+    edit_win.refresh()
+
+    # Handle theme selection dynamically
+    if key == "theme":
+        # Load theme names dynamically from the JSON
+        theme_options = [k.split("_", 2)[2].lower() for k in loaded_config.keys() if k.startswith("COLOR_CONFIG")]
+        return get_list_input("Select Theme", current_value, theme_options)
+    elif key == "node_sort":
+        sort_options = ['lastHeard', 'name', 'hops']
+        return get_list_input("Sort By", current_value, sort_options)
+
+    # Standard Input Mode (Scrollable)
+    edit_win.addstr(7, 2, "New Value: ", get_color("settings_default"))
+    curses.curs_set(1)
+
+    scroll_offset = 0  # Determines which part of the text is visible
+    user_input = ""
+    input_position = (7, 13)  # Tuple for row and column
+    row, col = input_position  # Unpack tuple
+    while True:
+        visible_text = user_input[scroll_offset:scroll_offset + input_width]  # Only show what fits
+        edit_win.addstr(row, col, " " * input_width, get_color("settings_default"))  # Clear previous text
+        edit_win.addstr(row, col, visible_text, get_color("settings_default"))  # Display text
+        edit_win.refresh()
+
+        edit_win.move(row, col + min(len(user_input) - scroll_offset, input_width))  # Adjust cursor position
+        key = edit_win.get_wch()
+
+        if key in (chr(27), curses.KEY_LEFT):  # ESC or Left Arrow
+            curses.curs_set(0)
+            return current_value  # Exit without returning a value
+        
+        elif key in (chr(curses.KEY_ENTER), chr(10), chr(13)):
+            break
+
+        elif key in (curses.KEY_BACKSPACE, chr(127)):  # Backspace
+            if user_input:  # Only process if there's something to delete
+                user_input = user_input[:-1]
+                if scroll_offset > 0 and len(user_input) < scroll_offset + input_width:
+                    scroll_offset -= 1  # Move back if text is shorter than scrolled area
+        else:
+            if isinstance(key, str):
+                user_input += key
+            else:
+                user_input += chr(key)
+
+            if len(user_input) > input_width:  # Scroll if input exceeds visible area
+                scroll_offset += 1
+
+    curses.curs_set(0)
+    return user_input if user_input else current_value
+
+
+def display_menu(state):
+    """
+    Render the configuration menu with a Save button directly added to the window.
+    """
+    num_items = len(state.current_menu) + (1 if state.show_save_option else 0)
+
+    # Determine menu items based on the type of current_menu
+    if isinstance(state.current_menu, dict):
+        options = list(state.current_menu.keys())
+    elif isinstance(state.current_menu, list):
+        options = [f"[{i}]" for i in range(len(state.current_menu))]
+    else:
+        options = []  # Fallback in case of unexpected data types
+
+    # Calculate dynamic dimensions for the menu
+    max_menu_height = curses.LINES
+    menu_height = min(max_menu_height, num_items + 5)  
+    num_items = len(options)
+    start_y = (curses.LINES - menu_height) // 2
+    start_x = (curses.COLS - width) // 2
+
+    # Create the window
+    menu_win = curses.newwin(menu_height, width, start_y, start_x)
+    menu_win.erase()
+    menu_win.bkgd(get_color("background"))
+    menu_win.attrset(get_color("window_frame"))
+    menu_win.border()
+    menu_win.keypad(True)
+
+    # Create the pad for scrolling
+    menu_pad = curses.newpad(num_items + 1, width - 8)
+    menu_pad.bkgd(get_color("background"))
+
+    # Display the menu path
+    header = " > ".join(state.menu_path)
+    if len(header) > width - 4:
+        header = header[:width - 7] + "..."
+    menu_win.addstr(1, 2, header, get_color("settings_breadcrumbs", bold=True))
+
+    # Populate the pad with menu options
+    for idx, key in enumerate(options):
+        value = state.current_menu[key] if isinstance(state.current_menu, dict) else state.current_menu[int(key.strip("[]"))]
+        display_key = f"{key}"[:width // 2 - 2]
+        display_value = (
+            f"{value}"[:width // 2 - 8]
+        )
+
+        color = get_color("settings_default", reverse=(idx == state.selected_index))
+        menu_pad.addstr(idx, 0, f"{display_key:<{width // 2 - 2}} {display_value}".ljust(width - 8), color)
+
+    # Add Save button to the main window
+    if state.show_save_option:
+        save_position = menu_height - 2
+        menu_win.addstr(save_position, (width - len(save_option)) // 2, save_option, get_color("settings_save", reverse=(state.selected_index == len(state.current_menu))))
+
+    menu_win.refresh()
+    menu_pad.refresh(
+        state.start_index[-1], 0,
+        menu_win.getbegyx()[0] + 3, menu_win.getbegyx()[1] + 4,
+        menu_win.getbegyx()[0] + 3 + menu_win.getmaxyx()[0] - 5 - (2 if state.show_save_option else 0),
+        menu_win.getbegyx()[1] + menu_win.getmaxyx()[1] - 4
+    )
+
+    max_index = num_items + (1 if state.show_save_option else 0) - 1
+    visible_height = menu_win.getmaxyx()[0] - 5 - (2 if state.show_save_option else 0)
+
+    draw_arrows(menu_win, visible_height, max_index, state)
+
+    return menu_win, menu_pad, options
+
+
+def move_highlight(old_idx, options, menu_win, menu_pad, state):
+    if old_idx == state.selected_index:  # No-op
+        return
+
+    max_index = len(options) + (1 if state.show_save_option else 0) - 1
+    visible_height = menu_win.getmaxyx()[0] - 5 - (2 if state.show_save_option else 0)
+
+    # Adjust state.start_index only when moving out of visible range
+    if state.selected_index == max_index and state.show_save_option:
+        pass
+    elif state.selected_index < state.start_index[-1]:  # Moving above the visible area
+        state.start_index[-1] = state.selected_index
+    elif state.selected_index >= state.start_index[-1] + visible_height:  # Moving below the visible area
+        state.start_index[-1] = state.selected_index - visible_height
+    pass
+
+    # Ensure state.start_index is within bounds
+    state.start_index[-1] = max(0, min(state.start_index[-1], max_index - visible_height + 1))
+
+    # Clear old selection
+    if state.show_save_option and old_idx == max_index:
+        menu_win.chgat(menu_win.getmaxyx()[0] - 2, (width - len(save_option)) // 2, len(save_option), get_color("settings_save"))
+    else:
+        menu_pad.chgat(old_idx, 0, menu_pad.getmaxyx()[1], get_color("settings_sensitive") if options[old_idx] in sensitive_settings else get_color("settings_default"))
+
+    # Highlight new selection
+    if state.show_save_option and state.selected_index == max_index:
+        menu_win.chgat(menu_win.getmaxyx()[0] - 2, (width - len(save_option)) // 2, len(save_option), get_color("settings_save", reverse=True))
+    else:
+        menu_pad.chgat(state.selected_index, 0, menu_pad.getmaxyx()[1], get_color("settings_sensitive", reverse=True) if options[state.selected_index] in sensitive_settings else get_color("settings_default", reverse=True))
+
+    menu_win.refresh()
+    
+    # Refresh pad only if scrolling is needed
+    menu_pad.refresh(state.start_index[-1], 0,
+                     menu_win.getbegyx()[0] + 3, menu_win.getbegyx()[1] + 4,
+                     menu_win.getbegyx()[0] + 3 + visible_height, 
+                     menu_win.getbegyx()[1] + menu_win.getmaxyx()[1] - 4)
+
+    draw_arrows(menu_win, visible_height, max_index, state)
+
+
+def draw_arrows(win, visible_height, max_index, state):
+
+    mi = max_index - (2 if state.show_save_option else 0) 
+
+    if visible_height < mi:
+        if state.start_index[-1] > 0:
+            win.addstr(3, 2, "▲", get_color("settings_default"))
+        else:
+            win.addstr(3, 2, " ", get_color("settings_default"))
+
+        if mi - state.start_index[-1] >= visible_height + (0 if state.show_save_option else 1) :
+            win.addstr(visible_height + 3, 2, "▼", get_color("settings_default"))
+        else:
+            win.addstr(visible_height + 3, 2, " ", get_color("settings_default"))
+
+
+def json_editor(stdscr, state):
+
+    state.selected_index = 0  # Track the selected option
+
+    script_dir = os.path.dirname(os.path.abspath(__file__))
+    parent_dir = os.path.abspath(os.path.join(script_dir, os.pardir))
+    file_path = os.path.join(parent_dir, "config.json")
+
+    state.show_save_option = True  # Always show the Save button
+
+    # Ensure the file exists
+    if not os.path.exists(file_path):
+        with open(file_path, "w") as f:
+            json.dump({}, f)
+
+    # Load JSON data
+    with open(file_path, "r") as f:
+        original_data = json.load(f)
+
+    data = original_data  # Reference to the original data
+    state.current_menu = data  # Track the current level of the menu
+
+    # Render the menu
+    menu_win, menu_pad, options = display_menu(state)
+    need_redraw = True
+
+    while True:
+        if(need_redraw):
+            menu_win, menu_pad, options = display_menu(state)
+            menu_win.refresh()
+            need_redraw = False
+            
+        max_index = len(options) + (1 if state.show_save_option else 0) - 1
+        key = menu_win.getch()
+
+        if key == curses.KEY_UP:
+
+            old_selected_index = state.selected_index
+            state.selected_index = max_index if state.selected_index == 0 else state.selected_index - 1
+            move_highlight(old_selected_index, options, menu_win, menu_pad, state)
+
+        elif key == curses.KEY_DOWN:
+
+            old_selected_index = state.selected_index
+            state.selected_index = 0 if state.selected_index == max_index else state.selected_index + 1
+            move_highlight(old_selected_index, options, menu_win, menu_pad, state)
+
+        elif key == ord("\t") and state.show_save_option:
+            old_selected_index = state.selected_index
+            state.selected_index = max_index
+            move_highlight(old_selected_index, options, menu_win, menu_pad, state)
+
+        elif key in (curses.KEY_RIGHT, 10, 13):  # 10 = \n, 13 = carriage return
+
+            need_redraw = True
+            menu_win.erase()
+            menu_win.refresh()
+
+            if state.selected_index < len(options):  # Handle selection of a menu item
+                selected_key = options[state.selected_index]
+                state.menu_path.append(str(selected_key))
+                state.start_index.append(0)
+                state.menu_index.append(state.selected_index)
+                
+                # Handle nested data
+                if isinstance(state.current_menu, dict):
+                    if selected_key in state.current_menu:
+                        selected_data = state.current_menu[selected_key]
+                    else:
+                        continue  # Skip invalid key
+                elif isinstance(state.current_menu, list):
+                    selected_data = state.current_menu[int(selected_key.strip("[]"))]
+
+                if isinstance(selected_data, list) and len(selected_data) == 2:
+                    # Edit color pair
+                    new_value = edit_color_pair(selected_key, selected_data)
+                    state.menu_path.pop()
+                    state.start_index.pop()
+                    state.menu_index.pop()
+                    state.current_menu[selected_key] = new_value
+
+                elif isinstance(selected_data, (dict, list)):
+                    # Navigate into nested data
+                    state.current_menu = selected_data
+                    state.selected_index = 0  # Reset the selected index
+
+                else:
+                    # General value editing
+                    new_value = edit_value(selected_key, selected_data, state)
+                    state.menu_path.pop()
+                    state.menu_index.pop()
+                    state.start_index.pop()
+                    state.current_menu[selected_key] = new_value
+                    need_redraw = True
+                
+            else:
+                # Save button selected
+                save_json(file_path, data)
+                stdscr.refresh()
+                continue
+
+        elif key in (27, curses.KEY_LEFT):  # Escape or Left Arrow
+
+            need_redraw = True
+            menu_win.erase()
+            menu_win.refresh()
+
+            # state.selected_index = state.menu_index[-1]
+
+            # Navigate back in the menu
+            if len(state.menu_path) > 2:
+                state.menu_path.pop()
+                state.start_index.pop()
+                state.current_menu = data
+
+                for path in state.menu_path[2:]:
+                    state.current_menu = state.current_menu[path] if isinstance(state.current_menu, dict) else state.current_menu[int(path.strip("[]"))]
+
+            else:
+                # Exit the editor
+                menu_win.clear()
+                menu_win.refresh()
+                
+                break
+
+
+def save_json(file_path, data):
+    formatted_json = format_json_single_line_arrays(data)
+    with open(file_path, "w", encoding="utf-8") as f:
+        f.write(formatted_json)
+    setup_colors(reinit=True)
+
+def main(stdscr):
+    from contact.ui.ui_state import MenuState
+
+    state = MenuState()
+    if len(state.menu_path) == 0:
+        state.menu_path = ["App Settings"]  # Initialize if not set
+
+    curses.curs_set(0)
+    stdscr.keypad(True)
+    setup_colors()
+    json_editor(stdscr, state)
+
+if __name__ == "__main__":
+    curses.wrapper(main)

contact/utilities/arg_parser.py

@@ -33,5 +33,14 @@ def setup_parser():
         default=None,
         const="any"
     )
+    parser.add_argument(
+        "--settings",
+        "--set",
+        "--control",
+        "-c",
+        help="Launch directly into the settings",
+        action="store_true"
+    )
+
 
     return parser

contact/utilities/db_handler.py

@@ -3,9 +3,9 @@ import time
 import logging
 from datetime import datetime
 
-from utilities.utils import decimal_to_hex
-import ui.default_config as config
-import 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
@@ -190,7 +190,6 @@ def maybe_store_nodeinfo_in_db(packet):
     except Exception as e:
         logging.error(f"Unexpected error in maybe_store_nodeinfo_in_db: {e}")
 
-
 def update_node_info_in_db(user_id, long_name=None, short_name=None, hw_model=None, is_licensed=None, role=None, public_key=None, chat_archived=None):
     """Update or insert node information into the database, preserving unchanged fields."""
     try:
@@ -200,7 +199,6 @@ def update_node_info_in_db(user_id, long_name=None, short_name=None, hw_model=No
             db_cursor = db_connection.cursor()
             table_name = f'"{globals.myNodeNum}_nodedb"'  # Quote in case of numeric names
 
-
             table_columns = [i[1] for i in db_cursor.execute(f'PRAGMA table_info({table_name})')]
             if "chat_archived" not in table_columns:
                 update_table_query = f"ALTER TABLE {table_name} ADD COLUMN chat_archived INTEGER"
@@ -221,6 +219,14 @@ def update_node_info_in_db(user_id, long_name=None, short_name=None, hw_model=No
                 public_key = public_key if public_key is not None else existing_public_key
                 chat_archived = chat_archived if chat_archived is not None else existing_chat_archived
 
+            long_name = long_name if long_name is not None else "Meshtastic " + str(decimal_to_hex(user_id)[-4:])
+            short_name = short_name if short_name is not None else str(decimal_to_hex(user_id)[-4:])
+            hw_model = hw_model if hw_model is not None else "UNSET"
+            is_licensed = is_licensed if is_licensed is not None else 0
+            role = role if role is not None else "CLIENT"
+            public_key = public_key if public_key is not None else ""
+            chat_archived = chat_archived if chat_archived is not None else 0
+
             # Upsert logic
             upsert_query = f'''
                 INSERT INTO {table_name} (user_id, long_name, short_name, hw_model, is_licensed, role, public_key, chat_archived)

contact/utilities/input_handlers.py

@@ -3,7 +3,7 @@ import binascii
 import curses
 import ipaddress
 import re
-from 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."""
@@ -372,6 +372,11 @@ def get_list_input(prompt, current_option, list_options):
     list_pad.refresh(0, 0,
                     list_win.getbegyx()[0] + 3, list_win.getbegyx()[1] + 4,
                     list_win.getbegyx()[0] + list_win.getmaxyx()[0] - 2, list_win.getbegyx()[1] + list_win.getmaxyx()[1] - 4)
+    
+    max_index = len(list_options) - 1
+    visible_height = list_win.getmaxyx()[0] - 5
+
+    draw_arrows(list_win, visible_height, max_index, 0)
 
     while True:
         key = list_win.getch()
@@ -385,8 +390,12 @@ def get_list_input(prompt, current_option, list_options):
             selected_index = min(len(list_options) - 1, selected_index + 1)
             move_highlight(old_selected_index, selected_index, list_options, list_win, list_pad)
         elif key == ord('\n'):  # Enter key
+            list_win.clear()
+            list_win.refresh()
             return list_options[selected_index]
         elif key == 27 or key == curses.KEY_LEFT:  # ESC or Left Arrow
+            list_win.clear()
+            list_win.refresh()
             return current_option
 
 
@@ -424,5 +433,22 @@ def move_highlight(old_idx, new_idx, options, list_win, list_pad):
                      list_win.getbegyx()[0] + 3, list_win.getbegyx()[1] + 4,
                      list_win.getbegyx()[0] + 3 + visible_height, 
                      list_win.getbegyx()[1] + list_win.getmaxyx()[1] - 4)
+    
+    draw_arrows(list_win, visible_height, max_index, scroll_offset)
 
-    return scroll_offset  # Return updated scroll_offset to be stored externally
+    return scroll_offset  # Return updated scroll_offset to be stored externally
+
+
+def draw_arrows(win, visible_height, max_index, start_index):
+
+    if visible_height < max_index:
+        if start_index > 0:
+            win.addstr(3, 2, "▲", get_color("settings_default"))
+        else:
+            win.addstr(3, 2, " ", get_color("settings_default"))
+
+        if max_index - start_index > visible_height:
+            win.addstr(visible_height + 3, 2, "▼", get_color("settings_default"))
+        else:
+            win.addstr(visible_height + 3, 2, " ", get_color("settings_default"))
+        

contact/utilities/interfaces.py

@@ -1,6 +1,6 @@
 import logging
 import meshtastic.serial_interface, meshtastic.tcp_interface, meshtastic.ble_interface
-import globals
+import contact.globals as globals
 
 def initialize_interface(args):
     try:

contact/utilities/save_to_radio.py

@@ -4,7 +4,7 @@ import logging
 import base64
 import time
 
-def save_changes(interface, menu_path, modified_settings):
+def save_changes(interface, modified_settings, state):
     """
     Save changes to the device based on modified settings.
     :param interface: Meshtastic interface instance
@@ -52,8 +52,8 @@ def save_changes(interface, menu_path, modified_settings):
             if not modified_settings:
                 return
 
-        if menu_path[1] ==  "Radio Settings" or menu_path[1] == "Module Settings":
-            config_category = menu_path[2].lower() # for radio and module configs
+        if state.menu_path[1] ==  "Radio Settings" or state.menu_path[1] == "Module Settings":
+            config_category = state.menu_path[2].lower() # for radio and module configs
 
             if {'latitude', 'longitude', 'altitude'} & modified_settings.keys():
                 lat = float(modified_settings.get('latitude', 0.0))
@@ -64,7 +64,7 @@ def save_changes(interface, menu_path, modified_settings):
                 logging.info(f"Updated {config_category} with Latitude: {lat} and Longitude {lon} and Altitude {alt}")
                 return
 
-        elif menu_path[1] == "User Settings":  # for user configs
+        elif state.menu_path[1] == "User Settings":  # for user configs
             config_category = "User Settings"
             long_name = modified_settings.get("longName")
             short_name = modified_settings.get("shortName")
@@ -77,11 +77,11 @@ def save_changes(interface, menu_path, modified_settings):
 
             return
         
-        elif menu_path[1] == "Channels":    # for channel configs
+        elif state.menu_path[1] == "Channels":    # for channel configs
             config_category = "Channels"
 
             try:
-                channel = menu_path[-1]
+                channel = state.menu_path[-1]
                 channel_num = int(channel.split()[-1]) - 1
             except (IndexError, ValueError) as e:
                 channel_num = None

contact/utilities/utils.py

@@ -1,7 +1,7 @@
-import globals
+import contact.globals as globals
 import datetime
 from meshtastic.protobuf import config_pb2
-import 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."""
@@ -47,7 +47,15 @@ def get_node_list():
                 return node['hopsAway'] if 'hopsAway' in node else 100
             else:
                 return node
+
         sorted_nodes = sorted(globals.interface.nodes.values(), key = node_sort)
+
+        # Move favorite nodes to the beginning
+        sorted_nodes = sorted(sorted_nodes, key = lambda node: node['isFavorite'] if 'isFavorite' in node else False, reverse = True)
+
+        # Move ignored nodes to the end
+        sorted_nodes = sorted(sorted_nodes, key = lambda node: node['isIgnored'] if 'isIgnored' in node else False)
+
         node_list = [node['num'] for node in sorted_nodes if node['num'] != my_node_num]
         return [my_node_num] + node_list  # Ensuring your node is always first
     return []

pyproject.toml

@@ -0,0 +1,24 @@
+[project]
+name = "contact"
+version = "1.3.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 = [
+    {name = "Ben Lipsey",email = "ben@pdxlocations.com"}
+]
+license = "GPL-3.0-only"
+readme = "README.md"
+requires-python = ">=3.9,<3.14"
+dependencies = [
+    "meshtastic (>=2.6.0,<3.0.0)"
+]
+
+[project.urls]
+Homepage = "https://github.com/pdxlocations/contact"
+Issues = "https://github.com/pdxlocations/contact/issues"
+
+[build-system]
+requires = ["poetry-core>=2.0.0,<3.0.0"]
+build-backend = "poetry.core.masonry.api"
+
+[tool.poetry.scripts]
+contact = "contact.__main__:start"

ui/user_config.py

@@ -1,321 +0,0 @@
-import os
-import json
-import curses
-from ui.colors import get_color, setup_colors, COLOR_MAP
-from ui.default_config import format_json_single_line_arrays, loaded_config
-from utilities.input_handlers import get_list_input
-
-width = 60
-save_option_text = "Save Changes"
-
-def edit_color_pair(key, current_value):
-
-    """
-    Allows the user to select a foreground and background color for a key.
-    """
-    color_list = [" "] + list(COLOR_MAP.keys())
-    fg_color = get_list_input(f"Select Foreground Color for {key}", current_value[0], color_list)
-    bg_color = get_list_input(f"Select Background Color for {key}", current_value[1], color_list)
-
-    return [fg_color, bg_color]
-
-def edit_value(key, current_value):
-    width = 60
-    height = 10
-    input_width = width - 16  # Allow space for "New Value: "
-    start_y = (curses.LINES - height) // 2
-    start_x = (curses.COLS - width) // 2
-
-    # Create a centered window
-    edit_win = curses.newwin(height, width, start_y, start_x)
-    edit_win.bkgd(get_color("background"))
-    edit_win.attrset(get_color("window_frame"))
-    edit_win.border()
-
-    # Display instructions
-    edit_win.addstr(1, 2, f"Editing {key}", get_color("settings_default", bold=True))
-    edit_win.addstr(3, 2, "Current Value:", get_color("settings_default"))
-
-    wrap_width = width - 4  # Account for border and padding
-    wrapped_lines = [current_value[i:i+wrap_width] for i in range(0, len(current_value), wrap_width)]
-
-    for i, line in enumerate(wrapped_lines[:4]):  # Limit display to fit the window height
-        edit_win.addstr(4 + i, 2, line, get_color("settings_default"))
-
-    edit_win.refresh()
-
-    # Handle theme selection dynamically
-    if key == "theme":
-        # Load theme names dynamically from the JSON
-        theme_options = [k.split("_", 2)[2].lower() for k in loaded_config.keys() if k.startswith("COLOR_CONFIG")]
-        return get_list_input("Select Theme", current_value, theme_options)
-    elif key == "node_sort":
-        sort_options = ['lastHeard', 'name', 'hops']
-        return get_list_input("Sort By", current_value, sort_options)
-
-    # Standard Input Mode (Scrollable)
-    edit_win.addstr(7, 2, "New Value: ", get_color("settings_default"))
-    curses.curs_set(1)
-
-    scroll_offset = 0  # Determines which part of the text is visible
-    user_input = ""
-    input_position = (7, 13)  # Tuple for row and column
-    row, col = input_position  # Unpack tuple
-    while True:
-        visible_text = user_input[scroll_offset:scroll_offset + input_width]  # Only show what fits
-        edit_win.addstr(row, col, " " * input_width, get_color("settings_default"))  # Clear previous text
-        edit_win.addstr(row, col, visible_text, get_color("settings_default"))  # Display text
-        edit_win.refresh()
-
-        edit_win.move(row, col + min(len(user_input) - scroll_offset, input_width))  # Adjust cursor position
-        key = edit_win.get_wch()
-
-        if key in (chr(27), curses.KEY_LEFT):  # ESC or Left Arrow
-            curses.curs_set(0)
-            return current_value  # Exit without returning a value
-        elif key in (chr(curses.KEY_ENTER), chr(10), chr(13)):
-            break
-        elif key in (curses.KEY_BACKSPACE, chr(127)):  # Backspace
-            if user_input:  # Only process if there's something to delete
-                user_input = user_input[:-1]
-                if scroll_offset > 0 and len(user_input) < scroll_offset + input_width:
-                    scroll_offset -= 1  # Move back if text is shorter than scrolled area
-        else:
-            if isinstance(key, str):
-                user_input += key
-            else:
-                user_input += chr(key)
-
-            if len(user_input) > input_width:  # Scroll if input exceeds visible area
-                scroll_offset += 1
-
-    curses.curs_set(0)
-    return user_input if user_input else current_value
-
-
-def render_menu(current_data, menu_path, selected_index):
-    """
-    Render the configuration menu with a Save button directly added to the window.
-    """
-    # Determine menu items based on the type of current_data
-    if isinstance(current_data, dict):
-        options = list(current_data.keys())
-    elif isinstance(current_data, list):
-        options = [f"[{i}]" for i in range(len(current_data))]
-    else:
-        options = []  # Fallback in case of unexpected data types
-
-    # Calculate dynamic dimensions for the menu
-    num_items = len(options)
-    height = min(curses.LINES - 2, num_items + 6)  # Include space for borders and Save button
-    start_y = (curses.LINES - height) // 2
-    start_x = (curses.COLS - width) // 2
-
-    # Create the window
-    menu_win = curses.newwin(height, width, start_y, start_x)
-    menu_win.clear()
-    menu_win.bkgd(get_color("background"))
-    menu_win.attrset(get_color("window_frame"))
-    menu_win.border()
-    menu_win.keypad(True)
-
-    # Display the menu path
-    header = " > ".join(menu_path)
-    if len(header) > width - 4:
-        header = header[:width - 7] + "..."
-    menu_win.addstr(1, 2, header, get_color("settings_breadcrumbs", bold=True))
-
-    # Create the pad for scrolling
-    menu_pad = curses.newpad(num_items + 1, width - 8)
-    menu_pad.bkgd(get_color("background"))
-
-    # Populate the pad with menu options
-    for idx, key in enumerate(options):
-        value = current_data[key] if isinstance(current_data, dict) else current_data[int(key.strip("[]"))]
-        display_key = f"{key}"[:width // 2 - 2]
-        display_value = (
-            f"{value}"[:width // 2 - 8]
-        )
-
-        color = get_color("settings_default", reverse=(idx == selected_index))
-        menu_pad.addstr(idx, 0, f"{display_key:<{width // 2 - 2}} {display_value}".ljust(width - 8), color)
-
-    # Add Save button to the main window
-    save_button_position = height - 2
-    menu_win.addstr(
-        save_button_position,
-        (width - len(save_option_text)) // 2,
-        save_option_text,
-        get_color("settings_save", reverse=(selected_index == len(options))),
-    )
-
-    # Refresh menu and pad
-    menu_win.refresh()
-    menu_pad.refresh(
-        0,
-        0,
-        menu_win.getbegyx()[0] + 3,
-        menu_win.getbegyx()[1] + 4,
-        
-        menu_win.getbegyx()[0] + menu_win.getmaxyx()[0] - 3,
-        menu_win.getbegyx()[1] + menu_win.getmaxyx()[1] - 4,
-    )
-
-    return menu_win, menu_pad, options
-
-
-def move_highlight(old_idx, new_idx, options, menu_win, menu_pad):
-    if old_idx == new_idx:
-        return # no-op
-
-    show_save_option = True
-
-    max_index = len(options) + (1 if show_save_option else 0) - 1
-
-    if show_save_option and old_idx == max_index: # special case un-highlight "Save" option
-        menu_win.chgat(menu_win.getmaxyx()[0] - 2, (width - len(save_option_text)) // 2, len(save_option_text), get_color("settings_save"))
-    else:
-        menu_pad.chgat(old_idx, 0, menu_pad.getmaxyx()[1], get_color("settings_default"))
-
-    if show_save_option and new_idx == max_index: # special case highlight "Save" option
-        menu_win.chgat(menu_win.getmaxyx()[0] - 2, (width - len(save_option_text)) // 2, len(save_option_text), get_color("settings_save", reverse = True))
-    else:
-       menu_pad.chgat(new_idx, 0,menu_pad.getmaxyx()[1], get_color("settings_default", reverse = True))
-
-    start_index = max(0, new_idx - (menu_win.getmaxyx()[0] - 6))
-
-    menu_win.refresh()
-    menu_pad.refresh(start_index, 0,
-                     menu_win.getbegyx()[0] + 3,
-                     menu_win.getbegyx()[1] + 4,
-                     menu_win.getbegyx()[0] + menu_win.getmaxyx()[0] - 3,
-                     menu_win.getbegyx()[1] + 4 + menu_win.getmaxyx()[1] - 4)
-
-
-def json_editor(stdscr):
-    menu_path = ["App Settings"]
-    selected_index = 0  # Track the selected option
-
-    file_path = "config.json"
-    show_save_option = True  # Always show the Save button
-
-    # Ensure the file exists
-    if not os.path.exists(file_path):
-        with open(file_path, "w") as f:
-            json.dump({}, f)
-
-    # Load JSON data
-    with open(file_path, "r") as f:
-        original_data = json.load(f)
-
-    data = original_data  # Reference to the original data
-    current_data = data  # Track the current level of the menu
-
-    # Render the menu
-    menu_win, menu_pad, options = render_menu(current_data, menu_path, selected_index)
-    need_redraw = True
-
-    while True:
-        if(need_redraw):
-            menu_win, menu_pad, options = render_menu(current_data, menu_path, selected_index)
-            menu_win.refresh()
-            need_redraw = False
-            
-        max_index = len(options) + (1 if show_save_option else 0) - 1
-        key = menu_win.getch()
-
-
-        if key == curses.KEY_UP:
-
-            old_selected_index = selected_index
-            selected_index = max_index if selected_index == 0 else selected_index - 1
-            move_highlight(old_selected_index, selected_index, options, menu_win, menu_pad)
-
-        elif key == curses.KEY_DOWN:
-
-            old_selected_index = selected_index
-            selected_index = 0 if selected_index == max_index else selected_index + 1
-            move_highlight(old_selected_index, selected_index, options, menu_win, menu_pad)
-
-        elif key == ord("\t") and show_save_option:
-            old_selected_index = selected_index
-            selected_index = max_index
-            move_highlight(old_selected_index, selected_index, options, menu_win, menu_pad)
-
-        elif key in (curses.KEY_RIGHT, ord("\n")):
-
-            need_redraw = True
-            menu_win.erase()
-            menu_win.refresh()
-
-
-            if selected_index < len(options):  # Handle selection of a menu item
-                selected_key = options[selected_index]
-
-                # Handle nested data
-                if isinstance(current_data, dict):
-                    if selected_key in current_data:
-                        selected_data = current_data[selected_key]
-                    else:
-                        continue  # Skip invalid key
-                elif isinstance(current_data, list):
-                    selected_data = current_data[int(selected_key.strip("[]"))]
-
-                if isinstance(selected_data, list) and len(selected_data) == 2:
-                    # Edit color pair
-                    new_value = edit_color_pair(
-                        selected_key, selected_data)
-                    current_data[selected_key] = new_value
-
-                elif isinstance(selected_data, (dict, list)):
-                    # Navigate into nested data
-                    menu_path.append(str(selected_key))
-                    current_data = selected_data
-                    selected_index = 0  # Reset the selected index
-
-                else:
-                    # General value editing
-                    new_value = edit_value(selected_key, selected_data)
-                    current_data[selected_key] = new_value
-                    need_redraw = True
-
-            else:
-                # Save button selected
-                save_json(file_path, data)
-                stdscr.refresh()
-                continue
-
-        elif key in (27, curses.KEY_LEFT):  # Escape or Left Arrow
-
-            need_redraw = True
-            menu_win.erase()
-            menu_win.refresh()
-
-            # Navigate back in the menu
-            if len(menu_path) > 1:
-                menu_path.pop()
-                current_data = data
-                for path in menu_path[1:]:
-                    current_data = current_data[path] if isinstance(current_data, dict) else current_data[int(path.strip("[]"))]
-                selected_index = 0
-            else:
-                # Exit the editor
-                menu_win.clear()
-                menu_win.refresh()
-                break
-
-
-def save_json(file_path, data):
-    formatted_json = format_json_single_line_arrays(data)
-    with open(file_path, "w", encoding="utf-8") as f:
-        f.write(formatted_json)
-    setup_colors(reinit=True)
-
-def main(stdscr):
-    curses.curs_set(0)
-    stdscr.keypad(True)
-    setup_colors()
-    json_editor(stdscr)
-
-if __name__ == "__main__":
-    curses.wrapper(main)