Hide the settings storing api

[bertos.git] / wizard / BToolchainPage.py

diff --git a/wizard/BToolchainPage.py b/wizard/BToolchainPage.py
index 202349a9f72c03fd585446909631001014db53c5..2afcf1be1e94b48c0f2e16a5dbbbf9d2a77ab69a 100644 (file)
--- a/wizard/BToolchainPage.py
+++ b/wizard/BToolchainPage.py
@@ -9,9 +9,12 @@
 # Author: Lorenzo Berni <duplo@develer.com>
 #
 
+import os
+
 from BWizardPage import *
 import BToolchainSearch
 import bertos_utils
+import qvariant_converter
 
 class BToolchainPage(BWizardPage):
     
@@ -33,10 +36,10 @@ class BToolchainPage(BWizardPage):
             self.pageContent.doSearchButton.setEnabled(False)
     
     def _populateToolchainList(self):
-        toolchains = self._settingsRetrieve("toolchains").toList()
+        toolchains = self.toolchains()
         for element in toolchains:
-            item = QListWidgetItem(element.toString())
-            item.setData(Qt.UserRole, element)
+            item = QListWidgetItem(element)
+            item.setData(Qt.UserRole, QVariant(element))
             self.pageContent.toolchainList.addItem(item)
             
     def _clearList(self):
@@ -46,12 +49,17 @@ class BToolchainPage(BWizardPage):
         self.emit(SIGNAL("completeChanged()"))
     
     def _search(self):
-        dirList = [unicode(element.toString()) for element in self._settingsRetrieve("search_dir_list").toList()]
-        dirList += [element for element in bertos_utils.getSystemPath()]
+        dirList = self.searchDirList()
+        if(self.pathSearch()):
+            dirList += [element for element in bertos_utils.getSystemPath()]
         toolchainList = bertos_utils.findToolchains(dirList)
+        storedToolchainList = self.toolchains()
+        toolchainList = set(toolchainList) - set(storedToolchainList)
         for element in toolchainList:
-            self.pageContent.toolchainList.addItem(QListWidgetItem(element))
-        self._settingsStore("toolchains", toolchainList)
+            item = QListWidgetItem(element)
+            item.setData(Qt.UserRole, QVariant(element))
+            self.pageContent.toolchainList.addItem(item)
+        self.setToolchains(list(toolchainList.union(storedToolchainList)))
         
     def _connectSignals(self):
         self.connect(self.pageContent.toolchainList, SIGNAL("itemSelectionChanged()"), self._selectionChanged)
@@ -60,24 +68,36 @@ class BToolchainPage(BWizardPage):
         self.connect(self.pageContent.searchButton, SIGNAL("clicked()"), self.searchToolchain)
         self.connect(self.pageContent.checkButton, SIGNAL("clicked()"), self.validateToolchains)
     
+    def _validItem(self, index, infos):
+        item = self.pageContent.toolchainList.item(index)
+        needed = self._projectInfoRetrieve("CPU_INFOS")
+        if infos["target"].find(needed["TOOLCHAIN"]) != -1:
+            item.setIcon(QIcon(":/images/ok.png"))
+        else:
+            item.setIcon(QIcon(":/images/warning.png"))
+        item.setText(infos["version"] + " " + infos["target"])
+    
+    def _invalidItem(self, index):
+        item = self.pageContent.toolchainList.item(index)
+        item.setIcon(QIcon(":/images/error.png"))
+    
     def addToolchain(self):
         sel_toolchain = QFileDialog.getOpenFileName(self, self.tr("Choose the toolchain"), "")
         if not sel_toolchain.isEmpty():
             item = QListWidgetItem(sel_toolchain)
             item.setData(Qt.UserRole, QVariant(sel_toolchain))
             self.pageContent.toolchainList.addItem(item)
-            toolchains = self._settingsRetrieve("toolchains").toList()
-            toolchains = set([toolchain.toString() for toolchain in toolchains] + [sel_toolchain])
-            self._settingsStore("toolchains", list(toolchains))
+            toolchains = self.toolchains()
+            toolchains = set(toolchains + [sel_toolchain])
+            self.setToolchains(list(toolchains))
     
     def removeToolchain(self):
         if self.pageContent.toolchainList.currentRow() != -1:
             item = self.pageContent.toolchainList.takeItem(self.pageContent.toolchainList.currentRow())
-            item = item.data(Qt.UserRole).toString()
-            toolchains = self._settingsRetrieve("toolchains").toList()
-            toolchains = [toolchain.toString() for toolchain in toolchains]
-            toolchains.remove(unicode(item))
-            self._settingsStore("toolchains", toolchains)
+            toolchain = qvariant_converter.getString(item.data(Qt.UserRole))
+            toolchains = self.toolchains()
+            toolchains.remove(toolchain)
+            self.setToolchains(toolchains)
     
     def searchToolchain(self):
         search = BToolchainSearch.BToolchainSearch()
@@ -85,26 +105,26 @@ class BToolchainPage(BWizardPage):
         search.exec_()
     
     def validateToolchains(self):
-        print "validating toolchains"
-        print self.pageContent.toolchainList.count()
         for i in range(self.pageContent.toolchainList.count()):
-            filename = self.pageContent.toolchainList.item(i).text()
-            print i, filename
+            filename = qvariant_converter.getString(self.pageContent.toolchainList.item(i).data(Qt.UserRole))
             self._validationProcess = QProcess()
             self._validationProcess.start(filename, ["-v"])
-            self._validationProcess.waitForStarted(5)
-            if not self._validationProcess.waitForFinished(5):
-                self._validationProcess.kill()
-                print "process killed"
+            self._validationProcess.waitForStarted(1000)
+            if self._validationProcess.waitForFinished(200):
+                description = str(self._validationProcess.readAllStandardError())
+                infos = bertos_utils.getToolchainInfo(description)
+                if len(infos.keys()) == 4:
+                    self._validItem(i, infos)
+                else:
+                    self._invalidItem(i)
             else:
-                print self._validationProcess.readAllStandardError()
-    
-    def _getToolchainInfo():
-        print self._validationProcess.readAllStandardOutput()
+                self._validationProcess.kill()
+                self._invalidItem(i)
     
     def isComplete(self):
         if self.pageContent.toolchainList.currentRow() != -1:
-            self._projectInfoStore("TOOLCHAIN", self.pageContent.toolchainList.item(self.pageContent.toolchainList.currentRow()).data(Qt.UserRole).toString())
+            self._projectInfoStore("TOOLCHAIN", 
+                qvariant_converter.getString(self.pageContent.toolchainList.item(self.pageContent.toolchainList.currentRow()).data(Qt.UserRole)))
             return True
         else:
             return False
\ No newline at end of file