X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/6ae5d719b93de2e8897a660ac61b0e9c5a190dde..ca3361067f6e74db5765978bb6f41eaefc5f2c7e:/RecordTimer.py

diff --git a/RecordTimer.py b/RecordTimer.py
index d72197cd..e8b76e92 100644
--- a/RecordTimer.py
+++ b/RecordTimer.py
@@ -184,24 +184,12 @@ class RecordTimerEntry(timer.TimerEntry, object):
 				if event_id is None:
 					event_id = -1
 
-			prep_res=self.record_service.prepare(self.Filename + ".ts", self.begin, self.end, event_id)
+			prep_res=self.record_service.prepare(self.Filename + ".ts", self.begin, self.end, event_id, self.name.replace("\n", ""), self.description.replace("\n", ""), ' '.join(self.tags))
 			if prep_res:
-				self.log(2, "'prepare' failed: error %d" % prep_res)
-				NavigationInstance.instance.stopRecordService(self.record_service)
-				self.record_service = None
-				return False
-
-			self.log(3, "prepare ok, writing meta information to %s" % self.Filename)
-			try:
-				f = open(self.Filename + ".ts.meta", "w")
-				f.write(rec_ref.toString() + "\n")
-				f.write(self.name.replace("\n", "") + "\n")
-				f.write(self.description.replace("\n", "") + "\n")
-				f.write(str(self.begin) + "\n")
-				f.write(' '.join(self.tags))
-				f.close()
-			except IOError:
-				self.log(4, "failed to write meta information")
+				if prep_res == 255:
+					self.log(4, "failed to write meta information")
+				else:
+					self.log(2, "'prepare' failed: error %d" % prep_res)
 				NavigationInstance.instance.stopRecordService(self.record_service)
 				self.record_service = None
 				return False
@@ -661,7 +649,7 @@ class RecordTimer(timer.Timer):
 						chktimecmp_end = chktimecmp + (duration / 60)
 					time = localtime(x.begin)
 					for y in (0, 1, 2, 3, 4, 5, 6):
-						if x.repeated & (2 ** y):
+						if x.repeated & (2 ** y) and (x.begin <= begin or begin <= x.begin <= end):
 							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