X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/102039a66da3684b4983bef947c36c98013b2d85..7f6790f2afe0fb6f65746fdc1c00935ed1567146:/lib/python/Components/TimerSanityCheck.py

diff --git a/lib/python/Components/TimerSanityCheck.py b/lib/python/Components/TimerSanityCheck.py
index f94b56a6..cf505022 100644
--- a/lib/python/Components/TimerSanityCheck.py
+++ b/lib/python/Components/TimerSanityCheck.py
@@ -1,13 +1,12 @@
-import string
 import NavigationInstance
-from time import localtime
-from Components.NimManager import nimmanager
+from time import localtime, mktime, gmtime
 from ServiceReference import ServiceReference
-from enigma import iServiceInformation, eServiceCenter
+from enigma import iServiceInformation, eServiceCenter, eServiceReference
 
 class TimerSanityCheck:
 	def __init__(self, timerlist, newtimer=None):
 		print "sanitycheck"
+		self.localtimediff = 25*3600 - mktime(gmtime(25*3600))
 		self.timerlist = timerlist
 		self.newtimer = newtimer
 		self.simultimer = []
@@ -39,7 +38,7 @@ class TimerSanityCheck:
 					if timer.begin == self.newtimer.begin:
 						getUnsignedDataRef1 = timer.service_ref.ref.getUnsignedData
 						getUnsignedDataRef2 = self.newtimer.service_ref.ref.getUnsignedData
-						for x in range(1,5):
+						for x in (1, 2, 3, 4):
 							if getUnsignedDataRef1(x) != getUnsignedDataRef2(x):
 								break;
 						else:
@@ -54,6 +53,7 @@ class TimerSanityCheck:
 		# index -1 for the new Timer, 0..n index of the existing timers
 		# count of running timers
 
+		serviceHandler = eServiceCenter.getInstance()
 		print "checkTimerlist"
 # create a list with all start and end times
 # split it into recurring and singleshot timers
@@ -71,6 +71,10 @@ class TimerSanityCheck:
 			rflags = ((rflags & 0x7F)>> 3)|((rflags & 0x07)<<4)
 			if rflags:
 				begin = self.newtimer.begin % 86400 # map to first day
+				if (self.localtimediff > 0) and ((begin + self.localtimediff) > 86400):
+					rflags = ((rflags >> 1)& 0x3F)|((rflags << 6)& 0x40)
+				elif (self.localtimediff < 0) and (begin < self.localtimediff):
+					rflags = ((rflags << 1)& 0x7E)|((rflags >> 6)& 0x01)
 				while rflags: # then arrange on the week
 					if rflags & 1:
 						self.rep_eventlist.append((begin, -1))
@@ -88,6 +92,10 @@ class TimerSanityCheck:
 					rflags = timer.repeated
 					rflags = ((rflags & 0x7F)>> 3)|((rflags & 0x07)<<4)
 					begin = timer.begin % 86400 # map all to first day
+					if (self.localtimediff > 0) and ((begin + self.localtimediff) > 86400):
+						rflags = ((rflags >> 1)& 0x3F)|((rflags << 6)& 0x40)
+					elif (self.localtimediff < 0) and (begin < self.localtimediff):
+						rflags = ((rflags << 1)& 0x7E)|((rflags >> 6)& 0x01)
 					while rflags:
 						if rflags & 1:
 							self.rep_eventlist.append((begin, idx))
@@ -149,40 +157,58 @@ class TimerSanityCheck:
 		fakeRecList = []
 		ConflictTimer = None
 		ConflictTunerType = None
-		ConflictSlot = None
 		newTimerTunerType = None
-		newTimerTunerSlot = None
 		cnt = 0
 		idx = 0
 		overlaplist = []
 		for event in self.nrep_eventlist:
-			cnt -= event[1]
+			cnt += event[1]
 			if event[2] == -1: # new timer
 				timer = self.newtimer
 			else:
 				timer = self.timerlist[event[2]]
 			if event[1] == self.bflag:
-				fakeRecService = NavigationInstance.instance.recordService(timer.service_ref)
-				fakeRecResult = fakeRecService.start(True)
-				feinfo = fakeRecService.frontendInfo().getFrontendData()
-				tunerType = feinfo.get("tuner_type")
-				tunerSlot = feinfo.get("tuner_number")
+				tunerType = [ ]
+				fakeRecService = NavigationInstance.instance.recordService(timer.service_ref, True)
+				if fakeRecService:
+					fakeRecResult = fakeRecService.start(True)
+				else:
+					fakeRecResult = -1
+				if not fakeRecResult: # tune okay
+					feinfo = fakeRecService.frontendInfo().getFrontendData()
+					tunerType.append(feinfo.get("tuner_type"))
+				else: # tune failed.. so we must go another way to get service type (DVB-S, DVB-T, DVB-C)
+
+					def getServiceType(ref): # helper function to get a service type of a service reference
+						serviceInfo = serviceHandler.info(ref)
+						serviceInfo = serviceInfo and serviceInfo.getInfoObject(ref, iServiceInformation.sTransponderData)
+						return serviceInfo and serviceInfo["tuner_type"] or ""
+
+					ref = timer.service_ref.ref
+					if ref.flags & eServiceReference.isGroup: # service group ?
+						serviceList = serviceHandler.list(ref) # get all alternative services
+						if serviceList:
+							for ref in serviceList.getContent("R"): # iterate over all group service references
+								type = getServiceType(ref)
+								if not type in tunerType: # just add single time
+									tunerType.append(type) 
+					else:
+						tunerType.append(getServiceType(ref))
+
 				if event[2] == -1: # new timer
 					newTimerTunerType = tunerType
-					newTimerTunerSlot = tunerSlot
-				overlaplist.append((fakeRecResult, timer, tunerType, tunerSlot))
+				overlaplist.append((fakeRecResult, timer, tunerType))
 				fakeRecList.append((timer, fakeRecService))
 				if fakeRecResult:
 					if ConflictTimer is None: # just take care of the first conflict
 						ConflictTimer = timer
 						ConflictTunerType = tunerType
-						ConflictTunerSlot = tunerSlot
 			elif event[1] == self.eflag:
 				for fakeRec in fakeRecList:
-					if timer == fakeRec[0]:
+					if timer == fakeRec[0] and fakeRec[1]:
 						NavigationInstance.instance.stopRecordService(fakeRec[1])
 						fakeRecList.remove(fakeRec)
-				del fakeRec
+				fakeRec = None
 				for entry in overlaplist:
 					if entry[1] == timer:
 						overlaplist.remove(entry)
@@ -211,7 +237,6 @@ class TimerSanityCheck:
 						if nt and kt:
 							ConflictTimer = self.newtimer
 							ConflictTunerType = newTimerTunerType
-							ConflictSlot = newTimerTunerSlot
 							break
 
 		self.simultimer = [ ConflictTimer ]
@@ -223,8 +248,11 @@ class TimerSanityCheck:
 				else:
 					continue
 				for entry in event[4]:
-					if not self.simultimer.count(entry[1]) and (entry[2] == ConflictTunerType or entry[3] == ConflictTunerSlot):
-						self.simultimer.append(entry[1])
+					if not entry[1] in self.simultimer:
+						for x in entry[2]:
+							if x in ConflictTunerType:
+								self.simultimer.append(entry[1])
+								break
 
 		if len(self.simultimer) < 2:
 			print "Bug: unknown Conflict!"