Changeset 105194 in vbox for trunk/src/VBox/Frontends

Timestamp:

Jul 8, 2024 4:33:52 PM (7 months ago)

Author:

vboxsync

Message:

FE/VBoxManage: Added a new flag SHOW_PROGRESS_OPS for showProgress() to only show the (sub) operation descriptions without all too much details (as with SHOW_PROGRESS_DETAILS). Needed for the new recording progress object. bugref:10718

Location:

trunk/src/VBox/Frontends/VBoxManage

Files:

• VBoxManage.cpp (modified) (4 diffs)
• VBoxManage.h (modified) (1 diff)

trunk/src/VBox/Frontends/VBoxManage/VBoxManage.cpp

@@ -319 +319 @@
         fFlags = SHOW_PROGRESS_DETAILS;
 
-    const bool fDetailed = RT_BOOL(fFlags & SHOW_PROGRESS_DETAILS);
-    const bool fQuiet = !RT_BOOL(fFlags & (SHOW_PROGRESS | SHOW_PROGRESS_DETAILS));
-
+    const bool fDetailed =  RT_BOOL(fFlags & SHOW_PROGRESS_DETAILS);
+    const bool fOps      =  RT_BOOL(fFlags & SHOW_PROGRESS_OPS);
+    const bool fQuiet    = !RT_BOOL(fFlags & (SHOW_PROGRESS | SHOW_PROGRESS_DETAILS | SHOW_PROGRESS_OPS));
+
+    AssertReturn((!fDetailed && !fOps) || (fDetailed != fOps), E_INVALIDARG); /* Mutually exclusive. */
 
     BOOL fCompleted = FALSE;
@@ -369 +371 @@
     }
 
-    if (!fQuiet && !fDetailed)
+    if (!fQuiet && !fDetailed && !fOps)
     {
         RTStrmPrintf(g_pStdErr, "0%%...");
@@ -395 +397 @@
         progress->COMGETTER(Percent(&ulCurrentPercent));
 
-        if (fDetailed)
+        if (   fDetailed
+            || fOps)
         {
             ULONG ulOperation = 1;
@@ -422 +425 @@
                 progress->COMGETTER(TimeRemaining)(&lSecsRem);
 
-                RTStrmPrintf(g_pStdErr, VBoxManage::tr("(%u/%u) %ls %02u%% => %02u%% (%d s remaining)\n"), ulOperation + 1, cOperations,
-                             bstrOperationDescription.raw(), ulCurrentOperationPercent, ulCurrentPercent, lSecsRem);
+                if (fDetailed)
+                    RTStrmPrintf(g_pStdErr, VBoxManage::tr("(%u/%u) %ls %02u%% => %02u%% (%d s remaining)\n"), ulOperation + 1, cOperations,
+                                 bstrOperationDescription.raw(), ulCurrentOperationPercent, ulCurrentPercent, lSecsRem);
+                else
+                    RTStrmPrintf(g_pStdErr, VBoxManage::tr("%02u%%: %ls\n"), ulCurrentPercent, bstrOperationDescription.raw());
+
                 ulLastPercent = ulCurrentPercent;
                 ulLastOperationPercent = ulCurrentOperationPercent;

trunk/src/VBox/Frontends/VBoxManage/VBoxManage.h

@@ -156 +156 @@
 # define SHOW_PROGRESS_DESC     RT_BIT_32(0)
 # define SHOW_PROGRESS          RT_BIT_32(1)
+/** Shows detailed information of the progress.
+ *  Mutually exclusive with SHOW_PROGRESS_OPS. */
 # define SHOW_PROGRESS_DETAILS  RT_BIT_32(2)
+/** Only shows the operation descriptions without other details.
+ *  Mutually exclusive with SHOW_PROGRESS_DETAILS. */
+# define SHOW_PROGRESS_OPS      RT_BIT_32(3)
 HRESULT showProgress(ComPtr<IProgress> progress, uint32_t fFlags = SHOW_PROGRESS);