fix typo

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

diff --git a/lib/python/Components/DreamInfoHandler.py b/lib/python/Components/DreamInfoHandler.py
index 8e9a8a27a3a0476af68991a7f16115327e85d9b8..2f2e757cf4e12b22662c7b2ebb1d9788cce612da 100644 (file)
--- a/lib/python/Components/DreamInfoHandler.py
+++ b/lib/python/Components/DreamInfoHandler.py
@@ -1,8 +1,9 @@
 import xml.sax
 import xml.sax

-from Tools.Directories import crawlDirectory, resolveFilename, SCOPE_CONFIG, SCOPE_SKIN
+from Tools.Directories import crawlDirectory, resolveFilename, SCOPE_CONFIG, SCOPE_SKIN, copyfile, copytree

 from Components.NimManager import nimmanager
 from Components.Ipkg import IpkgComponent
 from Components.config import config, configfile
 from Components.NimManager import nimmanager
 from Components.Ipkg import IpkgComponent
 from Components.config import config, configfile

+from Tools.HardwareInfo import HardwareInfo

 from enigma import eConsoleAppContainer, eDVBDB
 import os
 
 from enigma import eConsoleAppContainer, eDVBDB
 import os
 


@@ -22,16 +23,15 @@ class InfoHandler(xml.sax.ContentHandler):
                self.elements = []
                self.validFileTypes = ["skin", "config", "services", "favourites", "package"]
                self.prerequisitesMet = prerequisiteMet
                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):
        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)
                self.elements.append(name)

-               if name in ["hardware", "bcastsystem", "satellite", "tag"]:
+               if name in ("hardware", "bcastsystem", "satellite", "tag"):

                        if not attrs.has_key("type"):
                                        self.printError(str(name) + " tag with no type attribute")
                        if self.elements[-3] == "default":
                        if not attrs.has_key("type"):
                                        self.printError(str(name) + " tag with no type attribute")
                        if self.elements[-3] == "default":


@@ -63,11 +63,11 @@ class InfoHandler(xml.sax.ContentHandler):
                                                self.filetype = type
                                                self.fileattrs = attrs
        def endElement(self, name):
                                                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":
                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] = []
                        if len(self.prerequisites) == 0 or self.prerequisitesMet(self.prerequisites):
                                if not self.attributes.has_key(self.filetype):
                                        self.attributes[self.filetype] = []


@@ -89,7 +89,7 @@ class InfoHandler(xml.sax.ContentHandler):
                        self.attributes["author"] = str(data)
                if self.elements[-1] == "name":
                        self.attributes["name"] = str(data)
                        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
                
 class DreamInfoHandler:
        STATUS_WORKING = 0


@@ -98,6 +98,7 @@ class DreamInfoHandler:
        STATUS_INIT = 4
        
        def __init__(self, statusCallback, blocking = False, neededTag = None):
        STATUS_INIT = 4
        
        def __init__(self, statusCallback, blocking = False, neededTag = None):

+               self.hardware_info = HardwareInfo()

                self.directory = "/"
                
                self.neededTag = neededTag
                self.directory = "/"
                
                self.neededTag = neededTag


@@ -109,7 +110,8 @@ class DreamInfoHandler:
                self.currentlyInstallingMetaIndex = None
                
                self.console = eConsoleAppContainer()
                self.currentlyInstallingMetaIndex = None
                
                self.console = eConsoleAppContainer()

-               self.console.appClosed.get().append(self.installNext)
+               self.console.appClosed.append(self.installNext)
+               self.reloadFavourites = False

                
                self.statusCallback = statusCallback
                self.setStatus(self.STATUS_INIT)
                
                self.statusCallback = statusCallback
                self.setStatus(self.STATUS_INIT)


@@ -130,7 +132,13 @@ class DreamInfoHandler:
        # prerequisites = True: give only packages matching the prerequisites
        def fillPackagesList(self, prerequisites = True):
                self.packageslist = []
        # 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])
                        
                for package in packages:
                        self.readInfo(package[0] + "/", package[0] + "/" + package[1])
                        


@@ -138,7 +146,7 @@ class DreamInfoHandler:
                        for package in self.packageslist[:]:
                                if not self.prerequisiteMet(package[0]["prerequisites"]):
                                        self.packageslist.remove(package)
                        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...
                        
        def prerequisiteMet(self, prerequisites):
                # TODO: we need to implement a hardware detection here...


@@ -149,18 +157,29 @@ class DreamInfoHandler:
                                return False
                else:
                        if prerequisites.has_key("tag"):
                                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"):
                if prerequisites.has_key("bcastsystem"):

+                       has_system = False

                        for bcastsystem in prerequisites["bcastsystem"]:
                                if nimmanager.hasNimType(bcastsystem):
                        for bcastsystem in prerequisites["bcastsystem"]:
                                if nimmanager.hasNimType(bcastsystem):

-                                       return True
-                       return False
+                                       has_system = True
+                       if not has_system:
+                               return False

                if prerequisites.has_key("hardware"):
                if prerequisites.has_key("hardware"):

+                       hardware_found = False

                        for hardware in prerequisites["hardware"]:
                        for hardware in prerequisites["hardware"]:

-                               # TODO: hardware detection
-                               met = True
+                               if hardware == self.hardware_info.device_name:
+                                       hardware_found = True
+                       if not hardware_found:
+                               return False

                return True
        
        def installPackages(self, indexes):
                return True
        
        def installPackages(self, indexes):


@@ -174,6 +193,10 @@ class DreamInfoHandler:
                self.installPackage(self.installIndexes[self.currentlyInstallingMetaIndex])
 
        def installPackage(self, index):
                self.installPackage(self.installIndexes[self.currentlyInstallingMetaIndex])
 
        def installPackage(self, index):

+               print "self.packageslist:", self.packageslist
+               if len(self.packageslist) <= index:
+                       print "no package with index", index, "found... installing nothing"
+                       return

                print "installing package with index", index, "and name", self.packageslist[index][0]["attributes"]["name"]
                
                attributes = self.packageslist[index][0]["attributes"]
                print "installing package with index", index, "and name", self.packageslist[index][0]["attributes"]["name"]
                
                attributes = self.packageslist[index][0]["attributes"]


@@ -188,20 +211,30 @@ class DreamInfoHandler:
                self.statusCallback(self.status, None)
                                                
        def installNext(self, *args, **kwargs):
                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
                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:
                        if self.currentlyInstallingMetaIndex is None or self.currentlyInstallingMetaIndex >= len(self.installIndexes) - 1:

+                               print "set status to DONE"

                                self.setStatus(self.STATUS_DONE)
                                return
                        else:
                                self.setStatus(self.STATUS_DONE)
                                return
                        else:

+                               print "increment meta index to install next package"

                                self.currentlyInstallingMetaIndex += 1
                                self.currentlyInstallingMetaIndex += 1

+                               self.currentAttributeIndex = 0

                                self.installPackage(self.installIndexes[self.currentlyInstallingMetaIndex])
                                self.installPackage(self.installIndexes[self.currentlyInstallingMetaIndex])

+                               return

                
                self.setStatus(self.STATUS_WORKING)             
                
                
                self.setStatus(self.STATUS_WORKING)             
                

+               print "currentAttributeIndex:", self.currentAttributeIndex

                currentAttribute = self.attributeNames[self.currentAttributeIndex]
                
                print "installing", currentAttribute, "with index", self.currentIndex
                currentAttribute = self.attributeNames[self.currentAttributeIndex]
                
                print "installing", currentAttribute, "with index", self.currentIndex


@@ -272,7 +305,7 @@ class DreamInfoHandler:
                print "installing skin:", directory, " - ", name
                print "cp -a %s %s" % (directory, resolveFilename(SCOPE_SKIN))
                if self.blocking:
                print "installing skin:", directory, " - ", name
                print "cp -a %s %s" % (directory, resolveFilename(SCOPE_SKIN))
                if self.blocking:

-                       os.system("cp -a %s %s" % (directory, resolveFilename(SCOPE_SKIN)))
+                       copytree(directory, resolveFilename(SCOPE_SKIN))

                        self.installNext()
                else:
                        if self.console.execute("cp -a %s %s" % (directory, resolveFilename(SCOPE_SKIN))):
                        self.installNext()
                else:
                        if self.console.execute("cp -a %s %s" % (directory, resolveFilename(SCOPE_SKIN))):


@@ -290,9 +323,10 @@ class DreamInfoHandler:
 
        def installFavourites(self, directory, name):
                print "installing favourites:", directory, " - ", name
 
        def installFavourites(self, directory, name):
                print "installing favourites:", directory, " - ", name

+               self.reloadFavourites = True

 
                if self.blocking:
 
                if self.blocking:

-                       os.system("cp %s %s" % ((directory + name), resolveFilename(SCOPE_CONFIG)))
+                       copyfile(directory + name, resolveFilename(SCOPE_CONFIG))

                        self.installNext()
                else:
                        if self.console.execute("cp %s %s" % ((directory + name), resolveFilename(SCOPE_CONFIG))):
                        self.installNext()
                else:
                        if self.console.execute("cp %s %s" % ((directory + name), resolveFilename(SCOPE_CONFIG))):