X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FcreaDevManagerLib%2FmodelCDMLib.cpp;h=48df51b85c29581095b42db809baa4ab4449cbe0;hb=76962b2ed3513cee0f6afd83b9d93e2b43bdefc5;hp=9ecaea45f3a39c495dd863f29bceba4ba4a3c8ca;hpb=f57f98a24c774785361ae5053f1510106da19052;p=crea.git diff --git a/lib/creaDevManagerLib/modelCDMLib.cpp b/lib/creaDevManagerLib/modelCDMLib.cpp index 9ecaea4..48df51b 100644 --- a/lib/creaDevManagerLib/modelCDMLib.cpp +++ b/lib/creaDevManagerLib/modelCDMLib.cpp @@ -35,6 +35,7 @@ #include "modelCDMLib.h" #include +#include #include #include "CDMUtilities.h" @@ -45,10 +46,12 @@ modelCDMLib::modelCDMLib() { } -modelCDMLib::modelCDMLib(const std::string& path, const int& level) +modelCDMLib::modelCDMLib(modelCDMIProjectTreeNode* parent, const std::string& path, const std::string& name, const int& level) { + std::cout << "creating lib\n"; + this->parent = parent; this->type = wxDIR_DIRS; - this->name = "lib"; + this->name = name; this->level = level; this->path = path; @@ -69,9 +72,17 @@ modelCDMLib::modelCDMLib(const std::string& path, const int& level) { std::string stdfileName = crea::wx2std(fileName); - modelCDMLibrary* library = new modelCDMLibrary(pathFixed + "/" + stdfileName, this->level + 1); - this->libraries.push_back(library); - this->children.push_back(library); + if(stdfileName != "template_lib") + { + modelCDMLibrary* library = new modelCDMLibrary(this, pathFixed + CDMUtilities::SLASH + stdfileName, stdfileName, this->level + 1); + this->libraries.push_back(library); + this->children.push_back(library); + } + else + { + modelCDMFolder* folder = new modelCDMFolder(this, pathFixed + CDMUtilities::SLASH + stdfileName, stdfileName, this->level + 1); + this->children.push_back(folder); + } cont = dir.GetNext(&fileName); } @@ -80,37 +91,75 @@ modelCDMLib::modelCDMLib(const std::string& path, const int& level) while (cont) { std::string stdfileName = crea::wx2std(fileName); + std::size_t fileTypePos = stdfileName.find_last_of("."); + std::string fileType; + if(fileTypePos != std::string::npos) + fileType = stdfileName.substr(fileTypePos); + else + fileType = ""; //if CMakeLists, create CMakeLists if(stdfileName == "CMakeLists.txt") { - this->CMakeLists = new modelCDMCMakeListsFile(pathFixed + "/" + stdfileName, this->level + 1); + this->CMakeLists = new modelCDMCMakeListsFile(this, pathFixed + CDMUtilities::SLASH + stdfileName, stdfileName, this->level + 1); this->children.push_back(this->CMakeLists); } + //if is a code file, create modelCDMCodeFile + else if( + fileType == ".c" || + fileType == ".cxx" || + fileType == ".h" || + fileType == ".cpp" || + fileType == ".txx" || + fileType == ".cmake" ) + { + this->children.push_back(new modelCDMCodeFile(this, pathFixed + CDMUtilities::SLASH + stdfileName, stdfileName, this->level + 1)); + } //if is an unknown file, create file else { - this->children.push_back(new modelCDMFile(pathFixed + "/" + stdfileName, this->level + 1)); + this->children.push_back(new modelCDMFile(this, pathFixed + CDMUtilities::SLASH + stdfileName, stdfileName, this->level + 1)); } cont = dir.GetNext(&fileName); } } this->SortChildren(); + std::sort(this->libraries.begin(), this->libraries.end(), CompareNodeItem); } modelCDMLib::~modelCDMLib() { } -modelCDMIProjectTreeNode* modelCDMLib::CreateLibrary( - const std::string& name, - std::string*& result, - const std::string& path +const std::vector& modelCDMLib::GetLibraries() const +{ + return this->libraries; +} + +modelCDMLibrary* modelCDMLib::CreateLibrary( + const std::string& namein, + std::string*& result ) { + std::vector words; + CDMUtilities::splitter::split(words,namein," '/\\*\"%",CDMUtilities::splitter::no_empties); + std::string name; + for (int i = 0; i < (int)(words.size()); i++) + { + name += words[i]; + } + if (name == "") + { + result = new std::string("The given name is not valid: '/\\*\"% are forbidden."); + return NULL; + } //copy template library folder with new name - std::string copyCommand = "cp -r " + this->path + "/template_lib " + this->path + "/" + name; +#ifdef _WIN32 + std::string copyCommand = "xcopy \"" + this->path + CDMUtilities::SLASH + "template_lib\" \"" + this->path + CDMUtilities::SLASH + name + CDMUtilities::SLASH + "\" /Y"; +#else + std::string copyCommand = "cp -r \"" + this->path + CDMUtilities::SLASH + "template_lib\" \"" + this->path + CDMUtilities::SLASH + name + "\""; +#endif if(system(copyCommand.c_str())) { result = new std::string("An error occurred while running '" + copyCommand + "'."); @@ -118,13 +167,13 @@ modelCDMIProjectTreeNode* modelCDMLib::CreateLibrary( } //set name of library in CMakeLists inside copied folder std::string line; - std::ifstream in((this->path + "/" + name + "/CMakeLists.txt").c_str()); + std::ifstream in((this->path + CDMUtilities::SLASH + name + CDMUtilities::SLASH + "CMakeLists.txt").c_str()); if( !in.is_open()) { result = new std::string("CMakeLists.txt file failed to open."); return NULL; } - std::ofstream out((this->path + "/" + name + "/CMakeLists.txt.tmp").c_str()); + std::ofstream out((this->path + CDMUtilities::SLASH + name + CDMUtilities::SLASH + "CMakeLists.txt.tmp").c_str()); while (getline(in, line)) { if(line == "SET ( LIBRARY_NAME MyLib )") @@ -134,40 +183,41 @@ modelCDMIProjectTreeNode* modelCDMLib::CreateLibrary( in.close(); out.close(); //delete old file and rename new file - std::string renameCommand = "mv " + this->path + "/" + name + "/CMakeLists.txt.tmp " + this->path + "/" + name + "/CMakeLists.txt"; +#ifdef _WIN32 + std::string renameCommand = "move /Y \"" + this->path + CDMUtilities::SLASH + name + CDMUtilities::SLASH + "CMakeLists.txt.tmp\" \"" + this->path + CDMUtilities::SLASH + name + CDMUtilities::SLASH + "CMakeLists.txt\""; +#else + std::string renameCommand = "mv \"" + this->path + CDMUtilities::SLASH + name + CDMUtilities::SLASH + "CMakeLists.txt.tmp\" \"" + this->path + CDMUtilities::SLASH + name + CDMUtilities::SLASH + "CMakeLists.txt\""; +#endif if(system(renameCommand.c_str())) { result = new std::string("An error occurred while running '" + renameCommand + "'."); return NULL; } + //add library to lib CMakeLists + std::fstream out1((this->path + CDMUtilities::SLASH + "CMakeLists.txt").c_str(), std::fstream::in | std::fstream::out | std::fstream::app); + if (out1.is_open()) + { + out1 << "ADD_SUBDIRECTORY(" << name << ")" << std::endl; + out1.close(); + } + + //add library to model - modelCDMLibrary* library = new modelCDMLibrary(this->path + "/" + name, this->level + 1); + modelCDMLibrary* library = new modelCDMLibrary(this, this->path + CDMUtilities::SLASH + name, name, this->level + 1); this->libraries.push_back(library); this->children.push_back(library); this->SortChildren(); - result = new std::string(this->path + "/" + name); + result = new std::string(this->path + CDMUtilities::SLASH + name); return library; } -bool modelCDMLib::OpenCMakeListsFile(std::string*& result) -{ - //TODO: implement method - return true; -} - const bool modelCDMLib::Refresh(std::string*& result) { - //TODO: implement method - - - + std::cout << "refreshing lib" << std::endl; this->type = wxDIR_DIRS; - this->name = "lib"; - this->level = level; - this->path = path; @@ -183,26 +233,50 @@ const bool modelCDMLib::Refresh(std::string*& result) while (cont) { std::string stdfileName = crea::wx2std(fileName); - std::string libraryName = stdfileName; - //check if they already exist - bool found = false; - for (int i = 0;!found && i < this->libraries.size(); i++) + + if(stdfileName != "template_lib") { - if (this->libraries[i]->GetName() == libraryName) + std::string libraryName = stdfileName; + //check if library already exist + bool found = false; + for (int i = 0; !found && i < (int)(this->libraries.size()); i++) { - found = true; - int pos = std::find(this->children.begin(), this->children.end(), this->libraries[i]) - this->children.begin(); - checked[pos] = true; - checkedLibraries[i] = true; - if(!this->libraries[i]->Refresh(result)) - return false; + if (this->libraries[i]->GetName() == libraryName) + { + found = true; + int pos = std::find(this->children.begin(), this->children.end(), this->libraries[i]) - this->children.begin(); + checked[pos] = true; + checkedLibraries[i] = true; + if(!this->libraries[i]->Refresh(result)) + return false; + } + } + if(!found) + { + modelCDMLibrary* library = new modelCDMLibrary(this, this->path + CDMUtilities::SLASH + stdfileName, stdfileName, this->level + 1); + this->libraries.push_back(library); + this->children.push_back(library); } } - if(!found) + else { - modelCDMLibrary* library = new modelCDMLibrary(this->path + "/" + stdfileName, this->level + 1); - this->libraries.push_back(library); - this->children.push_back(library); + //check if folder already exist + 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); + } } cont = dir.GetNext(&fileName); } @@ -211,13 +285,20 @@ const bool modelCDMLib::Refresh(std::string*& result) while (cont) { std::string stdfileName = crea::wx2std(fileName); + std::size_t fileTypePos = stdfileName.find_last_of("."); + std::string fileType; + if(fileTypePos != std::string::npos) + fileType = stdfileName.substr(fileTypePos); + else + fileType = ""; + //if CMakeLists, create CMakeLists if(stdfileName == "CMakeLists.txt") { if (this->CMakeLists == NULL) { - this->CMakeLists = new modelCDMCMakeListsFile(this->path + "/" + stdfileName, this->level + 1); + this->CMakeLists = new modelCDMCMakeListsFile(this, this->path + CDMUtilities::SLASH + stdfileName, stdfileName, this->level + 1); this->children.push_back(this->CMakeLists); } else @@ -232,7 +313,7 @@ const bool modelCDMLib::Refresh(std::string*& result) else { bool found = false; - for (int i = 0; i children.size(); i++) + for (int i = 0; !found && i < (int)(this->children.size()); i++) { if (this->children[i]->GetName() == stdfileName) { @@ -245,8 +326,22 @@ const bool modelCDMLib::Refresh(std::string*& result) if(!found) { - modelCDMFile* file = new modelCDMFile(this->path + "/" + stdfileName, this->level + 1); - this->children.push_back(file); + //if is a code file, create modelCDMCodeFile + if( + fileType == ".c" || + fileType == ".cxx" || + fileType == ".h" || + fileType == ".cpp" || + fileType == ".txx" || + fileType == ".cmake" ) + { + this->children.push_back(new modelCDMCodeFile(this, this->path + CDMUtilities::SLASH + stdfileName, stdfileName, this->level + 1)); + } + else + { + modelCDMFile* file = new modelCDMFile(this, this->path + CDMUtilities::SLASH + stdfileName, stdfileName, this->level + 1); + this->children.push_back(file); + } } } @@ -254,7 +349,7 @@ const bool modelCDMLib::Refresh(std::string*& result) } } - for (int i = 0; i < checkedLibraries.size(); i++) + for (int i = 0; i < (int)(checkedLibraries.size()); i++) { if(!checkedLibraries[i]) { @@ -263,7 +358,7 @@ const bool modelCDMLib::Refresh(std::string*& result) i--; } } - for (int i = 0; i < checked.size(); i++) + for (int i = 0; i < (int)(checked.size()); i++) { if(!checked[i]) { @@ -274,5 +369,171 @@ const bool modelCDMLib::Refresh(std::string*& result) } } this->SortChildren(); + std::sort(this->libraries.begin(), this->libraries.end(), CompareNodeItem); return true; } + +void modelCDMLib::CheckStructure(std::map& properties) +{ + //check cmake exist + if(this->CMakeLists != NULL) + { + //set properties parameters based on model + for (int i = 0; i < (int)(this->libraries.size()); i++) + properties["lib add " + libraries[i]->GetName()] = false; + + //open cmakelists + std::ifstream confFile; + confFile.open((this->CMakeLists->GetPath()).c_str()); + + //take everything that is not commented + std::string fileContent; + + std::string word; + std::vector words; + while(confFile.is_open() && !confFile.eof()) + { + std::getline(confFile,word, '\n'); + if(word[0] != '#') + { + CDMUtilities::splitter::split(words, word, "#", CDMUtilities::splitter::empties_ok); + if (words.size() > 0) + { + word = words[0]; + CDMUtilities::splitter::split(words, word, " ", CDMUtilities::splitter::empties_ok); + for (int i = 0; i < (int)(words.size()); i++) + { + if(words[i].substr(0,2) == "//") + break; + fileContent += words[i] + " "; + } + } + } + } + + //check every instruction + std::stringstream ss(fileContent); + while(!ss.eof()) + { + std::getline(ss,word, '('); + + //check instruction name + CDMUtilities::splitter::split(words, word, " ", CDMUtilities::splitter::no_empties); + + //add instructions + if (words.size() > 0 && words[words.size()-1] == "ADD_SUBDIRECTORY") + { + std::getline(ss,word, ')'); + //std::cout << word << std::endl; + CDMUtilities::splitter::split(words, word, " ", CDMUtilities::splitter::no_empties); + + if (words.size() > 0) + { + { + properties["lib add " + words[0]] = true; + } + } + } + } + + } + + //check libraries' structure + for (int i = 0; i < (int)(this->libraries.size()); i++) + { + properties["library " + this->libraries[i]->GetName()] = true; + this->libraries[i]->CheckStructure(properties); + } +} + +bool modelCDMLib::IsLibraryIncluded(const std::string& library_name) +{ + if (this->HasCMakeLists()) + { + CDMUtilities::CMLFile cmlFile = CDMUtilities::readCMLFile(this->CMakeLists->GetPath().c_str()); + for (int i = 0; i < cmlFile.size(); ++i) + { + if (cmlFile[i].first=="command" && cmlFile[i].second[0] == "ADD_SUBDIRECTORY") + { + int pos = 1; + while (pos < cmlFile[i].second.size()) + { + if (!isspace(cmlFile[i].second[pos][0]) && cmlFile[i].second[pos][0] != '(' && cmlFile[i].second[pos][0] != '#') + { + if (library_name == cmlFile[i].second[pos]) + return true; + break; + } + pos++; + } + } + } + } + return false; +} + +bool modelCDMLib::SetLibraryInclude(const std::string& library_name, const bool& toInclude) +{ + if (this->HasCMakeLists()) + { + CDMUtilities::CMLFile cmlFile = CDMUtilities::readCMLFile(this->CMakeLists->GetPath().c_str()); + + bool found = false; + + for (int i = 0; i < cmlFile.size(); ++i) + { + if(toInclude && cmlFile[i].first == "comment") + { + std::vector segments; + std::string line = cmlFile[i].second[0]; + while(line[0] == '#') + line.erase(0,1); + + CDMUtilities::splitter::split(segments, line, " ()", CDMUtilities::splitter::no_empties); + if (segments.size() > 1 && segments[0] == "ADD_SUBDIRECTORY" && segments[1] == library_name) + { + found = true; + while(cmlFile[i].second[0][0] == '#') + cmlFile[i].second[0].erase(0,1); + } + } + else if(cmlFile[i].first == "command" && cmlFile[i].second[0] == "ADD_SUBDIRECTORY") + { + int pos = 1; + while (pos < cmlFile[i].second.size()) + { + if (!isspace(cmlFile[i].second[pos][0]) && cmlFile[i].second[pos][0] != '(' && cmlFile[i].second[pos][0] != '#') + { + if (library_name == cmlFile[i].second[pos]) + { + found = true; + if (!toInclude) + { + cmlFile[i].first = "comment"; + cmlFile[i].second[0] = "#" + cmlFile[i].second[0]; + while (cmlFile[i].second.size() > 1) + { + cmlFile[i].second[0] += cmlFile[i].second[1]; + cmlFile[i].second.erase(cmlFile[i].second.begin()+1); + } + + } + } + break; + } + pos++; + } + } + } + if (!found && toInclude) + { + CDMUtilities::syntaxElement element; + element.first = "command"; + element.second.push_back("ADD_SUBDIRECTORY(" + library_name + ")"); + cmlFile.push_back(element); + } + + return CDMUtilities::writeCMLFile(this->CMakeLists->GetPath().c_str(),cmlFile); + } + return false; +}