better async handling

[enigma2.git] / lib / python / Screens / NetworkSetup.py

diff --git a/lib/python/Screens/NetworkSetup.py b/lib/python/Screens/NetworkSetup.py
index c26302faa242932be20cf3d3099bb8f9d3a3a567..887e1674417e87d3e9f362ee7a59380ef77e39cc 100755 (executable)
--- a/lib/python/Screens/NetworkSetup.py
+++ b/lib/python/Screens/NetworkSetup.py
@@ -285,13 +285,12 @@ class AdapterSetup(Screen, ConfigListScreen, HelpableScreen):
                self.finished_cb = None
                self.oktext = _("Press OK on your remote control to continue.")
                self.oldInterfaceState = iNetwork.getAdapterAttribute(self.iface, "up")
-               #iNetwork.getInterfaces()
                
                self.createConfig()
 
                self["OkCancelActions"] = HelpableActionMap(self, "OkCancelActions",
                        {
-                       "cancel": (self.close, _("exit networkadapter setup menu")),
+                       "cancel": (self.cancel, _("exit networkadapter setup menu")),
                        "ok": (self.ok, _("select menu entry")),
                        })
 
@@ -413,7 +412,6 @@ class AdapterSetup(Screen, ConfigListScreen, HelpableScreen):
                                        self.aps = self.w.getNetworkList()
                                        if self.aps is not None:
                                                print "[NetworkSetup.py] got Accespoints!"
-                                               print self.aps
                                                for ap in self.aps:
                                                        a = self.aps[ap]
                                                        if a['active']:
@@ -629,7 +627,7 @@ class AdapterSetup(Screen, ConfigListScreen, HelpableScreen):
                if data is False:
                        self.close('ok')
                else:
-                       configuredInterfaces = configuredNetworkAdapters
+                       configuredInterfaces = iNetwork.getConfiguredAdapters()
                        for interface in configuredInterfaces:
                                if interface == self.iface:
                                        continue
@@ -638,17 +636,26 @@ class AdapterSetup(Screen, ConfigListScreen, HelpableScreen):
                                self.applyConfig(True)
                        
        def ConfigfinishedCB(self,data):
-               if data is True:
-                       self.close('ok')
+               if data is not None:
+                       if data is True:
+                               self.close('ok')
 
        def cancel(self):
-               iNetwork.setAdapterAttribute(self.iface, "up", self.oldInterfaceState)
-               self.activateInterfaceEntry.value = self.oldInterfaceState
-               if self.activateInterfaceEntry.value is False:
-                       iNetwork.deactivateInterface(self.iface)
-               iNetwork.getInterfaces()
-               self.close('cancel')
+               if self.oldInterfaceState is False:
+                       iNetwork.deactivateInterface(self.iface,self.deactivateInterfaceCB)
+               else:
+                       self.close('cancel')
 
+       def deactivateInterfaceCB(self,data):
+               if data is not None:
+                       if data is True:
+                               iNetwork.getInterfaces(self.cancelCB)
+       
+       def cancelCB(self,data):                        
+               if data is not None:
+                       if data is True:
+                               self.close('cancel')
+                               
        def runAsync(self, finished_cb):
                self.finished_cb = finished_cb
                self.ok()
@@ -663,7 +670,8 @@ class AdapterSetup(Screen, ConfigListScreen, HelpableScreen):
                
        def cleanup(self):
                iNetwork.stopLinkStateConsole()
-               iNetwork.stopRestartConsole()   
+               iNetwork.stopDeactivateInterfaceConsole()
+               
 
 class AdapterSetupConfiguration(Screen, HelpableScreen):
        def __init__(self, session,iface):
@@ -722,7 +730,6 @@ class AdapterSetupConfiguration(Screen, HelpableScreen):
                iNetwork.getInterfaces(self.updateStatusbar)
                self.onLayoutFinish.append(self.layoutFinished)
                self.onClose.append(self.cleanup)
-               self.onHide.append(self.cleanup)
 
        def ok(self):
                if self["menulist"].getCurrent()[1] == 'edit':
@@ -770,7 +777,7 @@ class AdapterSetupConfiguration(Screen, HelpableScreen):
                                ifobj = Wireless(self.iface) # a Wireless NIC Object
                                self.wlanresponse = ifobj.getStatistics()
                                if self.wlanresponse[0] != 19:
-                                       self.session.openWithCallback(self.AdapterSetupClosed, WlanStatus,self.iface)
+                                       self.session.openWithCallback(self.WlanStatusClosed, WlanStatus,self.iface)
                                else:
                                        # Display Wlan not available Message
                                        self.showErrorMessage()
@@ -830,19 +837,14 @@ class AdapterSetupConfiguration(Screen, HelpableScreen):
                
                if self.iface == 'wlan0' or self.iface == 'ath0':
                        try:
-                               from Plugins.SystemPlugins.WirelessLan.Wlan import Wlan
-                               w = Wlan(self.iface)
-                               stats = w.getStatus()
-                               if stats['BSSID'] == "00:00:00:00:00:00":
-                                       self["statuspic"].setPixmapNum(1)
-                               else:
-                                       self["statuspic"].setPixmapNum(0)
-                               self["statuspic"].show()
+                               from Plugins.SystemPlugins.WirelessLan.Wlan import iStatus,Status
                        except:
                                        self["statuspic"].setPixmapNum(1)
                                        self["statuspic"].show()
+                       else:
+                               iStatus.getDataForInterface(self.iface,self.getInfoCB)
                else:
-                       self.getLinkState(self.iface)
+                       iNetwork.getLinkState(self.iface,self.dataAvail)
 
        def doNothing(self):
                pass
@@ -894,7 +896,7 @@ class AdapterSetupConfiguration(Screen, HelpableScreen):
                                        ifobj = Wireless(self.iface) # a Wireless NIC Object
                                        self.wlanresponse = ifobj.getStatistics()
                                        if self.wlanresponse[0] != 19:
-                                               self.session.openWithCallback(self.AdapterSetupClosed, WlanStatus,self.iface)
+                                               self.session.openWithCallback(self.WlanStatusClosed, WlanStatus,self.iface)
                                        else:
                                                # Display Wlan not available Message
                                                self.showErrorMessage()
@@ -907,12 +909,24 @@ class AdapterSetupConfiguration(Screen, HelpableScreen):
                        self["menulist"].l.setList(self.mainmenu)
                        iNetwork.getInterfaces(self.updateStatusbar)
 
+       def WlanStatusClosed(self, *ret):
+               if ret is not None and len(ret):
+                       from Plugins.SystemPlugins.WirelessLan.Wlan import iStatus,Status
+                       iStatus.stopWlanConsole()
+                       self.mainmenu = self.genMainMenu()
+                       self["menulist"].l.setList(self.mainmenu)
+                       iNetwork.getInterfaces(self.updateStatusbar)
+
        def WlanScanClosed(self,*ret):
                if ret[0] is not None:
                        self.session.openWithCallback(self.AdapterSetupClosed, AdapterSetup, self.iface,ret[0],ret[1])
                else:
-                       self.session.openWithCallback(self.AdapterSetupClosed, AdapterSetup, self.iface,None,None)
-
+                       from Plugins.SystemPlugins.WirelessLan.Wlan import iStatus,Status
+                       iStatus.stopWlanConsole()
+                       self.mainmenu = self.genMainMenu()
+                       self["menulist"].l.setList(self.mainmenu)
+                       iNetwork.getInterfaces(self.updateStatusbar)
+                       
        def restartLan(self, ret = False):
                if (ret == True):
                        iNetwork.restartNetwork(self.restartLanDataAvail)
@@ -930,18 +944,15 @@ class AdapterSetupConfiguration(Screen, HelpableScreen):
                if data is True:
                        self.session.open(MessageBox, _("Finished restarting your network"), type = MessageBox.TYPE_INFO, timeout = 10, default = False)
 
-       def getLinkState(self,iface):
-               iNetwork.getLinkState(iface,self.dataAvail)
-
        def dataAvail(self,data):
                self.output = data.strip()
                result = self.output.split('\n')
                pattern = re_compile("Link detected: yes")
                for item in result:
                        if re_search(pattern, item):
-                               self["statuspic"].setPixmapNum(0)
-                       else:
                                self["statuspic"].setPixmapNum(1)
+                       else:
+                               self["statuspic"].setPixmapNum(0)
                self["statuspic"].show()
 
        def showErrorMessage(self):
@@ -949,7 +960,23 @@ class AdapterSetupConfiguration(Screen, HelpableScreen):
                
        def cleanup(self):
                iNetwork.stopLinkStateConsole()
-
+               iNetwork.stopDeactivateInterfaceConsole()
+               try:
+                       from Plugins.SystemPlugins.WirelessLan.Wlan import iStatus,Status
+               except ImportError:
+                       pass
+               else:
+                       iStatus.stopWlanConsole()
+
+       def getInfoCB(self,data,status):
+               if data is not None:
+                       if data is True:
+                               if status is not None:
+                                       if status[self.iface]["acesspoint"] == "No Connection" or status[self.iface]["acesspoint"] == "Not-Associated" or status[self.iface]["acesspoint"] == False:
+                                               self["statuspic"].setPixmapNum(1)
+                                       else:
+                                               self["statuspic"].setPixmapNum(0)
+                                       self["statuspic"].show()
 
 class NetworkAdapterTest(Screen):      
        def __init__(self, session,iface):
@@ -958,6 +985,8 @@ class NetworkAdapterTest(Screen):
                self.oldInterfaceState = iNetwork.getAdapterAttribute(self.iface, "up")
                iNetwork.getInterfaces()
                self.setLabels()
+               self.onClose.append(self.cleanup)
+               self.onHide.append(self.cleanup)
                
                self["updown_actions"] = NumberActionMap(["WizardActions","ShortcutActions"],
                {
@@ -1115,6 +1144,7 @@ class NetworkAdapterTest(Screen):
 
        def doStep3(self):
                self["Networktext"].setForegroundColorNum(1)
+               self["Network"].setText(_("Please wait..."))
                self.getLinkState(self.iface)
                self["NetworkInfo_Text"].setForegroundColorNum(1)
                self.steptimer = True
@@ -1287,24 +1317,14 @@ class NetworkAdapterTest(Screen):
        def getLinkState(self,iface):
                if iface == 'wlan0' or iface == 'ath0':
                        try:
-                               from Plugins.SystemPlugins.WirelessLan.Wlan import Wlan
-                               w = Wlan(iface)
-                               stats = w.getStatus()
-                               if stats['BSSID'] == "00:00:00:00:00:00":
-                                       self["Network"].setForegroundColorNum(1)
-                                       self["Network"].setText(_("disconnected"))
-                                       self["NetworkInfo_Check"].setPixmapNum(1)
-                                       self["NetworkInfo_Check"].show()
-                               else:
-                                       self["Network"].setForegroundColorNum(2)
-                                       self["Network"].setText(_("connected"))
-                                       self["NetworkInfo_Check"].setPixmapNum(0)
-                                       self["NetworkInfo_Check"].show()
+                               from Plugins.SystemPlugins.WirelessLan.Wlan import iStatus,Status
                        except:
                                        self["Network"].setForegroundColorNum(1)
                                        self["Network"].setText(_("disconnected"))
                                        self["NetworkInfo_Check"].setPixmapNum(1)
                                        self["NetworkInfo_Check"].show()
+                       else:
+                               iStatus.getDataForInterface(self.iface,self.getInfoCB)
                else:
                        iNetwork.getLinkState(iface,self.LinkStatedataAvail)
 
@@ -1324,7 +1344,6 @@ class NetworkAdapterTest(Screen):
                self["NetworkInfo_Check"].show()
 
        def NetworkStatedataAvail(self,data):
-               print "DATA",data
                if data <= 2:
                        self["IP"].setForegroundColorNum(2)
                        self["IP"].setText(_("confirmed"))
@@ -1339,7 +1358,6 @@ class NetworkAdapterTest(Screen):
                self.nextStepTimer.start(3000)          
                
        def DNSLookupdataAvail(self,data):
-               print "DATA",data
                if data <= 2:
                        self["DNS"].setForegroundColorNum(2)
                        self["DNS"].setText(_("confirmed"))
@@ -1362,5 +1380,28 @@ class NetworkAdapterTest(Screen):
                self["shortcutsyellow"].setEnabled(False)
                self["updown_actions"].setEnabled(True)
                self.activebutton = 6
-               
-               
\ No newline at end of file
+
+       def getInfoCB(self,data,status):
+               if data is not None:
+                       if data is True:
+                               if status is not None:
+                                       if status[self.iface]["acesspoint"] == "No Connection" or status[self.iface]["acesspoint"] == "Not-Associated" or status[self.iface]["acesspoint"] == False:
+                                               self["Network"].setForegroundColorNum(1)
+                                               self["Network"].setText(_("disconnected"))
+                                               self["NetworkInfo_Check"].setPixmapNum(1)
+                                               self["NetworkInfo_Check"].show()
+                                       else:
+                                               self["Network"].setForegroundColorNum(2)
+                                               self["Network"].setText(_("connected"))
+                                               self["NetworkInfo_Check"].setPixmapNum(0)
+                                               self["NetworkInfo_Check"].show()
+                                               
+       def cleanup(self):
+               iNetwork.stopLinkStateConsole()
+               iNetwork.stopDNSConsole()
+               try:
+                       from Plugins.SystemPlugins.WirelessLan.Wlan import iStatus,Status
+               except ImportError:
+                       pass
+               else:
+                       iStatus.stopWlanConsole()                                               
\ No newline at end of file