X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/d317910c8fa4d1c9a4a3fedb36858574469dce17..9d459ff20eb617ec5e0e26cf4dbbdd5f58ebafc9:/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py diff --git a/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py b/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py old mode 100644 new mode 100755 index 15e52b99..b7a64b9a --- a/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py +++ b/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py @@ -1,191 +1,285 @@ +from enigma import eTimer from Screens.Screen import Screen -from Screens.MessageBox import MessageBox - from Components.ActionMap import ActionMap, NumberActionMap -from Components.Pixmap import Pixmap +from Components.Pixmap import Pixmap,MultiPixmap from Components.Label import Label -from Components.GUIComponent import * +from Components.Sources.StaticText import StaticText from Components.MenuList import MenuList -from Components.MultiContent import MultiContentEntryText +from Components.config import config, getConfigListEntry, ConfigYesNo, NoSave, ConfigSubsection, ConfigText, ConfigSelection, ConfigPassword +from Components.ConfigList import ConfigListScreen +from Components.Network import Network, iNetwork +from Components.Console import Console +from Plugins.Plugin import PluginDescriptor +from os import system, path as os_path, listdir +from Wlan import Wlan, WlanList, wpaSupplicant +from Wlan import Status, iStatus +plugin_path = "/usr/lib/enigma2/python/Plugins/SystemPlugins/WirelessLan" -from Components.config import config, getConfigListEntry -from Components.ConfigList import ConfigList, ConfigListScreen -from Components.Network import Network +list = [] +list.append("WEP") +list.append("WPA") +list.append("WPA2") +list.append("WPA/WPA2") -from Plugins.Plugin import PluginDescriptor +weplist = [] +weplist.append("ASCII") +weplist.append("HEX") -from Wlan import Wlan, WlanList, wpaSupplicant +config.plugins.wlan = ConfigSubsection() +config.plugins.wlan.essid = NoSave(ConfigText(default = "home", fixed_size = False)) +config.plugins.wlan.hiddenessid = NoSave(ConfigText(default = "home", fixed_size = False)) -plugin_path = "/usr/lib/enigma2/python/Plugins/SystemPlugins/WirelessLan" +config.plugins.wlan.encryption = ConfigSubsection() +config.plugins.wlan.encryption.enabled = NoSave(ConfigYesNo(default = False)) +config.plugins.wlan.encryption.type = NoSave(ConfigSelection(list, default = "WPA/WPA2" )) +config.plugins.wlan.encryption.wepkeytype = NoSave(ConfigSelection(weplist, default = "ASCII")) +config.plugins.wlan.encryption.psk = NoSave(ConfigPassword(default = "mysecurewlan", fixed_size = False)) -class WlanSelection(Screen): + +class WlanStatus(Screen): skin = """ - - - - - - - + + + + + + + + + + - - - - + + + + + + + + + + + + """ - def __init__(self, session, args = None): - self.skin = WlanSelection.skin - self.session = session + def __init__(self, session, iface): Screen.__init__(self, session) + self.session = session + self.iface = iface + self.skin = WlanStatus.skin + + self["LabelBSSID"] = StaticText(_('Accesspoint:')) + self["LabelESSID"] = StaticText(_('SSID:')) + self["LabelQuality"] = StaticText(_('Link Quality:')) + self["LabelSignal"] = StaticText(_('Signal Strength:')) + self["LabelBitrate"] = StaticText(_('Bitrate:')) + self["LabelEnc"] = StaticText(_('Encryption:')) + + self["BSSID"] = StaticText() + self["ESSID"] = StaticText() + self["quality"] = StaticText() + self["signal"] = StaticText() + self["bitrate"] = StaticText() + self["enc"] = StaticText() + + self["IFtext"] = StaticText() + self["IF"] = StaticText() + self["Statustext"] = StaticText() + self["statuspic"] = MultiPixmap() + self["statuspic"].hide() + self["key_red"] = StaticText(_("Close")) + + self.resetList() + self.updateStatusbar() + + self["actions"] = NumberActionMap(["WizardActions", "InputActions", "EPGSelectActions", "ShortcutActions"], + { + "ok": self.exit, + "back": self.exit, + "red": self.exit, + }, -1) + self.timer = eTimer() + self.timer.timeout.get().append(self.resetList) + self.onShown.append(lambda: self.timer.start(5000)) + self.onLayoutFinish.append(self.layoutFinished) + self.onClose.append(self.cleanup) + + def cleanup(self): + iStatus.stopWlanConsole() + + def layoutFinished(self): + self.setTitle(_("Wireless Network State")) - self.list = [] - - self["list"] = WlanList(self.session) + def resetList(self): + print "self.iface im resetlist",self.iface + iStatus.getDataForInterface(self.iface,self.getInfoCB) + + def getInfoCB(self,data,status): + if data is not None: + if data is True: + if status is not None: + self["BSSID"].setText(status[self.iface]["acesspoint"]) + self["ESSID"].setText(status[self.iface]["essid"]) + self["quality"].setText(status[self.iface]["quality"]+"%") + self["signal"].setText(status[self.iface]["signal"]) + self["bitrate"].setText(status[self.iface]["bitrate"]) + self["enc"].setText(status[self.iface]["encryption"]) + self.updateStatusLink(status) + + def exit(self): + self.timer.stop() + self.close() + + def updateStatusbar(self): + print "self.iface im updateStatusbar",self.iface + self["BSSID"].setText(_("Please wait...")) + self["ESSID"].setText(_("Please wait...")) + self["quality"].setText(_("Please wait...")) + self["signal"].setText(_("Please wait...")) + self["bitrate"].setText(_("Please wait...")) + self["enc"].setText(_("Please wait...")) + self["IFtext"].setText(_("Network:")) + self["IF"].setText(iNetwork.getFriendlyAdapterName(self.iface)) + self["Statustext"].setText(_("Link:")) + + def updateStatusLink(self,status): + 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 WlanScan(Screen): + skin = """ + + + + + + + + + + + + """ + + def __init__(self, session, iface): + Screen.__init__(self, session) + self.session = session + self.iface = iface + self.skin = WlanScan.skin self.skin_path = plugin_path + self.oldInterfaceState = iNetwork.getAdapterAttribute(self.iface, "up") - self["cancel"] = Pixmap() - self["select"] = Pixmap() - self["rescan"] = Pixmap() - self["skip"] = Pixmap() + self["info"] = StaticText() + self.list = [] + self["list"] = WlanList(self.session, self.iface) - self["canceltext"] = Label(_("Cancel")) - self["selecttext"] = Label(_("Select")) - self["rescantext"] = Label(_("Rescan")) - self["skiptext"] = Label(_("Skip")) + self.setInfo() + + self["key_red"] = StaticText(_("Close")) + self["key_green"] = StaticText(_("Connect")) + self["key_yellow"] = StaticText(_("Refresh")) self["actions"] = NumberActionMap(["WizardActions", "InputActions", "EPGSelectActions"], { "ok": self.select, - "back": self.exit, -# "up": self.up, -# "down": self.down, + "back": self.cancel, }, -1) self["shortcuts"] = ActionMap(["ShortcutActions"], { - "red": self.exit, + "red": self.cancel, "green": self.select, "yellow": self.rescan, - "blue": self.skip, }) + self.onLayoutFinish.append(self.layoutFinished) + + def layoutFinished(self): + self.setTitle(_("Choose a wireless network")) def select(self): cur = self["list"].getCurrent() - if cur: - ret = (self.session, cur) + #print "CURRENT",cur + if cur is not None: + if cur[1] is not None: + essid = cur[0] + if essid == '': + essid = cur[1] + encrypted = cur[2] + self.close(essid,self["list"].getList()) + else: + self.close(None,None) else: - ret = (self.session, None) - self.close(ret) + self.close(None,None) + + def WlanSetupClosed(self, *ret): + if ret[0] == 2: + self.close(None) def rescan(self): self["list"].reload() + self.setInfo() - def skip(self): - self.close( (self.session, None) ) - - def exit(self): - self.close( (None ,) ) - -class WlanConfiguration(ConfigListScreen, Screen): - skin = """ - - - - - - """ - - def __init__(self, session, essid = None, encrypted = False, iface = "wlan0"): - - Screen.__init__(self, session) - self.skin = WlanConfiguration.skin - - self.iface = iface - self.list = [] - self.ws = wpaSupplicant() - - self["introduction"] = Label(_("Press OK to activate the settings.")) - self["interface"] = Label(_("Interface: ")+self.iface) - - if essid is None: - self.ws.loadConfig() - + def cancel(self): + if self.oldInterfaceState is False: + iNetwork.deactivateInterface(self.iface,self.deactivateInterfaceCB) else: - config.plugins.wlan.essid.value = essid - config.plugins.wlan.encryption.enabled.value = True - - self["actions"] = ActionMap(["SetupActions"], - { - "ok": self.ok, - "cancel": self.cancel, - }, -2) - - ConfigListScreen.__init__(self, self.list) - self.createSetup() - - def createSetup(self): + self.close(None) - self.list = [ ] - - self.list.append(getConfigListEntry(_("Network SSID"), config.plugins.wlan.essid)) - self.list.append(getConfigListEntry(_("Encryption"), config.plugins.wlan.encryption.enabled)) - - if config.plugins.wlan.encryption.enabled.value: - self.list.append(getConfigListEntry(_("Encryption Type"), config.plugins.wlan.encryption.type)) - self.list.append(getConfigListEntry(_("Encryption Key"), config.plugins.wlan.encryption.psk)) - - self["config"].list = self.list - self["config"].l.setList(self.list) + def deactivateInterfaceCB(self,data): + if data is not None: + if data is True: + iNetwork.getInterfaces(self.cancelCB) - def keyLeft(self): - ConfigListScreen.keyLeft(self) - self.createSetup() + def cancelCB(self,data): + if data is not None: + if data is True: + self.close(None) - def keyRight(self): - ConfigListScreen.keyRight(self) - self.createSetup() - - def ok(self): - self.ws.writeConfig() - self.ws.restart(self.iface) - self.close() - - def cancel(self): - self.close() - -def EntryChosen(parms): - if parms[0]: - session = parms[0] - if parms[1] is not None: - val = parms[1] - essid = val[0] - encrypted = val[2] - iface = val[3] - session.open(WlanConfiguration, essid, encrypted, iface) + def setInfo(self): + length = self["list"].getLength() + + if length == 0: + self["info"].setText(_("No wireless networks found! Please refresh.")) + elif length == 1: + self["info"].setText(_("1 wireless network found!")) else: - session.open(WlanConfiguration) + self["info"].setText(str(length)+_(" wireless networks found!")) -def WlanSelectionMain(session, iface): - session.openWithCallback(EntryChosen, WlanSelection) -def WlanConfigurationMain(session, **kwargs): - session.open(WlanConfiguration) +def WlanStatusScreenMain(session, iface): + session.open(WlanStatus, iface) + def callFunction(iface): - w = Wlan() + + w = Wlan(iface) + i = w.getWirelessInterfaces() + if i: + if iface in i: + return WlanStatusScreenMain + + return None - if iface in w.getWirelessInterfaces(): - return WlanSelectionMain - else: - return None def configStrings(iface): - return "#Custom Configstring for "+iface - + driver = iNetwork.detectWlanModule() + print "Found WLAN-Driver:",driver + if driver in ('ralink', 'zydas'): + return " pre-up /usr/sbin/wpa_supplicant -i"+iface+" -c/etc/wpa_supplicant.conf -B -D"+driver+"\n post-down wpa_cli terminate" + else: + if config.plugins.wlan.essid.value == "hidden...": + return ' pre-up iwconfig '+iface+' essid "'+config.plugins.wlan.hiddenessid.value+'"\n pre-up /usr/sbin/wpa_supplicant -i'+iface+' -c/etc/wpa_supplicant.conf -B -dd -D'+driver+'\n post-down wpa_cli terminate' + else: + return ' pre-up iwconfig '+iface+' essid "'+config.plugins.wlan.essid.value+'"\n pre-up /usr/sbin/wpa_supplicant -i'+iface+' -c/etc/wpa_supplicant.conf -B -dd -D'+driver+'\n post-down wpa_cli terminate' + def Plugins(**kwargs): - return PluginDescriptor(name=_("Wireless LAN"), description=_("Connect to a Wireless Network"), where = PluginDescriptor.WHERE_NETWORKSETUP, fnc={"ifaceSupported": callFunction, "configStrings": configStrings, "menuEntryName": lambda x: _("Wlan Configuartion Utility")}) + return PluginDescriptor(name=_("Wireless LAN"), description=_("Connect to a Wireless Network"), where = PluginDescriptor.WHERE_NETWORKSETUP, fnc={"ifaceSupported": callFunction, "configStrings": configStrings, "WlanPluginEntry": lambda x: "Wireless Network Configuartion..."}) \ No newline at end of file