Changeset 31676 in vbox for trunk/src/VBox/Main/ApplianceImpl.cpp

Timestamp:

Aug 13, 2010 6:40:53 PM (14 years ago)

Author:

vboxsync

Message:

Main/FE/Qt4: add initial OVA support

File:

• trunk/src/VBox/Main/ApplianceImpl.cpp (modified) (11 diffs)

trunk/src/VBox/Main/ApplianceImpl.cpp

@@ -667 +667 @@
     BOOL fCanceled;
     ULONG currentPercent;
+    ULONG cOp = 0;
     while (SUCCEEDED(pProgressAsync->COMGETTER(Completed(&fCompleted))))
     {
@@ -676 +677 @@
             break;
         }
-
-        rc = pProgressAsync->COMGETTER(Percent(&currentPercent));
+        /* Check if the current operation have changed. It is also possible
+           that in the meantime more than one async operation was finished. So
+           we have to loop as long as we reached the same operation count. */
+        ULONG curOp;
+        for(;;)
+        {
+            rc = pProgressAsync->COMGETTER(Operation(&curOp));
+            if (FAILED(rc)) throw rc;
+            if (cOp != curOp)
+            {
+                Bstr bstr;
+                ULONG currentWeight;
+                rc = pProgressAsync->COMGETTER(OperationDescription(bstr.asOutParam()));
+                if (FAILED(rc)) throw rc;
+                rc = pProgressAsync->COMGETTER(OperationWeight(&currentWeight));
+                if (FAILED(rc)) throw rc;
+                rc = pProgressThis->SetNextOperation(bstr, currentWeight);
+                if (FAILED(rc)) throw rc;
+                ++cOp;
+            }else
+                break;
+        }
+
+        rc = pProgressAsync->COMGETTER(OperationPercent(&currentPercent));
         if (FAILED(rc)) throw rc;
-        if (!pProgressThis.isNull())
-            pProgressThis->SetCurrentOperationProgress(currentPercent);
+        pProgressThis->SetCurrentOperationProgress(currentPercent);
         if (fCompleted)
             break;
@@ -745 +767 @@
 }
 
+#include <iprt/tar.h>
 /**
  * Called from Appliance::importImpl() and Appliance::writeImpl() to set up a
@@ -754 +777 @@
  * @return
  */
-HRESULT Appliance::setUpProgress(ComObjPtr<Progress> &pProgress,
+HRESULT Appliance::setUpProgress(const LocationInfo &locInfo,
+                                 ComObjPtr<Progress> &pProgress,
                                  const Bstr &bstrDescription,
                                  SetUpProgressMode mode)
@@ -785 +809 @@
     }
 
+    bool fOVA = locInfo.strPath.endsWith(".ova", Utf8Str::CaseInsensitive);
     switch (mode)
     {
         case ImportFileNoManifest:
-        break;
-
+        {
+            if (fOVA)
+            {
+                // Another operation for packing
+                ++cOperations;
+
+                // assume that packing the files into the archive has the same weight than creating all files in the ovf exporting step
+                ulTotalOperationsWeight += m->ulTotalDisksMB;
+            }
+            break;
+        }
         case ImportFileWithManifest:
         case WriteFile:
+        {
             ++cOperations;          // another one for creating the manifest
 
-            // assume that checking or creating the manifest will take 10% of the time it takes to export the disks
+            // assume that creating the manifest will take 10% of the time it takes to export the disks
             m->ulWeightForManifestOperation = m->ulTotalDisksMB / 10;
             ulTotalOperationsWeight += m->ulWeightForManifestOperation;
-        break;
-
+            if (fOVA)
+            {
+                // Another operation for packing
+                ++cOperations;
+
+                // assume that packing the files into the archive has the same weight than creating all files in the ovf exporting step
+                ulTotalOperationsWeight += m->ulTotalDisksMB;
+            }
+            break;
+        }
         case ImportS3:
         {
@@ -814 +857 @@
             ULONG ulInitWeight = (ULONG)((double)ulTotalOperationsWeight * 0.1  / 100);  // use 0.1% for init
             ulTotalOperationsWeight += ulInitWeight;
+            break;
         }
-        break;
-
         case WriteS3:
         {
@@ -834 +876 @@
             ULONG ulOVFCreationWeight = (ULONG)((double)ulTotalOperationsWeight * 50.0 / 100.0); /* Use 50% for the creation of the OVF & the disks */
             ulTotalOperationsWeight += ulOVFCreationWeight;
+            break;
         }
-        break;
     }
 
@@ -916 +958 @@
 }
 
-Utf8Str Appliance::manifestFileName(Utf8Str aPath) const
-{
+Utf8Str Appliance::manifestFileName(const Utf8Str& aPath) const
+{
+    Utf8Str strTmpPath = aPath;
     /* Get the name part */
-    char *pszMfName = RTStrDup(RTPathFilename(aPath.c_str()));
+    char *pszMfName = RTStrDup(RTPathFilename(strTmpPath.c_str()));
     /* Strip any extensions */
     RTPathStripExt(pszMfName);
     /* Path without the filename */
-    aPath.stripFilename();
+    strTmpPath.stripFilename();
     /* Format the manifest path */
-    Utf8StrFmt strMfFile("%s/%s.mf", aPath.c_str(), pszMfName);
+    Utf8StrFmt strMfFile("%s/%s.mf", strTmpPath.c_str(), pszMfName);
     RTStrFree(pszMfName);
     return strMfFile;
@@ -973 +1016 @@
         case TaskOVF::Read:
             if (task->locInfo.storageType == VFSType_File)
-                taskrc = pAppliance->readFS(task->locInfo);
+                taskrc = pAppliance->readFS(task->locInfo, task->pProgress);
             else if (task->locInfo.storageType == VFSType_S3)
                 taskrc = pAppliance->readS3(task.get());
@@ -980 +1023 @@
         case TaskOVF::Import:
             if (task->locInfo.storageType == VFSType_File)
-                taskrc = pAppliance->importFS(task->locInfo, task->pProgress);
+                taskrc = pAppliance->importFS(task.get());
             else if (task->locInfo.storageType == VFSType_S3)
                 taskrc = pAppliance->importS3(task.get());
@@ -987 +1030 @@
         case TaskOVF::Write:
             if (task->locInfo.storageType == VFSType_File)
-                taskrc = pAppliance->writeFS(task->locInfo, task->enFormat, task->pProgress);
+                taskrc = pAppliance->writeFS(task.get());
             else if (task->locInfo.storageType == VFSType_S3)
                 taskrc = pAppliance->writeS3(task.get());