Resolve comments

Signed-off-by: Blake McHale <[email protected]>

Author: bmchalenv

greenwave_monitor/CMakeLists.txt

@@ -111,7 +111,7 @@ if(BUILD_TESTING)
   )
 
   # Add ncurses frontend tests
-  ament_add_pytest_test(test_ncurses_frontend test/test_ncurses_frontend.py
+  ament_add_pytest_test(test_ncurses_frontend_argparse test/test_ncurses_frontend_argparse.py
     TIMEOUT 120
     WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
   )

greenwave_monitor/greenwave_monitor/ncurses_frontend.py

@@ -41,7 +41,7 @@
 class GreenwaveNcursesFrontend(Node):
     """Ncurses frontend for Greenwave Monitor."""
 
-    def __init__(self, hide_unmonitored: bool = False):
+    def __init__(self, show_only_monitored: bool = False):
         """Initialize the ncurses frontend node."""
         super().__init__('greenwave_ncurses_frontend')
 
@@ -60,7 +60,7 @@ def __init__(self, hide_unmonitored: bool = False):
         self.input_buffer = ''
         self.status_message = ''
         self.status_timeout = 0
-        self.show_only_monitored = hide_unmonitored
+        self.show_only_monitored = show_only_monitored
 
         # Initialize UI adaptor
         self.ui_adaptor = GreenwaveUiAdaptor(self)
@@ -452,19 +452,12 @@ def curses_main(stdscr, node):
 def parse_args():
     """Parse command-line arguments."""
     parser = argparse.ArgumentParser(
-        description='Ncurses-based frontend for Greenwave Monitor',
-        add_help=False
+        description='Ncurses-based frontend for Greenwave Monitor'
     )
     parser.add_argument(
-        '--help',
-        action='help',
-        default=argparse.SUPPRESS,
-        help='Show this help message and exit'
-    )
-    parser.add_argument(
-        '--hide-unmonitored',
+        '--show-only-monitored',
         action='store_true',
-        help='Hide unmonitored topics on initialization'
+        help='Show only monitored topics on initialization'
     )
     return parser.parse_known_args()
 
@@ -473,7 +466,7 @@ def main(args=None):
     """Entry point for the ncurses frontend application."""
     parsed_args, ros_args = parse_args()
     rclpy.init(args=ros_args)
-    node = GreenwaveNcursesFrontend(hide_unmonitored=parsed_args.hide_unmonitored)
+    node = GreenwaveNcursesFrontend(show_only_monitored=parsed_args.show_only_monitored)
     thread = None
 
     def signal_handler(signum, frame):

greenwave_monitor/scripts/ncurses_dashboard

@@ -23,7 +23,7 @@
 # Parse command line arguments
 DEMO_MODE=false
 LOG_DIR=""
-HIDE_UNMONITORED=false
+SHOW_ONLY_MONITORED=false
 MONITOR_ARGS=()
 
 show_help() {
@@ -34,7 +34,7 @@ show_help() {
     echo "OPTIONS:"
     echo "  --demo, --test             Launch demo publisher nodes for testing"
     echo "  --log-dir DIR              Enable logging to specified directory"
-    echo "  --hide-unmonitored         Hide unmonitored topics on initialization"
+    echo "  --show-only-monitored      Show only monitored topics on initialization"
     echo "  --help, -h                 Show this help message"
     echo ""
     echo "MONITOR_ARGS are passed directly to the greenwave_monitor node"
@@ -58,8 +58,8 @@ while [[ $# -gt 0 ]]; do
             LOG_DIR="$2"
             shift 2
             ;;
-        --hide-unmonitored)
-            HIDE_UNMONITORED=true
+        --show-only-monitored)
+            SHOW_ONLY_MONITORED=true
             shift
             ;;
         --help|-h)
@@ -121,11 +121,12 @@ echo "Monitor process started with PID: $MONITOR_PID"
 # Launch ncurses frontend in the foreground
 echo "Starting ncurses TUI..."
 echo "Controls: a=Add Topic, r=Remove, f=Set Frequency, c=Clear Freq, q=Quit"
+# NOTE: add proper argument parsing to the ncurses frontend if more than one argument is added here
 FRONTEND_ARGS=()
-if [ "$HIDE_UNMONITORED" = "true" ]; then
-    FRONTEND_ARGS+=("--hide-unmonitored")
+if [ "$SHOW_ONLY_MONITORED" = "true" ]; then
+    FRONTEND_ARGS+=("--show-only-monitored")
 fi
 python3 -m greenwave_monitor.ncurses_frontend "${FRONTEND_ARGS[@]}"
 
 # Note: We don't need to explicitly exit here because the trap will handle cleanup
-# when the ncurses frontend exits
+# when the ncurses frontend exits

…ve_monitor/test/test_ncurses_frontend.py …r/test/test_ncurses_frontend_argparse.pygreenwave_monitor/test/test_ncurses_frontend.py renamed to greenwave_monitor/test/test_ncurses_frontend_argparse.py greenwave_monitor/test/test_ncurses_frontend.py renamed to greenwave_monitor/test/test_ncurses_frontend_argparse.py

@@ -25,29 +25,29 @@
 class TestParseArgs:
     """Test argument parsing for ncurses frontend."""
 
-    def test_default_hide_unmonitored_false(self, monkeypatch):
-        """Test that hide_unmonitored defaults to False."""
+    def test_default_show_only_monitored_false(self, monkeypatch):
+        """Test that show_only_monitored defaults to False."""
         monkeypatch.setattr(sys, 'argv', ['ncurses_frontend'])
         from greenwave_monitor.ncurses_frontend import parse_args
         parsed_args, _ = parse_args()
-        assert parsed_args.hide_unmonitored is False
+        assert parsed_args.show_only_monitored is False
 
-    def test_hide_unmonitored_long_flag(self, monkeypatch):
-        """Test --hide-unmonitored flag enables hide_unmonitored."""
-        monkeypatch.setattr(sys, 'argv', ['ncurses_frontend', '--hide-unmonitored'])
+    def test_show_only_monitored_long_flag(self, monkeypatch):
+        """Test --show-only-monitored flag enables show_only_monitored."""
+        monkeypatch.setattr(sys, 'argv', ['ncurses_frontend', '--show-only-monitored'])
         from greenwave_monitor.ncurses_frontend import parse_args
         parsed_args, _ = parse_args()
-        assert parsed_args.hide_unmonitored is True
+        assert parsed_args.show_only_monitored is True
 
     def test_ros_args_passthrough(self, monkeypatch):
         """Test that ROS arguments are passed through."""
         monkeypatch.setattr(
             sys, 'argv',
-            ['ncurses_frontend', '--hide-unmonitored', '--ros-args', '-r', '__node:=my_node']
+            ['ncurses_frontend', '--show-only-monitored', '--ros-args', '-r', '__node:=my_node']
         )
         from greenwave_monitor.ncurses_frontend import parse_args
         parsed_args, ros_args = parse_args()
-        assert parsed_args.hide_unmonitored is True
+        assert parsed_args.show_only_monitored is True
         assert '--ros-args' in ros_args
         assert '-r' in ros_args
         assert '__node:=my_node' in ros_args