Changeset 43041 in vbox for trunk/src/VBox/Main/src-server

Timestamp:

Aug 28, 2012 1:58:40 PM (13 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

80375

Message:

Main/VirtualBox: final API change, cleans up optional parameters to IVirtualBox::createMachine, preparing for adding more flags.

Location:

trunk/src/VBox/Main/src-server

Files:

• ApplianceImplImport.cpp (modified) (3 diffs)
• MachineImpl.cpp (modified) (3 diffs)
• VirtualBoxImpl.cpp (modified) (7 diffs)

trunk/src/VBox/Main/src-server/ApplianceImplImport.cpp

@@ -206 +206 @@
             rc = mVirtualBox->ComposeMachineFilename(Bstr(nameVBox).raw(),
                                                      NULL /* aGroup */,
+                                                     NULL /* aCreateFlags */,
                                                      NULL /* aBaseFolder */,
                                                      bstrMachineFilename.asOutParam());
@@ -1954 +1955 @@
                                     ComSafeArrayAsInParam(groups),
                                     Bstr(stack.strOsTypeVBox).raw(),
-                                    NULL, /* uuid */
-                                    FALSE, /* fForceOverwrite */
+                                    NULL, /* aCreateFlags */
                                     pNewMachine.asOutParam());
     if (FAILED(rc)) throw rc;
@@ -2868 +2868 @@
         rc = mVirtualBox->ComposeMachineFilename(Bstr(stack.strNameVBox).raw(),
                                                  NULL /* aGroup */,
+                                                 NULL /* aCreateFlags */,
                                                  NULL /* aBaseFolder */,
                                                  bstrMachineFilename.asOutParam());

trunk/src/VBox/Main/src-server/MachineImpl.cpp

@@ -290 +290 @@
                       GuestOSType *aOsType,
                       const Guid &aId,
-                      bool fForceOverwrite)
+                      bool fForceOverwrite,
+                      bool fDirectoryIncludesUUID)
 {
     LogFlowThisFuncEnter();
@@ -324 +325 @@
         mUserData->s.llGroups = llGroups;
 
+        mUserData->s.fDirectoryIncludesUUID = fDirectoryIncludesUUID;
         // the "name sync" flag determines whether the machine directory gets renamed along
         // with the machine file; say so if the settings file name is the same as the
@@ -10946 +10948 @@
     strConfigFileOnly.stripPath()                           // vmname.vbox
                      .stripExt();                           // vmname
+    /** @todo hack, make somehow use of ComposeMachineFilename */
+    if (mUserData->s.fDirectoryIncludesUUID)
+        strConfigFileOnly += Utf8StrFmt(" (%RTuuid)", mData->mUuid.raw());
 
     AssertReturn(!strMachineDirName.isEmpty(), false);

trunk/src/VBox/Main/src-server/VirtualBoxImpl.cpp

@@ -1406 +1406 @@
 STDMETHODIMP VirtualBox::ComposeMachineFilename(IN_BSTR aName,
                                                 IN_BSTR aGroup,
+                                                IN_BSTR aCreateFlags,
                                                 IN_BSTR aBaseFolder,
                                                 BSTR *aFilename)
@@ -1417 +1418 @@
     AutoCaller autoCaller(this);
     if (FAILED(autoCaller.rc())) return autoCaller.rc();
+
+    Utf8Str strCreateFlags(aCreateFlags);
+    Guid id;
+    bool fDirectoryIncludesUUID = false;
+    if (!strCreateFlags.isEmpty())
+    {
+        const char *pcszNext = strCreateFlags.c_str();
+        while (*pcszNext != '\0')
+        {
+            Utf8Str strFlag;
+            const char *pcszComma = RTStrStr(pcszNext, ",");
+            if (!pcszComma)
+                strFlag = pcszNext;
+            else
+                strFlag = Utf8Str(pcszNext, pcszComma - pcszNext);
+
+            const char *pcszEqual = RTStrStr(strFlag.c_str(), "=");
+            /* skip over everything which doesn't contain '=' */
+            if (pcszEqual && pcszEqual != strFlag.c_str())
+            {
+                Utf8Str strKey(strFlag.c_str(), pcszEqual - strFlag.c_str());
+                Utf8Str strValue(strFlag.c_str() + (pcszEqual - strFlag.c_str() + 1));
+
+                if (strKey == "UUID")
+                    id = strValue.c_str();
+                else if (strKey == "directoryIncludesUUID")
+                    fDirectoryIncludesUUID = (strValue == "1");
+            }
+
+            if (!pcszComma)
+                pcszNext += strFlag.length();
+            else
+                pcszNext += strFlag.length() + 1;
+        }
+    }
+    if (id.isEmpty())
+        fDirectoryIncludesUUID = false;
 
     Utf8Str strGroup(aGroup);
@@ -1436 +1474 @@
     Utf8Str strBase = aBaseFolder;
     Utf8Str strName = aName;
+    Utf8Str strDirName(strName);
+    if (fDirectoryIncludesUUID)
+        strDirName += Utf8StrFmt(" (%RTuuid)", id.raw());
     sanitiseMachineFilename(strName);
+    sanitiseMachineFilename(strDirName);
 
     if (strBase.isEmpty())
@@ -1551 +1593 @@
                                        ComSafeArrayIn(IN_BSTR, aGroups),
                                        IN_BSTR aOsTypeId,
-                                       IN_BSTR aId,
-                                       BOOL forceOverwrite,
+                                       IN_BSTR aCreateFlags,
                                        IMachine **aMachine)
 {
     LogFlowThisFuncEnter();
-    LogFlowThisFunc(("aSettingsFile=\"%ls\", aName=\"%ls\", aOsTypeId =\"%ls\"\n", aSettingsFile, aName, aOsTypeId));
+    LogFlowThisFunc(("aSettingsFile=\"%ls\", aName=\"%ls\", aOsTypeId =\"%ls\", aCreateFlags=\"%ls\"\n", aSettingsFile, aName, aOsTypeId, aCreateFlags));
 
     CheckComArgStrNotEmptyOrNull(aName);
@@ -1570 +1611 @@
         return rc;
 
+    Utf8Str strCreateFlags(aCreateFlags);
+    Guid id;
+    bool fForceOverwrite = false;
+    bool fDirectoryIncludesUUID = false;
+    if (!strCreateFlags.isEmpty())
+    {
+        const char *pcszNext = strCreateFlags.c_str();
+        while (*pcszNext != '\0')
+        {
+            Utf8Str strFlag;
+            const char *pcszComma = RTStrStr(pcszNext, ",");
+            if (!pcszComma)
+                strFlag = pcszNext;
+            else
+                strFlag = Utf8Str(pcszNext, pcszComma - pcszNext);
+
+            const char *pcszEqual = RTStrStr(strFlag.c_str(), "=");
+            /* skip over everything which doesn't contain '=' */
+            if (pcszEqual && pcszEqual != strFlag.c_str())
+            {
+                Utf8Str strKey(strFlag.c_str(), pcszEqual - strFlag.c_str());
+                Utf8Str strValue(strFlag.c_str() + (pcszEqual - strFlag.c_str() + 1));
+
+                if (strKey == "UUID")
+                    id = strValue.c_str();
+                else if (strKey == "forceOverwrite")
+                    fForceOverwrite = (strValue == "1");
+                else if (strKey == "directoryIncludesUUID")
+                    fDirectoryIncludesUUID = (strValue == "1");
+            }
+
+            if (!pcszComma)
+                pcszNext += strFlag.length();
+            else
+                pcszNext += strFlag.length() + 1;
+        }
+    }
+    /* Create UUID if none was specified. */
+    if (id.isEmpty())
+        id.create();
+
     /* NULL settings file means compose automatically */
     Bstr bstrSettingsFile(aSettingsFile);
     if (bstrSettingsFile.isEmpty())
     {
+        Utf8Str strNewCreateFlags(Utf8StrFmt("UUID=%RTuuid", id.raw()));
+        if (fDirectoryIncludesUUID)
+            strNewCreateFlags += ",directoryIncludesUUID=1";
+
         rc = ComposeMachineFilename(aName,
                                     Bstr(llGroups.front()).raw(),
+                                    Bstr(strNewCreateFlags).raw(),
                                     NULL /* aBaseFolder */,
                                     bstrSettingsFile.asOutParam());
@@ -1585 +1672 @@
     rc = machine.createObject();
     if (FAILED(rc)) return rc;
-
-    /* Create UUID if an empty one was specified. */
-    Guid id(aId);
-    if (id.isEmpty())
-        id.create();
 
     GuestOSType *osType = NULL;
@@ -1602 +1684 @@
                        osType,
                        id,
-                       !!forceOverwrite);
+                       fForceOverwrite,
+                       fDirectoryIncludesUUID);
     if (SUCCEEDED(rc))
     {