patrick
/
tt
mirror of https://github.com/PatrickLipka/tt.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

solved switch task problem by adding trim function. Moved string utilities to separate files

This commit is contained in:
Patrick Lipka 2021-12-13 16:18:47 +01:00
parent 0bf621eb0f
commit 28f5b43ca8
3 changed files with 54 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/string_utils.cpp Normal file
View File

@ -0,0 +1,24 @@
#include <string>
#include "string_utils.h"
std::string space_to_underscore(std::string str){
for(size_t i = 0; i < str.length(); i++){
if(str[i] == ' ') str[i] = '_';
}
return str;
}
std::string underscore_to_space(std::string str){
for(size_t i = 0; i < str.length(); i++){
if(str[i] == '_') str[i] = ' ';
}
return str;
}
std::string trim(const std::string& str)
{
const char* WhiteSpace = " ";
std::size_t start = str.find_first_not_of(WhiteSpace);
std::size_t end = str.find_last_not_of(WhiteSpace);
return start == end ? std::string() : str.substr(start, end - start + 1);
}

9
src/string_utils.h Normal file
View File

@ -0,0 +1,9 @@
#ifndef STRING_UTILS_H
#define STRING_UTILS_H
#include <string>
std::string trim(const std::string &str);
std::string space_to_underscore(std::string str);
std::string underscore_to_space(std::string str);
#endif

54
src/ui.cpp
View File

@ -7,7 +7,9 @@
#include "ui.h" #include "ui.h"
#include "project.h" #include "project.h"
#include "track.h" #include "track.h"
// Use GNU readline library for autocompletion and command history #include "string_utils.h"
// Uses GNU readline library for autocompletion and command history
std::string command_names[num_commands]={ std::string command_names[num_commands]={
"np", "np",
@ -16,7 +18,7 @@ std::string command_names[num_commands]={
"st", "st",
"at", "at",
"rt", "rt",
"re" "re",
"rm", "rm",
"report", "report",
"ls", "ls",
@ -47,20 +49,6 @@ char *tt_name_generator(const char *text, int state){
return NULL; return NULL;
} }
std::string space_to_underscore(std::string str){
for(size_t i = 0; i < str.length(); i++){
if(str[i] == ' ') str[i] = '_';
}
return str;
}
std::string underscore_to_space(std::string str){
for(size_t i = 0; i < str.length(); i++){
if(str[i] == '_') str[i] = ' ';
}
return str;
}
void init_autocomplete(ProjectList *proj_list){ void init_autocomplete(ProjectList *proj_list){
// add command names to auto complete list // add command names to auto complete list
for (int i=0; i<num_commands; i++){ for (int i=0; i<num_commands; i++){
@ -153,7 +141,7 @@ void command_ls(std::string input, ProjectList *proj_list){
std::cout << std::endl; std::cout << std::endl;
}else{ }else{
// list tasks for given project // list tasks for given project
Project *proj = proj_list->find_project_by_name(underscore_to_space(str)); Project *proj = proj_list->find_project_by_name(trim(underscore_to_space(str)));
if(proj == NULL){ if(proj == NULL){
std::cout << "Project " << str << " does not exists." << std::endl; std::cout << "Project " << str << " does not exists." << std::endl;
}else{ }else{
@ -178,12 +166,12 @@ void command_start(std::string input, ProjectList *proj_list){
int place_of_slash = str.find("/"); int place_of_slash = str.find("/");
std::string proj_name = str.substr(0,place_of_slash); std::string proj_name = str.substr(0,place_of_slash);
std::string task_name = str.substr(place_of_slash+1); std::string task_name = str.substr(place_of_slash+1);
Project *proj = proj_list->find_project_by_name(underscore_to_space(proj_name)); Project *proj = proj_list->find_project_by_name(trim(underscore_to_space(proj_name)));
if (proj == NULL){ if (proj == NULL){
std::cout << "Project " << underscore_to_space(proj_name) << " does not exist." << std::endl; std::cout << "Project " << underscore_to_space(proj_name) << " does not exist." << std::endl;
return; return;
} }
int id=proj->find_task_id_by_name(underscore_to_space(task_name)); int id=proj->find_task_id_by_name(trim(underscore_to_space(task_name)));
if(id >= 0){ if(id >= 0){
std::cout << "id=" << id << std::endl; std::cout << "id=" << id << std::endl;
proj->set_active_task(id); proj->set_active_task(id);
@ -197,7 +185,7 @@ void command_start(std::string input, ProjectList *proj_list){
// create new project // create new project
void command_np(std::string name, ProjectList *proj_list){ void command_np(std::string name, ProjectList *proj_list){
if (proj_list->find_project_id_by_name(underscore_to_space(name)) == -1){ if (proj_list->find_project_id_by_name(trim(underscore_to_space(name))) == -1){
Project proj(underscore_to_space(name)); Project proj(underscore_to_space(name));
std::string auto_complete_str = space_to_underscore(name); std::string auto_complete_str = space_to_underscore(name);
autocomplete_names.push_back(auto_complete_str); autocomplete_names.push_back(auto_complete_str);
@ -213,8 +201,8 @@ void command_rm(std::string input, ProjectList *proj_list){
size_t place_of_slash = input.find("/"); size_t place_of_slash = input.find("/");
std::string proj_name = input.substr(0,place_of_slash); std::string proj_name = input.substr(0,place_of_slash);
std::string task_name = input.substr(place_of_slash+1); std::string task_name = input.substr(place_of_slash+1);
int id = proj_list->find_project_id_by_name(underscore_to_space(proj_name)); int id = proj_list->find_project_id_by_name(trim(underscore_to_space(proj_name)));
Project *proj = proj_list->find_project_by_name(underscore_to_space(proj_name)); Project *proj = proj_list->find_project_by_name(trim(underscore_to_space(proj_name)));
if (proj == NULL){ if (proj == NULL){
proj = proj_list->active_project; proj = proj_list->active_project;
} }
@ -256,7 +244,7 @@ void command_rm(std::string input, ProjectList *proj_list){
} }
} }
}else{ }else{
int task_id = proj_list->active_project->find_task_id_by_name(underscore_to_space(task_name)); int task_id = proj_list->active_project->find_task_id_by_name(trim(underscore_to_space(task_name)));
if (task_id >=0){ if (task_id >=0){
del = false; del = false;
std::cout << "Do you really want to remove task " << underscore_to_space(proj->name) << "/" << underscore_to_space(task_name) << "? [y|n]" << std::endl; std::cout << "Do you really want to remove task " << underscore_to_space(proj->name) << "/" << underscore_to_space(task_name) << "? [y|n]" << std::endl;
@ -299,7 +287,7 @@ void command_nt(std::string input, ProjectList *proj_list){
size_t place_of_slash = input.find("/"); size_t place_of_slash = input.find("/");
std::string proj_name = input.substr(0,place_of_slash); std::string proj_name = input.substr(0,place_of_slash);
std::string task_name = input.substr(place_of_slash+1); std::string task_name = input.substr(place_of_slash+1);
Project *proj = proj_list->find_project_by_name(underscore_to_space(proj_name)); Project *proj = proj_list->find_project_by_name(trim(underscore_to_space(proj_name)));
if (place_of_slash == std::string::npos){ if (place_of_slash == std::string::npos){
proj = proj_list->active_project; proj = proj_list->active_project;
} }
@ -307,7 +295,7 @@ void command_nt(std::string input, ProjectList *proj_list){
std::cout << "Project " << underscore_to_space(proj_name) << " does not exist." << std::endl; std::cout << "Project " << underscore_to_space(proj_name) << " does not exist." << std::endl;
return; return;
} }
int id = proj->find_task_id_by_name(underscore_to_space(task_name)); int id = proj->find_task_id_by_name(trim(underscore_to_space(task_name)));
if (id < 0){ if (id < 0){
Task task(task_name); Task task(task_name);
proj->add_task(task); proj->add_task(task);
@ -322,7 +310,7 @@ void command_nt(std::string input, ProjectList *proj_list){
// switch project // switch project
void command_sp(std::string name, ProjectList *proj_list){ void command_sp(std::string name, ProjectList *proj_list){
int id = proj_list->find_project_id_by_name(underscore_to_space(name)); int id = proj_list->find_project_id_by_name(trim(underscore_to_space(name)));
if (id >= 0){ if (id >= 0){
proj_list->set_active_project(id); proj_list->set_active_project(id);
std::cout << "Switched to project " << underscore_to_space(name) << std::endl; std::cout << "Switched to project " << underscore_to_space(name) << std::endl;
@ -336,17 +324,17 @@ void command_st(std::string input, ProjectList *proj_list){
size_t place_of_slash = input.find("/"); size_t place_of_slash = input.find("/");
std::string proj_name = input.substr(0,place_of_slash); std::string proj_name = input.substr(0,place_of_slash);
std::string task_name = input.substr(place_of_slash+1); std::string task_name = input.substr(place_of_slash+1);
int proj_id = proj_list->find_project_id_by_name(underscore_to_space(proj_name)); int proj_id = proj_list->find_project_id_by_name(trim(underscore_to_space(proj_name)));
Project *proj = proj_list->find_project_by_name(underscore_to_space(proj_name)); Project *proj = proj_list->find_project_by_name(trim(underscore_to_space(proj_name)));
if (place_of_slash == std::string::npos){ if (place_of_slash == std::string::npos){
proj = proj_list->active_project; proj = proj_list->active_project;
proj_id = proj_list->find_project_id_by_name(underscore_to_space(proj_list->active_project->name)); proj_id = proj_list->find_project_id_by_name(trim(underscore_to_space(proj_list->active_project->name)));
} }
if (proj == NULL){ if (proj == NULL){
std::cout << "Project " << underscore_to_space(proj_name) << " does not exist." << std::endl; std::cout << "Project " << underscore_to_space(proj_name) << " does not exist." << std::endl;
return; return;
} }
int task_id = proj->find_task_id_by_name(underscore_to_space(task_name)); int task_id = proj->find_task_id_by_name(trim(underscore_to_space(task_name)));
if (task_id >= 0){ if (task_id >= 0){
proj_list->set_active_project(proj_id); proj_list->set_active_project(proj_id);
proj->set_active_task(task_id); proj->set_active_task(task_id);
@ -362,8 +350,8 @@ void command_re(std::string input, std::string new_name, ProjectList *proj_list)
size_t place_of_slash = input.find("/"); size_t place_of_slash = input.find("/");
std::string proj_name = input.substr(0,place_of_slash); std::string proj_name = input.substr(0,place_of_slash);
std::string task_name = input.substr(place_of_slash+1); std::string task_name = input.substr(place_of_slash+1);
int id = proj_list->find_project_id_by_name(underscore_to_space(proj_name)); int id = proj_list->find_project_id_by_name(trim(underscore_to_space(proj_name)));
Project *proj = proj_list->find_project_by_name(underscore_to_space(proj_name)); Project *proj = proj_list->find_project_by_name(trim(underscore_to_space(proj_name)));
if (proj == NULL){ if (proj == NULL){
proj = proj_list->active_project; proj = proj_list->active_project;
} }
@ -388,7 +376,7 @@ void command_re(std::string input, std::string new_name, ProjectList *proj_list)
proj->name = underscore_to_space(new_name); proj->name = underscore_to_space(new_name);
std::cout << "Renamed project " << old_name << " to " << proj->name << std::endl; std::cout << "Renamed project " << old_name << " to " << proj->name << std::endl;
}else{ }else{
int task_id = proj_list->active_project->find_task_id_by_name(underscore_to_space(task_name)); int task_id = proj_list->active_project->find_task_id_by_name(trim(underscore_to_space(task_name)));
if (task_id >=0){ if (task_id >=0){
proj->tasks[task_id].name = underscore_to_space(new_name); proj->tasks[task_id].name = underscore_to_space(new_name);