cameron
/
cs142-project-1
1
0
Fork 0
Code Issues 1 Pull Requests 1 Releases Wiki Activity
Browse Source

go fn is alllllll goooood

stew
Sarah Inzerillo 4 years ago
parent
ac9aa0df9c
commit
992d96daed
2 changed files with 94 additions and 97 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 189
      src/Buffer.cpp
  2. 2
      src/FileBrowser.cpp

189
src/Buffer.cpp
View File

@ -6,24 +6,24 @@ using namespace std;
void Buffer::display() const
{
int ix_stop_line_ = ix_top_line_ + window_height_;
for (int i = ix_top_line_; i < ix_stop_line_; ++i) {
if (i < v_lines_.size())
cout << std::setw(6) << i+1 << " " << v_lines_[i];
cout << '\n';
}
int ix_stop_line_ = ix_top_line_ + window_height_;
for (int i = ix_top_line_; i < ix_stop_line_; ++i) {
if (i < v_lines_.size())
cout << std::setw(6) << i+1 << " " << v_lines_[i];
cout << '\n';
}
}
string* Buffer::get_lines() const
{
string* lines = new string[window_height_];
int line = 0;
while (line < window_height_ && line + ix_top_line_ < v_lines_.size()) {
lines[line - ix_top_line_] = v_lines_[line];
++line;
}
return lines;
string* lines = new string[window_height_];
int line = 0;
while (line < window_height_ && line + ix_top_line_ < v_lines_.size()) {
lines[line - ix_top_line_] = v_lines_[line];
++line;
}
return lines;
}
auto get_tag(const string & line)
@ -39,111 +39,108 @@ auto get_tag(const string & line)
bool Buffer::open(const string & new_file_name)
{
std::ifstream file(new_file_name);
if (!file)
return false;
v_lines_.clear();
// Note: the vector is cleared only after we know the file
// opened successfully.
std::ifstream file(new_file_name);
if (!file)
return false;
int curr_link = 0;
std::string curr_l, line;
while(getline(file, line))
{
v_lines_.clear();
// Note: the vector is cleared only after we know the file
// opened successfully.
// Remove any newlines that are in the file.
for(auto char_loc = line.find_first_of('\n'); char_loc != -1; char_loc = line.find_first_of('\n'))
line.erase(char_loc, 1);
int curr_link = 0;
std::string curr_l, line;
while(getline(file, line))
{
// Replace break tags with newlines.
for(auto char_loc = line.find("<br>"); char_loc != -1; char_loc = line.find("<br>"))
line.replace(char_loc, 4, "\n");
// Remove any newlines that are in the file.
for(auto char_loc = line.find_first_of('\n'); char_loc != -1; char_loc = line.find_first_of('\n'))
line.erase(char_loc, 1);
// Find link tags and process them.
// Replace break tags with newlines.
for(auto char_loc = line.find("<br>"); char_loc != -1; char_loc = line.find("<br>"))
line.replace(char_loc, 4, "\n");
// Find tags and process them.
for(auto tag_loc = line.find("<a "); tag_loc != -1; tag_loc = line.find("<a", tag_loc + 1))
{
++curr_link;
// Find link tags and process them.
// Find the length of the tag and pull out the data from the tag.
auto tag_len = line.find_first_of('>', tag_loc) - tag_loc;
std::string link_tag = line.substr(tag_loc + 3, tag_len - 3);
// Find tags and process them.
for(auto tag_loc = line.find("<a "); tag_loc != -1; tag_loc = line.find("<a", tag_loc + 1))
{
++curr_link;
// Seperate the link path and link name into seperate strings. Assuming no spaces in the link path.
auto second_space_loc = link_tag.find_first_of(' ', 0);
std::string file_name = link_tag.substr(0, second_space_loc - 1);
std::string link_name = link_tag.substr(second_space_loc + 1);
// Find the length of the tag and pull out the data from the tag.
auto tag_len = line.find_first_of('>', tag_loc) - tag_loc;
std::string link_tag = line.substr(tag_loc + 3, tag_len - 3);
// Adds the link as a pair to a vector of links.
v_links_.push_back({file_name, link_name});
// Seperate the link path and link name into seperate strings. Assuming no spaces in the link path.
auto second_space_loc = link_tag.find_first_of(' ', 0);
std::string file_name = link_tag.substr(0, second_space_loc);
std::string link_name = link_tag.substr(second_space_loc + 1);
// Adds the link as a pair to a vector of links.
v_links_.push_back({file_name, link_name});
// Reformat the link tag to match specification.
line.replace(tag_loc, tag_len + 1, "<" + link_name + ">[" + to_string(curr_link) + "]");
}
// Reformat the link tag to match specification.
line.replace(tag_loc, tag_len + 1, "<" + link_name + ">[" + to_string(curr_link) + "]");
}
// Search for all paragraphs and breaks in the line and add them to the v_lines vector.
for(auto _tag = get_tag(line); _tag != -1; _tag = get_tag(line))
{
// Search for all paragraphs and breaks in the line and add them to the v_lines vector.
for(auto _tag = get_tag(line); _tag != -1; _tag = get_tag(line))
{
// Check to see if we have a paragraph tag, so we can add a blank line.
bool is_p = _tag == line.find("<p>");
int tag_len = is_p ? 3 : 4;
// Check to see if we have a paragraph tag, so we can add a blank line.
bool is_p = _tag == line.find("<p>");
int tag_len = is_p ? 3 : 4;
// Seperate out text that should stay in the previous line and text that goes in the new line. Delete the tag in the process.
std::string extra_text = line.substr(_tag + tag_len);
line.erase(_tag);
// Seperate out text that should stay in the previous line and text that goes in the new line. Delete the tag in the process.
std::string extra_text = line.substr(_tag + tag_len);
line.erase(_tag);
curr_l += line;
curr_l += line;
// However, if the paragraph is empty, then it shouldn't be added.
if(curr_1 != "")
{
v_lines_.push_back(curr_p);
curr_1 = "";
// However, if the paragraph is empty, then it shouldn't be added.
if(curr_l != "")
{
v_lines_.push_back(curr_l);
curr_l = "";
}
// However, if the tag is located at the start of the file, there will be no data, so it shouldn't be added as it will be an empty line.
if(curr_l != "")
{
v_lines_.push_back(curr_l);
curr_l = "";
// However, if the tag is located at the start of the file, there will be no data, so it shouldn't be added as it will be an empty line.
if(curr_l != "")
if(is_p)
{
v_lines_.push_back(curr_l);
curr_l = "";
if(is_p)
{
v_lines_.push_back("");
}
v_lines_.push_back("");
}
// Move any remaining data on the line back into the line variable so that it can be processed.
line = extra_text;
}
// Append any data left on this line to the v_line being read. Add a space so that content from two lines can be seperated.
curr_1 += " " + line;
// Move any remaining data on the line back into the line variable so that it can be processed.
line = extra_text;
}
// Append any data left on this line to the v_line being read. Add a space so that content from two lines can be seperated.
curr_l += " " + line;
}
// Push the contents of curr_p as it has the last line in the file.
v_lines_.push_back(curr_l);
// Push the contents of curr_p as it has the last line in the file.
v_lines_.push_back(curr_l);
file_name_ = new_file_name;
ix_top_line_ = 0;
v_hist_.push_back(file_name_);
curr_link_itr = v_hist_.end() - 1;
return true;
file_name_ = new_file_name;
ix_top_line_ = 0;
v_hist_.push_back(file_name_);
curr_link_itr = v_hist_.end() - 1;
return true;
}
bool Buffer::go(const int & link)
{
string f_name = v_links_[link-1].first;
if(!open(f_name))
return false;
else
{
// v_hist_.push_back(file_name_);
// curr_link_itr = v_hist_.end() - 1;
return true;
}
string f_name = v_links_[link-1].first;
v_links_.clear();
if(!open(f_name))
return false;
else
{
return true;
}
}
bool Buffer::back()
@ -151,12 +148,12 @@ bool Buffer::back()
if(v_hist_.empty())
return false;
v_hist_.erase(curr_link_itr);
curr_link_itr = prev(curr_link_itr);
v_hist_.erase(curr_link_itr + 1);
if(v_hist_.size() == 0)
return false;
curr_link_itr = prev(curr_link_itr);
open(*curr_link_itr);
return true;

2
src/FileBrowser.cpp
View File

@ -9,7 +9,7 @@ void FileBrowser::display()
const string long_separator(50, '-');
const string short_separator(8, '-');
//system("cls || clear");
system("cls || clear");
if (!error_message_.empty()) {
cout << "ERROR: " + error_message_ << endl;

Write Preview
Loading…
Cancel
Save