servicemp3.cpp: more simple/flexible streaming detection

[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 62f0d9bf76e7841f15b830fdb78833412a4b2b0a..d26881edd332d1d8dde9b88b6f194677062ca704 100644 (file)
--- 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,8 +116,8 @@ 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):
@@ -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)