Changeset 78668 in vbox for trunk/src

Timestamp:

May 22, 2019 4:39:59 PM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9470: Networking stuff: Make sure particular network customers which download files check whether these files were already saved by RTHttp before trying to overwrite them.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/net

Files:

• UIDownloaderAdditions.cpp (modified) (1 diff)
• UIDownloaderExtensionPack.cpp (modified) (1 diff)
• UIDownloaderUserManual.cpp (modified) (1 diff)

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

@@ -147 +147 @@
     while (true)
     {
-        /* Try to open file for writing: */
+        /* Make sure the file already exists.  If we reached
+         * this place, it's already written and checked. */
         QFile file(target());
-        if (file.open(QIODevice::WriteOnly))
+        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: */
             if (msgCenter().proposeMountGuestAdditions(source().toString(), QDir::toNativeSeparators(target())))

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

@@ -149 +149 @@
     while (true)
     {
-        /* Try to open file for writing: */
+        /* Make sure the file already exists.  If we reached
+         * this place, it's already written and checked. */
         QFile file(target());
-        if (file.open(QIODevice::WriteOnly))
+        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 listener about extension-pack was downloaded: */
             emit sigDownloadFinished(source().toString(), target(), strCalculatedSumm);

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

@@ -90 +90 @@
     while (true)
     {
-        /* Try to open file for writing: */
+        /* Make sure the file already exists.  If we reached
+         * this place, it's already written and checked. */
         QFile file(target());
-        if (file.open(QIODevice::WriteOnly))
+        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(receivedData);
             file.close();
-
+            fSuccess = true;
+        }
+        /* If the file already exists or was just written: */
+        if (fSuccess)
+        {
             /* Warn the user about user-manual loaded and saved: */
             msgCenter().warnAboutUserManualDownloaded(source().toString(), QDir::toNativeSeparators(target()));