Browse Source

yeehaw

stew
Sarah Inzerillo 4 years ago
parent
commit
c8507fc800
  1. 5
      debug.sh
  2. BIN
      src/.Buffer.h.swo
  3. 188
      src/Buffer.cpp
  4. 16
      src/Buffer.h
  5. 19
      src/FileBrowser.cpp
  6. 33
      test.txt

5
debug.sh

@ -0,0 +1,5 @@
#!/bin/bash
cd obj
g++ ../src/*.cpp -c -g
cd ..
g++ obj/*.o -o bin/FileBrowser

BIN
src/.Buffer.h.swo

188
src/Buffer.cpp

@ -4,18 +4,30 @@
using namespace std;
void Buffer::display() const
{
<<<<<<< HEAD
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(4) << i+1 << " " << v_lines_[i];
cout << '\n';
}
>>>>>>> 9159d27c4f65480ce2606eeb041b3ce03a1b1048
}
/*
string* Buffer::get_lines() const
{
<<<<<<< HEAD
string* lines = new string[window_height_];
int line = 0;
while (line < window_height_ && line + ix_top_line_ < v_lines_.size()) {
@ -24,21 +36,82 @@ string* Buffer::get_lines() const
}
return lines;
=======
string* lines = new string[window_height_];
int line_num = 0;
while (line_num < window_height_ && line_num + ix_top_line_ < v_lines_.size()) {
lines[line_num] = v_lines_[line_num + ix_top_line_];
//cout << v_lines_[line_num] << endl;
++line_num;
}
//cout << "----------" << endl << endl;;
return lines;
>>>>>>> 9159d27c4f65480ce2606eeb041b3ce03a1b1048
}
*/
vector<string> Buffer::split_line(string & str) {
//Initialize the substring and set the positions in the string where they need to exist
vector<string> v = {};
string str_part = str;
size_t curr_pos = str_part.find(" ");
size_t total_pos = curr_pos;
bool searching = true;
// Split up the lines
while (str.length() > maximum_length_)
{
//Re-initialize the substring and set the positions in the string where they need to exist
str_part = str;
curr_pos = str_part.find(" ");
total_pos = curr_pos;
searching = true;
//While searching for the next space in a string
while (searching)
{
str_part = str_part.substr(curr_pos + 1, str_part.length());
curr_pos = str_part.find(" ");
if (curr_pos == -1)
{
searching = false;
}
else if (total_pos + curr_pos + 1 > maximum_length_)
{
searching = false;
}
else
{
total_pos += curr_pos + 1;
}
}
str_part = str.substr(0, total_pos);
str = str.substr(total_pos + 1, str.length());
v.push_back(str_part);
}
v.push_back(str);
return v;
}
auto get_tag(const string & line)
size_t Buffer::get_tag_(const string & line)
{
auto p_tag = line.find("<p>");
auto b_tag = line.find("<br>");
size_t p_tag = line.find("<p>");
size_t b_tag = line.find("<br>");
if (p_tag > b_tag)
return b_tag;
else
return p_tag;
if (p_tag > b_tag)
return b_tag;
else
return p_tag;
}
bool Buffer::open(const string & new_file_name)
{
<<<<<<< HEAD
std::ifstream file(new_file_name);
if (!file)
return false;
@ -158,3 +231,104 @@ bool Buffer::back()
return true;
}
=======
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.
int curr_link = 0;
std::string curr_line, line;
while(getline(file, line))
{
// 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 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);
// separate the link path and link name into separate 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);
// 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) + "]");
}
// 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;
// Separate 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_line += line;
// 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_line != "")
{
v_lines_.push_back(curr_line);
curr_line = "";
if(is_p)
{
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;
}
curr_line += line;
// TODO: What is this section
if (curr_line.length() > maximum_length_) {
vector<string> v_split_line = split_line(curr_line);
for (auto e: v_split_line) {
cout << e << endl;
v_lines_.push_back(e);
}
curr_line = "";
}
}
// Push the contents of curr_p as it has the last line in the file.
v_lines_.push_back(curr_line);
ix_top_line_ = 0;
file_name_ = new_file_name;
return true;
}
bool Buffer::go(int link)
{
string f_name = v_links_[link - 1].second;
if(!open(f_name))
return false;
else
return true;
}
void Buffer::back()
{
}
>>>>>>> 9159d27c4f65480ce2606eeb041b3ce03a1b1048

16
src/Buffer.h

@ -13,25 +13,35 @@
class Buffer
{
public:
void back();
void display() const;
const std::string & file_name() const { return file_name_; }
bool go(int link);
void move_to_next_page();
void move_to_previous_page();
int max_links();
<<<<<<< HEAD
bool go(const int & link);
bool back();
=======
>>>>>>> 9159d27c4f65480ce2606eeb041b3ce03a1b1048
bool open(const std::string & file_name);
std::string* get_lines() const;
//std::string* get_lines() const;
void set_maximum_length(int l) { maximum_length_ = l; }
void set_window_height(int h) { window_height_ = h; }
//Made window height public so the display function can be removed
private:
std::size_t get_tag_(const std::string & line);
std::string file_name_;
std::vector<std::string> split_line(std::string & str);
std::vector<std::string> v_lines_;
std::vector<std::pair<std::string, std::string>> v_links_;
std::vector<std::string> v_hist_;
std::vector<std::string>::iterator curr_link_itr = v_hist_.end();
int ix_top_line_ = 0;
std::string file_name_;
int window_height_;
int window_height_ = 0;
int maximum_length_ = 0;
};
inline void Buffer::move_to_next_page()

19
src/FileBrowser.cpp

@ -23,8 +23,14 @@ void FileBrowser::display()
cout << file_name << endl;
cout << long_separator << endl;
/*
//Display the lines
auto lines = buffer_.get_lines();
for (int i = 0; i < buffer_.window_height; ++i)
cout << std::setw(4) << i+1 << " " << lines[i] << endl;
delete[] lines;
*/
buffer_.display();
cout << long_separator << endl;
cout << " next previous open\n";
@ -36,10 +42,15 @@ void FileBrowser::execute_command(char command, bool & done)
{
switch (command) {
case 'b': {
<<<<<<< HEAD
if(!buffer_.back())
error_message_ = "No pervious links to open";
=======
buffer_.back();
>>>>>>> 9159d27c4f65480ce2606eeb041b3ce03a1b1048
break;
}
case 'g': {
stringstream ss;
string temp;
@ -59,6 +70,10 @@ void FileBrowser::execute_command(char command, bool & done)
}
break;
}
<<<<<<< HEAD
=======
>>>>>>> 9159d27c4f65480ce2606eeb041b3ce03a1b1048
case 'n': {
buffer_.move_to_next_page();
break;
@ -90,13 +105,13 @@ void FileBrowser::run()
cout << "Window height? ";
cin >> window_height_;
cin.get(); // '\n'
cout << '\n';
buffer_.set_window_height(window_height_);
cout << "Maximum length? ";
cin >> maximum_length_;
cin.get(); // '\n'
cout << '\n';
buffer_.set_maximum_length(maximum_length_);
cout << endl;
bool done = false;
while (!done) {

33
test.txt

@ -12,4 +12,37 @@
<p>This line is split into <p>two paragraph tags.
<p>This line con<br>tains some<br > problematic< p> tags.
Derp. Derp. Derp. Derp. Derp.
<<<<<<< HEAD
>>>>>>> d20176994a49dc433604ed3b1b96b8324f680782
=======
<p>This is the first line in the file.
<p>This is the second <br> and eighth line of the file.
<p>This line has a link to the <a docs/specification.txt specification> file.
<p>This line is split into <p>two paragraph tags.
<p>This line con<br>tains some<br > problematic< p> tags.
Derp. Derp. Derp. Derp. Derp.
<p>This is the first line in the file.
<p>This is the second <br> and fourteenth line of the file.
<p>This line has a link to the <a docs/specification.txt specification> file.
<p>This line is split into <p>two paragraph tags.
<p>This line con<br>tains some<br > problematic< p> tags.
Derp. Derp. Derp. Derp. Derp.
<p>This is the first line in the file.
<p>This is the second <br> and twentieth line of the file.
<p>This line has a link to the <a docs/specification.txt specification> file.
<p>This line is split into <p>two paragraph tags.
<p>This line con<br>tains some<br > problematic< p> tags.
Derp. Derp. Derp. Derp. Derp.
<p>This is the first line in the file.
<p>This is the second <br> and twenty sixth line of the file.
<p>This line has a link to the <a docs/specification.txt specification> file.
<p>This line is split into <p>two paragraph tags.
<p>This line con<br>tains some<br > problematic< p> tags.
Derp. Derp. Derp. Derp. Derp.
<p>This is the first line in the file.
<p>This is the second <br> and thirty second line of the file.
<p>This line has a link to the <a docs/specification.txt specification> file.
<p>This line is split into <p>two paragraph tags.
<p>This line con<br>tains some<br > problematic< p> tags.
Derp. Derp. Derp. Derp. Derp.
>>>>>>> 9159d27c4f65480ce2606eeb041b3ce03a1b1048
Loading…
Cancel
Save