add ability to stop currently running repeated timer when disabling it

diff --git a/lib/python/Screens/TimerEdit.py b/lib/python/Screens/TimerEdit.py
index 5532dc83833f8480be3b491c18e523d69ddbcbc9..babf28fe6cc0e8ba042196432a8f117d2785647e 100644 (file)
--- a/lib/python/Screens/TimerEdit.py
+++ b/lib/python/Screens/TimerEdit.py
@@ -1,15 +1,17 @@
-from Screen import Screen
-from Components.TimerList import TimerList, TimerEntryComponent
-from Components.MenuList import MenuList
 from Components.ActionMap import ActionMap
-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, AFTEREVENT
+from Tools.BoundFunction import boundFunction
 from time import *
-from ServiceReference import ServiceReference
-from Components.TimerSanityCheck import TimerSanityCheck
 
 class TimerEditList(Screen):
        def __init__(self, session):
@@ -66,10 +68,31 @@ class TimerEditList(Screen):
                
                        if t.disabled:
                                t.enable()
+                               self.session.nav.RecordTimer.timeChanged(t)
+
                        else:
-                               t.disable()
+                               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()
                

diff --git a/timer.py b/timer.py
index 5720cf9d5be638229286655bac1ddce23af7a840..96e38e1584d72a1f00950430397ba89ab586649f 100644 (file)
--- a/timer.py
+++ b/timer.py
@@ -30,7 +30,7 @@ class TimerEntry:
                return self.state == self.StateRunning
                
        # update self.begin and self.end according to the self.repeated-flags
-       def processRepeated(self):
+       def processRepeated(self, findRunningEvent = True):
                print "ProcessRepeated"
                if (self.repeated != 0):
                        now = int(time()) + 1
@@ -54,9 +54,10 @@ class TimerEntry:
                                flags = flags >> 1
 
                        print strftime("%c", localnow)
-                       while ((day[localbegin.tm_wday] != 0) or ((day[localbegin.tm_wday] == 0) and localend < localnow)):
-                               print strftime("%c", localbegin)
-                               print strftime("%c", localend)
+
+                       while ((day[localbegin.tm_wday] != 0) or ((day[localbegin.tm_wday] == 0) and ((findRunningEvent and localend < localnow) or ((not findRunningEvent) and localbegin < localnow)))):
+                               print "localbegin:", strftime("%c", localbegin)
+                               print "localend:", strftime("%c", localend)
                                #add one day to the struct_time, we have to convert using gmt functions, because the daylight saving flag might change after we add our 86400 seconds
                                localbegin = gmtime(timegm(localbegin) + 86400)
                                localend = gmtime(timegm(localend) + 86400)