Enrich the document of QCefDownloadItem::start and fix a bug of empty…

… suggested file name
CefView · Jul 29, 2023 · 2f433cb · 2f433cb
1 parent 87ac1cd
commit 2f433cb
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 3 deletions.
diff --git a/include/QCefDownloadItem.h b/include/QCefDownloadItem.h
@@ -49,6 +49,11 @@ class QCEFVIEW_EXPORT QCefDownloadItem
   /// </summary>
   /// <param name="path">The full path name (must include file name) to save the downloaded item</param>
   /// <param name="useDefaultDialog">Whether to use the default 'Save As...' dialog or not</param>
+  /// <remarks>
+  /// The 'path' parameter only works when 'useDefaultDialog' is set to false.
+  /// If you set 'useDefaultDialog' to true then you cannot control the initial
+  /// locatio nof the opened 'Save As...' dialog, it is determined by CEF internal implementation.
+  /// </remarks>
   void start(const QString& path, bool useDefaultDialog = true) const;
 
   /// <summary>

diff --git a/src/details/CCefClientDelegate_DownloadHandler.cpp b/src/details/CCefClientDelegate_DownloadHandler.cpp
@@ -48,13 +48,17 @@ CCefClientDelegate::onBeforeDownload(CefRefPtr<CefBrowser> browser,
       item = QCefDownloadItemPrivate::create(shared_from_this());
     }
 
+    // set suggested file name
+    auto suggestedFileName = QString::fromStdString(suggested_name);
+    QCefDownloadItemPrivate::setSuggestedName(item.data(), suggestedFileName);
+
     // update
     QCefDownloadItemPrivate::update(item.data(), *(download_item.get()));
     QCefDownloadItemPrivate::setBeforeDownloadCallback(item.data(), callback);
 
     // notify user of the new download item
     weakRefItem = item;
-    pCefViewPrivate_->onNewDownloadItem(item, QString::fromStdString(suggested_name));
+    pCefViewPrivate_->onNewDownloadItem(item, suggestedFileName);
     item.reset();
   }
 

diff --git a/src/details/QCefDownloadItemPrivate.cpp b/src/details/QCefDownloadItemPrivate.cpp
@@ -12,6 +12,13 @@ QCefDownloadItemPrivate::create(CCefClientDelegate::RefPtr handler)
   return QSharedPointer<QCefDownloadItem>(new QCefDownloadItem(), &QCefDownloadItemPrivate::destroy);
 }
 
+void
+QCefDownloadItemPrivate::setSuggestedName(QCefDownloadItem* item, const QString& suggestedFileName)
+{
+  auto p = item->d_ptr.data();
+  p->suggestedFileName = suggestedFileName;
+}
+
 void
 QCefDownloadItemPrivate::update(QCefDownloadItem* item, CefDownloadItem& cefItem)
 {
@@ -49,9 +56,19 @@ QCefDownloadItemPrivate::update(QCefDownloadItem* item, CefDownloadItem& cefItem
   p->fullPath = QString::fromStdString(cefItem.GetFullPath().ToString());
   p->url = QString::fromStdString(cefItem.GetURL().ToString());
   p->originalUrl = QString::fromStdString(cefItem.GetOriginalUrl().ToString());
-  p->suggestedFileName = QString::fromStdString(cefItem.GetSuggestedFileName().ToString());
-  p->contentDisposition = QString::fromStdString(cefItem.GetContentDisposition().ToString());
   p->mimeType = QString::fromStdString(cefItem.GetMimeType().ToString());
+
+  // update suggested name if not empty
+  auto suggestedFileName = QString::fromStdString(cefItem.GetSuggestedFileName().ToString());
+  if (!suggestedFileName.isEmpty()) {
+    p->suggestedFileName = suggestedFileName;
+  }
+
+  // update content disposition if not empty
+  auto contentDisposition = QString::fromStdString(cefItem.GetContentDisposition().ToString());
+  if (!contentDisposition.isEmpty()) {
+    p->contentDisposition = contentDisposition;
+  }
 }
 
 void

diff --git a/src/details/QCefDownloadItemPrivate.h b/src/details/QCefDownloadItemPrivate.h
@@ -44,6 +44,8 @@ class QCefDownloadItemPrivate
 public:
   static QSharedPointer<QCefDownloadItem> create(CCefClientDelegate::RefPtr handler);
 
+  static void setSuggestedName(QCefDownloadItem* item, const QString& suggestedFileName);
+
   static void update(QCefDownloadItem* item, CefDownloadItem& cefItem);
 
   static void setBeforeDownloadCallback(QCefDownloadItem* item,