mirror of
https://github.com/gryf/wicd.git
synced 2025-12-19 12:28:08 +01:00
Fix some issues by pylint
This commit is contained in:
David Paleino
113
cli/wicd-cli.py
113
cli/wicd-cli.py
@@ -1,5 +1,6 @@
|
||||
#!/usr/bin/python
|
||||
|
||||
""" Scriptable command-line interface. """
|
||||
# This program is free software; you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation; either version 2 of the License, or
|
||||
@@ -32,20 +33,30 @@ 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.'
|
||||
print 'Error: Could not connect to the daemon. ' + \
|
||||
'Please make sure it is running.'
|
||||
sys.exit(3)
|
||||
|
||||
if not daemon:
|
||||
print 'Error connecting to wicd via D-Bus. Please make sure the wicd service is running.'
|
||||
print 'Error connecting to wicd via D-Bus. ' + \
|
||||
'Please make sure the wicd service is running.'
|
||||
sys.exit(3)
|
||||
|
||||
parser = optparse.OptionParser()
|
||||
@@ -61,12 +72,14 @@ parser.add_option('--list-networks', '-l', default=False, action='store_true')
|
||||
parser.add_option('--network-details', '-d', default=False, action='store_true')
|
||||
parser.add_option('--disconnect', '-x', default=False, action='store_true')
|
||||
parser.add_option('--connect', '-c', default=False, action='store_true')
|
||||
parser.add_option('--list-encryption-types', '-e', default=False, action='store_true')
|
||||
parser.add_option('--list-encryption-types', '-e', default=False,
|
||||
action='store_true')
|
||||
# short options for these aren't great.
|
||||
parser.add_option('--wireless', '-y', default=False, action='store_true')
|
||||
parser.add_option('--wired', '-z', default=False, action='store_true')
|
||||
parser.add_option('--load-profile', '-o', default=False, action='store_true')
|
||||
parser.add_option('--status', '-i', default=False, action='store_true') # -i(nfo)
|
||||
parser.add_option('--status', '-i', default=False,
|
||||
action='store_true') # -i(nfo)
|
||||
|
||||
options, arguments = parser.parse_args()
|
||||
|
||||
@@ -114,12 +127,14 @@ if options.status:
|
||||
|
||||
# functions
|
||||
def is_valid_wireless_network_id(network_id):
|
||||
""" Check if it's a valid wireless network. '"""
|
||||
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):
|
||||
""" Check if it's a valid wired network. '"""
|
||||
num = len(wired.GetWiredProfileList())
|
||||
if not (network_id < num and \
|
||||
network_id >= 0):
|
||||
@@ -127,6 +142,7 @@ def is_valid_wired_network_id(network_id):
|
||||
sys.exit(4)
|
||||
|
||||
def is_valid_wired_network_profile(profile_name):
|
||||
""" Check if it's a valid wired network profile. '"""
|
||||
if not profile_name in wired.GetWiredProfileList():
|
||||
print 'Profile of that name does not exist.'
|
||||
sys.exit(5)
|
||||
@@ -151,10 +167,10 @@ if options.list_networks:
|
||||
wireless.GetWirelessProperty(network_id, 'essid'))
|
||||
elif options.wired:
|
||||
print '#\tProfile name'
|
||||
id = 0
|
||||
i = 0
|
||||
for profile in wired.GetWiredProfileList():
|
||||
print '%s\t%s' % (id, profile)
|
||||
id += 1
|
||||
print '%s\t%s' % (i, profile)
|
||||
i += 1
|
||||
op_performed = True
|
||||
|
||||
if options.network_details:
|
||||
@@ -173,13 +189,17 @@ if options.network_details:
|
||||
if wireless.GetWirelessProperty(network_id, "encryption"):
|
||||
print "Encryption: On"
|
||||
print "Encryption Method: %s" % \
|
||||
wireless.GetWirelessProperty(network_id, "encryption_method")
|
||||
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")
|
||||
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
|
||||
@@ -194,7 +214,8 @@ if options.network_property:
|
||||
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)
|
||||
print wireless.GetWirelessProperty(network_id,
|
||||
options.network_property)
|
||||
else:
|
||||
wireless.SetWirelessProperty(network_id, \
|
||||
options.network_property, options.set_to)
|
||||
@@ -209,11 +230,13 @@ if options.disconnect:
|
||||
daemon.Disconnect()
|
||||
if options.wireless:
|
||||
if wireless.GetCurrentNetworkID(0) > -1:
|
||||
print "Disconnecting from %s on %s" % (wireless.GetCurrentNetwork(0),
|
||||
wireless.DetectWirelessInterface())
|
||||
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()
|
||||
print "Disconnecting from wired connection on %s" % \
|
||||
wired.DetectWiredInterface()
|
||||
op_performed = True
|
||||
|
||||
if options.connect:
|
||||
@@ -226,16 +249,17 @@ if options.connect:
|
||||
wireless.DetectWirelessInterface())
|
||||
wireless.ConnectWireless(options.network)
|
||||
|
||||
check = lambda: wireless.CheckIfWirelessConnecting()
|
||||
status = lambda: wireless.CheckWirelessConnectingStatus()
|
||||
message = lambda: wireless.CheckWirelessConnectingMessage()
|
||||
check = wireless.CheckIfWirelessConnecting
|
||||
status = wireless.CheckWirelessConnectingStatus
|
||||
message = wireless.CheckWirelessConnectingMessage
|
||||
elif options.wired:
|
||||
print "Connecting to wired connection on %s" % wired.DetectWiredInterface()
|
||||
print "Connecting to wired connection on %s" % \
|
||||
wired.DetectWiredInterface()
|
||||
wired.ConnectWired()
|
||||
|
||||
check = lambda: wired.CheckIfWiredConnecting()
|
||||
status = lambda: wired.CheckWiredConnectingStatus()
|
||||
message = lambda: wired.CheckWiredConnectingMessage()
|
||||
check = wired.CheckIfWiredConnecting
|
||||
status = wired.CheckWiredConnectingStatus
|
||||
message = wired.CheckWiredConnectingMessage
|
||||
else:
|
||||
check = lambda: False
|
||||
status = lambda: False
|
||||
@@ -245,36 +269,37 @@ if options.connect:
|
||||
last = None
|
||||
if check:
|
||||
while check():
|
||||
next = status()
|
||||
if next != last:
|
||||
# avoid a race condition where status is updated to "done" after the
|
||||
# loop check
|
||||
if next == "done":
|
||||
next_ = status()
|
||||
if next_ != last:
|
||||
# avoid a race condition where status is updated to "done" after
|
||||
# the loop check
|
||||
if next_ == "done":
|
||||
break
|
||||
print message()
|
||||
last = next
|
||||
last = next_
|
||||
print "done!"
|
||||
op_performed = True
|
||||
|
||||
# pretty print optional and required properties
|
||||
def str_properties(prop):
|
||||
""" Pretty print optional and required properties. """
|
||||
if len(prop) == 0:
|
||||
return "None"
|
||||
else:
|
||||
return ', '.join("%s (%s)" % (x[0], x[1].replace("_", " ")) for x in type['required'])
|
||||
tmp = [(x[0], x[1].replace('_', ' ')) for x in type['required']]
|
||||
return ', '.join("%s (%s)" % (x, y) for x, y in tmp)
|
||||
|
||||
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'])
|
||||
i = 0
|
||||
for t in et:
|
||||
print '%s\t%-20s\t%s' % (i, t['type'], t['name'])
|
||||
print ' Req: %s' % str_properties(t['required'])
|
||||
print '---'
|
||||
# don't print optionals (yet)
|
||||
#print ' Opt: %s' % str_properties(type['optional'])
|
||||
id += 1
|
||||
i += 1
|
||||
op_performed = True
|
||||
|
||||
if options.save and options.network > -1:
|
||||
|
||||
Reference in New Issue
Block a user