Changeset 65517 in vbox for trunk/src/VBox/Frontends/VBoxManage

Timestamp:

Jan 30, 2017 12:50:05 PM (8 years ago)

Author:

vboxsync

Message:

VBoxManage: added --sorteds option to list vms.

Location:

trunk/src/VBox/Frontends/VBoxManage

Files:

• VBoxManageHelp.cpp (modified) (1 diff)
• VBoxManageList.cpp (modified) (8 diffs)

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

@@ -623 +623 @@
     if (fCategory & USAGE_LIST)
         RTStrmPrintf(pStrm,
-                           "%s list [--long|-l]%s vms|runningvms|ostypes|hostdvds|hostfloppies|\n"
+                           "%s list [--long|-l] [--sorted|-s]%s vms|runningvms|ostypes|hostdvds|hostfloppies|\n"
 #if defined(VBOX_WITH_NETFLT)
                      "                            intnets|bridgedifs|hostonlyifs|natnets|dhcpservers|\n"

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

@@ -37 +37 @@
 #include <iprt/getopt.h>
 #include <iprt/ctype.h>
+
+#include <vector>
+#include <algorithm>
 
 #include "VBoxManage.h"
@@ -925 +928 @@
  * @param   pVirtualBox         Reference to the IVirtualBox smart pointer.
  */
-static HRESULT produceList(enum enmListType enmCommand, bool fOptLong, const ComPtr<IVirtualBox> &pVirtualBox)
+static HRESULT produceList(enum enmListType enmCommand, bool fOptLong, bool fOptSorted, const ComPtr<IVirtualBox> &pVirtualBox)
 {
     HRESULT rc = S_OK;
@@ -944 +947 @@
             {
                 /*
-                 * Iterate through the collection
+                 * Display it.
                  */
-                for (size_t i = 0; i < machines.size(); ++i)
+                if (!fOptSorted)
                 {
-                    if (machines[i])
-                        rc = showVMInfo(pVirtualBox, machines[i], NULL, fOptLong ? VMINFO_STANDARD : VMINFO_COMPACT);
+                    for (size_t i = 0; i < machines.size(); ++i)
+                        if (machines[i])
+                            rc = showVMInfo(pVirtualBox, machines[i], NULL, fOptLong ? VMINFO_STANDARD : VMINFO_COMPACT);
+                }
+                else
+                {
+                    /*
+                     * Sort the list by name before displaying it.
+                     */
+                    std::vector<std::pair<com::Bstr, IMachine *>> sortedMachines;
+                    for (size_t i = 0; i < machines.size(); ++i)
+                    {
+                        IMachine *pMachine = machines[i];
+                        if (pMachine) /* no idea why we need to do this... */
+                        {
+                            Bstr bstrName;
+                            pMachine->COMGETTER(Name)(bstrName.asOutParam());
+                            sortedMachines.push_back(std::pair<com::Bstr, IMachine *>(bstrName, pMachine));
+                        }
+                    }
+
+                    std::sort(sortedMachines.begin(), sortedMachines.end());
+
+                    for (size_t i = 0; i < sortedMachines.size(); ++i)
+                        rc = showVMInfo(pVirtualBox, sortedMachines[i].second, NULL, fOptLong ? VMINFO_STANDARD : VMINFO_COMPACT);
                 }
             }
@@ -1273 +1299 @@
     bool                fOptLong      = false;
     bool                fOptMultiple  = false;
+    bool                fOptSorted    = false;
     enum enmListType    enmOptCommand = kListNotSpecified;
 
@@ -1279 +1306 @@
         { "--long",             'l',                     RTGETOPT_REQ_NOTHING },
         { "--multiple",         'm',                     RTGETOPT_REQ_NOTHING }, /* not offical yet */
+        { "--sorted",           's',                     RTGETOPT_REQ_NOTHING },
         { "vms",                kListVMs,                RTGETOPT_REQ_NOTHING },
         { "runningvms",         kListRunningVMs,         RTGETOPT_REQ_NOTHING },
@@ -1321 +1349 @@
                 break;
 
+            case 's':
+                fOptSorted = true;
+                break;
+
             case 'm':
                 fOptMultiple = true;
@@ -1356 +1388 @@
                 if (fOptMultiple)
                 {
-                    HRESULT hrc = produceList((enum enmListType)ch, fOptLong, a->virtualBox);
+                    HRESULT hrc = produceList((enum enmListType)ch, fOptLong, fOptSorted, a->virtualBox);
                     if (FAILED(hrc))
                         return RTEXITCODE_FAILURE;
@@ -1377 +1409 @@
     if (!fOptMultiple)
     {
-        HRESULT hrc = produceList(enmOptCommand, fOptLong, a->virtualBox);
+        HRESULT hrc = produceList(enmOptCommand, fOptLong, fOptSorted, a->virtualBox);
         if (FAILED(hrc))
             return RTEXITCODE_FAILURE;