X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/6d5483c0835b27268da7bc6081ed6db330cffa72..f8e1f4b8f24d9b9cd22f5466824bbc1b5b58d486:/RecordTimer.py

diff --git a/RecordTimer.py b/RecordTimer.py
index 386e03f0..dfddb73c 100644
--- a/RecordTimer.py
+++ b/RecordTimer.py
@@ -61,6 +61,7 @@ class RecordTimerEntry(timer.TimerEntry):
 	
 	def resetState(self):
 		self.state = self.StateWaiting
+		self.cancelled = False
 		self.first_try_prepare = True
 		self.timeChanged()
 	
@@ -108,7 +109,7 @@ class RecordTimerEntry(timer.TimerEntry):
 					f.write(self.description + "\n")
 					f.write(str(self.begin) + "\n")
 					f.close()
-				except:
+				except IOError:
 					self.log(4, "failed to write meta information")
 				return True
 
@@ -148,6 +149,10 @@ class RecordTimerEntry(timer.TimerEntry):
 			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:
 				self.log(11, "zapping")
 				NavigationInstance.instance.playService(self.service_ref.ref)
@@ -237,7 +242,7 @@ class RecordTimer(timer.Timer):
 	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
 	
@@ -338,24 +343,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:
@@ -365,10 +375,6 @@ class RecordTimer(timer.Timer):
 						if time_match < diff:
 							time_match = diff
 		return time_match
-							
-						
-						
-			
 
 	def removeEntry(self, entry):
 		print "[Timer] Remove " + str(entry)