Changeset 78701 in vbox for trunk/src/VBox

Timestamp:

May 23, 2019 5:02:30 PM (6 years ago)

Author:

vboxsync

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

130779

Message:

FE/Qt: bugref:9470: Networking stuff: Rework GA network customer to download image to .tmp file first and then rename it carefully with rewriting confirmation if required.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/net/UIDownloaderAdditions.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/net/UIDownloaderAdditions.cpp

@@ -59 +59 @@
     const QString strSource = strSourcePath + strSourceName;
     const QString strPathSHA256SumsFile = QString("https://www.virtualbox.org/download/hashes/%1/SHA256SUMS").arg(strVersion);
-    const QString strTarget = QDir(vboxGlobal().homeFolder()).absoluteFilePath(strSourceName);
+    const QString strTarget = QDir(vboxGlobal().homeFolder()).absoluteFilePath(QString("%1.tmp").arg(strSourceName));
 
     /* Set source/target: */
@@ -144 +144 @@
     }
 
-    /* Serialize that buffer into the file: */
+    /* Make sure temporary file exists.  If we have
+     * reached this place, it's already written and verified. */
+    const QString strTempFilename = target();
+    if (!QFile::exists(strTempFilename))
+    {
+        /* But still we are providing a failsafe.
+         * Since we can try to write it again. */
+        QFile file(strTempFilename);
+        if (!file.open(QIODevice::WriteOnly))
+            AssertFailedReturnVoid();
+        file.write(m_receivedData);
+    }
+
+    /* Rename temporary file to target one.  This can require a number
+     * of tries to let user choose the place to save file to. */
+    QString strNetTarget = target();
+    strNetTarget.remove(QRegExp("\\.tmp$"));
+    setTarget(strNetTarget);
     while (true)
     {
-        /* Make sure the file already exists.  If we reached
-         * this place, it's already written and checked. */
-        QFile file(target());
-        bool fSuccess = false;
-        /* Check step. Try to open file for reading first. */
-        if (file.open(QIODevice::ReadOnly))
-            fSuccess = true;
-        /* Failsafe step. Try to open file for writing otherwise. */
-        if (!fSuccess && file.open(QIODevice::WriteOnly))
-        {
-            /* Write buffer into the file: */
-            file.write(m_receivedData);
-            file.close();
-            fSuccess = true;
-        }
-        /* If the file already exists or was just written: */
-        if (fSuccess)
-        {
-            /* Warn the user about additions-image loaded and saved, propose to mount it: */
+        /* Make sure target file doesn't exist: */
+        bool fTargetFileExists = QFile::exists(target());
+        if (fTargetFileExists)
+        {
+            /* We should ask user about file rewriting (or exit otherwise): */
+            if (!msgCenter().confirmOverridingFile(QDir::toNativeSeparators(target())))
+                break;
+            /* And remove file if rewriting confirmed: */
+            if (QFile::remove(target()))
+                fTargetFileExists = false;
+        }
+
+        /* Try to rename temporary file to target one (would fail if target file still exists): */
+        const bool fFileRenamed = !fTargetFileExists && QFile::rename(strTempFilename, target());
+
+        /* If file renamed: */
+        if (fFileRenamed)
+        {
+            /* Warn the user about additions-image downloaded and saved, propose to mount it (and/or exit in any case): */
             if (msgCenter().proposeMountGuestAdditions(source().toString(), QDir::toNativeSeparators(target())))
                 emit sigDownloadFinished(target());
             break;
         }
-
-        /* Warn the user about additions-image was downloaded but was NOT saved: */
-        msgCenter().cannotSaveGuestAdditions(source().toString(), QDir::toNativeSeparators(target()));
-
-        /* Ask the user for another location for the additions-image file: */
-        QString strTarget = QIFileDialog::getExistingDirectory(QFileInfo(target()).absolutePath(),
-                                                               windowManager().networkManagerOrMainWindowShown(),
-                                                               tr("Select folder to save Guest Additions image to"), true);
-
-        /* Check if user had really set a new target: */
-        if (!strTarget.isNull())
-            setTarget(QDir(strTarget).absoluteFilePath(QFileInfo(target()).fileName()));
         else
-            break;
-    }
-}
-
+        {
+            /* Warn the user about additions-image was downloaded but was NOT saved: */
+            msgCenter().cannotSaveGuestAdditions(source().toString(), QDir::toNativeSeparators(target()));
+            /* Ask the user for another location for the additions-image file: */
+            const QString strTarget = QIFileDialog::getExistingDirectory(QFileInfo(target()).absolutePath(),
+                                                                         windowManager().networkManagerOrMainWindowShown(),
+                                                                         tr("Select folder to save Guest Additions image to"), true);
+
+            /* Check if user had really set a new target (and exit in opposite case): */
+            if (!strTarget.isNull())
+                setTarget(QDir(strTarget).absoluteFilePath(QFileInfo(target()).fileName()));
+            else
+                break;
+        }
+    }
+}