fix possible crash

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

diff --git a/lib/python/Screens/Setup.py b/lib/python/Screens/Setup.py
index 2452eef90bb3cfd53ad93893160a77103a561ac1..7226562fd5a5431865ac58d874513526b0beb756 100644 (file)
--- a/lib/python/Screens/Setup.py
+++ b/lib/python/Screens/Setup.py
@@ -1,14 +1,12 @@
 from Screen import Screen
 from Components.ActionMap import NumberActionMap
-from Components.config import config
+from Components.config import config, ConfigNothing
+from Components.SystemInfo import SystemInfo
 from Components.ConfigList import ConfigListScreen
 from Components.Label import Label
 from Components.Pixmap import Pixmap
 
-import xml.dom.minidom
-from skin import elementsWithTag
-
-from Tools import XMLTools
+import xml.etree.cElementTree
 
 # FIXME: use resolveFile!
 # read the setupmenu
@@ -18,9 +16,16 @@ try:
 except:
        # if not found in the current path, we use the global datadir-path
        setupfile = file('/usr/share/enigma2/setup.xml', 'r')
-setupdom = xml.dom.minidom.parseString(setupfile.read())
+setupdom = xml.etree.cElementTree.parse(setupfile)
 setupfile.close()
 
+class SetupError(Exception):
+    def __init__(self, message):
+        self.msg = message
+
+    def __str__(self):
+        return self.msg
+
 class SetupSummary(Screen):
        skin = """
        <screen position="6,0" size="120,64">
@@ -30,11 +35,10 @@ class SetupSummary(Screen):
        </screen>"""
 
        def __init__(self, session, parent):
-               Screen.__init__(self, session)
+               Screen.__init__(self, session, parent = parent)
                self["SetupTitle"] = Label(_(parent.setup_title))
                self["SetupEntry"] = Label("")
                self["SetupValue"] = Label("")
-               self.parent = parent
                self.onShow.append(self.addWatcher)
                self.onHide.append(self.removeWatcher)
                
@@ -55,28 +59,35 @@ class Setup(ConfigListScreen, Screen):
 
        ALLOW_SUSPEND = True
 
+       def removeNotifier(self):
+               config.usage.setup_level.notifiers.remove(self.levelChanged)
+
+       def levelChanged(self, configElement):
+               list = []
+               self.refill(list)
+               self["config"].setList(list)
+
+       def refill(self, list):
+               xmldata = setupdom.getroot()
+               for x in xmldata.findall("setup"):
+                       if x.get("key") != self.setup:
+                               continue
+                       self.addItems(list, x);
+                       self.setup_title = x.get("title", "").encode("UTF-8")
+
        def __init__(self, session, setup):
                Screen.__init__(self, session)
 
-               xmldata = setupdom.childNodes[0]
-               
-               entries = xmldata.childNodes
+               # for the skin: first try a setup_<setupID>, then Setup
+               self.skinName = ["setup_" + setup, "Setup" ]
 
                self.onChangedEntry = [ ]
+
+               self.setup = setup
                list = []
-                               
-               for x in entries:             #walk through the actual nodelist
-                       if x.nodeType != xml.dom.minidom.Element.nodeType:
-                               continue
-                       elif x.tagName == 'setup':
-                               if x.getAttribute("key") != setup:
-                                       continue
-                               self.addItems(list, x.childNodes);
-                               myTitle = x.getAttribute("title").encode("UTF-8")
+               self.refill(list)
 
                #check for list.entries > 0 else self.close
-               
-               self.setup_title = myTitle
                self["title"] = Label(_(self.setup_title))
 
                self["oktext"] = Label(_("OK"))
@@ -108,29 +119,36 @@ class Setup(ConfigListScreen, Screen):
        def createSummary(self):
                return SetupSummary
 
-       def addItems(self, list, childNode):
-               for x in childNode:
-                       if x.nodeType != xml.dom.minidom.Element.nodeType:
-                               continue
-                       elif x.tagName == 'item':
-                               item_level = int(x.getAttribute("level") or "0")
+       def addItems(self, list, parentNode):
+               for x in parentNode:
+                       if x.tag == 'item':
+                               item_level = int(x.get("level", 0))
+
+                               if not self.levelChanged in config.usage.setup_level.notifiers:
+                                       config.usage.setup_level.notifiers.append(self.levelChanged)
+                                       self.onClose.append(self.removeNotifier)
 
                                if item_level > config.usage.setup_level.index:
                                        continue
 
-                               item_text = _(x.getAttribute("text").encode("UTF-8") or "??")
-                               b = eval(XMLTools.mergeText(x.childNodes));
+                               requires = x.get("requires")
+                               if requires and not SystemInfo.get(requires, False):
+                                       continue;
+
+                               item_text = _(x.get("text", "??").encode("UTF-8"))
+                               b = eval(x.text or "");
                                if b == "":
                                        continue
                                #add to configlist
                                item = b
                                # the first b is the item itself, ignored by the configList.
                                # the second one is converted to string.
-                               list.append( (item_text, item) )
+                               if not isinstance(item, ConfigNothing):
+                                       list.append( (item_text, item) )
 
 def getSetupTitle(id):
-       xmldata = setupdom.childNodes[0].childNodes
-       for x in elementsWithTag(xmldata, "setup"):
-               if x.getAttribute("key") == id:
-                       return x.getAttribute("title").encode("UTF-8")
-       raise "unknown setup id '%s'!" % repr(id)
+       xmldata = setupdom.getroot()
+       for x in xmldata.findall("setup"):
+               if x.get("key") == id:
+                       return x.get("title", "").encode("UTF-8")
+       raise SetupError("unknown setup id '%s'!" % repr(id))