speedup opening of long movielists

[enigma2.git] / lib / python / Components / config.py

diff --git a/lib/python/Components/config.py b/lib/python/Components/config.py
index 82a5d6d853122b037a19b64ebb0d0216b44e56fe..635eb748589e28d095dbec67756de463443f662a 100644 (file)
--- a/lib/python/Components/config.py
+++ b/lib/python/Components/config.py
@@ -27,13 +27,16 @@ class configFile:
                x = line.find("=")
                if x > -1:
                        self.configElements[line[:x]] = line[x + 1:-1]
-       
+
        def getKey(self, key):
                return self.configElements[key]
 
-       def setKey(self, key, value):
+       def setKey(self, key, value, isDefaultKey=False):
                self.changed = 1
-               self.configElements[key] = value
+               if isDefaultKey and self.configElements.has_key(key):
+                       del self.configElements[key]
+               else:
+                       self.configElements[key] = value
 
        def save(self):
                if self.changed == 0:           #no changes, so no write to disk needed
@@ -257,15 +260,10 @@ class configSequence:
                        olddec = oldvalue % 10 ** (numberLen - posinblock) - (oldvalue % 10 ** (numberLen - posinblock - 1))
                        newvalue = oldvalue - olddec + (10 ** (numberLen - posinblock - 1) * number)
                        
-                       print "You actually pressed a number (" + str(number) + ") which will be added at block number " + str(blocknumber) + " on position " + str(posinblock)
-                       print "Old value: " + str(oldvalue) + " olddec: " + str(olddec) + " newvalue: " + str(newvalue)
                        self.parent.value[blocknumber] = newvalue
                        self.markedPos += 1
                
-               self.checkValues()                      
-               
-               print "markPos:",
-               print self.markedPos
+               self.checkValues()
 
                #FIXME: dont call when press left/right
                self.parent.change()    
@@ -273,7 +271,6 @@ class configSequence:
        def __call__(self, selected):                   #needed by configlist
                value = ""
                mPos = self.markedPos
-               print "Positon: " + str(mPos)
                num = 0;
                for i in self.parent.value:
                        if len(value):  #fixme no heading separator possible
@@ -285,7 +282,6 @@ class configSequence:
                        #if diff > 0:
                                ## if this helps?!
                                #value += " " * diff
-                       print (("%0" + str(len(str(self.valueBounds[num][1]))) + "d") % i)
                        if (self.censorChar == ""):
                                value += ("%0" + str(len(str(self.valueBounds[num][1]))) + "d") % i
                        else:
@@ -297,7 +293,27 @@ class configSequence:
                        return ("mtext"[1-selected:], value, [mPos])
                else:
                        return ("text", value)
+
+class configNothing:
+       def __init__(self, parent):
+               self.parent = parent
+               self.markedPos = 0
+
+       def cancel(self):
+               self.parent.reload()
+
+       def save(self):
+               self.parent.save()
                
+       def nextEntry(self):
+               self.parent.vals[1](self.parent.getConfigPath())
+
+       def handleKey(self, key):
+               pass
+
+       def __call__(self, selected):                   #needed by configlist
+               return ("text", "")
+
 class configText:
        # used as first parameter
        # is the text of a fixed size or is the user able to extend the length of the text
@@ -323,7 +339,6 @@ class configText:
                self.parent.save()
                
        def nextEntry(self):
-               print self.parent
                self.parent.vals[1](self.parent.getConfigPath())
 
        def handleKey(self, key):
@@ -383,7 +398,7 @@ config = Config();
 
 configfile = configFile()
 
-class ConfigSlider:
+class configSlider:
        def __init__(self, parent):
                self.parent = parent
 
@@ -397,21 +412,21 @@ class ConfigSlider:
                if self.parent.value < 0:
                        self.parent.value = 0   
 
-               if self.parent.value > 10:
-                       self.parent.value = 10  
+               if self.parent.value > self.parent.vals[1]:
+                       self.parent.value = self.parent.vals[1]
 
        def handleKey(self, key):
                if key == config.key["prevElement"]:
-                       self.parent.value = self.parent.value - 1
+                       self.parent.value = self.parent.value - self.parent.vals[0]
                if key == config.key["nextElement"]:
-                       self.parent.value = self.parent.value + 1
+                       self.parent.value = self.parent.value + self.parent.vals[0]
                                        
                self.checkValues()      
                self.parent.change()    
 
        def __call__(self, selected):                   #needed by configlist
                self.checkValues()
-               return ("slider", self.parent.value * 10)
+               return ("slider", self.parent.value, self.parent.vals[1])
 
 class ConfigSubsection:
        def __init__(self):
@@ -433,7 +448,7 @@ class configElement:
                return 0        #prevent bigger then array
 
        def datafromFile(self, control, data):
-               if control == ConfigSlider:
+               if control == configSlider:
                        return int(data)
                elif control == configSelection:
                        try:
@@ -463,7 +478,7 @@ class configElement:
                        return ""       
 
        def datatoFile(self, control, data):
-               if control == ConfigSlider:
+               if control == configSlider:
                        return str(data)
                elif control == configSelection:
                        if len(self.vals) < data + 1:
@@ -485,18 +500,20 @@ class configElement:
                        return str(data)
                elif control == configText:
                        return str(data.strip())
-
                elif control == configSequence:
+#                      print self.vals
+#                      print self.value
                        try:
-                               value = ((len(data) * ("%d" + self.vals[0]))[0:-1]) % tuple(data)
+                               value = ""
+                               count = 0
+                               for i in data:
+                                       if value !="":
+                                               value += self.vals[0]
+                                       value += (("%0" + str(len(str(self.vals[1][count][1]))) + "d") % i)
+                                       count += 1
+                                       #value = ((len(data) * ("%d" + self.vals[0]))[0:-1]) % tuple(data)
                        except: 
                                value = str(data)       
-#                      just in case you don't understand the above, here an equivalent:
-#                      value = ""
-#                      for i in data:
-#                              if value !="":
-#                                      value += self.vals[0]
-#                              value += str(i)
                        return value
                elif control == configSatlist:
                        return str(self.vals[self.value][1]);
@@ -512,27 +529,29 @@ class configElement:
 
                if value == "":
                        #print "value not found - using default"
-
                        if self.controlType == configSatlist:
                                self.value = self.getIndexbyEntry(self.defaultValue)
-                       else:   
+                       elif self.controlType == configSequence:
+                               self.value = self.defaultValue[:]
+                       else:
                                self.value = self.defaultValue
 
                        self.save()             #add missing value to dict
                else:
                        #print "set val:" + str(value)
                        self.value = value
-                       
+
                #is this right? activate settings after load/cancel and use default     
                self.change()
 
-       def __init__(self, configPath, control, defaultValue, vals):
+       def __init__(self, configPath, control, defaultValue, vals, saveDefaults = True):
                self.configPath = configPath
                self.defaultValue = defaultValue
                self.controlType = control
                self.vals = vals
                self.notifierList = [ ]
                self.enabled = True
+               self.saveDefaults = saveDefaults
                self.loadData()         
                
        def getConfigPath(self):
@@ -541,13 +560,28 @@ class configElement:
        def addNotifier(self, notifier):
                self.notifierList.append(notifier);
                notifier(self);
+
        def change(self):
                for notifier in self.notifierList:
                        notifier(self)
+
        def reload(self):
                self.loadData()
+
        def save(self):
-               configfile.setKey(self.configPath, self.datatoFile(self.controlType,self.value))
+               if self.controlType == configSatlist:
+                       defaultValue = self.getIndexbyEntry(self.defaultValue)
+               else:
+                       defaultValue = self.defaultValue
+               if self.value != defaultValue or self.saveDefaults:
+                       configfile.setKey(self.configPath, self.datatoFile(self.controlType, self.value))
+               else:
+                       try:
+                               oldValue = configfile.getKey(self.configPath)
+                       except:
+                               oldValue = None
+                       if oldValue is not None and oldValue != defaultValue:
+                               configfile.setKey(self.configPath, self.datatoFile(self.controlType, self.value), True)
 
 class configElement_nonSave(configElement):
        def __init__(self, configPath, control, defaultValue, vals):
@@ -555,13 +589,12 @@ class configElement_nonSave(configElement):
 
        def save(self):
                pass
-               
+
 def getConfigListEntry(description, element):
        b = element
        item = b.controlType(b)
        return ((description, item))
 
-
 def configElementBoolean(name, default, texts=(_("Enable"), _("Disable"))):
        return configElement(name, configSelection, default, texts)