X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/295fb0f22061cb6c1c014d866ea79c453527a867..d3233d4aa3d508e1408aabd797168044cc84983f:/lib/python/Components/config.py diff --git a/lib/python/Components/config.py b/lib/python/Components/config.py index 75035a78..7df6e762 100644 --- a/lib/python/Components/config.py +++ b/lib/python/Components/config.py @@ -26,6 +26,7 @@ import copy # class ConfigElement(object): def __init__(self): + object.__init__(self) self.saved_value = None self.save_disabled = False @@ -66,23 +67,29 @@ class ConfigElement(object): def cancel(self): self.load() + def isChanged(self): + if self.saved_value is None and self.value == self.default: + return False + return self.tostring(self.value) != self.saved_value + def changed(self): for x in self.notifiers: x(self) - def addNotifier(self, notifier): + def addNotifier(self, notifier, initial_call = True): assert callable(notifier), "notifiers must be callable" self.notifiers.append(notifier) - + # CHECKME: # do we want to call the notifier - # - at all when adding it? (yes) + # - at all when adding it? (yes, though optional) # - when the default is active? (yes) # - when no value *yet* has been set, # because no config has ever been read (currently yes) # (though that's not so easy to detect. # the entry could just be new.) - notifier(self) + if initial_call: + notifier(self) def disableSave(self): self.save_disabled = True @@ -163,6 +170,13 @@ class ConfigSelection(ConfigElement): def getValue(self): return self._value + def setCurrentText(self, text): + i = self.choices.index(self.value) + del self.description[self.choices[i]] + self.choices[i] = text + self.description[text] = text + self._value = text + value = property(getValue, setValue) def getIndex(self): @@ -179,8 +193,17 @@ class ConfigSelection(ConfigElement): elif key == KEY_RIGHT: self.value = self.choices[(i + 1) % nchoices] + def getText(self): + descr = self.description[self.value] + if len(descr): + return _(descr) + return descr + def getMulti(self, selected): - return ("text", self.description[self.value]) + descr = self.description[self.value] + if len(descr): + return ("text", _(descr)) + return ("text", descr) # HTML def getHTML(self, id): @@ -211,10 +234,19 @@ class ConfigBoolean(ConfigElement): if key in [KEY_LEFT, KEY_RIGHT]: self.value = not self.value + def getText(self): + descr = self.descriptions[self.value] + if len(descr): + return _(descr) + return descr + def getMulti(self, selected): - return ("text", _(self.descriptions[self.value])) + descr = self.descriptions[self.value] + if len(descr): + return ("text", _(descr)) + return ("text", descr) - def tostring(self, value): + def tostring(self, value): if not value: return "false" else: @@ -265,6 +297,9 @@ class ConfigDateTime(ConfigElement): if key == KEY_RIGHT: self.value = self.value + self.increment + def getText(self): + return time.strftime(self.formatstring, time.localtime(self.value)) + def getMulti(self, selected): return ("text", time.strftime(self.formatstring, time.localtime(self.value))) @@ -301,7 +336,7 @@ class ConfigSequence(ConfigElement): max_pos += len(str(self.limits[num][1])) while self._value[num] < self.limits[num][0]: - self.value[num] += 1 + self._value[num] += 1 while self._value[num] > self.limits[num][1]: self._value[num] -= 1 @@ -367,8 +402,8 @@ class ConfigSequence(ConfigElement): self.validate() self.changed() - - def getMulti(self, selected): + + def genText(self): value = "" mPos = self.marked_pos num = 0; @@ -381,9 +416,16 @@ class ConfigSequence(ConfigElement): if self.censor_char == "": value += ("%0" + str(len(str(self.limits[num][1]))) + "d") % i else: - value += (self.censorChar * len(str(self.limits[num][1]))) + value += (self.censor_char * len(str(self.limits[num][1]))) num += 1 - + return (value, mPos) + + def getText(self): + (value, mPos) = self.genText() + return value + + def getMulti(self, selected): + (value, mPos) = self.genText() # only mark cursor when we are selected # (this code is heavily ink optimized!) if self.enabled: @@ -398,11 +440,15 @@ class ConfigSequence(ConfigElement): return str(v) def fromstring(self, value): - return [int(x) for x in self.saved_value.split(self.seperator)] + return [int(x) for x in value.split(self.seperator)] class ConfigIP(ConfigSequence): def __init__(self, default): ConfigSequence.__init__(self, seperator = ".", limits = [(0,255),(0,255),(0,255),(0,255)], default = default) + + def getHTML(self, id): + # we definitely don't want leading zeros + return '.'.join(["%d" % d for d in self.value]) class ConfigMAC(ConfigSequence): def __init__(self, default): @@ -414,10 +460,12 @@ class ConfigPosition(ConfigSequence): class ConfigClock(ConfigSequence): def __init__(self, default): - ConfigSequence.__init__(self, seperator = ":", limits = [(0,23),(0,59)], default = default) + import time + t = time.localtime(default) + ConfigSequence.__init__(self, seperator = ":", limits = [(0,23),(0,59)], default = [t.tm_hour, t.tm_min]) class ConfigInteger(ConfigSequence): - def __init__(self, default, limits): + def __init__(self, default, limits = (0, 10000000000)): ConfigSequence.__init__(self, seperator = ":", limits = [limits], default = default) # you need to override this to do input validation @@ -436,9 +484,16 @@ class ConfigInteger(ConfigSequence): def tostring(self, value): return str(value) -class ConfigPIN(ConfigSequence): +class ConfigPIN(ConfigInteger): def __init__(self, default, len = 4, censor = ""): - ConfigSequence.__init__(self, seperator = ":", limits = [(0, (10**len)-1)], censor_char = censor, default = [default]) + assert isinstance(default, int), "ConfigPIN default must be an integer" + if default == -1: + default = "aaaa" + ConfigSequence.__init__(self, seperator = ":", limits = [(0, (10**len)-1)], censor_char = censor, default = default) + self.len = len + + def getLength(self): + return self.len class ConfigFloat(ConfigSequence): def __init__(self, default, limits): @@ -461,10 +516,10 @@ class ConfigText(ConfigElement, NumericalTextInput): self.value = self.default = default def validateMarker(self): - if self.marked_pos < 0: - self.marked_pos = 0 if self.marked_pos >= len(self.text): self.marked_pos = len(self.text) - 1 + if self.marked_pos < 0: + self.marked_pos = 0 #def nextEntry(self): # self.vals[1](self.getConfigPath()) @@ -478,12 +533,10 @@ class ConfigText(ConfigElement, NumericalTextInput): self.marked_pos -= 1 elif key == KEY_RIGHT: self.marked_pos += 1 - if not self.fixed_size: - if self.marked_pos >= len(self.text): - self.text = self.text.ljust(len(self.text) + 1) + self.maybeExpand() elif key in KEY_NUMBERS: number = self.getKey(getKeyNumber(key)) - self.text = self.text[0:self.marked_pos] + str(number) + self.text[self.marked_pos + 1:] + self.text = self.text[0:self.marked_pos] + unicode(number) + self.text[self.marked_pos + 1:] elif key == KEY_TIMEOUT: self.timeout() return @@ -491,8 +544,14 @@ class ConfigText(ConfigElement, NumericalTextInput): self.validateMarker() self.changed() + def maybeExpand(self): + if not self.fixed_size: + if self.marked_pos >= len(self.text): + self.text = self.text.ljust(len(self.text) + 1) + def nextFunc(self): self.marked_pos += 1 + self.maybeExpand() self.validateMarker() self.changed() @@ -509,6 +568,9 @@ class ConfigText(ConfigElement, NumericalTextInput): value = property(getValue, setValue) _value = property(getValue, setValue) + def getText(self): + return self.value + def getMulti(self, selected): return ("mtext"[1-selected:], self.value, [self.marked_pos]) @@ -549,6 +611,9 @@ class ConfigSlider(ConfigElement): self.checkValues() self.changed() + def getText(self): + return "%d / %d" % (self.value, self.max) + def getMulti(self, selected): self.checkValues() return ("slider", self.value, self.max) @@ -571,7 +636,7 @@ class ConfigSatlist(ConfigSelection): orbital_position = property(getOrbitalPosition) # nothing. -class ConfigDummy(ConfigSelection): +class ConfigNothing(ConfigSelection): def __init__(self): ConfigSelection.__init__(self, choices = [""]) @@ -637,6 +702,12 @@ class ConfigSubList(list, object): item.saved_value = self.stored_values[i] item.load() + def dict(self): + res = dict() + for index in range(len(self)): + res[str(index)] = self[index] + return res + # same as ConfigSubList, just as a dictionary. # care must be taken that the 'key' has a proper # str() method, because it will be used in the config @@ -676,6 +747,9 @@ class ConfigSubDict(dict, object): item.saved_value = self.stored_values[str(key)] item.load() + def dict(self): + return self + # Like the classes above, just with a more "native" # syntax. # @@ -736,6 +810,9 @@ class ConfigSubsection(object): for x in self.content.items.values(): x.load() + def dict(self): + return self.content.items + # the root config object, which also can "pickle" (=serialize) # down the whole config tree. # @@ -785,7 +862,8 @@ class Config(ConfigSubsection): # we inherit from ConfigSubsection, so ... #object.__setattr__(self, "saved_value", tree["config"]) - self.setSavedValue(tree["config"]) + if "config" in tree: + self.setSavedValue(tree["config"]) def saveToFile(self, filename): f = open(filename, "w") @@ -801,7 +879,7 @@ config = Config() config.misc = ConfigSubsection() class ConfigFile: - CONFIG_FILE = resolveFilename(SCOPE_CONFIG, "config2") + CONFIG_FILE = resolveFilename(SCOPE_CONFIG, "settings") def load(self): try: @@ -810,11 +888,26 @@ class ConfigFile: print "unable to load config (%s), assuming defaults..." % str(e) def save(self): - config.save() +# config.save() config.saveToFile(self.CONFIG_FILE) + def __resolveValue(self, pickles, cmap): + if cmap.has_key(pickles[0]): + if len(pickles) > 1: + return self.__resolveValue(pickles[1:], cmap[pickles[0]].dict()) + else: + return str(cmap[pickles[0]].value) + return None + def getResolvedKey(self, key): - return None # FIXME + names = key.split('.') + if len(names) > 1: + if names[0] == "config": + ret=self.__resolveValue(names[1:], config.content.items) + if ret and len(ret): + return ret + print "getResolvedKey", key, "failed !! (Typo??)" + return "" def NoSave(element): element.disableSave() @@ -824,8 +917,9 @@ configfile = ConfigFile() configfile.load() -def getConfigListEntry(desc, config): - return (desc, config) +def getConfigListEntry(*args): + assert len(args) > 1, "getConfigListEntry needs a minimum of two arguments (descr, configElement)" + return args #def _(x): # return x