Browse Source

Consistant formatting

inzeris
Sarah Inzerillo 3 years ago
parent
commit
8fb0f32bc0
  1. 3
      docs/status_report.txt
  2. 256
      src/Buffer.cpp
  3. 112
      src/Buffer.h
  4. 229
      src/FileBrowser.cpp

3
docs/status_report.txt

@ -0,0 +1,3 @@
Ryan Stewart, Cameron Weinfurt, Sarah Inzerillo
Our file fiewer is complete and runs as expected.

256
src/Buffer.cpp

@ -7,152 +7,154 @@ 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(4) << 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';
}
}
//Pass the string by copy because I don't want to change the original, but still need to manipulate it
void Buffer::split_line(string str)
void Buffer::split_line(string str)
{
// Split up the lines and then push them onto the line vector
while (str.length() > maximum_length_)
{
//Initialize the substring and set the positions in the string where they need to exist
string str_part = str;
size_t curr_pos = str_part.find(" ");
size_t total_pos = curr_pos;
bool 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;
// Split up the lines and then push them onto the line vector
while (str.length() > maximum_length_)
{
//Initialize the substring and set the positions in the string where they need to exist
string str_part = str;
size_t curr_pos = str_part.find(" ");
size_t total_pos = curr_pos;
bool 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;
}
else
{
total_pos += curr_pos + 1;
}
}
//Check if the string part can still be chopped
if (str_part.length() != str.length())
}
//Check if the string part can still be chopped
if (str_part.length() != str.length())
{
str_part = str.substr(0, total_pos);
str = str.substr(total_pos + 1, str.length());
v_lines_.push_back(str_part);
}
//Break out of the loop because there is no way to make the string shorter
//I also didn't see why I can't use break and would have to use a boolean
else
str_part = str.substr(0, total_pos);
str = str.substr(total_pos + 1, str.length());
v_lines_.push_back(str_part);
}
//Break out of the loop because there is no way to make the string shorter
//I also didn't see why I can't use break and would have to use a boolean
else
{
break;
}
}
v_lines_.push_back(str);
break;
}
}
v_lines_.push_back(str);
}
size_t Buffer::get_tag_(const string & line)
{
size_t p_tag = line.find("<p>");
size_t 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, bool add_to_hist_)
{
std::ifstream file(new_file_name);
if (!file)
return false;
v_links_.clear();
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);
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 != "")
{
split_line(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;
}
// Push the contents of curr_line as it has the last line in the file.
split_line(curr_line);
std::ifstream file(new_file_name);
if (!file)
return false;
v_links_.clear();
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);
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 != "")
{
split_line(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;
}
// Push the contents of curr_line as it has the last line in the file.
split_line(curr_line);
ix_top_line_ = 0;
file_name_ = new_file_name;
file_name_ = new_file_name;
if(add_to_hist_){
v_hist_.push_back(file_name_);
curr_link_itr = v_hist_.end() - 1;
}
if(add_to_hist_)
{
v_hist_.push_back(file_name_);
curr_link_itr = v_hist_.end() - 1;
}
return true;
return true;
}
bool Buffer::go(int link)

112
src/Buffer.h

@ -1,56 +1,56 @@
// Buffer.h
#ifndef _Buffer_h_
#define _Buffer_h_
#include <fstream>
#include <iomanip>
#include <sstream>
#include <iostream>
#include <string>
#include <vector>
class Buffer
{
public:
bool back();
void display() const;
const std::string & file_name() const { return file_name_; }
bool go(int link);
long max_links() {return v_links_.size(); };
void move_to_next_page();
void move_to_previous_page();
bool open(const std::string & file_name, bool add_to_hist_ = true);
void set_maximum_length(int l) { maximum_length_ = l; }
void set_window_height(int h) { window_height_ = h; }
private:
std::size_t get_tag_(const std::string & line);
void split_line(std::string str);
std::string file_name_;
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();
bool add_to_hist_ = 1;
int ix_top_line_ = 0;
int window_height_ = 0;
int maximum_length_ = 0;
};
inline void Buffer::move_to_next_page()
{
ix_top_line_ += window_height_;
if (ix_top_line_ >= v_lines_.size())
ix_top_line_ -= window_height_;
}
inline void Buffer::move_to_previous_page()
{
ix_top_line_ -= window_height_;
if (ix_top_line_ < 0)
ix_top_line_ = 0;
}
#endif
// Buffer.h
#ifndef _Buffer_h_
#define _Buffer_h_
#include <fstream>
#include <iomanip>
#include <sstream>
#include <iostream>
#include <string>
#include <vector>
class Buffer
{
public:
bool back();
void display() const;
const std::string & file_name() const { return file_name_; }
bool go(int link);
long max_links() {return v_links_.size(); };
void move_to_next_page();
void move_to_previous_page();
bool open(const std::string & file_name, bool add_to_hist_ = true);
void set_maximum_length(int l) { maximum_length_ = l; }
void set_window_height(int h) { window_height_ = h; }
private:
std::size_t get_tag_(const std::string & line);
void split_line(std::string str);
std::string file_name_;
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();
bool add_to_hist_ = 1;
int ix_top_line_ = 0;
int window_height_ = 0;
int maximum_length_ = 0;
};
inline void Buffer::move_to_next_page()
{
ix_top_line_ += window_height_;
if (ix_top_line_ >= v_lines_.size())
ix_top_line_ -= window_height_;
}
inline void Buffer::move_to_previous_page()
{
ix_top_line_ -= window_height_;
if (ix_top_line_ < 0)
ix_top_line_ = 0;
}
#endif

229
src/FileBrowser.cpp

@ -1,115 +1,114 @@
// FileBrowser.cpp
#include "FileBrowser.h"
using namespace std;
void FileBrowser::display()
{
const string long_separator(50, '-');
const string short_separator(8, '-');
system("cls || clear");
if (!error_message_.empty()) {
cout << "ERROR: " + error_message_ << endl;
error_message_.clear();
}
string file_name = buffer_.file_name();
if (file_name.empty())
cout << "<no file opened>\n";
else
cout << file_name << endl;
cout << long_separator << endl;
buffer_.display();
cout << long_separator << endl;
cout << " next previous open\n";
cout << " go back quit\n";
cout << short_separator << endl;
}
void FileBrowser::execute_command(char command, bool & done)
{
switch (command) {
case 'b': {
if(!buffer_.back())
error_message_ = "No previous links to open";
break;
}
case 'g': {
stringstream ss;
string temp;
int link;
cout << "go to link: ";
getline(cin, temp);
ss.str(temp);
ss >> link;
if (!ss) {
error_message_ = temp + " is not a valid link";
}
else if (link < 1 || link > buffer_.max_links()) {
error_message_ = "Could not open " + temp + " because the file is out of range";
}
else if(!buffer_.go(link)){
error_message_ = "Could not open link " + temp;
}
break;
}
case 'n': {
buffer_.move_to_next_page();
break;
}
case 'o': {
cout << "file name: ";
string file_name;
getline(cin, file_name);
if (!buffer_.open(file_name))
error_message_ = "Could not open " + file_name;
break;
}
case 'p': {
buffer_.move_to_previous_page();
break;
}
case 'q': {
done = true;
break;
}
}
}
void FileBrowser::run()
{
cout << "Window height? ";
cin >> window_height_;
cin.get(); // '\n'
buffer_.set_window_height(window_height_);
cout << "Maximum length? ";
cin >> maximum_length_;
cin.get(); // '\n'
buffer_.set_maximum_length(maximum_length_);
cout << endl;
bool done = false;
while (!done) {
display();
cout << "command: ";
char command;
cin >> command;
cin.get(); // '\n'
execute_command(command, done);
cout << endl;
}
}
// FileBrowser.cpp
#include "FileBrowser.h"
using namespace std;
void FileBrowser::display()
{
const string long_separator(50, '-');
const string short_separator(8, '-');
system("cls || clear");
if (!error_message_.empty())
{
cout << "ERROR: " + error_message_ << endl;
error_message_.clear();
}
string file_name = buffer_.file_name();
if (file_name.empty())
cout << "<no file opened>\n";
else
cout << file_name << endl;
cout << long_separator << endl;
buffer_.display();
cout << long_separator << endl;
cout << " next previous open\n";
cout << " go back quit\n";
cout << short_separator << endl;
}
void FileBrowser::execute_command(char command, bool & done)
{
switch(command)
{
case 'b': {
if(!buffer_.back())
error_message_ = "No previous links to open";
break;
}
case 'g': {
stringstream ss;
string temp;
int link;
cout << "go to link: ";
getline(cin, temp);
ss.str(temp);
ss >> link;
if (!ss) {
error_message_ = temp + " is not a valid link";
}
else if (link < 1 || link > buffer_.max_links()) {
error_message_ = "Could not open " + temp + " because the file is out of range";
}
else if(!buffer_.go(link)){
error_message_ = "Could not open link " + temp;
}
break;
}
case 'n': {
buffer_.move_to_next_page();
break;
}
case 'o': {
cout << "file name: ";
string file_name;
getline(cin, file_name);
if (!buffer_.open(file_name))
error_message_ = "Could not open " + file_name;
break;
}
case 'p': {
buffer_.move_to_previous_page();
break;
}
case 'q': {
done = true;
break;
}
}
}
void FileBrowser::run()
{
cout << "Window height? ";
cin >> window_height_;
cin.get(); // '\n'
buffer_.set_window_height(window_height_);
cout << "Maximum length? ";
cin >> maximum_length_;
cin.get(); // '\n'
buffer_.set_maximum_length(maximum_length_);
cout << endl;
bool done = false;
while (!done)
{
display();
cout << "command: ";
char command;
cin >> command;
cin.get(); // '\n'
execute_command(command, done);
cout << endl;
}
}
Loading…
Cancel
Save