commit e378f90fd8b7cfab10326d52750aafd13d6b1511
parent 6863281879c8e5d176dbed0c10675ec23776a9dc
Author: Andrew Laack <andrew@laack.co>
Date: Mon, 21 Sep 2026 23:03:55 -0500
Building out types
Diffstat:
12 files changed, 104 insertions(+), 9 deletions(-)
diff --git a/Makefile b/Makefile
@@ -1,5 +1,5 @@
build:
- g++ src/main.cpp src/link.cpp src/site.cpp src/utils.cpp src/gemini-client.cpp src/browser.cpp -lssl -lcrypto -lncurses -o browser.out
+ g++ src/main.cpp src/link.cpp src/plaintext.cpp src/site.cpp src/utils.cpp src/gemini-client.cpp src/browser.cpp -lssl -lcrypto -lncurses -o browser.out
install:
echo "Not implemented"
@@ -8,12 +8,12 @@ clean:
echo "Not implemented"
browser-test:
- g++ tests/browser-test.cpp src/link.cpp src/browser.cpp src/site.cpp src/utils.cpp src/gemini-client.cpp -lCatch2Main -lCatch2 -lssl -lcrypto -o test.out
+ g++ tests/browser-test.cpp src/plaintext.cpp src/browser.cpp src/link.cpp src/site.cpp src/utils.cpp src/gemini-client.cpp -lCatch2Main -lCatch2 -lssl -lcrypto -o test.out
./test.out
rm test.out
fetch-test:
- g++ tests/fetch-test.cpp src/link.cpp src/site.cpp src/utils.cpp src/gemini-client.cpp -lCatch2Main -lCatch2 -lssl -lcrypto -o test.out
+ g++ tests/fetch-test.cpp src/link.cpp src/site.cpp src/plaintext.cpp src/utils.cpp src/gemini-client.cpp -lCatch2Main -lCatch2 -lssl -lcrypto -o test.out
./test.out
rm test.out
diff --git a/include/browser.hpp b/include/browser.hpp
@@ -1,6 +1,7 @@
#pragma once
#include <vector>
+#include "line.hpp"
#include "site.hpp"
#include "link.hpp"
@@ -9,8 +10,12 @@ class Browser {
std::vector<Link*> siteHistory;
int previousIdx = -1;
Site* currentSite;
+ std::vector<Line*> lines;
public:
Browser();
void goToSite(std::string url);
Site* getCurrentSite();
+ std::optional<uri> getPriorUri();
+ std::string renderSite();
+ std::vector<Line*> toLines(Site* site);
};
diff --git a/include/line.hpp b/include/line.hpp
@@ -0,0 +1,8 @@
+#pragma once
+
+#include <string>
+
+class Line {
+ public:
+ virtual std::string textToDraw() = 0;
+};
diff --git a/include/link.hpp b/include/link.hpp
@@ -3,8 +3,9 @@
#include <optional>
#include <string>
#include "../vendor/uri.hpp"
+#include "line.hpp"
-class Link {
+class Link : public Line {
private:
uri linkDestination = uri("gemini://example.com");
std::optional<std::string> linkText;
@@ -13,4 +14,5 @@ class Link {
Link(std::string text, std::optional<uri> prior = std::nullopt);
uri getLinkDestination();
std::optional<std::string> getLinkText();
+ std::string textToDraw() override;
};
diff --git a/include/plaintext.hpp b/include/plaintext.hpp
@@ -0,0 +1,10 @@
+#pragma once
+#include "line.hpp"
+
+class Plaintext : public Line {
+ private:
+ std::string text = "";
+ public:
+ Plaintext(std::string text);
+ std::string textToDraw();
+};
diff --git a/include/site.hpp b/include/site.hpp
@@ -2,10 +2,13 @@
#include <cstdint>
#include <string>
+#include <vector>
+#include "link.hpp"
class Site{
private:
std::string body;
+ std::vector<Line*> lines;
std::string header;
public:
Site(std::string header, std::string body);
diff --git a/include/utils.hpp b/include/utils.hpp
@@ -1,9 +1,13 @@
#pragma once
+#include <optional>
#include <string>
#include <vector>
+#include "line.hpp"
+#include "../vendor/uri.hpp"
bool isPrefixed(std::string input, std::string prefix);
std::string readFileToString(std::string filePath);
bool isWhiteSpace(std::string& line, int idx);
std::string truncateAfter(std::string input, char truncate);
std::vector<std::string> stringToList(std::string input);
+Line* lineToLine(std::string input, std::optional<uri> prior);
diff --git a/src/browser.cpp b/src/browser.cpp
@@ -1,6 +1,9 @@
#include "../include/browser.hpp"
#include "../include/site.hpp"
#include "../include/gemini-client.hpp"
+#include "../include/utils.hpp"
+#include <iostream>
+#include <optional>
void Browser::goToSite(std::string url) {
@@ -29,10 +32,23 @@ void Browser::goToSite(std::string url) {
if(currentSite != nullptr) {
delete currentSite;
}
-
currentSite = site;
+ lines = toLines(site);
}
+// TODO: This is a pure function.
+std::vector<Line*> Browser::toLines(Site* site) {
+ auto lines = stringToList(site->getBody());
+
+ std::vector<Line*> res{};
+
+ for(auto line: lines) {
+ res.push_back(lineToLine(line, getPriorUri()));
+ }
+ return res;
+}
+
+
Browser::Browser() {
currentSite = nullptr;
}
@@ -40,3 +56,21 @@ Browser::Browser() {
Site* Browser::getCurrentSite() {
return currentSite;
}
+
+std::string Browser::renderSite() {
+ std::string res = "";
+ for(auto* line: lines) {
+ res += line->textToDraw();
+ }
+ return res;
+}
+
+
+std::optional<uri> Browser::getPriorUri() {
+ if(previousIdx < siteHistory.size() && previousIdx >= 0) {
+ return siteHistory[previousIdx]->getLinkDestination();
+ }
+ return std::nullopt;
+
+}
+
diff --git a/src/link.cpp b/src/link.cpp
@@ -61,3 +61,10 @@ uri Link::getLinkDestination() {
std::optional<std::string> Link::getLinkText() {
return linkText;
}
+
+std::string Link::textToDraw() {
+ if(linkText != std::nullopt) {
+ return linkText.value() + "\n";
+ }
+ return linkDestination.to_string() + "\n";
+}
diff --git a/src/main.cpp b/src/main.cpp
@@ -1,6 +1,4 @@
#include "../include/browser.hpp"
-#include "../include/site.hpp"
-#include "../include/link.hpp"
#include "../include/utils.hpp"
#include <algorithm>
#include <iostream>
@@ -28,8 +26,13 @@ int main() {
curs_set(0); // hide cursor
keypad(stdscr,TRUE);
- b.goToSite("gemini://tlgs.one/known-hosts");
- auto current = b.getCurrentSite()->getBody();
+ endwin();
+ b.goToSite("gemini://tlgs.one");
+ auto current = b.renderSite();
+ std::cout << b.getCurrentSite()->getBody() << std::endl;
+ std::cout << "OTHER OTHER" << std::endl;
+ std::cout << current << std::endl;
+ return 0;
auto strLs = stringToList(current);
int input;
diff --git a/src/plaintext.cpp b/src/plaintext.cpp
@@ -0,0 +1,9 @@
+#include "../include/plaintext.hpp"
+
+Plaintext::Plaintext(std::string input) {
+ text = input;
+}
+
+std::string Plaintext::textToDraw() {
+ return text + "\n";
+}
diff --git a/src/utils.cpp b/src/utils.cpp
@@ -1,5 +1,7 @@
#include "../include/utils.hpp"
+#include "../include/link.hpp"
#include "../include/errors.hpp"
+#include "../include/plaintext.hpp"
#include <cstddef>
#include <cstdint>
#include <fstream>
@@ -55,3 +57,11 @@ std::vector<std::string> stringToList(std::string input)
return res;
}
+
+Line* lineToLine(std::string input, std::optional<uri> prior) {
+ if(input.substr(0,2) == "=>") {
+ Link* ln = new Link{input, prior};
+ return ln;
+ }
+ return new Plaintext{input};
+}