mirror of
https://github.com/gryf/wicd.git
synced 2025-12-20 04:48:00 +01:00
Cleaned up formatting in gui.py. Made glade template for preferences dialog and rewrote gui.py to use it instead of creating it explictly in the code. Fixed a bunch indentation/whitespace problems. Cleaned up a ton of formatting in daemon.py Fixed a wired autoconnect bug. Rewrote part of the connection monitoring code, further minimizing the number of external program calls, as well as number of dbus calls. Added StatusInformation methods to daemon.py, to allow external apps to poll for the current connection status without making several dbus calls. Fixed bad function call to GetDBMSignalStrength in daemon.py.
173 lines
6.0 KiB
Python
Executable File
173 lines
6.0 KiB
Python
Executable File
#!/usr/bin/env python
|
|
|
|
""" Configure the scripts for a particular network.
|
|
|
|
Script for configuring the scripts for a network passed in as a
|
|
command line argument. This needs to run a separate process because
|
|
editing scripts requires root access, and the GUI/Tray are typically
|
|
run as the current user.
|
|
|
|
"""
|
|
|
|
#
|
|
# Copyright (C) 2007 Adam Blackburn
|
|
# Copyright (C) 2007 Dan O'Reilly
|
|
#
|
|
# This program is free software; you can redistribute it and/or modify
|
|
# it under the terms of the GNU General Public License Version 2 as
|
|
# published by the Free Software Foundation.
|
|
#
|
|
# This program is distributed in the hope that it will be useful,
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
# GNU General Public License for more details.
|
|
#
|
|
# You should have received a copy of the GNU General Public License
|
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
#
|
|
|
|
import sys
|
|
import gtk
|
|
import ConfigParser
|
|
import dbus
|
|
import dbus.service
|
|
import gtk.glade
|
|
|
|
import wpath
|
|
import misc
|
|
|
|
_ = misc.get_gettext()
|
|
|
|
language = {}
|
|
language['configure_scripts'] = _("Configure Scripts")
|
|
language['before_script'] = _("Pre-connection Script")
|
|
language['after_script'] = _("Post-connection Script")
|
|
language['disconnect_script'] = _("Disconnection Script")
|
|
|
|
bus = dbus.SystemBus()
|
|
|
|
# Connect to the daemon
|
|
try:
|
|
print 'Attempting to connect tray to daemon...'
|
|
proxy_obj = bus.get_object('org.wicd.daemon', '/org/wicd/daemon')
|
|
print 'Success.'
|
|
except Exception:
|
|
print 'Daemon not running...'
|
|
misc.PromptToStartDaemon()
|
|
sys.exit(1)
|
|
|
|
wireless = dbus.Interface(proxy_obj, 'org.wicd.daemon.wireless')
|
|
wired = dbus.Interface(proxy_obj, 'org.wicd.daemon.wired')
|
|
config = dbus.Interface(proxy_obj, 'org.wicd.daemon.config')
|
|
|
|
wireless_conf = wpath.etc + 'wireless-settings.conf'
|
|
wired_conf = wpath.etc + 'wired-settings.conf'
|
|
|
|
|
|
def none_to_blank(text):
|
|
""" Converts special string cases to a blank string.
|
|
|
|
If text is None, 'None', or '' then this method will
|
|
return '', otherwise it will just return str(text).
|
|
|
|
"""
|
|
if text == None or text == "None" or text == "":
|
|
return ""
|
|
else:
|
|
return str(text)
|
|
|
|
def blank_to_none(text):
|
|
""" Convert an empty or null string to 'None'. """
|
|
if text == "" or text == None:
|
|
return "None"
|
|
else:
|
|
return str(text)
|
|
|
|
def get_script_info(network, network_type):
|
|
""" Read script info from disk and load it into the configuration dialog """
|
|
info = {}
|
|
con = ConfigParser.ConfigParser()
|
|
if network_type == "wired":
|
|
con.read(wired_conf)
|
|
if con.has_section(network):
|
|
info["pre_entry"] = con.get(network, "beforescript")
|
|
info["post_entry"] = con.get(network, "afterscript")
|
|
info["disconnect_entry"] = con.get(network, "disconnectscript")
|
|
else:
|
|
bssid = wireless.GetWirelessProperty(int(network), "bssid")
|
|
con.read(wireless_conf)
|
|
if con.has_section(bssid):
|
|
info["pre_entry"] = con.get(bssid, "beforescript")
|
|
info["post_entry"] = con.get(bssid, "afterscript")
|
|
info["disconnect_entry"] = con.get(bssid, "disconnectscript")
|
|
|
|
return info
|
|
|
|
def write_scripts(network, network_type, script_info):
|
|
""" Writes script info to disk and loads it into the daemon. """
|
|
con = ConfigParser.ConfigParser()
|
|
print "writing scripts, type", network_type
|
|
if network_type == "wired":
|
|
con.read(wired_conf)
|
|
if con.has_section(network):
|
|
con.add_section(network)
|
|
con.set(network, "beforescript", script_info["pre_entry"])
|
|
con.set(network, "afterscript", script_info["post_entry"])
|
|
con.set(network, "disconnectscript",
|
|
script_info["disconnect_entry"])
|
|
con.write(open(wired_conf, "w"))
|
|
config.ReadWiredNetworkProfile(network)
|
|
config.SaveWiredNetworkProfile(network)
|
|
else:
|
|
bssid = wireless.GetWirelessProperty(int(network), "bssid")
|
|
con.read(wireless_conf)
|
|
if con.has_section(bssid):
|
|
con.add_section(bssid)
|
|
con.set(bssid, "beforescript", script_info["pre_entry"])
|
|
con.set(bssid, "afterscript", script_info["post_entry"])
|
|
con.set(bssid, "disconnectscript", script_info["disconnect_entry"])
|
|
con.write(open(wireless_conf, "w"))
|
|
config.ReadWirelessNetworkProfile(int(network))
|
|
config.SaveWirelessNetworkProfile(int(network))
|
|
|
|
def main (argv):
|
|
""" Runs the script configuration dialog. """
|
|
if len(argv) < 2:
|
|
print 'Network id to configure is missing, aborting.'
|
|
sys.exit(1)
|
|
|
|
network = argv[1]
|
|
network_type = argv[2]
|
|
|
|
script_info = get_script_info(network, network_type)
|
|
|
|
gladefile = wpath.etc + "wicd.glade"
|
|
wTree = gtk.glade.XML(gladefile)
|
|
dialog = wTree.get_widget("configure_script_dialog")
|
|
wTree.get_widget("pre_label").set_label(language['before_script'] + ":")
|
|
wTree.get_widget("post_label").set_label(language['after_script'] + ":")
|
|
wTree.get_widget("disconnect_label").set_label(language['disconnect_script'] + ":")
|
|
wTree.get_widget("window1").hide()
|
|
|
|
pre_entry = wTree.get_widget("pre_entry")
|
|
post_entry = wTree.get_widget("post_entry")
|
|
disconnect_entry = wTree.get_widget("disconnect_entry")
|
|
|
|
pre_entry.set_text(none_to_blank(script_info.get("pre_entry")))
|
|
post_entry.set_text(none_to_blank(script_info.get("post_entry")))
|
|
disconnect_entry.set_text(none_to_blank(script_info.get("disconnect_entry")))
|
|
|
|
dialog.show_all()
|
|
|
|
result = dialog.run()
|
|
if result == 1:
|
|
script_info["pre_entry"] = blank_to_none(pre_entry.get_text())
|
|
script_info["post_entry"] = blank_to_none(post_entry.get_text())
|
|
script_info["disconnect_entry"] = blank_to_none(disconnect_entry.get_text())
|
|
write_scripts(network, network_type, script_info)
|
|
dialog.destroy()
|
|
|
|
|
|
if __name__ == '__main__':
|
|
main(sys.argv)
|