Feature #1711 CreaDevManager application implementation

[crea.git] / lib / creaDevManagerLib / modelCDMProject.cpp

diff --git a/lib/creaDevManagerLib/modelCDMProject.cpp b/lib/creaDevManagerLib/modelCDMProject.cpp
index dae81a13434f081c9e51f12e8f671dc4e019ef6c..886a3659c4854cf4163be399bfb3b9f5c4c8de36 100644 (file)
--- a/lib/creaDevManagerLib/modelCDMProject.cpp
+++ b/lib/creaDevManagerLib/modelCDMProject.cpp
@@ -170,17 +170,54 @@ modelCDMProject::modelCDMProject(
               this->lib = new modelCDMLib(this, pathFixed + CDMUtilities::SLASH + stdfileName, stdfileName, this->level + 1);
               this->children.push_back(this->lib);
             }
-          //if package , create package
-          else if(stdfileName.size() > 9 && stdfileName.substr(0,5) == "bbtk_" && stdfileName.substr(stdfileName.size()-4,4) == "_PKG")
-            {
-              modelCDMPackage* package = new modelCDMPackage(this, pathFixed + CDMUtilities::SLASH + stdfileName, stdfileName, this->level + 1);
-              this->packages.push_back(package);
-              this->children.push_back(package);
-            }
-          //if is an unknown folder, create folder
           else
             {
-              this->children.push_back(new modelCDMFolder(this, pathFixed + CDMUtilities::SLASH + stdfileName, stdfileName, this->level + 1));
+              bool isPackage = false;
+
+              // check if cmakelists file exist in folder.
+              std::string tmppath = this->GetPath() + CDMUtilities::SLASH + stdfileName + CDMUtilities::SLASH + "CMakeLists.txt";
+              CDMUtilities::CMLFile CMfile = CDMUtilities::readCMLFile(tmppath.c_str());
+              if (CMfile.size() > 0)
+                {
+                  std::cout << "-->" << stdfileName << " ::has cmakelists" << std::endl;
+                  // check if cmakelists file has the SET(BBTK_PACKAGE_NAME [pkgname]) instruction.
+                  for (int i = 0; !isPackage && i < CMfile.size(); ++i) {
+                    if (CMfile[i].first == "command" && CMfile[i].second.size() > 1)
+                      {
+                        std::string cm = CMfile[i].second[0];
+
+                        int pos = 1;
+                        while(pos < CMfile[i].second.size()-1 && !isalpha(CMfile[i].second[pos][0]))
+                          pos++;
+
+                        std::string pm1 = CMfile[i].second[pos];
+
+                        std::cout << cm << " " << pm1 << std::endl;
+                        std::transform(cm.begin(), cm.end(), cm.begin(), ::toupper);
+                        std::transform(pm1.begin(), pm1.end(), pm1.begin(), ::toupper);
+                        if(cm == "SET" && pm1 == "BBTK_PACKAGE_NAME")
+                          {
+                            isPackage = true;
+                          }
+                      }
+                  }
+                }
+
+              // if package, create package
+              if(isPackage)
+                {
+                  std::cout << "is Package\n";
+                  modelCDMPackage* package = new modelCDMPackage(this, pathFixed + CDMUtilities::SLASH + stdfileName, stdfileName, this->level + 1);
+                  std::cout << "Package created\n";
+                  this->packages.push_back(package);
+                  this->children.push_back(package);
+                }
+              // if is an unknown folder, create folder
+              else
+                {
+                  this->children.push_back(new modelCDMFolder(this, pathFixed + CDMUtilities::SLASH + stdfileName, stdfileName, this->level + 1));
+                }
+
             }
 
           cont = dir.GetNext(&fileName);
@@ -191,7 +228,11 @@ modelCDMProject::modelCDMProject(
         {
           std::string stdfileName = crea::wx2std(fileName);
           std::size_t fileTypePos = stdfileName.find_last_of(".");
-          std::string fileType = stdfileName.substr(fileTypePos);
+          std::string fileType;
+          if(fileTypePos != std::string::npos)
+            fileType = stdfileName.substr(fileTypePos);
+          else
+            fileType = "";
 
           //if CMakeLists, create CMakeLists
           if(stdfileName == "CMakeLists.txt")
@@ -596,7 +637,7 @@ const bool modelCDMProject::Refresh(std::string*& result)
 
             }
           //if package , create package
-          else if(stdfileName.size() > 9 && stdfileName.substr(0,5) == "bbtk_" && stdfileName.substr(stdfileName.size()-4,4) == "_PKG")
+          /*else if(stdfileName.size() > 9 && stdfileName.substr(0,5) == "bbtk_" && stdfileName.substr(stdfileName.size()-4,4) == "_PKG")
             {
               bool found = false;
               for (int i = 0; !found && i < (int)(this->packages.size()); i++)
@@ -618,26 +659,85 @@ const bool modelCDMProject::Refresh(std::string*& result)
                   this->children.push_back(package);
                 }
 
-            }
-          //if is an unknown folder, create folder
+            }*/
+          // package or folder
           else
             {
-              bool found = false;
-              for (int i = 0; !found && i < (int)(this->children.size()); i++)
+              bool isPackage = false;
+
+              // check if cmakelists file exist in folder.
+              std::string tmppath = this->GetPath() + CDMUtilities::SLASH + stdfileName + CDMUtilities::SLASH + "CMakeLists.txt";
+              CDMUtilities::CMLFile CMfile = CDMUtilities::readCMLFile(tmppath.c_str());
+              if (CMfile.size() > 0)
+
                 {
-                  if (this->children[i]->GetName() == stdfileName)
+                  // check if cmakelists file has the SET(BBTK_PACKAGE_NAME [pkgname]) instruction.
+                  for (int i = 0; !isPackage && i < CMfile.size(); ++i) {
+                    if (CMfile[i].first == "command" && CMfile[i].second.size() > 1)
+                      {
+                        std::string cm = CMfile[i].second[0];
+
+                        int pos = 1;
+                        while(pos < CMfile[i].second.size()-1 && !isalpha(CMfile[i].second[pos][0]))
+                          pos++;
+
+                        std::string pm1 = CMfile[i].second[pos];
+
+                        std::cout << cm << " " << pm1 << std::endl;
+                        std::transform(cm.begin(), cm.end(), cm.begin(), ::toupper);
+                        std::transform(pm1.begin(), pm1.end(), pm1.begin(), ::toupper);
+                        if(cm == "SET" && pm1 == "BBTK_PACKAGE_NAME")
+                          {
+                            isPackage = true;
+                          }
+                      }
+                  }
+                }
+
+              // if package, create package
+              if (isPackage)
+                {
+                  bool found = false;
+                  for (int i = 0; !found && i < (int)(this->packages.size()); i++)
                     {
-                      found = true;
-                      checked[i] = true;
-                      if(!this->children[i]->Refresh(result))
-                        return false;
+                      if (this->packages[i]->GetName() == stdfileName)
+                        {
+                          found = true;
+                          int pos = std::find(this->children.begin(), this->children.end(), this->packages[i]) - this->children.begin();
+                          checked[pos] = true;
+                          checkedPackages[i] = true;
+                          if(!this->packages[i]->Refresh(result))
+                            return false;
+                        }
                     }
-                }
 
-              if(!found)
+                  if (!found)
+                    {
+                      modelCDMPackage* package = new modelCDMPackage(this, this->path + CDMUtilities::SLASH + stdfileName, stdfileName, this->level + 1);
+                      this->packages.push_back(package);
+                      this->children.push_back(package);
+                    }
+                }
+              //if is an unknown folder, create folder
+              else
                 {
-                  modelCDMFolder* folder = new modelCDMFolder(this, this->path + CDMUtilities::SLASH + stdfileName, stdfileName, this->level + 1);
-                  this->children.push_back(folder);
+                  bool found = false;
+                  for (int i = 0; !found && i < (int)(this->children.size()); i++)
+                    {
+                      if (this->children[i]->GetName() == stdfileName)
+                        {
+                          found = true;
+                          checked[i] = true;
+                          if(!this->children[i]->Refresh(result))
+                            return false;
+                        }
+                    }
+
+                  if(!found)
+                    {
+                      modelCDMFolder* folder = new modelCDMFolder(this, this->path + CDMUtilities::SLASH + stdfileName, stdfileName, this->level + 1);
+                      this->children.push_back(folder);
+                    }
                 }
             }
 
@@ -649,7 +749,11 @@ const bool modelCDMProject::Refresh(std::string*& result)
         {
           std::string stdfileName = crea::wx2std(fileName);
           std::size_t fileTypePos = stdfileName.find_last_of(".");
-          std::string fileType = stdfileName.substr(fileTypePos);
+          std::string fileType;
+          if(fileTypePos != std::string::npos)
+            fileType = stdfileName.substr(fileTypePos);
+          else
+            fileType = "";
 
           //if CMakeLists, create CMakeLists
           if(stdfileName == "CMakeLists.txt")