X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/be296b411e8fc29f652799bf752d80db374d6672..af6a8a3a102ff0230fcc6d90ad213e2e7d706fa8:/RecordTimer.py
diff --git a/RecordTimer.py b/RecordTimer.py
index 08ea8590..3d9ff8ef 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
@@ -302,13 +303,13 @@ class RecordTimer(timer.Timer):
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')
@@ -325,6 +326,40 @@ class RecordTimer(timer.Timer):
print "[Timer] Record " + str(entry)
entry.Timer = self
self.addTimerEntry(entry)
+
+ def isInTimer(self, eventid, begin, duration, service):
+ 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
+ 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:
+ diff = end - x.begin
+ if time_match < diff:
+ time_match = diff
+ elif x.begin <= begin <= x.end:
+ diff = x.end - begin
+ if time_match < diff:
+ time_match = diff
+ return time_match
+
+
+
+
def removeEntry(self, entry):
print "[Timer] Remove " + str(entry)