Wizard.py: async fixes

diff --git a/lib/python/Screens/Wizard.py b/lib/python/Screens/Wizard.py
index 17a8150..23d6253 100644 (file)
--- a/lib/python/Screens/Wizard.py
+++ b/lib/python/Screens/Wizard.py
@@ -307,37 +307,42 @@ class Wizard(Screen):
 
        def finished(self, gotoStep = None, *args, **kwargs):
                print "finished"
-               self.prevStep = self.currStep
-               self.gotoStep = gotoStep
+               currStep = self.currStep
 
                if self.updateValues not in self.onShown:
                        self.onShown.append(self.updateValues)
-
+                       
                if self.showConfig:
-                       if self.wizard[self.prevStep]["config"]["type"] == "dynamic":
-                               eval("self." + self.wizard[self.prevStep]["config"]["evaluation"])()
+                       if self.wizard[currStep]["config"]["type"] == "dynamic":
+                               eval("self." + self.wizard[currStep]["config"]["evaluation"])()
 
                if self.showList:
-                       if (len(self.wizard[self.prevStep]["evaluatedlist"]) > 0):
+                       if (len(self.wizard[currStep]["evaluatedlist"]) > 0):
                                print "current:", self["list"].current
                                nextStep = self["list"].current[1]
-                               if (self.wizard[self.prevStep].has_key("listevaluation")):
+                               if (self.wizard[currStep].has_key("listevaluation")):
                                        exec("self." + self.wizard[self.currStep]["listevaluation"] + "('" + nextStep + "')")
                                else:
                                        self.currStep = self.getStepWithID(nextStep)
 
-               if ((self.prevStep == self.numSteps and self.wizard[self.prevStep]["nextstep"] is None) or self.wizard[self.prevStep]["id"] == "end"): # wizard finished
+               print_now = True
+               if ((currStep == self.numSteps and self.wizard[currStep]["nextstep"] is None) or self.wizard[currStep]["id"] == "end"): # wizard finished
                        print "wizard finished"
                        self.markDone()
                        self.close()
                else:
-                       self.codeafterA=True
-                       self.runCode(self.wizard[self.prevStep]["codeafter"])
-                       if self.runCode(self.wizard[self.prevStep]["codeafter_async"]):
+                       self.codeafter = True
+                       self.runCode(self.wizard[currStep]["codeafter"])
+                       self.prevStep = currStep
+                       self.gotoStep = gotoStep
+                       if not self.runCode(self.wizard[currStep]["codeafter_async"]):
+                               self.afterAsyncCode()
+                       else:
                                if self.updateValues in self.onShown:
                                        self.onShown.remove(self.updateValues)
-                       else:
-                               self.afterAsyncCode()
+
+               if print_now:
+                       print "Now: " + str(self.currStep)
 
        def ok(self):
                print "OK"
@@ -460,41 +465,48 @@ class Wizard(Screen):
                        self.configInstance.doClose()
                        self.configInstance = None
 
+               self.condition = True
                exec (self.wizard[self.currStep]["condition"])
-
-               if len(self.stepHistory) == 0 or self.stepHistory[-1] != self.currStep:
-                       self.stepHistory.append(self.currStep)
-               print "wizard step:", self.wizard[self.currStep]
+               if not self.condition:
+                       self.currStep += 1
+                       self.updateValues()
+               else:
+                       if len(self.stepHistory) == 0 or self.stepHistory[-1] != self.currStep:
+                               self.stepHistory.append(self.currStep)
+                       print "wizard step:", self.wizard[self.currStep]
                        
-               if self.showSteps:
-                       self["step"].setText(self.getTranslation("Step ") + str(self.currStep) + "/" + str(self.numSteps))
-               if self.showStepSlider:
-                       self["stepslider"].setValue(self.currStep)
+                       if self.showSteps:
+                               self["step"].setText(self.getTranslation("Step ") + str(self.currStep) + "/" + str(self.numSteps))
+                       if self.showStepSlider:
+                               self["stepslider"].setValue(self.currStep)
                
-               if self.wizard[self.currStep]["timeout"] is not None:
-                       self.resetCounter() 
-                       self.timeoutTimer.start(1000)
+                       if self.wizard[self.currStep]["timeout"] is not None:
+                               self.resetCounter() 
+                               self.timeoutTimer.start(1000)
                        
-               print "wizard text", self.getTranslation(self.wizard[self.currStep]["text"])
-               self.updateText(firstset = True)
-               if self.wizard[self.currStep].has_key("displaytext"):
-                       displaytext = self.wizard[self.currStep]["displaytext"]
-                       print "set LCD text"
-                       for x in self.lcdCallbacks:
-                               x(displaytext)
+                       print "wizard text", self.getTranslation(self.wizard[self.currStep]["text"])
+                       self.updateText(firstset = True)
+                       if self.wizard[self.currStep].has_key("displaytext"):
+                               displaytext = self.wizard[self.currStep]["displaytext"]
+                               print "set LCD text"
+                               for x in self.lcdCallbacks:
+                                       x(displaytext)
                                
-               self.codeafterA=False
-               self.runCode(self.wizard[self.currStep]["code"])
-               if self.runCode(self.wizard[self.currStep]["code_async"]):
-                       if self.updateValues in self.onShown:
-                               self.onShown.remove(self.updateValues)
-               else:
-                       self.afterAsyncCode()
+                       self.codeafter=False
+                       self.runCode(self.wizard[self.currStep]["code"])
+                       if self.runCode(self.wizard[self.currStep]["code_async"]):
+                               if self.updateValues in self.onShown:
+                                       self.onShown.remove(self.updateValues)
+                       else:
+                               self.afterAsyncCode()
 
        def afterAsyncCode(self):
-               if self.codeafterA:
+               if not self.updateValues in self.onShown:
+                       self.onShown.append(self.updateValues)
+
+               if self.codeafter:
                        if self.wizard[self.prevStep]["nextstep"] is not None:
-                               self.currStep = self.getStepWithID(self.wizard[self.currStep]["nextstep"])
+                               self.currStep = self.getStepWithID(self.wizard[self.prevStep]["nextstep"])
                        if self.gotoStep is not None:
                                self.currStep = self.getStepWithID(self.gotoStep)
                        self.currStep += 1