cache get command (#183)

* move TryParseObjectId and TryParseIoHash to Oid::TryParse and IoHash::TryParse respectively
* zen cache-get command

1 files changed, 2 insertions, 40 deletions

diff --git a/src/zencore/compactbinaryjson.cpp b/src/zencore/compactbinaryjson.cpp
index 58a91c731..d8c8a8584 100644
--- a/src/zencore/compactbinaryjson.cpp
+++ b/src/zencore/compactbinaryjson.cpp
@@ -466,7 +466,7 @@ private:
 			case Json::Type::STRING:
 				{
 					Oid Id;
-					if (TryParseObjectId(Json.string_value(), Id))
+					if (Oid::TryParse(Json.string_value(), Id))
 					{
 						if (FieldName.empty())
 						{
@@ -481,7 +481,7 @@ private:
 					}
 
 					IoHash Hash;
-					if (TryParseIoHash(Json.string_value(), Hash))
+					if (IoHash::TryParse(Json.string_value(), Hash))
 					{
 						if (FieldName.empty())
 						{
@@ -511,44 +511,6 @@ private:
 
 		return true;
 	}
-
-	static constexpr AsciiSet HexCharSet = AsciiSet("0123456789abcdefABCDEF");
-
-	static bool TryParseObjectId(std::string_view Str, Oid& Id)
-	{
-		using namespace std::literals;
-
-		if (Str.size() == Oid::StringLength && AsciiSet::HasOnly(Str, HexCharSet))
-		{
-			Id = Oid::FromHexString(Str);
-			return true;
-		}
-
-		if (Str.starts_with("0x"sv))
-		{
-			return TryParseObjectId(Str.substr(2), Id);
-		}
-
-		return false;
-	}
-
-	static bool TryParseIoHash(std::string_view Str, IoHash& Hash)
-	{
-		using namespace std::literals;
-
-		if (Str.size() == IoHash::StringLength && AsciiSet::HasOnly(Str, HexCharSet))
-		{
-			Hash = IoHash::FromHexString(Str);
-			return true;
-		}
-
-		if (Str.starts_with("0x"sv))
-		{
-			return TryParseIoHash(Str.substr(2), Hash);
-		}
-
-		return false;
-	}
 };
 
 CbFieldIterator