[ox/fs] Add new Directory type

deps/ox/src/ox/fs/filesystem/pathiterator.cpp

@@ -12,9 +12,13 @@
 
 namespace ox {
 
-PathIterator::PathIterator(const char *path, std::size_t maxSize) {
+PathIterator::PathIterator(const char *path, std::size_t maxSize, std::size_t iterator) {
 	m_path = path;
 	m_maxSize = maxSize;
+	m_iterator = iterator;
+}
+
+PathIterator::PathIterator(const char *path): PathIterator(path, ox_strlen(path)) {
 }
 
 /**
@@ -85,7 +89,30 @@ int PathIterator::next(char *pathOut, std::size_t pathOutSize) {
 	return retval;
 }
 
-bool PathIterator::hasNext() {
+ValErr<std::size_t> PathIterator::nextSize() const {
+	std::size_t size = 0;
+	Error retval = 1;
+	auto it = m_iterator;
+	if (it < m_maxSize && ox_strlen(&m_path[it])) {
+		retval = 0;
+		if (m_path[it] == '/') {
+			it++;
+		}
+		std::size_t start = it;
+		// end is at the next /
+		const char *substr = ox_strchr(&m_path[start], '/', m_maxSize - start);
+		// correct end if it is invalid, which happens if there is no next /
+		if (!substr) {
+			substr = ox_strchr(&m_path[start], 0, m_maxSize - start);
+		}
+		std::size_t end = substr - m_path;
+		size = end - start;
+	}
+	it += size;
+	return {size, retval};
+}
+
+bool PathIterator::hasNext() const {
 	std::size_t size = 0;
 	if (m_iterator < m_maxSize && ox_strlen(&m_path[m_iterator])) {
 		std::size_t start = m_iterator;
@@ -104,4 +131,12 @@ bool PathIterator::hasNext() {
 	return size > 0;
 }
 
+PathIterator PathIterator::operator+(int i) {
+	return PathIterator(m_path, m_maxSize, m_iterator + i);
+}
+
+PathIterator PathIterator::operator-(int i) {
+	return PathIterator(m_path, m_maxSize, m_iterator - i);
+}
+
 }

deps/ox/src/ox/fs/filesystem/pathiterator.hpp

@@ -8,6 +8,7 @@
 
 #pragma once
 
+#include <ox/std/strops.hpp>
 #include <ox/std/types.hpp>
 
 namespace ox {
@@ -19,7 +20,9 @@ class PathIterator {
 		std::size_t m_maxSize = 0;
 
 	public:
-		PathIterator(const char *path, std::size_t maxSize);
+		PathIterator(const char *path, std::size_t maxSize, std::size_t iterator = 0);
+
+		PathIterator(const char *path);
 
 		/**
 		 * @return 0 if no error
@@ -36,7 +39,17 @@ class PathIterator {
 		 */
 		int next(char *pathOut, std::size_t pathOutSize);
 
-		bool hasNext();
+		/**
+		 * @return 0 if no error
+		 */
+		ValErr<std::size_t> nextSize() const;
+
+		bool hasNext() const;
+
+		PathIterator operator+(int i);
+
+		PathIterator operator-(int i);
+
 };
 
 }