kiwix/kiwix-desktop
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-desktop.git synced 2025-09-23 03:58:56 -04:00
Code Issues Packages Projects Releases Wiki Activity

Adapt kiwix-desktop to new libkiwix's headers.

Browse Source
This commit is contained in:
Matthieu Gautier 2021-07-08 10:24:04 +02:00
parent 57162a79ed
commit 2289a633b9
4 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/contentmanager.cpp
View File

@ -2,9 +2,8 @@
#include "kiwixapp.h" #include "kiwixapp.h"
#include "static_content.h" #include "static_content.h"
#include <kiwix/tools/networkTools.h>
#include <kiwix/tools/otherTools.h>
#include <kiwix/manager.h> #include <kiwix/manager.h>
#include <kiwix/tools.h>
#include <QDebug> #include <QDebug>
#include <QUrlQuery> #include <QUrlQuery>
@ -252,8 +251,8 @@ void ContentManager::eraseBook(const QString& id)
auto tabBar = KiwixApp::instance()->getTabWidget(); auto tabBar = KiwixApp::instance()->getTabWidget();
tabBar->closeTabsByZimId(id); tabBar->closeTabsByZimId(id);
kiwix::Book book = mp_library->getBookById(id); kiwix::Book book = mp_library->getBookById(id);
QString dirPath = QString::fromStdString(removeLastPathElement(book.getPath())); QString dirPath = QString::fromStdString(kiwix::removeLastPathElement(book.getPath()));
QString filename = QString::fromStdString(getLastPathElement(book.getPath())) + "*"; QString filename = QString::fromStdString(kiwix::getLastPathElement(book.getPath())) + "*";
eraseBookFilesFromComputer(dirPath, filename); eraseBookFilesFromComputer(dirPath, filename);
mp_library->removeBookFromLibraryById(id); mp_library->removeBookFromLibraryById(id);
mp_library->save(); mp_library->save();
@ -298,8 +297,8 @@ void ContentManager::cancelBook(const QString& id)
if (download->getStatus() != kiwix::Download::K_COMPLETE) { if (download->getStatus() != kiwix::Download::K_COMPLETE) {
download->cancelDownload(); download->cancelDownload();
} }
QString dirPath = QString::fromStdString(removeLastPathElement(download->getPath())); QString dirPath = QString::fromStdString(kiwix::removeLastPathElement(download->getPath()));
QString filename = QString::fromStdString(getLastPathElement(download->getPath())) + "*"; QString filename = QString::fromStdString(kiwix::getLastPathElement(download->getPath())) + "*";
eraseBookFilesFromComputer(dirPath, filename); eraseBookFilesFromComputer(dirPath, filename);
mp_library->removeBookFromLibraryById(id); mp_library->removeBookFromLibraryById(id);
mp_library->save(); mp_library->save();

5
src/kiwixapp.cpp
View File

@ -1,6 +1,7 @@
#include "kiwixapp.h" #include "kiwixapp.h"
#include "static_content.h" #include "static_content.h"
#include "zim/error.h" #include "zim/error.h"
#include "kiwix/tools.h"
#include <QLocale> #include <QLocale>
#include <QLibraryInfo> #include <QLibraryInfo>
@ -110,13 +111,13 @@ KiwixApp::~KiwixApp()
QString KiwixApp::findLibraryDirectory() QString KiwixApp::findLibraryDirectory()
{ {
// Check for library.xml in the same directory than the executable (portable kiwix-desktop) // Check for library.xml in the same directory than the executable (portable kiwix-desktop)
auto currentDataDir = QString::fromStdString(removeLastPathElement(getExecutablePath())); auto currentDataDir = QString::fromStdString(kiwix::removeLastPathElement(kiwix::getExecutablePath()));
auto libraryFile = QFileInfo(currentDataDir, "library.xml"); auto libraryFile = QFileInfo(currentDataDir, "library.xml");
if (libraryFile.exists()) if (libraryFile.exists())
return currentDataDir; return currentDataDir;
// Check for default dataDirectory. // Check for default dataDirectory.
currentDataDir = QString::fromStdString(getDataDirectory()); currentDataDir = QString::fromStdString(kiwix::getDataDirectory());
libraryFile = QFileInfo(currentDataDir, "library.xml"); libraryFile = QFileInfo(currentDataDir, "library.xml");
if (libraryFile.exists()) if (libraryFile.exists())
return currentDataDir; return currentDataDir;

10
src/library.cpp
View File

@ -2,7 +2,7 @@
#include "kiwixapp.h" #include "kiwixapp.h"
#include <kiwix/manager.h> #include <kiwix/manager.h>
#include "kiwixapp.h" #include <kiwix/tools.h>
#include <QtDebug> #include <QtDebug>
@ -27,8 +27,8 @@ Library::Library(const QString& libraryDirectory)
{ {
auto manipulator = LibraryManipulator(this); auto manipulator = LibraryManipulator(this);
auto manager = kiwix::Manager(&manipulator); auto manager = kiwix::Manager(&manipulator);
manager.readFile(appendToDirectory(m_libraryDirectory.toStdString(),"library.xml"), false); manager.readFile(kiwix::appendToDirectory(m_libraryDirectory.toStdString(),"library.xml"), false);
manager.readBookmarkFile(appendToDirectory(m_libraryDirectory.toStdString(),"library.bookmarks.xml")); manager.readBookmarkFile(kiwix::appendToDirectory(m_libraryDirectory.toStdString(),"library.bookmarks.xml"));
emit(booksChanged()); emit(booksChanged());
} }
@ -114,8 +114,8 @@ void Library::removeBookmark(const QString &zimId, const QString &url)
void Library::save() void Library::save()
{ {
m_library.writeToFile(appendToDirectory(m_libraryDirectory.toStdString(),"library.xml")); m_library.writeToFile(kiwix::appendToDirectory(m_libraryDirectory.toStdString(),"library.xml"));
m_library.writeBookmarksToFile(appendToDirectory(m_libraryDirectory.toStdString(), "library.bookmarks.xml")); m_library.writeBookmarksToFile(kiwix::appendToDirectory(m_libraryDirectory.toStdString(), "library.bookmarks.xml"));
} }
kiwix::Book &Library::getBookById(QString id) kiwix::Book &Library::getBookById(QString id)

6
src/settingsmanager.cpp
View File

@ -1,9 +1,9 @@
#include "settingsmanager.h" #include "settingsmanager.h"
#include "kiwix/tools/pathTools.h"
#include "kiwixapp.h" #include "kiwixapp.h"
#include <QDir> #include <QDir>
#include <QFileDialog> #include <QFileDialog>
#include <QMessageBox> #include <QMessageBox>
#include <kiwix/tools.h>
SettingsManager::SettingsManager(QObject *parent) SettingsManager::SettingsManager(QObject *parent)
: QObject(parent), : QObject(parent),
@ -91,7 +91,7 @@ bool SettingsManager::confirmDialogDownloadDir(const QString& dir)
void SettingsManager::resetDownloadDir() void SettingsManager::resetDownloadDir()
{ {
auto dir = QString::fromStdString(getDataDirectory()); auto dir = QString::fromStdString(kiwix::getDataDirectory());
if (dir == m_downloadDir) { if (dir == m_downloadDir) {
return; return;
} }
@ -131,5 +131,5 @@ void SettingsManager::initSettings()
{ {
m_kiwixServerPort = m_settings.value("localKiwixServer/port", 8181).toInt(); m_kiwixServerPort = m_settings.value("localKiwixServer/port", 8181).toInt();
m_zoomFactor = m_settings.value("view/zoomFactor", 1).toDouble(); m_zoomFactor = m_settings.value("view/zoomFactor", 1).toDouble();
m_downloadDir = m_settings.value("download/dir", QString::fromStdString(getDataDirectory())).toString(); m_downloadDir = m_settings.value("download/dir", QString::fromStdString(kiwix::getDataDirectory())).toString();
} }