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

Timestamp:

Nov 4, 2010 2:05:28 PM (14 years ago)

Author:

vboxsync

Message:

VBoxManage: Implemented 'list extpacks', 'extpack install' and 'extpack uninstall'.

Location:

trunk/src/VBox/Frontends/VBoxManage

Files:

• VBoxManage.cpp (modified) (1 diff)
• VBoxManage.h (modified) (1 diff)
• VBoxManageHelp.cpp (modified) (2 diffs)
• VBoxManageList.cpp (modified) (6 diffs)
• VBoxManageMisc.cpp (modified) (1 diff)

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

@@ -401 +401 @@
             { "dhcpserver",       USAGE_DHCPSERVER,        handleDHCPServer},
             { "vrde",             USAGE_VRDE,              handleVRDE},
+            { "extpack",          USAGE_EXTPACK,           handleExtPack},
             { NULL,               0,                       NULL }
         };

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

@@ -98 +98 @@
 #define USAGE_PASSWORDHASH          RT_BIT_64(54)
 #define USAGE_VRDE                  RT_BIT_64(55)
+#define USAGE_EXTPACK               RT_BIT_64(56)
 #define USAGE_ALL                   (~(uint64_t)0)
 /** @} */

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

@@ -115 +115 @@
                      "                            hostcpuids|hddbackends|hdds|dvds|floppies|\n"
                      "                            usbhost|usbfilters|systemproperties|\n"
-                     "                            vrdelibraries\n"
+                     "                            vrdelibraries|extpacks\n"
                      "\n");
     }
@@ -727 +727 @@
                      "\n");
     }
+    if (u64Cmd & USAGE_EXTPACK)
+    {
+        RTStrmPrintf(pStrm,
+                     "VBoxManage extpack          install <tarball>\n"
+                     "VBoxManage extpack          uninstall [--force] <name>\n"
+                     "\n");
+    }
 }
 

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

@@ -185 +185 @@
     }
 }
+
+
+/**
+ * List extension packs.
+ *
+ * @returns See produceList.
+ * @param   rptrVirtualBox      Reference to the IVirtualBox smart pointer.
+ */
+static HRESULT listExtensionPacks(const ComPtr<IVirtualBox> &rptrVirtualBox)
+{
+    ComObjPtr<IExtPackManager> ptrExtPackMgr;
+    CHECK_ERROR2_RET(rptrVirtualBox, COMGETTER(ExtensionPackManager)(ptrExtPackMgr.asOutParam()), hrcCheck);
+
+    SafeIfaceArray<IExtPack> extPacks;
+    CHECK_ERROR2_RET(ptrExtPackMgr, COMGETTER(InstalledExtPacks)(ComSafeArrayAsOutParam(extPacks)), hrcCheck);
+    RTPrintf("Extension Packs: %u\n", extPacks.size());
+
+    HRESULT hrc = S_OK;
+    for (size_t i = 0; i < extPacks.size(); i++)
+    {
+        /* Read all the properties. */
+        Bstr    bstrName;
+        CHECK_ERROR2_STMT(extPacks[i], COMGETTER(Name)(bstrName.asOutParam()),          hrc = hrcCheck; bstrName.setNull());
+        Bstr    bstrDesc;
+        CHECK_ERROR2_STMT(extPacks[i], COMGETTER(Description)(bstrDesc.asOutParam()),   hrc = hrcCheck; bstrDesc.setNull());
+        Bstr    bstrVersion;
+        CHECK_ERROR2_STMT(extPacks[i], COMGETTER(Version)(bstrVersion.asOutParam()),    hrc = hrcCheck; bstrVersion.setNull());
+        ULONG   uRevision;
+        CHECK_ERROR2_STMT(extPacks[i], COMGETTER(Revision)(&uRevision),                 hrc = hrcCheck; uRevision = 0);
+        BOOL    fUsable;
+        CHECK_ERROR2_STMT(extPacks[i], COMGETTER(Usable)(&fUsable),                     hrc = hrcCheck; fUsable = FALSE);
+        Bstr    bstrWhy;
+        CHECK_ERROR2_STMT(extPacks[i], COMGETTER(WhyUnusable)(bstrWhy.asOutParam()),    hrc = hrcCheck; bstrWhy.setNull());
+
+        /* Display them. */
+        if (i)
+            RTPrintf("\n");
+        RTPrintf("Pack no.%2zu:   %lS\n"
+                 "Version:      %lS\n"
+                 "Revision:     %u\n"
+                 "Description:  %lS\n"
+                 "Usable:       %RTbool\n"
+                 "Why unusable: %lS\n",
+                 i, bstrName.raw(),
+                 bstrVersion.raw(),
+                 uRevision,
+                 bstrDesc.raw(),
+                 fUsable != FALSE,
+                 bstrWhy.raw());
+    }
+    return hrc;
+}
+
 
 /**
@@ -211 +264 @@
     kListSystemProperties,
     kListDhcpServers,
-    kListVrdeLibraries
+    kListVrdeLibraries,
+    kListExtPacks
 };
 
@@ -613 +667 @@
             CHECK_ERROR_RET(rptrVirtualBox, COMGETTER(Host)(Host.asOutParam()), 1);
 
-            SafeIfaceArray <IHostUSBDevice> CollPtr;
+            SafeIfaceArray<IHostUSBDevice> CollPtr;
             CHECK_ERROR_RET(Host, COMGETTER(USBDevices)(ComSafeArrayAsOutParam(CollPtr)), 1);
 
@@ -870 +924 @@
             SafeArray<BSTR> libs;
             CHECK_ERROR(rptrVirtualBox, VRDEListLibraries(ComSafeArrayAsOutParam(libs)));
-            for (size_t i = 0; i < libs.size(); ++i)
-            {
-                Bstr bstrName(libs[i]);
-                RTPrintf("%lS\n", bstrName.raw());
-            }
-            break;
-        }
+            if (SUCCEEDED(rc))
+            {
+                for (size_t i = 0; i < libs.size(); ++i)
+                {
+                    Bstr bstrName(libs[i]);
+                    RTPrintf("%lS\n", bstrName.raw());
+                }
+            }
+            break;
+        }
+
+        case kListExtPacks:
+            rc = listExtensionPacks(rptrVirtualBox);
+            break;
 
         /* No default here, want gcc warnings. */
@@ -922 +983 @@
         { "dhcpservers",        kListDhcpServers,        RTGETOPT_REQ_NOTHING },
         { "vrdelibraries",      kListVrdeLibraries,      RTGETOPT_REQ_NOTHING },
+        { "extpacks",           kListExtPacks,           RTGETOPT_REQ_NOTHING },
     };
 
@@ -964 +1026 @@
             case kListDhcpServers:
             case kListVrdeLibraries:
+            case kListExtPacks:
                 enmOptCommand = (enum enmListType)ch;
                 if (fOptMultiple)

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

@@ -911 +911 @@
 }
 
+int handleExtPack(HandlerArg *a)
+{
+    if (a->argc < 2)
+        return errorSyntax(USAGE_EXTPACK, "Incorrect number of parameters");
+
+    ComObjPtr<IExtPackManager> ptrExtPackMgr;
+    CHECK_ERROR2_RET(a->virtualBox, COMGETTER(ExtensionPackManager)(ptrExtPackMgr.asOutParam()), RTEXITCODE_FAILURE);
+
+    RTGETOPTSTATE   GetState;
+    RTGETOPTUNION   ValueUnion;
+    int             ch;
+    HRESULT         hrc = S_OK;
+
+    if (!strcmp(a->argv[0], "install"))
+    {
+        if (a->argc > 2)
+            return errorSyntax(USAGE_EXTPACK, "Too many parameters given to \"extpack install\"");
+
+        Bstr bstrTarball(a->argv[1]);
+        Bstr bstrName;
+        CHECK_ERROR2_RET(ptrExtPackMgr, Install(bstrTarball.raw(), bstrName.asOutParam()), RTEXITCODE_FAILURE);
+        RTPrintf("Successfully installed \"%lS\".\n", bstrName.raw());
+    }
+    else if (!strcmp(a->argv[0], "uninstall"))
+    {
+        const char *pszName = NULL;
+        bool        fForced = false;
+
+        static const RTGETOPTDEF s_aUninstallOptions[] =
+        {
+            { "--forced",  'f', RTGETOPT_REQ_NOTHING },
+        };
+
+        RTGetOptInit(&GetState, a->argc, a->argv, s_aUninstallOptions, RT_ELEMENTS(s_aUninstallOptions),
+                     1, RTGETOPTINIT_FLAGS_NO_STD_OPTS);
+        while ((ch = RTGetOpt(&GetState, &ValueUnion)))
+        {
+            switch (ch)
+            {
+                case 'f':
+                    fForced = true;
+                    break;
+
+                case VINF_GETOPT_NOT_OPTION:
+                    if (pszName)
+                        return errorSyntax(USAGE_EXTPACK, "Too many extension pack names given to \"extpack uninstall\"");
+                    pszName = ValueUnion.psz;
+                    break;
+
+                default:
+                    return errorGetOpt(USAGE_EXTPACK, ch, &ValueUnion);
+            }
+        }
+        if (!pszName)
+            return errorSyntax(USAGE_EXTPACK, "Not extension pack name was given to \"extpack uninstall\"");
+
+        Bstr bstrName(pszName);
+        CHECK_ERROR2_RET(ptrExtPackMgr, Uninstall(bstrName.raw(), fForced), RTEXITCODE_FAILURE);
+        RTPrintf("Successfully uninstalled \"%s\".\n", pszName);
+    }
+    else
+        return errorSyntax(USAGE_EXTPACK, "Unknown command \"%s\"", a->argv[0]);
+
+    return RTEXITCODE_SUCCESS;
+}
+
+