Changeset 2222

Timestamp:

07/08/2008 14:47:59 (5 months ago)

Author:

chris

Message:

Add machine-readable output mode (with -m option) to bbstoreaccounts info.

Location:

box/trunk

Files:

• bin/bbackupquery/BackupQueries.cpp (modified) (1 diff)
• bin/bbstoreaccounts/bbstoreaccounts.cpp (modified) (7 diffs)
• lib/common/Utils.cpp (modified) (1 diff)
• lib/common/Utils.h (modified) (1 diff)

box/trunk/bin/bbackupquery/BackupQueries.cpp

@@ -2191 +2191 @@
 void BackupQueries::CommandUsageDisplayEntry(const char *Name, int64_t Size, int64_t HardLimit, int32_t BlockSize)
 {
-        std::cout << FormatUsageLineStart(Name) <<
-                FormatUsageBar(Size, Size * BlockSize, HardLimit * BlockSize) <<
+        std::cout << FormatUsageLineStart(Name, false) <<
+                FormatUsageBar(Size, Size * BlockSize, HardLimit * BlockSize, false) <<
                 std::endl;
 }

box/trunk/bin/bbstoreaccounts/bbstoreaccounts.cpp

@@ -40 +40 @@
 #define MAX_SOFT_LIMIT_SIZE             97
 
+bool sMachineReadableOutput = false;
+
 void CheckSoftHardLimits(int64_t SoftLimit, int64_t HardLimit)
 {
@@ -72 +74 @@
 {
         return FormatUsageBar(Blocks, Blocks * BlockSizeOfDiscSet(DiscSet),
-                MaxBlocks * BlockSizeOfDiscSet(DiscSet));
+                MaxBlocks * BlockSizeOfDiscSet(DiscSet),
+                sMachineReadableOutput);
 }
 
@@ -206 +209 @@
 {
         // Load in the account database 
-        std::auto_ptr<BackupStoreAccountDatabase> db(BackupStoreAccountDatabase::Read(rConfig.GetKeyValue("AccountDatabase").c_str()));
+        std::auto_ptr<BackupStoreAccountDatabase> db(
+                BackupStoreAccountDatabase::Read(
+                        rConfig.GetKeyValue("AccountDatabase").c_str()));
         
         // Exists?
@@ -221 +226 @@
         int discSet;
         acc.GetAccountRoot(ID, rootDir, discSet);
-        std::auto_ptr<BackupStoreInfo> info(BackupStoreInfo::Load(ID, rootDir, discSet, true /* ReadOnly */));
+        std::auto_ptr<BackupStoreInfo> info(BackupStoreInfo::Load(ID,
+                rootDir, discSet, true /* ReadOnly */));
         
         // Then print out lots of info
-        std::cout << FormatUsageLineStart("Account ID") <<
+        std::cout << FormatUsageLineStart("Account ID", sMachineReadableOutput) <<
                 BOX_FORMAT_ACCOUNT(ID) << std::endl;
-        std::cout << FormatUsageLineStart("Last object ID") <<
+        std::cout << FormatUsageLineStart("Last object ID", sMachineReadableOutput) <<
                 BOX_FORMAT_OBJECTID(info->GetLastObjectIDUsed()) << std::endl;
-        std::cout << FormatUsageLineStart("Used") <<
+        std::cout << FormatUsageLineStart("Used", sMachineReadableOutput) <<
                 BlockSizeToString(info->GetBlocksUsed(),
                         info->GetBlocksHardLimit(), discSet) << std::endl;
-        std::cout << FormatUsageLineStart("Old files") <<
+        std::cout << FormatUsageLineStart("Old files", sMachineReadableOutput) <<
                 BlockSizeToString(info->GetBlocksInOldFiles(),
                         info->GetBlocksHardLimit(), discSet) << std::endl;
-        std::cout << FormatUsageLineStart("Deleted files") <<
+        std::cout << FormatUsageLineStart("Deleted files", sMachineReadableOutput) <<
                 BlockSizeToString(info->GetBlocksInDeletedFiles(),
                         info->GetBlocksHardLimit(), discSet) << std::endl;
-        std::cout << FormatUsageLineStart("Directories") <<
+        std::cout << FormatUsageLineStart("Directories", sMachineReadableOutput) <<
                 BlockSizeToString(info->GetBlocksInDirectories(),
                         info->GetBlocksHardLimit(), discSet) << std::endl;
-        std::cout << FormatUsageLineStart("Soft limit") <<
+        std::cout << FormatUsageLineStart("Soft limit", sMachineReadableOutput) <<
                 BlockSizeToString(info->GetBlocksSoftLimit(),
                         info->GetBlocksHardLimit(), discSet) << std::endl;
-        std::cout << FormatUsageLineStart("Hard limit") <<
+        std::cout << FormatUsageLineStart("Hard limit", sMachineReadableOutput) <<
                 BlockSizeToString(info->GetBlocksHardLimit(),
                         info->GetBlocksHardLimit(), discSet) << std::endl;
-        std::cout << FormatUsageLineStart("Client store marker") <<
+        std::cout << FormatUsageLineStart("Client store marker", sMachineReadableOutput) <<
                 info->GetLastObjectIDUsed() << std::endl;
         
@@ -429 +435 @@
 "        set numbers) with the specified soft and hard limits (in blocks\n"
 "        if suffixed with B, MB with M, GB with G)\n"
-"  info <account>\n"
+"  info [-m] <account>\n"
 "        Prints information about the specified account including number\n"
-"        of blocks used.\n"
+"        of blocks used. The -m option enable machine-readable output.\n"
 "  setlimit <accounts> <softlimit> <hardlimit>\n"
 "        Changes the limits of the account as specified. Numbers are\n"
@@ -465 +471 @@
         // See if there's another entry on the command line
         int c;
-        while((c = getopt(argc, (char * const *)argv, "c:")) != -1)
+        while((c = getopt(argc, (char * const *)argv, "c:m")) != -1)
         {
                 switch(c)
@@ -474 +480 @@
                         break;
                 
+                case 'm':
+                        // enable machine readable output
+                        sMachineReadableOutput = true;
+                        break;
+
                 case '?':
                 default:

box/trunk/lib/common/Utils.cpp

@@ -253 +253 @@
 }
 
-std::string FormatUsageBar(int64_t Blocks, int64_t Bytes, int64_t Max)
+std::string FormatUsageBar(int64_t Blocks, int64_t Bytes, int64_t Max,
+        bool MachineReadable)
 {
         std::ostringstream result;
         
-        // Bar graph
-        char bar[17];
-        unsigned int b = (int)((Bytes * (sizeof(bar)-1)) / Max);
-        if(b > sizeof(bar)-1) {b = sizeof(bar)-1;}
-        for(unsigned int l = 0; l < b; l++)
-        {
-                bar[l] = '*';
-        }
-        for(unsigned int l = b; l < sizeof(bar) - 1; l++)
-        {
-                bar[l] = ' ';
-        }
-        bar[sizeof(bar)-1] = '\0';
-        
-        result << std::fixed <<
-                std::setw(10) << Blocks << " blocks, " <<
-                std::setw(10) << HumanReadableSize(Bytes) << ", " << 
-                std::setw(3) << std::setprecision(0) <<
-                ((Bytes*100)/Max) << "% |" << bar << "|";
+
+        if (MachineReadable)
+        {
+                result << (Bytes >> 10) << " kB, " <<
+                        std::setprecision(0) << ((Bytes*100)/Max) << "%";
+        }
+        else
+        {
+                // Bar graph
+                char bar[17];
+                unsigned int b = (int)((Bytes * (sizeof(bar)-1)) / Max);
+                if(b > sizeof(bar)-1) {b = sizeof(bar)-1;}
+                for(unsigned int l = 0; l < b; l++)
+                {
+                        bar[l] = '*';
+                }
+                for(unsigned int l = b; l < sizeof(bar) - 1; l++)
+                {
+                        bar[l] = ' ';
+                }
+                bar[sizeof(bar)-1] = '\0';
+                
+                result << std::fixed <<
+                        std::setw(10) << Blocks << " blocks, " <<
+                        std::setw(10) << HumanReadableSize(Bytes) << ", " << 
+                        std::setw(3) << std::setprecision(0) <<
+                        ((Bytes*100)/Max) << "% |" << bar << "|";
+        }
         
         return result.str();
 }
 
-std::string FormatUsageLineStart(const std::string& rName)
-{
-        std::ostringstream result;      
-        result << std::setw(20) << std::right << rName << ": ";
+std::string FormatUsageLineStart(const std::string& rName,
+        bool MachineReadable)
+{
+        std::ostringstream result;
+
+        if (MachineReadable)
+        {
+                result << rName << ": ";
+        }
+        else
+        {
+                result << std::setw(20) << std::right << rName << ": ";
+        }
+
         return result.str();
 }

box/trunk/lib/common/Utils.h

@@ -32 +32 @@
 int ObjectExists(const std::string& rFilename);
 std::string HumanReadableSize(int64_t Bytes);
-std::string FormatUsageBar(int64_t Blocks, int64_t Bytes, int64_t Max);
-std::string FormatUsageLineStart(const std::string& rName);
+std::string FormatUsageBar(int64_t Blocks, int64_t Bytes, int64_t Max,
+        bool MachineReadable);
+std::string FormatUsageLineStart(const std::string& rName,
+        bool MachineReadable);
 
 #include "MemLeakFindOff.h"