this->CMakeLists = NULL;
}
-modelCDMFolder::modelCDMFolder(const std::string& path, const int& level)
+modelCDMFolder::modelCDMFolder(const std::string& path, const std::string& name, const int& level)
{
//set attributes
this->children.clear();
this->level = level;
this->CMakeLists = NULL;
this->length = 0;
-
- 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->name = name;
this->path = path;
this->type = wxDIR_DIRS;
std::string stdfileName = crea::wx2std(fileName);
//if is an unknown folder, create folder
- this->children.push_back(new modelCDMFolder(pathFixed + "/" + stdfileName, this->level + 1));
+ this->children.push_back(new modelCDMFolder(pathFixed + CDMUtilities::SLASH + stdfileName, stdfileName, this->level + 1));
cont = dir.GetNext(&fileName);
}
//if CMakeLists, create CMakeLists
if(stdfileName == "CMakeLists.txt")
{
- this->CMakeLists = new modelCDMCMakeListsFile(pathFixed + "/" + stdfileName, this->level + 1);
+ this->CMakeLists = new modelCDMCMakeListsFile(pathFixed + CDMUtilities::SLASH + stdfileName, stdfileName, this->level + 1);
this->children.push_back(this->CMakeLists);
}
else
{
- this->children.push_back(new modelCDMFile(pathFixed + "/" + stdfileName, this->level + 1));
+ this->children.push_back(new modelCDMFile(pathFixed + CDMUtilities::SLASH + stdfileName, stdfileName, this->level + 1));
}
//if is an unknown file, create file
cont = dir.GetNext(&fileName);
modelCDMFolder* modelCDMFolder::CreateFolder(const std::string& name, std::string*& result)
{
//TODO:: mkdir depending on OS
- std::string command = "mkdir " + path + "/" + name;
+ std::string command = "mkdir \"" + path + CDMUtilities::SLASH + name + "\"";
if(system(command.c_str()))
{
result = new std::string("Error executing: " + command + ".");
return NULL;
}
- modelCDMFolder* folder = new modelCDMFolder(path + "/" + name, level + 1);
+ modelCDMFolder* folder = new modelCDMFolder(path + CDMUtilities::SLASH + name, name, level + 1);
this->folders.push_back(folder);
this->children.push_back(folder);
}
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->folders.push_back(folder);
this->children.push_back(folder);
}
{
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
return false;
}
}
+
//if is an unknown file, create file
else
{
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);
}
}