X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/ceebb28346d39f3c18f5fdc47fd84f48a207589a..c5d48668f18226413164d84ff808547bb10fcbba:/RecordTimer.py

diff --git a/RecordTimer.py b/RecordTimer.py
index dfddb73c..1d343952 100644
--- a/RecordTimer.py
+++ b/RecordTimer.py
@@ -7,8 +7,9 @@ from Components.config import config
 import timer
 import xml.dom.minidom
 
+from enigma import quitMainloop, eEPGCache, eEPGCachePtr
+
 from Screens.MessageBox import MessageBox
-from Screens.SubserviceSelection import SubserviceSelection
 import NavigationInstance
 from time import localtime
 
@@ -34,11 +35,23 @@ def parseEvent(ev):
 	end += config.recording.margin_after.value[0] * 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")
@@ -139,9 +160,10 @@ class RecordTimerEntry(timer.TimerEntry):
 				self.first_try_prepare = False
 				if config.recording.asktozap.value == 0:
 					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):
@@ -210,6 +237,8 @@ def createTimer(xml):
 	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)) + '"')