add some more profiles probes for more accurate progress

diff --git a/lib/python/Screens/InfoBar.py b/lib/python/Screens/InfoBar.py
index 1e8f761..228ca4e 100644 (file)
--- a/lib/python/Screens/InfoBar.py
+++ b/lib/python/Screens/InfoBar.py
@@ -1,14 +1,21 @@
+from Tools.Profile import profile, profile_final
+

 from Screen import Screen
 
 from Screen import Screen
 

+profile("LOAD:MovieSelection")

 from Screens.MovieSelection import MovieSelection
 from Screens.MovieSelection import MovieSelection

+profile("LOAD:ChannelSelectionRadio")

 from Screens.ChannelSelection import ChannelSelectionRadio
 from Screens.ChannelSelection import ChannelSelectionRadio

+profile("LOAD:ChoiceBox")

 from Screens.ChoiceBox import ChoiceBox
 
 from Screens.ChoiceBox import ChoiceBox
 

+profile("LOAD:InitBar_Components")

 from Components.Sources.Source import ObsoleteSource
 from Components.ActionMap import HelpableActionMap
 from Components.config import config
 from Components.ServiceEventTracker import ServiceEventTracker
 
 from Components.Sources.Source import ObsoleteSource
 from Components.ActionMap import HelpableActionMap
 from Components.config import config
 from Components.ServiceEventTracker import ServiceEventTracker
 

+profile("LOAD:InfoBarGenerics")

 from Screens.InfoBarGenerics import InfoBarShowHide, \
        InfoBarNumberZap, InfoBarChannelSelection, InfoBarMenu, InfoBarRdsDecoder, \
        InfoBarEPG, InfoBarEvent, InfoBarServiceName, InfoBarSeek, InfoBarInstantRecord, \
 from Screens.InfoBarGenerics import InfoBarShowHide, \
        InfoBarNumberZap, InfoBarChannelSelection, InfoBarMenu, InfoBarRdsDecoder, \
        InfoBarEPG, InfoBarEvent, InfoBarServiceName, InfoBarSeek, InfoBarInstantRecord, \


@@ -18,8 +25,10 @@ from Screens.InfoBarGenerics import InfoBarShowHide, \
        InfoBarSummarySupport, InfoBarMoviePlayerSummarySupport, InfoBarTimeshiftState, InfoBarTeletextPlugin, InfoBarExtensions, \
        InfoBarSubtitleSupport, InfoBarPiP, InfoBarPlugins, InfoBarSleepTimer, InfoBarServiceErrorPopupSupport
 
        InfoBarSummarySupport, InfoBarMoviePlayerSummarySupport, InfoBarTimeshiftState, InfoBarTeletextPlugin, InfoBarExtensions, \
        InfoBarSubtitleSupport, InfoBarPiP, InfoBarPlugins, InfoBarSleepTimer, InfoBarServiceErrorPopupSupport
 

+profile("LOAD:HelpableScreen")

 from Screens.HelpMenu import HelpableScreen
 
 from Screens.HelpMenu import HelpableScreen
 

+profile("LOAD:enigma")

 from enigma import iPlayableService
 
 class InfoBar(InfoBarShowHide,
 from enigma import iPlayableService
 
 class InfoBar(InfoBarShowHide,

diff --git a/lib/python/Screens/Screen.py b/lib/python/Screens/Screen.py
index 585f15c..4c4f117 100644 (file)
--- a/lib/python/Screens/Screen.py
+++ b/lib/python/Screens/Screen.py
@@ -1,9 +1,13 @@
-from Components.HTMLSkin import HTMLSkin
+from Tools.Profile import profile, profile_final
+
+profile("LOAD:GUISkin")

 from Components.GUISkin import GUISkin
 from Components.GUISkin import GUISkin

+profile("LOAD:Source")

 from Components.Sources.Source import Source
 from Components.Sources.Source import Source

+profile("LOAD:GUIComponent")

 from Components.GUIComponent import GUIComponent
 
 from Components.GUIComponent import GUIComponent
 

-class Screen(dict, HTMLSkin, GUISkin):
+class Screen(dict, GUISkin):

 
        ALLOW_SUSPEND = False
 
 
        ALLOW_SUSPEND = False
 

diff --git a/skin.py b/skin.py
index ac66c8d..21ec62a 100644 (file)
--- a/skin.py
+++ b/skin.py
@@ -1,6 +1,10 @@
+from Tools.Profile import profile, profile_final
+
+profile("LOAD:minidom")

 import xml.dom.minidom
 from os import path
 
 import xml.dom.minidom
 from os import path
 

+profile("LOAD:enigma_skin")

 from enigma import eSize, ePoint, gFont, eWindow, eLabel, ePixmap, eWindowStyleManager, \
        addFont, gRGB, eWindowStyleSkinned
 
 from enigma import eSize, ePoint, gFont, eWindow, eLabel, ePixmap, eWindowStyleManager, \
        addFont, gRGB, eWindowStyleSkinned
 


@@ -52,6 +56,7 @@ def loadSkin(name):
 config.skin = ConfigSubsection()
 config.skin.primary_skin = ConfigText(default = "skin.xml")
 
 config.skin = ConfigSubsection()
 config.skin.primary_skin = ConfigText(default = "skin.xml")
 

+profile("LoadSkin")

 try:
        loadSkin(config.skin.primary_skin.value)
 except (SkinError, IOError, AssertionError), err:
 try:
        loadSkin(config.skin.primary_skin.value)
 except (SkinError, IOError, AssertionError), err:


@@ -60,7 +65,9 @@ except (SkinError, IOError, AssertionError), err:
        config.skin.primary_skin.value = 'skin.xml'
        loadSkin('skin.xml')
 
        config.skin.primary_skin.value = 'skin.xml'
        loadSkin('skin.xml')
 

+profile("LoadSkinDefault")

 loadSkin('skin_default.xml')
 loadSkin('skin_default.xml')

+profile("LoadSkinDefaultDone")

 
 def parsePosition(str):
        x, y = str.split(',')
 
 def parsePosition(str):
        x, y = str.split(',')