Merge pull request #3 from snu-systems-corp/develop

Develop: New URL API.

2 files changed, 42 insertions, 20 deletions

diff --git a/dev/lib/net/modem.hpp b/dev/lib/net/modem.hpp
index 69b1aef..6c63399 100644
--- a/dev/lib/net/modem.hpp
+++ b/dev/lib/net/modem.hpp
@@ -14,7 +14,7 @@
 #include <string>
 #include <cstddef>
 
-#define OCL_MODEM_INTERFACE : public scl::net::basic_modem
+#define SCL_MODEM_INTERFACE : public scl::net::basic_modem
 
 namespace scl::net
 {
diff --git a/dev/lib/net/url.hpp b/dev/lib/net/url.hpp
index 3ada418..52991f2 100644
--- a/dev/lib/net/url.hpp
+++ b/dev/lib/net/url.hpp
@@ -8,46 +8,70 @@
 #pragma once
 
 #include <string>
-#include <iostream>
 #include <sstream>
 
 /// @author Amlal El Mahrouss (amlal@nekernel.org)
+/// @brief Parse URLs (in a non-standard way).
 
 namespace scl::net
 {
 	template <typename char_type>
 	class basic_url;
 
-	template <typename char_type>
-	class basic_url_traits;
+	enum class url_protocol
+	{
+		invalid = 0,
+		http,
+		https,
+		mailto,
+		bad = 0xff,
+	};
 
 	/// @brief Basic URL parser container.
 	template <typename char_type>
 	class basic_url final
 	{
-		friend basic_url_traits<char_type>;
-
-		std::basic_stringstream<char_type> ss_{};
+		url_protocol					   m_protocol_{url_protocol::invalid};
+		std::basic_stringstream<char_type> m_ss_{};
 
 	public:
-		explicit basic_url() = default;
-		~basic_url()		 = default;
+		explicit basic_url(const std::basic_string<char_type>& protocol)
+		{
+			if (protocol.starts_with("https://"))
+			{
+				m_protocol_ = url_protocol::https;
+				this->operator/=(protocol.substr(strlen("https://")));
+			}
+			else if (protocol.starts_with("http://"))
+			{
+				m_protocol_ = url_protocol::http;
+				this->operator/=(protocol.substr(strlen("http://")));
+			}
+			else if (protocol.starts_with("mailto:"))
+			{
+				m_protocol_ = url_protocol::mailto;
+				this->operator/=(protocol.substr(strlen("mailto:")));
+			}
+		}
+
+		~basic_url() = default;
 
 		basic_url& operator=(const basic_url&) = default;
 		basic_url(const basic_url&)			   = default;
 
+	private:
 		basic_url& operator/=(const std::basic_string<char_type>& in)
 		{
 			if (in.empty())
 				return *this;
 
-			ss_ += in;
+			m_ss_ += in;
 			return *this;
 		}
 
 		basic_url& operator/=(const char_type& in)
 		{
-			ss_ += in;
+			m_ss_ += in;
 			return *this;
 		}
 
@@ -56,17 +80,15 @@ namespace scl::net
 			return this->is_valid();
 		}
 
-		bool is_valid()
+	public:
+		bool protocol_exists()
 		{
-			return ss_.size() > 0;
+			return this->m_protocol_ != url_protocol::bad || this->m_protocol_ != url_protocol::invalid;
 		}
-	};
 
-	enum class protocol
-	{
-		http,
-		https,
-		mailto,
-		bad
+		bool is_valid()
+		{
+			return m_ss_.size() > 0 && this->protocol_exists();
+		}
 	};
 } // namespace scl::net