fridmanos
/
File-viewer
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update Functions.h 

Make display_directory_content() use a vector instead of a map
This commit is contained in:
Isak 2018-02-18 00:09:28 +01:00 committed by GitHub
parent c266ef0750
commit a926a44231
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/headers/Functions.h
View File

@ -39,13 +39,13 @@ parse_command_line(int argc, char **argv)
return optinfo; return optinfo;
} }
std::map<int, std::string> /* Returns a std::map, constructed like the following: <index, file_name>*/ std::vector<std::string>
display_directory_content() display_directory_content()
{ {
Directory dir( get_current_dir_name() ); Directory dir( get_current_dir_name() );
int count=1; int count=1;
std::map<int, std::string> content_map; std::vector<std::string> file_name_v;
std::cout << "* Viewing contents of " << get_current_dir_name() << " *\n\n"; std::cout << "* Viewing contents of " << get_current_dir_name() << " *\n\n";
while ((dir.read()) != NULL) while ((dir.read()) != NULL)
@ -54,17 +54,17 @@ display_directory_content()
{ {
std::string dir_name = "/" + dir.name() + "/"; std::string dir_name = "/" + dir.name() + "/";
std::cout << "* " << count << ": " << dir_name << '\n'; /* Prepend directories with slash */ std::cout << "* " << count << ": " << dir_name << '\n'; /* Prepend directories with slash */
content_map.insert(std::pair<int, std::string>( count, dir_name )); file_name_v.push_back(dir_name);
} }
else if (dir.type() == Types::FILE) else if (dir.type() == Types::FILE)
{ {
std::cout << "* " << count << ": " << dir.name() << '\n'; std::cout << "* " << count << ": " << dir.name() << '\n';
content_map.insert(std::pair<int, std::string>( count, dir.name() )); file_name_v.push_back( dir.name() );
} }
count++; count++;
} }
return content_map; return file_name_v;
} }
void void
@ -83,3 +83,4 @@ display_file_content(const std::string file_name) /* Displays the content of a f
} }
#endif #endif