X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/dfbd5853de864053e8ac10d1269e8137f3cb5a34..cac26b7fed73c832e8af35cc44830ef4a8f34d5a:/RecordTimer.py
diff --git a/RecordTimer.py b/RecordTimer.py
index 9f78ff24..f41a4857 100644
--- a/RecordTimer.py
+++ b/RecordTimer.py
@@ -10,8 +10,9 @@ 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 Tools.XMLTools import elementsWithTag, mergeText, stringToXML
from ServiceReference import ServiceReference
# ok, for descriptions etc we have:
@@ -237,9 +238,6 @@ class RecordTimer(timer.Timer):
for timer in elementsWithTag(root.childNodes, "timer"):
self.record(createTimer(timer))
- def strToXML(self, str):
- return str.replace('&', '&').replace('<', '<').replace('>', '>').replace("'", '''). replace('"', '&qout;')
-
def saveTimer(self):
#doc = xml.dom.minidom.Document()
#root_element = doc.createElement('timers')
@@ -295,20 +293,20 @@ class RecordTimer(timer.Timer):
list.append(' end="' + str(int(timer.end)) + '"')
list.append(' serviceref="' + str(timer.service_ref) + '"')
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(' name="' + str(stringToXML(timer.name)) + '"')
+ list.append(' description="' + str(stringToXML(timer.description)) + '"')
if timer.eit is not None:
list.append(' eit="' + str(timer.eit) + '"')
list.append(' disabled="' + str(int(timer.disabled)) + '"')
list.append('>\n')
- for time, code, msg in timer.log_entries:
- list.append('')
- list.append(str(msg))
- list.append('\n')
+ #for time, code, msg in timer.log_entries:
+ #list.append('')
+ #list.append(str(msg))
+ #list.append('\n')
list.append('\n')
@@ -330,13 +328,21 @@ class RecordTimer(timer.Timer):
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:
+ #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
+ else: #if x.eit is None:
end = begin + duration
if begin <= x.begin <= end:
diff = end - x.begin