Gradually moving to better archive structure.

It's dragging other new API changes along with it, including use of Blob
and Text.

1 files changed, 20 insertions, 14 deletions

diff --git a/src/unstable/uuid.cpp b/src/unstable/uuid.cpp
index 6642d75..9708423 100644
--- a/src/unstable/uuid.cpp
+++ b/src/unstable/uuid.cpp
@@ -10,6 +10,8 @@
 #include "bu/formatter.h"
 #include "bu/membuf.h"
 #include "bu/random.h"
+#include "bu/archive.h"
+#include "bu/blobbuilder.h"
 #include <string.h>
 
 #ifdef WIN32
@@ -27,11 +29,11 @@ Bu::Uuid::Uuid( const Uuid &src )
     memcpy( data, src.data, 16 );
 }
 
-Bu::Uuid::Uuid( const Bu::String &sSrc )
+Bu::Uuid::Uuid( const Bu::Blob &sSrc )
 {
     if( sSrc.getSize() == 16 )
     {
-        memcpy( data, sSrc.getStr(), 16 );
+        memcpy( data, sSrc.getData(), 16 );
     }
     else if( sSrc.getSize() == 36 )
     {
@@ -44,12 +46,12 @@ Bu::Uuid::~Uuid()
 {
 }
 
-Bu::String Bu::Uuid::toRawString() const
+Bu::Blob Bu::Uuid::toRawBlob() const
 {
-    return Bu::String( (char *)data, 16 );
+    return Bu::Blob( (char *)data, 16 );
 }
 
-Bu::String Bu::Uuid::toString() const
+Bu::Blob Bu::Uuid::toBlob() const
 {
     Bu::MemBuf mb;
     Bu::Formatter f( mb );
@@ -61,12 +63,14 @@ Bu::String Bu::Uuid::toString() const
         f << Bu::Fmt::hex(2).caps(false) << (unsigned int)data[j];
     }
 
-    return mb.getString();
+    return mb.getBlob();
 }
 
-Bu::String Bu::Uuid::toUrn() const
+Bu::Blob Bu::Uuid::toUrn() const
 {
-    return "urn:uuid:" + toString();
+    BlobBuilder bb("urn:uuid:");
+    bb.append( toBlob() );
+    return bb.getBlob();
 }
 
 int Bu::Uuid::getVersion()
@@ -129,9 +133,9 @@ Bu::Uuid Bu::Uuid::generate( Bu::Uuid::Type eType )
     return id;
 }
 
-void Bu::Uuid::set( const Bu::String &sSrc )
+void Bu::Uuid::set( const Bu::Blob &sSrc )
 {
-    const char *dat = sSrc.getStr();
+    const char *dat = sSrc.getData();
     int iNibble = 0;
     memset( data, 0, 16 );
     for( int j = 0; j < 36; j++ )
@@ -162,7 +166,7 @@ Bu::Uuid &Bu::Uuid::operator=( const Uuid &rhs )
 
 template<> uint32_t Bu::__calcHashCode<Bu::Uuid>( const Bu::Uuid &k )
 {
-    return __calcHashCode<String>( k.toRawString() );
+    return __calcHashCode<Blob>( k.toRawBlob() );
 }
 
 template<> bool Bu::__cmpHashKeys<Bu::Uuid>( const Bu::Uuid &a, const Bu::Uuid &b )
@@ -172,18 +176,20 @@ template<> bool Bu::__cmpHashKeys<Bu::Uuid>( const Bu::Uuid &a, const Bu::Uuid &
 
 Bu::Archive &Bu::operator>>( Bu::Archive &ar, Bu::Uuid &u )
 {
-    ar.read( u.data, 16 );
+    Bu::Blob b;
+    ar >> b;
+    memcpy( b.getData(), u.data, 16 );
     return ar;
 }
 
 Bu::Archive &Bu::operator<<( Bu::Archive &ar, const Bu::Uuid &u )
 {
-    ar.write( u.data, 16 );
+    ar << u.toRawBlob();
     return ar;
 }
 
 Bu::Formatter &Bu::operator<<( Bu::Formatter &f, const Bu::Uuid &u )
 {
-    return f << u.toString();
+    return f << u.toBlob();
 }