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

Binary I/O fixed

This commit is contained in:
Patrick Lipka 2021-12-09 11:43:14 +01:00
parent 94e3e07a74
commit d15b8a57e4
2 changed files with 28 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/project.cpp
View File

@ -35,12 +35,11 @@ void ProjectList::remove_project(int id){
} }
void ProjectList::save(std::string file_name){ void ProjectList::save(std::string file_name){
std::ofstream of(file_name, std::ios::out | std::ios::binary); std::ofstream of(file_name, std::ios::binary);
if (!of){ if (!of){
std::cout << "Could not open file " << file_name << " for writing!" << std::endl; std::cout << "Could not open file " << file_name << " for writing!" << std::endl;
exit(1); exit(1);
} }
std::cout << num_projects << " " << num_projects << std::endl;
of.write((char*) &num_projects, sizeof(int)); of.write((char*) &num_projects, sizeof(int));
of.write((char*) &active_project, sizeof(int)); of.write((char*) &active_project, sizeof(int));
for (int i=0; i<num_projects; i++){ for (int i=0; i<num_projects; i++){
@ -52,7 +51,7 @@ void ProjectList::save(std::string file_name){
for (int j=0; j<projects[i].num_tasks; j++){ for (int j=0; j<projects[i].num_tasks; j++){
size_t task_name_len = projects[i].tasks[j].name.size(); size_t task_name_len = projects[i].tasks[j].name.size();
of.write((char*) &task_name_len, sizeof(size_t)); of.write((char*) &task_name_len, sizeof(size_t));
of.write((char*) projects[i].tasks[j].name.c_str(), len); of.write((char*) projects[i].tasks[j].name.c_str(), task_name_len);
of.write((char*) &(projects[i].tasks[j].work_time), sizeof(int)); of.write((char*) &(projects[i].tasks[j].work_time), sizeof(int));
} }
} }
@ -60,20 +59,20 @@ void ProjectList::save(std::string file_name){
} }
void ProjectList::load(std::string file_name){ void ProjectList::load(std::string file_name){
std::ifstream inf(file_name, std::ios::in | std::ios::binary); std::ifstream inf(file_name, std::ios::binary);
int active;
if (!inf){ if (!inf){
std::cout << "Could not open file " << file_name << " for reading!" << std::endl; std::cout << "Could not open file " << file_name << " for reading!" << std::endl;
exit(1); exit(1);
} }
inf.read((char*) &num_projects,sizeof(int)); inf.read((char*) &num_projects,sizeof(int));
std::cout << "num projects: " << num_projects << std::endl; inf.read((char*) &active, sizeof(int));
inf.read((char*) &active_project, sizeof(int)); int np = num_projects;
for (int i=0; i<num_projects;i++){ for (int i=0; i<np;i++){
size_t len; size_t len;
std::string proj_name; std::string proj_name;
//std::cout << "about to read name" << std::endl; int active_t;
inf.read((char*) &len, sizeof(size_t)); inf.read((char*) &len, sizeof(size_t));
//std::cout << "name read" << std::endl;
char* tmp_name = new char[len+1]; char* tmp_name = new char[len+1];
inf.read(tmp_name, len); inf.read(tmp_name, len);
tmp_name[len] = '\0'; tmp_name[len] = '\0';
@ -81,9 +80,9 @@ void ProjectList::load(std::string file_name){
Project proj(proj_name); Project proj(proj_name);
delete [] tmp_name; delete [] tmp_name;
inf.read((char*) &(proj.num_tasks), sizeof(int)); inf.read((char*) &(proj.num_tasks), sizeof(int));
inf.read((char*) &(proj.active_task), sizeof(int)); inf.read((char*) &active_t, sizeof(int));
for (int j; j<proj.num_tasks; j++){ int nt = proj.num_tasks;
std::cout << "jloop" << std::endl; for (int j=0; j<nt; j++){
std::string task_name; std::string task_name;
size_t task_name_len; size_t task_name_len;
inf.read((char*) &task_name_len, sizeof(size_t)); inf.read((char*) &task_name_len, sizeof(size_t));
@ -93,10 +92,14 @@ void ProjectList::load(std::string file_name){
task_name = tmp_task_name; task_name = tmp_task_name;
delete [] tmp_task_name; delete [] tmp_task_name;
Task task(task_name); Task task(task_name);
inf.read((char*) &(task.work_time), sizeof(int)); int work_time=0;
proj.add_task(task); inf.read((char*) &(work_time), sizeof(int));
std::cout << "Task " << task.name << "read." << std::endl; task.add_time(work_time);
proj.add_task(task);
} }
add_project(proj); proj.active_task = active_t;
add_project(proj);
} }
active_project = active;
inf.close();
} }

11
src/tt.cpp
View File

@ -13,20 +13,27 @@ int main(){
proj.add_task(task); proj.add_task(task);
std::cout << "Project name: " << proj.name << " No tasks:"<< proj.num_tasks <<" contains task 0: " << proj.tasks[0].name << " with work time " << proj.tasks[0].work_time << std::endl; std::cout << "Project name: " << proj.name << " No tasks:"<< proj.num_tasks <<" contains task 0: " << proj.tasks[0].name << " with work time " << proj.tasks[0].work_time << std::endl;
std::cout << "Removing Task 0 from Project" << std::endl; /*std::cout << "Removing Task 0 from Project" << std::endl;
proj.remove_task(0); proj.remove_task(0);
std::cout << "Number of tasks in project: " << proj.num_tasks << std::endl; std::cout << "Number of tasks in project: " << proj.num_tasks << std::endl;
*/
ProjectList proj_list; ProjectList proj_list;
proj_list.add_project(proj); proj_list.add_project(proj);
std::cout << "Project List no of projects: " << proj_list.num_projects << " Name of active proj: " << proj_list.projects[proj_list.active_project].name << std::endl; std::cout << "Project List no of projects: " << proj_list.num_projects << " Name of active proj: " << proj_list.projects[proj_list.active_project].name << std::endl;
std::cout << "Write Project List to file" << std::endl; std::cout << "Write Project List to file" << std::endl;
std::cout << "Active Project: " << proj_list.active_project << std::endl;
proj_list.save("test.bin"); proj_list.save("test.bin");
std::cout << "Read Project List from file" << std::endl; std::cout << "Read Project List from file" << std::endl;
ProjectList list2; ProjectList list2;
list2.load("test.bin"); list2.load("test.bin");
std::cout << "Project List no of projects: " << list2.num_projects << std::endl;
std::cout << "active Project: " << list2.active_project << std::endl;
std::cout << "Name of active proj: " << list2.projects[list2.active_project].name << std::endl;
std::cout << "Name of active task: " << list2.projects[list2.active_project].tasks[list2.projects[list2.active_project].active_task].name << std::endl;
std::cout << "Work time of this task: " << list2.projects[list2.active_project].tasks[list2.projects[list2.active_project].active_task].work_time << std::endl;
return 0; return 0;
} }