From 9fc0d2d328c71f6e485fc1a054e2ac89bf654f62 Mon Sep 17 00:00:00 2001
From: Per Larsson <p3rl@protonmail.com>
Date: Fri, 1 Oct 2021 11:02:19 +0200
Subject: Clang format fix.

---
 zencore/include/zencore/refcount.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'zencore/include')

diff --git a/zencore/include/zencore/refcount.h b/zencore/include/zencore/refcount.h
index 0a1e15614..320718f5b 100644
--- a/zencore/include/zencore/refcount.h
+++ b/zencore/include/zencore/refcount.h
@@ -17,7 +17,7 @@ namespace zen {
 class RefCounted
 {
 public:
-	RefCounted() = default;
+	RefCounted()		  = default;
 	virtual ~RefCounted() = default;
 
 	inline uint32_t AddRef() const { return AtomicIncrement(const_cast<RefCounted*>(this)->m_RefCount); }
-- 
cgit v1.2.3


From bf9abfda914d2619c30df3ab6c7904fb87c93901 Mon Sep 17 00:00:00 2001
From: Per Larsson <p3rl@protonmail.com>
Date: Fri, 1 Oct 2021 15:45:57 +0200
Subject: Added simple stats HTML dashboard with route /dashboard.

---
 zencore/include/zencore/iobuffer.h | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'zencore/include')

diff --git a/zencore/include/zencore/iobuffer.h b/zencore/include/zencore/iobuffer.h
index 36ecbd9a7..ee2f3c3c7 100644
--- a/zencore/include/zencore/iobuffer.h
+++ b/zencore/include/zencore/iobuffer.h
@@ -25,6 +25,7 @@ enum class ZenContentType : uint8_t
 	kCbPackageOffer		= 6,
 	kCompressedBinary	= 7,
 	kUnknownContentType = 8,
+	kHTML				= 9,
 	kCOUNT
 };
 
@@ -54,6 +55,8 @@ ToString(ZenContentType ContentType)
 			return "compressed-binary"sv;
 		case ZenContentType::kYAML:
 			return "yaml"sv;
+		case ZenContentType::kHTML:
+			return "html"sv;
 	}
 }
 
-- 
cgit v1.2.3


From 4e5fe27def24e21d7e105f59ab98e0c4c80c87dc Mon Sep 17 00:00:00 2001
From: Stefan Boberg <stefan@boberg.org>
Date: Fri, 1 Oct 2021 18:50:32 +0200
Subject: filesystem: Added FileContents::Flatten() and ensured it's possible
 to #include filesystem.h standalone

---
 zencore/include/zencore/filesystem.h | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'zencore/include')

diff --git a/zencore/include/zencore/filesystem.h b/zencore/include/zencore/filesystem.h
index 6678528f6..c7ac7140d 100644
--- a/zencore/include/zencore/filesystem.h
+++ b/zencore/include/zencore/filesystem.h
@@ -2,9 +2,10 @@
 
 #pragma once
 
-#include "stream.h"
 #include "zencore.h"
 
+#include <zencore/iobuffer.h>
+
 #include <filesystem>
 #include <functional>
 
@@ -36,6 +37,8 @@ struct FileContents
 {
 	std::vector<IoBuffer> Data;
 	std::error_code		  ErrorCode;
+
+	IoBuffer Flatten();
 };
 
 ZENCORE_API FileContents ReadFile(std::filesystem::path Path);
-- 
cgit v1.2.3