X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FcreaDevManagerLib%2FmodelCDMPackage.cpp;h=cd24c04f04b8df0e69bc3f90c22e9a9dcd1a6b41;hb=311bdcc514f85386f3bbbef9ff6a88bf69fd930f;hp=82a514c3f0d354d32af72758108fd201ad364dad;hpb=2b6788596bc21c7942df4b0d6917eaf5b5d72277;p=crea.git diff --git a/lib/creaDevManagerLib/modelCDMPackage.cpp b/lib/creaDevManagerLib/modelCDMPackage.cpp index 82a514c..cd24c04 100644 --- a/lib/creaDevManagerLib/modelCDMPackage.cpp +++ b/lib/creaDevManagerLib/modelCDMPackage.cpp @@ -43,15 +43,17 @@ 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) { + std::cout << "creating package: " + path + "\n"; 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()); @@ -120,12 +122,6 @@ modelCDMPackage::modelCDMPackage(const std::string& path, const int& level) } } - std::vector 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; @@ -143,28 +139,14 @@ modelCDMPackage::modelCDMPackage(const std::string& path, const int& level) //if src, check for black boxes if(stdfileName == "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); - } - } + this->src = new modelCDMPackageSrc(path + CDMUtilities::SLASH + stdfileName, stdfileName, this->level + 1); + this->children.push_back(this->src); } - //if is an unknown folder, create folder 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); } @@ -177,12 +159,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); @@ -220,9 +202,9 @@ const std::string& modelCDMPackage::GetDescription() const return this->description; } -const std::vector& modelCDMPackage::GetBlackBoxes() const +modelCDMPackageSrc* modelCDMPackage::GetSrc() const { - return this->blackBoxes; + return this->src; } bool modelCDMPackage::SetAuthors(const std::string& authors, std::string*& result) @@ -237,14 +219,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."); @@ -260,7 +242,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 + "'."); @@ -285,14 +267,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."); @@ -312,7 +294,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 + "'."); @@ -335,14 +317,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."); @@ -358,7 +340,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 + "'."); @@ -369,30 +351,28 @@ bool modelCDMPackage::SetDescription(const std::string& description, std::string return true; } -bool modelCDMPackage::CreateBlackBox( +modelCDMBlackBox* modelCDMPackage::CreateBlackBox( + std::string*& result, const std::string& name, + const std::string& type, + const std::string& format, + const std::string& categories, const std::string& authors, const std::string& authorsEmail, - const std::string& categories, const std::string& description ) { - //TODO: implement method - return true; + return this->src->CreateBlackBox(result,name, this->namePackage, type,format,categories,authors,authorsEmail,description); } const bool modelCDMPackage::Refresh(std::string*& result) { - std::cout << "refreshing package" << std::endl; + std::cout << "refreshing package " << this->namePackage << 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()); @@ -464,7 +444,7 @@ const bool modelCDMPackage::Refresh(std::string*& result) std::vector checked(this->children.size(), false); - std::vector checkedBlackBoxes(this->blackBoxes.size(), false); + bool checkedSrc = false; //check all folders wxDir dir(crea::std2wx((this->path).c_str())); @@ -477,51 +457,32 @@ const bool modelCDMPackage::Refresh(std::string*& result) std::string stdfileName = crea::wx2std(fileName); - + //detect black boxes in src if(stdfileName == "src") { - wxDir srcF(crea::std2wx((path + "/" + "src").c_str())); - if (srcF.IsOpened()) + //check if box already exist + bool found = false; + if (this->src != NULL) { - 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); - } + found = true; + int pos = std::find(this->children.begin(), this->children.end(), this->src) - this->children.begin(); + checked[pos] = true; + checkedSrc = true; + if(!this->src->Refresh(result)) + return false; + } + else + { + this->src = new modelCDMPackageSrc(path + CDMUtilities::SLASH + stdfileName, stdfileName, this->level +1); + this->children.push_back(this->src); } - } - //if not src else { - //check if they already exist + + //check if folder already exist bool found = false; - for (int i = 0;!found && i < this->children.size(); i++) + for (int i = 0; !found && i < this->children.size(); i++) { if (this->children[i]->GetName() == stdfileName) { @@ -533,11 +494,12 @@ 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); } - cont = dir.GetNext(&fileName); } + cont = dir.GetNext(&fileName); + } cont = dir.GetFirst(&fileName, wxEmptyString, wxDIR_FILES); @@ -550,7 +512,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 @@ -565,7 +527,7 @@ const bool modelCDMPackage::Refresh(std::string*& result) else { bool found = false; - for (int i = 0; i children.size(); i++) + for (int i = 0; !found && i < this->children.size(); i++) { if (this->children[i]->GetName() == stdfileName) { @@ -578,7 +540,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); } } @@ -587,15 +549,11 @@ const bool modelCDMPackage::Refresh(std::string*& result) } } - for (int i = 0; i < checkedBlackBoxes.size(); i++) + if(!checkedSrc) { - if(!checkedBlackBoxes[i]) - { - this->blackBoxes.erase(this->blackBoxes.begin()+i); - checkedBlackBoxes.erase(checkedBlackBoxes.begin()+i); - i--; - } + this->src = NULL; } + for (int i = 0; i < checked.size(); i++) { if(!checked[i])