X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/40abde85c0fbd8c10fdc7f8894c128cb8acf05ee..c917eef3dc01ada59fc5f3f1e63036ee6fcb5bba:/RecordTimer.py

diff --git a/RecordTimer.py b/RecordTimer.py
index 1e21091d..1c707c36 100644
--- a/RecordTimer.py
+++ b/RecordTimer.py
@@ -50,7 +50,7 @@ class AFTEREVENT:
 	DEEPSTANDBY = 2
 
 # please do not translate log messages
-class RecordTimerEntry(timer.TimerEntry):
+class RecordTimerEntry(timer.TimerEntry, object):
 ######### the following static methods and members are only in use when the box is in (soft) standby
 	receiveRecordEvents = False
 
@@ -59,9 +59,9 @@ class RecordTimerEntry(timer.TimerEntry):
 		quitMainloop(1)
 
 	@staticmethod
-	def gotRecordEvent(recservice, event):
+	def staticGotRecordEvent(recservice, event):
 		if event == iRecordableService.evEnd:
-			print "RecordTimer.gotRecordEvent(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()
@@ -71,30 +71,30 @@ class RecordTimerEntry(timer.TimerEntry):
 					print "no starting records in the next 360 seconds... immediate shutdown"
 					RecordTimerEntry.shutdown() # immediate shutdown
 		elif event == iRecordableService.evStart:
-			print "RecordTimer.gotRecordEvent(iRecordableService.evStart)"
+			print "RecordTimer.staticGotRecordEvent(iRecordableService.evStart)"
 
 	@staticmethod
 	def stopTryQuitMainloop():
 		print "RecordTimer.stopTryQuitMainloop"
-		NavigationInstance.instance.record_event.remove(RecordTimerEntry.gotRecordEvent)
+		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.gotRecordEvent)
+			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.gotRecordEvent(None, iRecordableService.evEnd)
+			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))
-		
+
 		if checkOldTimers == True:
 			if self.begin < time.time() - 1209600:
 				self.begin = int(time.time())
@@ -111,7 +111,7 @@ class RecordTimerEntry(timer.TimerEntry):
 		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.afterEvent = afterEvent
@@ -145,7 +145,7 @@ class RecordTimerEntry(timer.TimerEntry):
 		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
@@ -159,27 +159,32 @@ class RecordTimerEntry(timer.TimerEntry):
 					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
-				
-			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
-				
+
 			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
+
+			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")
@@ -190,6 +195,7 @@ class RecordTimerEntry(timer.TimerEntry):
 				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
@@ -236,8 +242,15 @@ class RecordTimerEntry(timer.TimerEntry):
 				return True
 
 			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")
@@ -249,7 +262,7 @@ class RecordTimerEntry(timer.TimerEntry):
 					# retry
 					self.begin = time.time() + self.backoff
 					return False
-				
+
 				return True
 		elif next_state == self.StateEnded:
 			self.log(12, "stop recording")
@@ -301,6 +314,38 @@ class RecordTimerEntry(timer.TimerEntry):
 		if int(old_prepare) != int(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"))
@@ -437,12 +482,25 @@ class RecordTimer(timer.Timer):
 			file.write(x)
 		file.close()
 
+	def getNextZapTime(self):
+		llen = len(self.timer_list)
+		idx = 0
+		now = time.time()
+		while idx < llen:
+			timer = self.timer_list[idx]
+			if not timer.justplay or timer.begin < now:
+				idx += 1
+			else:
+				return timer.begin
+		return -1
+
 	def getNextRecordingTime(self):
 		llen = len(self.timer_list)
 		idx = 0
+		now = time.time()
 		while idx < llen:
 			timer = self.timer_list[idx]
-			if timer.justplay:
+			if timer.justplay or timer.begin < now:
 				idx += 1
 			else:
 				return timer.begin