diff options
Diffstat (limited to 'lib/python/Components')
| -rw-r--r-- | lib/python/Components/ServiceScan.py | 9 | ||||
| -rw-r--r-- | lib/python/Components/Sources/FrontendStatus.py | 6 |
2 files changed, 8 insertions, 7 deletions
diff --git a/lib/python/Components/ServiceScan.py b/lib/python/Components/ServiceScan.py index 09498713..26ce763b 100644 --- a/lib/python/Components/ServiceScan.py +++ b/lib/python/Components/ServiceScan.py @@ -46,18 +46,19 @@ class ServiceScan: self.run += 1 self.execBegin() - def __init__(self, progressbar, text, servicelist, passNumber, scanList): + def __init__(self, progressbar, text, servicelist, passNumber, scanList, frontendInfo): self.foundServices = 0 self.progressbar = progressbar self.text = text self.servicelist = servicelist self.passNumber = passNumber self.scanList = scanList + self.frontendInfo = frontendInfo self.run = 0 - + def doRun(self): self.scan = eComponentScan() - + self.frontendInfo.frontend_source = lambda : self.scan.getFrontend() self.feid = self.scanList[self.run]["feid"] self.flags = self.scanList[self.run]["flags"] self.state = self.Idle @@ -79,10 +80,10 @@ class ServiceScan: self.servicelist.clear() self.state = self.Running err = self.scan.start(self.feid, self.flags) + self.frontendInfo.updateFrontendData() if err: self.state = self.Error self.errorcode = 0 - self.scanStatusChanged() def execEnd(self): diff --git a/lib/python/Components/Sources/FrontendStatus.py b/lib/python/Components/Sources/FrontendStatus.py index e1623ae1..5e096186 100644 --- a/lib/python/Components/Sources/FrontendStatus.py +++ b/lib/python/Components/Sources/FrontendStatus.py @@ -29,11 +29,11 @@ class FrontendStatus(Source): def getFrontendStatus(self): if self.frontend_source: - frontend = self.frontend_source + frontend = self.frontend_source() + dict = { } if frontend: - dict = { } frontend.getFrontendStatus(dict) - return dict + return dict elif self.service_source: service = self.service_source() feinfo = service and service.frontendInfo() |