small fix

[enigma2.git] / RecordTimer.py

diff --git a/RecordTimer.py b/RecordTimer.py
index 386e03f06da3841063b3b5b063c5af81a87f7c82..0f4256813aaa052c5a30542da1489eef0fa57d70 100644 (file)
--- a/RecordTimer.py
+++ b/RecordTimer.py
@@ -1,5 +1,4 @@
 import time
 import time

-import codecs

 #from time import datetime
 from Tools import Directories, Notifications
 
 #from time import datetime
 from Tools import Directories, Notifications
 


@@ -7,9 +6,15 @@ from Components.config import config
 import timer
 import xml.dom.minidom
 
 import timer
 import xml.dom.minidom
 

+from enigma import eEPGCache, getBestPlayableServiceReference, \
+       eServiceReference, iRecordableService, quitMainloop
+

 from Screens.MessageBox import MessageBox
 from Screens.MessageBox import MessageBox

-from Screens.SubserviceSelection import SubserviceSelection
+

 import NavigationInstance
 import NavigationInstance

+
+import Screens.Standby
+

 from time import localtime
 
 from Tools.XMLTools import elementsWithTag, mergeText, stringToXML
 from time import localtime
 
 from Tools.XMLTools import elementsWithTag, mergeText, stringToXML


@@ -24,20 +29,77 @@ from ServiceReference import ServiceReference
 
 # parses an event, and gives out a (begin, end, name, duration, eit)-tuple.
 # begin and end will be corrected
 
 # parses an event, and gives out a (begin, end, name, duration, eit)-tuple.
 # begin and end will be corrected

-def parseEvent(ev):
-       name = ev.getEventName()
-       description = ev.getShortDescription()
+def parseEvent(ev, description = True):
+       if description:
+               name = ev.getEventName()
+               description = ev.getShortDescription()
+       else:
+               name = ""
+               description = ""

        begin = ev.getBeginTime()
        end = begin + ev.getDuration()
        eit = ev.getEventId()
        begin = ev.getBeginTime()
        end = begin + ev.getDuration()
        eit = ev.getEventId()

-       begin -= config.recording.margin_before.value[0] * 60
-       end += config.recording.margin_after.value[0] * 60
+       begin -= config.recording.margin_before.value * 60
+       end += config.recording.margin_after.value * 60

        return (begin, end, name, description, eit)
 
        return (begin, end, name, description, eit)
 

+class AFTEREVENT:
+       NONE = 0
+       STANDBY = 1
+       DEEPSTANDBY = 2
+

 # please do not translate log messages
 # please do not translate log messages

-class RecordTimerEntry(timer.TimerEntry):
-       def __init__(self, serviceref, begin, end, name, description, eit, disabled = False, justplay = False):
+class RecordTimerEntry(timer.TimerEntry, object):
+######### the following static methods and members are only in use when the box is in (soft) standby
+       receiveRecordEvents = False
+
+       @staticmethod
+       def shutdown():
+               quitMainloop(1)
+
+       @staticmethod
+       def staticGotRecordEvent(recservice, event):
+               if event == iRecordableService.evEnd:
+                       print "RecordTimer.staticGotRecordEvent(iRecordableService.evEnd)"
+                       recordings = NavigationInstance.instance.getRecordings()
+                       if not len(recordings): # no more recordings exist
+                               rec_time = NavigationInstance.instance.RecordTimer.getNextRecordingTime()
+                               if rec_time > 0 and (rec_time - time.time()) < 360:
+                                       print "another recording starts in", rec_time - time.time(), "seconds... do not shutdown yet"
+                               else:
+                                       print "no starting records in the next 360 seconds... immediate shutdown"
+                                       RecordTimerEntry.shutdown() # immediate shutdown
+               elif event == iRecordableService.evStart:
+                       print "RecordTimer.staticGotRecordEvent(iRecordableService.evStart)"
+
+       @staticmethod
+       def stopTryQuitMainloop():
+               print "RecordTimer.stopTryQuitMainloop"
+               NavigationInstance.instance.record_event.remove(RecordTimerEntry.staticGotRecordEvent)
+               RecordTimerEntry.receiveRecordEvents = False
+
+       @staticmethod
+       def TryQuitMainloop():
+               if not RecordTimerEntry.receiveRecordEvents:
+                       print "RecordTimer.TryQuitMainloop"
+                       NavigationInstance.instance.record_event.append(RecordTimerEntry.staticGotRecordEvent)
+                       RecordTimerEntry.receiveRecordEvents = True
+                       # send fake event.. to check if another recordings are running or
+                       # other timers start in a few seconds
+                       RecordTimerEntry.staticGotRecordEvent(None, iRecordableService.evEnd)
+                       # send normal notification for the case the user leave the standby now..
+                       Notifications.AddNotification(Screens.Standby.TryQuitMainloop, 1, onSessionOpenCallback=RecordTimerEntry.stopTryQuitMainloop)
+#################################################################
+
+       def __init__(self, serviceref, begin, end, name, description, eit, disabled = False, justplay = False, afterEvent = AFTEREVENT.NONE, checkOldTimers = False):

                timer.TimerEntry.__init__(self, int(begin), int(end))
                timer.TimerEntry.__init__(self, int(begin), int(end))

+
+               if checkOldTimers == True:
+                       if self.begin < time.time() - 1209600:
+                               self.begin = int(time.time())
+               
+               if self.end < self.begin:
+                       self.end = self.begin

                
                assert isinstance(serviceref, ServiceReference)
                
                
                assert isinstance(serviceref, ServiceReference)
                


@@ -48,9 +110,10 @@ class RecordTimerEntry(timer.TimerEntry):
                self.description = description
                self.disabled = disabled
                self.timer = None
                self.description = description
                self.disabled = disabled
                self.timer = None

-               self.record_service = None
+               self.__record_service = None

                self.start_prepare = 0
                self.justplay = justplay
                self.start_prepare = 0
                self.justplay = justplay

+               self.afterEvent = afterEvent

                
                self.log_entries = []
                self.resetState()
                
                self.log_entries = []
                self.resetState()


@@ -61,6 +124,7 @@ class RecordTimerEntry(timer.TimerEntry):
        
        def resetState(self):
                self.state = self.StateWaiting
        
        def resetState(self):
                self.state = self.StateWaiting

+               self.cancelled = False

                self.first_try_prepare = True
                self.timeChanged()
        
                self.first_try_prepare = True
                self.timeChanged()
        


@@ -80,37 +144,60 @@ class RecordTimerEntry(timer.TimerEntry):
                self.Filename = Directories.getRecordingFilename(filename)
                self.log(0, "Filename calculated as: '%s'" % self.Filename)
                #begin_date + " - " + service_name + description)
                self.Filename = Directories.getRecordingFilename(filename)
                self.log(0, "Filename calculated as: '%s'" % self.Filename)
                #begin_date + " - " + service_name + description)

-       
+

        def tryPrepare(self):
                if self.justplay:
                        return True
                else:
                        self.calculateFilename()
        def tryPrepare(self):
                if self.justplay:
                        return True
                else:
                        self.calculateFilename()

-                       self.record_service = NavigationInstance.instance.recordService(self.service_ref)
-                       if self.record_service == None:
+                       rec_ref = self.service_ref and self.service_ref.ref
+                       if rec_ref and rec_ref.flags & eServiceReference.isGroup:
+                               rec_ref = getBestPlayableServiceReference(rec_ref, eServiceReference())
+                               if not rec_ref:
+                                       self.log(1, "'get best playable service for group... record' failed")
+                                       return False
+                               
+                       self.record_service = rec_ref and NavigationInstance.instance.recordService(rec_ref)
+
+                       if not self.record_service:

                                self.log(1, "'record service' failed")
                                return False
                                self.log(1, "'record service' failed")
                                return False

+
+                       if self.repeated:
+                               epgcache = eEPGCache.getInstance()
+                               queryTime=self.begin+(self.end-self.begin)/2
+                               evt = epgcache.lookupEventTime(rec_ref, queryTime)
+                               if evt:
+                                       self.description = evt.getShortDescription()
+                                       event_id = evt.getEventId()
+                               else:
+                                       event_id = -1

                        else:
                                event_id = self.eit
                                if event_id is None:
                                        event_id = -1
                        else:
                                event_id = self.eit
                                if event_id is None:
                                        event_id = -1

-                               prep_res = self.record_service.prepare(self.Filename + ".ts", self.begin, self.end, event_id )
-                               if prep_res:
-                                       self.log(2, "'prepare' failed: error %d" % prep_res)
-                                       self.record_service = None
-                                       return False
-       
-                               self.log(3, "prepare ok, writing meta information to %s" % self.Filename)
-                               try:
-                                       f = open(self.Filename + ".ts.meta", "w")
-                                       f.write(str(self.service_ref) + "\n")
-                                       f.write(self.name + "\n")
-                                       f.write(self.description + "\n")
-                                       f.write(str(self.begin) + "\n")
-                                       f.close()
-                               except:
-                                       self.log(4, "failed to write meta information")
-                               return True
+
+                       prep_res=self.record_service.prepare(self.Filename + ".ts", self.begin, self.end, event_id)
+                       if prep_res:
+                               self.log(2, "'prepare' failed: error %d" % prep_res)
+                               NavigationInstance.instance.stopRecordService(self.record_service)
+                               self.record_service = None
+                               return False
+
+                       self.log(3, "prepare ok, writing meta information to %s" % self.Filename)
+                       try:
+                               f = open(self.Filename + ".ts.meta", "w")
+                               f.write(rec_ref.toString() + "\n")
+                               f.write(self.name + "\n")
+                               f.write(self.description + "\n")
+                               f.write(str(self.begin) + "\n")
+                               f.close()
+                       except IOError:
+                               self.log(4, "failed to write meta information")
+                               NavigationInstance.instance.stopRecordService(self.record_service)
+                               self.record_service = None
+                               return False
+                       return True

 
        def do_backoff(self):
                if self.backoff == 0:
 
        def do_backoff(self):
                if self.backoff == 0:


@@ -136,11 +223,12 @@ class RecordTimerEntry(timer.TimerEntry):
                        self.log(7, "prepare failed")
                        if self.first_try_prepare:
                                self.first_try_prepare = False
                        self.log(7, "prepare failed")
                        if self.first_try_prepare:
                                self.first_try_prepare = False

-                               if config.recording.asktozap.value == 0:
+                               if not config.recording.asktozap.value:

                                        self.log(8, "asking user to zap away")
                                        self.log(8, "asking user to zap away")

-                                       Notifications.AddNotificationWithCallback(self.failureCB, MessageBox, _("A timer failed to record!\nDisable TV and try again?\n"))
+                                       Notifications.AddNotificationWithCallback(self.failureCB, MessageBox, _("A timer failed to record!\nDisable TV and try again?\n"), timeout=20)

                                else: # zap without asking
                                        self.log(9, "zap without asking")
                                else: # zap without asking
                                        self.log(9, "zap without asking")

+                                       Notifications.AddNotification(MessageBox, _("In order to record a timer, the TV was switched to the recording service!\n"), type=MessageBox.TYPE_INFO, timeout=20)

                                        self.failureCB(True)
 
                        self.do_backoff()
                                        self.failureCB(True)
 
                        self.do_backoff()


@@ -148,9 +236,20 @@ class RecordTimerEntry(timer.TimerEntry):
                        self.start_prepare = time.time() + self.backoff
                        return False
                elif next_state == self.StateRunning:
                        self.start_prepare = time.time() + self.backoff
                        return False
                elif next_state == self.StateRunning:

+                       # if this timer has been cancelled, just go to "end" state.
+                       if self.cancelled:
+                               return True
+

                        if self.justplay:
                        if self.justplay:

-                               self.log(11, "zapping")
-                               NavigationInstance.instance.playService(self.service_ref.ref)
+                               if Screens.Standby.inStandby:
+                                       self.log(11, "wakeup and zap")
+                                       #set service to zap after standby
+                                       Screens.Standby.inStandby.prev_running_service = self.service_ref.ref
+                                       #wakeup standby
+                                       Screens.Standby.inStandby.Power()
+                               else:
+                                       self.log(11, "zapping")
+                                       NavigationInstance.instance.playService(self.service_ref.ref)

                                return True
                        else:
                                self.log(11, "start recording")
                                return True
                        else:
                                self.log(11, "start recording")


@@ -162,15 +261,32 @@ class RecordTimerEntry(timer.TimerEntry):
                                        # retry
                                        self.begin = time.time() + self.backoff
                                        return False
                                        # retry
                                        self.begin = time.time() + self.backoff
                                        return False

-                               
+

                                return True
                elif next_state == self.StateEnded:
                        self.log(12, "stop recording")
                        if not self.justplay:
                                return True
                elif next_state == self.StateEnded:
                        self.log(12, "stop recording")
                        if not self.justplay:

-                               self.record_service.stop()
+                               NavigationInstance.instance.stopRecordService(self.record_service)

                                self.record_service = None
                                self.record_service = None

+                       if self.afterEvent == AFTEREVENT.STANDBY:
+                               if not Screens.Standby.inStandby: # not already in standby
+                                       Notifications.AddNotificationWithCallback(self.sendStandbyNotification, MessageBox, _("A finished record timer wants to set your\nDreambox to standby. Do that now?"), timeout = 20)
+                       if self.afterEvent == AFTEREVENT.DEEPSTANDBY:
+                               if not Screens.Standby.inTryQuitMainloop: # not a shutdown messagebox is open
+                                       if Screens.Standby.inStandby: # not in standby
+                                               RecordTimerEntry.TryQuitMainloop() # start shutdown handling without screen
+                                       else:
+                                               Notifications.AddNotificationWithCallback(self.sendTryQuitMainloopNotification, MessageBox, _("A finished record timer wants to shut down\nyour Dreambox. Shutdown now?"), timeout = 20)

                        return True
 
                        return True
 

+       def sendStandbyNotification(self, answer):
+               if answer:
+                       Notifications.AddNotification(Screens.Standby.Standby)
+
+       def sendTryQuitMainloopNotification(self, answer):
+               if answer:
+                       Notifications.AddNotification(Screens.Standby.TryQuitMainloop, 1)
+

        def getNextActivation(self):
                if self.state == self.StateEnded:
                        return self.end
        def getNextActivation(self):
                if self.state == self.StateEnded:
                        return self.end


@@ -194,17 +310,51 @@ class RecordTimerEntry(timer.TimerEntry):
                self.start_prepare = self.begin - self.prepare_time
                self.backoff = 0
                
                self.start_prepare = self.begin - self.prepare_time
                self.backoff = 0
                

-               if old_prepare != self.start_prepare:
+               if int(old_prepare) != int(self.start_prepare):

                        self.log(15, "record time changed, start prepare is now: %s" % time.ctime(self.start_prepare))
 
                        self.log(15, "record time changed, start prepare is now: %s" % time.ctime(self.start_prepare))
 

+       def gotRecordEvent(self, record, event):
+               # TODO: this is not working (never true), please fix. (comparing two swig wrapped ePtrs)
+               if self.__record_service.__deref__() != record.__deref__():
+                       return
+               self.log(16, "record event %d" % event)
+               if event == iRecordableService.evRecordWriteError:
+                       print "WRITE ERROR on recording, disk full?"
+                       # show notification. the 'id' will make sure that it will be
+                       # displayed only once, even if more timers are failing at the
+                       # same time. (which is very likely in case of disk fullness)
+                       Notifications.AddPopup(text = _("Write error while recording. Disk full?\n"), type = MessageBox.TYPE_ERROR, timeout = 0, id = "DiskFullMessage")
+                       # ok, the recording has been stopped. we need to properly note 
+                       # that in our state, with also keeping the possibility to re-try.
+                       # TODO: this has to be done.
+               elif event == iRecordableService.evStart:
+                       # maybe this should be configurable?
+                       Notifications.AddPopup(text = _("A record has been started:\n%s") % self.name, type = MessageBox.TYPE_INFO, timeout = 3)
+
+       # we have record_service as property to automatically subscribe to record service events
+       def setRecordService(self, service):
+               if self.__record_service is not None:
+                       print "[remove callback]"
+                       NavigationInstance.instance.record_event.remove(self.gotRecordEvent)
+
+               self.__record_service = service
+
+               if self.__record_service is not None:
+                       print "[add callback]"
+                       NavigationInstance.instance.record_event.append(self.gotRecordEvent)
+
+       record_service = property(lambda self: self.__record_service, setRecordService)
+

 def createTimer(xml):
        begin = int(xml.getAttribute("begin"))
        end = int(xml.getAttribute("end"))
 def createTimer(xml):
        begin = int(xml.getAttribute("begin"))
        end = int(xml.getAttribute("end"))

-       serviceref = ServiceReference(str(xml.getAttribute("serviceref")))
+       serviceref = ServiceReference(xml.getAttribute("serviceref").encode("utf-8"))

        description = xml.getAttribute("description").encode("utf-8")
        repeated = xml.getAttribute("repeated").encode("utf-8")
        disabled = long(xml.getAttribute("disabled") or "0")
        justplay = long(xml.getAttribute("justplay") or "0")
        description = xml.getAttribute("description").encode("utf-8")
        repeated = xml.getAttribute("repeated").encode("utf-8")
        disabled = long(xml.getAttribute("disabled") or "0")
        justplay = long(xml.getAttribute("justplay") or "0")

+       afterevent = str(xml.getAttribute("afterevent") or "nothing")
+       afterevent = { "nothing": AFTEREVENT.NONE, "standby": AFTEREVENT.STANDBY, "deepstandby": AFTEREVENT.DEEPSTANDBY }[afterevent]

        if xml.hasAttribute("eit") and xml.getAttribute("eit") != "None":
                eit = long(xml.getAttribute("eit"))
        else:
        if xml.hasAttribute("eit") and xml.getAttribute("eit") != "None":
                eit = long(xml.getAttribute("eit"))
        else:


@@ -212,7 +362,7 @@ def createTimer(xml):
        
        name = xml.getAttribute("name").encode("utf-8")
        #filename = xml.getAttribute("filename").encode("utf-8")
        
        name = xml.getAttribute("name").encode("utf-8")
        #filename = xml.getAttribute("filename").encode("utf-8")

-       entry = RecordTimerEntry(serviceref, begin, end, name, description, eit, disabled, justplay)
+       entry = RecordTimerEntry(serviceref, begin, end, name, description, eit, disabled, justplay, afterevent)

        entry.repeated = int(repeated)
        
        for l in elementsWithTag(xml.childNodes, "log"):
        entry.repeated = int(repeated)
        
        for l in elementsWithTag(xml.childNodes, "log"):


@@ -237,7 +387,7 @@ class RecordTimer(timer.Timer):
        def isRecording(self):
                isRunning = False
                for timer in self.timer_list:
        def isRecording(self):
                isRunning = False
                for timer in self.timer_list:

-                       if timer.isRunning():
+                       if timer.isRunning() and not timer.justplay:

                                isRunning = True
                return isRunning
        
                                isRunning = True
                return isRunning
        


@@ -302,24 +452,25 @@ class RecordTimer(timer.Timer):
                        list.append('<timer')
                        list.append(' begin="' + str(int(timer.begin)) + '"')
                        list.append(' end="' + str(int(timer.end)) + '"')
                        list.append('<timer')
                        list.append(' begin="' + str(int(timer.begin)) + '"')
                        list.append(' end="' + str(int(timer.end)) + '"')

-                       list.append(' serviceref="' + str(timer.service_ref) + '"')
+                       list.append(' serviceref="' + stringToXML(str(timer.service_ref)) + '"')

                        list.append(' repeated="' + str(int(timer.repeated)) + '"')
                        list.append(' name="' + str(stringToXML(timer.name)) + '"')
                        list.append(' description="' + str(stringToXML(timer.description)) + '"')
                        list.append(' repeated="' + str(int(timer.repeated)) + '"')
                        list.append(' name="' + str(stringToXML(timer.name)) + '"')
                        list.append(' description="' + str(stringToXML(timer.description)) + '"')

+                       list.append(' afterevent="' + str(stringToXML({ AFTEREVENT.NONE: "nothing", AFTEREVENT.STANDBY: "standby", AFTEREVENT.DEEPSTANDBY: "deepstandby" }[timer.afterEvent])) + '"')

                        if timer.eit is not None:
                                list.append(' eit="' + str(timer.eit) + '"')
                        list.append(' disabled="' + str(int(timer.disabled)) + '"')
                        list.append(' justplay="' + str(int(timer.justplay)) + '"')
                        list.append('>\n')
                        
                        if timer.eit is not None:
                                list.append(' eit="' + str(timer.eit) + '"')
                        list.append(' disabled="' + str(int(timer.disabled)) + '"')
                        list.append(' justplay="' + str(int(timer.justplay)) + '"')
                        list.append('>\n')
                        

-                       #for time, code, msg in timer.log_entries:
-                               #list.append('<log')
-                               #list.append(' code="' + str(code) + '"')
-                               #list.append(' time="' + str(time) + '"')
-                               #list.append('>')
-                               #list.append(str(msg))
-                               #list.append('</log>\n')
-
+                       if config.recording.debug.value:
+                               for time, code, msg in timer.log_entries:
+                                       list.append('<log')
+                                       list.append(' code="' + str(code) + '"')
+                                       list.append(' time="' + str(time) + '"')
+                                       list.append('>')
+                                       list.append(str(stringToXML(msg)))
+                                       list.append('</log>\n')

                        
                        list.append('</timer>\n')
 
                        
                        list.append('</timer>\n')
 


@@ -330,6 +481,22 @@ class RecordTimer(timer.Timer):
                        file.write(x)
                file.close()
 
                        file.write(x)
                file.close()
 

+       def getNextZapTime(self):
+               now = time.time()
+               for timer in self.timer_list:
+                       if not timer.justplay or timer.begin < now:
+                               continue
+                       return timer.begin
+               return -1
+
+       def getNextRecordingTime(self):
+               now = time.time()
+               for timer in self.timer_list:
+                       if timer.justplay or timer.begin < now:
+                               continue
+                       return timer.begin
+               return -1
+

        def record(self, entry):
                entry.timeChanged()
                print "[Timer] Record " + str(entry)
        def record(self, entry):
                entry.timeChanged()
                print "[Timer] Record " + str(entry)


@@ -338,24 +505,56 @@ class RecordTimer(timer.Timer):
                
        def isInTimer(self, eventid, begin, duration, service):
                time_match = 0
                
        def isInTimer(self, eventid, begin, duration, service):
                time_match = 0

+               chktime = None
+               chktimecmp = None
+               chktimecmp_end = None
+               end = begin + duration

                for x in self.timer_list:
                for x in self.timer_list:

-                       if str(x.service_ref) == str(service):
+                       check = x.service_ref.ref.toCompareString() == str(service)
+                       if not check:
+                               sref = x.service_ref.ref
+                               parent_sid = sref.getUnsignedData(5)
+                               parent_tsid = sref.getUnsignedData(6)
+                               if parent_sid and parent_tsid: # check for subservice
+                                       sid = sref.getUnsignedData(1)
+                                       tsid = sref.getUnsignedData(2)
+                                       sref.setUnsignedData(1, parent_sid)
+                                       sref.setUnsignedData(2, parent_tsid)
+                                       sref.setUnsignedData(5, 0)
+                                       sref.setUnsignedData(6, 0)
+                                       check = x.service_ref.ref.toCompareString() == str(service)
+                                       num = 0
+                                       if check:
+                                               check = False
+                                               event = eEPGCache.getInstance().lookupEventId(sref, eventid)
+                                               num = event and event.getNumOfLinkageServices() or 0
+                                       sref.setUnsignedData(1, sid)
+                                       sref.setUnsignedData(2, tsid)
+                                       sref.setUnsignedData(5, parent_sid)
+                                       sref.setUnsignedData(6, parent_tsid)
+                                       for cnt in range(num):
+                                               subservice = event.getLinkageService(sref, cnt)
+                                               if sref.toCompareString() == subservice.toCompareString():
+                                                       check = True
+                                                       break
+                       if check:

                                #if x.eit is not None and x.repeated == 0:
                                #       if x.eit == eventid:
                                #               return duration
                                if x.repeated != 0:
                                #if x.eit is not None and x.repeated == 0:
                                #       if x.eit == eventid:
                                #               return duration
                                if x.repeated != 0:

-                                       chktime = localtime(begin)
+                                       if chktime is None:
+                                               chktime = localtime(begin)
+                                               chktimecmp = chktime.tm_wday * 1440 + chktime.tm_hour * 60 + chktime.tm_min
+                                               chktimecmp_end = chktimecmp + (duration / 60)

                                        time = localtime(x.begin)
                                        time = localtime(x.begin)

-                                       chktimecmp = chktime.tm_wday * 1440 + chktime.tm_hour * 60 + chktime.tm_min

                                        for y in range(7):
                                                if x.repeated & (2 ** y):
                                                        timecmp = y * 1440 + time.tm_hour * 60 + time.tm_min
                                                        if timecmp <= chktimecmp < (timecmp + ((x.end - x.begin) / 60)):
                                                                time_match = ((timecmp + ((x.end - x.begin) / 60)) - chktimecmp) * 60
                                        for y in range(7):
                                                if x.repeated & (2 ** y):
                                                        timecmp = y * 1440 + time.tm_hour * 60 + time.tm_min
                                                        if timecmp <= chktimecmp < (timecmp + ((x.end - x.begin) / 60)):
                                                                time_match = ((timecmp + ((x.end - x.begin) / 60)) - chktimecmp) * 60

-                                                       elif chktimecmp <= timecmp < (chktimecmp + (duration / 60)):
-                                                               time_match = ((chktimecmp + (duration / 60)) - timecmp) * 60
+                                                       elif chktimecmp <= timecmp < chktimecmp_end:
+                                                               time_match = (chktimecmp_end - timecmp) * 60

                                else: #if x.eit is None:
                                else: #if x.eit is None:

-                                       end = begin + duration

                                        if begin <= x.begin <= end:
                                                diff = end - x.begin
                                                if time_match < diff:
                                        if begin <= x.begin <= end:
                                                diff = end - x.begin
                                                if time_match < diff:


@@ -365,10 +564,6 @@ class RecordTimer(timer.Timer):
                                                if time_match < diff:
                                                        time_match = diff
                return time_match
                                                if time_match < diff:
                                                        time_match = diff
                return time_match

-                                                       
-                                               
-                                               
-                       

 
        def removeEntry(self, entry):
                print "[Timer] Remove " + str(entry)
 
        def removeEntry(self, entry):
                print "[Timer] Remove " + str(entry)