1 files changed, 65 insertions, 12 deletions

diff --git a/src/tools/myriad.cpp b/src/tools/myriad.cpp
index 1dc73ec..0dd9840 100644
--- a/src/tools/myriad.cpp
+++ b/src/tools/myriad.cpp
@@ -20,6 +20,7 @@ enum Mode
     modeCreate,
     modeInfo,
     modeStreamNew,
+    modeStreamErase,
     modeStreamDump,
     modeStreamPut,
     modeStreamGet,
@@ -44,6 +45,8 @@ public:
                 "Display some info about a Myriad file." );
         addOption( eMode, 'n', "new",
                 "Create a new sub-stream in a Myriad file.");
+        addOption( eMode, 'e', "erase",
+                "Erase sub-stream in a Myriad file.");
         addOption( eMode, 'd', "dump",
                 "Display a hexdump of a stream from a Myriad file.");
         addOption( eMode, "get",
@@ -67,6 +70,7 @@ public:
         setOverride( "create", modeCreate );
         setOverride( "info", modeInfo );
         setOverride( "new", modeStreamNew );
+        setOverride( "erase", modeStreamErase );
         setOverride( "dump", modeStreamDump );
         setOverride( "put", modeStreamPut );
         setOverride( "get", modeStreamGet );
@@ -90,6 +94,49 @@ Bu::Formatter &operator>>( Bu::Formatter &f, Mode & /*e*/ )
     return f;
 }
 
+void printMap( const Bu::BitString &bs )
+{
+    for( int j = 0; j < bs.getSize(); j++ )
+    {
+        if( j>0 && (j%50) == 0 )
+            Bu::println("");
+        if( bs.getBit( j ) )
+            Bu::print("#");
+        else
+            Bu::print("-");
+    }
+    Bu::println("\n");
+}
+
+void printMap( const Bu::Array<int32_t> &bm )
+{
+    int iBigest = 0;
+    for( int j = 0; j < bm.getSize(); j++ )
+    {
+        if( iBigest < bm[j] )
+            iBigest = bm[j];
+    }
+    int iWidth = Bu::String("%1").arg( iBigest ).end().getSize();
+    Bu::String sEmpty;
+    for( int j = 0; j < iWidth; j++ )
+    {
+        sEmpty += '-';
+    }
+    int iBreakAt = 60/(iWidth+1);
+    for( int j = 0; j < bm.getSize(); j++ )
+    {
+        if( j>0 && (j%iBreakAt) == 0 )
+            Bu::println("");
+
+        if( bm[j] < 0 )
+            Bu::print("%1 ").arg( sEmpty, Bu::Fmt(2).right().fill(' '));
+        else
+            Bu::print("%1 ").arg( bm[j], Bu::Fmt(2).right().fill(' '));
+        
+    }
+    Bu::println("\n");
+}
+
 int main( int argc, char *argv[] )
 {
     Options opts( argc, argv );
@@ -153,6 +200,22 @@ int main( int argc, char *argv[] )
             }
             break;
 
+        case modeStreamErase:
+            if( !opts.sFile.isSet() )
+            {
+                sio << "Please specify a file manipulate." << sio.nl;
+                return 0;
+            }
+            else
+            {
+                File fOut( opts.sFile, File::Write|File::Read );
+                Myriad m( fOut );
+                m.erase( opts.iStream );
+                printMap( m.buildBlockUseMap() );
+                printMap( m.buildBlockMap() );
+            }
+            break;
+
         case modeStreamDump:
             if( !opts.sFile.isSet() )
             {
@@ -255,17 +318,8 @@ int main( int argc, char *argv[] )
             {
                 File fIn( opts.sFile, File::Write|File::Read );
                 Myriad m( fIn );
-/*                Bu::BitString bs = m.getBlocksUsed();
-                for( int j = 0; j < bs.getSize(); j++ )
-                {
-                    if( j>0 && (j%50) == 0 )
-                        Bu::println("");
-                    if( bs.getBit( j ) )
-                        Bu::print("#");
-                    else
-                        Bu::print("-");
-                }*/
-                Bu::println("\n");
+                printMap( m.buildBlockUseMap() );
+                printMap( m.buildBlockMap() );
             }
             break;
 
@@ -277,4 +331,3 @@ int main( int argc, char *argv[] )
 
     return 0;
 }
-