Merge commit 'origin/bug_138_networkwizard_fixes' into experimental

[enigma2.git] / 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 eed8c842bd869244914fb0dfcde3a0bee47ccc88..4d0a992d8866babe2e5d3bf85f0b96985712ce34 100644 (file)
--- a/lib/python/Plugins/SystemPlugins/DefaultServicesScanner/plugin.py
+++ b/lib/python/Plugins/SystemPlugins/DefaultServicesScanner/plugin.py
@@ -91,12 +91,15 @@ class DefaultServicesScannerPlugin(ScanSetup):
 
        def scanFinished(self, value = None):
                print "finished"
 
        def scanFinished(self, value = None):
                print "finished"

+               print "self.scanIndex:", self.scanIndex

                db = eDVBDB.getInstance()
                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" />
        <prerequisites>
                <tag type="services" />
                <bcastsystem type="DVB-S" />


@@ -113,8 +116,8 @@ class DefaultServicesScannerPlugin(ScanSetup):
                </file>
        </files>
 </default>""" % (satint, "Dream", nimmanager.getSatDescription(satint), satint)
                </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):
                
                self.scanIndex += 1
                if self.scanIndex + 1 >= len(self.multiscanlist):