X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/51550aa81c726aedfa7159af0e67f8bcd5fb8a2f..1446dc7551cab6dfac53dda7eb8a8c3b3182cf48:/mytest.py

diff --git a/mytest.py b/mytest.py
old mode 100644
new mode 100755
index 8c900c18..c335bf2d
--- 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
 
@@ -40,13 +42,14 @@ 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
+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,10 @@ from Components.PluginComponent import plugins
 
 profile("LOAD:Wizard")
 from Screens.Wizard import wizardManager
-from Screens.ImageWizard import *
-from Screens.StartWizard import *
 from Screens.DefaultWizard import *
+from Screens.StartWizard import *
 from Screens.TutorialWizard import *
+import Screens.Rc
 from Tools.BoundFunction import boundFunction
 from Plugins.Plugin import PluginDescriptor
 
@@ -273,7 +276,7 @@ class Session:
 
 	def open(self, screen, *arguments, **kwargs):
 		if len(self.dialog_stack) and not self.in_exec:
-			raise "modal open are allowed only from a screen which is modal!"
+			raise RuntimeError("modal open are allowed only from a screen which is modal!")
 			# ...unless it's the very first screen.
 
 		self.pushCurrent()
@@ -317,7 +320,6 @@ class Session:
 profile("Standby,PowerKey")
 import Screens.Standby
 from Screens.Menu import MainMenu, mdom
-import xml.dom.minidom
 from GlobalActions import globalActionMap
 
 class PowerKey:
@@ -340,27 +342,25 @@ class PowerKey:
 			self.session.open(Screens.Standby.TryQuitMainloop, 1)
 
 	def powerlong(self):
+		if Screens.Standby.inTryQuitMainloop or (self.session.current_dialog and not self.session.current_dialog.ALLOW_SUSPEND):
+			return
+
 		self.standbyblocked = 1
 		action = config.usage.on_long_powerpress.value
 		if action == "shutdown":
 			self.shutdown()
 		elif action == "show_menu":
 			print "Show shutdown Menu"
-			menu = mdom.childNodes[0]
-			for x in menu.childNodes:
-				if x.nodeType != xml.dom.minidom.Element.nodeType:
-				    continue
-				elif x.tagName == 'menu':
-					for y in x.childNodes:
-						if y.nodeType != xml.dom.minidom.Element.nodeType:
-							continue
-						elif y.tagName == 'id':
-							id = y.getAttribute("val")
-							if id and id == "shutdown":
-								self.session.infobar = self
-								menu_screen = self.session.openWithCallback(self.MenuClosed, MainMenu, x, x.childNodes)
-								menu_screen.setTitle(_("Standby / Restart"))
-								return
+			root = mdom.getroot()
+			for x in root.findall("menu"):
+				y = x.find("id")
+				if y is not None:
+					id = y.get("val")
+					if id and id == "shutdown":
+						self.session.infobar = self
+						menu_screen = self.session.openWithCallback(self.MenuClosed, MainMenu, x)
+						menu_screen.setTitle(_("Standby / Restart"))
+						return
 
 	def powerdown(self):
 		self.standbyblocked = 0
@@ -412,7 +412,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 +462,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")