X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/f1ba8813bfe7a7ceedbf9175126264158ed85409..86994c65bb90af606820742518a323c831e7ea50:/mytest.py

diff --git a/mytest.py b/mytest.py
index 9587273a..098675b6 100644
--- a/mytest.py
+++ b/mytest.py
@@ -1,5 +1,6 @@
-from Tools import RedirectOutput
-from enigma import *
+from Tools import RedirectOutput, RedirectTime
+from enigma import runMainloop, eDVBDB, eTimer, quitMainloop, eDVBVolumecontrol, \
+	getDesktop, ePythonConfigQuery, eAVSwitch, eWindow, eServiceEvent
 from tools import *
 
 from Components.Language import language
@@ -10,12 +11,11 @@ def setEPGLanguage():
 	
 language.addCallback(setEPGLanguage)
 
-import traceback
+from traceback import print_exc
 import Screens.InfoBar
 from Screens.SimpleSummary import SimpleSummary
 
-import sys
-import time
+from sys import stdout, exc_info
 
 import ServiceReference
 
@@ -27,7 +27,7 @@ from Navigation import Navigation
 from skin import readSkin, applyAllAttributes
 
 from Tools.Directories import InitFallbackFiles, resolveFilename, SCOPE_PLUGINS, SCOPE_SKIN_IMAGE
-from Components.config import config, ConfigText, configfile, ConfigSubsection, ConfigInteger
+from Components.config import config, configfile, ConfigText, ConfigSubsection, ConfigInteger
 InitFallbackFiles()
 eDVBDB.getInstance().reloadBouquets()
 
@@ -155,11 +155,11 @@ class Session:
 		if callback is not None:
 			callback(*retval)
 
-	def execBegin(self, first=True):
+	def execBegin(self, first=True, do_show = True):
 		assert not self.in_exec 
 		self.in_exec = True
 		c = self.current_dialog
-		
+
 		# when this is an execbegin after a execend of a "higher" dialog,
 		# popSummary already did the right thing.
 		if first:
@@ -172,7 +172,7 @@ class Session:
 		c.execBegin()
 
 		# when execBegin opened a new dialog, don't bother showing the old one.
-		if c == self.current_dialog:
+		if c == self.current_dialog and do_show:
 			c.show()
 		
 	def execEnd(self, last=True):
@@ -191,9 +191,9 @@ class Session:
 		try:
 			return screen(self, *arguments, **kwargs)
 		except:
-			errstr = "Screen %s(%s, %s): %s" % (str(screen), str(arguments), str(kwargs), sys.exc_info()[0])
+			errstr = "Screen %s(%s, %s): %s" % (str(screen), str(arguments), str(kwargs), exc_info()[0])
 			print errstr
-			traceback.print_exc(file=sys.stdout)
+			print_exc(file=stdout)
 			quitMainloop(5)
 	
 	def instantiateDialog(self, screen, *arguments, **kwargs):
@@ -214,7 +214,7 @@ class Session:
 		except:
 			print 'EXCEPTION IN DIALOG INIT CODE, ABORTING:'
 			print '-'*60
-			traceback.print_exc(file=sys.stdout)
+			print_exc(file=stdout)
 			quitMainloop(5)
 			print '-'*60
 		
@@ -246,13 +246,13 @@ class Session:
 	 
 	def pushCurrent(self):
 		if self.current_dialog is not None:
-			self.dialog_stack.append(self.current_dialog)
+			self.dialog_stack.append((self.current_dialog, self.current_dialog.shown))
 			self.execEnd(last=False)
-	
+
 	def popCurrent(self):
 		if len(self.dialog_stack):
-			self.current_dialog = self.dialog_stack.pop()
-			self.execBegin(first=False)
+			(self.current_dialog, do_show) = self.dialog_stack.pop()
+			self.execBegin(first=False, do_show=do_show)
 		else:
 			self.current_dialog = None
 
@@ -387,7 +387,7 @@ class VolumeControl:
 				self.muteDialog.hide()
 				self.volumeDialog.setValue(vol)
 
-from Screens.Standby import Standby
+import Screens.Standby
 
 class PowerKey:
 	""" PowerKey stuff - handles the powerkey press and powerkey release actions"""
@@ -398,7 +398,7 @@ class PowerKey:
 		self.powerKeyTimer.timeout.get().append(self.powertimer)
 		globalActionMap.actions["powerdown"]=self.powerdown
 		globalActionMap.actions["powerup"]=self.powerup
-		self.standbyblocked = 0
+		self.standbyblocked = 1
 #		self["PowerKeyActions"] = HelpableActionMap(self, "PowerKeyActions",
 			#{
 				#"powerdown": self.powerdown,
@@ -409,7 +409,8 @@ class PowerKey:
 
 	def powertimer(self):	
 		print "PowerOff - Now!"
-		self.quit()
+		if not Screens.Standby.inTryQuitMainloop:
+			self.session.open(Screens.Standby.TryQuitMainloop, 1)
 	
 	def powerdown(self):
 		self.standbyblocked = 0
@@ -422,12 +423,8 @@ class PowerKey:
 			self.standby()
 
 	def standby(self):
-		if self.session.current_dialog and self.session.current_dialog.ALLOW_SUSPEND:
-			self.session.open(Standby, self)
-
-	def quit(self):
-		# halt
-		quitMainloop(1)
+		if not Screens.Standby.inStandby and self.session.current_dialog and self.session.current_dialog.ALLOW_SUSPEND:
+			self.session.open(Screens.Standby.Standby)
 
 from Screens.Scart import Scart
 
@@ -489,20 +486,28 @@ def runScreenTest():
 
 	# we need session.scart to access it from within menu.xml
 	session.scart = AutoScartControl(session)
-	
+
 	runReactor()
 	
 	configfile.save()
-	
-	from Tools.DreamboxHardware import setFPWakeuptime
+
 	from time import time
+	from Tools.DreamboxHardware import setFPWakeuptime
+	#get next record timer start time
 	nextRecordingTime = session.nav.RecordTimer.getNextRecordingTime()
-	if nextRecordingTime != -1:
-		if (nextRecordingTime - time() < 330): # no time to switch box back on
-			setFPWakeuptime(time() + 30) # so switch back on in 30 seconds
+	#get next zap timer start time
+	nextZapTime = session.nav.RecordTimer.getNextZapTime()
+	#get currentTime
+	nowTime = time()
+	if nextZapTime != -1 and nextRecordingTime != -1:
+		startTime = nextZapTime < nextRecordingTime and nextZapTime or nextRecordingTime
+	else:
+		startTime = nextZapTime != -1 and nextZapTime or nextRecordingTime
+	if startTime != -1:
+		if (startTime - nowTime < 330): # no time to switch box back on
+			setFPWakeuptime(nowTime + 30) # so switch back on in 30 seconds
 		else:
-			setFPWakeuptime(nextRecordingTime - (300))
-	
+			setFPWakeuptime(startTime - 300)
 	session.nav.stopService()
 	session.nav.shutdown()
 	
@@ -553,6 +558,6 @@ try:
 except:
 	print 'EXCEPTION IN PYTHON STARTUP CODE:'
 	print '-'*60
-	traceback.print_exc(file=sys.stdout)
+	print_exc(file=stdout)
 	quitMainloop(5)
 	print '-'*60