X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/0a23feb1aebe448bd4b063a5fa1253ac40a40503..516e72712b0aaff0cd6dc050a3e35d86ff21b31f:/RecordTimer.py

diff --git a/RecordTimer.py b/RecordTimer.py
index 1e2aca1d..f41a4857 100644
--- a/RecordTimer.py
+++ b/RecordTimer.py
@@ -10,8 +10,9 @@ 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 Tools.XMLTools import elementsWithTag, mergeText, stringToXML
 from ServiceReference import ServiceReference
 
 # ok, for descriptions etc we have:
@@ -22,12 +23,15 @@ from ServiceReference import ServiceReference
 
 
 # parses an event, and gives out a (begin, end, name, duration, eit)-tuple.
+# begin and end will be corrected
 def parseEvent(ev):
 	name = ev.getEventName()
 	description = ev.getShortDescription()
 	begin = ev.getBeginTime()
 	end = begin + ev.getDuration()
 	eit = ev.getEventId()
+	begin -= config.recording.margin_before.value[0] * 60
+	end += config.recording.margin_after.value[0] * 60
 	return (begin, end, name, description, eit)
 
 # please do not translate log messages
@@ -83,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
@@ -186,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)
@@ -202,7 +207,7 @@ def createTimer(xml):
 	for l in elementsWithTag(xml.childNodes, "log"):
 		time = int(l.getAttribute("time"))
 		code = int(l.getAttribute("code"))
-		msg = mergeText(l.childNodes).strip()
+		msg = mergeText(l.childNodes).strip().encode("utf-8")
 		entry.log_entries.append((time, code, msg))
 	
 	return entry
@@ -217,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:
@@ -233,9 +238,6 @@ class RecordTimer(timer.Timer):
 		for timer in elementsWithTag(root.childNodes, "timer"):
 			self.record(createTimer(timer))
 
-	def strToXML(self, str):
-		return str.replace('&', '&amp;').replace('<', '&lt;').replace('>', '&gt;').replace("'", '&apos;'). replace('"', '&qout;')
-
 	def saveTimer(self):
 		#doc = xml.dom.minidom.Document()
 		#root_element = doc.createElement('timers')
@@ -291,19 +293,20 @@ class RecordTimer(timer.Timer):
 			list.append(' end="' + str(int(timer.end)) + '"')
 			list.append(' serviceref="' + str(timer.service_ref) + '"')
 			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) + '"')
+			list.append(' name="' + str(stringToXML(timer.name)) + '"')
+			list.append(' description="' + str(stringToXML(timer.description)) + '"')
+			if timer.eit is not None:
+				list.append(' eit="' + str(timer.eit) + '"')
 			list.append(' disabled="' + str(int(timer.disabled)) + '"')
 			list.append('>\n')
 			
-			for time, code, msg in timer.log_entries:
-				list.append('<log')
-				list.append(' code="' + str(code) + '"')
-				list.append(' time="' + str(time) + '"')
-				list.append('>')
-				list.append(str(msg))
-				list.append('</log>\n')
+			#for time, code, msg in timer.log_entries:
+				#list.append('<log')
+				#list.append(' code="' + str(code) + '"')
+				#list.append(' time="' + str(time) + '"')
+				#list.append('>')
+				#list.append(str(msg))
+				#list.append('</log>\n')
 
 			
 			list.append('</timer>\n')
@@ -320,6 +323,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
+				else: #if 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)