git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix no more working tuner resource handling
[enigma2.git]
/
lib
/
python
/
Components
/
DreamInfoHandler.py
diff --git
a/lib/python/Components/DreamInfoHandler.py
b/lib/python/Components/DreamInfoHandler.py
index 833fea4c9181b8cc2b7bc11d7e4c16f4477c08d4..8e34632c7ed80e8bc7a5a6cde8d9529e359f0dfd 100644
(file)
--- a/
lib/python/Components/DreamInfoHandler.py
+++ b/
lib/python/Components/DreamInfoHandler.py
@@
-3,6
+3,7
@@
from Tools.Directories import crawlDirectory, resolveFilename, SCOPE_CONFIG, SCO
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
@@
-97,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
@@
-165,14
+167,19
@@
class DreamInfoHandler:
if int(sat) not in nimmanager.getConfiguredSats():
return False
if prerequisites.has_key("bcastsystem"):
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):
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):
@@
-186,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"]
@@
-208,7
+219,7
@@
class DreamInfoHandler:
attributes = self.installingAttributes
#print "attributes:", attributes
attributes = self.installingAttributes
#print "attributes:", attributes
- if self.currentAttributeIndex >= len(self.attributeNames)
- 1
: # end of package reached
+ 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"
print "end of package reached"
if self.currentlyInstallingMetaIndex is None or self.currentlyInstallingMetaIndex >= len(self.installIndexes) - 1:
print "set status to DONE"
@@
-219,9
+230,11
@@
class DreamInfoHandler:
self.currentlyInstallingMetaIndex += 1
self.currentAttributeIndex = 0
self.installPackage(self.installIndexes[self.currentlyInstallingMetaIndex])
self.currentlyInstallingMetaIndex += 1
self.currentAttributeIndex = 0
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