X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/08fca93e7f2a37a452399d08c5c84b969b7e52af..64cfba23aba53b4ab3933284b2a4a9ef5ec68e26:/lib/python/Screens/TimerEntry.py diff --git a/lib/python/Screens/TimerEntry.py b/lib/python/Screens/TimerEntry.py index 7e2e55c8..b231b568 100644 --- a/lib/python/Screens/TimerEntry.py +++ b/lib/python/Screens/TimerEntry.py @@ -1,25 +1,31 @@ from Screen import Screen import ChannelSelection from ServiceReference import ServiceReference -from Components.config import * -from Components.ActionMap import ActionMap, NumberActionMap -from Components.ConfigList import ConfigList +from Components.config import config, ConfigSelection, ConfigText, ConfigSubList, ConfigDateTime, ConfigClock, ConfigYesNo, getConfigListEntry +from Components.ActionMap import NumberActionMap +from Components.ConfigList import ConfigListScreen from Components.MenuList import MenuList from Components.Button import Button -from Components.NimManager import nimmanager from Components.Label import Label from Components.Pixmap import Pixmap -from Screens.SubserviceSelection import SubserviceSelection -from Screens.MessageBox import MessageBox +from Components.SystemInfo import SystemInfo +from Components.UsageConfig import defaultMoviePath +from Screens.MovieSelection import getPreferredTagEditor +from Screens.LocationBox import MovieLocationBox +from Screens.ChoiceBox import ChoiceBox +from RecordTimer import AFTEREVENT from enigma import eEPGCache -import time -import datetime +from time import localtime, mktime, time, strftime +from datetime import datetime -class TimerEntry(Screen): +class TimerEntry(Screen, ConfigListScreen): def __init__(self, session, timer): Screen.__init__(self, session) self.timer = timer - + + self.entryDate = None + self.entryService = None + self["oktext"] = Label(_("OK")) self["canceltext"] = Label(_("Cancel")) self["ok"] = Pixmap() @@ -27,90 +33,97 @@ class TimerEntry(Screen): self.createConfig() - self["actions"] = NumberActionMap(["SetupActions", "TextEntryActions"], + self["actions"] = NumberActionMap(["SetupActions", "GlobalActions", "PiPSetupActions"], { "ok": self.keySelect, "save": self.keyGo, "cancel": self.keyCancel, - "left": self.keyLeft, - "right": self.keyRight, - "delete": self.keyDelete, - "1": self.keyNumberGlobal, - "2": self.keyNumberGlobal, - "3": self.keyNumberGlobal, - "4": self.keyNumberGlobal, - "5": self.keyNumberGlobal, - "6": self.keyNumberGlobal, - "7": self.keyNumberGlobal, - "8": self.keyNumberGlobal, - "9": self.keyNumberGlobal, - "0": self.keyNumberGlobal - }, -1) + "volumeUp": self.incrementStart, + "volumeDown": self.decrementStart, + "size+": self.incrementEnd, + "size-": self.decrementEnd + }, -2) self.list = [] - self["config"] = ConfigList(self.list) + ConfigListScreen.__init__(self, self.list, session = session) self.createSetup("config") def createConfig(self): - config.timerentry = ConfigSubsection() - - if (self.timer.justplay): - justplay = 0 - else: - justplay = 1 - + justplay = self.timer.justplay + + afterevent = { + AFTEREVENT.NONE: "nothing", + AFTEREVENT.DEEPSTANDBY: "deepstandby", + AFTEREVENT.STANDBY: "standby", + AFTEREVENT.AUTO: "auto" + }[self.timer.afterEvent] + + weekday_table = ("mon", "tue", "wed", "thu", "fri", "sat", "sun") + # calculate default values day = [] weekday = 0 - for x in range(0,7): - day.append(1) - if (self.timer.repeated != 0): # repeated - type = 1 # repeated + for x in (0, 1, 2, 3, 4, 5, 6): + day.append(0) + if self.timer.repeated: # repeated + type = "repeated" if (self.timer.repeated == 31): # Mon-Fri - repeated = 2 # Mon - Fri + repeated = "weekdays" elif (self.timer.repeated == 127): # daily - repeated = 0 # daily + repeated = "daily" else: flags = self.timer.repeated - repeated = 3 # user defined + repeated = "user" count = 0 - for x in range(0, 7): - if (flags == 1): # weekly + for x in (0, 1, 2, 3, 4, 5, 6): + if flags == 1: # weekly print "Set to weekday " + str(x) weekday = x - if (flags & 1 == 1): # set user defined flags - day[x] = 0 + if flags & 1 == 1: # set user defined flags + day[x] = 1 count += 1 else: - day[x] = 1 + day[x] = 0 flags = flags >> 1 - if (count == 1): - repeated = 1 # weekly + if count == 1: + repeated = "weekly" else: # once - type = 0 - repeated = 0 - weekday = (int(strftime("%w", time.localtime(self.timer.begin))) - 1) % 7 - day[weekday] = 0 - - config.timerentry.justplay = configElement_nonSave("config.timerentry.justplay", configSelection, justplay, (("zap", _("zap")), ("record", _("record")))) - config.timerentry.type = configElement_nonSave("config.timerentry.type", configSelection, type, (_("once"), _("repeated"))) - config.timerentry.name = configElement_nonSave("config.timerentry.name", configText, self.timer.name, (configText.extendableSize, self.keyRightCallback)) - config.timerentry.description = configElement_nonSave("config.timerentry.description", configText, self.timer.description, (configText.extendableSize, self.keyRightCallback)) + type = "once" + repeated = None + weekday = (int(strftime("%w", localtime(self.timer.begin))) - 1) % 7 + day[weekday] = 1 + + self.timerentry_justplay = ConfigSelection(choices = [("zap", _("zap")), ("record", _("record"))], default = {0: "record", 1: "zap"}[justplay]) + if SystemInfo["DeepstandbySupport"]: + shutdownString = _("go to deep standby") + else: + shutdownString = _("shut down") + self.timerentry_afterevent = ConfigSelection(choices = [("nothing", _("do nothing")), ("standby", _("go to standby")), ("deepstandby", shutdownString), ("auto", _("auto"))], default = afterevent) + self.timerentry_type = ConfigSelection(choices = [("once",_("once")), ("repeated", _("repeated"))], default = type) + self.timerentry_name = ConfigText(default = self.timer.name, visible_width = 50, fixed_size = False) + self.timerentry_description = ConfigText(default = self.timer.description, visible_width = 50, fixed_size = False) + self.timerentry_tags = self.timer.tags[:] + self.timerentry_tagsset = ConfigSelection(choices = [not self.timerentry_tags and "None" or " ".join(self.timerentry_tags)]) - config.timerentry.repeated = configElement_nonSave("config.timerentry.repeated", configSelection, repeated, (_("daily"), _("weekly"), _("Mon-Fri"), _("user defined"))) + self.timerentry_repeated = ConfigSelection(default = repeated, choices = [("daily", _("daily")), ("weekly", _("weekly")), ("weekdays", _("Mon-Fri")), ("user", _("user defined"))]) - config.timerentry.startdate = configElement_nonSave("config.timerentry.startdate", configDateTime, self.timer.begin, (_("%d.%B %Y"), 86400)) - config.timerentry.starttime = configElement_nonSave("config.timerentry.starttime", configSequence, [int(time.strftime("%H", time.localtime(self.timer.begin))), int(time.strftime("%M", time.localtime(self.timer.begin)))], configsequencearg.get("CLOCK")) + self.timerentry_date = ConfigDateTime(default = self.timer.begin, formatstring = _("%d.%B %Y"), increment = 86400) + self.timerentry_starttime = ConfigClock(default = self.timer.begin) + self.timerentry_endtime = ConfigClock(default = self.timer.end) - config.timerentry.enddate = configElement_nonSave("config.timerentry.enddate", configDateTime, self.timer.end, (_("%d.%B %Y"), 86400)) - config.timerentry.endtime = configElement_nonSave("config.timerentry.endtime", configSequence, [int(time.strftime("%H", time.localtime(self.timer.end))), int(time.strftime("%M", time.localtime(self.timer.end)))], configsequencearg.get("CLOCK")) + default = self.timer.dirname or defaultMoviePath() + tmp = config.movielist.videodirs.value + if default not in tmp: + tmp.append(default) + self.timerentry_dirname = ConfigSelection(default = default, choices = tmp) - config.timerentry.weekday = configElement_nonSave("config.timerentry.weekday", configSelection, weekday, (_("Monday"), _("Tuesday"), _("Wednesday"), _("Thursday"), _("Friday"), _("Saturday"), _("Sunday"))) + self.timerentry_repeatedbegindate = ConfigDateTime(default = self.timer.repeatedbegindate, formatstring = _("%d.%B %Y"), increment = 86400) - config.timerentry.day = [] - for x in range(0,7): - config.timerentry.day.append(configElement_nonSave("config.timerentry.day[" + str(x) + "]", configSelection, day[x], (_("yes"), _("no")))) + self.timerentry_weekday = ConfigSelection(default = weekday_table[weekday], choices = [("mon",_("Monday")), ("tue", _("Tuesday")), ("wed",_("Wednesday")), ("thu", _("Thursday")), ("fri", _("Friday")), ("sat", _("Saturday")), ("sun", _("Sunday"))]) + self.timerentry_day = ConfigSubList() + for x in (0, 1, 2, 3, 4, 5, 6): + self.timerentry_day.append(ConfigYesNo(default = day[x])) # FIXME some service-chooser needed here servicename = "N/A" @@ -118,78 +131,64 @@ class TimerEntry(Screen): servicename = str(self.timer.service_ref.getServiceName()) except: pass - config.timerentry.service = configElement_nonSave("config.timerentry.service", configSelection, 0, ((servicename),)) - - config.timerentry.startdate.addNotifier(self.checkDate) - config.timerentry.enddate.addNotifier(self.checkDate) - - def checkDate(self, configElement): - if (configElement.getConfigPath() == "config.timerentry.startdate"): - if (config.timerentry.enddate.value < config.timerentry.startdate.value): - config.timerentry.enddate.value = config.timerentry.startdate.value - config.timerentry.enddate.change() - try: - self["config"].invalidate(config.timerentry.enddate) - except: - pass - if (configElement.getConfigPath() == "config.timerentry.enddate"): - if (config.timerentry.enddate.value < config.timerentry.startdate.value): - config.timerentry.startdate.value = config.timerentry.enddate.value - config.timerentry.startdate.change() - try: - self["config"].invalidate(config.timerentry.startdate) - except: - pass + self.timerentry_service_ref = self.timer.service_ref + self.timerentry_service = ConfigSelection([servicename]) def createSetup(self, widget): self.list = [] - self.list.append(getConfigListEntry(_("Name"), config.timerentry.name)) - self.list.append(getConfigListEntry(_("Description"), config.timerentry.description)) - self.timerJustplayEntry = getConfigListEntry(_("Timer Type"), config.timerentry.justplay) + self.list.append(getConfigListEntry(_("Name"), self.timerentry_name)) + self.list.append(getConfigListEntry(_("Description"), self.timerentry_description)) + self.timerJustplayEntry = getConfigListEntry(_("Timer Type"), self.timerentry_justplay) self.list.append(self.timerJustplayEntry) - self.timerTypeEntry = getConfigListEntry(_("Repeat Type"), config.timerentry.type) + self.timerTypeEntry = getConfigListEntry(_("Repeat Type"), self.timerentry_type) self.list.append(self.timerTypeEntry) - if (config.timerentry.type.value == 0): # once + if self.timerentry_type.value == "once": self.frequencyEntry = None else: # repeated - self.frequencyEntry = getConfigListEntry(_("Frequency"), config.timerentry.repeated) + self.frequencyEntry = getConfigListEntry(_("Repeats"), self.timerentry_repeated) self.list.append(self.frequencyEntry) - if (config.timerentry.repeated.value == 0): # daily + self.repeatedbegindateEntry = getConfigListEntry(_("Starting on"), self.timerentry_repeatedbegindate) + self.list.append(self.repeatedbegindateEntry) + if self.timerentry_repeated.value == "daily": pass - if (config.timerentry.repeated.value == 2): # Mon-Fri + if self.timerentry_repeated.value == "weekdays": pass - if (config.timerentry.repeated.value == 1): # weekly - self.list.append(getConfigListEntry(_("Weekday"), config.timerentry.weekday)) - - if (config.timerentry.repeated.value == 3): # user defined - self.list.append(getConfigListEntry(_("Monday"), config.timerentry.day[0])) - self.list.append(getConfigListEntry(_("Tuesday"), config.timerentry.day[1])) - self.list.append(getConfigListEntry(_("Wednesday"), config.timerentry.day[2])) - self.list.append(getConfigListEntry(_("Thursday"), config.timerentry.day[3])) - self.list.append(getConfigListEntry(_("Friday"), config.timerentry.day[4])) - self.list.append(getConfigListEntry(_("Saturday"), config.timerentry.day[5])) - self.list.append(getConfigListEntry(_("Sunday"), config.timerentry.day[6])) - - #self.list.append(getConfigListEntry("StartDate", config.timerentry.startdate)) -# self.list.append(getConfigListEntry("Weekday", config.timerentry.weekday)) - - if (config.timerentry.type.value == 0): # once - self.list.append(getConfigListEntry(_("Start"), config.timerentry.startdate)) - self.list.append(getConfigListEntry(" ", config.timerentry.starttime)) - else: - self.list.append(getConfigListEntry(_("StartTime"), config.timerentry.starttime)) - if (config.timerentry.type.value == 0): # once - if currentConfigSelectionElement(config.timerentry.justplay) != "zap": - self.list.append(getConfigListEntry(_("End"), config.timerentry.enddate)) - self.list.append(getConfigListEntry(" ", config.timerentry.endtime)) + if self.timerentry_repeated.value == "weekly": + self.list.append(getConfigListEntry(_("Weekday"), self.timerentry_weekday)) + + if self.timerentry_repeated.value == "user": + self.list.append(getConfigListEntry(_("Monday"), self.timerentry_day[0])) + self.list.append(getConfigListEntry(_("Tuesday"), self.timerentry_day[1])) + self.list.append(getConfigListEntry(_("Wednesday"), self.timerentry_day[2])) + self.list.append(getConfigListEntry(_("Thursday"), self.timerentry_day[3])) + self.list.append(getConfigListEntry(_("Friday"), self.timerentry_day[4])) + self.list.append(getConfigListEntry(_("Saturday"), self.timerentry_day[5])) + self.list.append(getConfigListEntry(_("Sunday"), self.timerentry_day[6])) + + self.entryDate = getConfigListEntry(_("Date"), self.timerentry_date) + if self.timerentry_type.value == "once": + self.list.append(self.entryDate) + + self.entryStartTime = getConfigListEntry(_("StartTime"), self.timerentry_starttime) + self.list.append(self.entryStartTime) + if self.timerentry_justplay.value != "zap": + self.entryEndTime = getConfigListEntry(_("EndTime"), self.timerentry_endtime) + self.list.append(self.entryEndTime) else: - if currentConfigSelectionElement(config.timerentry.justplay) != "zap": - self.list.append(getConfigListEntry(_("EndTime"), config.timerentry.endtime)) - - self.channelEntry = getConfigListEntry(_("Channel"), config.timerentry.service) + self.entryEndTime = None + self.channelEntry = getConfigListEntry(_("Channel"), self.timerentry_service) self.list.append(self.channelEntry) + self.dirname = getConfigListEntry(_("Location"), self.timerentry_dirname) + self.tagsSet = getConfigListEntry(_("Tags"), self.timerentry_tagsset) + if self.timerentry_justplay.value != "zap": + if config.usage.setup_level.index >= 2: # expert+ + self.list.append(self.dirname) + if getPreferredTagEditor(): + self.list.append(self.tagsSet) + self.list.append(getConfigListEntry(_("After event"), self.timerentry_afterevent)) + self[widget].list = self.list self[widget].l.setList(self.list) @@ -203,114 +202,198 @@ class TimerEntry(Screen): self.createSetup("config") def keyLeft(self): - if self["config"].getCurrent() == self.channelEntry: + if self["config"].getCurrent() in (self.channelEntry, self.tagsSet): self.keySelect() else: - self["config"].handleKey(config.key["prevElement"]) + ConfigListScreen.keyLeft(self) self.newConfig() - def keyDelete(self): - self["config"].handleKey(config.key["delete"]) - - def keyRightCallback(self, configPath): - currentConfigPath = self["config"].getCurrent()[1].parent.getConfigPath() - # check if we are still on the same config entry - if (currentConfigPath == configPath): - self.keyRight() - def keyRight(self): - if self["config"].getCurrent() == self.channelEntry: + if self["config"].getCurrent() in (self.channelEntry, self.tagsSet): self.keySelect() else: - self["config"].handleKey(config.key["nextElement"]) + ConfigListScreen.keyRight(self) self.newConfig() - + def keySelect(self): - if self["config"].getCurrent() == self.channelEntry: - self.session.openWithCallback(self.finishedChannelSelection, ChannelSelection.SimpleChannelSelection, _("Select channel to record from")) + cur = self["config"].getCurrent() + if cur == self.channelEntry: + self.session.openWithCallback( + self.finishedChannelSelection, + ChannelSelection.SimpleChannelSelection, + _("Select channel to record from") + ) + elif config.usage.setup_level.index >= 2 and cur == self.dirname: + self.session.openWithCallback( + self.pathSelected, + MovieLocationBox, + _("Choose target folder"), + self.timerentry_dirname.value, + minFree = 100 # We require at least 100MB free space + ) + elif getPreferredTagEditor() and cur == self.tagsSet: + self.session.openWithCallback( + self.tagEditFinished, + getPreferredTagEditor(), + self.timerentry_tags + ) else: self.keyGo() - def finishedChannelSelection(self, args): - oldref = self.timer.service_ref - try: - self.timer.service_ref = ServiceReference(args) - config.timerentry.service.vals = (str(self.timer.service_ref.getServiceName()),) - self["config"].invalidate(config.timerentry.service) - except: - print "you pressed cancel" - self.timer.service_ref = oldref - - def keyNumberGlobal(self, number): - print "You pressed number " + str(number) - if (self["config"].getCurrent()[1].parent.enabled == True): - self["config"].handleKey(config.key[str(number)]) + def finishedChannelSelection(self, *args): + if args: + self.timerentry_service_ref = ServiceReference(args[0]) + self.timerentry_service.setCurrentText(self.timerentry_service_ref.getServiceName()) + self["config"].invalidate(self.channelEntry) def getTimestamp(self, date, mytime): - d = time.localtime(date) - dt = datetime.datetime(d.tm_year, d.tm_mon, d.tm_mday, mytime[0], mytime[1]) + d = localtime(date) + dt = datetime(d.tm_year, d.tm_mon, d.tm_mday, mytime[0], mytime[1]) return int(mktime(dt.timetuple())) + def getBeginEnd(self): + date = self.timerentry_date.value + endtime = self.timerentry_endtime.value + starttime = self.timerentry_starttime.value + + begin = self.getTimestamp(date, starttime) + end = self.getTimestamp(date, endtime) + + # if the endtime is less than the starttime, add 1 day. + if end < begin: + end += 86400 + return begin, end + def keyGo(self): - self.timer.name = config.timerentry.name.value - self.timer.description = config.timerentry.description.value - self.timer.justplay = (currentConfigSelectionElement(config.timerentry.justplay) == "zap") + self.timer.name = self.timerentry_name.value + self.timer.description = self.timerentry_description.value + self.timer.justplay = self.timerentry_justplay.value == "zap" self.timer.resetRepeated() - - if (config.timerentry.type.value == 0): # once - self.timer.begin = self.getTimestamp(config.timerentry.startdate.value, config.timerentry.starttime.value) - self.timer.end = self.getTimestamp(config.timerentry.enddate.value, config.timerentry.endtime.value) - if (config.timerentry.type.value == 1): # repeated - if (config.timerentry.repeated.value == 0): # daily - for x in range(0,7): + self.timer.afterEvent = { + "nothing": AFTEREVENT.NONE, + "deepstandby": AFTEREVENT.DEEPSTANDBY, + "standby": AFTEREVENT.STANDBY, + "auto": AFTEREVENT.AUTO + }[self.timerentry_afterevent.value] + self.timer.service_ref = self.timerentry_service_ref + self.timer.tags = self.timerentry_tags + + if self.timer.dirname or self.timerentry_dirname.value != defaultMoviePath(): + self.timer.dirname = self.timerentry_dirname.value + config.movielist.last_timer_videodir.value = self.timer.dirname + config.movielist.last_timer_videodir.save() + + if self.timerentry_type.value == "once": + self.timer.begin, self.timer.end = self.getBeginEnd() + if self.timerentry_type.value == "repeated": + if self.timerentry_repeated.value == "daily": + for x in (0, 1, 2, 3, 4, 5, 6): self.timer.setRepeated(x) - if (config.timerentry.repeated.value == 1): # weekly - self.timer.setRepeated(config.timerentry.weekday.value) - - if (config.timerentry.repeated.value == 2): # Mon-Fri - for x in range(0,5): + if self.timerentry_repeated.value == "weekly": + self.timer.setRepeated(self.timerentry_weekday.index) + + if self.timerentry_repeated.value == "weekdays": + for x in (0, 1, 2, 3, 4): self.timer.setRepeated(x) - - if (config.timerentry.repeated.value == 3): # user defined - for x in range(0,7): - if (config.timerentry.day[x].value == 0): self.timer.setRepeated(x) - self.timer.begin = self.getTimestamp(time.time(), config.timerentry.starttime.value) - self.timer.end = self.getTimestamp(time.time(), config.timerentry.endtime.value) + if self.timerentry_repeated.value == "user": + for x in (0, 1, 2, 3, 4, 5, 6): + if self.timerentry_day[x].value: + self.timer.setRepeated(x) + + self.timer.repeatedbegindate = self.getTimestamp(self.timerentry_repeatedbegindate.value, self.timerentry_starttime.value) + if self.timer.repeated: + self.timer.begin = self.getTimestamp(self.timerentry_repeatedbegindate.value, self.timerentry_starttime.value) + self.timer.end = self.getTimestamp(self.timerentry_repeatedbegindate.value, self.timerentry_endtime.value) + else: + self.timer.begin = self.getTimestamp(time.time(), self.timerentry_starttime.value) + self.timer.end = self.getTimestamp(time.time(), self.timerentry_endtime.value) + + # when a timer end is set before the start, add 1 day + if self.timer.end < self.timer.begin: + self.timer.end += 86400 if self.timer.eit is not None: event = eEPGCache.getInstance().lookupEventId(self.timer.service_ref.ref, self.timer.eit) - if event is not None: - if event.getNumOfLinkageServices() > 0: - self.session.openWithCallback(self.subserviceSelected, SubserviceSelection, event, self.timer.service_ref.ref) + if event: + n = event.getNumOfLinkageServices() + if n > 1: + tlist = [] + ref = self.session.nav.getCurrentlyPlayingServiceReference() + parent = self.timer.service_ref.ref + selection = 0 + for x in range(n): + i = event.getLinkageService(parent, x) + if i.toString() == ref.toString(): + selection = x + tlist.append((i.getName(), i)) + self.session.openWithCallback(self.subserviceSelected, ChoiceBox, title=_("Please select a subservice to record..."), list = tlist, selection = selection) return + elif n > 0: + parent = self.timer.service_ref.ref + self.timer.service_ref = ServiceReference(event.getLinkageService(parent, 0)) + self.saveTimer() self.close((True, self.timer)) + def incrementStart(self): + self.timerentry_starttime.increment() + self["config"].invalidate(self.entryStartTime) + + def decrementStart(self): + self.timerentry_starttime.decrement() + self["config"].invalidate(self.entryStartTime) + + def incrementEnd(self): + if self.entryEndTime is not None: + self.timerentry_endtime.increment() + self["config"].invalidate(self.entryEndTime) + + def decrementEnd(self): + if self.entryEndTime is not None: + self.timerentry_endtime.decrement() + self["config"].invalidate(self.entryEndTime) + def subserviceSelected(self, service): if not service is None: - self.timer.service_ref = ServiceReference(service) + self.timer.service_ref = ServiceReference(service[1]) + self.saveTimer() self.close((True, self.timer)) + def saveTimer(self): + self.session.nav.RecordTimer.saveTimer() + def keyCancel(self): self.close((False,)) - + + def pathSelected(self, res): + if res is not None: + if config.movielist.videodirs.value != self.timerentry_dirname.choices: + self.timerentry_dirname.setChoices(config.movielist.videodirs.value, default=res) + self.timerentry_dirname.value = res + + def tagEditFinished(self, ret): + if ret is not None: + self.timerentry_tags = ret + self.timerentry_tagsset.setChoices([not ret and "None" or " ".join(ret)]) + self["config"].invalidate(self.tagsSet) + class TimerLog(Screen): def __init__(self, session, timer): Screen.__init__(self, session) self.timer = timer; self.log_entries = self.timer.log_entries[:] - + self.fillLogList() - + self["loglist"] = MenuList(self.list) self["logentry"] = Label() - + self["key_red"] = Button(_("Delete entry")) self["key_green"] = Button() self["key_yellow"] = Button("") self["key_blue"] = Button(_("Clear log")) - + self.onShown.append(self.updateText) self["actions"] = NumberActionMap(["OkCancelActions", "DirectionActions", "ColorActions"], @@ -326,33 +409,34 @@ class TimerLog(Screen): }, -1) def deleteEntry(self): - self.log_entries.remove(self["loglist"].getCurrent()[1]) + cur = self["loglist"].getCurrent() + if cur is None: + return + self.log_entries.remove(cur[1]) self.fillLogList() self["loglist"].l.setList(self.list) self.updateText() def fillLogList(self): - self.list = [ ] - for x in self.log_entries: - self.list.append((str(strftime("%Y-%m-%d %H-%M", localtime(x[0])) + " - " + x[2]), x)) - - def clearLog(self): + self.list = [(str(strftime("%Y-%m-%d %H-%M", localtime(x[0])) + " - " + x[2]), x) for x in self.log_entries] + + def clearLog(self): self.log_entries = [] self.fillLogList() self["loglist"].l.setList(self.list) self.updateText() - + def keyClose(self): if self.timer.log_entries != self.log_entries: self.timer.log_entries = self.log_entries self.close((True, self.timer)) else: self.close((False,)) - + def up(self): self["loglist"].instance.moveSelection(self["loglist"].instance.moveUp) self.updateText() - + def down(self): self["loglist"].instance.moveSelection(self["loglist"].instance.moveDown) self.updateText() @@ -360,13 +444,13 @@ class TimerLog(Screen): def left(self): self["loglist"].instance.moveSelection(self["loglist"].instance.pageUp) self.updateText() - + def right(self): self["loglist"].instance.moveSelection(self["loglist"].instance.pageDown) self.updateText() def updateText(self): - if len(self.list) > 0: + if self.list: self["logentry"].setText(str(self["loglist"].getCurrent()[1][2])) else: self["logentry"].setText("")