X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/435dfb5a2e49ec3957f05359e883f3246481fdf6..781220c0da56eb1ccbed096fc731da9161d654a3:/RecordTimer.py

diff --git a/RecordTimer.py b/RecordTimer.py
index 19ec9db5..9bb1da71 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,14 +189,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 +203,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
@@ -280,6 +284,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)) + '"')
@@ -287,7 +294,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')