1 files changed, 75 insertions, 22 deletions

diff --git a/src/tools/myriad.cpp b/src/tools/myriad.cpp
index ccf3d3b..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 );
@@ -121,14 +168,14 @@ int main( int argc, char *argv[] )
                 Myriad m( fIn );
                 sio << "Myriad info:" << sio.nl
                     << "  Block size:   " << m.getBlockSize() << sio.nl
-                    << "  Block count:  " << m.getNumBlocks() << sio.nl
-                    << "  Blocks used:  " << m.getNumUsedBlocks() << " ("
-                    << m.getNumUsedBlocks()*100/m.getNumBlocks() << "%)"
+                    << "  Block count:  " << m.getTotalBlocks() << sio.nl
+                    << "  Blocks used:  " << m.getUsedBlocks() << " ("
+                    << m.getUsedBlocks()*100/m.getTotalBlocks() << "%)"
                     << sio.nl
-                    << "  Stream count: " << m.getNumStreams() << sio.nl
+                    << "  Stream count: " << m.getTotalStreams() << sio.nl
                     << "  Used space:   " << m.getTotalUsedBytes() << sio.nl
                     << "  Unused space: " << m.getTotalUnusedBytes() << sio.nl
-                    << "  % of files:   " << (double)(m.getNumBlocks()*m.getBlockSize())/(double)(m.getTotalUsedBytes() + m.getTotalUnusedBytes( 4096 ))*100.0 << sio.nl;
+                    << "  % of files:   " << (double)(m.getTotalBlocks()*m.getBlockSize())/(double)(m.getTotalUsedBytes() + m.getTotalUnusedBytes( 4096 ))*100.0 << sio.nl;
 /*              Bu::Array<int> aStreams = m.getStreamIds();
                 sio << "  Stream info:" << sio.nl;
                 for( Bu::Array<int>::iterator i = aStreams.begin(); i; i++ )
@@ -149,7 +196,23 @@ int main( int argc, char *argv[] )
             {
                 File fOut( opts.sFile, File::Write|File::Read );
                 Myriad m( fOut );
-                m.createStream( opts.iPreallocate );
+                m.create( Bu::Myriad::WriteNew, opts.iPreallocate );
+            }
+            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;
 
@@ -163,7 +226,7 @@ int main( int argc, char *argv[] )
             {
                 File fOut( opts.sFile, File::Read );
                 Myriad m( fOut );
-                MyriadStream s = m.openStream( opts.iStream );
+                MyriadStream s = m.open( opts.iStream, Bu::Myriad::Read );
                 sio << "Stream " << opts.iStream << ":" << sio.nl;
                 char buf[8];
                 int iPos = 0;
@@ -210,8 +273,8 @@ int main( int argc, char *argv[] )
             {
                 File fOut( opts.sFile, File::Write|File::Read );
                 Myriad m( fOut );
-                MyriadStream sOut = m.openStream(
-                    m.createStream( opts.iPreallocate )
+                MyriadStream sOut = m.create(
+                    Bu::Myriad::WriteNew, opts.iPreallocate
                     );
                 File fIn( opts.sSrc, File::Read );
                 char buf[1024];
@@ -236,7 +299,7 @@ int main( int argc, char *argv[] )
             {
                 File fIn( opts.sFile, File::Write|File::Read );
                 Myriad m( fIn );
-                MyriadStream sIn = m.openStream( opts.iStream );
+                MyriadStream sIn = m.open( opts.iStream, Bu::Myriad::Read );
                 File fOut( opts.sDst, File::Write|File::Create|File::Truncate );
                 char buf[1024];
                 while( !sIn.isEos() )
@@ -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;
 }
-