X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/1491d0aae0f1340a296ad9a764fdf2001f813ad6..dfbd5853de864053e8ac10d1269e8137f3cb5a34:/RecordTimer.py

diff --git a/RecordTimer.py b/RecordTimer.py
index bb42efc9..9f78ff24 100644
--- a/RecordTimer.py
+++ b/RecordTimer.py
@@ -22,12 +22,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
@@ -61,15 +64,18 @@ class RecordTimerEntry(timer.TimerEntry):
 	
 	def calculateFilename(self):
 		service_name = self.service_ref.getServiceName()
-#		begin_date = datetime.fromtimestamp(begin).strf...
-		begin_date = ""
+		begin_date = time.strftime("%Y%m%d %H%M", time.localtime(self.begin))
 		
 		print "begin_date: ", begin_date
 		print "service_name: ", service_name
 		print "name:", self.name
 		print "description: ", self.description
+		
+		filename = begin_date + " - " + service_name
+		if self.name:
+			filename += " - " + self.name
 
-		self.Filename = Directories.getRecordingFilename(service_name)
+		self.Filename = Directories.getRecordingFilename(filename)
 		self.log(0, "Filename calculated as: '%s'" % self.Filename)
 		#begin_date + " - " + service_name + description)
 	
@@ -80,7 +86,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
@@ -183,14 +192,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)
@@ -199,7 +206,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
@@ -214,7 +221,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:
@@ -290,7 +297,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')
 			
@@ -317,6 +325,32 @@ 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
+				elif x.repeated != 0:
+					# TODO: implement!
+					pass
+				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)