Changeset 2353

Timestamp:

17/10/2008 00:15:25 (4 years ago)

Author:

chris

Message:

Add -m option to bbackupquery usage command for machine-readable output.

Location:

box/trunk/bin/bbackupquery

Files:

• BackupQueries.cpp (modified) (4 diffs)
• BackupQueries.h (modified) (1 diff)
• documentation.txt (modified) (1 diff)

box/trunk/bin/bbackupquery/BackupQueries.cpp

@@ -223 +223 @@
                 { "restore", "drif" },
                 { "help", "" },
-                { "usage", "" },
+                { "usage", "m" },
                 { "undelete", "" },
                 { "delete", "" },
@@ -359 +359 @@
                 
         case Command_Usage:
-                CommandUsage();
+                CommandUsage(opts);
                 break;
                 
@@ -2249 +2249 @@
 //
 // --------------------------------------------------------------------------
-void BackupQueries::CommandUsage()
-{
+void BackupQueries::CommandUsage(const bool *opts)
+{
+        bool MachineReadable = opts['m'];
+
         // Request full details from the server
         std::auto_ptr<BackupProtocolClientAccountUsage> usage(mrConnection.QueryGetAccountUsage());
@@ -2257 +2259 @@
         int64_t hardLimit = usage->GetBlocksHardLimit();
         int32_t blockSize = usage->GetBlockSize();
-        CommandUsageDisplayEntry("Used", usage->GetBlocksUsed(), hardLimit, blockSize);
-        CommandUsageDisplayEntry("Old files", usage->GetBlocksInOldFiles(), hardLimit, blockSize);
-        CommandUsageDisplayEntry("Deleted files", usage->GetBlocksInDeletedFiles(), hardLimit, blockSize);
-        CommandUsageDisplayEntry("Directories", usage->GetBlocksInDirectories(), hardLimit, blockSize);
-        CommandUsageDisplayEntry("Soft limit", usage->GetBlocksSoftLimit(), hardLimit, blockSize);
-        CommandUsageDisplayEntry("Hard limit", hardLimit, hardLimit, blockSize);
-}
-
-
-// --------------------------------------------------------------------------
-//
-// Function
-//              Name:    BackupQueries::CommandUsageDisplayEntry(const char *, int64_t, int64_t, int32_t)
+        CommandUsageDisplayEntry("Used", usage->GetBlocksUsed(), hardLimit,
+                blockSize, MachineReadable);
+        CommandUsageDisplayEntry("Old files", usage->GetBlocksInOldFiles(),
+                hardLimit, blockSize, MachineReadable);
+        CommandUsageDisplayEntry("Deleted files", usage->GetBlocksInDeletedFiles(),
+                hardLimit, blockSize, MachineReadable);
+        CommandUsageDisplayEntry("Directories", usage->GetBlocksInDirectories(),
+                hardLimit, blockSize, MachineReadable);
+        CommandUsageDisplayEntry("Soft limit", usage->GetBlocksSoftLimit(),
+                hardLimit, blockSize, MachineReadable);
+        CommandUsageDisplayEntry("Hard limit", hardLimit, hardLimit, blockSize,
+                MachineReadable);
+}
+
+
+// --------------------------------------------------------------------------
+//
+// Function
+//              Name:    BackupQueries::CommandUsageDisplayEntry(const char *,
+//                       int64_t, int64_t, int32_t, bool)
 //              Purpose: Display an entry in the usage table
 //              Created: 19/4/04
 //
 // --------------------------------------------------------------------------
-void BackupQueries::CommandUsageDisplayEntry(const char *Name, int64_t Size, int64_t HardLimit, int32_t BlockSize)
-{
-        std::cout << FormatUsageLineStart(Name, false) <<
-                FormatUsageBar(Size, Size * BlockSize, HardLimit * BlockSize, false) <<
-                std::endl;
+void BackupQueries::CommandUsageDisplayEntry(const char *Name, int64_t Size,
+int64_t HardLimit, int32_t BlockSize, bool MachineReadable)
+{
+        std::cout << FormatUsageLineStart(Name, MachineReadable) <<
+                FormatUsageBar(Size, Size * BlockSize, HardLimit * BlockSize,
+                        MachineReadable) << std::endl;
 }
 

box/trunk/bin/bbackupquery/BackupQueries.h

@@ -59 +59 @@
         void CommandDelete(const std::vector<std::string> &args,
                 const bool *opts);
-        void CommandUsage();
+        void CommandUsage(const bool *opts);
         void CommandUsageDisplayEntry(const char *Name, int64_t Size,
-                int64_t HardLimit, int32_t BlockSize);
+                int64_t HardLimit, int32_t BlockSize, bool MachineReadable);
         void CommandHelp(const std::vector<std::string> &args);
 

box/trunk/bin/bbackupquery/documentation.txt

@@ -143 +143 @@
 <
 
-> usage
+> usage [-m]
 
         Show space used on the server for this account.
+
+        -m -- display the output in machine-readable form
 
         Used: Total amount of space used on the server.