X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=mytest.py;h=99695e0525d0b9de620ba3501cfe614e01b6474b;hp=d58649cfafe45126ccf7a0f918803706058ace58;hb=5219d43296787b3592eedba7fd78b54e87638351;hpb=19d19912b3f7ff117f4f9e8136c428b664d806cb diff --git a/mytest.py b/mytest.py old mode 100644 new mode 100755 index d58649c..99695e0 --- a/mytest.py +++ b/mytest.py @@ -1,14 +1,17 @@ +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 profile("PYTHON_START") from enigma import runMainloop, eDVBDB, eTimer, quitMainloop, \ - getDesktop, ePythonConfigQuery, eAVSwitch, eServiceEvent + getDesktop, ePythonConfigQuery, eAVSwitch, eServiceEvent, \ + eEPGCache from tools import * profile("LANGUAGE") @@ -28,6 +31,9 @@ from Screens.SimpleSummary import SimpleSummary from sys import stdout, exc_info +profile("Bouquets") +eDVBDB.getInstance().reloadBouquets() + profile("ParentalControl") from Components.ParentalControl import InitParentalControl InitParentalControl() @@ -36,17 +42,41 @@ 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 Tools.Directories import InitFallbackFiles, resolveFilename, SCOPE_PLUGINS, SCOPE_CURRENT_SKIN +from Components.config import config, configfile, ConfigText, ConfigYesNo, ConfigInteger, NoSave InitFallbackFiles() -profile("ReloadProfiles") -eDVBDB.getInstance().reloadBouquets() +profile("config.misc") + +config.misc.radiopic = ConfigText(default = resolveFilename(SCOPE_CURRENT_SKIN, "radio.mvi")) +config.misc.isNextRecordTimerAfterEventActionAuto = ConfigYesNo(default=False) +config.misc.useTransponderTime = ConfigYesNo(default=True) +config.misc.startCounter = ConfigInteger(default=0) # number of e2 starts... +config.misc.standbyCounter = NoSave(ConfigInteger(default=0)) # number of standby +config.misc.epgcache_filename = ConfigText(default = "/hdd/epg.dat") + +def setEPGCachePath(configElement): + eEPGCache.getInstance().setCacheFile(configElement.value) + + +#demo code for use of standby enter leave callbacks +#def leaveStandby(): +# print "!!!!!!!!!!!!!!!!!leave standby" -config.misc.radiopic = ConfigText(default = resolveFilename(SCOPE_SKIN_IMAGE)+"radio.mvi") +#def standbyCountChanged(configElement): +# print "!!!!!!!!!!!!!!!!!enter standby num", configElement.value +# from Screens.Standby import inStandby +# inStandby.onClose.append(leaveStandby) + +#config.misc.standbyCounter.addNotifier(standbyCountChanged, initial_call = False) +#################################################### + +def useTransponderTimeChanged(configElement): + enigma.eDVBLocalTimeHandler.getInstance().setUseDVBTime(configElement.value) +config.misc.useTransponderTime.addNotifier(useTransponderTimeChanged) profile("Twisted") try: @@ -59,7 +89,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 +102,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 @@ -184,6 +214,7 @@ class Session: self.summary.show() c.addSummary(self.summary) + c.saveKeyboardMode() c.execBegin() # when execBegin opened a new dialog, don't bother showing the old one. @@ -195,6 +226,7 @@ class Session: self.in_exec = False self.current_dialog.execEnd() + self.current_dialog.restoreKeyboardMode() self.current_dialog.hide() if last: @@ -253,7 +285,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: @@ -272,8 +304,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() @@ -317,7 +349,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,38 +371,38 @@ 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.doAction(action = config.usage.on_long_powerpress.value) + + def doAction(self, action): 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 + elif action == "standby": + self.standby() def powerdown(self): self.standbyblocked = 0 def powerup(self): if self.standbyblocked == 0: - self.standbyblocked = 1 - self.standby() + self.doAction(action = config.usage.on_short_powerpress.value) 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") @@ -408,18 +439,18 @@ profile("Load:VolumeControl") from Components.VolumeControl import VolumeControl def runScreenTest(): + config.misc.startCounter.value += 1 + profile("readPluginList") 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() @@ -442,11 +473,14 @@ 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) + + config.misc.epgcache_filename.addNotifier(setEPGCachePath) runNextScreen(session, screensToRun) @@ -461,33 +495,46 @@ def runScreenTest(): profile("RunReactor") profile_final() runReactor() - profile("configfile.save") - configfile.save() + + config.misc.startCounter.save() profile("wakeup") - from time import time - from Tools.DreamboxHardware import setFPWakeuptime + 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 - setFPWakeuptime(nowTime + 30) # so switch back on in 30 seconds + recordTimerWakeupAuto = False + if wakeupList: + from time import strftime + startTime = wakeupList[0] + if (startTime[0] - nowTime) < 270: # no time to switch box back on + wptime = nowTime + 30 # so switch back on in 30 seconds else: - setFPWakeuptime(startTime - 300) + wptime = startTime[0] - 240 + 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")