Merge commit 'origin/translations' into experimental

[enigma2.git] / Navigation.py

diff --git a/Navigation.py b/Navigation.py
index ece892275a6458f74614cb3e9a07ba57aecf9356..2437bbf5ecf5e4c594f2e7aafba7657a4d6bfa2b 100644 (file)
--- a/Navigation.py
+++ b/Navigation.py
@@ -1,17 +1,17 @@
-from enigma import eServiceCenter, eServiceReference, pNavigation, getBestPlayableServiceReference
+from enigma import eServiceCenter, eServiceReference, pNavigation, getBestPlayableServiceReference, iPlayableService

 from Components.ParentalControl import parentalControl
 from Tools.BoundFunction import boundFunction
 from Components.ParentalControl import parentalControl
 from Tools.BoundFunction import boundFunction

+from Tools.DreamboxHardware import setFPWakeuptime, getFPWakeuptime, getFPWasTimerWakeup, clearFPWasTimerWakeup
+from time import time

 import RecordTimer
 import SleepTimer
 import RecordTimer
 import SleepTimer

-
+import Screens.Standby

 import NavigationInstance
 import ServiceReference
 
 import NavigationInstance
 import ServiceReference
 

-from time import time
-

 # TODO: remove pNavgation, eNavigation and rewrite this stuff in python.
 class Navigation:
 # TODO: remove pNavgation, eNavigation and rewrite this stuff in python.
 class Navigation:

-       def __init__(self):
+       def __init__(self, nextRecordTimerAfterEventActionAuto=False):

                if NavigationInstance.instance is not None:
                        raise NavigationInstance.instance
                
                if NavigationInstance.instance is not None:
                        raise NavigationInstance.instance
                


@@ -28,40 +28,49 @@ class Navigation:
                self.record_event = [ ]
                self.currentlyPlayingServiceReference = None
                self.currentlyPlayingService = None
                self.record_event = [ ]
                self.currentlyPlayingServiceReference = None
                self.currentlyPlayingService = None

-               self.state = 0

                self.RecordTimer = RecordTimer.RecordTimer()
                self.RecordTimer = RecordTimer.RecordTimer()

+               if getFPWasTimerWakeup():
+                       clearFPWasTimerWakeup()
+                       if getFPWasTimerWakeup(): # sanity check to detect if the FP driver is working correct!
+                               print "buggy fp driver detected!!! please update drivers.... ignore timer wakeup!"
+                       elif nextRecordTimerAfterEventActionAuto and (len(self.getRecordings()) or abs(self.RecordTimer.getNextRecordingTime() - time()) <= 360):
+                               if not Screens.Standby.inTryQuitMainloop: # not a shutdown messagebox is open
+                                       RecordTimer.RecordTimerEntry.TryQuitMainloop(False) # start shutdown handling

                self.SleepTimer = SleepTimer.SleepTimer()
 
        def dispatchEvent(self, i):
                self.SleepTimer = SleepTimer.SleepTimer()
 
        def dispatchEvent(self, i):

-               self.state = i != 1

                for x in self.event:
                        x(i)
                for x in self.event:
                        x(i)

+               if i == iPlayableService.evEnd:
+                       self.currentlyPlayingServiceReference = None
+                       self.currentlyPlayingService = None

 
        def dispatchRecordEvent(self, rec_service, event):
 #              print "record_event", rec_service, event
                for x in self.record_event:
                        x(rec_service, event)
 
 
        def dispatchRecordEvent(self, rec_service, event):
 #              print "record_event", rec_service, event
                for x in self.record_event:
                        x(rec_service, event)
 

-       def playService(self, ref, checkParentalControl = True):
+       def playService(self, ref, checkParentalControl = True, forceRestart = False):

                oldref = self.currentlyPlayingServiceReference
                oldref = self.currentlyPlayingServiceReference

+               if ref and oldref and ref == oldref and not forceRestart:
+                       print "ignore request to play already running service"
+                       return 0

                print "playing", ref and ref.toString()
                print "playing", ref and ref.toString()

-               self.currentlyPlayingServiceReference = None
-               self.currentlyPlayingService = None

                if ref is None:
                        self.stopService()
                        return 0
                if ref is None:
                        self.stopService()
                        return 0

-               if not checkParentalControl or parentalControl.isServicePlayable(ref.toCompareString(), boundFunction(self.playService, checkParentalControl = False)):
+               if not checkParentalControl or parentalControl.isServicePlayable(ref, boundFunction(self.playService, checkParentalControl = False)):

                        if ref.flags & eServiceReference.isGroup:
                                if not oldref:
                                        oldref = eServiceReference()
                                playref = getBestPlayableServiceReference(ref, oldref)
                        if ref.flags & eServiceReference.isGroup:
                                if not oldref:
                                        oldref = eServiceReference()
                                playref = getBestPlayableServiceReference(ref, oldref)

-                               if not playref or (checkParentalControl and not parentalControl.isServicePlayable(playref.toCompareString(), boundFunction(self.playService, checkParentalControl = False))):
+                               if not playref or (checkParentalControl and not parentalControl.isServicePlayable(playref, boundFunction(self.playService, checkParentalControl = False))):

                                        self.stopService()
                                        return 0
                        else:
                                playref = ref
                        if self.pnav and not self.pnav.playService(playref):
                                        self.stopService()
                                        return 0
                        else:
                                playref = ref
                        if self.pnav and not self.pnav.playService(playref):

-                               self.currentlyPlayingServiceReference = ref
+                               self.currentlyPlayingServiceReference = playref

                                return 0
                else:
                        self.stopService()
                                return 0
                else:
                        self.stopService()


@@ -70,15 +79,15 @@ class Navigation:
        def getCurrentlyPlayingServiceReference(self):
                return self.currentlyPlayingServiceReference
        
        def getCurrentlyPlayingServiceReference(self):
                return self.currentlyPlayingServiceReference
        

-       def recordService(self, ref):
+       def recordService(self, ref, simulate=False):

                service = None
                print "recording service: %s" % (str(ref))
                if isinstance(ref, ServiceReference.ServiceReference):
                        ref = ref.ref
                if ref:
                        if ref.flags & eServiceReference.isGroup:
                service = None
                print "recording service: %s" % (str(ref))
                if isinstance(ref, ServiceReference.ServiceReference):
                        ref = ref.ref
                if ref:
                        if ref.flags & eServiceReference.isGroup:

-                               ref = getBestPlayableServiceReference(ref, eServiceReference())
-                       service = ref and self.pnav and self.pnav.recordService(ref)
+                               ref = getBestPlayableServiceReference(ref, eServiceReference(), simulate)
+                       service = ref and self.pnav and self.pnav.recordService(ref, simulate)

                        if service is None:
                                print "record returned non-zero"
                return service
                        if service is None:
                                print "record returned non-zero"
                return service


@@ -87,33 +96,22 @@ class Navigation:
                ret = self.pnav and self.pnav.stopRecordService(service)
                return ret
 
                ret = self.pnav and self.pnav.stopRecordService(service)
                return ret
 

-       def getRecordings(self):
-               return self.pnav and self.pnav.getRecordings()
+       def getRecordings(self, simulate=False):
+               return self.pnav and self.pnav.getRecordings(simulate)

 
        def getCurrentService(self):
 
        def getCurrentService(self):

-               if self.state:
-                       if not self.currentlyPlayingService:
-                               self.currentlyPlayingService = self.pnav and self.pnav.getCurrentService()
-                       return self.currentlyPlayingService
-               return None
+               if not self.currentlyPlayingService:
+                       self.currentlyPlayingService = self.pnav and self.pnav.getCurrentService()
+               return self.currentlyPlayingService

 
        def stopService(self):
                print "stopService"
                if self.pnav:
                        self.pnav.stopService()
 
        def stopService(self):
                print "stopService"
                if self.pnav:
                        self.pnav.stopService()

-               self.currentlyPlayingService = None
-               self.currentlyPlayingServiceReference = None

 
        def pause(self, p):
                return self.pnav and self.pnav.pause(p)
 
 
        def pause(self, p):
                return self.pnav and self.pnav.pause(p)
 

-       def recordWithTimer(self, ref, begin, end, name, description, eit):
-               if isinstance(ref, eServiceReference):
-                       ref = ServiceReference.ServiceReference(ref)
-               entry = RecordTimer.RecordTimerEntry(ref, begin, end, name, description, eit)
-               self.RecordTimer.record(entry)
-               return entry
-       

        def shutdown(self):
                self.RecordTimer.shutdown()
                self.ServiceHandler = None
        def shutdown(self):
                self.RecordTimer.shutdown()
                self.ServiceHandler = None