fix bluescreen(segfault) in automatic service scan .. part2

[enigma2.git] / lib / python / Components / ServiceScan.py

diff --git a/lib/python/Components/ServiceScan.py b/lib/python/Components/ServiceScan.py
index e51532f471ae3f2a152c4b5c8d7684ec645ee00e..d812fddba75dd50b2ed0c728bd4e8245556c024a 100644 (file)
--- a/lib/python/Components/ServiceScan.py
+++ b/lib/python/Components/ServiceScan.py
@@ -26,52 +26,59 @@ class ServiceScan:
                                        self.state = self.Error
                                        self.errorcode = errcode
                        else:
-                               self.text.setText("scan in progress - %d %% done!\n%d services found!" % (self.scan.getProgress(), self.scan.getNumServices()))
+                               self.text.setText(_("scan in progress - %d %% done!\n%d services found!") % (self.scan.getProgress(), self.foundServices + self.scan.getNumServices()))
                
                if self.state == self.Done:
-                       self.text.setText("scan done!")
+                       if self.scan.getNumServices() == 1:
+                               self.text.setText(_("scan done!\nOne service found!"))
+                       elif self.scan.getNumServices() == 0:
+                               self.text.setText(_("scan done!\nNo service found!"))
+                       else:
+                               self.text.setText(_("scan done!\n%d services found!") % (self.foundServices + self.scan.getNumServices()))
                
                if self.state == self.Error:
-                       self.text.setText("ERROR - failed to scan (%s)!" % (self.Errors[self.errorcode]) )
+                       self.text.setText(_("ERROR - failed to scan (%s)!") % (self.Errors[self.errorcode]) )
+                       
+               if self.state == self.Done or self.state == self.Error:
+                       if self.run != len(self.scanList) - 1:
+                               self.foundServices += self.scan.getNumServices()
+                               self.execEnd()
+                               self.run += 1
+                               self.execBegin()
        
-       def __init__(self, progressbar, text, transponders):
+       def __init__(self, progressbar, text, servicelist, passNumber, scanList):
+               self.foundServices = 0
                self.progressbar = progressbar
                self.text = text
+               self.servicelist = servicelist
+               self.passNumber = passNumber
+               self.scanList = scanList
+               self.run = 0
+               
+       def doRun(self):
                self.scan = eComponentScan()
+               
+               self.feid = self.scanList[self.run]["feid"]
+               self.flags = self.scanList[self.run]["flags"]
                self.state = self.Idle
                self.scanStatusChanged()
                
-               
-               if 1:
-                       parm = eDVBFrontendParametersSatellite()
-
-                       parm.frequency = 11817000
-                       parm.symbol_rate = 27500000
-                       parm.polarisation = 1 # eDVBFrontendParametersSatellite.Polarisation.Vertical
-                       parm.fec = 3 # eDVBFrontendParametersSatellite.FEC.f3_4;
-                       parm.inversion = 1 #eDVBFrontendParametersSatellite.Inversion.Off;
-                       parm.orbital_position = 192
-               else:
-                       parm = eDVBFrontendParametersTerrestrial()
-                       
-                       parm.frequency = 626000000;
-                       parm.inversion = 2  # eDVBFrontendParametersTerrestrial.Inversion.Unknown;
-                       parm.bandwidth = 0  #eDVBFrontendParametersTerrestrial.Bandwidth.Bw8MHz;
-                       parm.code_rate_HP = parm.code_rate_LP = 6 #eDVBFrontendParametersTerrestrial.FEC.fAuto;
-                       parm.modulation = 1 #eDVBFrontendParametersTerrestrial.Modulation.QAM16;
-                       parm.transmission_mode = 1 # eDVBFrontendParametersTerrestrial.TransmissionMode.TM8k;
-                       parm.guard_interval = 0 # eDVBFrontendParametersTerrestrial.GuardInterval.GI_1_32;
-                       parm.hierarchy = 0 #eDVBFrontendParametersTerrestrial.Hierarchy.HNone;
-               
-               for x in transponders:
+               for x in self.scanList[self.run]["transponders"]:
                        self.scan.addInitial(x)
-               
-               #self.scan.addInitial(parm)
+
+       def updatePass(self):
+               size = len(self.scanList)
+               if size > 1:
+                       self.passNumber.setText(_("pass") + " " + str(self.run + 1) + "/" + str(size) + " (" + _("Tuner") + " " + str(self.scanList[self.run]["feid"]) + ")")
                
        def execBegin(self):
+               self.doRun()
+               self.updatePass()
                self.scan.statusChanged.get().append(self.scanStatusChanged)
+               self.scan.newService.get().append(self.newService)
+               self.servicelist.clear()
                self.state = self.Running
-               err = self.scan.start()
+               err = self.scan.start(self.feid, self.flags)
                if err:
                        self.state = self.Error
                        self.errorcode = 0
@@ -80,10 +87,18 @@ class ServiceScan:
        
        def execEnd(self):
                self.scan.statusChanged.get().remove(self.scanStatusChanged)
+               self.scan.newService.get().remove(self.newService)
                if not self.isDone():
                        print "*** warning *** scan was not finished!"
+               
+               del self.scan
 
        def isDone(self):
-               print "state is %d " % (self.state)
                return self.state == self.Done or self.state == self.Error
-       
+
+       def newService(self):
+               newServiceName = self.scan.getLastServiceName()
+               self.servicelist.addItem(newServiceName)
+
+       def destroy(self):
+               pass