Changeset 173154 in webkit

Timestamp:

Sep 1, 2014 1:35:52 AM (10 years ago)

Author:

commit-queue@webkit.org

Message:

[SOUP] WebKitDownload cannot overwrite existing file
​https://bugs.webkit.org/show_bug.cgi?id=136322

Patch by Michael Catanzaro <Michael Catanzaro> on 2014-09-01
Reviewed by Carlos Garcia Campos.

• Shared/Downloads/soup/DownloadSoup.cpp:

(WebKit::DownloadClient::didReceiveResponse): pass a member variable
to Download::decideDestinationWithSuggestedFilename instead of a
temporary bool, so we can use the result in didFinishLoading.
(WebKit::DownloadClient::didFinishLoading): overwrite the destination
if Download::decideDestinationWithSuggestedFilename determined we
should do so.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Shared/Downloads/soup/DownloadSoup.cpp (modified) (4 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-09-01  Michael Catanzaro  <mcatanzaro@igalia.com>
+
+        [SOUP] WebKitDownload cannot overwrite existing file
+        https://bugs.webkit.org/show_bug.cgi?id=136322
+
+        Reviewed by Carlos Garcia Campos.
+
+        * Shared/Downloads/soup/DownloadSoup.cpp:
+        (WebKit::DownloadClient::didReceiveResponse): pass a member variable
+        to Download::decideDestinationWithSuggestedFilename instead of a
+        temporary bool, so we can use the result in didFinishLoading.
+        (WebKit::DownloadClient::didFinishLoading): overwrite the destination
+        if Download::decideDestinationWithSuggestedFilename determined we
+        should do so.
+
 2014-08-31  Tim Horton  <timothy_horton@apple.com>
 

trunk/Source/WebKit2/Shared/Downloads/soup/DownloadSoup.cpp

@@ -51 +51 @@
     DownloadClient(Download* download)
         : m_download(download)
+        , m_allowOverwrite(false)
     {
     }
@@ -89 +90 @@
         }
 
-        bool overwrite;
-        m_destinationURI = m_download->decideDestinationWithSuggestedFilename(suggestedFilename, overwrite);
+        m_destinationURI = m_download->decideDestinationWithSuggestedFilename(suggestedFilename, m_allowOverwrite);
         if (m_destinationURI.isEmpty()) {
 #if PLATFORM(GTK)
@@ -138 +138 @@
         GRefPtr<GFile> destinationFile = adoptGRef(g_file_new_for_uri(m_destinationURI.utf8().data()));
         GUniqueOutPtr<GError> error;
-        if (!g_file_move(m_intermediateFile.get(), destinationFile.get(), G_FILE_COPY_NONE, nullptr, nullptr, nullptr, &error.outPtr())) {
+        if (!g_file_move(m_intermediateFile.get(), destinationFile.get(), m_allowOverwrite ? G_FILE_COPY_OVERWRITE : G_FILE_COPY_NONE, nullptr, nullptr, nullptr, &error.outPtr())) {
             downloadFailed(platformDownloadDestinationError(m_response, error->message));
             return;
@@ -198 +198 @@
     ResourceResponse m_delayedResponse;
     GMainLoopSource m_handleResponseLater;
+    bool m_allowOverwrite;
 };