- improved scan error handling

[enigma2.git] / components.py

diff --git a/components.py b/components.py
index a5df8ffef7f10460a5704f3bad750016f637c234..af0fbffa6441814ea8891ab6689e8225bedada39 100644 (file)
--- a/components.py
+++ b/components.py
@@ -277,7 +277,7 @@ class ServiceList(HTMLComponent, GUIComponent):
        def __init__(self):
                GUIComponent.__init__(self)
                self.l = eListboxServiceContent()
-       
+               
        def getCurrent(self):
                r = eServiceReference()
                self.l.getCurrent(r)
@@ -292,6 +292,19 @@ class ServiceList(HTMLComponent, GUIComponent):
 
        def setRoot(self, root):
                self.l.setRoot(root)
+               
+               # mark stuff
+       def clearMarked(self):
+               self.l.clearMarked()
+       
+       def isMarked(self, ref):
+               return self.l.isMarked(ref)
+
+       def addMarked(self, ref):
+               self.l.addMarked(ref)
+       
+       def removeMarked(self, ref):
+               self.l.removeMarked(ref)
 
 class ServiceScan:
        
@@ -299,12 +312,25 @@ class ServiceScan:
        Running = 2
        Done = 3
        Error = 4
+       
+       Errors = { 
+               1: "error while scanning",
+               2: "no resource manager",
+               3: "no channel list"
+               }
+               
                
        def scanStatusChanged(self):
                if self.state == self.Running:
                        self.progressbar.setValue(self.scan.getProgress())
                        if self.scan.isDone():
-                               self.state = self.Done
+                               errcode = self.scan.getError()
+                               
+                               if errcode == 0:
+                                       self.state = self.Done
+                               else:
+                                       self.state = self.Error
+                                       self.errorcode = errcode
                        else:
                                self.text.setText("scan in progress - %d %% done!\n%d services found!" % (self.scan.getProgress(), self.scan.getNumServices()))
                
@@ -312,7 +338,7 @@ class ServiceScan:
                        self.text.setText("scan done!")
                
                if self.state == self.Error:
-                       self.text.setText("ERROR - failed to scan!")
+                       self.text.setText("ERROR - failed to scan (%s)!" % (self.Errors[self.errorcode]) )
        
        def __init__(self, progressbar, text):
                self.progressbar = progressbar
@@ -323,10 +349,10 @@ class ServiceScan:
                
        def execBegin(self):
                self.scan.statusChanged.get().append(self.scanStatusChanged)
+               self.state = self.Running
                if self.scan.start():
                        self.state = self.Error
-               else:
-                       self.state = self.Running
+
                self.scanStatusChanged()
        
        def execEnd(self):
@@ -335,23 +361,27 @@ class ServiceScan:
                        print "*** warning *** scan was not finished!"
 
        def isDone(self):
-               return self.state == self.Done
+               print "state is %d " % (self.state)
+               return self.state == self.Done or self.state == self.Error
        
 class ActionMap:
-       def __init__(self, context, actions = { }, prio=0):
+       def __init__(self, contexts = [ ], actions = { }, prio=0):
                self.actions = actions
-               self.context = context
+               self.contexts = contexts
                self.prio = prio
                self.p = eActionMapPtr()
                eActionMap.getInstance(self.p)
 
        def execBegin(self):
-               self.p.bindAction(self.context, self.prio, self.action)
+               for ctx in self.contexts:
+                       self.p.bindAction(ctx, self.prio, self.action)
        
        def execEnd(self):
-               self.p.unbindAction(self.context, self.action)
+               for ctx in self.contexts:
+                       self.p.unbindAction(ctx, self.action)
        
        def action(self, context, action):
+               print " ".join(("action -> ", context, action))
                try:
                        self.actions[action]()
                except KeyError:
@@ -390,12 +420,12 @@ class EventInfo(PerServiceDisplay):
        def __init__(self, navcore, now_or_next):
                # listen to evUpdatedEventInfo and evStopService
                # note that evStopService will be called once to establish a known state
+               self.now_or_next = now_or_next
                PerServiceDisplay.__init__(self, navcore, 
                        { 
                                pNavigation.evUpdatedEventInfo: self.ourEvent, 
                                pNavigation.evStopService: self.stopEvent 
                        })
-               self.now_or_next = now_or_next
 
        def ourEvent(self):
                info = iServiceInformationPtr()
@@ -412,7 +442,8 @@ class EventInfo(PerServiceDisplay):
                print "new event info in EventInfo! yeah!"
 
        def stopEvent(self):
-                       self.setText("waiting for event data...");
+               self.setText(
+                       ("waiting for event data...", "", "--:--",  "--:--")[self.now_or_next]);
 
 class ServiceName(PerServiceDisplay):
        def __init__(self, navcore):