src/grim.cc

Commits

b966b2a517365074e5c381dbdea05b3221dc0198 e840f1eeb0ae26af69e1ae146ea9938e28e9f1af e4e05418a640eaed08cd1ec7cd8644eb1dbcca50 4e01ba8ad2c3361fa4be3d896288020948b58b5e aae562ac1350480e4889aabb35899f776c5b59e9 6c3ae0e31eb0893f20e3872117f92cc6b9a942af 350e7d88bb2feb9db00c6e032cc6623f215b7adf 95e6c70d23e99ffcf70e5bbe12503496e5d8f232 e188783659b9bc3b9993a647e93ed110e7f41db6 5e4c38ff3c212cdd9881427ef3f8c2706539a190 e50ea9e1356a74af18fdd171337ef9dc931e1f4e 8f2e83556d12aaebe8e8597ea6923804b0eb7a43 1627c585128af263181053ab2cf1a4cdcd14ee21 def3513f75b325464ad88a33c741c4ca80572b77 a21501590980a905fa9b902897d700a42a08b7f0 56074a6bfe4498d092f3a227297c8c20e2bb962c d9cf1485b7ae0614130494f0e73237921323b9a1 80f04b134ae32ad8a9d526007b33dd02f6600f05 23d6c65f9368d3c622a55a3068a6b2f1efa0c8d4 09c195df02536b6a796bd648fce9669397b96109 f2b5c8202fbc904e2ed78260e3fdbd55164799d2 4bfba076120f389994fc46a98e8b7a2622314400 e36ac5417e10ee9b9f94f340e1ccf28afc5705ea d00dc89a86dd7e2fcfd4618bc3a1c8cfba9e3c3d d9eef16adaf292f3748db5fb5aa98463de10d712 18ff2ec1bfc1cf9fcd17c1acb05c3b41f8f0ed83 9e7fd2980d723437ea621b78d395fa72ca3f4922

Diff

diff --git a/src/grim.cc b/src/grim.cc
index 2cdc017..25bad64 100755
--- a/src/grim.cc
+++ b/src/grim.cc
@@ -252,9 +252,5 @@ std::vector<std::vector<std::string>> parseSelectorParts(std::string selector) {
-			if (e > 0 && e < sl-1) {
-				bool prevMatch = selector[e-1] == '>' || selector[e-1] == '+' || selector[e-1] == '~';
-				bool nextMatch = selector[e+1] == '>' || selector[e+1] == '+' || selector[e+1] == '~';
-
-				if (prevMatch && !nextMatch) {
-					s = '\0';
-				} else if (!prevMatch && nextMatch) {
-					s = '\0';
-				}
+			if (e > 0 && selector[e-1] != ':' && selector[e-1] != ',' && selector[e-1] != '#' && selector[e-1] != '.') {
+				continue;
+			} else 
+			if (e < sl-1 && selector[e+1] != ':' && selector[e+1] != ',' && selector[e+1] != '#' && selector[e+1] != '.') {
+				continue;
@@ -266 +262 @@ std::vector<std::vector<std::string>> parseSelectorParts(std::string selector) {
-			if (s == ':' || s == '[' || s == ',' || s == '#' || s == '.') {
+			if (s == ':' || s == '[' || s == ',' || s == '#' || s == '.' || s == ' ') {
@@ -270 +266 @@ std::vector<std::vector<std::string>> parseSelectorParts(std::string selector) {
-			if (s == '>' || s == '+' || s == '~' || s == ' ') {
+			if (s == '>' || s == '+' || s == '~') {
@@ -275 +271 @@ std::vector<std::vector<std::string>> parseSelectorParts(std::string selector) {
-			} else if (s != '\0') {
+			} else {
@@ -278 +274 @@ std::vector<std::vector<std::string>> parseSelectorParts(std::string selector) {
-		} else if (s != '\0') {
+		} else {
@@ -288 +284 @@ std::vector<std::vector<std::string>> parseSelectorParts(std::string selector) {
-			buffer.clear();
+			buffer = {};
@@ -393,0 +390,20 @@ class StyleHandler {
+
+
+
+void popSelector(std::string selector, std::string& trimmed, std::string& popped, char& symbol) {
+	for (size_t i = selector.length()-1; i >= 0; i--) {
+		if (
+				selector[i] == ' ' ||
+				selector[i] == '>' ||
+				selector[i] == '~' ||
+				selector[i] == '+' 
+		   ) {
+			symbol = selector[i];
+			trimmed = selector.substr(0,i);
+			break;
+		} else {
+			popped = selector[i]+popped;
+		}
+	}
+}
+
@@ -395 +411 @@ class StyleHandler {
-bool testSelector(Node* node, std::vector<std::vector<std::string>> selector) {
+bool testSelector(Node* node, std::string selector) {
@@ -403,13 +419,3 @@ bool testSelector(Node* node, std::vector<std::vector<std::string>> selector) {
-	if (selector.size() > 1) {
-		// If a selector is made up of several different selectors
-		// ie h1, h2, h3
-		// run each selector and return on a match
-		for (auto s : selector) {
-			bool match = testSelector({s});
-			if (match) {
-				return true;
-			}
-		}
-		return false;
-	}
-
+	std::string trimmed, popped;
+	char symbol;
+	popSelector(selector, trimmed, popped, symbol);
@@ -417 +422,0 @@ bool testSelector(Node* node, std::vector<std::vector<std::string>> selector) {
-	std::vector<std::string> parts;
@@ -419,9 +424 @@ bool testSelector(Node* node, std::vector<std::vector<std::string>> selector) {
-	for (size_t i = selector[0].size()-1; i >= 0; i--) {
-		std::string part = selector[0][i];
-		if (part != '>' || part != ' ' || part != '+' || part != '~') {
-			parts.insert(0, part);
-		} else {
-			break;
-		}
-	}
-	
+	// Check if popped matches this element
@@ -428,0 +426,2 @@ bool testSelector(Node* node, std::vector<std::vector<std::string>> selector) {
+	std::vector<std::vector<std::string>> pParts = parseSelectorParts(popped);
+
@@ -539 +538,3 @@ bool testSelector(Node* node, std::vector<std::vector<std::string>> selector) {
-}*/
+}
+
+*/

#include "grim.h"
#include <iostream>
#include <sstream>
#include <algorithm>
#include <stdexcept>
#include <cctype>

std::string ClassList::value() const {
    if (classes.empty()) {
        return "";
    }
    std::string collection = classes[0];
    for (size_t i = 1; i < classes.size(); ++i) {
        collection += " " + classes[i];
    }
    return collection;
}

std::vector<std::string> ClassList::values() {
	return classes;
}

void ClassList::add(std::string value) {
    classes.push_back(value);
}

void ClassList::remove(std::string value) {
    auto it_prev = std::find(classes.begin(), classes.end(), value);
    if (it_prev != classes.end()) {
        *it_prev = classes.back();
        classes.pop_back();
    }
}

// Constructor
Node::Node() : parent(nullptr) {}

std::string Node::getTagName() const { return TagName; }
void Node::setTagName(const std::string& name) { TagName = name; }

const std::unordered_map<std::string, std::string>& Node::getAttributes() const {
    return Attributes;
}

// Implement the getter/setter methods declared using the macro
#define IMPLEMENT_ATTRIBUTE_ACCESSORS(_Type, _FuncNameSuffix, _AttrKeyString) \
    _Type Node::get##_FuncNameSuffix() const { \
        return getAttribute<_Type>(_AttrKeyString); \
    } \
    void Node::set##_FuncNameSuffix(_Type value) { \
        setAttribute(_AttrKeyString, value); \
    }

IMPLEMENT_ATTRIBUTE_ACCESSORS(std::string, Id, "id")
IMPLEMENT_ATTRIBUTE_ACCESSORS(std::string, InnerText, "innerText")
IMPLEMENT_ATTRIBUTE_ACCESSORS(bool, ContentEditable, "contenteditable")
IMPLEMENT_ATTRIBUTE_ACCESSORS(std::string, Href, "href")
IMPLEMENT_ATTRIBUTE_ACCESSORS(std::string, Src, "src")
IMPLEMENT_ATTRIBUTE_ACCESSORS(std::string, Title, "title")
IMPLEMENT_ATTRIBUTE_ACCESSORS(std::string, Value, "value")
IMPLEMENT_ATTRIBUTE_ACCESSORS(int, TabIndex, "tabindex")
IMPLEMENT_ATTRIBUTE_ACCESSORS(bool, Disabled, "disabled")
IMPLEMENT_ATTRIBUTE_ACCESSORS(bool, Required, "required")
IMPLEMENT_ATTRIBUTE_ACCESSORS(bool, Checked, "checked")

Node* Node::createElement(std::string name) {
    std::unique_ptr<Node> newNode = std::make_unique<Node>();
    newNode->setTagName(name);
    newNode->parent = this;
    children.push_back(std::move(newNode));
    return children.back().get();
}

template<typename T>
void Node::setAttribute(const std::string& name, const T& value) {
    if constexpr (std::is_same_v<T, bool>) {
        if (value) {
            Attributes[name] = "";
        } else {
            Attributes.erase(name);
        }
    } else if constexpr (std::is_arithmetic_v<T>) {
        Attributes[name] = std::to_string(value);
    } else {
        static_assert(std::is_convertible_v<T, std::string>,
            "setAttribute: Type cannot be converted to std::string automatically.");
        Attributes[name] = static_cast<std::string>(value);
    }
}

void Node::setAttribute(const std::string& name, const std::string& value) {
    Attributes[name] = value;
}

template<typename T>
T Node::getAttribute(const std::string& name) const {
    auto it = Attributes.find(name);
    if (it != Attributes.end()) {
        const std::string& s = it->second;

if constexpr (std::is_same_v<T, int>) {
            try {
                return std::stoi(s);
            } catch (const std::invalid_argument& e) {
                return 0;
            } catch (const std::out_of_range& e) {
                return 0;
            }
        } else if constexpr (std::is_same_v<T, bool>) {
            std::string lower_s = s;
            std::transform(lower_s.begin(), lower_s.end(), lower_s.begin(),
                [](unsigned char c){ return std::tolower(c); });
            return (!lower_s.empty() && lower_s != "false");
        } else if constexpr (std::is_same_v<T, double>) {
            try {
                return std::stod(s);
            } catch (const std::invalid_argument& e) {
                return 0.0;
            } catch (const std::out_of_range& e) {
                return 0.0;
            }
        } else {
            static_assert(std::is_convertible_v<std::string, T>,
                "getAttribute: Type conversion from std::string not implemented for this type.");
            return static_cast<T>(s);
        }
    }
    return T();
}

std::string Node::getAttribute(const std::string& name) const {
    auto it = Attributes.find(name);
    if (it != Attributes.end()) {
        return it->second;
    }
    return "";
}

std::vector<std::string> Node::getAttributeKeys() {
	std::vector<std::string> keys;

for(auto p : Attributes) {
		keys.push_back(p.first);
	}
	return keys;
}

std::string Node::print(int indent) {
	std::string out = "";
    for (int i = 0; i < indent; ++i) {
        out += "  ";
    }

out += "<" + getTagName();
    for (const auto& attr_pair : getAttributes()) {
        if (attr_pair.first == "innerText" || attr_pair.first == "tagName") {
            continue;
        }
        out += " " + attr_pair.first;
        if (!attr_pair.second.empty()) {
            out += "=\"" + attr_pair.second + "\"";
        }
    }
    out += ">";

if (!getAttribute("innerText").empty()) {
        out += "\n" + getAttribute("innerText");
    }

out += "\n";

for (const auto& child : children) {
        out += child->print(indent + 1)+"\n";
    }

for (int i = 0; i < indent; ++i) {
        out += "  ";
    }
    out += "</" + getTagName() + ">\n";

return out;
}

std::string trimSpace(std::string str) {
    int start = 0;
    int end = str.length() - 1;

// Handle empty string case
    if (str.empty()) {
        return "";
    }

// Find the first non-space character
    for (/* start is already 0 */; start <= end; ++start) {
        if (!std::isspace(str[start])) {
            break;
        }
    }

// If the loop finished, it means the string was all spaces or empty
    if (start > end) {
        return ""; // Or a string of spaces, depending on desired behavior for "   "
    }

// Find the last non-space character
    for (/* end is already str.length() - 1 */; end >= start; --end) {
        if (!std::isspace(str[end])) {
            break;
        }
    }

// Calculate the length of the substring
    // The length is (end_index - start_index) + 1
    return str.substr(start, end - start + 1);
}

struct Style {
	std::unordered_map<std::string, std::string> properties;
	std::vector<std::vector<std::string>> selector;
	// Index of when it was added (for cascading)
	size_t index;
};

// parseSelectorParts deconstructs a selector into its indiviual parts
// so they can be store and used in things like finding styles for basemap
// and comparing a node to a selector in testSelector. This is a higher level function
// that should be ran once perselector and the results saved somewhere
std::vector<std::vector<std::string>> parseSelectorParts(std::string selector) {
	// need to account for selectors with parenthesis like: h1:(+ input:required)
	// need to convert all single quotes to double quotes
	// need to account for commas, will return
	// need to colapse all spaces to a single space
	// need to trim spaces

std::vector<std::vector<std::string>> parts;
	std::vector<std::string> buffer;
	std::string current;
	size_t nesting = 0;

size_t sl = selector.length();

for (size_t e = 0; e < sl; e++) {
		char s = selector[e];
		 
		if (s == '\'') {
			// convert single quotes to double quotes
			s = '\"';
		}

if (s == ' ' && nesting == 0) {
			if (e > 0 && e < sl-1) {
				bool prevMatch = selector[e-1] == '>' || selector[e-1] == '+' || selector[e-1] == '~';
				bool nextMatch = selector[e+1] == '>' || selector[e+1] == '+' || selector[e+1] == '~';

if (prevMatch && !nextMatch) {
					s = '\0';
				} else if (!prevMatch && nextMatch) {
					s = '\0';
				}
			}
		}

if (nesting == 0 && !current.empty()) {
			// !ISSUE: Missing space
			if (s == ':' || s == '[' || s == ',' || s == '#' || s == '.') {
				buffer.push_back(trimSpace(current));
				current = s;
			} else 
			if (s == '>' || s == '+' || s == '~' || s == ' ') {
				buffer.push_back(trimSpace(current));
				buffer.push_back("");
				buffer.back() += s;
				current = "";
			} else if (s != '\0') {
				current += s;
			}
		} else if (s != '\0') {
			current += s;
		}

if ((s == ',' && nesting == 0) || e == sl-1) {
			//std::cout << selector.substr(start, e-start+1) << std::endl;
			if (!current.empty() && current != ",") {
				buffer.push_back(trimSpace(current));
			}
			parts.push_back(buffer);
			buffer.clear();
			current = "";
		}
		if (s == '(' || s == '[' || s == '{') {
			nesting++;
		} else if (s == ')' || s == ']' || s == '}') {
			nesting--;
		}

}

return parts;
}

class StyleHandler {
	private:
		// basemap: Maps baseparts to a index of the styles vector pointing to a Style object
		// because processing a CSS selector isn't trivial we want to make a short list of 
		// the styles that can possibly be a match so we aren't spending a lot of compute 
		// on a selector that applies to the wrong element. Todo this we take the right most part
		// of a selector (that is the part that targets the current element) and we do a few checks
		// like is the tagname the same, does it have that class, and do the id's match. If so that 
		// is a candidate and we run the full selector on it. That includes checking parents,children, 
		// or what ever else the selector needs to match.
		std::unordered_map<std::string, std::vector<size_t>> basemap;
		std::vector<Style> styles;

std::vector<std::string> parseNodeParts(Node* node) {
			std::vector<std::string> parts;

parts.push_back(node->getTagName());
			parts.push_back("#"+node->getId());

// classes and attributes
			auto keys = node->getAttributeKeys();

for (auto k : keys) {
				if (k != "tagName" || k != "id" || k != "innerText" || k != "class") {
					std::string v;
					std::string av = node->getAttribute(k);
					if (av != "") {
							v = "=\""+av+"\"";

}
					parts.push_back('['+k+v+']');
				}
			}

auto classes = node->classList.values();

for (auto c : classes) {
				parts.push_back("."+c);
			}

return parts;
		}

public:
		void add(std::string selector, std::unordered_map<std::string, std::string> properties) {
			// Type is 2d vector of selector parts
			auto parts = parseSelectorParts(selector);
			size_t index = styles.size();
			Style style = {properties,parts,index};

styles.push_back(std::move(style));
// !ISSUE: Re do the basemap mapping in the add function
// + will need to go through each 1d then once in start from right and go left until >+~" " or eol 
/*			for (auto p : parts) {
				if (basemap.find(p) != basemap.end()) {
					basemap[p].push_back(index);
				} else {
					std::vector<size_t> bm = {index};
					basemap[p] = bm;
				}
			}
*/
		}
		
		std::unordered_map<std::string, std::string> getStyles(Node* node) {
			std::vector<std::string> parts = parseNodeParts(node);

std::vector<size_t> canidates;

for (auto p : parts) {
				if (auto sty = basemap.find(p); sty != basemap.end()) {
					for (auto s : sty->second) {
						bool found = false;
						// This makes sure we aren't adding the same styles to the candidates list
						for (auto c : canidates) {
							if (c == s) {
								found = true;
								break;
							}
						}
						if (!found) {
							canidates.push_back(s);
						}
					}
				}
			}

// Now we have the list of candidates next we will refined our selection
			// we need to pull the selectors from each candidate then run testSelector on it
		}
};
/*
bool testSelector(Node* node, std::vector<std::vector<std::string>> selector) {
	// By the time we get here, we know the right most selector some what matches
	// so now if it is a compound selector we should see if the parent('s) some what match
	if (selector == "*") {
		return true;
	}

if (selector.size() > 1) {
		// If a selector is made up of several different selectors
		// ie h1, h2, h3
		// run each selector and return on a match
		for (auto s : selector) {
			bool match = testSelector({s});
			if (match) {
				return true;
			}
		}
		return false;
	}

std::vector<std::string> parts;

for (size_t i = selector[0].size()-1; i >= 0; i--) {
		std::string part = selector[0][i];
		if (part != '>' || part != ' ' || part != '+' || part != '~') {
			parts.insert(0, part);
		} else {
			break;
		}
	}
	
	
	bool matched = true;

std::vector<std::string> nodeClasses = node->classList.values();
	std::unordered_map<std::string, std::string> attributes = node->getAttributes();

std::vector<std::string> attrs;

for (auto a : attributes) {
		if (a.second != "") {
			attrs.push_back("["+a.first+"=\""+a.second+"\"]");
		} else {

attrs.push_back("["+a.first+"]");
		}
	}
	
	size_t i = 0;
	for (auto p : pParts) {
		i++;
		if (i == 0 && p[0] != '#' && p[0] != '.' &&  p[0] != '[') {
			matched = node->getTagName() == p;
		} else if (p[0] == '#') {
			matched = node->getId() == p;
		} else if (p[0] == '.') {
			// Remove the period
			std::string clipped = p.substr(1);
			bool found = false;
			for (auto c : nodeClasses) {
				if (clipped == c) {
					found = true;
					break;
				}
			}
			matched = found;
		} else if (p[0] == '[') {
			bool found = false;
			for (auto a : attrs) {
				if (p == a) {
					found = true;
					break;
				}
			}
			matched = found;
		}

if (!matched) {
			// Return out of the function
			return false;
		}
	}

// The rest of the logic assumes the other selectors do not match until proven otherwise
	matched = false;

if (symbol == '\0' || node->parent != nullptr) {
		return false;
	}
	
	if (symbol == '>') {
		// We are just testing the parent node here
		matched = testSelector(node->parent, trimmed);
	} else if (symbol == '+') {
		const auto& children = node->parent->children;
		if (children.size() > 1) {
			for (size_t i = 0; i < children.size(); i++) {
				Node* child_ptr = children[i].get();

if (child_ptr == node) {
					if (i == 0) {
						return false;
					} else {
						// In this selector we just need to get the direct sibling and test it
						matched = testSelector(children[i-1].get(), trimmed);
					}
					break;
				}
			}
		}
	} else if (symbol == '~') {
		const auto& children = node->parent->children;
		if (children.size() > 1) {
			for (size_t i = 0; i < children.size(); i++) {
				Node* child_ptr = children[i].get();

if (child_ptr == node) {
					break;
				} else {
					// We have to test every selector before the current element,
					// if any match then it matches
					matched = testSelector(children[i].get(), trimmed);
					if (matched) {
						break;
					}
				}
			}
		}
	} else if (symbol == ' ') {
		// For the descendant combinator we have to check every parent until we match or nullptr out
		Node* current = node->parent;
		while (current != nullptr) {
			if (testSelector(current, trimmed)) {
				matched = true;
				break;
			}
			current = current->parent;
		}
	}

return matched;
}*/