X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/57b2443810050abf1b81172d0fb1365c836c82b4..35eb65423843d8e6aa8b614aaa4a39fa0b06993d:/RecordTimer.py

diff --git a/RecordTimer.py b/RecordTimer.py
index e047075f..4cfada5a 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)
 	
@@ -183,7 +189,10 @@ def createTimer(xml):
 	serviceref = ServiceReference(str(xml.getAttribute("serviceref")))
 	description = xml.getAttribute("description").encode("utf-8")
 	repeated = xml.getAttribute("repeated").encode("utf-8")
-	disabled = eval(xml.getAttribute("disabled"))
+	try:
+		disabled = eval(xml.getAttribute("disabled"))
+	except:
+		disabled = False
 	try:
 		eit = long(xml.getAttribute("eit").encode("utf-8"))
 	except:
@@ -277,6 +286,9 @@ class RecordTimer(timer.Timer):
 		list.append('<timers>\n')
 		
 		for timer in self.timer_list + self.processed_timers:
+			if timer.dontSave:
+				continue
+
 			list.append('<timer')
 			list.append(' begin="' + str(int(timer.begin)) + '"')
 			list.append(' end="' + str(int(timer.end)) + '"')