X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fpython%2FComponents%2Fconfig.py;h=789ec32fc85695396f84ceff645bf547d608692d;hp=f8ef0ec86a5708305e2241eef0d6e49b1de82adc;hb=0fd217d2eef3ae87953e6622edb977aded899a52;hpb=76ab06c06bdf77f0b0cecd225367862ef0de0d2f diff --git a/lib/python/Components/config.py b/lib/python/Components/config.py old mode 100644 new mode 100755 index f8ef0ec..789ec32 --- a/lib/python/Components/config.py +++ b/lib/python/Components/config.py @@ -1,9 +1,10 @@ -import time from enigma import getPrevAsciiCode from Tools.NumericalTextInput import NumericalTextInput from Tools.Directories import resolveFilename, SCOPE_CONFIG -import copy - +from Components.Harddisk import harddiskmanager +from copy import copy as copy_copy +from os import path as os_path +from time import localtime, strftime # ConfigElement, the base class of all ConfigElements. @@ -19,7 +20,7 @@ import copy # saved_value is a text representation of _value, stored in the config file # # and has (at least) the following methods: -# save() stores _value into saved_value, +# save() stores _value into saved_value, # (or stores 'None' if it should not be stored) # load() loads _value from saved_value, or loads # the default if saved_value is 'None' (default) @@ -27,12 +28,33 @@ import copy # class ConfigElement(object): def __init__(self): - - object.__init__(self) self.saved_value = None + self.last_value = None self.save_disabled = False - self.notifiers = [] + self.__notifiers = None + self.__notifiers_final = None self.enabled = True + self.callNotifiersOnSaveAndCancel = False + + def getNotifiers(self): + if self.__notifiers is None: + self.__notifiers = [ ] + return self.__notifiers + + def setNotifiers(self, val): + self.__notifiers = val + + notifiers = property(getNotifiers, setNotifiers) + + def getNotifiersFinal(self): + if self.__notifiers_final is None: + self.__notifiers_final = [ ] + return self.__notifiers_final + + def setNotifiersFinal(self, val): + self.__notifiers_final = val + + notifiers_final = property(getNotifiersFinal, setNotifiersFinal) # you need to override this to do input validation def setValue(self, value): @@ -41,7 +63,7 @@ class ConfigElement(object): def getValue(self): return self._value - + value = property(getValue, setValue) # you need to override this if self.value is not a string @@ -50,10 +72,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) @@ -64,23 +87,36 @@ class ConfigElement(object): self.saved_value = None else: self.saved_value = self.tostring(self.value) + if self.callNotifiersOnSaveAndCancel: + self.changed() def cancel(self): self.load() + if self.callNotifiersOnSaveAndCancel: + self.changed() 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: - x(self) - - def addNotifier(self, notifier, initial_call = True): - assert callable(notifier), "notifiers must be callable" - self.notifiers.append(notifier) + if self.__notifiers: + for x in self.notifiers: + x(self) + + def changedFinal(self): + if self.__notifiers_final: + for x in self.notifiers_final: + x(self) + def addNotifier(self, notifier, initial_call = True, immediate_feedback = True): + assert callable(notifier), "notifiers must be callable" + if immediate_feedback: + self.notifiers.append(notifier) + else: + self.notifiers_final.append(notifier) # CHECKME: # do we want to call the notifier # - at all when adding it? (yes, though optional) @@ -98,8 +134,13 @@ class ConfigElement(object): def __call__(self, selected): return self.getMulti(selected) - def helpWindow(self): - return None + def onSelect(self, session): + pass + + def onDeselect(self, session): + if not self.last_value == self.value: + self.changedFinal() + self.last_value = self.value KEY_LEFT = 0 KEY_RIGHT = 1 @@ -119,6 +160,109 @@ def getKeyNumber(key): assert key in KEY_NUMBERS return key - KEY_0 +class choicesList(object): # XXX: we might want a better name for this + LIST_TYPE_LIST = 1 + LIST_TYPE_DICT = 2 + + def __init__(self, choices, type = None): + self.choices = choices + if type is None: + if isinstance(choices, list): + self.type = choicesList.LIST_TYPE_LIST + elif isinstance(choices, dict): + self.type = choicesList.LIST_TYPE_DICT + else: + assert False, "choices must be dict or list!" + else: + self.type = type + + def __list__(self): + if self.type == choicesList.LIST_TYPE_LIST: + ret = [not isinstance(x, tuple) and x or x[0] for x in self.choices] + else: + ret = self.choices.keys() + return ret or [""] + + def __iter__(self): + if self.type == choicesList.LIST_TYPE_LIST: + ret = [not isinstance(x, tuple) and x or x[0] for x in self.choices] + else: + ret = self.choices + return iter(ret or [""]) + + def __len__(self): + return len(self.choices) or 1 + + def __getitem__(self, index): + if self.type == choicesList.LIST_TYPE_LIST: + ret = self.choices[index] + if isinstance(ret, tuple): + ret = ret[0] + return ret + return self.choices.keys()[index] + + def index(self, value): + return self.__list__().index(value) + + def __setitem__(self, index, value): + if self.type == choicesList.LIST_TYPE_LIST: + orig = self.choices[index] + if isinstance(orig, tuple): + self.choices[index] = (value, orig[1]) + else: + self.choices[index] = value + else: + key = self.choices.keys()[index] + orig = self.choices[key] + del self.choices[key] + self.choices[value] = orig + + def default(self): + choices = self.choices + if not choices: + return "" + if self.type is choicesList.LIST_TYPE_LIST: + default = choices[0] + if isinstance(default, tuple): + default = default[0] + else: + default = choices.keys()[0] + return default + +class descriptionList(choicesList): # XXX: we might want a better name for this + def __list__(self): + if self.type == choicesList.LIST_TYPE_LIST: + ret = [not isinstance(x, tuple) and x or x[1] for x in self.choices] + else: + ret = self.choices.values() + return ret or [""] + + def __iter__(self): + return iter(self.__list__()) + + def __getitem__(self, index): + if self.type == choicesList.LIST_TYPE_LIST: + for x in self.choices: + if isinstance(x, tuple): + if x[0] == index: + return str(x[1]) + elif x == index: + return str(x) + return str(index) # Fallback! + else: + return str(self.choices.get(index, "")) + + def __setitem__(self, index, value): + if self.type == choicesList.LIST_TYPE_LIST: + i = self.index(index) + orig = self.choices[i] + if isinstance(orig, tuple): + self.choices[i] = (orig[0], value) + else: + self.choices[i] = value + else: + self.choices[index] = value + # # ConfigSelection is a "one of.."-type. # it has the "choices", usually a list, which contains @@ -130,44 +274,30 @@ def getKeyNumber(key): class ConfigSelection(ConfigElement): def __init__(self, choices, default = None): ConfigElement.__init__(self) - self.choices = [] - self.description = {} - - if isinstance(choices, list): - for x in choices: - if isinstance(x, tuple): - self.choices.append(x[0]) - self.description[x[0]] = x[1] - else: - self.choices.append(x) - self.description[x] = x - elif isinstance(choices, dict): - for (key, val) in choices.items(): - self.choices.append(key) - self.description[key] = val - else: - assert False, "ConfigSelection choices must be dict or list!" - - #assert len(self.choices), "you can't have an empty configselection" - if len(self.choices) == 0: - self.choices = [""] - self.description[""] = "" + self.choices = choicesList(choices) if default is None: - default = self.choices[0] + default = self.choices.default() - assert default in self.choices, "default must be in choice list, but " + repr(default) + " is not!" - for x in self.choices: - assert isinstance(x, str), "ConfigSelection choices must be strings" - - self.value = self.default = default + self._descr = None + self.default = self._value = self.last_value = default + + def setChoices(self, choices, default = None): + self.choices = choicesList(choices) + + if default is None: + default = self.choices.default() + self.default = default + + if self.value not in self.choices: + self.value = default def setValue(self, value): if value in self.choices: self._value = value else: self._value = self.default - + self._descr = None self.changed() def tostring(self, val): @@ -178,16 +308,15 @@ class ConfigSelection(ConfigElement): 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._descr = self.description[text] = text self._value = text value = property(getValue, setValue) - + def getIndex(self): return self.choices.index(self.value) - + index = property(getIndex) # GUI @@ -203,15 +332,25 @@ class ConfigSelection(ConfigElement): 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] - if len(descr): + if self._descr is not None: + return self._descr + descr = self._descr = self.description[self.value] + if descr: return _(descr) return descr def getMulti(self, selected): - descr = self.description[self.value] - if len(descr): + if self._descr is not None: + descr = self._descr + else: + descr = self._descr = self.description[self.value] + if descr: return ("text", _(descr)) return ("text", descr) @@ -219,29 +358,34 @@ class ConfigSelection(ConfigElement): def getHTML(self, id): res = "" for v in self.choices: + descr = self.description[v] if self.value == v: checked = 'checked="checked" ' else: checked = '' - res += '' + self.description[v] + "
\n" + res += '' + descr + "
\n" return res; def unsafeAssign(self, value): # setValue does check if value is in choices. This is safe enough. self.value = value + description = property(lambda self: descriptionList(self.choices.choices, self.choices.type)) + # a binary decision. # # several customized versions exist for different # descriptions. # +boolean_descriptions = {False: "false", True: "true"} class ConfigBoolean(ConfigElement): - def __init__(self, default = False, descriptions = {False: "false", True: "true"}): + def __init__(self, default = False, descriptions = boolean_descriptions): ConfigElement.__init__(self) self.descriptions = descriptions - self.value = self.default = default + self.value = self.last_value = self.default = default + def handleKey(self, key): - if key in [KEY_LEFT, KEY_RIGHT]: + if key in (KEY_LEFT, KEY_RIGHT): self.value = not self.value elif key == KEY_HOME: self.value = False @@ -250,13 +394,13 @@ class ConfigBoolean(ConfigElement): def getText(self): descr = self.descriptions[self.value] - if len(descr): + if descr: return _(descr) return descr def getMulti(self, selected): descr = self.descriptions[self.value] - if len(descr): + if descr: return ("text", _(descr)) return ("text", descr) @@ -286,24 +430,32 @@ class ConfigBoolean(ConfigElement): else: self.value = False + def onDeselect(self, session): + if not self.last_value == self.value: + self.changedFinal() + self.last_value = self.value + +yes_no_descriptions = {False: _("no"), True: _("yes")} class ConfigYesNo(ConfigBoolean): def __init__(self, default = False): - ConfigBoolean.__init__(self, default = default, descriptions = {False: _("no"), True: _("yes")}) + ConfigBoolean.__init__(self, default = default, descriptions = yes_no_descriptions) +on_off_descriptions = {False: _("off"), True: _("on")} class ConfigOnOff(ConfigBoolean): def __init__(self, default = False): - ConfigBoolean.__init__(self, default = default, descriptions = {False: _("off"), True: _("on")}) + ConfigBoolean.__init__(self, default = default, descriptions = on_off_descriptions) +enable_disable_descriptions = {False: _("disable"), True: _("enable")} class ConfigEnableDisable(ConfigBoolean): def __init__(self, default = False): - ConfigBoolean.__init__(self, default = default, descriptions = {False: _("disable"), True: _("enable")}) + ConfigBoolean.__init__(self, default = default, descriptions = enable_disable_descriptions) class ConfigDateTime(ConfigElement): def __init__(self, default, formatstring, increment = 86400): ConfigElement.__init__(self) self.increment = increment self.formatstring = formatstring - self.value = self.default = int(default) + self.value = self.last_value = self.default = int(default) def handleKey(self, key): if key == KEY_LEFT: @@ -314,10 +466,10 @@ class ConfigDateTime(ConfigElement): self.value = self.default def getText(self): - return time.strftime(self.formatstring, time.localtime(self.value)) + return strftime(self.formatstring, localtime(self.value)) def getMulti(self, selected): - return ("text", time.strftime(self.formatstring, time.localtime(self.value))) + return ("text", strftime(self.formatstring, localtime(self.value))) def fromstring(self, val): return int(val) @@ -329,7 +481,7 @@ class ConfigDateTime(ConfigElement): # several helper exist to ease this up a bit. # class ConfigSequence(ConfigElement): - def __init__(self, seperator, limits, censor_char = "", default = None): + def __init__(self, seperator, limits, default, censor_char = ""): ConfigElement.__init__(self) assert isinstance(limits, list) and len(limits[0]) == 2, "limits must be [(min, max),...]-tuple-list" assert censor_char == "" or len(censor_char) == 1, "censor char must be a single char (or \"\")" @@ -341,11 +493,10 @@ class ConfigSequence(ConfigElement): self.seperator = seperator self.limits = limits self.censor_char = censor_char - - self.default = default - self.value = copy.copy(default) - - self.endNotifier = [] + + self.last_value = self.default = default + self.value = copy_copy(default) + self.endNotifier = None def validate(self): max_pos = 0 @@ -353,17 +504,18 @@ 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 if self.marked_pos >= max_pos: - for x in self.endNotifier: - x(self) + if self.endNotifier: + for x in self.endNotifier: + x(self) self.marked_pos = max_pos - 1 if self.marked_pos < 0: @@ -372,13 +524,15 @@ class ConfigSequence(ConfigElement): def validatePos(self): if self.marked_pos < 0: self.marked_pos = 0 - + total_len = sum([len(str(x[1])) for x in self.limits]) if self.marked_pos >= total_len: self.marked_pos = total_len - 1 - + def addEndNotifier(self, notifier): + if self.endNotifier is None: + self.endNotifier = [] self.endNotifier.append(notifier) def handleKey(self, key): @@ -386,15 +540,15 @@ class ConfigSequence(ConfigElement): self.marked_pos -= 1 self.validatePos() - if key == KEY_RIGHT: + elif key == KEY_RIGHT: self.marked_pos += 1 self.validatePos() - - if key == KEY_HOME: + + elif key == KEY_HOME: self.marked_pos = 0 self.validatePos() - if key == KEY_END: + elif key == KEY_END: max_pos = 0 num = 0 for i in self._value: @@ -402,8 +556,8 @@ class ConfigSequence(ConfigElement): num += 1 self.marked_pos = max_pos - 1 self.validatePos() - - if key in KEY_NUMBERS or key == KEY_ASCII: + + elif key in KEY_NUMBERS or key == KEY_ASCII: if key == KEY_ASCII: code = getPrevAsciiCode() if code < 48 or code > 57: @@ -411,11 +565,8 @@ class ConfigSequence(ConfigElement): number = code - 48 else: number = getKeyNumber(key) - - block_len = [] - for x in self.limits: - block_len.append(len(str(x[1]))) - + + block_len = [len(str(x[1])) for x in self.limits] total_len = sum(block_len) pos = 0 @@ -434,38 +585,37 @@ class ConfigSequence(ConfigElement): # position in the block posinblock = self.marked_pos - block_len_total[blocknumber] - + oldvalue = self._value[blocknumber] olddec = oldvalue % 10 ** (number_len - posinblock) - (oldvalue % 10 ** (number_len - posinblock - 1)) newvalue = oldvalue - olddec + (10 ** (number_len - posinblock - 1) * number) - + self._value[blocknumber] = newvalue self.marked_pos += 1 - + self.validate() self.changed() - + def genText(self): value = "" mPos = self.marked_pos num = 0; for i in self._value: - if len(value): #fixme no heading separator possible + if value: #fixme no heading separator possible value += self.seperator if mPos >= len(value) - 1: mPos += 1 - if self.censor_char == "": value += ("%0" + str(len(str(self.limits[num][1]))) + "d") % i else: 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 @@ -477,39 +627,149 @@ class ConfigSequence(ConfigElement): def tostring(self, val): return self.seperator.join([self.saveSingle(x) for x in val]) - + def saveSingle(self, v): return str(v) def fromstring(self, value): return [int(x) for x in value.split(self.seperator)] + def onDeselect(self, session): + if self.last_value != self._value: + self.changedFinal() + self.last_value = copy_copy(self._value) + +ip_limits = [(0,255),(0,255),(0,255),(0,255)] class ConfigIP(ConfigSequence): - def __init__(self, default): - ConfigSequence.__init__(self, seperator = ".", limits = [(0,255),(0,255),(0,255),(0,255)], default = default) - + def __init__(self, default, auto_jump = False): + ConfigSequence.__init__(self, seperator = ".", limits = ip_limits, default = default) + self.block_len = [len(str(x[1])) for x in self.limits] + 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 + + elif key == KEY_RIGHT: + if self.marked_block < len(self.limits)-1: + self.marked_block += 1 + self.overwrite = True + + elif key == KEY_HOME: + self.marked_block = 0 + self.overwrite = True + + elif key == KEY_END: + self.marked_block = len(self.limits)-1 + self.overwrite = True + + elif key in KEY_NUMBERS or key == KEY_ASCII: + if key == KEY_ASCII: + code = getPrevAsciiCode() + if code < 48 or code > 57: + return + number = code - 48 + else: + 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 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]) +mac_limits = [(1,255),(1,255),(1,255),(1,255),(1,255),(1,255)] class ConfigMAC(ConfigSequence): def __init__(self, default): - ConfigSequence.__init__(self, seperator = ":", limits = [(1,255),(1,255),(1,255),(1,255),(1,255),(1,255)], default = default) + ConfigSequence.__init__(self, seperator = ":", limits = mac_limits, default = default) class ConfigPosition(ConfigSequence): def __init__(self, default, args): ConfigSequence.__init__(self, seperator = ",", limits = [(0,args[0]),(0,args[1]),(0,args[2]),(0,args[3])], default = default) +clock_limits = [(0,23),(0,59)] class ConfigClock(ConfigSequence): def __init__(self, default): - import time - t = time.localtime(default) - ConfigSequence.__init__(self, seperator = ":", limits = [(0,23),(0,59)], default = [t.tm_hour, t.tm_min]) + t = localtime(default) + ConfigSequence.__init__(self, seperator = ":", limits = clock_limits, default = [t.tm_hour, t.tm_min]) + + def increment(self): + # Check if Minutes maxed out + if self._value[1] == 59: + # Increment Hour, reset Minutes + if self._value[0] < 23: + self._value[0] += 1 + else: + self._value[0] = 0 + self._value[1] = 0 + else: + # Increment Minutes + self._value[1] += 1 + # Trigger change + self.changed() + def decrement(self): + # Check if Minutes is minimum + if self._value[1] == 0: + # Decrement Hour, set Minutes to 59 + if self._value[0] > 0: + self._value[0] -= 1 + else: + self._value[0] = 23 + self._value[1] = 59 + else: + # Decrement Minutes + self._value[1] -= 1 + # Trigger change + self.changed() + +integer_limits = (0, 9999999999) class ConfigInteger(ConfigSequence): - def __init__(self, default, limits = (0, 10000000000)): + def __init__(self, default, limits = integer_limits): ConfigSequence.__init__(self, seperator = ":", limits = [limits], default = default) - + # you need to override this to do input validation def setValue(self, value): self._value = [value] @@ -517,7 +777,7 @@ class ConfigInteger(ConfigSequence): def getValue(self): return self._value[0] - + value = property(getValue, setValue) def fromstring(self, value): @@ -551,35 +811,36 @@ class ConfigText(ConfigElement, NumericalTextInput): def __init__(self, default = "", fixed_size = True, visible_width = False): ConfigElement.__init__(self) NumericalTextInput.__init__(self, nextFunc = self.nextFunc, handleTimeout = False) - + self.marked_pos = 0 self.allmarked = (default != "") self.fixed_size = fixed_size self.visible_width = visible_width self.offset = 0 self.overwrite = fixed_size - - self.value = self.default = default + self.help_window = None + self.value = self.last_value = self.default = default def validateMarker(self): + textlen = len(self.text) if self.fixed_size: - if self.marked_pos > len(self.text)-1: - self.marked_pos = len(self.text)-1 + if self.marked_pos > textlen-1: + self.marked_pos = textlen-1 else: - if self.marked_pos > len(self.text): - self.marked_pos = len(self.text) + if self.marked_pos > textlen: + self.marked_pos = textlen if self.marked_pos < 0: self.marked_pos = 0 if self.visible_width: if self.marked_pos < self.offset: self.offset = self.marked_pos if self.marked_pos >= self.offset + self.visible_width: - if self.marked_pos == len(self.text): + if self.marked_pos == textlen: self.offset = self.marked_pos - self.visible_width else: self.offset = self.marked_pos - self.visible_width + 1 - if self.offset > 0 and self.offset + self.visible_width > len(self.text): - self.offset = max(0, len(self.text) - self.visible_width) + if self.offset > 0 and self.offset + self.visible_width > textlen: + self.offset = max(0, len - self.visible_width) def insertChar(self, ch, pos, owr): if owr or self.overwrite: @@ -652,13 +913,14 @@ class ConfigText(ConfigElement, NumericalTextInput): self.timeout() self.overwrite = not self.overwrite elif key == KEY_ASCII: - self.timeout() - newChar = unichr(getPrevAsciiCode()) - if self.allmarked: - self.deleteAllChars() - self.allmarked = False - self.insertChar(newChar, self.marked_pos, False) - self.marked_pos += 1 + self.timeout() + newChar = unichr(getPrevAsciiCode()) + if not self.useableChars or newChar in self.useableChars: + if self.allmarked: + self.deleteAllChars() + self.allmarked = False + self.insertChar(newChar, self.marked_pos, False) + self.marked_pos += 1 elif key in KEY_NUMBERS: owr = self.lastKey == getKeyNumber(key) newChar = self.getKey(getKeyNumber(key)) @@ -668,8 +930,12 @@ class ConfigText(ConfigElement, NumericalTextInput): self.insertChar(newChar, self.marked_pos, owr) elif key == KEY_TIMEOUT: self.timeout() + if self.help_window: + self.help_window.update(self) return + if self.help_window: + self.help_window.update(self) self.validateMarker() self.changed() @@ -680,19 +946,19 @@ class ConfigText(ConfigElement, NumericalTextInput): def getValue(self): return self.text.encode("utf-8") - + def setValue(self, val): try: self.text = val.decode("utf-8") except UnicodeDecodeError: - self.text = val + self.text = val.decode("utf-8", "ignore") print "Broken UTF8!" value = property(getValue, setValue) _value = property(getValue, setValue) def getText(self): - return self.value + return self.text.encode("utf-8") def getMulti(self, selected): if self.visible_width: @@ -706,11 +972,24 @@ 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 != "") + if session is not None: + from Screens.NumericalTextInputHelpDialog import NumericalTextInputHelpDialog + self.help_window = session.instantiateDialog(NumericalTextInputHelpDialog, self) + self.help_window.show() - def helpWindow(self): - from Screens.NumericalTextInputHelpDialog import NumericalTextInputHelpDialog - return (NumericalTextInputHelpDialog,self) + def onDeselect(self, session): + self.marked_pos = 0 + self.offset = 0 + if self.help_window: + session.deleteDialog(self.help_window) + self.help_window = None + if not self.last_value == self.value: + self.changedFinal() + self.last_value = self.value def getHTML(self, id): return '
\n' @@ -718,11 +997,154 @@ 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 + +# lets the user select between [min, min+stepwidth, min+(stepwidth*2)..., maxval] with maxval <= max depending +# on the stepwidth +# min, max, stepwidth, default are int values +# wraparound: pressing RIGHT key at max value brings you to min value and vice versa if set to True +class ConfigSelectionNumber(ConfigSelection): + def __init__(self, min, max, stepwidth, default = None, wraparound = False): + self.wraparound = wraparound + if default is None: + default = min + default = str(default) + choices = [] + step = min + while step <= max: + choices.append(str(step)) + step += stepwidth + + ConfigSelection.__init__(self, choices, default) + + def getValue(self): + return int(self.text) + + def setValue(self, val): + self.text = str(val) + + def handleKey(self, key): + if not self.wraparound: + if key == KEY_RIGHT: + if len(self.choices) == (self.choices.index(self.value) + 1): + return + if key == KEY_LEFT: + if self.choices.index(self.value) == 0: + return + ConfigSelection.handleKey(self, key) + + + +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 isChanged(self): + sv = self.saved_value + strv = self.tostring(self.value) + if sv is None and strv == self.default: + return False + return strv != sv + + 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 + if not self.last_value == self.value: + self.changedFinal() + self.last_value = self.value + +class ConfigSearchText(ConfigText): + def __init__(self, default = "", fixed_size = False, visible_width = False): + ConfigText.__init__(self, default = default, fixed_size = fixed_size, visible_width = visible_width) + NumericalTextInput.__init__(self, nextFunc = self.nextFunc, handleTimeout = False, search = True) + +class ConfigDirectory(ConfigText): + def __init__(self, default="", visible_width=60): + ConfigText.__init__(self, default, fixed_size = True, visible_width = visible_width) + + def handleKey(self, key): + pass + + def getValue(self): + if self.text == "": + return None + else: + return ConfigText.getValue(self) + + def setValue(self, val): + if val == None: + val = "" + ConfigText.setValue(self, val) + + def getMulti(self, selected): + if self.text == "": + return ("mtext"[1-selected:], _("List of Storage Devices"), range(0)) + else: + return ConfigText.getMulti(self, selected) + # a slider. class ConfigSlider(ConfigElement): def __init__(self, default = 0, increment = 1, limits = (0, 100)): ConfigElement.__init__(self) - self.value = self.default = default + self.value = self.last_value = self.default = default self.min = limits[0] self.max = limits[1] self.increment = increment @@ -745,9 +1167,7 @@ class ConfigSlider(ConfigElement): self.value = self.max else: return - self.checkValues() - self.changed() def getText(self): return "%d / %d" % (self.value, self.max) @@ -770,13 +1190,253 @@ class ConfigSatlist(ConfigSelection): if self.value == "": return None return int(self.value) - + orbital_position = property(getOrbitalPosition) +class ConfigSet(ConfigElement): + def __init__(self, choices, default = []): + ConfigElement.__init__(self) + if isinstance(choices, list): + choices.sort() + self.choices = choicesList(choices, choicesList.LIST_TYPE_LIST) + else: + assert False, "ConfigSet choices must be a list!" + if default is None: + default = [] + self.pos = -1 + default.sort() + self.last_value = self.default = default + self.value = default[:] + + def toggleChoice(self, choice): + value = self.value + if choice in value: + value.remove(choice) + else: + value.append(choice) + value.sort() + self.changed() + + 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: + if self.pos < 0: + self.pos = len(self.choices)-1 + else: + self.pos -= 1 + elif key == KEY_RIGHT: + if self.pos >= len(self.choices)-1: + self.pos = -1 + else: + 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]+")" + len_val1 = len(val1) + return ("mtext", val1+chstr+val2, range(len_val1, len_val1 + len(chstr))) + + def onDeselect(self, session): + self.pos = -1 + if not self.last_value == self.value: + self.changedFinal() + self.last_value = self.value[:] + + def tostring(self, value): + return str(value) + + def fromstring(self, val): + return eval(val) + + description = property(lambda self: descriptionList(self.choices.choices, choicesList.LIST_TYPE_LIST)) + +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) + self.value = default[:] + + def setValue(self, value): + locations = self.locations + loc = [x[0] for x in 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] + locations = [x for x in locations if not x[0] in diff] + [[x, self.getMountpoint(x), True, True] for x in add] + locations.sort(key = lambda x: x[0]) + self.locations = locations + self.changed() + + def getValue(self): + self.checkChangedMountpoints() + locations = self.locations + for x in locations: + x[3] = x[2] + return [x[0] for x in 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) + locations = [[x, None, False, False] for x in tmp] + self.refreshMountpoints() + for x in locations: + if os_path.exists(x[0]): + x[1] = self.getMountpoint(x[0]) + x[2] = True + self.locations = locations + + def save(self): + locations = self.locations + if self.save_disabled or not locations: + self.saved_value = None + else: + self.saved_value = self.tostring([x[0] for x in locations]) + + def isChanged(self): + sv = self.saved_value + locations = self.locations + if val is None and not locations: + return False + return self.tostring([x[0] for x in 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() + newmounts = self.mountpoints + if oldmounts == newmounts: + return + for x in oldmounts: + if not x in newmounts: + self.removedMount(x) + for x in newmounts: + 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): - ConfigSelection.__init__(self, choices = [""]) + ConfigSelection.__init__(self, choices = [("","")]) # until here, 'saved_value' always had to be a *string*. # now, in ConfigSubsection, and only there, saved_value @@ -789,7 +1449,6 @@ class ConfigNothing(ConfigSelection): # config.saved_value == {"foo": {"bar": "True"}, "foobar": "False"} # - class ConfigSubsectionContent(object): pass @@ -805,22 +1464,21 @@ class ConfigSubsectionContent(object): # config.dipswitches.append(ConfigYesNo()) class ConfigSubList(list, object): def __init__(self): - object.__init__(self) list.__init__(self) self.stored_values = {} def save(self): for x in self: x.save() - + def load(self): for x in self: x.load() def getSavedValue(self): - res = {} - for i in range(len(self)): - sv = self[i].saved_value + res = { } + for i, val in enumerate(self): + sv = val.saved_value if sv is not None: res[str(i)] = sv return res @@ -832,7 +1490,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) @@ -841,10 +1499,7 @@ class ConfigSubList(list, object): item.load() def dict(self): - res = dict() - for index in range(len(self)): - res[str(index)] = self[index] - return res + return dict([(str(index), value) for index, value in enumerate(self)]) # same as ConfigSubList, just as a dictionary. # care must be taken that the 'key' has a proper @@ -852,14 +1507,13 @@ class ConfigSubList(list, object): # file. class ConfigSubDict(dict, object): def __init__(self): - object.__init__(self) dict.__init__(self) self.stored_values = {} def save(self): for x in self.values(): x.save() - + def load(self): for x in self.values(): x.load() @@ -867,15 +1521,16 @@ 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): self.stored_values = dict(values) for (key, val) in self.items(): if str(key) in self.stored_values: - val = self.stored_values[str(key)] + val.saved_value = self.stored_values[str(key)] saved_value = property(getSavedValue, setSavedValue) @@ -895,25 +1550,26 @@ class ConfigSubDict(dict, object): # loading of added elements. this is why this class # is so complex. # -# we need the 'content' because we overwrite +# we need the 'content' because we overwrite # __setattr__. # If you don't understand this, try adding # __setattr__ to a usual exisiting class and you will. class ConfigSubsection(object): def __init__(self): - object.__init__(self) self.__dict__["content"] = ConfigSubsectionContent() self.content.items = { } self.content.stored_values = { } - + def __setattr__(self, name, value): if name == "saved_value": return self.setSavedValue(value) - assert isinstance(value, ConfigSubsection) or isinstance(value, ConfigElement) or isinstance(value, ConfigSubList) or isinstance(value, ConfigSubDict), "ConfigSubsections can only store ConfigSubsections, ConfigSubLists, ConfigSubDicts or ConfigElements" - self.content.items[name] = value - if name in self.content.stored_values: - #print "ok, now we have a new item,", name, "and have the following value for it:", self.content.stored_values[name] - value.saved_value = self.content.stored_values[name] + assert isinstance(value, (ConfigSubsection, ConfigElement, ConfigSubList, ConfigSubDict)), "ConfigSubsections can only store ConfigSubsections, ConfigSubLists, ConfigSubDicts or ConfigElements" + content = self.content + content.items[name] = value + x = content.stored_values.get(name, None) + if x is not None: + #print "ok, now we have a new item,", name, "and have the following value for it:", x + value.saved_value = x value.load() def __getattr__(self, name): @@ -922,21 +1578,20 @@ 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]) + value = values.get(key, None) + if value is not None: + val.saved_value = value saved_value = property(getSavedValue, setSavedValue) @@ -964,26 +1619,25 @@ class Config(ConfigSubsection): def pickle_this(self, prefix, topickle, result): for (key, val) in topickle.items(): - name = prefix + "." + key - + name = '.'.join((prefix, key)) if isinstance(val, dict): self.pickle_this(name, val, result) elif isinstance(val, tuple): - result.append(name + "=" + val[0]) # + " ; " + val[1]) + result += [name, '=', val[0], '\n'] else: - result.append(name + "=" + val) + result += [name, '=', val, '\n'] def pickle(self): - result = [ ] + result = [] self.pickle_this("config", self.saved_value, result) - return '\n'.join(result) + "\n" + return ''.join(result) def unpickle(self, lines): tree = { } for l in lines: - if not len(l) or l[0] == '#': + if not l or l[0] == '#': continue - + n = l.find('=') val = l[n+1:].strip() @@ -992,10 +1646,10 @@ class Config(ConfigSubsection): # val = val[:val.find(' ')] base = tree - + for n in names[:-1]: base = base.setdefault(n, {}) - + base[names[-1]] = val # we inherit from ConfigSubsection, so ... @@ -1004,8 +1658,9 @@ class Config(ConfigSubsection): self.setSavedValue(tree["config"]) def saveToFile(self, filename): + text = self.pickle() f = open(filename, "w") - f.write(self.pickle()) + f.write(text) f.close() def loadFromFile(self, filename): @@ -1024,19 +1679,20 @@ class ConfigFile: config.loadFromFile(self.CONFIG_FILE) except IOError, e: print "unable to load config (%s), assuming defaults..." % str(e) - + def save(self): # config.save() config.saveToFile(self.CONFIG_FILE) - + def __resolveValue(self, pickles, cmap): - if cmap.has_key(pickles[0]): + key = pickles[0] + if cmap.has_key(key): if len(pickles) > 1: - return self.__resolveValue(pickles[1:], cmap[pickles[0]].dict()) + return self.__resolveValue(pickles[1:], cmap[key].dict()) else: - return str(cmap[pickles[0]].value) + return str(cmap[key].value) return None - + def getResolvedKey(self, key): names = key.split('.') if len(names) > 1: @@ -1059,6 +1715,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 #