X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/753161b26ec6d7d068e61e6ce7063369740476a0..f918deab76b3ebd790b64a5694805ecbf944ca66:/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 2c29cbae..4d0a992d 100644
--- a/lib/python/Plugins/SystemPlugins/DefaultServicesScanner/plugin.py
+++ b/lib/python/Plugins/SystemPlugins/DefaultServicesScanner/plugin.py
@@ -11,7 +11,7 @@ from Screens.ServiceScan import ServiceScan
 from Screens.MessageBox import MessageBox
 from Tools.Directories import resolveFilename, SCOPE_CONFIG, copyfile
 #from Screens.Screen import Screen
-from file import unlink
+from os import unlink
 from enigma import eTimer, eDVBDB
 
 class DefaultServiceScan(ServiceScan):
@@ -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()
@@ -63,7 +63,7 @@ class DefaultServicesScannerPlugin(ScanSetup):
 		ScanSetup.__init__(self, session)
 		# backup lamedb
 		confdir = resolveFilename(SCOPE_CONFIG)
-		copyfile(confdir + "/lamedb", confdir + "/lamedb.backup)
+		copyfile(confdir + "/lamedb", confdir + "/lamedb.backup")
 		self.scan_type.value = "multisat"
 		self.createSetup()
 		self.scanIndex = 0
@@ -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: