moving the list generation to a seperate method

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

diff --git a/lib/python/Components/ServiceScan.py b/lib/python/Components/ServiceScan.py
index 9aec982925a7999f8dc659921094372c4a83fb74..24bbc10ef96d70c1a41270f51ec91fa5ac874048 100644 (file)
--- a/lib/python/Components/ServiceScan.py
+++ b/lib/python/Components/ServiceScan.py
@@ -26,49 +26,56 @@ class ServiceScan:
                                        self.state = self.Error
                                        self.errorcode = errcode
                        else:
                                        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.scan.getNumServices()))

                
                if self.state == self.Done:
                
                if self.state == self.Done:

-                       self.text.setText("scan done!")
+                       self.text.setText(_("scan done!"))

                
                if self.state == self.Error:
                
                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]) )

        
        

-       def __init__(self, progressbar, text):
+       def __init__(self, progressbar, text, transponders, feid, flags):

                self.progressbar = progressbar
                self.text = text
                self.scan = eComponentScan()
                self.state = self.Idle
                self.progressbar = progressbar
                self.text = text
                self.scan = eComponentScan()
                self.state = self.Idle

+               self.feid = feid
+               self.flags = flags

                self.scanStatusChanged()
                
                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
+#                      self.scan.addInitial(parm)
+#              else:
+#                              # until we have a terrestrial.xml:
+#                      for x in [490000000, 530000000, 546000000, 570000000, 626000000]:
+#                              parm = eDVBFrontendParametersTerrestrial()
+#                              parm.frequency = x
+#                              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;
+#                              self.scan.addInitial(parm)

                
                

-               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:
+                       self.scan.addInitial(x)

                
                

-               self.scan.addInitial(parm)
+               #self.scan.addInitial(parm)

                
        def execBegin(self):
                self.scan.statusChanged.get().append(self.scanStatusChanged)
                self.state = self.Running
                
        def execBegin(self):
                self.scan.statusChanged.get().append(self.scanStatusChanged)
                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
                if err:
                        self.state = self.Error
                        self.errorcode = 0


@@ -79,8 +86,9 @@ class ServiceScan:
                self.scan.statusChanged.get().remove(self.scanStatusChanged)
                if not self.isDone():
                        print "*** warning *** scan was not finished!"
                self.scan.statusChanged.get().remove(self.scanStatusChanged)
                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 isDone(self):
                print "state is %d " % (self.state)
                return self.state == self.Done or self.state == self.Error

-