X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/1c6c579ff6302c3301eb21bd0933d5ede824a384..4588321e0ee8151324a5a183ff2ced5ea80629cf:/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 96ff43a0..4d0a992d 100644
--- a/lib/python/Plugins/SystemPlugins/DefaultServicesScanner/plugin.py
+++ b/lib/python/Plugins/SystemPlugins/DefaultServicesScanner/plugin.py
@@ -9,10 +9,10 @@ from Plugins.Plugin import PluginDescriptor
 from Screens.ScanSetup import ScanSetup
 from Screens.ServiceScan import ServiceScan
 from Screens.MessageBox import MessageBox
-from Tools.Directories import resolveFilename, SCOPE_CONFIG
+from Tools.Directories import resolveFilename, SCOPE_CONFIG, copyfile
 #from Screens.Screen import Screen
+from os import unlink
 from enigma import eTimer, eDVBDB
-import os
 
 class DefaultServiceScan(ServiceScan):
 	skin = """
@@ -39,9 +39,12 @@ class DefaultServiceScan(ServiceScan):
 		<widget name="scan_progress" position="10,105" size="400,15" pixmap="skin_default/progress_big.png" borderWidth="2" borderColor="#cccccc" />
 		<widget name="servicelist" position="10,135" size="400,265" selectionDisabled="1" />
 	</screen>"""
-		
+
 	def __init__(self, session, scanList):
-		os.system("rm " + resolveFilename(SCOPE_CONFIG) + "/lamedb")
+		try:
+			unlink(resolveFilename(SCOPE_CONFIG) + "/lamedb");
+		except OSError:
+			pass
 		db = eDVBDB.getInstance()
 		db.reloadServicelist()
 		ServiceScan.__init__(self, session, scanList)
@@ -59,7 +62,8 @@ class DefaultServicesScannerPlugin(ScanSetup):
 	def __init__(self, session, args = None):
 		ScanSetup.__init__(self, session)
 		# backup lamedb
-		os.system("cp " + resolveFilename(SCOPE_CONFIG) + "/lamedb " + resolveFilename(SCOPE_CONFIG) + "/lamedb.backup")
+		confdir = resolveFilename(SCOPE_CONFIG)
+		copyfile(confdir + "/lamedb", confdir + "/lamedb.backup")
 		self.scan_type.value = "multisat"
 		self.createSetup()
 		self.scanIndex = 0
@@ -87,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" />
@@ -109,13 +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"
-			os.system("cp " + resolveFilename(SCOPE_CONFIG) + "/lamedb.backup " + resolveFilename(SCOPE_CONFIG) + "/lamedb")
+			confdir = resolveFilename(SCOPE_CONFIG)
+			copyfile(confdir + "/lamedb.backup", confdir + "/lamedb")
 			db.reloadServicelist()
 			self.close()
 		else: