X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=RecordTimer.py;h=cdd37eb598f2e7a7fdc3cb252a29e3803991f6ec;hp=1f65038cd73dca936b2ceeffa6ea13b46f0a60b5;hb=8d22c234622439727d1b14c82959300ce5b58ed0;hpb=f4e60c14b94fe0155aba9addc908a0b2860b3cd8

diff --git a/RecordTimer.py b/RecordTimer.py
index 1f65038..cdd37eb 100644
--- a/RecordTimer.py
+++ b/RecordTimer.py
@@ -186,10 +186,16 @@ class RecordTimerEntry(timer.TimerEntry, object):
 
 			prep_res=self.record_service.prepare(self.Filename + ".ts", self.begin, self.end, event_id, self.name.replace("\n", ""), self.description.replace("\n", ""), ' '.join(self.tags))
 			if prep_res:
-				if prep_res == 255:
+				if prep_res == -255:
 					self.log(4, "failed to write meta information")
 				else:
 					self.log(2, "'prepare' failed: error %d" % prep_res)
+
+				# we must calc nur start time before stopRecordService call because in Screens/Standby.py TryQuitMainloop tries to get
+				# the next start time in evEnd event handler...
+				self.do_backoff()
+				self.start_prepare = time.time() + self.backoff
+
 				NavigationInstance.instance.stopRecordService(self.record_service)
 				self.record_service = None
 				return False
@@ -207,29 +213,36 @@ class RecordTimerEntry(timer.TimerEntry, object):
 	def activate(self):
 		next_state = self.state + 1
 		self.log(5, "activating state %d" % next_state)
-		
+
 		if next_state == self.StatePrepared:
 			if self.tryPrepare():
 				self.log(6, "prepare ok, waiting for begin")
+				# create file to "reserve" the filename
+				# because another recording at the same time on another service can try to record the same event
+				# i.e. cable / sat.. then the second recording needs an own extension... when we create the file
+				# here than calculateFilename is happy
+				open(self.Filename + ".ts", "w").close() 
 				# fine. it worked, resources are allocated.
 				self.next_activation = self.begin
 				self.backoff = 0
 				return True
-			
+
 			self.log(7, "prepare failed")
 			if self.first_try_prepare:
 				self.first_try_prepare = False
-				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"), 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()
-			# retry
-			self.start_prepare = time.time() + self.backoff
+				cur_ref = NavigationInstance.instance.getCurrentlyPlayingServiceReference()
+				if cur_ref and not cur_ref.getPath():
+					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"), 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)
+				elif cur_ref:
+					self.log(8, "currently running service is not a live service.. so stop it makes no sense")
+				else:
+					self.log(8, "currently no service running... so we dont need to stop it")
 			return False
 		elif next_state == self.StateRunning:
 			# if this timer has been cancelled, just go to "end" state.
@@ -427,7 +440,36 @@ class RecordTimer(timer.Timer):
 			self.loadTimer()
 		except IOError:
 			print "unable to load timers from file!"
-			
+
+	def doActivate(self, w):
+		# when activating a timer which has already passed,
+		# simply abort the timer. don't run trough all the stages.
+		if w.shouldSkip():
+			w.state = TimerEntry.StateEnded
+		else:
+			# when active returns true, this means "accepted".
+			# otherwise, the current state is kept.
+			# the timer entry itself will fix up the delay then.
+			if w.activate():
+				w.state += 1
+
+		self.timer_list.remove(w)
+
+		# did this timer reached the last state?
+		if w.state < TimerEntry.StateEnded:
+			# no, sort it into active list
+			insort(self.timer_list, w)
+		else:
+			# yes. Process repeated, and re-add.
+			if w.repeated:
+				w.processRepeated()
+				w.state = TimerEntry.StateWaiting
+				self.addTimerEntry(w)
+			else:
+				insort(self.processed_timers, w)
+		
+		self.stateChanged(w)
+
 	def isRecording(self):
 		isRunning = False
 		for timer in self.timer_list:
@@ -569,9 +611,10 @@ class RecordTimer(timer.Timer):
 	def getNextRecordingTime(self):
 		now = time.time()
 		for timer in self.timer_list:
-			if timer.justplay or timer.begin < now:
+			next_act = timer.getNextActivation()
+			if timer.justplay or next_act < now:
 				continue
-			return timer.begin
+			return next_act
 		return -1
 
 	def isNextRecordAfterEventActionAuto(self):