From f1e3f25d9b7a12cdedb99e4cb0bfa66157a1a972 Mon Sep 17 00:00:00 2001 From: Mike Buland Date: Tue, 27 Aug 2024 13:37:36 -0700 Subject: Making progress. --- src/tools/myriad.cpp | 280 ------------------------------------------------- src/tools/myriadfs.cpp | 269 ----------------------------------------------- 2 files changed, 549 deletions(-) delete mode 100644 src/tools/myriad.cpp delete mode 100644 src/tools/myriadfs.cpp (limited to 'src/tools') diff --git a/src/tools/myriad.cpp b/src/tools/myriad.cpp deleted file mode 100644 index ccf3d3b..0000000 --- a/src/tools/myriad.cpp +++ /dev/null @@ -1,280 +0,0 @@ -/* - * Copyright (C) 2007-2023 Xagasoft, All rights reserved. - * - * This file is part of the libbu++ library and is released under the - * terms of the license contained in the file LICENSE. - */ - -#include "bu/sio.h" -#include "bu/file.h" -#include "bu/myriad.h" -#include "bu/myriadstream.h" -#include "bu/optparser.h" - -#include - -using namespace Bu; - -enum Mode -{ - modeCreate, - modeInfo, - modeStreamNew, - modeStreamDump, - modeStreamPut, - modeStreamGet, - modeBlockMap, - - modeNone -}; - -class Options : public OptParser -{ -public: - Options( int argc, char *argv[] ) : - eMode( modeNone ), - iBlockSize( 64 ), - iPreallocate( 0 ), - iStream( 0 ) - { - addHelpBanner("Mode of operation:"); - addOption( eMode, 'c', "create", - "Create a new Myriad file." ); - addOption( eMode, 'i', "info", - "Display some info about a Myriad file." ); - addOption( eMode, 'n', "new", - "Create a new sub-stream in a Myriad file."); - addOption( eMode, 'd', "dump", - "Display a hexdump of a stream from a Myriad file."); - addOption( eMode, "get", - "Get a file out of a Myriad stream (use --dst)."); - addOption( eMode, "put", - "Put a file into a Myriad stream (usr --src)."); - addOption( eMode, 'm', "block-map", - "Visualize block usage."); - addHelpOption(); - - addHelpBanner("\nGeneral options:"); - addOption( iBlockSize, 'b', "block-size", "Set the block size." ); - addOption( iPreallocate, 'p', "preallocate", - "Number of blocks to preallocate." ); - addOption( sFile, 'f', "file", "Set the Myriad filename." ); - addOption( iStream, 's', "stream", "Substream to work with."); - addOption( sSrc, "src", "Source file for copying into a Myriad file."); - addOption( sDst, "dst", - "Destination file for copying out of a Myriad file."); - - setOverride( "create", modeCreate ); - setOverride( "info", modeInfo ); - setOverride( "new", modeStreamNew ); - setOverride( "dump", modeStreamDump ); - setOverride( "put", modeStreamPut ); - setOverride( "get", modeStreamGet ); - setOverride( "block-map", modeBlockMap ); - - parse( argc, argv ); - } - - Mode eMode; - int iBlockSize; - int iPreallocate; - int iStream; - Bu::String sFile; - Bu::String sSrc; - Bu::String sDst; -}; - -Bu::Formatter &operator>>( Bu::Formatter &f, Mode & /*e*/ ) -{ - sio << "Uh oh, the formatter was called..." << sio.nl; - return f; -} - -int main( int argc, char *argv[] ) -{ - Options opts( argc, argv ); - - switch( opts.eMode ) - { - case modeCreate: - if( !opts.sFile.isSet() ) - { - sio << "Please specify a file to create." << sio.nl; - return 0; - } - else - { - File fOut( opts.sFile, File::WriteNew|File::Read ); - Myriad m( fOut, opts.iBlockSize, opts.iPreallocate ); - } - break; - - case modeInfo: - if( !opts.sFile.isSet() ) - { - sio << "Please specify a file to display info about." << sio.nl; - return 0; - } - else - { - File fIn( opts.sFile, File::Read ); - 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() << "%)" - << sio.nl - << " Stream count: " << m.getNumStreams() << 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; -/* Bu::Array aStreams = m.getStreamIds(); - sio << " Stream info:" << sio.nl; - for( Bu::Array::iterator i = aStreams.begin(); i; i++ ) - { - sio << " " << Fmt(4) << *i << ") " - << m.getStreamSize( *i ) << "b" << sio.nl; - } */ - } - break; - - case modeStreamNew: - 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.createStream( opts.iPreallocate ); - } - break; - - case modeStreamDump: - if( !opts.sFile.isSet() ) - { - sio << "Please specify a file to manipulate." << sio.nl; - return 0; - } - else - { - File fOut( opts.sFile, File::Read ); - Myriad m( fOut ); - MyriadStream s = m.openStream( opts.iStream ); - sio << "Stream " << opts.iStream << ":" << sio.nl; - char buf[8]; - int iPos = 0; - while( !s.isEos() ) - { - size_t sAmnt = s.read( buf, 8 ); - sio << Fmt(5) << iPos << ": "; - iPos += sAmnt; - for( size_t j = 0; j < sAmnt; j++ ) - { - sio << Fmt::hex(2) << (int)((unsigned char)buf[j]) - << " "; - } - for( size_t j = sAmnt; j < 8; j++ ) - { - sio << "-- "; - } - sio << "| "; - for( size_t j = 0; j < sAmnt; j++ ) - { - if( buf[j] >= 32 && buf[j] <= 126 ) - sio << buf[j] << " "; - else - sio << " "; - } - sio << sio.nl; - } - sio << "Position: " << s.tell() << ", isEos()=" << s.isEos() - << sio.nl; - } - break; - - case modeStreamPut: - if( !opts.sFile.isSet() ) - { - sio << "Please specify a file manipulate." << sio.nl; - return 0; - } - else if( !opts.sSrc.isSet() ) - { - sio << "Please specify a source file to read." << sio.nl; - } - else - { - File fOut( opts.sFile, File::Write|File::Read ); - Myriad m( fOut ); - MyriadStream sOut = m.openStream( - m.createStream( opts.iPreallocate ) - ); - File fIn( opts.sSrc, File::Read ); - char buf[1024]; - while( !fIn.isEos() ) - { - sOut.write( buf, fIn.read( buf, 1024 ) ); - } - } - break; - - case modeStreamGet: - if( !opts.sFile.isSet() ) - { - sio << "Please specify a file manipulate." << sio.nl; - return 0; - } - else if( !opts.sDst.isSet() ) - { - sio << "Please specify a destination file to write." << sio.nl; - } - else - { - File fIn( opts.sFile, File::Write|File::Read ); - Myriad m( fIn ); - MyriadStream sIn = m.openStream( opts.iStream ); - File fOut( opts.sDst, File::Write|File::Create|File::Truncate ); - char buf[1024]; - while( !sIn.isEos() ) - { - fOut.write( buf, sIn.read( buf, 1024 ) ); - } - } - break; - - case modeBlockMap: - if( !opts.sFile.isSet() ) - { - sio << "Please specify a file manipulate." << sio.nl; - return 0; - } - { - 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"); - } - break; - - case modeNone: - sio << "Please select a mode, for more info, try --help." - << sio.nl << sio.nl; - break; - } - - return 0; -} - diff --git a/src/tools/myriadfs.cpp b/src/tools/myriadfs.cpp deleted file mode 100644 index 587bc89..0000000 --- a/src/tools/myriadfs.cpp +++ /dev/null @@ -1,269 +0,0 @@ -/* - * Copyright (C) 2007-2023 Xagasoft, All rights reserved. - * - * This file is part of the libbu++ library and is released under the - * terms of the license contained in the file LICENSE. - */ - -#include "bu/sio.h" -#include "bu/streamstack.h" -#include "bu/file.h" -#include "bu/myriadfs.h" -#include "bu/myriadstream.h" -#include "bu/optparser.h" - -enum Mode -{ - modeList, - modeCat, - modeCopyIn, - modeCopyOut, - modeMkdir, - modeInitialize, - modeRm, - - modeNone -}; - -Bu::Formatter &operator>>( Bu::Formatter &f, Mode & /*e*/ ) -{ - Bu::sio << "Uh oh, the formatter was called..." << Bu::sio.nl; - return f; -} - -class Options : public Bu::OptParser -{ -public: - Options( int argc, char *argv[] ) : - eMode( modeNone ), - iBlockSize( 64 ) - { - addHelpBanner("Options:"); - addOption( sFile, 'f', "file", "Myriadfs file"); - addOption( iBlockSize, 'b', "block-size", - "Specify the block size when initializing a new MyriadFs"); - - setNonOption( Bu::slot( this, &Options::nonOption ) ); - - addHelpOption(); - - parse( argc, argv ); - } - - int nonOption( Bu::Array aParams ) - { - if( eMode == modeNone ) - { - //Bu::println("Checking mode"); - // First param, must be the mode - if( aParams[0] == "ls" ) - eMode = modeList; - else if( aParams[0] == "cat" ) - eMode = modeCat; - else if( aParams[0] == "cp-in" ) - eMode = modeCopyIn; - else if( aParams[0] == "cp-out" ) - eMode = modeCopyOut; - else if( aParams[0] == "mkdir" ) - eMode = modeMkdir; - else if( aParams[0] == "initialize" ) - eMode = modeInitialize; - else if( aParams[0] == "rm" ) - eMode = modeRm; - else - Bu::println("Unknown command, try --help"); - return 0; - } else { - lParams.append( aParams[0] ); - } - //Bu::println("Got option: \"%1\"").arg( aParams[0] ); - return 0; - } - - Mode eMode; - Bu::String sFile; - Bu::StringList lParams; - int iBlockSize; -}; - -int main( int argc, char *argv[] ) -{ - Options opt( argc, argv ); - - if( opt.sFile.isEmpty() ) - { - Bu::println("You must specify a MyriadFs stream (see -f).\n"); - return 1; - } - - if( opt.eMode == modeNone ) - { - Bu::println("Specify an operation to perfrom.\n"); - return 1; - } - - int iFlags = Bu::File::ReadWrite; - - if( opt.eMode == modeInitialize ) - { - iFlags |= Bu::File::Create|Bu::File::Truncate; - } - - Bu::File fFs( opt.sFile, iFlags ); - Bu::MyriadFs mFs( fFs, opt.iBlockSize ); - - switch( opt.eMode ) - { - case modeList: - { - Bu::String sPath = "/"; - if( opt.lParams.getSize() > 0 ) - { - sPath = opt.lParams.first(); - } - Bu::MyriadFs::Dir lEnt = mFs.readDir( sPath ); - for( Bu::MyriadFs::Dir::iterator i = lEnt.begin(); i; i++ ) - { - Bu::String sPerm; - switch( (*i).uPerms&Bu::MyriadFs::typeMask ) - { - case Bu::MyriadFs::typeDir: sPerm += "d"; break; - case Bu::MyriadFs::typeChrDev: sPerm += "c"; break; - case Bu::MyriadFs::typeBlkDev: sPerm += "b"; break; - case Bu::MyriadFs::typeSymLink: sPerm += "l"; break; - case Bu::MyriadFs::typeSocket: sPerm += "s"; break; - default: sPerm += "-"; break; - } - sPerm += ((*i).uPerms&Bu::MyriadFs::permUsrR)?"r":"-"; - sPerm += ((*i).uPerms&Bu::MyriadFs::permUsrW)?"w":"-"; - sPerm += ((*i).uPerms&Bu::MyriadFs::permUsrX)?"x":"-"; - sPerm += ((*i).uPerms&Bu::MyriadFs::permGrpR)?"r":"-"; - sPerm += ((*i).uPerms&Bu::MyriadFs::permGrpW)?"w":"-"; - sPerm += ((*i).uPerms&Bu::MyriadFs::permGrpX)?"x":"-"; - sPerm += ((*i).uPerms&Bu::MyriadFs::permOthR)?"r":"-"; - sPerm += ((*i).uPerms&Bu::MyriadFs::permOthW)?"w":"-"; - sPerm += ((*i).uPerms&Bu::MyriadFs::permOthX)?"x":"-"; - Bu::println("%1 %2 %3:%4 %5 %6") - .arg( sPerm ) - .arg( (*i).iNode ) - .arg( (*i).iUser ) - .arg( (*i).iGroup ) - .arg( (*i).iSize ) - .arg( (*i).sName ); - } - } - break; - - case modeCat: - { - if( opt.lParams.isEmpty() ) - { - Bu::println("Specify at least one file."); - return 1; - } - int iBlockSize = 1024*1024; - char *pBuf = new char[iBlockSize]; - for( Bu::StringList::iterator i = opt.lParams.begin(); i; i++ ) - { - Bu::MyriadStream ms = mFs.open( *i, Bu::MyriadFs::Read ); - int iRead = 0; - do - { - iRead = ms.read( pBuf, iBlockSize ); - if( iRead > 0 ) - { - Bu::sioRaw.write( pBuf, iRead ); - } - } while( iRead == iBlockSize ); - } - delete[] pBuf; - } - break; - - case modeCopyIn: - { - if( opt.lParams.getSize() != 2 ) - { - Bu::println("Specify a source file and destination file."); - return 1; - } - int iBlockSize = 1024*1024; - char *pBuf = new char[iBlockSize]; - Bu::File fs = Bu::File( - opt.lParams.first(), Bu::File::Read ); - Bu::MyriadStream ms = mFs.open( - opt.lParams.last(), Bu::MyriadFs::WriteNew ); - int iRead = 0; - do - { - iRead = fs.read( pBuf, iBlockSize ); - if( iRead > 0 ) - { - ms.write( pBuf, iRead ); - } - } while( iRead == iBlockSize ); - delete[] pBuf; - } - break; - - case modeCopyOut: - { - if( opt.lParams.getSize() != 2 ) - { - Bu::println("Specify a source file and destination file."); - return 1; - } - int iBlockSize = 1024*1024; - char *pBuf = new char[iBlockSize]; - Bu::MyriadStream ms = mFs.open( - opt.lParams.first(), Bu::MyriadFs::Read ); - Bu::File fs = Bu::File( - opt.lParams.last(), Bu::File::WriteNew ); - int iRead = 0; - do - { - iRead = ms.read( pBuf, iBlockSize ); - if( iRead > 0 ) - { - fs.write( pBuf, iRead ); - } - } while( iRead == iBlockSize ); - delete[] pBuf; - } - break; - - case modeMkdir: - { - if( opt.lParams.isEmpty() ) - { - Bu::println("Specify at least one directory."); - return 1; - } - for( Bu::StringList::iterator i = opt.lParams.begin(); i; i++ ) - { - mFs.mkDir( *i, 0777 ); - } - } - break; - - case modeInitialize: - Bu::println("MyriadFs initialized.\n"); - break; - - case modeRm: - { - if( opt.lParams.getSize() != 1 ) - { - Bu::println("Specify a file path."); - return 1; - } - mFs.unlink( opt.lParams.first() ); - } - break; - - case modeNone: - break; - } - - return 0; -} -- cgit v1.2.3