X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/aceb62aeebc259a4da520b303a31a6a174d9400a..f43943087f01dca40b5bda702340bed885bcc891:/lib/python/Screens/TimerEntry.py diff --git a/lib/python/Screens/TimerEntry.py b/lib/python/Screens/TimerEntry.py index 08892a90..467f851f 100644 --- a/lib/python/Screens/TimerEntry.py +++ b/lib/python/Screens/TimerEntry.py @@ -4,19 +4,24 @@ from Components.ActionMap import NumberActionMap from Components.ConfigList import ConfigList from Components.NimManager import nimmanager from Components.Label import Label -from time import * -from datetime import * +import time +import datetime +from math import log class TimerEntry(Screen): def __init__(self, session, timer): Screen.__init__(self, session) self.timer = timer; + + self["ok"] = Label("OK") + self["cancel"] = Label("Cancel") self.createConfig() self["actions"] = NumberActionMap(["SetupActions"], { - "ok": self.keyGo, + "ok": self.keySelect, + "save": self.keyGo, "cancel": self.keyCancel, "left": self.keyLeft, "right": self.keyRight, @@ -38,31 +43,59 @@ class TimerEntry(Screen): def createConfig(self): config.timerentry = ConfigSubsection() - - config.timerentry.type = configElement_nonSave("config.timerentry.type", configSelection, 0, ("once", "repeated")) + + # calculate default values + day = [] + weekday = 0 + for x in range(0,7): + day.append(1) + if (self.timer.repeated != 0): # repeated + type = 1 # repeated + if (self.timer.repeated == 31): # Mon-Fri + repeated = 2 # Mon - Fri + elif (self.timer.repeated == 127): # daily + repeated = 0 # daily + else: + flags = self.timer.repeated + repeated = 3 # user-defined + count = 0 + for x in range(0, 7): + if (flags == 1): # weekly + print "Set to weekday " + str(x) + weekday = x + if (flags & 1 == 1): # set user-defined flags + day[x] = 0 + count += 1 + else: + day[x] = 1 + flags = flags >> 1 + if (count == 1): + repeated = 1 # weekly + else: # once + type = 0 + repeated = 0 + + config.timerentry.type = configElement_nonSave("config.timerentry.type", configSelection, type, ("once", "repeated")) config.timerentry.description = configElement_nonSave("config.timerentry.description", configText, self.timer.description, (configText.extendableSize, self.keyRightCallback)) - config.timerentry.repeated = configElement_nonSave("config.timerentry.repeated", configSelection, 0, ("daily", "weekly", "Mon-Fri", "user-defined")) + config.timerentry.repeated = configElement_nonSave("config.timerentry.repeated", configSelection, repeated, ("daily", "weekly", "Mon-Fri", "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(strftime("%H", localtime(self.timer.begin))), int(strftime("%M", localtime(self.timer.begin)))], configsequencearg.get("CLOCK")) + 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")) 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(strftime("%H", localtime(self.timer.end))), int(strftime("%M", localtime(self.timer.end)))], configsequencearg.get("CLOCK")) + 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")) + + config.timerentry.weekday = configElement_nonSave("config.timerentry.weekday", configSelection, weekday, ("Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Sunday")) - config.timerentry.weekday = configElement_nonSave("config.timerentry.weekday", configDateTime, time(), ("%A", 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"))) - config.timerentry.monday = configElement_nonSave("config.timerentry.monday", configSelection, 0, ("yes", "no")) - config.timerentry.tuesday = configElement_nonSave("config.timerentry.tuesday", configSelection, 0, ("yes", "no")) - config.timerentry.wednesday = configElement_nonSave("config.timerentry.wednesday", configSelection, 0, ("yes", "no")) - config.timerentry.thursday = configElement_nonSave("config.timerentry.thursday", configSelection, 0, ("yes", "no")) - config.timerentry.friday = configElement_nonSave("config.timerentry.friday", configSelection, 0, ("yes", "no")) - config.timerentry.saturday = configElement_nonSave("config.timerentry.saturday", configSelection, 0, ("yes", "no")) - config.timerentry.sunday = configElement_nonSave("config.timerentry.sunday", configSelection, 0, ("yes", "no")) # FIXME some service-chooser needed here config.timerentry.service = configElement_nonSave("config.timerentry.service", configSelection, 0, ((str(self.timer.service_ref.getServiceName())),)) - + config.timerentry.startdate.addNotifier(self.checkDate) config.timerentry.enddate.addNotifier(self.checkDate) @@ -95,13 +128,13 @@ class TimerEntry(Screen): self.list.append(getConfigListEntry("Weekday", config.timerentry.weekday)) if (config.timerentry.repeated.value == 3): # user-defined - self.list.append(getConfigListEntry("Monday", config.timerentry.monday)) - self.list.append(getConfigListEntry("Tuesday", config.timerentry.tuesday)) - self.list.append(getConfigListEntry("Wednesday", config.timerentry.wednesday)) - self.list.append(getConfigListEntry("Thursday", config.timerentry.thursday)) - self.list.append(getConfigListEntry("Friday", config.timerentry.friday)) - self.list.append(getConfigListEntry("Saturday", config.timerentry.saturday)) - self.list.append(getConfigListEntry("Sunday", config.timerentry.sunday)) + 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)) @@ -138,22 +171,46 @@ class TimerEntry(Screen): def keyRight(self): self["config"].handleKey(config.key["nextElement"]) self.newConfig() + + def keySelect(self): + pass 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 getTimestamp(self, date, time): - d = localtime(date) # for gettin indexes 0(year), 1(month) and 2(day) - dt = datetime(d.tm_year, d.tm_mon, d.tm_mday, time[0], time[1]) + 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]) print dt return int(mktime(dt.timetuple())) def keyGo(self): + 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.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): + 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) + self.close((True, self.timer)) def keyCancel(self):