Add methods to allow adding resource mapping item for single QCefView…

… instance (#113)
CefView · Jun 14, 2022 · d618af7 · d618af7
1 parent 4f5c686
commit d618af7
Show file tree

Hide file tree

Showing 6 changed files with 70 additions and 9 deletions.
diff --git a/example/QCefViewTest/MainWindow.cpp b/example/QCefViewTest/MainWindow.cpp
@@ -40,9 +40,9 @@ MainWindow::MainWindow(QWidget* parent)
   QString webResourceDir = /*QString("file://") +*/ QDir::toNativeSeparators(dir.filePath("webres"));
 #endif
 
-  // add a local folder to URL map
+  // add a local folder to URL map (global)
   QCefContext::instance()->addLocalFolderResource(webResourceDir, URL_ROOT);
-
+  
   createCefView();
 }
 
@@ -59,8 +59,8 @@ MainWindow::createCefView()
   setting.setBackgroundColor(QColor::fromRgba(qRgba(0, 255, 0, 255)));
 
   // create the QCefView widget and add it to the layout container
-  // cefViewWidget = new CefViewWidget(INDEX_URL, &setting);
-  cefViewWidget = new CefViewWidget("https://www.testufo.com", &setting, this);
+  cefViewWidget = new CefViewWidget(INDEX_URL, &setting);
+  // cefViewWidget = new CefViewWidget("https://www.testufo.com", &setting, this);
   // cefViewWidget = new CefViewWidget("https://devicetests.com", &setting);
   ui.cefContainer->layout()->addWidget(cefViewWidget);
   cefViewWidget->setStyleSheet("background-color: blue;");

diff --git a/include/QCefContext.h b/include/QCefContext.h
@@ -1,4 +1,4 @@
-#ifndef QCEF_H
+#ifndef QCEF_H
 #define QCEF_H
 #pragma once
 #include <QCefView_global.h>
@@ -45,15 +45,15 @@ class QCEFVIEW_EXPORT QCefContext : public QObject
   ~QCefContext();
 
   /// <summary>
-  /// Adds a url mapping item with local web resource directory
+  /// Adds a url mapping item with local web resource directory. This works for all <see ref="QCefView" /> instances created subsequently
   /// </summary>
   /// <param name="path">The path to the local resource directory</param>
   /// <param name="url">The url to be mapped to</param>
   /// <param name="priority">The priority</param>
   void addLocalFolderResource(const QString& path, const QString& url, int priority = 0);
 
   /// <summary>
-  /// Adds a url mapping item with local archive (.zip) file which contains the web resource
+  /// Adds a url mapping item with local archive (.zip) file which contains the web resource. This works for all <see ref="QCefView" /> instances created subsequently
   /// </summary>
   /// <param name="path">The path to the local archive file</param>
   /// <param name="url">The url to be mapped to</param>

diff --git a/include/QCefView.h b/include/QCefView.h
@@ -66,6 +66,23 @@ class QCEFVIEW_EXPORT QCefView : public QWidget
   /// Destructs the QCefView instance
   /// </summary>
   ~QCefView();
+
+  /// <summary>
+  /// Adds a url mapping item with local web resource directory
+  /// </summary>
+  /// <param name="path">The path to the local resource directory</param>
+  /// <param name="url">The url to be mapped to</param>
+  /// <param name="priority">The priority</param>
+  void addLocalFolderResource(const QString& path, const QString& url, int priority = 0);
+
+  /// <summary>
+  /// Adds a url mapping item with local archive (.zip) file which contains the web resource
+  /// </summary>
+  /// <param name="path">The path to the local archive file</param>
+  /// <param name="url">The url to be mapped to</param>
+  /// <param name="password">The password of the archive</param>
+  /// <param name="priority">The priority</param>
+  void addArchiveResource(const QString& path, const QString& url, const QString& password = "", int priority = 0);
 
   /// <summary>
   /// Gets the browser id

diff --git a/src/QCefView.cpp b/src/QCefView.cpp
@@ -29,13 +29,33 @@ QCefView::QCefView(const QString url, const QCefSetting* setting, QWidget* paren
 
 QCefView::QCefView(QWidget* parent /*= 0*/)
   : QCefView("about:blank", nullptr, parent)
-{}
+{
+}
 
 QCefView::~QCefView()
 {
   qDebug() << this << "is being destructed";
 }
 
+void
+QCefView::addLocalFolderResource(const QString& path, const QString& url, int priority /*= 0*/)
+{
+  Q_D(QCefView);
+
+  d->addLocalFolderResource(path, url, priority);
+}
+
+void
+QCefView::addArchiveResource(const QString& path,
+                             const QString& url,
+                             const QString& password /*= ""*/,
+                             int priority /*= 0*/)
+{
+  Q_D(QCefView);
+
+  d->addArchiveResource(path, url, password, priority);
+}
+
 int
 QCefView::browserId()
 {
@@ -186,7 +206,8 @@ QCefView::onBeforePopup(qint64 frameId,
 
 void
 QCefView::onPopupCreated(QWindow* wnd)
-{}
+{
+}
 
 QVariant
 QCefView::inputMethodQuery(Qt::InputMethodQuery query) const

diff --git a/src/details/QCefViewPrivate.cpp b/src/details/QCefViewPrivate.cpp
@@ -179,6 +179,25 @@ QCefViewPrivate::destroyCefBrowser()
   pCefBrowser_ = nullptr;
 }
 
+void
+QCefViewPrivate::addLocalFolderResource(const QString& path, const QString& url, int priority /*= 0*/)
+{
+  if (pClient_) {
+    pClient_->AddLocalDirectoryResourceProvider(path.toStdString(), url.toStdString(), priority);
+  }
+}
+
+void
+QCefViewPrivate::addArchiveResource(const QString& path,
+                                    const QString& url,
+                                    const QString& password /*= ""*/,
+                                    int priority /*= 0*/)
+{
+  if (pClient_) {
+    pClient_->AddArchiveResourceProvider(path.toStdString(), url.toStdString(), password.toStdString(), priority);
+  }
+}
+
 void
 QCefViewPrivate::onCefMainBrowserCreated(CefRefPtr<CefBrowser>& browser, QWindow* window)
 {

diff --git a/src/details/QCefViewPrivate.h b/src/details/QCefViewPrivate.h
@@ -135,6 +135,10 @@ class QCefViewPrivate : public QObject
 
   void destroyCefBrowser();
 
+  void addLocalFolderResource(const QString& path, const QString& url, int priority = 0);
+
+  void addArchiveResource(const QString& path, const QString& url, const QString& password = "", int priority = 0);
+
 protected:
   void onCefMainBrowserCreated(CefRefPtr<CefBrowser>& browser, QWindow* window);