X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/9577681fd68514b24f3ed95f7057443c26c37b28..01f6932815a6a21ab46bb420be093685378b43dd:/lib/python/Components/ServiceScan.py diff --git a/lib/python/Components/ServiceScan.py b/lib/python/Components/ServiceScan.py index e51532f4..04690b5d 100644 --- a/lib/python/Components/ServiceScan.py +++ b/lib/python/Components/ServiceScan.py @@ -26,43 +26,29 @@ 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.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.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]) ) - def __init__(self, progressbar, text, transponders): + def __init__(self, progressbar, text, servicelist, transponders, feid, flags): self.progressbar = progressbar self.text = text self.scan = eComponentScan() self.state = self.Idle + self.feid = feid + self.flags = flags + self.servicelist = servicelist 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: self.scan.addInitial(x) @@ -70,8 +56,9 @@ class ServiceScan: def execBegin(self): self.scan.statusChanged.get().append(self.scanStatusChanged) + self.scan.newService.get().append(self.newService) 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 +67,15 @@ 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)