Provide a pre-/post-down script mechanism

WICD currently only provides pre-/post-connection scripts, and
  only one disconnection script, that is run before actually
  disconnecting. This provides pre-/post-disconnection scripts,
  thus increasing configuration flexibility.

wicd/configscript.py

@@ -42,7 +42,8 @@ language = {}
 language['configure_scripts'] = _("Configure Scripts")
 language['before_script'] = _("Pre-connection Script")
 language['after_script'] = _("Post-connection Script")
-language['disconnect_script'] = _("Disconnection Script")
+language['pre_disconnect_script'] = _("Pre-disconnection Script")
+language['post_disconnect_script'] = _("Post-disconnection Script")
 
 dbus = dbusmanager.DBusManager()
 dbus.connect_to_dbus()
@@ -100,14 +101,16 @@ def get_script_info(network, network_type):
         if con.has_section(network):
             info["pre_entry"] = get_val(con, network, "beforescript")
             info["post_entry"] = get_val(con, network, "afterscript")
-            info["disconnect_entry"] = get_val(con, network, "disconnectscript")
+            info["pre_disconnect_entry"] = get_val(con, network, "predisconnectscript")
+            info["post_disconnect_entry"] = get_val(con, network, "postdisconnectscript")
     else:
         bssid = wireless.GetWirelessProperty(int(network), "bssid")
         con.read(wireless_conf)
         if con.has_section(bssid):
             info["pre_entry"] = get_val(con, bssid, "beforescript")
             info["post_entry"] = get_val(con, bssid, "afterscript")
-            info["disconnect_entry"] = get_val(con, bssid, "disconnectscript")
+            info["pre_disconnect_entry"] = get_val(con, bssid, "predisconnectscript")
+            info["post_disconnect_entry"] = get_val(con, bssid, "postdisconnectscript")
     return info
 
 def write_scripts(network, network_type, script_info):
@@ -120,7 +123,8 @@ def write_scripts(network, network_type, script_info):
             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.set(network, "predisconnectscript", script_info["pre_disconnect_entry"])
+        con.set(network, "postdisconnectscript", script_info["post_disconnect_entry"])
         con.write(open(wired_conf, "w"))
         wired.ReloadConfig()
         wired.ReadWiredNetworkProfile(network)
@@ -132,7 +136,8 @@ def write_scripts(network, network_type, script_info):
             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.set(bssid, "predisconnectscript", script_info["pre_disconnect_entry"])
+        con.set(bssid, "postdisconnectscript", script_info["post_disconnect_entry"])
         con.write(open(wireless_conf, "w"))
         wireless.ReloadConfig()
         wireless.ReadWirelessNetworkProfile(int(network))
@@ -155,25 +160,30 @@ def main (argv):
     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("pre_disconnect_label").set_label(language['pre_disconnect_script']
+                                                   + ":")
+    wTree.get_widget("post_disconnect_label").set_label(language['post_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_disconnect_entry = wTree.get_widget("pre_disconnect_entry")
+    post_disconnect_entry = wTree.get_widget("post_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")))
-    
+    pre_disconnect_entry.set_text(none_to_blank(script_info.get("pre_disconnect_entry")))
+    post_disconnect_entry.set_text(none_to_blank(script_info.get("post_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())
+        script_info["pre_disconnect_entry"] = blank_to_none(pre_disconnect_entry.get_text())
+        script_info["post_disconnect_entry"] = blank_to_none(post_disconnect_entry.get_text())
         write_scripts(network, network_type, script_info)
     dialog.destroy()
  

wicd/networking.py

@@ -151,7 +151,8 @@ class Controller(object):
         self.connecting_thread = None
         self.before_script = None
         self.after_script = None
-        self.disconnect_script = None
+        self.pre_disconnect_script = None
+        self.post_disconnect_script = None
         self.driver = None
         self.iface = None
     
@@ -203,17 +204,23 @@ class Controller(object):
     def Disconnect(self, *args, **kargs):
         """ Disconnect from the network. """
         iface = self.iface
-        misc.ExecuteScripts(wpath.disconnectscripts, self.debug)
-        if self.disconnect_script:
-            print 'Running disconnect script'
-            misc.ExecuteScript(expand_script_macros(self.disconnect_script,
-                                                    'disconnection', *args),
+        misc.ExecuteScripts(wpath.predisconnectscripts, self.debug)
+        if self.pre_disconnect_script:
+            print 'Running pre-disconnect script'
+            misc.ExecuteScript(expand_script_macros(self.pre_disconnect_script,
+                                                    'pre-disconnection', *args),
                                self.debug)
         iface.ReleaseDHCP()
         iface.SetAddress('0.0.0.0')
         iface.FlushRoutes()
         iface.Down()
         iface.Up()
+        misc.ExecuteScripts(wpath.postdisconnectscripts, self.debug)
+        if self.post_disconnect_script:
+            print 'Running post-disconnect script'
+            misc.ExecuteScript(expand_script_macros(self.post_disconnect_script,
+                                                    'post-disconnection', *args),
+                               self.debug)
         
     def ReleaseDHCP(self):
         """ Release the DHCP lease for this interface. """
@@ -273,8 +280,8 @@ class ConnectThread(threading.Thread):
     lock = threading.Lock()
 
     def __init__(self, network, interface_name, before_script, after_script, 
-                 disconnect_script, gdns1, gdns2, gdns3, gdns_dom, gsearch_dom, 
-                 iface, debug):
+                 pre_disconnect_script, post_disconnect_script, gdns1,
+                 gdns2, gdns3, gdns_dom, gsearch_dom, iface, debug):
         """ Initialise the required object variables and the thread.
 
         Keyword arguments:
@@ -283,7 +290,8 @@ class ConnectThread(threading.Thread):
         wired -- name of the wired interface
         before_script -- script to run before bringing up the interface
         after_script -- script to run after bringing up the interface
-        disconnect_script -- script to run after disconnection
+        pre_disconnect_script -- script to run before disconnection
+        post_disconnect_script -- script to run after disconnection
         gdns1 -- global DNS server 1
         gdns2 -- global DNS server 2
         gdns3 -- global DNS server 3
@@ -297,7 +305,8 @@ class ConnectThread(threading.Thread):
         self.connect_result = None
         self.before_script = before_script
         self.after_script = after_script
-        self.disconnect_script = disconnect_script
+        self.pre_disconnect_script = pre_disconnect_script
+        self.post_disconnect_script = post_disconnect_script
         self._should_die = False
         self.abort_reason = ""
         self.connect_result = ""
@@ -607,7 +616,8 @@ class Wireless(Controller):
         
         self.connecting_thread = WirelessConnectThread(network,
             self.wireless_interface, self.wpa_driver, self.before_script,
-            self.after_script, self.disconnect_script, self.global_dns_1,
+            self.after_script, self.pre_disconnect_script,
+            self.post_disconnect_script, self.global_dns_1,
             self.global_dns_2, self.global_dns_3, self.global_dns_dom,
             self.global_search_dom, self.wiface, debug)
         self.connecting_thread.setDaemon(True)
@@ -779,8 +789,9 @@ class WirelessConnectThread(ConnectThread):
     """
 
     def __init__(self, network, wireless, wpa_driver, before_script,
-                 after_script, disconnect_script, gdns1, gdns2, gdns3, 
-                 gdns_dom, gsearch_dom, wiface, debug=False):
+                 after_script, pre_disconnect_script, post_disconnect_script,
+                 gdns1, gdns2, gdns3, gdns_dom, gsearch_dom, wiface,
+                 debug=False):
         """ Initialise the thread with network information.
 
         Keyword arguments:
@@ -789,14 +800,16 @@ class WirelessConnectThread(ConnectThread):
         wpa_driver -- type of wireless interface
         before_script -- script to run before bringing up the interface
         after_script -- script to run after bringing up the interface
-        disconnect_script -- script to run after disconnection
+        pre_disconnect_script -- script to run before disconnection
+        post_disconnect_script -- script to run after disconnection
         gdns1 -- global DNS server 1
         gdns2 -- global DNS server 2
         gdns3 -- global DNS server 3
 
         """
         ConnectThread.__init__(self, network, wireless, before_script, 
-                               after_script, disconnect_script, gdns1, gdns2, 
+                               after_script, pre_disconnect_script,
+                               post_disconnect_script, gdns1, gdns2,
                                gdns3, gdns_dom, gsearch_dom, wiface, debug)
         self.wpa_driver = wpa_driver
 
@@ -967,9 +980,10 @@ class Wired(Controller):
         if not self.liface: return False
         self.connecting_thread = WiredConnectThread(network,
             self.wired_interface, self.before_script, self.after_script,
-            self.disconnect_script, self.global_dns_1, self.global_dns_2, 
-            self.global_dns_3, self.global_dns_dom, self.global_search_dom, 
-            self.liface, debug)
+            self.pre_disconnect_script, self.post_disconnect_script,
+            self.global_dns_1, self.global_dns_2, self.global_dns_3,
+            self.global_dns_dom, self.global_search_dom, self.liface,
+            debug)
         self.connecting_thread.setDaemon(True)
         self.connecting_thread.start()
         return self.connecting_thread
@@ -993,8 +1007,8 @@ class WiredConnectThread(ConnectThread):
 
     """
     def __init__(self, network, wired, before_script, after_script, 
-                 disconnect_script, gdns1, gdns2, gdns3, gdns_dom, gsearch_dom, 
-                 liface, debug=False):
+                 pre_disconnect_script, post_disconnect_script, gdns1,
+                 gdns2, gdns3, gdns_dom, gsearch_dom, liface, debug=False):
         """ Initialise the thread with network information.
 
         Keyword arguments:
@@ -1003,14 +1017,16 @@ class WiredConnectThread(ConnectThread):
         wired -- name of the wired interface
         before_script -- script to run before bringing up the interface
         after_script -- script to run after bringing up the interface
-        disconnect_script -- script to run after disconnection
+        pre_disconnect_script -- script to run before disconnection
+        post_disconnect_script -- script to run after disconnection
         gdns1 -- global DNS server 1
         gdns2 -- global DNS server 2
         gdns3 -- global DNS server 3
 
         """
         ConnectThread.__init__(self, network, wired, before_script, 
-                               after_script, disconnect_script, gdns1, gdns2, 
+                               after_script, pre_disconnect_script,
+                               post_disconnect_script, gdns1, gdns2,
                                gdns3, gdns_dom, gsearch_dom, liface, debug)
 
     def _connect(self):

wicd/translations.py

@@ -74,7 +74,8 @@ language['wired_networks'] = _('''Wired Networks''')
 language['backend_alert'] = _('''Changes to your backend won't occur until the daemon is restarted.''')
 language['about_help'] = _('''Stop a network connection in progress''')
 language['connecting'] = _('''Connecting''')
-language['disconnect_script'] = _('''Run disconnect script''')
+language['pre_disconnect_script'] = _('''Run pre-disconnect script''')
+language['post_disconnect_script'] = _('''Run post-disconnect script''')
 language['cannot_edit_scripts_1'] = _('''To avoid various complications, wicd-curses does not support directly editing the scripts directly.  However, you can edit them manually.  First, (as root)", open the "$A" config file, and look for the section labeled by the $B in question.  In this case, this is:''')
 language['cannot_edit_scripts_3'] = _('''You can also configure the wireless networks by looking for the "[<ESSID>]" field in the config file.''')
 language['cannot_edit_scripts_2'] = _('''Once there, you can adjust (or add) the "beforescript", "afterscript", and "disconnectscript" variables as needed, to change the preconnect, postconnect, and disconnect scripts respectively.  Note that you will be specifying the full path to the scripts - not the actual script contents.  You will need to add/edit the script contents separately.  Refer to the wicd manual page for more information.''')

wicd/wicd-daemon.py

@@ -1134,8 +1134,10 @@ class WirelessDaemon(dbus.service.Object):
         # is done.
         self.wifi.before_script = self.GetWirelessProperty(id, 'beforescript')
         self.wifi.after_script = self.GetWirelessProperty(id, 'afterscript')
-        self.wifi.disconnect_script = self.GetWirelessProperty(id,
-                                                               'disconnectscript')
+        self.wifi.pre_disconnect_script = self.GetWirelessProperty(id,
+                                                               'predisconnectscript')
+        self.wifi.post_disconnect_script = self.GetWirelessProperty(id,
+                                                               'postdisconnectscript')
         print 'Connecting to wireless network ' + self.LastScan[id]['essid']
         self.daemon.wired_bus.wired.Disconnect()
         self.daemon.SetForcedDisconnect(False)
@@ -1222,12 +1224,14 @@ class WirelessDaemon(dbus.service.Object):
 
         write_script_ent(bssid_key, "beforescript")
         write_script_ent(bssid_key, "afterscript")
-        write_script_ent(bssid_key, "disconnectscript")
+        write_script_ent(bssid_key, "predisconnectscript")
+        write_script_ent(bssid_key, "postdisconnectscript")
 
         if cur_network["use_settings_globally"]:
             write_script_ent(essid_key, "beforescript")
             write_script_ent(essid_key, "afterscript")
-            write_script_ent(essid_key, "disconnectscript")
+            write_script_ent(essid_key, "predisconnectscript")
+            write_script_ent(essid_key, "postdisconnectscript")
 
         self.config.write()
 
@@ -1421,7 +1425,8 @@ class WiredDaemon(dbus.service.Object):
         """ Connects to a wired network. """
         self.wired.before_script = self.GetWiredProperty("beforescript")
         self.wired.after_script = self.GetWiredProperty("afterscript")
-        self.wired.disconnect_script = self.GetWiredProperty("disconnectscript")
+        self.wired.pre_disconnect_script = self.GetWiredProperty("predisconnectscript")
+        self.wired.post_disconnect_script = self.GetWiredProperty("postdisconnectscript")
         self.daemon.wireless_bus.wifi.Disconnect()
         self.daemon.SetForcedDisconnect(False)
         self.UnsetWiredLastUsed()
@@ -1439,7 +1444,8 @@ class WiredDaemon(dbus.service.Object):
 
         for option in ["ip", "broadcast", "netmask","gateway", "search_domain", 
                        "dns_domain", "dns1", "dns2", "dns3", "beforescript", 
-                       "afterscript", "disconnectscript"]:
+                       "afterscript", "predisconnectscript",
+                       "postdisconnectscript"]:
             self.config.set(profilename, option, None)
         self.config.set(profilename, "default", default)
         self.config.write()
@@ -1507,7 +1513,8 @@ class WiredDaemon(dbus.service.Object):
 
         write_script_ent(profilename, "beforescript")
         write_script_ent(profilename, "afterscript")
-        write_script_ent(profilename, "disconnectscript")
+        write_script_ent(profilename, "predisconnectscript")
+        write_script_ent(profilename, "postdisconnectscript")
         self.config.write()
         return "100: Profile Written"