Use tabs to display KiwixWebView.

This is the first step to handling several zim file at the same time.

- The Library class is used has a handler mapping zimId to kiwix::Reader.
- The KiwixWebView display url of the form : "zim://<zimId>.zim/path".
- The KiwixSchemeHandler uses the host (containing the zimid) to get
  the reader from the library and serve the content.

kiwix-desktop.pro

@@ -36,7 +36,8 @@ SOURCES += \
     kiwixapp.cpp \
     blobbuffer.cpp \
     kiwixrequestinterceptor.cpp \
-    kiwixwebview.cpp
+    kiwixwebview.cpp \
+    library.cpp
 
 HEADERS += \
         mainwindow.h \
@@ -44,7 +45,8 @@ HEADERS += \
     kiwixapp.h \
     blobbuffer.h \
     kiwixrequestinterceptor.h \
-    kiwixwebview.h
+    kiwixwebview.h \
+    library.h
 
 FORMS += \
         mainwindow.ui

kiwixapp.cpp

@@ -2,8 +2,7 @@
 #include "zim/error.h"
 
 KiwixApp::KiwixApp(int& argc, char *argv[])
-    : QApplication(argc, argv),
+    : QApplication(argc, argv)
-      reader(nullptr)
 {
     mainWindow = new MainWindow;
     setApplicationName("kiwix-desktop");
@@ -13,30 +12,17 @@ KiwixApp::KiwixApp(int& argc, char *argv[])
 KiwixApp::~KiwixApp()
 {
     delete mainWindow;
-    if (reader)
-        delete reader;
 }
 
 
 void KiwixApp::openZimFile(const QString &zimfile)
 {
-    if (reader)
-        delete reader;
     const std::string zimfile_ = zimfile.toLocal8Bit().constData();
     std::cout << "Opening " << zimfile_ << std::endl;
     try {
-        reader = new kiwix::Reader(zimfile_);
+        auto zimId = library.openBook(zimfile);
-    } catch (const zim::ZimFileFormatError& e) {
+        mainWindow->displayReader(library.getReader(zimId));
-        std::cout << "Cannot open " << zimfile_ << std::endl;
-        std::cout << e.what() << std::endl;
-        reader = nullptr;
     } catch (const std::exception& e) {
         std::cout << "oup" << e.what() << std::endl;
-        reader = nullptr;
     }
 }
-
-kiwix::Reader* KiwixApp::getReader()
-{
-    return reader;
-}

kiwixapp.h

@@ -5,7 +5,7 @@
 #include "kiwixrequestinterceptor.h"
 
 #include <QApplication>
-#include <kiwix/reader.h>
+#include "library.h"
 #include "mainwindow.h"
 
 
@@ -16,12 +16,16 @@ public:
     virtual ~KiwixApp();
 
     void openZimFile(const QString& zimfile);
-    kiwix::Reader* getReader();
-
 
+    KiwixSchemeHandler* getSchemeHandler() { return &schemeHandler; }
+    KiwixRequestInterceptor* getRequestInterceptor() { return &requestIntercetor; }
+    Library* getLibrary() { return &library; }
 private:
-    kiwix::Reader* reader;
+    Library library;
     MainWindow* mainWindow;
+
+    KiwixSchemeHandler schemeHandler;
+    KiwixRequestInterceptor requestIntercetor;
 };
 
 #endif // KIWIXAPP_H

kiwixschemehandler.cpp

@@ -16,11 +16,14 @@ void
 KiwixSchemeHandler::requestStarted(QWebEngineUrlRequestJob *request)
 {
     std::cout << "Handling request " << request->requestUrl().toString().toUtf8().constData() << std::endl;
-    std::string url = request->requestUrl().path().toUtf8().constData();
+    auto qurl = request->requestUrl();
+    std::string url = qurl.path().toUtf8().constData();
     std::cout << "Url is " << url << std::endl;
     if (url[0] == '/')
         url = url.substr(1);
-    auto reader = static_cast<KiwixApp*>(KiwixApp::instance())->getReader();
+    auto library = static_cast<KiwixApp*>(KiwixApp::instance())->getLibrary();
+    auto zim_id = qurl.host();
+    auto reader = library->getReader(zim_id);
     if ( reader == nullptr) {
         request->fail(QWebEngineUrlRequestJob::UrlNotFound);
         return;

kiwixwebview.cpp

@@ -2,15 +2,25 @@
 
 #include <QWebEngineProfile>
 #include <iostream>
+#include "kiwixapp.h"
 
 KiwixWebView::KiwixWebView(QWidget *parent)
     : QWebEngineView(parent)
 {
     auto profile = page()->profile();
-    profile->installUrlSchemeHandler("zim", &schemeHandler);
+    auto app = static_cast<KiwixApp*>(KiwixApp::instance());
-    profile->setRequestInterceptor(&requestInterceptor);
+    profile->installUrlSchemeHandler("zim", app->getSchemeHandler());
-
+    profile->setRequestInterceptor(app->getRequestInterceptor());
 }
 
 KiwixWebView::~KiwixWebView()
 {}
+
+
+void KiwixWebView::initFromReader(std::shared_ptr<kiwix::Reader> reader)
+{
+    std::string url("zim://");
+    url += reader->getId();
+    url += ".zim/";
+    page()->setUrl(QUrl(QString::fromStdString(url)));
+}

kiwixwebview.h

@@ -2,9 +2,7 @@
 #define KIWIXWEBVIEW_H
 
 #include <QWebEngineView>
-#include "kiwixschemehandler.h"
+#include <kiwix/reader.h>
-#include "kiwixrequestinterceptor.h"
-
 
 class KiwixWebView : public QWebEngineView
 {
@@ -14,9 +12,7 @@ public:
     KiwixWebView(QWidget *parent = Q_NULLPTR);
     virtual ~KiwixWebView();
 
-private:
+    void initFromReader(std::shared_ptr<kiwix::Reader> reader);
-    KiwixSchemeHandler schemeHandler;
-    KiwixRequestInterceptor requestInterceptor;
 };
 
 #endif // KIWIXWEBVIEW_H

library.cpp

@@ -0,0 +1,30 @@
+#include "library.h"
+
+Library::Library()
+{
+
+}
+
+QString Library::openBook(const QString &zimPath)
+{
+    for(auto it=readers_map.begin();
+        it != readers_map.end();
+        it++)
+    {
+        if(QString::fromStdString(it->second->getZimFilePath()) == zimPath)
+            return it->first;
+    }
+    const std::string zimPath_ = zimPath.toLocal8Bit().constData();
+    auto reader = std::shared_ptr<kiwix::Reader>(new kiwix::Reader(zimPath_));
+    auto id = QString::fromStdString(reader->getId() + ".zim");
+    readers_map[id] = reader;
+    return id;
+}
+
+std::shared_ptr<kiwix::Reader> Library::getReader(const QString &zimId)
+{
+    auto it = readers_map.find(zimId);
+    if (it != readers_map.end())
+        return it->second;
+    return nullptr;
+}

library.h

@@ -0,0 +1,18 @@
+#ifndef LIBRARY_H
+#define LIBRARY_H
+
+#include <kiwix/manager.h>
+#include <map>
+#include <qstring.h>
+
+class Library : public kiwix::Manager
+{
+public:
+    Library();
+    QString openBook(const QString& zimPath);
+    std::shared_ptr<kiwix::Reader> getReader(const QString& zimId);
+private:
+    std::map<QString, std::shared_ptr<kiwix::Reader>> readers_map;
+};
+
+#endif // LIBRARY_H

mainwindow.cpp

@@ -9,10 +9,7 @@ MainWindow::MainWindow(QWidget *parent) :
     ui(new Ui::MainWindow)
 {
     ui->setupUi(this);
-    ui->webview->page()->setUrl(QUrl("http://foo.zim"));
+    ui->tabWidget->tabBar()->setExpanding(false);
-    //ui->webview->page()->setUrl(QUrl("http://localhost:8080"));
-
-    QObject::connect(ui->webview, SIGNAL(urlChanged(const QUrl&)), this, SLOT(on_urlChanged_triggered(const QUrl&)));
 }
 
 MainWindow::~MainWindow()
@@ -20,14 +17,16 @@ MainWindow::~MainWindow()
     delete ui;
 }
 
-void MainWindow::on_pushButton_clicked()
+void MainWindow::displayReader(std::shared_ptr<kiwix::Reader> reader)
 {
-    ui->webview->reload();
+    auto webview = new KiwixWebView();
-}
+    std::string favicon_content;
-
+    std::string favicon_mimetype;
-
+    reader->getFavicon(favicon_content, favicon_mimetype);
-void MainWindow::on_urlChanged_triggered(const QUrl& url)
+    QPixmap pixmap;
-{
+    pixmap.loadFromData((const uchar*)favicon_content.data(), favicon_content.size());
-    std::cout << "new url : " << url.toString().toUtf8().constData() << std::endl;
+    auto icon = QIcon(pixmap);
-    ui->addressBar->setText(url.toString());
+    // Ownership of webview is passed to the tabWidget
+    ui->tabWidget->addTab(webview, icon, QString::fromStdString(reader->getTitle()));
+    webview->initFromReader(reader);
 }

mainwindow.h

@@ -2,6 +2,7 @@
 #define MAINWINDOW_H
 
 #include <QMainWindow>
+#include "kiwixwebview.h"
 
 namespace Ui {
 class MainWindow;
@@ -15,12 +16,11 @@ public:
     explicit MainWindow(QWidget *parent = 0);
     ~MainWindow();
 
-private slots:
+    void displayReader(std::shared_ptr<kiwix::Reader> reader);
-    void on_pushButton_clicked();
-    void on_urlChanged_triggered(const  QUrl& url);
 
 private:
     Ui::MainWindow *ui;
+    std::map<std::shared_ptr<kiwix::Reader>, KiwixWebView*> webviews_map;
 };
 
 #endif // MAINWINDOW_H

mainwindow.ui

@@ -16,28 +16,17 @@
   <widget class="QWidget" name="centralWidget">
    <layout class="QVBoxLayout" name="verticalLayout_2">
     <item>
-     <layout class="QHBoxLayout" name="horizontalLayout">
+     <widget class="QTabWidget" name="tabWidget">
-      <property name="sizeConstraint">
+      <property name="tabShape">
-       <enum>QLayout::SetMinimumSize</enum>
+       <enum>QTabWidget::Rounded</enum>
       </property>
-      <item>
+      <property name="currentIndex">
-       <widget class="QLineEdit" name="addressBar">
+       <number>-1</number>
-        <property name="enabled">
+      </property>
-         <bool>false</bool>
+      <property name="documentMode">
-        </property>
+       <bool>false</bool>
-       </widget>
+      </property>
-      </item>
+     </widget>
-      <item>
-       <widget class="QPushButton" name="refreshButton">
-        <property name="text">
-         <string>Refresh</string>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </item>
-    <item>
-     <widget class="KiwixWebView" name="webview" native="true"/>
     </item>
    </layout>
   </widget>
@@ -68,14 +57,6 @@
   <widget class="QStatusBar" name="statusBar"/>
  </widget>
  <layoutdefault spacing="6" margin="11"/>
- <customwidgets>
-  <customwidget>
-   <class>KiwixWebView</class>
-   <extends>QWidget</extends>
-   <header>kiwixwebview.h</header>
-   <container>1</container>
-  </customwidget>
- </customwidgets>
  <resources/>
  <connections/>
 </ui>