X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/266d4a5e9cdc02e8fd54481c2101078b5d62a93a..b9bda8a0d43be892f2e5d96ea45ba8d4b2fdae20:/lib/python/Screens/TimerEdit.py diff --git a/lib/python/Screens/TimerEdit.py b/lib/python/Screens/TimerEdit.py index ee2920a0..babf28fe 100644 --- a/lib/python/Screens/TimerEdit.py +++ b/lib/python/Screens/TimerEdit.py @@ -1,16 +1,17 @@ -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.Label import Label +from Components.MenuList import MenuList +from Components.TimerList import TimerList, TimerEntryComponent +from Components.TimerSanityCheck import TimerSanityCheck +from RecordTimer import RecordTimerEntry, parseEvent, AFTEREVENT +from Screen import Screen +from Screens.ChoiceBox import ChoiceBox from Screens.MessageBox import MessageBox +from ServiceReference import ServiceReference from TimerEntry import TimerEntry, TimerLog -from RecordTimer import RecordTimerEntry, parseEvent +from Tools.BoundFunction import boundFunction from time import * -from ServiceReference import ServiceReference -from Components.config import * -from Components.TimerSanityCheck import TimerSanityCheck class TimerEditList(Screen): def __init__(self, session): @@ -31,7 +32,7 @@ class TimerEditList(Screen): { "ok": self.openEdit, "cancel": self.leave, - "red": self.removeTimer, + "red": self.removeTimerQuestion, "green": self.addCurrentTimer, "blue": self.cleanupQuestion, "yellow": self.toggleDisabledState, @@ -61,9 +62,39 @@ class TimerEditList(Screen): self.updateState() def toggleDisabledState(self): - self["timerlist"].getCurrent()[0].disabled = not self["timerlist"].getCurrent()[0].disabled - self.updateState() - self.refill() + cur=self["timerlist"].getCurrent() + if cur: + t = cur[0] + + if t.disabled: + t.enable() + self.session.nav.RecordTimer.timeChanged(t) + + else: + if t.isRunning() and t.repeated: + list = [] + list.append((_("Stop current event but not coming events"), "stoponlycurrent")) + list.append((_("Stop current event and disable coming events"), "stopall")) + list.append((_("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.updateState() + self.refill() + + 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.updateState() + self.refill() def updateState(self): if len(self.list) > 0: @@ -81,14 +112,18 @@ class TimerEditList(Screen): for timer in self.session.nav.RecordTimer.processed_timers: self.list.append(TimerEntryComponent(timer, processed=True)) + self.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[0]) 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[0]) + def cleanupQuestion(self): self.session.openWithCallback(self.cleanupTimer, MessageBox, _("Really delete done timers?")) @@ -96,17 +131,20 @@ class TimerEditList(Screen): if delete: self.session.nav.RecordTimer.cleanup() self.refill() + + def removeTimerQuestion(self): + self.session.openWithCallback(self.removeTimer, MessageBox, _("Really delete this timer?")) - def removeTimer(self): + def removeTimer(self, result): + if not result: + return list = self["timerlist"] - timer = list.getCurrent()[0] - currentIndex = list.getCurrentIndex() - self.session.nav.RecordTimer.removeEntry(timer) - list.moveDown() - if list.getCurrentIndex() == currentIndex: - currentIndex -= 1 - self.refill() - list.moveToIndex(currentIndex) + cur = list.getCurrent() + if cur: + timer = cur[0] + timer.afterEvent = AFTEREVENT.NONE + self.session.nav.RecordTimer.removeEntry(timer) + self.refill() def refill(self): self.fillTimerList() @@ -124,11 +162,11 @@ 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, *data)) def addTimer(self, timer): self.session.openWithCallback(self.finishedAdd, TimerEntry, timer) @@ -138,7 +176,8 @@ class TimerEditList(Screen): if answer[0]: print "Edited timer" - if not TimerSanityCheck(self.session.nav.RecordTimer.timer_list, answer[1]).check(): + timersanitycheck = TimerSanityCheck(self.session.nav.RecordTimer.timer_list, answer[1]) + if not timersanitycheck.check(): print "Sanity check failed" else: print "Sanity check passed" @@ -150,16 +189,21 @@ class TimerEditList(Screen): def finishedAdd(self, answer): print "finished add" if answer[0]: - if not TimerSanityCheck(self.session.nav.RecordTimer.timer_list, answer[1]).check(): + timersanitycheck = TimerSanityCheck(self.session.nav.RecordTimer.timer_list, answer[1]) + if not timersanitycheck.check(): print "Sanity check failed" + self.session.openWithCallback(self.finishSanityCorrection, TimerSanityConflict, timersanitycheck.getSimulTimerList()) else: print "Sanity check passed" - entry = answer[1] - self.session.nav.RecordTimer.record(entry) - self.fillTimerList() + entry = answer[1] + self.session.nav.RecordTimer.record(entry) + self.fillTimerList() else: 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) @@ -167,3 +211,67 @@ class TimerEditList(Screen): def onStateChange(self, entry): self.refill() + +class TimerSanityConflict(Screen): + def __init__(self, session, timer): + Screen.__init__(self, session) + self.timer = timer + print "TimerSanityConflict", timer + + self["timer1"] = TimerList(self.getTimerList(timer[0])) + if len(timer) > 1: + self["timer2"] = TimerList(self.getTimerList(timer[1])) + else: + self["timer2"] = TimerList([]) + + self.list = [] + count = 0 + for x in timer: + if count != 0: + self.list.append((_("Conflicting timer") + " " + str(count), x)) + count += 1 + + self["list"] = MenuList(self.list) + + self["key_red"] = Button("Edit") + self["key_green"] = Button("Disable") + self["key_yellow"] = Button("Edit") + self["key_blue"] = Button("Disable") + + self["actions"] = ActionMap(["OkCancelActions", "DirectionActions", "ShortcutActions", "TimerEditActions"], + { + "ok": self.close, + #"cancel": self.leave, + "red": self.editTimer1, + "green": self.disableTimer1, +# "yellow": self.editTimer2, +# "blue": self.disableTimer2, + #"log": self.showLog, + #"left": self.left, + #"right": self.right, + "up": self.up, + "down": self.down + }, -1) + + def getTimerList(self, timer): + return [TimerEntryComponent(timer, processed=False)] + + def editTimer1(self): + self.session.openWithCallback(self.finishedEdit, TimerEntry, self["timer1"].getCurrent()[0]) + + def disableTimer1(self): + self.timer[0].disabled = True + self.finishedEdit((True, self.timer[0])) + + def finishedEdit(self, answer): + self.close((True, self.timer[0])) + + def up(self): + self["list"].instance.moveSelection(self["list"].instance.moveUp) + self["timer2"].l.setList(self.getTimerList(self["list"].getCurrent()[1])) + + def down(self): + self["list"].instance.moveSelection(self["list"].instance.moveDown) + self["timer2"].l.setList(self.getTimerList(self["list"].getCurrent()[1])) + + \ No newline at end of file