Merge branch 'master' into enigma2_rel25

[enigma2.git] / mytest.py

diff --git a/mytest.py b/mytest.py
index d58649cfafe45126ccf7a0f918803706058ace58..886efab2fca53b56f9308e69f1d011cfe014ca53 100644 (file)
--- a/mytest.py
+++ b/mytest.py
@@ -1,7 +1,9 @@
+import eConsoleImpl
 import eBaseImpl
 import enigma
 enigma.eTimer = eBaseImpl.eTimer
 enigma.eSocketNotifier = eBaseImpl.eSocketNotifier
+enigma.eConsoleAppContainer = eConsoleImpl.eConsoleAppContainer
 
 from Tools.Profile import profile, profile_final
 
@@ -36,17 +38,18 @@ profile("LOAD:Navigation")
 from Navigation import Navigation
 
 profile("LOAD:skin")
-from skin import readSkin, applyAllAttributes
+from skin import readSkin
 
 profile("LOAD:Tools")
 from Tools.Directories import InitFallbackFiles, resolveFilename, SCOPE_PLUGINS, SCOPE_SKIN_IMAGE
-from Components.config import config, configfile, ConfigText, ConfigSubsection, ConfigInteger
+from Components.config import config, configfile, ConfigText, ConfigYesNo
 InitFallbackFiles()
 
 profile("ReloadProfiles")
 eDVBDB.getInstance().reloadBouquets()
 
 config.misc.radiopic = ConfigText(default = resolveFilename(SCOPE_SKIN_IMAGE)+"radio.mvi")
+config.misc.isNextRecordTimerAfterEventActionAuto = ConfigYesNo(default=False)
 
 profile("Twisted")
 try:
@@ -59,7 +62,7 @@ try:
        from twisted.internet import reactor
 
        def runReactor():
-               reactor.run()
+               reactor.run(installSignalHandlers=False)
 except ImportError:
        print "twisted not available"
        def runReactor():
@@ -72,10 +75,11 @@ from Components.PluginComponent import plugins
 
 profile("LOAD:Wizard")
 from Screens.Wizard import wizardManager
+from Screens.DefaultWizard import *
 from Screens.ImageWizard import *
 from Screens.StartWizard import *
-from Screens.DefaultWizard import *
 from Screens.TutorialWizard import *
+import Screens.Rc
 from Tools.BoundFunction import boundFunction
 from Plugins.Plugin import PluginDescriptor
 
@@ -412,7 +416,8 @@ def runScreenTest():
        plugins.readPluginList(resolveFilename(SCOPE_PLUGINS))
 
        profile("Init:Session")
-       session = Session(desktop = getDesktop(0), summary_desktop = getDesktop(1), navigation = Navigation())
+       nav = Navigation(config.misc.isNextRecordTimerAfterEventActionAuto.value)
+       session = Session(desktop = getDesktop(0), summary_desktop = getDesktop(1), navigation = nav)
 
        CiHandler.setSession(session)
 
@@ -461,33 +466,39 @@ def runScreenTest():
        profile("RunReactor")
        profile_final()
        runReactor()
-       profile("configfile.save")
-       configfile.save()
 
        profile("wakeup")
        from time import time
-       from Tools.DreamboxHardware import setFPWakeuptime
+       from Tools.DreamboxHardware import setFPWakeuptime, getFPWakeuptime
        #get currentTime
        nowTime = time()
        wakeupList = [
-               x for x in
-                               [session.nav.RecordTimer.getNextRecordingTime(),
-                               session.nav.RecordTimer.getNextZapTime(),
-                               plugins.getNextWakeupTime()]
-               if x != -1
+               x for x in ((session.nav.RecordTimer.getNextRecordingTime(), 0, session.nav.RecordTimer.isNextRecordAfterEventActionAuto()),
+                                       (session.nav.RecordTimer.getNextZapTime(), 1),
+                                       (plugins.getNextWakeupTime(), 2))
+               if x[0] != -1
        ]
        wakeupList.sort()
+       recordTimerWakeupAuto = False
        if len(wakeupList):
                startTime = wakeupList.pop(0)
-               if (startTime - nowTime < 330): # no time to switch box back on
-                       setFPWakeuptime(nowTime + 30) # so switch back on in 30 seconds
+               if (startTime[0] - nowTime) < 330: # no time to switch box back on
+                       wptime = nowTime + 30  # so switch back on in 30 seconds
                else:
-                       setFPWakeuptime(startTime - 300)
+                       wptime = startTime[0] - 300
+               setFPWakeuptime(wptime)
+               recordTimerWakeupAuto = startTime[1] == 0 and startTime[2]
+       config.misc.isNextRecordTimerAfterEventActionAuto.value = recordTimerWakeupAuto
+       config.misc.isNextRecordTimerAfterEventActionAuto.save()
+
        profile("stopService")
        session.nav.stopService()
        profile("nav shutdown")
        session.nav.shutdown()
 
+       profile("configfile.save")
+       configfile.save()
+
        return 0
 
 profile("Init:skin")