Merge branch 'master' of fraxinas@git.opendreambox.org:/git/enigma2

[vuplus_dvbapp] / RecordTimer.py

diff --git a/RecordTimer.py b/RecordTimer.py
index f93872c..28b878a 100644 (file)
--- a/RecordTimer.py
+++ b/RecordTimer.py
@@ -10,7 +10,7 @@ from enigma import eEPGCache, getBestPlayableServiceReference, \
        eServiceReference, iRecordableService, quitMainloop
 
 from Screens.MessageBox import MessageBox
-
+from Components.TimerSanityCheck import TimerSanityCheck
 import NavigationInstance
 
 import Screens.Standby
@@ -91,7 +91,7 @@ class RecordTimerEntry(timer.TimerEntry, object):
                        Notifications.AddNotification(Screens.Standby.TryQuitMainloop, 1, onSessionOpenCallback=RecordTimerEntry.stopTryQuitMainloop, default_yes = default_yes)
 #################################################################
 
-       def __init__(self, serviceref, begin, end, name, description, eit, disabled = False, justplay = False, afterEvent = AFTEREVENT.NONE, checkOldTimers = False, dirname = None):
+       def __init__(self, serviceref, begin, end, name, description, eit, disabled = False, justplay = False, afterEvent = AFTEREVENT.NONE, checkOldTimers = False, dirname = None, tags = None):
                timer.TimerEntry.__init__(self, int(begin), int(end))
 
                if checkOldTimers == True:
@@ -116,7 +116,9 @@ class RecordTimerEntry(timer.TimerEntry, object):
                self.afterEvent = afterEvent
                self.dirname = dirname
                self.dirnameHadToFallback = False
-               
+               self.autoincrease = False
+               self.tags = tags or []
+
                self.log_entries = []
                self.resetState()
        
@@ -191,6 +193,7 @@ class RecordTimerEntry(timer.TimerEntry, object):
                                f.write(self.name + "\n")
                                f.write(self.description + "\n")
                                f.write(str(self.begin) + "\n")
+                               f.write(' '.join(self.tags))
                                f.close()
                        except IOError:
                                self.log(4, "failed to write meta information")
@@ -367,10 +370,14 @@ def createTimer(xml):
                location = xml.getAttribute("location").encode("utf-8")
        else:
                location = None
+       if xml.hasAttribute("tags") and xml.getAttribute("tags"):
+               tags = xml.getAttribute("tags").encode("utf-8").split(' ')
+       else:
+               tags = None
 
        name = xml.getAttribute("name").encode("utf-8")
        #filename = xml.getAttribute("filename").encode("utf-8")
-       entry = RecordTimerEntry(serviceref, begin, end, name, description, eit, disabled, justplay, afterevent, dirname = location)
+       entry = RecordTimerEntry(serviceref, begin, end, name, description, eit, disabled, justplay, afterevent, dirname = location, tags = tags)
        entry.repeated = int(repeated)
        
        for l in elementsWithTag(xml.childNodes, "log"):
@@ -418,8 +425,16 @@ class RecordTimer(timer.Timer):
                        return
 
                root = doc.childNodes[0]
+
+               # put out a message when at least one timer overlaps
+               checkit = True
                for timer in elementsWithTag(root.childNodes, "timer"):
-                       self.record(createTimer(timer))
+                       newTimer = createTimer(timer)
+                       if (self.record(newTimer, True, True) is not None) and (checkit == True):
+                               from Tools.Notifications import AddPopup
+                               from Screens.MessageBox import MessageBox
+                               AddPopup(_("Timer overlap in timers.xml detected!\nPlease recheck it!"), type = MessageBox.TYPE_ERROR, timeout = 0, id = "TimerLoadFailed")
+                               checkit = False # at moment it is enough when the message is displayed one time
 
        def saveTimer(self):
                #doc = xml.dom.minidom.Document()
@@ -483,6 +498,8 @@ class RecordTimer(timer.Timer):
                                list.append(' eit="' + str(timer.eit) + '"')
                        if timer.dirname is not None:
                                list.append(' location="' + str(stringToXML(timer.dirname)) + '"')
+                       if timer.tags is not None:
+                               list.append(' tags="' + str(stringToXML(' '.join(timer.tags))) + '"')
                        list.append(' disabled="' + str(int(timer.disabled)) + '"')
                        list.append(' justplay="' + str(int(timer.justplay)) + '"')
                        list.append('>\n')
@@ -521,12 +538,24 @@ class RecordTimer(timer.Timer):
                        return timer.begin
                return -1
 
-       def record(self, entry):
+       def record(self, entry, ignoreTSC=False, dosave=True):          #wird von loadTimer mit dosave=False aufgerufen
+               timersanitycheck = TimerSanityCheck(self.timer_list,entry)
+               if not timersanitycheck.check():
+                       if ignoreTSC != True:
+                               print "timer conflict detected!"
+                               print timersanitycheck.getSimulTimerList()
+                               return timersanitycheck.getSimulTimerList()
+                       else:
+                               print "ignore timer conflict"
+               elif timersanitycheck.doubleCheck():
+                       print "ignore double timer"
                entry.timeChanged()
                print "[Timer] Record " + str(entry)
                entry.Timer = self
                self.addTimerEntry(entry)
-               self.saveTimer()
+               if dosave:
+                       self.saveTimer()
+               return None
                
        def isInTimer(self, eventid, begin, duration, service):
                time_match = 0