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

Timestamp:

Oct 25, 2010 12:32:50 PM (14 years ago)

Author:

vboxsync

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

67007

Message:

FE;Main;OVF: On export name the disks like the ovf + disk + number.

File:

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

trunk/src/VBox/Main/ApplianceImpl.cpp

@@ -854 +854 @@
 }
 
-void Appliance::parseURI(Utf8Str strUri, LocationInfo &locInfo) const
+void Appliance::parseBucket(Utf8Str &aPath, Utf8Str &aBucket)
+{
+    /* Buckets are S3 specific. So parse the bucket out of the file path */
+    if (!aPath.startsWith("/"))
+        throw setError(E_INVALIDARG,
+                       tr("The path '%s' must start with /"), aPath.c_str());
+    size_t bpos = aPath.find("/", 1);
+    if (bpos != Utf8Str::npos)
+    {
+        aBucket = aPath.substr(1, bpos - 1); /* The bucket without any slashes */
+        aPath = aPath.substr(bpos); /* The rest of the file path */
+    }
+    /* If there is no bucket name provided reject it */
+    if (aBucket.isEmpty())
+        throw setError(E_INVALIDARG,
+                       tr("You doesn't provide a bucket name in the URI '%s'"), aPath.c_str());
+}
+
+/**
+ *
+ * @return
+ */
+int Appliance::TaskOVF::startThread()
+{
+    int vrc = RTThreadCreate(NULL, Appliance::taskThreadImportOrExport, this,
+                             0, RTTHREADTYPE_MAIN_HEAVY_WORKER, 0,
+                             "Appliance::Task");
+
+    if (RT_FAILURE(vrc))
+        return Appliance::setErrorStatic(E_FAIL,
+                                         Utf8StrFmt("Could not create OVF task thread (%Rrc)\n", vrc));
+
+    return S_OK;
+}
+
+/**
+ * Thread function for the thread started in Appliance::readImpl() and Appliance::importImpl()
+ * and Appliance::writeImpl().
+ * This will in turn call Appliance::readFS() or Appliance::readS3() or Appliance::importFS()
+ * or Appliance::importS3() or Appliance::writeFS() or Appliance::writeS3().
+ *
+ * @param aThread
+ * @param pvUser
+ */
+/* static */
+DECLCALLBACK(int) Appliance::taskThreadImportOrExport(RTTHREAD /* aThread */, void *pvUser)
+{
+    std::auto_ptr<TaskOVF> task(static_cast<TaskOVF*>(pvUser));
+    AssertReturn(task.get(), VERR_GENERAL_FAILURE);
+
+    Appliance *pAppliance = task->pAppliance;
+
+    LogFlowFuncEnter();
+    LogFlowFunc(("Appliance %p\n", pAppliance));
+
+    HRESULT taskrc = S_OK;
+
+    switch (task->taskType)
+    {
+        case TaskOVF::Read:
+            if (task->locInfo.storageType == VFSType_File)
+                taskrc = pAppliance->readFS(task.get());
+            else if (task->locInfo.storageType == VFSType_S3)
+                taskrc = pAppliance->readS3(task.get());
+        break;
+
+        case TaskOVF::Import:
+            if (task->locInfo.storageType == VFSType_File)
+                taskrc = pAppliance->importFS(task.get());
+            else if (task->locInfo.storageType == VFSType_S3)
+                taskrc = pAppliance->importS3(task.get());
+        break;
+
+        case TaskOVF::Write:
+            if (task->locInfo.storageType == VFSType_File)
+                taskrc = pAppliance->writeFS(task.get());
+            else if (task->locInfo.storageType == VFSType_S3)
+                taskrc = pAppliance->writeS3(task.get());
+        break;
+    }
+
+    task->rc = taskrc;
+
+    if (!task->pProgress.isNull())
+        task->pProgress->notifyComplete(taskrc);
+
+    LogFlowFuncLeave();
+
+    return VINF_SUCCESS;
+}
+
+/* static */
+int Appliance::TaskOVF::updateProgress(unsigned uPercent, void *pvUser)
+{
+    Appliance::TaskOVF* pTask = *(Appliance::TaskOVF**)pvUser;
+
+    if (    pTask
+         && !pTask->pProgress.isNull())
+    {
+        BOOL fCanceled;
+        pTask->pProgress->COMGETTER(Canceled)(&fCanceled);
+        if (fCanceled)
+            return -1;
+        pTask->pProgress->SetCurrentOperationProgress(uPercent);
+    }
+    return VINF_SUCCESS;
+}
+
+void parseURI(Utf8Str strUri, LocationInfo &locInfo)
 {
     /* Check the URI for the protocol */
@@ -901 +1009 @@
 }
 
-void Appliance::parseBucket(Utf8Str &aPath, Utf8Str &aBucket)
-{
-    /* Buckets are S3 specific. So parse the bucket out of the file path */
-    if (!aPath.startsWith("/"))
-        throw setError(E_INVALIDARG,
-                       tr("The path '%s' must start with /"), aPath.c_str());
-    size_t bpos = aPath.find("/", 1);
-    if (bpos != Utf8Str::npos)
-    {
-        aBucket = aPath.substr(1, bpos - 1); /* The bucket without any slashes */
-        aPath = aPath.substr(bpos); /* The rest of the file path */
-    }
-    /* If there is no bucket name provided reject it */
-    if (aBucket.isEmpty())
-        throw setError(E_INVALIDARG,
-                       tr("You doesn't provide a bucket name in the URI '%s'"), aPath.c_str());
-}
-
-/**
- *
- * @return
- */
-int Appliance::TaskOVF::startThread()
-{
-    int vrc = RTThreadCreate(NULL, Appliance::taskThreadImportOrExport, this,
-                             0, RTTHREADTYPE_MAIN_HEAVY_WORKER, 0,
-                             "Appliance::Task");
-
-    if (RT_FAILURE(vrc))
-        return Appliance::setErrorStatic(E_FAIL,
-                                         Utf8StrFmt("Could not create OVF task thread (%Rrc)\n", vrc));
-
-    return S_OK;
-}
-
-/**
- * Thread function for the thread started in Appliance::readImpl() and Appliance::importImpl()
- * and Appliance::writeImpl().
- * This will in turn call Appliance::readFS() or Appliance::readS3() or Appliance::importFS()
- * or Appliance::importS3() or Appliance::writeFS() or Appliance::writeS3().
- *
- * @param aThread
- * @param pvUser
- */
-/* static */
-DECLCALLBACK(int) Appliance::taskThreadImportOrExport(RTTHREAD /* aThread */, void *pvUser)
-{
-    std::auto_ptr<TaskOVF> task(static_cast<TaskOVF*>(pvUser));
-    AssertReturn(task.get(), VERR_GENERAL_FAILURE);
-
-    Appliance *pAppliance = task->pAppliance;
-
-    LogFlowFuncEnter();
-    LogFlowFunc(("Appliance %p\n", pAppliance));
-
-    HRESULT taskrc = S_OK;
-
-    switch (task->taskType)
-    {
-        case TaskOVF::Read:
-            if (task->locInfo.storageType == VFSType_File)
-                taskrc = pAppliance->readFS(task.get());
-            else if (task->locInfo.storageType == VFSType_S3)
-                taskrc = pAppliance->readS3(task.get());
-        break;
-
-        case TaskOVF::Import:
-            if (task->locInfo.storageType == VFSType_File)
-                taskrc = pAppliance->importFS(task.get());
-            else if (task->locInfo.storageType == VFSType_S3)
-                taskrc = pAppliance->importS3(task.get());
-        break;
-
-        case TaskOVF::Write:
-            if (task->locInfo.storageType == VFSType_File)
-                taskrc = pAppliance->writeFS(task.get());
-            else if (task->locInfo.storageType == VFSType_S3)
-                taskrc = pAppliance->writeS3(task.get());
-        break;
-    }
-
-    task->rc = taskrc;
-
-    if (!task->pProgress.isNull())
-        task->pProgress->notifyComplete(taskrc);
-
-    LogFlowFuncLeave();
-
-    return VINF_SUCCESS;
-}
-
-/* static */
-int Appliance::TaskOVF::updateProgress(unsigned uPercent, void *pvUser)
-{
-    Appliance::TaskOVF* pTask = *(Appliance::TaskOVF**)pvUser;
-
-    if (    pTask
-         && !pTask->pProgress.isNull())
-    {
-        BOOL fCanceled;
-        pTask->pProgress->COMGETTER(Canceled)(&fCanceled);
-        if (fCanceled)
-            return -1;
-        pTask->pProgress->SetCurrentOperationProgress(uPercent);
-    }
-    return VINF_SUCCESS;
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 //