X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/db2f1b7b345f68095dfeac660fda2105efb485a7..939c323eadd7ec9d3656bfe59a46c630415bdb19:/lib/python/Screens/TimerEdit.py diff --git a/lib/python/Screens/TimerEdit.py b/lib/python/Screens/TimerEdit.py index 99939bd8..54354987 100644 --- a/lib/python/Screens/TimerEdit.py +++ b/lib/python/Screens/TimerEdit.py @@ -1,58 +1,193 @@ -from Screen import Screen -from Components.TimerList import TimerList, TimerEntryComponent from Components.ActionMap import ActionMap -from Components.TimeInput import TimeInput -from Components.Label import Label from Components.Button import Button +from Components.config import config +from Components.MenuList import MenuList +from Components.TimerList import TimerList +from Components.TimerSanityCheck import TimerSanityCheck +from Components.UsageConfig import preferredTimerPath +from RecordTimer import RecordTimerEntry, parseEvent, AFTEREVENT +from Screen import Screen +from Screens.ChoiceBox import ChoiceBox from Screens.MessageBox import MessageBox -from TimerEntry import TimerEntry, TimerLog -from RecordTimer import RecordTimerEntry, parseEvent -from time import * from ServiceReference import ServiceReference -from Components.config import * +from TimerEntry import TimerEntry, TimerLog +from Tools.BoundFunction import boundFunction +from time import time class TimerEditList(Screen): + EMPTY = 0 + ENABLE = 1 + DISABLE = 2 + CLEANUP = 3 + DELETE = 4 + def __init__(self, session): Screen.__init__(self, session) list = [ ] self.list = list self.fillTimerList() + + print "EMPTY:",self.EMPTY + print "ENABLE:",self.ENABLE + print "DISABLE:",self.DISABLE + print "CLEANUP:",self.CLEANUP + print "DELETE:",self.DELETE self["timerlist"] = TimerList(list) - self["key_red"] = Button(_("Delete")) + self.key_red_choice = self.EMPTY + self.key_yellow_choice = self.EMPTY + self.key_blue_choice = self.EMPTY + + self["key_red"] = Button(" ") self["key_green"] = Button(_("Add")) - self["key_yellow"] = Button("") - self["key_blue"] = Button(_("Cleanup")) + self["key_yellow"] = Button(" ") + self["key_blue"] = Button(" ") + + print "key_red_choice:",self.key_red_choice - self["actions"] = ActionMap(["OkCancelActions", "ShortcutActions", "TimerEditActions"], + self["actions"] = ActionMap(["OkCancelActions", "DirectionActions", "ShortcutActions", "TimerEditActions"], { "ok": self.openEdit, "cancel": self.leave, - "red": self.removeTimer, "green": self.addCurrentTimer, - "blue": self.cleanupQuestion, - "log": self.showLog - }) + "log": self.showLog, + "left": self.left, + "right": self.right, + "up": self.up, + "down": self.down + }, -1) self.session.nav.RecordTimer.on_state_change.append(self.onStateChange) + self.onShown.append(self.updateState) - def fillTimerList(self): - del self.list[:] + def up(self): + self["timerlist"].instance.moveSelection(self["timerlist"].instance.moveUp) + self.updateState() + + def down(self): + self["timerlist"].instance.moveSelection(self["timerlist"].instance.moveDown) + self.updateState() + + def left(self): + self["timerlist"].instance.moveSelection(self["timerlist"].instance.pageUp) + self.updateState() + + def right(self): + self["timerlist"].instance.moveSelection(self["timerlist"].instance.pageDown) + self.updateState() + + def toggleDisabledState(self): + cur=self["timerlist"].getCurrent() + if cur: + t = cur + if t.disabled: + print "try to ENABLE timer" + t.enable() + timersanitycheck = TimerSanityCheck(self.session.nav.RecordTimer.timer_list, cur) + if not timersanitycheck.check(): + t.disable() + print "Sanity check failed" + self.session.openWithCallback(self.finishedEdit, TimerSanityConflict, timersanitycheck.getSimulTimerList()) + else: + print "Sanity check passed" + if timersanitycheck.doubleCheck(): + t.disable() + else: + if t.isRunning(): + if t.repeated: + list = ( + (_("Stop current event but not coming events"), "stoponlycurrent"), + (_("Stop current event and disable coming events"), "stopall"), + (_("Don't stop current event but disable coming events"), "stoponlycoming") + ) + self.session.openWithCallback(boundFunction(self.runningEventCallback, t), ChoiceBox, title=_("Repeating event currently recording... What do you want to do?"), list = list) + else: + t.disable() + self.session.nav.RecordTimer.timeChanged(t) + self.refill() + self.updateState() + + def runningEventCallback(self, t, result): + if result is not None: + if result[1] == "stoponlycurrent" or result[1] == "stopall": + t.enable() + t.processRepeated(findRunningEvent = False) + self.session.nav.RecordTimer.doActivate(t) + if result[1] == "stoponlycoming" or result[1] == "stopall": + t.disable() + self.session.nav.RecordTimer.timeChanged(t) + self.refill() + self.updateState() + + def removeAction(self, descr): + actions = self["actions"].actions + if descr in actions: + del actions[descr] + + def updateState(self): + cur = self["timerlist"].getCurrent() + if cur: + if self.key_red_choice != self.DELETE: + self["actions"].actions.update({"red":self.removeTimerQuestion}) + self["key_red"].setText(_("Delete")) + self.key_red_choice = self.DELETE + + if cur.disabled and (self.key_yellow_choice != self.ENABLE): + self["actions"].actions.update({"yellow":self.toggleDisabledState}) + self["key_yellow"].setText(_("Enable")) + self.key_yellow_choice = self.ENABLE + elif cur.isRunning() and not cur.repeated and (self.key_yellow_choice != self.EMPTY): + self.removeAction("yellow") + self["key_yellow"].setText(" ") + self.key_yellow_choice = self.EMPTY + elif ((not cur.isRunning())or cur.repeated ) and (not cur.disabled) and (self.key_yellow_choice != self.DISABLE): + self["actions"].actions.update({"yellow":self.toggleDisabledState}) + self["key_yellow"].setText(_("Disable")) + self.key_yellow_choice = self.DISABLE + else: + if self.key_red_choice != self.EMPTY: + self.removeAction("red") + self["key_red"].setText(" ") + self.key_red_choice = self.EMPTY + if self.key_yellow_choice != self.EMPTY: + self.removeAction("yellow") + self["key_yellow"].setText(" ") + self.key_yellow_choice = self.EMPTY - for timer in self.session.nav.RecordTimer.timer_list: - self.list.append(TimerEntryComponent(timer, processed=False)) + showCleanup = True + for x in self.list: + if (not x[0].disabled) and (x[1] == True): + break + else: + showCleanup = False - for timer in self.session.nav.RecordTimer.processed_timers: - self.list.append(TimerEntryComponent(timer, processed=True)) + if showCleanup and (self.key_blue_choice != self.CLEANUP): + self["actions"].actions.update({"blue":self.cleanupQuestion}) + self["key_blue"].setText(_("Cleanup")) + self.key_blue_choice = self.CLEANUP + elif (not showCleanup) and (self.key_blue_choice != self.EMPTY): + self.removeAction("blue") + self["key_blue"].setText(" ") + self.key_blue_choice = self.EMPTY + + def fillTimerList(self): + list = self.list + del list[:] + list.extend([(timer, False) for timer in self.session.nav.RecordTimer.timer_list]) + list.extend([(timer, True) for timer in self.session.nav.RecordTimer.processed_timers]) + list.sort(cmp = lambda x, y: x[0].begin < y[0].begin) def showLog(self): - self.session.openWithCallback(self.finishedEdit, TimerLog, self["timerlist"].getCurrent()[0]) + cur=self["timerlist"].getCurrent() + if cur: + self.session.openWithCallback(self.finishedEdit, TimerLog, cur) def openEdit(self): - self.session.openWithCallback(self.finishedEdit, TimerEntry, self["timerlist"].getCurrent()[0]) - #self.session.open(TimerEdit, self["timerlist"].getCurrent()[0]) - + cur=self["timerlist"].getCurrent() + if cur: + self.session.openWithCallback(self.finishedEdit, TimerEntry, cur) + def cleanupQuestion(self): self.session.openWithCallback(self.cleanupTimer, MessageBox, _("Really delete done timers?")) @@ -60,20 +195,38 @@ class TimerEditList(Screen): if delete: self.session.nav.RecordTimer.cleanup() self.refill() - - def removeTimer(self): + self.updateState() + + def removeTimerQuestion(self): + cur = self["timerlist"].getCurrent() + if not cur: + return + + self.session.openWithCallback(self.removeTimer, MessageBox, _("Do you really want to delete %s?") % (cur.name)) + + def removeTimer(self, result): + if not result: + return list = self["timerlist"] - currentIndex = list.getCurrentIndex() - list.moveDown() - if list.getCurrentIndex() == currentIndex: - currentIndex -= 1 - list.moveToIndex(currentIndex) - self.session.nav.RecordTimer.removeEntry(list.getCurrent()[0]) - self.refill() + cur = list.getCurrent() + if cur: + timer = cur + timer.afterEvent = AFTEREVENT.NONE + self.session.nav.RecordTimer.removeEntry(timer) + self.refill() + self.updateState() + def refill(self): + oldsize = len(self.list) self.fillTimerList() - self["timerlist"].invalidate() + lst = self["timerlist"] + newsize = len(self.list) + if oldsize and oldsize != newsize: + idx = lst.getCurrentIndex() + lst.entryRemoved(idx) + else: + lst.invalidate() def addCurrentTimer(self): event = None @@ -87,21 +240,44 @@ class TimerEditList(Screen): serviceref = ServiceReference(self.session.nav.getCurrentlyPlayingServiceReference()) if event is None: - data = (int(time()), int(time() + 60), "unknown event", "", None) + data = (int(time()), int(time() + 60), "", "", None) else: - data = parseEvent(event) + data = parseEvent(event, description = False) - self.addTimer(RecordTimerEntry(serviceref, *data)) + self.addTimer(RecordTimerEntry(serviceref, checkOldTimers = True, dirname = preferredTimerPath(), *data)) def addTimer(self, timer): self.session.openWithCallback(self.finishedAdd, TimerEntry, timer) + def finishedEdit(self, answer): print "finished edit" + if answer[0]: print "Edited timer" - self.session.nav.RecordTimer.timeChanged(answer[1]) + entry = answer[1] + timersanitycheck = TimerSanityCheck(self.session.nav.RecordTimer.timer_list, entry) + success = False + if not timersanitycheck.check(): + simulTimerList = timersanitycheck.getSimulTimerList() + if simulTimerList is not None: + for x in simulTimerList: + if x.setAutoincreaseEnd(entry): + self.session.nav.RecordTimer.timeChanged(x) + if not timersanitycheck.check(): + simulTimerList = timersanitycheck.getSimulTimerList() + if simulTimerList is not None: + self.session.openWithCallback(self.finishedEdit, TimerSanityConflict, timersanitycheck.getSimulTimerList()) + else: + success = True + else: + success = True + if success: + print "Sanity check passed" + self.session.nav.RecordTimer.timeChanged(entry) + self.fillTimerList() + self.updateState() else: print "Timeredit aborted" @@ -109,15 +285,163 @@ class TimerEditList(Screen): print "finished add" if answer[0]: entry = answer[1] - self.session.nav.RecordTimer.record(entry) + simulTimerList = self.session.nav.RecordTimer.record(entry) + if simulTimerList is not None: + for x in simulTimerList: + if x.setAutoincreaseEnd(entry): + self.session.nav.RecordTimer.timeChanged(x) + simulTimerList = self.session.nav.RecordTimer.record(entry) + if simulTimerList is not None: + self.session.openWithCallback(self.finishSanityCorrection, TimerSanityConflict, simulTimerList) self.fillTimerList() + self.updateState() else: - print "Timeredit aborted" + print "Timeredit aborted" + + def finishSanityCorrection(self, answer): + self.finishedAdd(answer) def leave(self): - self.session.nav.RecordTimer.saveTimer() self.session.nav.RecordTimer.on_state_change.remove(self.onStateChange) self.close() def onStateChange(self, entry): self.refill() + self.updateState() + +class TimerSanityConflict(Screen): + EMPTY = 0 + ENABLE = 1 + DISABLE = 2 + EDIT = 3 + + def __init__(self, session, timer): + Screen.__init__(self, session) + self.timer = timer + print "TimerSanityConflict" + + self["timer1"] = TimerList(self.getTimerList(timer[0])) + self.list = [] + self.list2 = [] + count = 0 + for x in timer: + if count != 0: + self.list.append((_("Conflicting timer") + " " + str(count), x)) + self.list2.append((timer[count], False)) + count += 1 + if count == 1: + self.list.append((_("Channel not in services list"))) + + self["list"] = MenuList(self.list) + self["timer2"] = TimerList(self.list2) + + self["key_red"] = Button("Edit") + self["key_green"] = Button(" ") + self["key_yellow"] = Button(" ") + self["key_blue"] = Button(" ") + + self.key_green_choice = self.EMPTY + self.key_yellow_choice = self.EMPTY + self.key_blue_choice = self.EMPTY + + self["actions"] = ActionMap(["OkCancelActions", "DirectionActions", "ShortcutActions", "TimerEditActions"], + { + "ok": self.leave_ok, + "cancel": self.leave_cancel, + "red": self.editTimer1, + "up": self.up, + "down": self.down + }, -1) + self.onShown.append(self.updateState) + + def getTimerList(self, timer): + return [(timer, False)] + + def editTimer1(self): + self.session.openWithCallback(self.finishedEdit, TimerEntry, self["timer1"].getCurrent()) + + def toggleTimer1(self): + if self.timer[0].disabled: + self.timer[0].disabled = False + else: + if not self.timer[0].isRunning(): + self.timer[0].disabled = True + self.finishedEdit((True, self.timer[0])) + + def editTimer2(self): + self.session.openWithCallback(self.finishedEdit, TimerEntry, self["timer2"].getCurrent()) + + def toggleTimer2(self): + x = self["list"].getSelectedIndex() + 1 # the first is the new timer so we do +1 here + if self.timer[x].disabled: + self.timer[x].disabled = False + elif not self.timer[x].isRunning(): + self.timer[x].disabled = True + self.finishedEdit((True, self.timer[0])) + + def finishedEdit(self, answer): + self.leave_ok() + + def leave_ok(self): + self.close((True, self.timer[0])) + + def leave_cancel(self): + self.close((False, self.timer[0])) + + def up(self): + self["list"].instance.moveSelection(self["list"].instance.moveUp) + self["timer2"].moveToIndex(self["list"].getSelectedIndex()) + + def down(self): + self["list"].instance.moveSelection(self["list"].instance.moveDown) + self["timer2"].moveToIndex(self["list"].getSelectedIndex()) + + def removeAction(self, descr): + actions = self["actions"].actions + if descr in actions: + del actions[descr] + + def updateState(self): + if self.timer[0] is not None: + if self.timer[0].disabled and self.key_green_choice != self.ENABLE: + self["actions"].actions.update({"green":self.toggleTimer1}) + self["key_green"].setText(_("Enable")) + self.key_green_choice = self.ENABLE + elif self.timer[0].isRunning() and not self.timer[0].repeated and self.key_green_choice != self.EMPTY: + self.removeAction("green") + self["key_green"].setText(" ") + self.key_green_choice = self.EMPTY + elif (not self.timer[0].isRunning() or self.timer[0].repeated ) and self.key_green_choice != self.DISABLE: + self["actions"].actions.update({"green":self.toggleTimer1}) + self["key_green"].setText(_("Disable")) + self.key_green_choice = self.DISABLE + + if len(self.timer) > 1: + x = self["list"].getSelectedIndex() + if self.timer[x] is not None: + if self.key_yellow_choice == self.EMPTY: + self["actions"].actions.update({"yellow":self.editTimer2}) + self["key_yellow"].setText(_("Edit")) + self.key_yellow_choice = self.EDIT + if self.timer[x].disabled and self.key_blue_choice != self.ENABLE: + self["actions"].actions.update({"blue":self.toggleTimer2}) + self["key_blue"].setText(_("Enable")) + self.key_blue_choice = self.ENABLE + elif self.timer[x].isRunning() and not self.timer[x].repeated and self.key_blue_choice != self.EMPTY: + self.removeAction("blue") + self["key_blue"].setText(" ") + self.key_blue_choice = self.EMPTY + elif (not self.timer[x].isRunning() or self.timer[x].repeated ) and self.key_blue_choice != self.DISABLE: + self["actions"].actions.update({"blue":self.toggleTimer2}) + self["key_blue"].setText(_("Disable")) + self.key_blue_choice = self.DISABLE + else: +#FIXME.... this doesnt hide the buttons self.... just the text + if self.key_yellow_choice != self.EMPTY: + self.removeAction("yellow") + self["key_yellow"].setText(" ") + self.key_yellow_choice = self.EMPTY + if self.key_blue_choice != self.EMPTY: + self.removeAction("blue") + self["key_blue"].setText(" ") + self.key_blue_choice = self.EMPTY