gryf/wicd
1
0
Fork 0
mirror of https://github.com/gryf/wicd.git synced 2025-12-19 20:38:00 +01:00
Code Issues Projects Releases Wiki Activity

Make configscript.py use the RawConfigParser wrapper

Browse Source
This commit is contained in:
David Paleino
2011-11-09 13:17:35 +01:00
parent af544135eb
commit 4d2af8af2b
1 changed files with 13 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
gtk/configscript.py
View File

@@ -29,11 +29,11 @@ run as the current user.
import sys import sys
import os import os
import gtk import gtk
import ConfigParser
from wicd import wpath from wicd import wpath
from wicd.translations import _ from wicd.translations import _
from wicd import dbusmanager from wicd import dbusmanager
from wicd.configmanager import ConfigManager
dbus = dbusmanager.DBusManager() dbus = dbusmanager.DBusManager()
dbus.connect_to_dbus() dbus.connect_to_dbus()
@@ -64,53 +64,30 @@ def blank_to_none(text):
else: else:
return str(text) return str(text)
def get_val(con, network, option, default="None"):
""" Returns the specified option for the given network.
Returns the value stored in the config file for the given option,
unless the option isn't stored yet, in which case the default value
provided is stored and then returned.
Keyword arguments:
network -- The section to search.
option -- The option to search for.
deafult -- The default value to store/return if the option isn't found.
"""
if not con.has_option(network, option):
con.set(network, option, default)
return con.get(network, option)
def get_script_info(network, network_type): def get_script_info(network, network_type):
""" Read script info from disk and load it into the configuration dialog """ """ Read script info from disk and load it into the configuration dialog """
info = {} info = {}
con = ConfigParser.ConfigParser()
if network_type == "wired": if network_type == "wired":
con.read(wired_conf) con = ConfigManager(wired_conf)
if con.has_section(network): if con.has_section(network):
info["pre_entry"] = get_val(con, network, "beforescript") info["pre_entry"] = con.get(network, "beforescript", None)
info["post_entry"] = get_val(con, network, "afterscript") info["post_entry"] = con.get(network, "afterscript", None)
info["pre_disconnect_entry"] = get_val(con, network, "predisconnectscript") info["pre_disconnect_entry"] = con.get(network, "predisconnectscript", None)
info["post_disconnect_entry"] = get_val(con, network, "postdisconnectscript") info["post_disconnect_entry"] = con.get(network, "postdisconnectscript", None)
else: else:
bssid = wireless.GetWirelessProperty(int(network), "bssid") bssid = wireless.GetWirelessProperty(int(network), "bssid")
con.read(wireless_conf) con = ConfigManager(wireless_conf)
if con.has_section(bssid): if con.has_section(bssid):
info["pre_entry"] = get_val(con, bssid, "beforescript") info["pre_entry"] = con.get(bssid, "beforescript", None)
info["post_entry"] = get_val(con, bssid, "afterscript") info["post_entry"] = con.get(bssid, "afterscript", None)
info["pre_disconnect_entry"] = get_val(con, bssid, "predisconnectscript") info["pre_disconnect_entry"] = con.get(bssid, "predisconnectscript", None)
info["post_disconnect_entry"] = get_val(con, bssid, "postdisconnectscript") info["post_disconnect_entry"] = con.get(bssid, "postdisconnectscript", None)
return info return info
def write_scripts(network, network_type, script_info): def write_scripts(network, network_type, script_info):
""" Writes script info to disk and loads it into the daemon. """ """ Writes script info to disk and loads it into the daemon. """
con = ConfigParser.ConfigParser()
if network_type == "wired": if network_type == "wired":
con.read(wired_conf) con = ConfigManager(wired_conf)
if not con.has_section(network):
con.add_section(network)
con.set(network, "beforescript", script_info["pre_entry"]) con.set(network, "beforescript", script_info["pre_entry"])
con.set(network, "afterscript", script_info["post_entry"]) con.set(network, "afterscript", script_info["post_entry"])
con.set(network, "predisconnectscript", script_info["pre_disconnect_entry"]) con.set(network, "predisconnectscript", script_info["pre_disconnect_entry"])
@@ -121,9 +98,7 @@ def write_scripts(network, network_type, script_info):
wired.SaveWiredNetworkProfile(network) wired.SaveWiredNetworkProfile(network)
else: else:
bssid = wireless.GetWirelessProperty(int(network), "bssid") bssid = wireless.GetWirelessProperty(int(network), "bssid")
con.read(wireless_conf) con = ConfigManager(wireless_conf)
if not con.has_section(bssid):
con.add_section(bssid)
con.set(bssid, "beforescript", script_info["pre_entry"]) con.set(bssid, "beforescript", script_info["pre_entry"])
con.set(bssid, "afterscript", script_info["post_entry"]) con.set(bssid, "afterscript", script_info["post_entry"])
con.set(bssid, "predisconnectscript", script_info["pre_disconnect_entry"]) con.set(bssid, "predisconnectscript", script_info["pre_disconnect_entry"])