don't add timers that are based on epg data, which are older than 14 days

diff --git a/lib/python/Screens/EpgSelection.py b/lib/python/Screens/EpgSelection.py
index 3dbba0fd6b162b4e619b25af7dc1cc41bae7d132..ffbea9a024118fe064c748ca83f387ac3c11f7b9 100644 (file)
--- a/lib/python/Screens/EpgSelection.py
+++ b/lib/python/Screens/EpgSelection.py
@@ -14,7 +14,7 @@ from TimerEdit import TimerEditList
 from TimerEntry import TimerEntry
 from ServiceReference import ServiceReference
 from Components.config import config, currentConfigSelectionElement
 from TimerEntry import TimerEntry
 from ServiceReference import ServiceReference
 from Components.config import config, currentConfigSelectionElement

-from time import localtime
+from time import localtime, time

 
 import xml.dom.minidom
 
 
 import xml.dom.minidom
 


@@ -184,7 +184,7 @@ class EPGSelection(Screen):
                        serviceref = cur[1]
                if event is None:
                        return
                        serviceref = cur[1]
                if event is None:
                        return

-               newEntry = RecordTimerEntry(serviceref, *parseEvent(event))
+               newEntry = RecordTimerEntry(serviceref, checkOldTimers = True, *parseEvent(event))

                self.session.openWithCallback(self.timerEditFinished, TimerEntry, newEntry)
 
        def timerEditFinished(self, answer):
                self.session.openWithCallback(self.timerEditFinished, TimerEntry, newEntry)
 
        def timerEditFinished(self, answer):

diff --git a/lib/python/Screens/EventView.py b/lib/python/Screens/EventView.py
index 05f2b1e3aff401e61b7432a4d6b6d509e2abb581..6563daa1fe5e4d46062cdde7fa3e6714c4243ba1 100644 (file)
--- a/lib/python/Screens/EventView.py
+++ b/lib/python/Screens/EventView.py
@@ -59,7 +59,7 @@ class EventViewBase:
 
        def timerAdd(self):
                if not self.isRecording:
 
        def timerAdd(self):
                if not self.isRecording:

-                       newEntry = RecordTimerEntry(self.currentService, *parseEvent(self.event))
+                       newEntry = RecordTimerEntry(self.currentService, checkOldTimers = True, *parseEvent(self.event))

                        self.session.openWithCallback(self.timerEditFinished, TimerEntry, newEntry)
 
        def timerEditFinished(self, answer):
                        self.session.openWithCallback(self.timerEditFinished, TimerEntry, newEntry)
 
        def timerEditFinished(self, answer):

diff --git a/lib/python/Screens/TimerEdit.py b/lib/python/Screens/TimerEdit.py
index ece9dc4ca12cbee4b788f1fa48b7a67c6714656d..3eae8162a126f265d6b468e65af103d58f5b0aca 100644 (file)
--- a/lib/python/Screens/TimerEdit.py
+++ b/lib/python/Screens/TimerEdit.py
@@ -139,7 +139,7 @@ class TimerEditList(Screen):
                else:
                        data = parseEvent(event)
 
                else:
                        data = parseEvent(event)
 

-               self.addTimer(RecordTimerEntry(serviceref, *data))
+               self.addTimer(RecordTimerEntry(serviceref, checkOldTimers = True, *data))

                
        def addTimer(self, timer):
                self.session.openWithCallback(self.finishedAdd, TimerEntry, timer)
                
        def addTimer(self, timer):
                self.session.openWithCallback(self.finishedAdd, TimerEntry, timer)