X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/e66f4bdb5fd20a77e5db713d732275aa32b22af5..585d209a9fc6d0a7a31ebd4deeca527d093fea1c:/lib/python/Components/config.py diff --git a/lib/python/Components/config.py b/lib/python/Components/config.py index 861e70bf..b448ca6d 100644 --- a/lib/python/Components/config.py +++ b/lib/python/Components/config.py @@ -2,8 +2,9 @@ import time from enigma import getPrevAsciiCode from Tools.NumericalTextInput import NumericalTextInput from Tools.Directories import resolveFilename, SCOPE_CONFIG +from Components.Harddisk import harddiskmanager import copy - +import os # ConfigElement, the base class of all ConfigElements. @@ -50,10 +51,11 @@ class ConfigElement(object): # you can overide this for fancy default handling def load(self): - if self.saved_value is None: + sv = self.saved_value + if sv is None: self.value = self.default else: - self.value = self.fromstring(self.saved_value) + self.value = self.fromstring(sv) def tostring(self, value): return str(value) @@ -69,9 +71,10 @@ class ConfigElement(object): self.load() def isChanged(self): - if self.saved_value is None and self.value == self.default: + sv = self.saved_value + if sv is None and self.value == self.default: return False - return self.tostring(self.value) != self.saved_value + return self.tostring(self.value) != sv def changed(self): for x in self.notifiers: @@ -133,6 +136,10 @@ def getKeyNumber(key): class ConfigSelection(ConfigElement): def __init__(self, choices, default = None): ConfigElement.__init__(self) + self._value = None + self.setChoices(choices, default) + + def setChoices(self, choices, default = None): self.choices = [] self.description = {} @@ -163,7 +170,10 @@ class ConfigSelection(ConfigElement): for x in self.choices: assert isinstance(x, str), "ConfigSelection choices must be strings" - self.value = self.default = default + self.default = default + + if self.value == None or not self.value in self.choices: + self.value = default def setValue(self, value): if value in self.choices: @@ -205,6 +215,11 @@ class ConfigSelection(ConfigElement): self.value = self.choices[0] elif key == KEY_END: self.value = self.choices[nchoices - 1] + + def selectNext(self): + nchoices = len(self.choices) + i = self.choices.index(self.value) + self.value = self.choices[(i + 1) % nchoices] def getText(self): descr = self.description[self.value] @@ -356,11 +371,11 @@ class ConfigSequence(ConfigElement): for i in self._value: max_pos += len(str(self.limits[num][1])) - while self._value[num] < self.limits[num][0]: - self._value[num] += 1 + if self._value[num] < self.limits[num][0]: + self._value[num] = self.limits[num][0] - while self._value[num] > self.limits[num][1]: - self._value[num] -= 1 + if self._value[num] > self.limits[num][1]: + self._value[num] = self.limits[num][1] num += 1 @@ -488,9 +503,77 @@ class ConfigSequence(ConfigElement): return [int(x) for x in value.split(self.seperator)] class ConfigIP(ConfigSequence): - def __init__(self, default): + def __init__(self, default, auto_jump = False): ConfigSequence.__init__(self, seperator = ".", limits = [(0,255),(0,255),(0,255),(0,255)], default = default) + self.block_len = [] + for x in self.limits: + self.block_len.append(len(str(x[1]))) + self.marked_block = 0 + self.overwrite = True + self.auto_jump = auto_jump + + def handleKey(self, key): + if key == KEY_LEFT: + if self.marked_block > 0: + self.marked_block -= 1 + self.overwrite = True + + if key == KEY_RIGHT: + if self.marked_block < len(self.limits)-1: + self.marked_block += 1 + self.overwrite = True + + if key == KEY_HOME: + self.marked_block = 0 + self.overwrite = True + + if key == KEY_END: + self.marked_block = len(self.limits)-1 + self.overwrite = True + + if key in KEY_NUMBERS: + number = getKeyNumber(key) + oldvalue = self._value[self.marked_block] + + if self.overwrite: + self._value[self.marked_block] = number + self.overwrite = False + else: + oldvalue *= 10 + newvalue = oldvalue + number + if self.auto_jump and newvalue > self.limits[self.marked_block][1] and self.marked_block < len(self.limits)-1: + self.handleKey(KEY_RIGHT) + self.handleKey(key) + return + else: + self._value[self.marked_block] = newvalue + + if len(str(self._value[self.marked_block])) >= self.block_len[self.marked_block]: + self.handleKey(KEY_RIGHT) + + self.validate() + self.changed() + + def genText(self): + value = "" + block_strlen = [] + for i in self._value: + block_strlen.append(len(str(i))) + if len(value): + value += self.seperator + value += str(i) + leftPos = sum(block_strlen[:(self.marked_block)])+self.marked_block + rightPos = sum(block_strlen[:(self.marked_block+1)])+self.marked_block + mBlock = range(leftPos, rightPos) + return (value, mBlock) + def getMulti(self, selected): + (value, mBlock) = self.genText() + if self.enabled: + return ("mtext"[1-selected:], value, mBlock) + else: + return ("text", value) + def getHTML(self, id): # we definitely don't want leading zeros return '.'.join(["%d" % d for d in self.value]) @@ -510,7 +593,7 @@ class ConfigClock(ConfigSequence): ConfigSequence.__init__(self, seperator = ":", limits = [(0,23),(0,59)], default = [t.tm_hour, t.tm_min]) class ConfigInteger(ConfigSequence): - def __init__(self, default, limits = (0, 10000000000)): + def __init__(self, default, limits = (0, 9999999999)): ConfigSequence.__init__(self, seperator = ":", limits = [limits], default = default) # you need to override this to do input validation @@ -699,7 +782,7 @@ class ConfigText(ConfigElement, NumericalTextInput): _value = property(getValue, setValue) def getText(self): - return self.value + return self.text.encode("utf-8") def getMulti(self, selected): if self.visible_width: @@ -713,7 +796,7 @@ class ConfigText(ConfigElement, NumericalTextInput): mark = range(0, len(self.text)) else: mark = [self.marked_pos] - return ("mtext"[1-selected:], self.value+" ", mark) + return ("mtext"[1-selected:], self.text.encode("utf-8")+" ", mark) def onSelect(self, session): self.allmarked = (self.value != "") @@ -735,6 +818,74 @@ class ConfigText(ConfigElement, NumericalTextInput): def unsafeAssign(self, value): self.value = str(value) +class ConfigPassword(ConfigText): + def __init__(self, default = "", fixed_size = False, visible_width = False, censor = "*"): + ConfigText.__init__(self, default = default, fixed_size = fixed_size, visible_width = visible_width) + self.censor_char = censor + self.hidden = True + + def getMulti(self, selected): + mtext, text, mark = ConfigText.getMulti(self, selected) + if self.hidden: + text = len(text) * self.censor_char + return (mtext, text, mark) + + def onSelect(self, session): + ConfigText.onSelect(self, session) + self.hidden = False + + def onDeselect(self, session): + ConfigText.onDeselect(self, session) + self.hidden = True + +class ConfigNumber(ConfigText): + def __init__(self, default = 0): + ConfigText.__init__(self, str(default), fixed_size = False) + + def getValue(self): + return int(self.text) + + def setValue(self, val): + self.text = str(val) + + value = property(getValue, setValue) + _value = property(getValue, setValue) + + def conform(self): + pos = len(self.text) - self.marked_pos + self.text = self.text.lstrip("0") + if self.text == "": + self.text = "0" + if pos > len(self.text): + self.marked_pos = 0 + else: + self.marked_pos = len(self.text) - pos + + def handleKey(self, key): + if key in KEY_NUMBERS or key == KEY_ASCII: + if key == KEY_ASCII: + ascii = getPrevAsciiCode() + if not (48 <= ascii <= 57): + return + else: + ascii = getKeyNumber(key) + 48 + newChar = unichr(ascii) + if self.allmarked: + self.deleteAllChars() + self.allmarked = False + self.insertChar(newChar, self.marked_pos, False) + self.marked_pos += 1 + else: + ConfigText.handleKey(self, key) + self.conform() + + def onSelect(self, session): + self.allmarked = (self.value != "") + + def onDeselect(self, session): + self.marked_pos = 0 + self.offset = 0 + # a slider. class ConfigSlider(ConfigElement): def __init__(self, default = 0, increment = 1, limits = (0, 100)): @@ -762,9 +913,7 @@ class ConfigSlider(ConfigElement): self.value = self.max else: return - self.checkValues() - self.changed() def getText(self): return "%d / %d" % (self.value, self.max) @@ -790,6 +939,240 @@ class ConfigSatlist(ConfigSelection): orbital_position = property(getOrbitalPosition) +class ConfigSet(ConfigElement): + def __init__(self, choices, default = []): + ConfigElement.__init__(self) + self.choices = [] + self.description = {} + if isinstance(choices, list): + choices.sort() + for x in choices: + if isinstance(x, tuple): + self.choices.append(x[0]) + self.description[x[0]] = str(x[1]) + else: + self.choices.append(x) + self.description[x] = str(x) + else: + assert False, "ConfigSet choices must be a list!" + if len(self.choices) == 0: + self.choices = [""] + self.description[""] = "" + if default is None: + default = [] + self.pos = -1 + default.sort() + self.default = default + self.value = default+[] + + def toggleChoice(self, choice): + if choice in self.value: + self.value.remove(choice) + else: + self.value.append(choice) + self.value.sort() + + def handleKey(self, key): + if key in KEY_NUMBERS + [KEY_DELETE, KEY_BACKSPACE]: + if self.pos != -1: + self.toggleChoice(self.choices[self.pos]) + elif key == KEY_LEFT: + self.pos -= 1 + if self.pos < -1: + self.pos = len(self.choices)-1 + elif key == KEY_RIGHT: + self.pos += 1 + if self.pos >= len(self.choices): + self.pos = -1 + elif key in [KEY_HOME, KEY_END]: + self.pos = -1 + + def genString(self, lst): + res = "" + for x in lst: + res += self.description[x]+" " + return res + + def getText(self): + return self.genString(self.value) + + def getMulti(self, selected): + if not selected or self.pos == -1: + return ("text", self.genString(self.value)) + else: + tmp = self.value+[] + ch = self.choices[self.pos] + mem = ch in self.value + if not mem: + tmp.append(ch) + tmp.sort() + ind = tmp.index(ch) + val1 = self.genString(tmp[:ind]) + val2 = " "+self.genString(tmp[ind+1:]) + if mem: + chstr = " "+self.description[ch]+" " + else: + chstr = "("+self.description[ch]+")" + return ("mtext", val1+chstr+val2, range(len(val1),len(val1)+len(chstr))) + + def onDeselect(self, session): + self.pos = -1 + self.changed() + + def tostring(self, value): + return str(value) + + def fromstring(self, val): + return eval(val) + +class ConfigLocations(ConfigElement): + def __init__(self, default = [], visible_width = False): + ConfigElement.__init__(self) + self.visible_width = visible_width + self.pos = -1 + self.default = default + self.locations = [] + self.mountpoints = [] + harddiskmanager.on_partition_list_change.append(self.mountpointsChanged) + + def setValue(self, value): + loc = [x[0] for x in self.locations if x[3]] + add = [x for x in value if not x in loc] + diff = add + [x for x in loc if not x in value] + self.locations = [x for x in self.locations if not x[0] in diff] + [[x, self.getMountpoint(x), True, True] for x in add] + self.locations.sort(key = lambda x: x[0]) + self.changed() + + def getValue(self): + self.checkChangedMountpoints() + for x in self.locations: + x[3] = x[2] + return [x[0] for x in self.locations if x[3]] + + value = property(getValue, setValue) + + def tostring(self, value): + return str(value) + + def fromstring(self, val): + return eval(val) + + def load(self): + sv = self.saved_value + if sv is None: + tmp = self.default + else: + tmp = self.fromstring(sv) + self.locations = [[x, None, False, False] for x in tmp] + self.refreshMountpoints() + for x in self.locations: + if os.path.exists(x[0]): + x[1] = self.getMountpoint(x[0]) + x[2] = True + + def save(self): + if self.save_disabled or self.locations == []: + self.saved_value = None + else: + self.saved_value = self.tostring([x[0] for x in self.locations]) + + def isChanged(self): + sv = self.saved_value + if val is None and self.locations == []: + return False + return self.tostring([x[0] for x in self.locations]) != sv + + def mountpointsChanged(self, action, dev): + print "Mounts changed: ", action, dev + mp = dev.mountpoint+"/" + if action == "add": + self.addedMount(mp) + elif action == "remove": + self.removedMount(mp) + self.refreshMountpoints() + + def addedMount(self, mp): + for x in self.locations: + if x[1] == mp: + x[2] = True + elif x[1] == None and os.path.exists(x[0]): + x[1] = self.getMountpoint(x[0]) + x[2] = True + + def removedMount(self, mp): + for x in self.locations: + if x[1] == mp: + x[2] = False + + def refreshMountpoints(self): + self.mountpoints = [p.mountpoint + "/" for p in harddiskmanager.getMountedPartitions() if p.mountpoint != "/"] + self.mountpoints.sort(key = lambda x: -len(x)) + + def checkChangedMountpoints(self): + oldmounts = self.mountpoints + self.refreshMountpoints() + if oldmounts == self.mountpoints: + return + for x in oldmounts: + if not x in self.mountpoints: + self.removedMount(x) + for x in self.mountpoints: + if not x in oldmounts: + self.addedMount(x) + + def getMountpoint(self, file): + file = os.path.realpath(file)+"/" + for m in self.mountpoints: + if file.startswith(m): + return m + return None + + def handleKey(self, key): + if key == KEY_LEFT: + self.pos -= 1 + if self.pos < -1: + self.pos = len(self.value)-1 + elif key == KEY_RIGHT: + self.pos += 1 + if self.pos >= len(self.value): + self.pos = -1 + elif key in [KEY_HOME, KEY_END]: + self.pos = -1 + + def getText(self): + return " ".join(self.value) + + def getMulti(self, selected): + if not selected: + valstr = " ".join(self.value) + if self.visible_width and len(valstr) > self.visible_width: + return ("text", valstr[0:self.visible_width]) + else: + return ("text", valstr) + else: + i = 0 + valstr = "" + ind1 = 0 + ind2 = 0 + for val in self.value: + if i == self.pos: + ind1 = len(valstr) + valstr += str(val)+" " + if i == self.pos: + ind2 = len(valstr) + i += 1 + if self.visible_width and len(valstr) > self.visible_width: + if ind1+1 < self.visible_width/2: + off = 0 + else: + off = min(ind1+1-self.visible_width/2, len(valstr)-self.visible_width) + return ("mtext", valstr[off:off+self.visible_width], range(ind1-off,ind2-off)) + else: + return ("mtext", valstr, range(ind1,ind2)) + + def onDeselect(self, session): + self.pos = -1 + # nothing. class ConfigNothing(ConfigSelection): def __init__(self): @@ -849,7 +1232,7 @@ class ConfigSubList(list, object): self[int(key)].saved_value = val saved_value = property(getSavedValue, setSavedValue) - + def append(self, item): i = str(len(self)) list.append(self, item) @@ -884,8 +1267,9 @@ class ConfigSubDict(dict, object): def getSavedValue(self): res = {} for (key, val) in self.items(): - if val.saved_value is not None: - res[str(key)] = val.saved_value + sv = val.saved_value + if sv is not None: + res[str(key)] = sv return res def setSavedValue(self, values): @@ -939,21 +1323,21 @@ class ConfigSubsection(object): def getSavedValue(self): res = self.content.stored_values for (key, val) in self.content.items.items(): - if val.saved_value is not None: - res[key] = val.saved_value + sv = val.saved_value + if sv is not None: + res[key] = sv elif key in res: del res[key] - return res def setSavedValue(self, values): values = dict(values) self.content.stored_values = values - + for (key, val) in self.content.items.items(): if key in values: - val.setSavedValue(values[key]) + val.saved_value = values[key] saved_value = property(getSavedValue, setSavedValue) @@ -1076,6 +1460,10 @@ def getConfigListEntry(*args): assert len(args) > 1, "getConfigListEntry needs a minimum of two arguments (descr, configElement)" return args +def updateConfigElement(element, newelement): + newelement.value = element.value + return newelement + #def _(x): # return x #