Changeset 28150 in vbox for trunk/src/VBox/Main

Timestamp:

Apr 9, 2010 3:58:10 PM (15 years ago)

Author:

vboxsync

Message:

Main/OVF: use readable disk names instead of UUIDs on export, better progress message

File:

• trunk/src/VBox/Main/ApplianceImplExport.cpp (modified) (4 diffs)

trunk/src/VBox/Main/ApplianceImplExport.cpp

@@ -318 +318 @@
                 strLocation = bstrLocation;
 
-                Bstr bstrName;
-                rc = pMedium->COMGETTER(Name)(bstrName.asOutParam());
-                if (FAILED(rc)) throw rc;
-
-                strTargetVmdkName = bstrName;
-                strTargetVmdkName.stripExt();
-                strTargetVmdkName.append(".vmdk");
-
-                // we need the size of the image so we can give it to addEntry();
-                // later, on export, the progress weight will be based on this.
-                // pMedium can be a differencing image though; in that case, we
-                // need to use the size of the base instead.
+                // find the source's base medium for two things:
+                // 1) we'll use its name to determine the name of the target disk, which is readable,
+                //    as opposed to the UUID filename of a differencing image, if pMedium is one
+                // 2) we need the size of the base image so we can give it to addEntry(), and later
+                //    on export, the progress will be based on that (and not the diff image)
                 ComPtr<IMedium> pBaseMedium;
                 rc = pMedium->COMGETTER(Base)(pBaseMedium.asOutParam());
                         // returns pMedium if there are no diff images
                 if (FAILED(rc)) throw rc;
+
+                Bstr bstrBaseName;
+                rc = pBaseMedium->COMGETTER(Name)(bstrBaseName.asOutParam());
+                if (FAILED(rc)) throw rc;
+
+                strTargetVmdkName = bstrBaseName;
+                strTargetVmdkName.stripExt();
+                strTargetVmdkName.append(".vmdk");
 
                 // force reading state, or else size will be returned as 0
@@ -1407 +1408 @@
                                strSrcFilePath.c_str());
 
+            // clone the disk:
+            ComPtr<IMedium> pSourceDisk;
+            ComPtr<IMedium> pTargetDisk;
+            ComPtr<IProgress> pProgress2;
+
+            Log(("Finding source disk \"%ls\"\n", bstrSrcFilePath.raw()));
+            rc = mVirtualBox->FindHardDisk(bstrSrcFilePath, pSourceDisk.asOutParam());
+            if (FAILED(rc)) throw rc;
+
+            Bstr uuidSource;
+            rc = pSourceDisk->COMGETTER(Id)(uuidSource.asOutParam());
+            if (FAILED(rc)) throw rc;
+            Guid guidSource(uuidSource);
+
             // output filename
             const Utf8Str &strTargetFileNameOnly = pDiskEntry->strOvf;
@@ -1415 +1430 @@
             strTargetFilePath.append(strTargetFileNameOnly);
 
-            // clone the disk:
-            ComPtr<IMedium> pSourceDisk;
-            ComPtr<IMedium> pTargetDisk;
-            ComPtr<IProgress> pProgress2;
-
-            Log(("Finding source disk \"%ls\"\n", bstrSrcFilePath.raw()));
-            rc = mVirtualBox->FindHardDisk(bstrSrcFilePath, pSourceDisk.asOutParam());
-            if (FAILED(rc)) throw rc;
-
-            Bstr uuidSource;
-            rc = pSourceDisk->COMGETTER(Id)(uuidSource.asOutParam());
-            if (FAILED(rc)) throw rc;
-            Guid guidSource(uuidSource);
-
             // We are always exporting to VMDK stream optimized for now
             Bstr bstrSrcFormat = L"VMDK";
@@ -1447 +1448 @@
                 // advance to the next operation
                 if (!pProgress.isNull())
-                    pProgress->SetNextOperation(BstrFmt(tr("Exporting virtual disk image '%s'"), strSrcFilePath.c_str()),
+                    pProgress->SetNextOperation(BstrFmt(tr("Exporting to disk image '%s'"), strTargetFilePath.c_str()),
                                                 pDiskEntry->ulSizeMB);     // operation's weight, as set up with the IProgress originally);