From d3634b4b8233b8e6a9d52e3c1e4308a2cc1fc482 Mon Sep 17 00:00:00 2001 From: Johan Hedberg Date: Fri, 7 Sep 2012 14:12:33 +0300 Subject: [PATCH] test: Add compact mode to test-discovery --- test/test-discovery | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/test/test-discovery b/test/test-discovery index 269c51c0d..94eafe481 100755 --- a/test/test-discovery +++ b/test/test-discovery @@ -8,7 +8,31 @@ import dbus import dbus.mainloop.glib from optparse import OptionParser, make_option +compact = False; +addresses = []; + +def print_compact(address, properties): + if address in addresses: + return + + addresses.append(address) + + name = "" + + for key in properties.keys(): + value = properties[key] + if type(value) is dbus.String: + value = unicode(value).encode('ascii', 'replace') + if (key == "Name"): + name = value + + print("%s %s" % (address, name)) + def device_found(address, properties): + if compact: + print_compact(address, properties) + return + print("[ " + address + " ]") for key in properties.keys(): @@ -36,6 +60,8 @@ if __name__ == '__main__': option_list = [ make_option("-i", "--device", action="store", type="string", dest="dev_id"), + make_option("-c", "--compact", + action="store_true", dest="compact"), ] parser = OptionParser(option_list=option_list) @@ -46,6 +72,9 @@ if __name__ == '__main__': else: adapter_path = manager.DefaultAdapter() + if options.compact: + compact = True; + adapter = dbus.Interface(bus.get_object("org.bluez", adapter_path), "org.bluez.Adapter") -- 2.47.3