X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/3d14c9d74ad4caa1e732b82ad62f695c658d4f40..9a2b8cd197039db5a4324149dcf6e817171166bf:/mytest.py diff --git a/mytest.py b/mytest.py old mode 100644 new mode 100755 index 88c035ab..17fdcaf1 --- a/mytest.py +++ b/mytest.py @@ -42,13 +42,19 @@ 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) +config.misc.useTransponderTime = ConfigYesNo(default=True) + +def useTransponderTimeChanged(configElement): + enigma.eDVBLocalTimeHandler.getInstance().setUseDVBTime(configElement.value) +config.misc.useTransponderTime.addNotifier(useTransponderTimeChanged) profile("Twisted") try: @@ -75,7 +81,6 @@ 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.TutorialWizard import * import Screens.Rc @@ -256,7 +261,7 @@ class Session: self.execEnd(last=False) def popCurrent(self): - if len(self.dialog_stack): + if self.dialog_stack: (self.current_dialog, do_show) = self.dialog_stack.pop() self.execBegin(first=False, do_show=do_show) else: @@ -275,8 +280,8 @@ class Session: return dlg 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!" + if self.dialog_stack and not self.in_exec: + raise RuntimeError("modal open are allowed only from a screen which is modal!") # ...unless it's the very first screen. self.pushCurrent() @@ -320,7 +325,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: @@ -343,27 +347,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 @@ -374,7 +376,7 @@ class PowerKey: self.standby() def standby(self): - if not Screens.Standby.inStandby and self.session.current_dialog and self.session.current_dialog.ALLOW_SUSPEND: + if not Screens.Standby.inStandby and self.session.current_dialog and self.session.current_dialog.ALLOW_SUSPEND and self.session.in_exec: self.session.open(Screens.Standby.Standby) profile("Scart") @@ -415,14 +417,12 @@ 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) - screensToRun = [ ] - - for p in plugins.getPlugins(PluginDescriptor.WHERE_WIZARD): - screensToRun.append(p.__call__) + screensToRun = [ p.__call__ for p in plugins.getPlugins(PluginDescriptor.WHERE_WIZARD) ] profile("wizards") screensToRun += wizardManager.getWizards() @@ -445,11 +445,12 @@ def runScreenTest(): return screen = screensToRun[0][1] + args = screensToRun[0][2:] - if len(screensToRun): - session.openWithCallback(boundFunction(runNextScreen, session, screensToRun[1:]), screen) + if screensToRun: + session.openWithCallback(boundFunction(runNextScreen, session, screensToRun[1:]), screen, *args) else: - session.open(screen) + session.open(screen, *args) runNextScreen(session, screensToRun) @@ -464,34 +465,44 @@ def runScreenTest(): profile("RunReactor") profile_final() runReactor() - profile("configfile.save") - configfile.save() profile("wakeup") - from time import time - from Tools.DreamboxHardware import setFPWakeuptime, getFPWakeuptime + from time import time, strftime, localtime + from Tools.DreamboxHardware import setFPWakeuptime, getFPWakeuptime, setRTCtime #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() - if len(wakeupList): - startTime = wakeupList.pop(0) - if (startTime - nowTime) < 330: # no time to switch box back on + recordTimerWakeupAuto = False + if wakeupList: + from time import strftime + startTime = wakeupList[0] + if (startTime[0] - nowTime) < 330: # no time to switch box back on wptime = nowTime + 30 # so switch back on in 30 seconds else: - wptime = startTime - 300 + wptime = startTime[0] - 300 + if not config.misc.useTransponderTime.value: + print "dvb time sync disabled... so set RTC now to current linux time!", strftime("%Y/%m/%d %H:%M", localtime(nowTime)) + setRTCtime(nowTime) + print "set wakeup time to", strftime("%Y/%m/%d %H:%M", localtime(wptime)) 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")