X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FcreaDevManagerLib%2FmodelCDMPackage.cpp;fp=lib%2FcreaDevManagerLib%2FmodelCDMPackage.cpp;h=a2ee6c8669d8e7b7f1f890e3c33e24990e758b56;hb=cfa883d25e73975f73c20fefc1ec2c947d827938;hp=097c360c11265b9db3b73dcbfae25cf744925516;hpb=2c45094f8403883f8fb52c1801f1d96a35a471bf;p=crea.git

diff --git a/lib/creaDevManagerLib/modelCDMPackage.cpp b/lib/creaDevManagerLib/modelCDMPackage.cpp
index 097c360..a2ee6c8 100644
--- a/lib/creaDevManagerLib/modelCDMPackage.cpp
+++ b/lib/creaDevManagerLib/modelCDMPackage.cpp
@@ -46,13 +46,13 @@ modelCDMPackage::modelCDMPackage()
   this->src = NULL;
 }
 
-modelCDMPackage::modelCDMPackage(const std::string& path, const int& level)
+modelCDMPackage::modelCDMPackage(const std::string& path, const std::string& name, const int& level)
 {
   this->type = wxDIR_DIRS;
+  this->name = name;
   //Get Package Name
 
-  //TODO: set pathMakeLists for windows
-  std::string pathMakeLists = path + "/CMakeLists.txt";
+  std::string pathMakeLists = path + CDMUtilities::SLASH + "CMakeLists.txt";
 
   std::ifstream confFile;
   confFile.open((pathMakeLists).c_str());
@@ -121,12 +121,6 @@ modelCDMPackage::modelCDMPackage(const std::string& path, const int& level)
         }
     }
 
-  std::vector<std::string> words;
-  std::string delimiters;
-  //TODO::fix for windows
-  delimiters = "/";
-  CDMUtilities::splitter::split(words, path, delimiters, CDMUtilities::splitter::no_empties);
-  this->name = words[words.size()-1];
   this->level = level;
   this->path = path;
 
@@ -144,28 +138,12 @@ modelCDMPackage::modelCDMPackage(const std::string& path, const int& level)
           //if src, check for black boxes
           if(stdfileName == "src")
             {
-              this->src = new modelCDMPackageSrc(path + delimiters + "src", this->level + 1);
+              this->src = new modelCDMPackageSrc(path + CDMUtilities::SLASH + stdfileName, stdfileName, this->level + 1);
               this->children.push_back(this->src);
-              /*wxDir srcF(crea::std2wx((path + delimiters + "src").c_str()));
-              if (srcF.IsOpened())
-                {
-                  wxString srcName;
-                  bool innerCont = srcF.GetFirst(&srcName, wxT("*.h"), wxDIR_FILES);
-                  while (innerCont)
-                    {
-                      if(crea::wx2std(srcName.substr(0,2)) == "bb")
-                        {
-                          modelCDMBlackBox* blackbox = new modelCDMBlackBox(crea::wx2std(srcName), path + delimiters + "src", this->level + 1);
-                          this->blackBoxes.push_back(blackbox);
-                          this->children.push_back(blackbox);
-                        }
-                      innerCont = srcF.GetNext(&srcName);
-                    }
-                }*/
             }
           else
             {
-              this->children.push_back(new modelCDMFolder(path + delimiters + stdfileName, this->level + 1));
+              this->children.push_back(new modelCDMFolder(path + CDMUtilities::SLASH + stdfileName, stdfileName, this->level + 1));
             }
 
           cont = dir.GetNext(&fileName);
@@ -180,12 +158,12 @@ modelCDMPackage::modelCDMPackage(const std::string& path, const int& level)
           //if CMakeLists, create CMakeLists
           if(stdfileName == "CMakeLists.txt")
             {
-              this->CMakeLists = new modelCDMCMakeListsFile(path + delimiters + stdfileName, this->level + 1);
+              this->CMakeLists = new modelCDMCMakeListsFile(path + CDMUtilities::SLASH + stdfileName, stdfileName, this->level + 1);
               this->children.push_back(this->CMakeLists);
             }
           else
             {
-              this->children.push_back(new modelCDMFile(path + delimiters + stdfileName, this->level + 1));
+              this->children.push_back(new modelCDMFile(path + CDMUtilities::SLASH + stdfileName, stdfileName, this->level + 1));
             }
           //if is an unknown file, create file
           cont = dir.GetNext(&fileName);
@@ -240,14 +218,14 @@ bool modelCDMPackage::SetAuthors(const std::string& authors, std::string*& resul
 
   std::string line;
   //opening original cmakelists
-  std::ifstream in((this->path + "/CMakeLists.txt").c_str());
+  std::ifstream in((this->path + CDMUtilities::SLASH + "CMakeLists.txt").c_str());
   if( !in.is_open())
     {
       result = new std::string("CMakeLists.txt file failed to open.");
       return false;
     }
   //opening temporal cmakelists
-  std::ofstream out((this->path + "/CMakeLists.txt.tmp").c_str());
+  std::ofstream out((this->path + CDMUtilities::SLASH + "CMakeLists.txt.tmp").c_str());
   if( !out.is_open())
     {
       result = new std::string("CMakeLists.txt.tmp file failed to open.");
@@ -263,7 +241,7 @@ bool modelCDMPackage::SetAuthors(const std::string& authors, std::string*& resul
   in.close();
   out.close();
   //delete old file and rename new file
-  std::string renameCommand = "mv " + this->path + "/CMakeLists.txt.tmp " + this->path + "/CMakeLists.txt";
+  std::string renameCommand = "mv \"" + this->path + CDMUtilities::SLASH + "CMakeLists.txt.tmp\" \"" + this->path + CDMUtilities::SLASH + "CMakeLists.txt\"";
   if(system(renameCommand.c_str()))
     {
       result = new std::string("An error occurred while running '" + renameCommand + "'.");
@@ -288,14 +266,14 @@ bool modelCDMPackage::SetVersion(const std::string& version, std::string*& resul
 
   std::string line;
   //opening original cmakelists
-  std::ifstream in((this->path + "/CMakeLists.txt").c_str());
+  std::ifstream in((this->path + CDMUtilities::SLASH + "CMakeLists.txt").c_str());
   if( !in.is_open())
     {
       result = new std::string("CMakeLists.txt file failed to open.");
       return false;
     }
   //opening temporal cmakelists
-  std::ofstream out((this->path + "/CMakeLists.txt.tmp").c_str());
+  std::ofstream out((this->path + CDMUtilities::SLASH + "CMakeLists.txt.tmp").c_str());
   if( !out.is_open())
     {
       result = new std::string("CMakeLists.txt.tmp file failed to open.");
@@ -315,7 +293,7 @@ bool modelCDMPackage::SetVersion(const std::string& version, std::string*& resul
   in.close();
   out.close();
   //delete old file and rename new file
-  std::string renameCommand = "mv " + this->path + "/CMakeLists.txt.tmp " + this->path + "/CMakeLists.txt";
+  std::string renameCommand = "mv \"" + this->path + CDMUtilities::SLASH + "CMakeLists.txt.tmp\" \"" + this->path + CDMUtilities::SLASH + "CMakeLists.txt\"";
   if(system(renameCommand.c_str()))
     {
       result = new std::string("An error occurred while running '" + renameCommand + "'.");
@@ -338,14 +316,14 @@ bool modelCDMPackage::SetDescription(const std::string& description, std::string
 
   std::string line;
   //opening original cmakelists
-  std::ifstream in((this->path + "/CMakeLists.txt").c_str());
+  std::ifstream in((this->path + CDMUtilities::SLASH + "CMakeLists.txt").c_str());
   if( !in.is_open())
     {
       result = new std::string("CMakeLists.txt file failed to open.");
       return false;
     }
   //opening temporal cmakelists
-  std::ofstream out((this->path + "/CMakeLists.txt.tmp").c_str());
+  std::ofstream out((this->path + CDMUtilities::SLASH + "CMakeLists.txt.tmp").c_str());
   if( !out.is_open())
     {
       result = new std::string("CMakeLists.txt.tmp file failed to open.");
@@ -361,7 +339,7 @@ bool modelCDMPackage::SetDescription(const std::string& description, std::string
   in.close();
   out.close();
   //delete old file and rename new file
-  std::string renameCommand = "mv " + this->path + "/CMakeLists.txt.tmp " + this->path + "/CMakeLists.txt";
+  std::string renameCommand = "mv \"" + this->path + CDMUtilities::SLASH + "CMakeLists.txt.tmp\" \"" + this->path + CDMUtilities::SLASH + "CMakeLists.txt\"";
   if(system(renameCommand.c_str()))
     {
       result = new std::string("An error occurred while running '" + renameCommand + "'.");
@@ -372,8 +350,10 @@ bool modelCDMPackage::SetDescription(const std::string& description, std::string
   return true;
 }
 
-bool modelCDMPackage::CreateBlackBox(
+modelCDMBlackBox* modelCDMPackage::CreateBlackBox(
     const std::string& name,
+    const std::string& type,
+    const std::string& format,
     const std::string& authors,
     const std::string& authorsEmail,
     const std::string& categories,
@@ -381,21 +361,17 @@ bool modelCDMPackage::CreateBlackBox(
 )
 {
   //TODO: implement method
-  return true;
+  return NULL;
 }
 
 const bool modelCDMPackage::Refresh(std::string*& result)
 {
   std::cout << "refreshing package" << std::endl;
   this->type = wxDIR_DIRS;
-  this->name = name;
-  this->level = level;
-  this->path = path;
 
   //Get Package Name
 
-  //TODO: set pathMakeLists for windows
-  std::string pathMakeLists = path + "/CMakeLists.txt";
+  std::string pathMakeLists = path + CDMUtilities::SLASH + "CMakeLists.txt";
 
   std::ifstream confFile;
   confFile.open((pathMakeLists).c_str());
@@ -496,44 +472,9 @@ const bool modelCDMPackage::Refresh(std::string*& result)
                 }
               else
                 {
-                  this->src = new modelCDMPackageSrc(path + "/" + "src", this->level +1);
+                  this->src = new modelCDMPackageSrc(path + CDMUtilities::SLASH + stdfileName, stdfileName, this->level +1);
                   this->children.push_back(this->src);
                 }
-              /*wxDir srcF(crea::std2wx((path + "/" + "src").c_str()));
-              if (srcF.IsOpened())
-                {
-                  wxString srcName;
-                  bool innerCont = srcF.GetFirst(&srcName, wxT("*.h"), wxDIR_FILES);
-                  while (innerCont)
-                    {
-                      std::string blackBoxName = crea::wx2std(srcName);
-                      if(crea::wx2std(srcName.substr(0,2)) == "bb")
-                        {
-                          //check if box already exist
-                          bool found = false;
-                          for (int i = 0;!found && i < this->blackBoxes.size(); i++)
-                            {
-                              if (this->blackBoxes[i]->GetName() == blackBoxName)
-                                {
-                                  found = true;
-                                  int pos = std::find(this->children.begin(), this->children.end(), this->blackBoxes[i]) - this->children.begin();
-                                  checked[pos] = true;
-                                  checkedBlackBoxes[i] = true;
-                                  if(!this->blackBoxes[i]->Refresh(result))
-                                    return false;
-                                }
-                            }
-                          if(!found)
-                            {
-                              modelCDMBlackBox* blackBox = new modelCDMBlackBox(blackBoxName, path + "/" + "src", this->level +1);
-                              this->blackBoxes.push_back(blackBox);
-                              this->children.push_back(blackBox);
-                            }
-                        }
-                      innerCont = srcF.GetNext(&srcName);
-                    }
-                }*/
-
             }
           else
             {
@@ -552,7 +493,7 @@ const bool modelCDMPackage::Refresh(std::string*& result)
                 }
               if(!found)
                 {
-                  modelCDMFolder* folder = new modelCDMFolder(this->path + "/" + stdfileName, this->level + 1);
+                  modelCDMFolder* folder = new modelCDMFolder(this->path + CDMUtilities::SLASH + stdfileName, stdfileName, this->level + 1);
                   this->children.push_back(folder);
                 }
             }
@@ -570,7 +511,7 @@ const bool modelCDMPackage::Refresh(std::string*& result)
             {
               if (this->CMakeLists == NULL)
                 {
-                  this->CMakeLists = new modelCDMCMakeListsFile(this->path + "/" + stdfileName, this->level + 1);
+                  this->CMakeLists = new modelCDMCMakeListsFile(this->path + CDMUtilities::SLASH + stdfileName, stdfileName, this->level + 1);
                   this->children.push_back(this->CMakeLists);
                 }
               else
@@ -598,7 +539,7 @@ const bool modelCDMPackage::Refresh(std::string*& result)
 
               if(!found)
                 {
-                  modelCDMFile* file = new modelCDMFile(this->path + "/" + stdfileName, this->level + 1);
+                  modelCDMFile* file = new modelCDMFile(this->path + CDMUtilities::SLASH + stdfileName, stdfileName, this->level + 1);
                   this->children.push_back(file);
                 }
             }