X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/a3ccac772dd40db6e4878f1a818dfb346ac27341..8d8279d975474b1cb8befad8d67df26de4104f20:/RecordTimer.py

diff --git a/RecordTimer.py b/RecordTimer.py
index 2835a388..2fb923ba 100644
--- a/RecordTimer.py
+++ b/RecordTimer.py
@@ -10,6 +10,7 @@ import xml.dom.minidom
 from Screens.MessageBox import MessageBox
 from Screens.SubserviceSelection import SubserviceSelection
 import NavigationInstance
+from time import localtime
 
 from Tools.XMLTools import elementsWithTag, mergeText
 from ServiceReference import ServiceReference
@@ -86,7 +87,10 @@ class RecordTimerEntry(timer.TimerEntry):
 			self.log(1, "'record service' failed")
 			return False
 		else:
-			prep_res = self.record_service.prepare(self.Filename + ".ts")
+			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
@@ -189,14 +193,12 @@ def createTimer(xml):
 	serviceref = ServiceReference(str(xml.getAttribute("serviceref")))
 	description = xml.getAttribute("description").encode("utf-8")
 	repeated = xml.getAttribute("repeated").encode("utf-8")
-	try:
-		disabled = eval(xml.getAttribute("disabled"))
-	except:
-		disabled = False
-	try:
-		eit = long(xml.getAttribute("eit").encode("utf-8"))
-	except:
+	disabled = long(xml.getAttribute("disabled") or "0")
+	if xml.hasAttribute("eit") and xml.getAttribute("eit") != "None":
+		eit = long(xml.getAttribute("eit"))
+	else:
 		eit = None
+	
 	name = xml.getAttribute("name").encode("utf-8")
 	#filename = xml.getAttribute("filename").encode("utf-8")
 	entry = RecordTimerEntry(serviceref, begin, end, name, description, eit, disabled)
@@ -220,7 +222,7 @@ class RecordTimer(timer.Timer):
 			self.loadTimer()
 		except IOError:
 			print "unable to load timers from file!"
-
+			
 	def isRecording(self):
 		isRunning = False
 		for timer in self.timer_list:
@@ -296,7 +298,8 @@ class RecordTimer(timer.Timer):
 			list.append(' repeated="' + str(int(timer.repeated)) + '"')
 			list.append(' name="' + str(self.strToXML(timer.name)) + '"')
 			list.append(' description="' + str(self.strToXML(timer.description)) + '"')
-			list.append(' eit="' + str(timer.eit) + '"')
+			if timer.eit is not None:
+				list.append(' eit="' + str(timer.eit) + '"')
 			list.append(' disabled="' + str(int(timer.disabled)) + '"')
 			list.append('>\n')
 			
@@ -323,6 +326,40 @@ class RecordTimer(timer.Timer):
 		print "[Timer] Record " + str(entry)
 		entry.Timer = self
 		self.addTimerEntry(entry)
+		
+	def isInTimer(self, eventid, begin, duration, service):
+		time_match = 0
+		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)
+					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 x.eit is None:
+					end = begin + duration
+					if begin <= x.begin <= end:
+						diff = end - x.begin
+						if time_match < diff:
+							time_match = diff
+					elif x.begin <= begin <= x.end:
+						diff = x.end - begin
+						if time_match < diff:
+							time_match = diff
+		return time_match
+							
+						
+						
+			
 
 	def removeEntry(self, entry):
 		print "[Timer] Remove " + str(entry)