fix typo
[enigma2.git] / RecordTimer.py
index 6c942fb10720fc19525e522a793a0d24875f601f..d831249384efafe27f60cb33c8839533fdb08e06 100644 (file)
@@ -7,8 +7,9 @@ from Components.config import config
 import timer
 import xml.dom.minidom
 
+from enigma import quitMainloop, eEPGCache
+
 from Screens.MessageBox import MessageBox
-from Screens.SubserviceSelection import SubserviceSelection
 import NavigationInstance
 from time import localtime
 
@@ -30,15 +31,27 @@ def parseEvent(ev):
        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)
 
+class AFTEREVENT:
+       NONE = 0
+       STANDBY = 1
+       DEEPSTANDBY = 2
+
 # please do not translate log messages
 class RecordTimerEntry(timer.TimerEntry):
-       def __init__(self, serviceref, begin, end, name, description, eit, disabled = False, justplay = False):
+       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))
                
+               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)
                
                self.service_ref = serviceref
@@ -51,6 +64,8 @@ class RecordTimerEntry(timer.TimerEntry):
                self.record_service = None
                self.start_prepare = 0
                self.justplay = justplay
+               self.afterEvent = afterEvent
+               self.session = None
                
                self.log_entries = []
                self.resetState()
@@ -100,7 +115,13 @@ class RecordTimerEntry(timer.TimerEntry):
                                        self.log(2, "'prepare' failed: error %d" % prep_res)
                                        self.record_service = None
                                        return False
-       
+
+                               if self.repeated:
+                                       epgcache = eEPGCache.getInstance()
+                                       queryTime=self.begin+(self.end-self.begin)/2
+                                       evt = epgcache.lookupEventTime(self.service_ref.ref, queryTime)
+                                       if evt:
+                                               self.description = evt.getShortDescription()
                                self.log(3, "prepare ok, writing meta information to %s" % self.Filename)
                                try:
                                        f = open(self.Filename + ".ts.meta", "w")
@@ -137,11 +158,12 @@ class RecordTimerEntry(timer.TimerEntry):
                        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")
-                                       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")
+                                       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()
@@ -174,6 +196,11 @@ class RecordTimerEntry(timer.TimerEntry):
                        if not self.justplay:
                                self.record_service.stop()
                                self.record_service = None
+                       if self.afterEvent == AFTEREVENT.STANDBY:
+                               if self.session is not None:
+                                       self.session.open(Standby, self)
+                       elif self.afterEvent == AFTEREVENT.DEEPSTANDBY:
+                               quitMainloop(1)
                        return True
 
        def getNextActivation(self):
@@ -205,11 +232,13 @@ class RecordTimerEntry(timer.TimerEntry):
 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")
+       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:
@@ -217,7 +246,7 @@ def createTimer(xml):
        
        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"):
@@ -311,6 +340,7 @@ class RecordTimer(timer.Timer):
                        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)) + '"')
@@ -343,24 +373,29 @@ class RecordTimer(timer.Timer):
                
        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:
                        if str(x.service_ref) == str(service):
                                #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)
-                                       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
-                                                       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:
-                                       end = begin + duration
                                        if begin <= x.begin <= end:
                                                diff = end - x.begin
                                                if time_match < diff: