X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/e9df68d0ed6ba7a8da987282f4bfae3824b8eb29..8d8279d975474b1cb8befad8d67df26de4104f20:/RecordTimer.py

diff --git a/RecordTimer.py b/RecordTimer.py
index 4c3304c7..2fb923ba 100644
--- a/RecordTimer.py
+++ b/RecordTimer.py
@@ -10,6 +10,7 @@ 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 ServiceReference import ServiceReference
@@ -328,14 +329,22 @@ class RecordTimer(timer.Timer):
 		
 	def isInTimer(self, eventid, begin, duration, service):
 		time_match = 0
-		for x in self.timer:
-			if x.service_ref == service:
-				if x.eit is not None and x.repeated == 0:
-					if x.eit == eventid:
-						return duration
-				elif x.repeated != 0:
-					# TODO: implement!
-					pass
+		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
 				elif x.eit is None:
 					end = begin + duration
 					if begin <= x.begin <= end: