- improved scan error handling

diff --git a/components.py b/components.py
index deb3760cccef06db3ffd3b0ae8294b910ca092d4..af0fbffa6441814ea8891ab6689e8225bedada39 100644 (file)
--- a/components.py
+++ b/components.py
@@ -312,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()))
                
@@ -325,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
@@ -336,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):

diff --git a/lib/components/scan.cpp b/lib/components/scan.cpp
index c82d04efa39547ffc139a9c024af51d13149111f..ad2e4d1aff2446e5422bde8422fffe3dce51b364 100644 (file)
--- a/lib/components/scan.cpp
+++ b/lib/components/scan.cpp
@@ -89,7 +89,10 @@ int eComponentScan::start()
        ePtr<iDVBChannel> channel;
 
        if (mgr->allocateRawChannel(channel))
+       {
                eDebug("scan: allocating raw channel failed!");
+               return -1;
+       }
 
        std::list<ePtr<iDVBFrontendParameters> > list;
                
@@ -98,7 +101,7 @@ int eComponentScan::start()
        m_scan = new eDVBScan(channel);
        m_scan->connectEvent(slot(*this, &eComponentScan::scanEvent), m_scan_event_connection);
        m_scan->start(list);
-
+       
        return 0;
 }
 
@@ -126,3 +129,8 @@ int eComponentScan::isDone()
 {
        return m_done;
 }
+
+int eComponentScan::getError()
+{
+       return m_failed;
+}

diff --git a/lib/components/scan.h b/lib/components/scan.h
index ca64f5e2bc28d0f8dc733cd735bb408bc7893b5f..6245613832ba666dc09534ccf65faaa58a780372 100644 (file)
--- a/lib/components/scan.h
+++ b/lib/components/scan.h
@@ -26,9 +26,11 @@ public:
                /* get number of services */
        int getNumServices();
        
-               /* true when done. */
+               /* true when done or error */
        int isDone();
        
+       int getError();
+       
        int start();
 };
 

diff --git a/screens.py b/screens.py
index 999ad4bff9104cf65a2e4b0cae82eb6b80e04a3b..fe8d69dbdbe73522a393aae34734dbb48ae30b5d 100644 (file)
--- a/screens.py
+++ b/screens.py
@@ -166,6 +166,9 @@ class serviceScan(Screen):
                if self["scan"].isDone():
                        self.close()
        
+       def cancel(self):
+               print "cancel not yet implemented ;)"
+       
        def __init__(self, session):
                Screen.__init__(self, session)
                
@@ -173,5 +176,9 @@ class serviceScan(Screen):
                self["scan_state"] = Label("scan state")
                self["scan"] = ServiceScan(self["scan_progress"], self["scan_state"])
 
-               self["okbutton"] = Button("ok", [self.ok])
-               self["okbutton"].disable()
+               self["actions"] = ActionMap(["OkCancelActions"], 
+                       {
+                               "ok": self.ok,
+                               "cancel": self.cancel
+                       })
+

diff --git a/skin.py b/skin.py
index 2986a4476f17223bdf7e24a7b336d2bc8ec5aaab..2e913a08cdfbd4d2db95f88914dece7f7e5ada8e 100644 (file)
--- a/skin.py
+++ b/skin.py
@@ -69,7 +69,6 @@ dom = xml.dom.minidom.parseString(
                <screen name="serviceScan" position="150,100" size="300,200" title="Service Scan">
                        <widget name="scan_progress" position="10,10" size="280,50" />
                        <widget name="scan_state" position="10,60" size="280,30" />
-                       <widget name="okbutton" position="10,100" size="280,40" />
                </screen>
        </skin>""")