X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/aa3e781f31a04223416f0a34b25ab95fc0bef429..0f6783fa5868d06629e07bfdd09d04f3ac549eb1:/lib/python/Components/ServiceScan.py?ds=sidebyside

diff --git a/lib/python/Components/ServiceScan.py b/lib/python/Components/ServiceScan.py
index d59b3049..93af4e62 100644
--- a/lib/python/Components/ServiceScan.py
+++ b/lib/python/Components/ServiceScan.py
@@ -1,4 +1,4 @@
-from enigma import eComponentScan
+from enigma import eComponentScan, eDVBFrontendParametersSatellite, eDVBFrontendParametersCable, eDVBFrontendParametersTerrestrial
 
 class ServiceScan:
 	
@@ -26,25 +26,60 @@ 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.doRun()
+				self.execBegin()
 	
-	def __init__(self, progressbar, text):
+	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()
 		
+		for x in self.scanList[self.run]["transponders"]:
+			self.scan.addInitial(x)
+
+	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
@@ -53,10 +88,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