append, don't overwrite __init__.py files

[enigma2.git] / lib / python / Components / EventInfo.py

diff --git a/lib/python/Components/EventInfo.py b/lib/python/Components/EventInfo.py
index ce13ba856ea7fc7411772a1bf28315b999f24f15..69487b5fa97ce81938f125551f45d3f6d6b1fa4a 100644 (file)
--- a/lib/python/Components/EventInfo.py
+++ b/lib/python/Components/EventInfo.py
@@ -11,16 +11,20 @@ class EventInfo(PerServiceDisplay):
        Next_Duration = 3
        Now_StartTime = 4
        Next_StartTime = 5
+       Now_Remaining = 6
        
        def __init__(self, navcore, now_or_next):
-               # listen to evUpdatedEventInfo and evStopService
-               # note that evStopService will be called once to establish a known state
+               # listen to evUpdatedEventInfo and evEnd
+               # note that evEnd will be called once to establish a known state
                self.now_or_next = now_or_next
                PerServiceDisplay.__init__(self, navcore, 
                        { 
-                               pNavigation.evUpdatedEventInfo: self.ourEvent, 
-                               pNavigation.evStopService: self.stopEvent 
+                               iPlayableService.evUpdatedEventInfo: self.ourEvent, 
+                               iPlayableService.evEnd: self.stopEvent 
                        })
+               
+               if now_or_next in [self.Now_Remaining]:
+                       self.enablePolling()
 
        def ourEvent(self):
                info = iServiceInformationPtr()
@@ -33,34 +37,37 @@ class EventInfo(PerServiceDisplay):
                                if ev is not None:
                                        self.update(ev)
 
-
        def update(self, ev):
-               if (self.Now_Duration <= self.now_or_next <= self.Next_Duration):
+               if self.now_or_next == self.Now_Remaining and ev.getBeginTime() <= time() <= (ev.getBeginTime() + ev.getDuration()):
+                       self.setText("+%d min" % ((ev.getBeginTime() + ev.getDuration() - time()) / 60))
+               elif self.now_or_next in [self.Now_Duration, self.Next_Duration, self.Now_Remaining]:
                        self.setText("%d min" % (ev.getDuration() / 60))
-               if (self.Now_StartTime <= self.now_or_next <= self.Next_StartTime):
+               elif self.now_or_next in [self.Now_StartTime, self.Next_StartTime]:
                        self.setText(strftime("%H:%M", localtime(ev.getBeginTime())))
-               if (self.Now <= self.now_or_next <= self.Next):
+               elif self.now_or_next in [self.Now, self.Next]:
                        self.setText(ev.getEventName())         
 
        def stopEvent(self):
                self.setText(
-                       #(_("waiting for event data..."), "", "--:--",  "--:--", "--:--", "--:--")[self.now_or_next]);
-                       ("", "", "--:--",  "--:--", "--:--", "--:--")[self.now_or_next]);
+                       ("", "", "",  "", "--:--", "--:--", "")[self.now_or_next]);
 
+       def poll(self):
+               self.ourEvent()
 
 class EventInfoProgress(PerServiceDisplayProgress, EventInfo):
        def __init__(self, navcore, now_or_next):
                self.now_or_next = now_or_next
                PerServiceDisplayProgress.__init__(self, navcore, 
                        { 
-                               pNavigation.evUpdatedEventInfo: self.ourEvent, 
-                               pNavigation.evStopService: self.stopEvent 
+                               iPlayableService.evUpdatedEventInfo: self.ourEvent, 
+                               iPlayableService.evEnd: self.stopEvent 
                        })
 
        def update(self, ev):
                self.g.setRange(0, ev.getDuration())
                progress = int(time() - ev.getBeginTime())
-               
+
                self.setValue(progress)
                
-               
\ No newline at end of file
+       def stopEvent(self):
+               self.setValue(0)