From 902f9b6c2b0a250f493e0df102a2862e6cd778cd Mon Sep 17 00:00:00 2001 From: David Paleino Date: Tue, 9 Aug 2011 18:03:01 +0200 Subject: [PATCH] Convert from tabs to (4) spaces --- cli/wicd-cli.py | 292 ++++++++++++++++++++++++------------------------ 1 file changed, 146 insertions(+), 146 deletions(-) diff --git a/cli/wicd-cli.py b/cli/wicd-cli.py index 1e7e610..570ea25 100644 --- a/cli/wicd-cli.py +++ b/cli/wicd-cli.py @@ -31,17 +31,17 @@ else: bus = dbus.SystemBus() try: - daemon = dbus.Interface(bus.get_object('org.wicd.daemon', '/org/wicd/daemon'), - 'org.wicd.daemon') - wireless = dbus.Interface(bus.get_object('org.wicd.daemon', '/org/wicd/daemon/wireless'), - 'org.wicd.daemon.wireless') - wired = dbus.Interface(bus.get_object('org.wicd.daemon', '/org/wicd/daemon/wired'), - 'org.wicd.daemon.wired') - config = dbus.Interface(bus.get_object('org.wicd.daemon', '/org/wicd/daemon/config'), - 'org.wicd.daemon.config') + daemon = dbus.Interface(bus.get_object('org.wicd.daemon', '/org/wicd/daemon'), + 'org.wicd.daemon') + wireless = dbus.Interface(bus.get_object('org.wicd.daemon', '/org/wicd/daemon/wireless'), + 'org.wicd.daemon.wireless') + wired = dbus.Interface(bus.get_object('org.wicd.daemon', '/org/wicd/daemon/wired'), + 'org.wicd.daemon.wired') + config = dbus.Interface(bus.get_object('org.wicd.daemon', '/org/wicd/daemon/config'), + 'org.wicd.daemon.config') except dbus.DBusException: - print 'Error: Could not connect to the daemon. Please make sure it is running.' - sys.exit(3) + print 'Error: Could not connect to the daemon. Please make sure it is running.' + sys.exit(3) parser = optparse.OptionParser() @@ -67,176 +67,176 @@ options, arguments = parser.parse_args() op_performed = False if not (options.wireless or options.wired): - print "Please use --wireless or --wired to specify " + \ - "the type of connection to operate on." + print "Please use --wireless or --wired to specify " + \ + "the type of connection to operate on." # functions def is_valid_wireless_network_id(network_id): - if not (network_id >= 0 \ - and network_id < wireless.GetNumberOfNetworks()): - print 'Invalid wireless network identifier.' - sys.exit(1) + if not (network_id >= 0 \ + and network_id < wireless.GetNumberOfNetworks()): + print 'Invalid wireless network identifier.' + sys.exit(1) def is_valid_wired_network_id(network_id): - num = len(wired.GetWiredProfileList()) - if not (network_id < num and \ - network_id >= 0): - print 'Invalid wired network identifier.' - sys.exit(4) + num = len(wired.GetWiredProfileList()) + if not (network_id < num and \ + network_id >= 0): + print 'Invalid wired network identifier.' + sys.exit(4) def is_valid_wired_network_profile(profile_name): - if not profile_name in wired.GetWiredProfileList(): - print 'Profile of that name does not exist.' - sys.exit(5) + if not profile_name in wired.GetWiredProfileList(): + print 'Profile of that name does not exist.' + sys.exit(5) if options.scan and options.wireless: - # synchronized scan - wireless.Scan(True) - op_performed = True + # synchronized scan + wireless.Scan(True) + op_performed = True if options.load_profile and options.wired: - is_valid_wired_network_profile(options.name) - config.ReadWiredNetworkProfile(options.name) - op_performed = True + is_valid_wired_network_profile(options.name) + config.ReadWiredNetworkProfile(options.name) + op_performed = True if options.list_networks: - if options.wireless: - print '#\tBSSID\t\t\tChannel\tESSID' - for network_id in range(0, wireless.GetNumberOfNetworks()): - print '%s\t%s\t%s\t%s' % (network_id, - wireless.GetWirelessProperty(network_id, 'bssid'), - wireless.GetWirelessProperty(network_id, 'channel'), - wireless.GetWirelessProperty(network_id, 'essid')) - elif options.wired: - print '#\tProfile name' - id = 0 - for profile in wired.GetWiredProfileList(): - print '%s\t%s' % (id, profile) - id += 1 - op_performed = True + if options.wireless: + print '#\tBSSID\t\t\tChannel\tESSID' + for network_id in range(0, wireless.GetNumberOfNetworks()): + print '%s\t%s\t%s\t%s' % (network_id, + wireless.GetWirelessProperty(network_id, 'bssid'), + wireless.GetWirelessProperty(network_id, 'channel'), + wireless.GetWirelessProperty(network_id, 'essid')) + elif options.wired: + print '#\tProfile name' + id = 0 + for profile in wired.GetWiredProfileList(): + print '%s\t%s' % (id, profile) + id += 1 + op_performed = True if options.network_details: - if options.wireless: - if options.network >= 0: - is_valid_wireless_network_id(options.network) - network_id = options.network - else: - network_id = wireless.GetCurrentNetworkID(0) - is_valid_wireless_network_id(network_id) - # we're connected to a network, print IP - print "IP: %s" % wireless.GetWirelessIP(0) + if options.wireless: + if options.network >= 0: + is_valid_wireless_network_id(options.network) + network_id = options.network + else: + network_id = wireless.GetCurrentNetworkID(0) + is_valid_wireless_network_id(network_id) + # we're connected to a network, print IP + print "IP: %s" % wireless.GetWirelessIP(0) - print "Essid: %s" % wireless.GetWirelessProperty(network_id, "essid") - print "Bssid: %s" % wireless.GetWirelessProperty(network_id, "bssid") - if wireless.GetWirelessProperty(network_id, "encryption"): - print "Encryption: On" - print "Encryption Method: %s" % \ - wireless.GetWirelessProperty(network_id, "encryption_method") - else: - print "Encryption: Off" - print "Quality: %s" % wireless.GetWirelessProperty(network_id, "quality") - print "Mode: %s" % wireless.GetWirelessProperty(network_id, "mode") - print "Channel: %s" % wireless.GetWirelessProperty(network_id, "channel") - print "Bit Rates: %s" % wireless.GetWirelessProperty(network_id, "bitrates") - op_performed = True + print "Essid: %s" % wireless.GetWirelessProperty(network_id, "essid") + print "Bssid: %s" % wireless.GetWirelessProperty(network_id, "bssid") + if wireless.GetWirelessProperty(network_id, "encryption"): + print "Encryption: On" + print "Encryption Method: %s" % \ + wireless.GetWirelessProperty(network_id, "encryption_method") + else: + print "Encryption: Off" + print "Quality: %s" % wireless.GetWirelessProperty(network_id, "quality") + print "Mode: %s" % wireless.GetWirelessProperty(network_id, "mode") + print "Channel: %s" % wireless.GetWirelessProperty(network_id, "channel") + print "Bit Rates: %s" % wireless.GetWirelessProperty(network_id, "bitrates") + op_performed = True # network properties if options.network_property: - options.network_property = options.network_property.lower() - if options.wireless: - if options.network >= 0: - is_valid_wireless_network_id(options.network) - network_id = options.network - else: - network_id = wireless.GetCurrentNetworkID(0) - is_valid_wireless_network_id(network_id) - if not options.set_to: - print wireless.GetWirelessProperty(network_id, options.network_property) - else: - wireless.SetWirelessProperty(network_id, \ - options.network_property, options.set_to) - elif options.wired: - if not options.set_to: - print wired.GetWiredProperty(options.network_property) - else: - wired.SetWiredProperty(options.network_property, options.set_to) - op_performed = True + options.network_property = options.network_property.lower() + if options.wireless: + if options.network >= 0: + is_valid_wireless_network_id(options.network) + network_id = options.network + else: + network_id = wireless.GetCurrentNetworkID(0) + is_valid_wireless_network_id(network_id) + if not options.set_to: + print wireless.GetWirelessProperty(network_id, options.network_property) + else: + wireless.SetWirelessProperty(network_id, \ + options.network_property, options.set_to) + elif options.wired: + if not options.set_to: + print wired.GetWiredProperty(options.network_property) + else: + wired.SetWiredProperty(options.network_property, options.set_to) + op_performed = True if options.disconnect: - daemon.Disconnect() - if options.wireless: - if wireless.GetCurrentNetworkID(0) > -1: - print "Disconnecting from %s on %s" % (wireless.GetCurrentNetwork(0), - wireless.DetectWirelessInterface()) - elif options.wired: - if wired.CheckPluggedIn(): - print "Disconnecting from wired connection on %s" % wired.DetectWiredInterface() - op_performed = True + daemon.Disconnect() + if options.wireless: + if wireless.GetCurrentNetworkID(0) > -1: + print "Disconnecting from %s on %s" % (wireless.GetCurrentNetwork(0), + wireless.DetectWirelessInterface()) + elif options.wired: + if wired.CheckPluggedIn(): + print "Disconnecting from wired connection on %s" % wired.DetectWiredInterface() + op_performed = True if options.connect: - check = None - if options.wireless and options.network > -1: - is_valid_wireless_network_id(options.network) - name = wireless.GetWirelessProperty(options.network, 'essid') - encryption = wireless.GetWirelessProperty(options.network, 'enctype') - print "Connecting to %s with %s on %s" % (name, encryption, - wireless.DetectWirelessInterface()) - wireless.ConnectWireless(options.network) + check = None + if options.wireless and options.network > -1: + is_valid_wireless_network_id(options.network) + name = wireless.GetWirelessProperty(options.network, 'essid') + encryption = wireless.GetWirelessProperty(options.network, 'enctype') + print "Connecting to %s with %s on %s" % (name, encryption, + wireless.DetectWirelessInterface()) + wireless.ConnectWireless(options.network) - check = lambda: wireless.CheckIfWirelessConnecting() - message = lambda: wireless.CheckWirelessConnectingMessage()[1] - elif options.wired: - print "Connecting to wired connection on %s" % wired.DetectWiredInterface() - wired.ConnectWired() + check = lambda: wireless.CheckIfWirelessConnecting() + message = lambda: wireless.CheckWirelessConnectingMessage()[1] + elif options.wired: + print "Connecting to wired connection on %s" % wired.DetectWiredInterface() + wired.ConnectWired() - check = lambda: wired.CheckIfWiredConnecting() - message = lambda: wired.CheckWiredConnectingMessage() + check = lambda: wired.CheckIfWiredConnecting() + message = lambda: wired.CheckWiredConnectingMessage() - # update user on what the daemon is doing - last = None - if check: - while check(): - next = message() - if next != last: - # avoid a race condition where status is updated to "done" after the - # loop check - if next == "done": - break - print "%s..." % next.replace("_", " ") - last = next - print "done!" - op_performed = True + # update user on what the daemon is doing + last = None + if check: + while check(): + next = message() + if next != last: + # avoid a race condition where status is updated to "done" after the + # loop check + if next == "done": + break + print "%s..." % next.replace("_", " ") + last = next + print "done!" + op_performed = True # pretty print optional and required properties def str_properties(prop): - if len(prop) == 0: - return "None" - else: - return ', '.join("%s (%s)" % (x[0], x[1].replace("_", " ")) for x in type['required']) + if len(prop) == 0: + return "None" + else: + return ', '.join("%s (%s)" % (x[0], x[1].replace("_", " ")) for x in type['required']) if options.wireless and options.list_encryption_types: - et = misc.LoadEncryptionMethods() - # print 'Installed encryption templates:' - print '%s\t%-20s\t%s' % ('#', 'Name', 'Description') - id = 0 - for type in et: - print '%s\t%-20s\t%s' % (id, type['type'], type['name']) - print ' Req: %s' % str_properties(type['required']) - print '---' - # don't print optionals (yet) - #print ' Opt: %s' % str_properties(type['optional']) - id += 1 - op_performed = True + et = misc.LoadEncryptionMethods() + # print 'Installed encryption templates:' + print '%s\t%-20s\t%s' % ('#', 'Name', 'Description') + id = 0 + for type in et: + print '%s\t%-20s\t%s' % (id, type['type'], type['name']) + print ' Req: %s' % str_properties(type['required']) + print '---' + # don't print optionals (yet) + #print ' Opt: %s' % str_properties(type['optional']) + id += 1 + op_performed = True if options.save and options.network > -1: - if options.wireless: - is_valid_wireless_network_id(options.network) - config.SaveWirelessNetworkProfile(options.network) - elif options.wired: - config.SaveWiredNetworkProfile(options.name) - op_performed = True + if options.wireless: + is_valid_wireless_network_id(options.network) + config.SaveWirelessNetworkProfile(options.network) + elif options.wired: + config.SaveWiredNetworkProfile(options.name) + op_performed = True if not op_performed: - print "No operations performed." + print "No operations performed."