Adapt kiwix-desktop to new libkiwix API.

src/contentmanager.cpp

@@ -15,6 +15,7 @@
 ContentManager::ContentManager(Library* library, kiwix::Downloader* downloader, QObject *parent)
     : QObject(parent),
       mp_library(library),
+      mp_remoteLibrary(std::make_shared<kiwix::Library>()),
       mp_downloader(downloader),
       m_remoteLibraryManager()
 {
@@ -56,7 +57,7 @@ QStringList ContentManager::getBookInfos(QString id, const QStringList &keys)
             return &mp_library->getBookById(id);
         } catch (...) {
             try {
-                return &m_remoteLibrary.getBookById(id.toStdString());
+                return &mp_remoteLibrary->getBookById(id.toStdString());
             } catch(...) { return nullptr; }
         }
     }();
@@ -179,7 +180,7 @@ QStringList ContentManager::updateDownloadInfos(QString id, const QStringList &k
     } catch(...) {
         kiwix::Book bCopy(b);
         bCopy.setDownloadId("");
-        mp_library->getKiwixLibrary().addOrUpdateBook(bCopy);
+        mp_library->getKiwixLibrary()->addOrUpdateBook(bCopy);
         mp_library->save();
         emit(mp_library->booksChanged());
         return values;
@@ -194,7 +195,7 @@ QStringList ContentManager::updateDownloadInfos(QString id, const QStringList &k
         bCopy.setPathValid(true);
         // removing book url so that download link in kiwix-serve is not displayed.
         bCopy.setUrl("");
-        mp_library->getKiwixLibrary().addOrUpdateBook(bCopy);
+        mp_library->getKiwixLibrary()->addOrUpdateBook(bCopy);
         mp_library->save();
         mp_library->bookmarksChanged();
         if (!m_local) {
@@ -255,7 +256,7 @@ QString ContentManager::downloadBook(const QString &id)
         return "";
     const auto& book = [&]()->const kiwix::Book& {
         try {
-            return m_remoteLibrary.getBookById(id.toStdString());
+            return mp_remoteLibrary->getBookById(id.toStdString());
         } catch (...) {
             return mp_library->getBookById(id);
         }
@@ -407,8 +408,8 @@ void ContentManager::updateLibrary() {
 
 #define CATALOG_URL "library.kiwix.org"
 void ContentManager::updateRemoteLibrary(const QString& content) {
-    m_remoteLibrary = kiwix::Library();
-    kiwix::Manager manager(&m_remoteLibrary);
+    mp_remoteLibrary = std::make_shared<kiwix::Library>();
+    kiwix::Manager manager(mp_remoteLibrary);
     manager.readOpds(content.toStdString(), CATALOG_URL);
     emit(this->booksChanged());
     emit(this->pendingRequest(false));
@@ -457,8 +458,8 @@ QStringList ContentManager::getBookIds()
         return mp_library->listBookIds(filter, m_sortBy, m_sortOrderAsc);
     } else {
         filter.remote(true);
-        auto bookIds = m_remoteLibrary.filter(filter);
-        m_remoteLibrary.sort(bookIds, m_sortBy, m_sortOrderAsc);
+        auto bookIds = mp_remoteLibrary->filter(filter);
+        mp_remoteLibrary->sort(bookIds, m_sortBy, m_sortOrderAsc);
         QStringList list;
         for(auto& bookId:bookIds) {
             list.append(QString::fromStdString(bookId));

src/contentmanager.h

@@ -29,7 +29,7 @@ class ContentManager : public QObject
 
 private:
     Library* mp_library;
-    kiwix::Library m_remoteLibrary;
+    std::shared_ptr<kiwix::Library> mp_remoteLibrary;
     kiwix::Downloader* mp_downloader;
     OpdsRequestManager m_remoteLibraryManager;
     ContentManagerView* mp_view;

src/kiwixapp.cpp

@@ -32,8 +32,8 @@ KiwixApp::KiwixApp(int& argc, char *argv[])
       mp_downloader(nullptr),
       mp_manager(nullptr),
       mp_mainWindow(nullptr),
-      m_nameMapper(m_library.getKiwixLibrary(), false),
-      m_server(&m_library.getKiwixLibrary(), &m_nameMapper)
+      mp_nameMapper(std::make_shared<kiwix::UpdatableNameMapper>(m_library.getKiwixLibrary(), false)),
+      mp_server(nullptr)
 {
     try {
         m_translation.setTranslation(QLocale());
@@ -114,7 +114,9 @@ void KiwixApp::init()
 
 KiwixApp::~KiwixApp()
 {
-    m_server.stop();
+    if (mp_server) {
+        mp_server->stop();
+    }
     if (mp_downloader) {
         mp_downloader->close();
         delete mp_downloader;
@@ -453,7 +455,26 @@ void KiwixApp::disableItemsOnLibraryPage(bool libraryDisplayed)
 
 void KiwixApp::updateNameMapper()
 {
-  m_nameMapper.update();
+  mp_nameMapper->update();
+}
+
+bool KiwixApp::runServer(const QString& ipAddress, int port) {
+    auto settings = getSettingsManager();
+    if (mp_server) {
+        mp_server->stop();
+    }
+    kiwix::Server::Configuration configuration(m_library.getKiwixLibrary(), mp_nameMapper);
+    configuration.setPort(port);
+    configuration.setAddress(ipAddress.toStdString());
+    settings->setKiwixServerPort(port);
+    settings->setKiwixServerIpAddress(ipAddress);
+    mp_server.reset(new kiwix::Server(configuration));
+    return mp_server->start();
+}
+
+void KiwixApp::stopServer() {
+    mp_server->stop();
+    mp_server.reset();
 }
 
 void KiwixApp::printVersions(std::ostream& out) {

src/kiwixapp.h

@@ -79,12 +79,14 @@ class KiwixApp : public QtSingleApplication
     TabBar* getTabWidget() { return getMainWindow()->getTabBar(); }
     QAction* getAction(Actions action);
     QString getLibraryDirectory() { return m_libraryDirectory; };
-    kiwix::Server* getLocalServer() { return &m_server; }
     SettingsManager* getSettingsManager() { return &m_settingsManager; };
     QString getText(const QString &key) { return m_translation.getText(key); };
     void setMonitorDir(const QString &dir);
     bool isCurrentArticleBookmarked();
 
+    bool runServer(const QString& ipAddress, int port);
+    void stopServer();
+
 public slots:
     void openZimFile(const QString& zimfile="");
     void openUrl(const QString& url, bool newTab=true);
@@ -108,8 +110,8 @@ public slots:
     ContentManager* mp_manager;
     MainWindow* mp_mainWindow;
     QErrorMessage* mp_errorDialog;
-    kiwix::UpdatableNameMapper m_nameMapper;
-    kiwix::Server m_server;
+    std::shared_ptr<kiwix::UpdatableNameMapper> mp_nameMapper;
+    std::unique_ptr<kiwix::Server> mp_server;
     Translation m_translation;
     QFileSystemWatcher m_watcher;
 

src/library.cpp

@@ -11,23 +11,24 @@
 class LibraryManipulator: public kiwix::LibraryManipulator {
   public:
     LibraryManipulator(Library* p_library)
-        : kiwix::LibraryManipulator(&p_library->getKiwixLibrary())
+        : kiwix::LibraryManipulator(p_library->getKiwixLibrary())
         , mp_library(p_library)
     {}
     virtual ~LibraryManipulator() {}
     bool addBookToLibrary(kiwix::Book book) {
-        auto ret = mp_library->m_library.addBook(book);
+        auto ret = mp_library->mp_library->addBook(book);
         emit(mp_library->booksChanged());
         return ret;
     }
     void addBookmarkToLibrary(kiwix::Bookmark bookmark) {
-        mp_library->m_library.addBookmark(bookmark);
+        mp_library->mp_library->addBookmark(bookmark);
     }
     Library* mp_library;
 };
 
 Library::Library(const QString& libraryDirectory)
-  : m_libraryDirectory(libraryDirectory)
+  : mp_library(std::make_shared<kiwix::Library>()),
+    m_libraryDirectory(libraryDirectory)
 {
     auto manipulator = LibraryManipulator(this);
     auto manager = kiwix::Manager(&manipulator);
@@ -44,11 +45,11 @@ Library::~Library()
 QString Library::openBookFromPath(const QString &zimPath)
 {
     try {
-        auto& book = m_library.getBookByPath(zimPath.toStdString());
+        auto& book = mp_library->getBookByPath(zimPath.toStdString());
         return QString::fromStdString(book.getId());
     } catch(std::out_of_range& e) { }
 
-    kiwix::Manager manager(&m_library);
+    kiwix::Manager manager(mp_library);
     auto id =  manager.addBookFromPathAndGetId(zimPath.toStdString());
     if (id == "") {
         throw std::invalid_argument("invalid zim file");
@@ -60,18 +61,18 @@ QString Library::openBookFromPath(const QString &zimPath)
 
 std::shared_ptr<zim::Archive> Library::getArchive(const QString &zimId)
 {
-    return m_library.getArchiveById(zimId.toStdString());
+    return mp_library->getArchiveById(zimId.toStdString());
 }
 
 std::shared_ptr<zim::Searcher> Library::getSearcher(const QString &zimId)
 {
-    return m_library.getSearcherById(zimId.toStdString());
+    return mp_library->getSearcherById(zimId.toStdString());
 }
 
 QStringList Library::getBookIds() const
 {
     QStringList list;
-    for(auto& id: m_library.getBooksIds()) {
+    for(auto& id: mp_library->getBooksIds()) {
         list.append(QString::fromStdString(id));
     }
     return list;
@@ -80,8 +81,8 @@ QStringList Library::getBookIds() const
 QStringList Library::listBookIds(const kiwix::Filter& filter, kiwix::supportedListSortBy sortBy, bool ascending) const
 {
     QStringList list;
-    auto bookIds = m_library.filter(filter);
-    m_library.sort(bookIds, sortBy, ascending);
+    auto bookIds = mp_library->filter(filter);
+    mp_library->sort(bookIds, sortBy, ascending);
     for(auto& id: bookIds) {
         list.append(QString::fromStdString(id));
     }
@@ -90,29 +91,29 @@ QStringList Library::listBookIds(const kiwix::Filter& filter, kiwix::supportedLi
 
 void Library::addBookToLibrary(kiwix::Book &book)
 {
-    m_library.addBook(book);
+    mp_library->addBook(book);
 }
 
 void Library::removeBookFromLibraryById(const QString& id) {
-    m_library.removeBookById(id.toStdString());
+    mp_library->removeBookById(id.toStdString());
 }
 
 void Library::addBookmark(kiwix::Bookmark &bookmark)
 {
-    m_library.addBookmark(bookmark);
+    mp_library->addBookmark(bookmark);
     emit bookmarksChanged();
 }
 
 void Library::removeBookmark(const QString &zimId, const QString &url)
 {
-    m_library.removeBookmark(zimId.toStdString(), url.toStdString());
+    mp_library->removeBookmark(zimId.toStdString(), url.toStdString());
     emit bookmarksChanged();
 }
 
 void Library::save()
 {
-    m_library.writeToFile(kiwix::appendToDirectory(m_libraryDirectory.toStdString(),"library.xml"));
-    m_library.writeBookmarksToFile(kiwix::appendToDirectory(m_libraryDirectory.toStdString(), "library.bookmarks.xml"));
+    mp_library->writeToFile(kiwix::appendToDirectory(m_libraryDirectory.toStdString(),"library.xml"));
+    mp_library->writeBookmarksToFile(kiwix::appendToDirectory(m_libraryDirectory.toStdString(), "library.bookmarks.xml"));
 }
 
 void Library::setMonitorDirZims(QStringList zimList)
@@ -160,7 +161,7 @@ void Library::loadMonitorDir(QString monitorDir)
         needsRefresh |= manager.addBookFromPath(book.toStdString());
     }
     for (auto bookPath : removedZims) {
-        removeBookFromLibraryById(QString::fromStdString(m_library.getBookByPath(bookPath.toStdString()).getId()));
+        removeBookFromLibraryById(QString::fromStdString(mp_library->getBookByPath(bookPath.toStdString()).getId()));
     }
     if (needsRefresh) {
         setMonitorDirZims(newDir.values());
@@ -177,5 +178,5 @@ void Library::asyncLoadMonitorDir(QString dir)
 
 const kiwix::Book &Library::getBookById(QString id) const
 {
-    return m_library.getBookById(id.toStdString());
+    return mp_library->getBookById(id.toStdString());
 }

src/library.h

@@ -32,7 +32,7 @@ class Library : public QObject
     std::shared_ptr<zim::Searcher> getSearcher(const QString& zimId);
     QStringList getBookIds() const;
     QStringList listBookIds(const kiwix::Filter& filter, kiwix::supportedListSortBy sortBy, bool ascending) const;
-    const std::vector<kiwix::Bookmark> getBookmarks(bool onlyValidBookmarks = false) const { return m_library.getBookmarks(onlyValidBookmarks); }
+    const std::vector<kiwix::Bookmark> getBookmarks(bool onlyValidBookmarks = false) const { return mp_library->getBookmarks(onlyValidBookmarks); }
     QStringList getLibraryZimsFromDir(QString dir) const;
     void setMonitorDirZims(QStringList zimList);
     void addBookToLibrary(kiwix::Book& book);
@@ -42,7 +42,7 @@ class Library : public QObject
     void save();
     void loadMonitorDir(QString dir);
     void asyncLoadMonitorDir(QString dir);
-    kiwix::Library& getKiwixLibrary() { return m_library; }
+    std::shared_ptr<kiwix::Library> getKiwixLibrary() { return mp_library; }
 public slots:
     const kiwix::Book& getBookById(QString id) const;
 
@@ -51,7 +51,7 @@ public slots:
     void bookmarksChanged();
 
 private:
-    kiwix::Library m_library;
+    std::shared_ptr<kiwix::Library> mp_library;
     QString m_libraryDirectory;
     QStringList m_monitorDirZims;
 friend class LibraryManipulator;

src/localkiwixserver.cpp

@@ -20,7 +20,6 @@ LocalKiwixServer::LocalKiwixServer(QWidget *parent) :
     QString style(byteContent);
     setStyleSheet(style);
 
-    mp_server = KiwixApp::instance()->getLocalServer();
     m_port = KiwixApp::instance()->getSettingsManager()->getKiwixServerPort();
 
     connect(ui->KiwixServerButton, SIGNAL(clicked()), this, SLOT(runOrStopServer()));
@@ -81,28 +80,28 @@ void LocalKiwixServer::openInBrowser()
 void LocalKiwixServer::runOrStopServer()
 {
     if (!m_active) {
-        auto settingsManager = KiwixApp::instance()->getSettingsManager();
         m_port = ui->PortChooser->text().toInt();
-        mp_server->setPort(m_port);
-        m_ipAddress = (ui->IpChooser->currentText() != gt("all")) ? ui->IpChooser->currentText() : "0.0.0.0";
-        settingsManager->setKiwixServerPort(m_port);
-        settingsManager->setKiwixServerIpAddress(m_ipAddress);
-        mp_server->setAddress(m_ipAddress.toStdString());
-        m_ipAddress = (m_ipAddress != "0.0.0.0") ? m_ipAddress : QString::fromStdString(kiwix::getBestPublicIp());
-        ui->IpAddress->setText("http://" + m_ipAddress + ":" + QString::number(m_port));
-        ui->IpAddress->setReadOnly(true);
-        if (!mp_server->start()) {
+        m_ipAddress = ui->IpChooser->currentText();
+
+        m_active = KiwixApp::instance()->runServer(
+            (m_ipAddress != gt("all") ? m_ipAddress : "0.0.0.0"),
+            m_port
+        );
+
+        if (!m_active) {
             QMessageBox messageBox;
             messageBox.critical(0,gt("error-title"),gt("error-launch-server-message"));
-            return;
         }
-        m_active = true;
     } else {
-        mp_server->stop();
+        KiwixApp::instance()->stopServer();
         m_active = false;
     }
 
     if (m_active) {
+        // Update UI to display how to acces the server
+        m_ipAddress = m_ipAddress != gt("all") ? m_ipAddress : QString::fromStdString(kiwix::getBestPublicIp());
+        ui->IpAddress->setText("http://" + m_ipAddress + ":" + QString::number(m_port));
+        ui->IpAddress->setReadOnly(true);
         ui->KiwixServerButton->setText(gt("stop-kiwix-server"));
         ui->KiwixServerText->setText(gt("kiwix-server-running-message"));
         ui->stackedWidget->setCurrentIndex(1);

src/localkiwixserver.h

@@ -22,7 +22,6 @@ public slots:
 
 private:
     Ui::LocalKiwixServer *ui;
-    kiwix::Server* mp_server;
     bool m_active = false;
     QString m_ipAddress;
     int m_port;

src/urlschemehandler.cpp

@@ -131,9 +131,12 @@ UrlSchemeHandler::handleSearchRequest(QWebEngineUrlRequestJob* request)
         request->fail(QWebEngineUrlRequestJob::UrlInvalid);
         return;
     }
-    IdNameMapper nameMapper;
-    kiwix::SearchRenderer renderer(search->getResults(start, pageLength), &nameMapper, search->getEstimatedMatches(),
-                            start);
+    auto nameMapper = std::make_shared<IdNameMapper>();
+    kiwix::SearchRenderer renderer(
+        search->getResults(start, pageLength),
+        nameMapper,
+        search->getEstimatedMatches(),
+        start);
     renderer.setSearchPattern(searchQuery);
     renderer.setSearchBookQuery("content="+bookId.toStdString());
     renderer.setProtocolPrefix("zim://");