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

Update Main.cpp 

Make Main.cpp use a vector instead of a map
This commit is contained in:
Isak 2018-02-18 00:10:00 +01:00 committed by GitHub
parent a926a44231
commit e0b742d8c2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/Main.cpp
View File

@ -1,7 +1,7 @@
/* Program to navigate directories */ /* Program to navigate directories */
#include <iostream> #include <iostream>
#include <string> #include <string>
#include <map> #include <vector>
#include <unistd.h> //for get_current_dir() and chdir() #include <unistd.h> //for get_current_dir() and chdir()
#include "headers/Functions.h" #include "headers/Functions.h"
@ -19,7 +19,7 @@ main(int argc, char *argv[])
chdir( get_current_dir_name() ); chdir( get_current_dir_name() );
CLEAR; CLEAR;
std::map<int, str_t> map = display_directory_content(); std::vector<std::string> file_v = display_directory_content();
/* Program loop */ /* Program loop */
for(;;) for(;;)
@ -29,20 +29,20 @@ main(int argc, char *argv[])
std::cin >> option; std::cin >> option;
if ( option == 0 ) break; if ( option == 0 ) break;
if ( option > map.size() ) {std::cerr << "Invalid input"; continue;} if ( option > file_v.size() ) {std::cerr << "Invalid input"; continue;}
if ( map[option][0] != '/' ) /* If it doesn't start with a '/', we know it's a file */ if ( file_v[option][0] != '/' ) /* If it doesn't start with a '/', we know it's a file */
{ {
if (prog_info.editor != NULL) { if (prog_info.editor != NULL) {
CLEAR; CLEAR;
str_t command = str_t(prog_info.editor) + " " + str_t(map[option]); str_t command = str_t(prog_info.editor) + " " + str_t(file_v[option]);
if ( system(command.c_str()) == -1 ) /* If opening file with specified editor failed, break */ if ( system(command.c_str()) == -1 ) /* If opening file with specified editor failed, break */
break; break;
} }
else else
{ {
CLEAR; CLEAR;
display_file_content(map[option]); display_file_content(file_v[option]);
str_t temp; str_t temp;
std::cout << "Return (\\n)"; std::cout << "Return (\\n)";
@ -55,11 +55,12 @@ main(int argc, char *argv[])
} }
else else
{ {
str_t path = get_current_dir_name() + map [option]; chdir( path.c_str() ); //Change current directory str_t path = get_current_dir_name() + file_v[option]; chdir( path.c_str() ); //Change current directory
CLEAR; CLEAR;
map = display_directory_content(); file_v = display_directory_content();
} }
} }
return 0; return 0;
} }