Changeset 33344 in vbox for trunk/src

Timestamp:

Oct 22, 2010 11:52:30 AM (14 years ago)

Author:

vboxsync

Message:

Main-OVF: Select the target format out of the available formats.

Location:

trunk/src/VBox/Main

Files:

• ApplianceImplImport.cpp (modified) (6 diffs)
• SystemPropertiesImpl.cpp (modified) (1 diff)
• include/SystemPropertiesImpl.h (modified) (1 diff)

trunk/src/VBox/Main/ApplianceImplImport.cpp

@@ -1675 +1675 @@
                        strTargetPath.c_str());
 
-    const Utf8Str &strSourceOVF = di.strHref;
-
-    // construct source file path
-    Utf8StrFmt strSrcFilePath("%s%c%s", stack.strSourceDir.c_str(), RTPATH_DELIMITER, strSourceOVF.c_str());
-
-    // subprogress object for hard disk
-    ComPtr<IProgress> pProgress2;
-
-    /**************** Check */
-    ComObjPtr<Progress> pProgress3;
-    pProgress3.createObject();
-    HRESULT rc = pProgress3->init(mVirtualBox, static_cast<IAppliance*>(this), BstrFmt(tr("Creating medium")).raw(), TRUE);
-    //        rc = pProgress3->init(mVirtualBox, static_cast<IAppliance*>(this), BstrFmt(tr("Creating medium '%s'"), strTargetFilePath.c_str()).raw(), TRUE);
+    ComObjPtr<Progress> pProgress;
+    pProgress.createObject();
+    HRESULT rc = pProgress->init(mVirtualBox, static_cast<IAppliance*>(this), BstrFmt(tr("Creating medium '%s'"), strTargetPath.c_str()).raw(), TRUE);
     if (FAILED(rc)) throw rc;
-    /**************** Check */
-
-    /* Figure out which format the user like to have. Default is VMDK. */
-    Utf8Str strFormat = "VMDK";
-    if (strTargetPath.endsWith("vdi", Utf8Str::CaseInsensitive))
-        strFormat = "VDI";
-    else if (strTargetPath.endsWith("vhd", Utf8Str::CaseInsensitive))
-        strFormat = "VHD";
+
+    Utf8Str strTrgFormat = "VMDK";
+    SystemProperties *pSysProps = mVirtualBox->getSystemProperties();
+    if (RTPathHaveExt(strTargetPath.c_str()))
+    {
+        char *pszExt = RTPathExt(strTargetPath.c_str());
+        /* Figure out which format the user like to have. Default is VMDK. */
+        ComObjPtr<MediumFormat> targetFormat = pSysProps->mediumFormatFromExtension(&pszExt[1]);
+        if (targetFormat.isNull())
+            throw setError(VBOX_E_NOT_SUPPORTED,
+                           tr("Could not find a valid medium format for the target disk '%s'"),
+                           strTargetPath.c_str());
+        Bstr bstrFormatName;
+        rc = targetFormat->COMGETTER(Name)(bstrFormatName.asOutParam());
+        if (FAILED(rc)) throw rc;
+        strTrgFormat = Utf8Str(bstrFormatName);
+    }
 
     bool fNeedsGlobalSaveSettings;
@@ -1702 +1701 @@
     pTargetHD.createObject();
     rc = pTargetHD->init(mVirtualBox,
-                         strFormat,
+                         strTrgFormat,
                          strTargetPath,
                          Guid::Empty,        // media registry
@@ -1714 +1713 @@
     if (FAILED(rc)) throw rc;
 
+    const Utf8Str &strSourceOVF = di.strHref;
+    // construct source file path
+    Utf8StrFmt strSrcFilePath("%s%c%s", stack.strSourceDir.c_str(), RTPATH_DELIMITER, strSourceOVF.c_str());
+
     /* If strHref is empty we have to create a new file */
     if (strSourceOVF.isEmpty())
     {
         // create a dynamic growing disk image with the given capacity
-        rc = pTargetHD->CreateBaseStorage(di.iCapacity / _1M, MediumVariant_Standard, pProgress2.asOutParam());
+        rc = pTargetHD->CreateBaseStorage(di.iCapacity / _1M, MediumVariant_Standard, ComPtr<IProgress>(pProgress).asOutParam());
         if (FAILED(rc)) throw rc;
 
@@ -1734 +1737 @@
             Utf8Str strSrcFormat = "VDI";
             if (   di.strFormat.compare("http://www.vmware.com/specifications/vmdk.html#sparse", Utf8Str::CaseInsensitive)
-                   || di.strFormat.compare("http://www.vmware.com/interfaces/specifications/vmdk.html#streamOptimized", Utf8Str::CaseInsensitive)
-                   || di.strFormat.compare("http://www.vmware.com/specifications/vmdk.html#compressed", Utf8Str::CaseInsensitive)
-                   || di.strFormat.compare("http://www.vmware.com/interfaces/specifications/vmdk.html#compressed", Utf8Str::CaseInsensitive)
+                || di.strFormat.compare("http://www.vmware.com/interfaces/specifications/vmdk.html#streamOptimized", Utf8Str::CaseInsensitive)
+                || di.strFormat.compare("http://www.vmware.com/specifications/vmdk.html#compressed", Utf8Str::CaseInsensitive)
+                || di.strFormat.compare("http://www.vmware.com/interfaces/specifications/vmdk.html#compressed", Utf8Str::CaseInsensitive)
                )
-                strSrcFormat = "VMDK";
-            SystemProperties *pSysProps = mVirtualBox->getSystemProperties();
-            AutoReadLock propsLock(pSysProps COMMA_LOCKVAL_SRC_POS);
+                strSrcFormat = "VMDK1";
             format = pSysProps->mediumFormat(strSrcFormat);
             if (format.isNull())
                 throw setError(VBOX_E_NOT_SUPPORTED,
-                               tr("Invalid medium storage format"));
+                               tr("Could not find a valid medium format for the source disk '%s'"),
+                               RTPathFilename(strSrcFilePath.c_str()));
         }
 
@@ -1754 +1756 @@
                                    pCallbacks, pStorage,
                                    nullParent,
-                                   pProgress3);
+                                   pProgress);
 
         /* Advance to the next operation */
@@ -1762 +1764 @@
 
     // now wait for the background disk operation to complete; this throws HRESULTs on error
-    ComPtr<IProgress> pp(pProgress3);
+    ComPtr<IProgress> pp(pProgress);
     waitForAsyncProgress(stack.pProgress, pp);
 

trunk/src/VBox/Main/SystemPropertiesImpl.cpp

@@ -850 +850 @@
 }
 
+/**
+ * Returns a medium format object corresponding to the given file extension or
+ * null if no such format.
+ *
+ * @param aExt   File extension.
+ *
+ * @return ComObjPtr<MediumFormat>
+ */
+ComObjPtr<MediumFormat> SystemProperties::mediumFormatFromExtension(const Utf8Str &aExt)
+{
+    ComObjPtr<MediumFormat> format;
+
+    AutoCaller autoCaller(this);
+    AssertComRCReturn (autoCaller.rc(), format);
+
+    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
+
+    bool fFound = false;
+    for (MediumFormatList::const_iterator it = m_llMediumFormats.begin();
+         it != m_llMediumFormats.end() && !fFound;
+         ++it)
+    {
+        /* MediumFormat is all const, no need to lock */
+        MediumFormat::StrList aFileList = (*it)->getFileExtensions();
+        for (MediumFormat::StrList::const_iterator it1 = aFileList.begin();
+             it1 != aFileList.end();
+             ++it1)
+        {
+            if ((*it1).compare(aExt, Utf8Str::CaseInsensitive) == 0)
+            {
+                format = *it;
+                fFound = true;
+                break;
+            }
+        }
+    }
+
+    return format;
+}
+
 // private methods
 /////////////////////////////////////////////////////////////////////////////

trunk/src/VBox/Main/include/SystemPropertiesImpl.h

@@ -107 +107 @@
 
     ComObjPtr<MediumFormat> mediumFormat(const Utf8Str &aFormat);
+    ComObjPtr<MediumFormat> mediumFormatFromExtension(const Utf8Str &aExt);
 
     // public methods for internal purposes only