X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/b0e09a2cd9a05a002222d79fb71848f4c7820ff3..01f6932815a6a21ab46bb420be093685378b43dd:/lib/python/Components/ServiceScan.py

diff --git a/lib/python/Components/ServiceScan.py b/lib/python/Components/ServiceScan.py
index 915a26a0..04690b5d 100644
--- a/lib/python/Components/ServiceScan.py
+++ b/lib/python/Components/ServiceScan.py
@@ -26,46 +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, flags):
+	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
-#			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)
-		
 		for x in transponders:
 			self.scan.addInitial(x)
 		
@@ -73,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(self.flags)
+		err = self.scan.start(self.feid, self.flags)
 		if err:
 			self.state = self.Error
 			self.errorcode = 0
@@ -83,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)