X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/17a005241a08d3ee1cb8f6f9fed68e4b3201e41c..HEAD:/lib/python/Plugins/SystemPlugins/DefaultServicesScanner/plugin.py

diff --git a/lib/python/Plugins/SystemPlugins/DefaultServicesScanner/plugin.py b/lib/python/Plugins/SystemPlugins/DefaultServicesScanner/plugin.py
index b1eafcd3..d26881ed 100644
--- a/lib/python/Plugins/SystemPlugins/DefaultServicesScanner/plugin.py
+++ b/lib/python/Plugins/SystemPlugins/DefaultServicesScanner/plugin.py
@@ -42,7 +42,7 @@ class DefaultServiceScan(ServiceScan):
 
 	def __init__(self, session, scanList):
 		try:
-			unlink("rm " + resolveFilename(SCOPE_CONFIG) + "/lamedb");
+			unlink(resolveFilename(SCOPE_CONFIG) + "/lamedb");
 		except OSError:
 			pass
 		db = eDVBDB.getInstance()
@@ -91,12 +91,15 @@ class DefaultServicesScannerPlugin(ScanSetup):
 
 	def scanFinished(self, value = None):
 		print "finished"
+		print "self.scanIndex:", self.scanIndex
 		db = eDVBDB.getInstance()
-		satint = self.multiscanlist[self.scanIndex][0]
-		print "scanned sat:", satint
-		db.saveServicelist("/tmp/lamedb." + str(satint))
-		file = open("/tmp/sat" + str(satint) + ".info", "w")
-		xml = """<default>
+		print "self.multiscanlist:", self.multiscanlist
+		if len(self.multiscanlist) - 1 >= self.scanIndex and len(self.multiscanlist[self.scanIndex]) > 0:
+			satint = self.multiscanlist[self.scanIndex][0]
+			print "scanned sat:", satint
+			db.saveServicelist("/tmp/lamedb." + str(satint))
+			file = open("/tmp/sat" + str(satint) + ".info", "w")
+			xml = """<default>
 	<prerequisites>
 		<tag type="services" />
 		<bcastsystem type="DVB-S" />
@@ -113,14 +116,14 @@ class DefaultServicesScannerPlugin(ScanSetup):
 		</file>
 	</files>
 </default>""" % (satint, "Dream", nimmanager.getSatDescription(satint), satint)
-		file.write(xml)
-		file.close()
+			file.write(xml)
+			file.close()
 		
 		self.scanIndex += 1
 		if self.scanIndex + 1 >= len(self.multiscanlist):
 			print "no more sats to scan"
 			confdir = resolveFilename(SCOPE_CONFIG)
-			copyfile(confdir + "/lamedb.backup", confdir + "/lamedb)
+			copyfile(confdir + "/lamedb.backup", confdir + "/lamedb")
 			db.reloadServicelist()
 			self.close()
 		else:
@@ -131,4 +134,4 @@ def DefaultServicesScannerMain(session, **kwargs):
 	session.open(DefaultServicesScannerPlugin)
 
 def Plugins(**kwargs):
-	return PluginDescriptor(name="Default Services Scanner", description=_("Scans default lamedbs sorted by satellite with a connected dish positioner"), where = PluginDescriptor.WHERE_PLUGINMENU, fnc=DefaultServicesScannerMain)
+	return PluginDescriptor(name="Default Services Scanner", description=_("Scans default lamedbs sorted by satellite with a connected dish positioner"), where = PluginDescriptor.WHERE_PLUGINMENU, needsRestart = False, fnc=DefaultServicesScannerMain)