call reloadBouquets instead of loadBouquets

[enigma2.git] / lib / python / Components / DreamInfoHandler.py

diff --git a/lib/python/Components/DreamInfoHandler.py b/lib/python/Components/DreamInfoHandler.py
index 8e9a8a27a3a0476af68991a7f16115327e85d9b8..6cd967003bbdf392cd6608118b0553c3e00febec 100644 (file)
--- a/lib/python/Components/DreamInfoHandler.py
+++ b/lib/python/Components/DreamInfoHandler.py
@@ -22,14 +22,13 @@ class InfoHandler(xml.sax.ContentHandler):
                self.elements = []
                self.validFileTypes = ["skin", "config", "services", "favourites", "package"]
                self.prerequisitesMet = prerequisiteMet
-       
-                               
+               
        def printError(self, error):
                print "Error in defaults xml files:", error
                raise InfoHandlerParseError, error
     
        def startElement(self, name, attrs):
-               print name, ":", attrs.items()
+               #print name, ":", attrs.items()
                self.elements.append(name)
                if name in ["hardware", "bcastsystem", "satellite", "tag"]:
                        if not attrs.has_key("type"):
@@ -63,11 +62,11 @@ class InfoHandler(xml.sax.ContentHandler):
                                                self.filetype = type
                                                self.fileattrs = attrs
        def endElement(self, name):
-               print "end", name
-               print "self.elements:", self.elements
+               #print "end", name
+               #print "self.elements:", self.elements
                self.elements.pop()
                if name == "file":
-                       print "prerequisites:", self.prerequisites
+                       #print "prerequisites:", self.prerequisites
                        if len(self.prerequisites) == 0 or self.prerequisitesMet(self.prerequisites):
                                if not self.attributes.has_key(self.filetype):
                                        self.attributes[self.filetype] = []
@@ -89,7 +88,7 @@ class InfoHandler(xml.sax.ContentHandler):
                        self.attributes["author"] = str(data)
                if self.elements[-1] == "name":
                        self.attributes["name"] = str(data)
-               print "characters", data
+               #print "characters", data
                
 class DreamInfoHandler:
        STATUS_WORKING = 0
@@ -110,6 +109,7 @@ class DreamInfoHandler:
                
                self.console = eConsoleAppContainer()
                self.console.appClosed.get().append(self.installNext)
+               self.reloadFavourites = False
                
                self.statusCallback = statusCallback
                self.setStatus(self.STATUS_INIT)
@@ -130,7 +130,13 @@ class DreamInfoHandler:
        # prerequisites = True: give only packages matching the prerequisites
        def fillPackagesList(self, prerequisites = True):
                self.packageslist = []
-               packages = crawlDirectory(self.directory, ".*\.info$")
+               packages = []
+               if not isinstance(self.directory, list):
+                       self.directory = [self.directory]
+               
+               for directory in self.directory:
+                       packages += crawlDirectory(directory, ".*\.info$")
+
                for package in packages:
                        self.readInfo(package[0] + "/", package[0] + "/" + package[1])
                        
@@ -138,7 +144,7 @@ class DreamInfoHandler:
                        for package in self.packageslist[:]:
                                if not self.prerequisiteMet(package[0]["prerequisites"]):
                                        self.packageslist.remove(package)
-               return packages
+               return self.packageslist
                        
        def prerequisiteMet(self, prerequisites):
                # TODO: we need to implement a hardware detection here...
@@ -149,9 +155,15 @@ class DreamInfoHandler:
                                return False
                else:
                        if prerequisites.has_key("tag"):
-                               if self.neededTag in prerequisites["tag"]:
-                                       return True
-                       return False
+                               if not self.neededTag in prerequisites["tag"]:
+                                       return False
+                       else:
+                               return False
+                               
+               if prerequisites.has_key("satellite"):
+                       for sat in prerequisites["satellite"]:
+                               if int(sat) not in nimmanager.getConfiguredSats():
+                                       return False                    
                if prerequisites.has_key("bcastsystem"):
                        for bcastsystem in prerequisites["bcastsystem"]:
                                if nimmanager.hasNimType(bcastsystem):
@@ -188,15 +200,22 @@ class DreamInfoHandler:
                self.statusCallback(self.status, None)
                                                
        def installNext(self, *args, **kwargs):
+               if self.reloadFavourites:
+                       self.reloadFavourites = False
+                       db = eDVBDB.getInstance().reloadBouquets()
+
                self.currentIndex += 1
                attributes = self.installingAttributes
                #print "attributes:", attributes
                
                if self.currentAttributeIndex >= len(self.attributeNames): # end of package reached
+                       print "end of package reached"
                        if self.currentlyInstallingMetaIndex is None or self.currentlyInstallingMetaIndex >= len(self.installIndexes) - 1:
+                               print "set status to DONE"
                                self.setStatus(self.STATUS_DONE)
                                return
                        else:
+                               print "increment meta index to install next package"
                                self.currentlyInstallingMetaIndex += 1
                                self.installPackage(self.installIndexes[self.currentlyInstallingMetaIndex])
                
@@ -290,7 +309,8 @@ class DreamInfoHandler:
 
        def installFavourites(self, directory, name):
                print "installing favourites:", directory, " - ", name
-
+               self.reloadFavourites = True
+               
                if self.blocking:
                        os.system("cp %s %s" % ((directory + name), resolveFilename(SCOPE_CONFIG)))
                        self.installNext()