X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/417813b4955d2f48f708b3d114cab703bb5965f7..006e3497641164df7a413c8730d9b8914d67e2d8:/lib/python/Components/DreamInfoHandler.py diff --git a/lib/python/Components/DreamInfoHandler.py b/lib/python/Components/DreamInfoHandler.py old mode 100644 new mode 100755 index 3c014b8a..03d52157 --- a/lib/python/Components/DreamInfoHandler.py +++ b/lib/python/Components/DreamInfoHandler.py @@ -1,9 +1,13 @@ +# -*- coding: iso-8859-1 -*- import xml.sax -from Tools.Directories import crawlDirectory, resolveFilename, SCOPE_CONFIG, SCOPE_SKIN +from Tools.Directories import crawlDirectory, resolveFilename, SCOPE_CONFIG, SCOPE_SKIN, SCOPE_METADIR, copyfile, copytree from Components.NimManager import nimmanager from Components.Ipkg import IpkgComponent -from enigma import eConsoleAppContainer +from Components.config import config, configfile +from Tools.HardwareInfo import HardwareInfo +from enigma import eConsoleAppContainer, eDVBDB import os +from re import compile as re_compile, search as re_search, IGNORECASE class InfoHandlerParseError(Exception): def __init__(self, value): @@ -21,30 +25,39 @@ class InfoHandler(xml.sax.ContentHandler): self.elements = [] self.validFileTypes = ["skin", "config", "services", "favourites", "package"] self.prerequisitesMet = prerequisiteMet - - + self.data = "" + 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"]: + + if name in ("hardware", "bcastsystem", "satellite", "tag", "flag"): if not attrs.has_key("type"): self.printError(str(name) + " tag with no type attribute") - if self.elements[-3] == "default": + if self.elements[-3] in ("default", "package"): prerequisites = self.globalprerequisites else: prerequisites = self.prerequisites if not prerequisites.has_key(name): prerequisites[name] = [] prerequisites[name].append(str(attrs["type"])) + + if name == "info": + self.foundTranslation = None + self.data = "" + if name == "files": if attrs.has_key("type"): if attrs["type"] == "directories": self.attributes["filestype"] = "directories" + elif attrs["type"] == "package": + self.attributes["filestype"] = "package" # TODO add a compressed archive type + if name == "file": self.prerequisites = {} if not attrs.has_key("type"): @@ -61,12 +74,29 @@ class InfoHandler(xml.sax.ContentHandler): else: self.filetype = type self.fileattrs = attrs + + if name == "package": + if attrs.has_key("details"): + self.attributes["details"] = str(attrs["details"]) + if attrs.has_key("name"): + self.attributes["name"] = str(attrs["name"]) + if attrs.has_key("packagename"): + self.attributes["packagename"] = str(attrs["packagename"]) + if attrs.has_key("packagetype"): + self.attributes["packagetype"] = str(attrs["packagetype"]) + if attrs.has_key("shortdescription"): + self.attributes["shortdescription"] = str(attrs["shortdescription"]) + + if name == "screenshot": + if attrs.has_key("src"): + self.attributes["screenshot"] = str(attrs["src"]) + def endElement(self, name): - print "end", name - print "self.elements:", self.elements + #print "endElement", 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] = [] @@ -77,36 +107,57 @@ class InfoHandler(xml.sax.ContentHandler): else: directory = self.directory self.attributes[self.filetype].append({ "name": str(self.fileattrs["name"]), "directory": directory }) - - if name == "default": + + if name in ( "default", "package" ): self.list.append({"attributes": self.attributes, 'prerequisites': self.globalprerequisites}) self.attributes = {} self.globalprerequisites = {} - + def characters(self, data): if self.elements[-1] == "author": self.attributes["author"] = str(data) if self.elements[-1] == "name": self.attributes["name"] = str(data) - print "characters", data - + if self.elements[-1] == "packagename": + self.attributes["packagename"] = str(data) + if self.elements[-1] == "shortdescription": + self.attributes["shortdescription"] = str(data) + if self.elements[-1] == "description": + self.data += data.strip() + self.attributes["description"] = str(self.data) + #print "characters", data + + class DreamInfoHandler: STATUS_WORKING = 0 STATUS_DONE = 1 STATUS_ERROR = 2 STATUS_INIT = 4 - - def __init__(self, statusCallback): + + def __init__(self, statusCallback, blocking = False, neededTag = None, neededFlag = None): + self.hardware_info = HardwareInfo() self.directory = "/" - + + self.neededTag = neededTag + self.neededFlag = neededFlag + + # caution: blocking should only be used, if further execution in enigma2 depends on the outcome of + # the installer! + self.blocking = blocking + + 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.packageslist = [] - + self.packagesIndexlist = [] + self.packageDetails = [] + def readInfo(self, directory, file): print "Reading .info file", file handler = InfoHandler(self.prerequisiteMet, directory) @@ -116,37 +167,146 @@ class DreamInfoHandler: self.packageslist.append((entry,file)) except InfoHandlerParseError: print "file", file, "ignored due to errors in the file" - print handler.list - + #print handler.list + + def readIndex(self, directory, file): + print "Reading .xml meta index file", directory, file + handler = InfoHandler(self.prerequisiteMet, directory) + try: + xml.sax.parse(file, handler) + for entry in handler.list: + self.packagesIndexlist.append((entry,file)) + except InfoHandlerParseError: + print "file", file, "ignored due to errors in the file" + #print handler.list + + def readDetails(self, directory, file): + self.packageDetails = [] + print "Reading .xml meta details file", file + handler = InfoHandler(self.prerequisiteMet, directory) + try: + xml.sax.parse(file, handler) + for entry in handler.list: + self.packageDetails.append((entry,file)) + except InfoHandlerParseError: + print "file", file, "ignored due to errors in the file" + #print handler.list + # 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]) - + if prerequisites: for package in self.packageslist[:]: if not self.prerequisiteMet(package[0]["prerequisites"]): self.packageslist.remove(package) - return packages + return self.packageslist + + # prerequisites = True: give only packages matching the prerequisites + def fillPackagesIndexList(self, prerequisites = True): + self.packagesIndexlist = [] + indexfileList = [] + + if not isinstance(self.directory, list): + self.directory = [self.directory] + + for indexfile in os.listdir(self.directory[0]): + if indexfile.startswith("index-"): + if indexfile.endswith(".xml"): + if indexfile[-7:-6] == "_": + continue + indexfileList.append(indexfile) + if len(indexfileList): + for file in indexfileList: + neededFile = self.directory[0] + "/" + file + if os.path.isfile(neededFile): + self.readIndex(self.directory[0] + "/" , neededFile) + + if prerequisites: + for package in self.packagesIndexlist[:]: + if not self.prerequisiteMet(package[0]["prerequisites"]): + self.packagesIndexlist.remove(package) + return self.packagesIndexlist + + # prerequisites = True: give only packages matching the prerequisites + def fillPackageDetails(self, details = None): + self.packageDetails = [] + detailsfile = details + if not isinstance(self.directory, list): + self.directory = [self.directory] + self.readDetails(self.directory[0] + "/", self.directory[0] + "/" + detailsfile) + return self.packageDetails def prerequisiteMet(self, prerequisites): # TODO: we need to implement a hardware detection here... print "prerequisites:", prerequisites met = True + if self.neededTag is None: + if prerequisites.has_key("tag"): + return False + elif self.neededTag == 'ALL_TAGS': + return True + else: + if prerequisites.has_key("tag"): + if not self.neededTag in prerequisites["tag"]: + return False + else: + return False + + if self.neededFlag is None: + if prerequisites.has_key("flag"): + return False + else: + if prerequisites.has_key("flag"): + if not self.neededFlag in prerequisites["flag"]: + return False + else: + return True # No flag found, assuming all flags valid + + if prerequisites.has_key("satellite"): + for sat in prerequisites["satellite"]: + if int(sat) not in nimmanager.getConfiguredSats(): + return False if prerequisites.has_key("bcastsystem"): + has_system = False 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"): + hardware_found = False 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): + print "installing packages", indexes + if len(indexes) == 0: + self.setStatus(self.STATUS_DONE) + return + self.installIndexes = indexes + print "+++++++++++++++++++++++bla" + self.currentlyInstallingMetaIndex = 0 + 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"] @@ -161,15 +321,30 @@ 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 reached - self.setStatus(self.STATUS_DONE) - return + 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.currentAttributeIndex = 0 + self.installPackage(self.installIndexes[self.currentlyInstallingMetaIndex]) + return self.setStatus(self.STATUS_WORKING) + print "currentAttributeIndex:", self.currentAttributeIndex currentAttribute = self.attributeNames[self.currentAttributeIndex] print "installing", currentAttribute, "with index", self.currentIndex @@ -181,6 +356,7 @@ class DreamInfoHandler: self.installNext() return else: # nothing to install here + self.currentIndex = -1 self.currentAttributeIndex += 1 self.installNext() return @@ -214,41 +390,19 @@ class DreamInfoHandler: def mergeConfig(self, directory, name, merge = True): print "merging config:", directory, " - ", name - - newconfig = self.readfile(directory + name) - newconfig.sort() - print newconfig - - if merge: - oldconfig = self.readfile(resolveFilename(SCOPE_CONFIG) + "settings") - oldconfig.sort() - print oldconfig - else: - oldconfig = [] - - # merge with duplicate removal through dictionary - mergeddict = {} - for list in oldconfig, newconfig: - for entry in list: - splitentry = entry.split("=") - if len(splitentry) != 2: # wrong entry - continue - mergeddict[splitentry[0]] = splitentry[1].strip() - - print "new:" - fd = open(resolveFilename(SCOPE_CONFIG) + "settings", "w") - for entry in mergeddict.keys(): - print entry + "=" + mergeddict[entry] - fd.write(entry + "=" + mergeddict[entry] + '\n') - fd.close() + if os.path.isfile(directory + name): + config.loadFromFile(directory + name) + configfile.save() self.installNext() - #configfile.load() - def installIPK(self, directory, name): - self.ipkg = IpkgComponent() - self.ipkg.addCallback(self.ipkgCallback) - self.ipkg.startCmd(IpkgComponent.CMD_INSTALL, {'package': directory + name}) + if self.blocking: + os.system("ipkg install " + directory + name) + self.installNext() + else: + self.ipkg = IpkgComponent() + self.ipkg.addCallback(self.ipkgCallback) + self.ipkg.startCmd(IpkgComponent.CMD_INSTALL, {'package': directory + name}) def ipkgCallback(self, event, param): print "ipkgCallback" @@ -260,68 +414,31 @@ class DreamInfoHandler: def installSkin(self, directory, name): print "installing skin:", directory, " - ", name print "cp -a %s %s" % (directory, resolveFilename(SCOPE_SKIN)) - if self.console.execute("cp -a %s %s" % (directory, resolveFilename(SCOPE_SKIN))): - print "execute failed" + if self.blocking: + copytree(directory, resolveFilename(SCOPE_SKIN)) self.installNext() + else: + if self.console.execute("cp -a %s %s" % (directory, resolveFilename(SCOPE_SKIN))): + print "execute failed" + self.installNext() - def readServices(self, filename): - newservicesfile = self.readfile(filename) - - transponders = [] - services = [] - status = 0 # 0 = start, 1 = transponders, 2 = services - count = 0 - while count < len(newservicesfile): - if status == 0: - if newservicesfile[count].strip() == "transponders": - status = 1 - elif status == 1: # reading transponders - if newservicesfile[count].strip() == "end": # finished reading transponders - pass - elif newservicesfile[count].strip() == "services": # start of services section - status = 2 - else: - transponders.append(''.join(newservicesfile[count:count + 3])) - count += 2 - elif status == 2: # reading services - if newservicesfile[count].strip() == "end": # finished reading file - break - else: - services.append(''.join(newservicesfile[count:count + 3])) - count += 2 - count += 1 - return (transponders, services) - def mergeServices(self, directory, name, merge = False): print "merging services:", directory, " - ", name - - newtransponders, newservices = self.readServices(directory + name) - if merge: - oldtransponders, oldservices = self.readServices(resolveFilename(SCOPE_CONFIG) + "lamedb") - else: - oldtransponders, oldservices = [], [] - - fp = open(resolveFilename(SCOPE_CONFIG) + "lamedb", "w") - fp.write("eDVB services /3/\n") - - fp.write("transponders\n") - for transponderlist in oldtransponders, newtransponders: - for transponder in transponderlist: - fp.write(transponder) - fp.write("end\n") - - fp.write("services\n") - for serviceslist in oldservices, newservices: - for service in serviceslist: - fp.write(service) - fp.write("end\n") - - fp.close() + if os.path.isfile(directory + name): + db = eDVBDB.getInstance() + db.reloadServicelist() + db.loadServicelist(directory + name) + db.saveServicelist() self.installNext() def installFavourites(self, directory, name): print "installing favourites:", directory, " - ", name + self.reloadFavourites = True - if self.console.execute("cp %s %s" % ((directory + name), resolveFilename(SCOPE_CONFIG))): - print "execute failed" + if self.blocking: + copyfile(directory + name, resolveFilename(SCOPE_CONFIG)) self.installNext() + else: + if self.console.execute("cp %s %s" % ((directory + name), resolveFilename(SCOPE_CONFIG))): + print "execute failed" + self.installNext()