copy lists, not list identities... should fix saving of non-default values
[enigma2.git] / lib / python / Components / config.py
index dfd5d5971a2bcd39a9c5c961cffaecf029069306..1645784b7c33e676b90b91677d81d4368762d3de 100644 (file)
@@ -1,11 +1,13 @@
 from time import *
+from Tools.NumericalTextInput import *
+from Tools.Directories import *
 
 class configFile:
        def __init__(self):
                self.changed = 0
                self.configElements = { }
                try:
-                       self.file = open("config")
+                       self.file = open(resolveFilename(SCOPE_CONFIG, "config"))
                except IOError:
                        print "cannot open config file"
                        return 
@@ -24,7 +26,7 @@ class configFile:
        def addElement(self, line):
                x = line.find("=")
                if x > -1:
-                       self.configElements[line[:x]] = line[x + 1:]
+                       self.configElements[line[:x]] = line[x + 1:-1]
        
        def getKey(self, key):
                return self.configElements[key]
@@ -37,19 +39,27 @@ class configFile:
                if self.changed == 0:           #no changes, so no write to disk needed
                        return
                        
-               fileHandle = open("config", "w")
+               fileHandle = open(resolveFilename(SCOPE_CONFIG, "config"), "w")
                
                keys = self.configElements.keys()
                keys.sort()
                for x in keys:
-                       wstr = x + "=" + self.configElements[x]
-                       
-                       if wstr[len(wstr) - 1] != '\n':
-                               wstr = wstr + "\n"
+                       wstr = x + "=" + self.configElements[x] + "\n"
 
                        fileHandle.write(wstr)
 
-               fileHandle.close()              
+               fileHandle.close()
+               
+def currentConfigSelectionElement(element):
+       return element.vals[element.value][0]
+
+def getConfigSelectionElement(element, value):
+       count = 0
+       for x in element.vals:
+               if x[0] == value:
+                       return count
+               count += 1
+       return -1
 
 class configSelection:
        def __init__(self, parent):
@@ -57,10 +67,9 @@ class configSelection:
                
        def checkValues(self):
                if self.parent.value < 0:
-                       self.parent.value = 0   
-
-               if(self.parent.value >= (len(self.parent.vals) - 1)):
-                       self.parent.value = len(self.parent.vals) - 1
+                       self.parent.value = len(self.parent.vals) - 1   
+               elif(self.parent.value > (len(self.parent.vals) - 1)):
+                       self.parent.value = 0
 
        def cancel(self):
                self.parent.reload()
@@ -76,12 +85,17 @@ class configSelection:
                
                self.checkValues()                      
 
-               self.parent.change()    
+               self.parent.change()
 
        def __call__(self, selected):                   #needed by configlist
                self.checkValues()
-               return ("text", self.parent.vals[self.parent.value])
-
+               if isinstance(self.parent.vals[self.parent.value], str):
+                       returnValue = _(self.parent.vals[self.parent.value])
+               else:
+                       returnValue = _(self.parent.vals[self.parent.value][1])
+               
+               return ("text", returnValue)
+               
 class configDateTime:
        def __init__(self, parent):
                self.parent = parent
@@ -150,10 +164,13 @@ class configSequenceArg:
        def get(self, type, args = ()):
                # configsequencearg.get ("IP")
                if (type == "IP"):
-                       return (("."), [(1,255),(0,255),(0,255),(0,255)], "")
+                       return (("."), [(0,255),(0,255),(0,255),(0,255)], "")
                # configsequencearg.get ("MAC")
                if (type == "MAC"):
                        return ((":"), [(1,255),(1,255),(1,255),(1,255),(1,255),(1,255)], "")
+               # configsequencearg.get ("CLOCK")
+               if (type == "CLOCK"):
+                       return ((":"), [(0,23),(0,59)], "")
                # configsequencearg.get("INTEGER", (min, max)) => x with min <= x <= max
                if (type == "INTEGER"):
                        return ((":"), [args], "")
@@ -164,6 +181,9 @@ class configSequenceArg:
                # configsequencearg.get("FLOAT", [(min,max),(min1,max1)]) => x.y with min <= x <= max and min1 <= y <= max1
                if (type == "FLOAT"):
                        return (("."), args, "")
+               
+       def getFloat(self, element):
+               return float(("%d.%0" + str(len(str(element.vals[1][1][1]))) + "d") % (element.value[0], element.value[1]))
 
 configsequencearg = configSequenceArg()
                
@@ -212,27 +232,35 @@ class configSequence:
                        self.markedPos += 1
                
                if key >= config.key["0"] and key <= config.key["9"]:
+                       self.blockLen = []
+                       for x in self.valueBounds:
+                               self.blockLen.append(len(str(x[1])))
+                               
+                       pos = 0
+                       blocknumber = 0
+                       self.blockLenTotal = [0,]
+                       for x in self.blockLen:
+                               pos += self.blockLen[blocknumber]
+                               self.blockLenTotal.append(pos)
+                               if (pos - 1 >= self.markedPos):
+                                       pass
+                               else:
+                                       blocknumber += 1
+                                       
                        number = 9 - config.key["9"] + key
                        # length of numberblock
-                       numberLen = len(str(self.valueBounds[0][1]))
+                       numberLen = len(str(self.valueBounds[blocknumber][1]))
                        # position in the block
-                       posinblock = self.markedPos % numberLen
-                       # blocknumber
-                       blocknumber = self.markedPos / numberLen
+                       posinblock = self.markedPos - self.blockLenTotal[blocknumber]
                        
                        oldvalue = self.parent.value[blocknumber]
                        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()    
@@ -240,7 +268,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
@@ -252,7 +279,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:
@@ -260,8 +286,67 @@ class configSequence:
                        num += 1
                        # only mark cursor when we are selected
                        # (this code is heavily ink optimized!)
-               return ("mtext"[1-selected:], value, [mPos])
+               if (self.parent.enabled == True):
+                       return ("mtext"[1-selected:], value, [mPos])
+               else:
+                       return ("text", value)
+               
+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
+       extendableSize = 1
+       fixedSize = 2
+
+       def __init__(self, parent):
+               self.parent = parent
+               self.markedPos = 0
+               self.mode = self.parent.vals[0]
+               self.textInput = NumericalTextInput(self.nextEntry)
+
+       def checkValues(self):
+               if (self.markedPos < 0):
+                       self.markedPos = 0
+               if (self.markedPos >= len(self.parent.value)):
+                       self.markedPos = len(self.parent.value) - 1
+                       
+       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):
+               #this will no change anything on the value itself
+               #so we can handle it here in gui element
+               if key == config.key["delete"]:
+                       self.parent.value = self.parent.value[0:self.markedPos] + self.parent.value[self.markedPos + 1:]
+               if key == config.key["prevElement"]:
+                       self.textInput.nextKey()
+                       self.markedPos -= 1
+
+               if key == config.key["nextElement"]:
+                       self.textInput.nextKey()
+                       self.markedPos += 1
+                       if (self.mode == self.extendableSize):
+                               if (self.markedPos >= len(self.parent.value)):
+                                       self.parent.value = self.parent.value.ljust(len(self.parent.value) + 1)
+                       
+                               
+               if key >= config.key["0"] and key <= config.key["9"]:
+                       number = 9 - config.key["9"] + key
+
+                       self.parent.value = self.parent.value[0:self.markedPos] + str(self.textInput.getKey(number)) + self.parent.value[self.markedPos + 1:]
+               
+               self.checkValues()                      
+               
+               self.parent.change()    
+
+       def __call__(self, selected):                   #needed by configlist
+               return ("mtext"[1-selected:], str(self.parent.value), [self.markedPos])
+               
 class configValue:
        def __init__(self, obj):
                self.obj = obj
@@ -274,6 +359,7 @@ class Config:
                self.key = { "choseElement": 0,
                                         "prevElement": 1,
                                         "nextElement": 2,
+                                        "delete": 3,
                                         "0": 10,
                                         "1": 11,
                                         "2": 12,
@@ -286,6 +372,7 @@ class Config:
                                         "9": 19 }
                
 config = Config();
+
 configfile = configFile()
 
 class ConfigSlider:
@@ -334,16 +421,28 @@ class configElement:
                                        tcnt = cnt
                        cnt += 1
                if tcnt != -1:
-                       return tcnt                     
+                       return tcnt
                return 0        #prevent bigger then array
 
        def datafromFile(self, control, data):
                if control == ConfigSlider:
-                       return int(data);
+                       return int(data)
                elif control == configSelection:
-                       return int(data);
+                       try:
+                               return int(data)
+                       except:
+                               for x in data.split(":"):
+                                       if x[0] == "*":
+                                               count = 0
+                                               for y in self.vals:
+                                                       if y[0] == x[1:-1]:
+                                                               return count
+                                                       count += 1
+                               return self.defaultValue
                elif control == configDateTime:
-                       return int(data);
+                       return int(data)
+               elif control == configText:
+                       return str(data)
                elif control == configSequence:
                        list = [ ]
                        part = data.split(self.vals[0])
@@ -357,19 +456,43 @@ class configElement:
 
        def datatoFile(self, control, data):
                if control == ConfigSlider:
-                       return str(data);
+                       return str(data)
                elif control == configSelection:
-                       return str(data);
+                       if len(self.vals) < data + 1:
+                               return "0"
+                       if isinstance(self.vals[data], str):
+                               return str(data)
+                       else:
+                               confList = []
+                               count = 0
+                               for x in self.vals:
+                                       if count == data:
+                                               confList.append("*" + str(x[0] + "*"))
+                                       else:
+                                               confList.append(x[0])
+                                       count += 1
+                               return ":".join(confList)
+                       return str(data)
                elif control == configDateTime:
-                       return str(data);
+                       return str(data)
+               elif control == configText:
+                       return str(data.strip())
+
                elif control == configSequence:
-                       value = ((len(data) * ("%d" + self.vals[0]))[0:-1]) % tuple(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)
+                       print self.vals
+                       print self.value
+                       try:
+                               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)       
+
                        return value
                elif control == configSatlist:
                        return str(self.vals[self.value][1]);
@@ -377,6 +500,7 @@ class configElement:
                        return ""       
 
        def loadData(self):
+               #print "load:" + self.configPath
                try:
                        value = self.datafromFile(self.controlType, configfile.getKey(self.configPath))
                except:         
@@ -384,27 +508,34 @@ 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):
+               return self.configPath
+       
        def addNotifier(self, notifier):
                self.notifierList.append(notifier);
                notifier(self);
@@ -414,7 +545,8 @@ class configElement:
        def reload(self):
                self.loadData()
        def save(self):
-               configfile.setKey(self.configPath, self.datatoFile(self.controlType,self.value))
+               if (self.defaultValue != self.value) or (self.saveDefaults == True):
+                       configfile.setKey(self.configPath, self.datatoFile(self.controlType,self.value))
 
 class configElement_nonSave(configElement):
        def __init__(self, configPath, control, defaultValue, vals):
@@ -428,4 +560,8 @@ def getConfigListEntry(description, element):
        item = b.controlType(b)
        return ((description, item))
 
-       
\ No newline at end of file
+
+def configElementBoolean(name, default, texts=(_("Enable"), _("Disable"))):
+       return configElement(name, configSelection, default, texts)
+
+config.misc = ConfigSubsection()