Changeset 18132 in vbox for trunk/src

Timestamp:

Mar 23, 2009 11:16:29 AM (16 years ago)

Author:

vboxsync

Message:

FE/Qt4-OVF: Check all target files if they exists & get confirmation from the user to overwrite them.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• include/VBoxExportApplianceWzd.h (modified) (2 diffs)
• include/VBoxProblemReporter.h (modified) (1 diff)
• src/VBoxExportApplianceWzd.cpp (modified) (4 diffs)
• src/VBoxProblemReporter.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/include/VBoxExportApplianceWzd.h

@@ -29 +29 @@
 
 class QIWidgetValidator;
+class CAppliance;
 
 class VBoxExportApplianceWzd : public QIWithRetranslateUI<QIAbstractWizard>,
@@ -52 +53 @@
 private:
     void addListViewVMItems (const QString& aSelectName);
-    bool exportVMs();
+    bool prepareForExportVMs (CAppliance &aAppliance);
+    bool exportVMs (CAppliance &aAppliance);
 
     /* Private member vars */

trunk/src/VBox/Frontends/VirtualBox/include/VBoxProblemReporter.h

@@ -148 +148 @@
     /* Generic problem handlers */
     bool askForOverridingFileIfExists (const QString& path, QWidget *aParent = NULL) const;
+    bool askForOverridingFilesIfExists (const QStringList& aPaths, QWidget *aParent /* = NULL */) const;
 
     /* Special problem handlers */

trunk/src/VBox/Frontends/VirtualBox/src/VBoxExportApplianceWzd.cpp

@@ -131 +131 @@
 void VBoxExportApplianceWzd::accept()
 {
-    /* Check if the file exists already, if yes get confirmation for
-     * overwriting from the user. */
-    if (!vboxProblem().askForOverridingFileIfExists (mFileSelector->path(), this))
-        return;
-    /* Export the VMs, on success we are finished */
-    if (exportVMs())
-        QIAbstractWizard::accept();
+    CAppliance appliance;
+    /* Prepare the export of the VM's. */
+    if (prepareForExportVMs (appliance))
+    {
+        QFileInfo fi (mFileSelector->path());
+        QStringList files;
+        files << mFileSelector->path();
+        /* We need to know every filename which will be created, so that we can
+         * ask the user for confirmation of overwriting. For that we iterating
+         * over all virtual systems & fetch all descriptions of the type
+         * HardDiskImage. */
+        CVirtualSystemDescriptionVector vsds = appliance.GetVirtualSystemDescriptions();
+        for (int i=0; i < vsds.size(); ++i)
+        {
+            QVector<KVirtualSystemDescriptionType> types;
+            QVector<QString> refs, origValues, configValues, extraConfigValues;
+
+            vsds[i].GetDescriptionByType (KVirtualSystemDescriptionType_HardDiskImage, types, refs, origValues, configValues, extraConfigValues);
+            foreach (const QString &s, origValues)
+                files << QString ("%1/%2").arg (fi.absolutePath()).arg (s);
+        }
+        /* Check if the file exists already, if yes get confirmation for
+         * overwriting from the user. */
+        if (!vboxProblem().askForOverridingFilesIfExists (files, this))
+            return;
+        /* Export the VMs, on success we are finished */
+        if (exportVMs(appliance))
+            QIAbstractWizard::accept();
+    }
 }
 
@@ -214 +236 @@
 }
 
-bool VBoxExportApplianceWzd::exportVMs()
+bool VBoxExportApplianceWzd::prepareForExportVMs (CAppliance &aAppliance)
 {
     CVirtualBox vbox = vboxGlobal().virtualBox();
     /* Create a appliance object */
-    CAppliance appliance = vbox.CreateAppliance();
-    bool fResult = appliance.isOk();
+    aAppliance = vbox.CreateAppliance();
+    bool fResult = aAppliance.isOk();
     if (fResult)
     {
@@ -234 +256 @@
             {
                 /* Add the export description to our appliance object */
-                m.Export (appliance);
+                m.Export (aAppliance);
                 fResult = m.isOk();
                 if (!fResult)
                 {
-                    vboxProblem().cannotExportAppliance (m, &appliance, this);
+                    vboxProblem().cannotExportAppliance (m, &aAppliance, this);
                     return false;
                 }
@@ -245 +267 @@
                 break;
         }
-        /* Proceed if there where no errors */
-        if (fResult)
-        {
-            /* Write the appliance */
-            CProgress progress = appliance.Write (mFileSelector->path());
-            fResult = appliance.isOk();
-            if (fResult)
-            {
-                /* Show some progress, so the user know whats going on */
-                vboxProblem().showModalProgressDialog (progress, tr ("Exporting Appliance ..."), this);
-                if (!progress.isOk() || progress.GetResultCode() != 0)
-                {
-                    vboxProblem().cannotExportAppliance (progress, &appliance, this);
-                    return false;
-                }
-                else
-                    return true;
-            }
-        }
     }
     if (!fResult)
-        vboxProblem().cannotExportAppliance (&appliance, this);
-
+        vboxProblem().cannotExportAppliance (&aAppliance, this);
+    return fResult;
+}
+
+bool VBoxExportApplianceWzd::exportVMs (CAppliance &aAppliance)
+{
+    /* Write the appliance */
+    CProgress progress = aAppliance.Write (mFileSelector->path());
+    bool fResult = aAppliance.isOk();
+    if (fResult)
+    {
+        /* Show some progress, so the user know whats going on */
+        vboxProblem().showModalProgressDialog (progress, tr ("Exporting Appliance ..."), this);
+        if (!progress.isOk() || progress.GetResultCode() != 0)
+        {
+            vboxProblem().cannotExportAppliance (progress, &aAppliance, this);
+            return false;
+        }
+        else
+            return true;
+    }
+    if (!fResult)
+        vboxProblem().cannotExportAppliance (&aAppliance, this);
     return false;
 }

trunk/src/VBox/Frontends/VirtualBox/src/VBoxProblemReporter.cpp

@@ -452 +452 @@
 }
 
+bool VBoxProblemReporter::askForOverridingFilesIfExists (const QStringList& aPaths, QWidget *aParent /* = NULL */) const
+{
+    QStringList existingFiles;
+    foreach (const QString &file, aPaths)
+    {
+        QFileInfo fi (file);
+        if (fi.exists())
+            existingFiles << fi.absoluteFilePath();
+    }
+    if (existingFiles.size() == 1)
+        /* If it is only one file use the single question versions above */
+        return askForOverridingFileIfExists (existingFiles.at (0), aParent);
+    else if (existingFiles.size() > 1)
+        return messageYesNo (aParent, Question, tr ("The following files exists already:<br /><br />%1<br /><br />Are you sure you want to replace them? Replacing them will overwrite there contents.").arg (existingFiles.join ("<br />")));
+    else
+        return true;
+}
 // Special Problem handlers
 /////////////////////////////////////////////////////////////////////////////