git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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 570143da2e5377ce2124741c575fd9b0234fb906..6cd967003bbdf392cd6608118b0553c3e00febec 100644
(file)
--- a/
lib/python/Components/DreamInfoHandler.py
+++ b/
lib/python/Components/DreamInfoHandler.py
@@
-22,8
+22,7
@@
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 printError(self, error):
print "Error in defaults xml files:", error
raise InfoHandlerParseError, error
@@
-110,6
+109,7
@@
class DreamInfoHandler:
self.console = eConsoleAppContainer()
self.console.appClosed.get().append(self.installNext)
self.console = eConsoleAppContainer()
self.console.appClosed.get().append(self.installNext)
+ self.reloadFavourites = False
self.statusCallback = statusCallback
self.setStatus(self.STATUS_INIT)
self.statusCallback = statusCallback
self.setStatus(self.STATUS_INIT)
@@
-157,6
+157,8
@@
class DreamInfoHandler:
if prerequisites.has_key("tag"):
if not self.neededTag in prerequisites["tag"]:
return False
if prerequisites.has_key("tag"):
if not self.neededTag in prerequisites["tag"]:
return False
+ else:
+ return False
if prerequisites.has_key("satellite"):
for sat in prerequisites["satellite"]:
if prerequisites.has_key("satellite"):
for sat in prerequisites["satellite"]:
@@
-198,6
+200,10
@@
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
self.currentIndex += 1
attributes = self.installingAttributes
#print "attributes:", attributes
@@
-303,7
+309,8
@@
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:
os.system("cp %s %s" % ((directory + name), resolveFilename(SCOPE_CONFIG)))
self.installNext()
if self.blocking:
os.system("cp %s %s" % ((directory + name), resolveFilename(SCOPE_CONFIG)))
self.installNext()