X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=RecordTimer.py;h=de4f6cc1c1075c672b5d83ddd6169739596b40aa;hp=215f9c3ab33930b3cc56e2d5471baac609896406;hb=17784edbd0427870d890675059827f8cfbf12a9d;hpb=365370295e04bdd056f6dd1c5e1523ec3f66e5b3

diff --git a/RecordTimer.py b/RecordTimer.py
index 215f9c3..de4f6cc 100644
--- a/RecordTimer.py
+++ b/RecordTimer.py
@@ -482,27 +482,19 @@ class RecordTimer(timer.Timer):
 		file.close()
 
 	def getNextZapTime(self):
-		llen = len(self.timer_list)
-		idx = 0
 		now = time.time()
-		while idx < llen:
-			timer = self.timer_list[idx]
+		for timer in self.timer_list:
 			if not timer.justplay or timer.begin < now:
-				idx += 1
-			else:
-				return timer.begin
+				continue
+			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]
+		for timer in self.timer_list:
 			if timer.justplay or timer.begin < now:
-				idx += 1
-			else:
-				return timer.begin
+				continue
+			return timer.begin
 		return -1
 
 	def record(self, entry):
@@ -510,6 +502,7 @@ class RecordTimer(timer.Timer):
 		print "[Timer] Record " + str(entry)
 		entry.Timer = self
 		self.addTimerEntry(entry)
+		self.saveTimer()
 		
 	def isInTimer(self, eventid, begin, duration, service):
 		time_match = 0
@@ -531,10 +524,20 @@ class RecordTimer(timer.Timer):
 					sref.setUnsignedData(5, 0)
 					sref.setUnsignedData(6, 0)
 					check = x.service_ref.ref.toCompareString() == str(service)
+					num = 0
+					if check:
+						check = False
+						event = eEPGCache.getInstance().lookupEventId(sref, eventid)
+						num = event and event.getNumOfLinkageServices() or 0
 					sref.setUnsignedData(1, sid)
 					sref.setUnsignedData(2, tsid)
 					sref.setUnsignedData(5, parent_sid)
 					sref.setUnsignedData(6, parent_tsid)
+					for cnt in range(num):
+						subservice = event.getLinkageService(sref, cnt)
+						if sref.toCompareString() == subservice.toCompareString():
+							check = True
+							break
 			if check:
 				#if x.eit is not None and x.repeated == 0:
 				#	if x.eit == eventid:
@@ -581,6 +584,7 @@ class RecordTimer(timer.Timer):
 		print "in running: ", entry in self.timer_list
 		# now the timer should be in the processed_timers list. remove it from there.
 		self.processed_timers.remove(entry)
+		self.saveTimer()
 
 	def shutdown(self):
 		self.saveTimer()