Version 1.0b: Fix bug with plugin- start after poweroff: Plugin started to early...

diff --git a/kiddytimer/CONTROL/control b/kiddytimer/CONTROL/control
index 4297cd8..c99f100 100644 (file)
--- a/kiddytimer/CONTROL/control
+++ b/kiddytimer/CONTROL/control
@@ -1,5 +1,5 @@
 Package: enigma2-plugin-extensions-kiddytimer
-Version: 1.0a-20100919-r0
+Version: 1.0b-20100919-r0
 Description: Allows to control the Kids' daily TV usage
 Architecture: mipsel
 Section: extra

diff --git a/kiddytimer/src/KTglob.py b/kiddytimer/src/KTglob.py
index bd13b70..f3533c1 100644 (file)
--- a/kiddytimer/src/KTglob.py
+++ b/kiddytimer/src/KTglob.py
@@ -3,7 +3,7 @@ from Components.config import config
 import time
 
 PLUGIN_BASE = "KiddyTimer"
-PLUGIN_VERSION = "1.0a"
+PLUGIN_VERSION = "1.0b"
 
 DAYNAMES= (_("Sunday"),
           _("Monday"),

diff --git a/kiddytimer/src/KTmain.py b/kiddytimer/src/KTmain.py
index 72396e7..8139366 100644 (file)
--- a/kiddytimer/src/KTmain.py
+++ b/kiddytimer/src/KTmain.py
@@ -10,7 +10,9 @@ from Screens.Screen import Screen
 from Screens import Standby
 from Tools.BoundFunction import boundFunction
 from Tools import Notifications
-from enigma import ePoint, eTimer
+from Tools.Directories import resolveFilename, SCOPE_CONFIG
+from enigma import ePoint, eTimer, eDVBLocalTimeHandler
+
 from __init__ import _
 import KTglob
 import NavigationInstance
@@ -103,38 +105,47 @@ class KiddyTimer():
         self.startTimer()
         
     def startTimer(self,bForceStart=False,iRemainingSeconds=0):
-        bDoStandardInit = True
-        if bForceStart:
-            self.enabled = True
+        curStartYear = time.localtime().tm_year 
+        if curStartYear < 2010: 
+            # Time has not yet been set from transponder, wait until it has been set
+            eDVBLocalTimeHandler.getInstance().m_timeUpdated.get().append(self.gotTime)
         else:
-            self.enabled = config.plugins.KiddyTimer.enabled.value
-        if (self.enabled == True and self.timerHasToRun()) or bForceStart:   
-            # Date of the current day
-            self.currentDay = time.strftime("%d.%m.%Y" , time.localtime())
-            # First check for Cheat- attempts by kids
-            if self.detectCheatAttempt():
-                config.plugins.KiddyTimer.remainingTime.value = 0
-                configfile.save()
-                bForceStart = True
-            elif iRemainingSeconds > 0:
-                self.resetTimer(setTime=iRemainingSeconds)
-                bDoStandardInit = False
-            elif self.currentDay != config.plugins.KiddyTimer.lastStartDay.getValue():
-                self.resetTimer()
-                bDoStandardInit = False
-            if bDoStandardInit:             
-                self.setCurrentDayTime()
-                self.setSessionTime(config.plugins.KiddyTimer.remainingTime.getValue())
-                self.setRemainingTime(self.sessionTime)
-                self.setSessionStartTime()
-
-            self.setPluginStatus("RUNNING")
-            self.toggleActiveState(True)
-            if not bForceStart:
-                self.askForActivation()
+            bDoStandardInit = True
+            if bForceStart:
+                self.enabled = True
             else:
-                self.startLoop()
-
+                self.enabled = config.plugins.KiddyTimer.enabled.value
+            if (self.enabled == True and self.timerHasToRun()) or bForceStart:   
+                # Date of the current day
+                self.currentDay = time.strftime("%d.%m.%Y" , time.localtime())
+                # First check for Cheat- attempts by kids
+                if self.detectCheatAttempt():
+                    config.plugins.KiddyTimer.remainingTime.value = 0
+                    configfile.save()
+                    bForceStart = True
+                elif iRemainingSeconds > 0:
+                    self.resetTimer(setTime=iRemainingSeconds)
+                    bDoStandardInit = False
+                elif self.currentDay != config.plugins.KiddyTimer.lastStartDay.getValue():
+                    self.resetTimer()
+                    bDoStandardInit = False
+                if bDoStandardInit:             
+                    self.setCurrentDayTime()
+                    self.setSessionTime(config.plugins.KiddyTimer.remainingTime.getValue())
+                    self.setRemainingTime(self.sessionTime)
+                    self.setSessionStartTime()
+    
+                self.setPluginStatus("RUNNING")
+                self.toggleActiveState(True)
+                if not bForceStart:
+                    self.askForActivation()
+                else:
+                    self.startLoop()
+
+    def gotTime(self):
+        eDVBLocalTimeHandler.getInstance().m_timeUpdated.get().remove(self.gotTime)
+        self.startTimer()
+    
     def stopTimer(self):
         if self.active:
             self.saveValues()
@@ -155,7 +166,7 @@ class KiddyTimer():
         self.setSessionStartTime()
 
     def timerHasToRun(self):
-        curStartTime = self.sessionStartTime or time.localtime()
+        curStartTime = time.localtime()
         iPluginStart = KTglob.getSecondsFromClock( [curStartTime[3],curStartTime[4]] )
         iMonitorEnd = KTglob.getSecondsFromClock(config.plugins.KiddyTimer.monitorEndTime.getValue())  
         iMonitorStart = KTglob.getSecondsFromClock(config.plugins.KiddyTimer.monitorStartTime.getValue())