commit 80809951f644b6950e3523e493bff28245a61462 Author: Karsten Loesing <karsten.loesing@gmx.net> Date: Mon May 27 11:27:07 2013 +0200 Tweak support for grouping by network family. - Tell app.py about the new --by-network-family option. If app.py doesn't know about it, compass.py will be surprised that it's not there. - Fix last table row saying how many other groups are not displayed by just saying how many "relay groups" there are. --- app.py | 1 + compass.py | 10 ++-------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/app.py b/app.py index 73270d7..8c04292 100644 --- a/app.py +++ b/app.py @@ -11,6 +11,7 @@ class Opt(object): option_details = { 'by_as':(Boolean, False), 'by_country':(Boolean, False), + 'by_network_family':(Boolean, False), 'inactive':( Boolean, False ), 'exits_only':( Boolean, False ), 'guards_only': ( Boolean, False), diff --git a/compass.py b/compass.py index 2d5cee7..ce49c56 100755 --- a/compass.py +++ b/compass.py @@ -330,14 +330,8 @@ class RelayStats(object): # Set up to handle the special lines at the bottom excluded_relays = util.Result(zero_probs=True) total_relays = util.Result(zero_probs=True) - if options.by_country and options.by_as: - filtered = "countries and ASes" - elif options.by_country: - filtered = "countries" - elif options.by_as: - filtered = "ASes" - elif options.by_network_family: - filtered = "network families" + if options.by_country or options.by_as or options.by_network_family: + filtered = "relay groups" else: filtered = "relays"