diff --git a/aprsd/cmds/list_plugins.py b/aprsd/cmds/list_plugins.py index 75b7256..af82a93 100644 --- a/aprsd/cmds/list_plugins.py +++ b/aprsd/cmds/list_plugins.py @@ -91,19 +91,17 @@ def _get_installed_aprsd_items(): plugins = {} extensions = {} for finder, name, ispkg in pkgutil.iter_modules(): - if name.startswith("aprsd_"): - print(f"Found aprsd_ module: {name}") - if ispkg: - module = importlib.import_module(name) - pkgs = walk_package(module) - for pkg in pkgs: - pkg_info = get_module_info( - module.__name__, pkg.name, module.__path__[0] - ) - if "plugin" in name: - plugins[name] = pkg_info - elif "extension" in name: - extensions[name] = pkg_info + if ispkg and name.startswith("aprsd_"): + module = importlib.import_module(name) + pkgs = walk_package(module) + for pkg in pkgs: + pkg_info = get_module_info( + module.__name__, pkg.name, module.__path__[0] + ) + if "plugin" in name: + plugins[name] = pkg_info + elif "extension" in name: + extensions[name] = pkg_info return plugins, extensions diff --git a/aprsd/cmds/listen.py b/aprsd/cmds/listen.py index f5851c8..d949e3e 100644 --- a/aprsd/cmds/listen.py +++ b/aprsd/cmds/listen.py @@ -113,6 +113,7 @@ class ListenStatsThread(APRSDThread): stats_json = collector.Collector().collect() stats = stats_json["PacketList"] total_rx = stats["rx"] + packet_count = len(stats["packets"]) rx_delta = total_rx - self._last_total_rx rate = rx_delta / 10 @@ -120,7 +121,8 @@ class ListenStatsThread(APRSDThread): LOGU.opt(colors=True).info( f"RX Rate: {rate} pps " f"Total RX: {total_rx} " - f"RX Last 10 secs: {rx_delta}", + f"RX Last 10 secs: {rx_delta} " + f"Packets in PacketList: {packet_count}", ) self._last_total_rx = total_rx