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

Merge pull request #800 from kiwix/monitor-fix

Browse Source 
Fix for monitor directory on Windows
This commit is contained in:
Kelson 2022-02-25 17:55:03 +01:00 committed by GitHub
commit bfbba8d9fd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/library.cpp
View File

@ -150,7 +150,7 @@ void Library::loadMonitorDir(QString monitorDir)
const QDir dir(monitorDir); const QDir dir(monitorDir);
QStringList newDirEntries = dir.entryList({"*.zim"}); QStringList newDirEntries = dir.entryList({"*.zim"});
for (auto &str : newDirEntries) { for (auto &str : newDirEntries) {
str = monitorDir + QDir::separator() + str; str = QDir::toNativeSeparators(monitorDir + "/" + str);
} }
QSet<QString> newDir = QSet<QString>::fromList(newDirEntries); QSet<QString> newDir = QSet<QString>::fromList(newDirEntries);
QStringList oldDirEntries = m_monitorDirZims; QStringList oldDirEntries = m_monitorDirZims;
@ -167,7 +167,6 @@ void Library::loadMonitorDir(QString monitorDir)
removeBookFromLibraryById(QString::fromStdString(m_library.getBookByPath(bookPath.toStdString()).getId())); removeBookFromLibraryById(QString::fromStdString(m_library.getBookByPath(bookPath.toStdString()).getId()));
} }
emit(booksChanged()); emit(booksChanged());
save();
} }
void Library::asyncLoadMonitorDir(QString dir) void Library::asyncLoadMonitorDir(QString dir)

2
src/settingsmanager.cpp
View File

@ -75,6 +75,7 @@ void SettingsManager::setZoomFactor(qreal zoomFactor)
void SettingsManager::setDownloadDir(QString downloadDir) void SettingsManager::setDownloadDir(QString downloadDir)
{ {
downloadDir = QDir::toNativeSeparators(downloadDir);
m_downloadDir = downloadDir; m_downloadDir = downloadDir;
m_settings.setValue("download/dir", downloadDir); m_settings.setValue("download/dir", downloadDir);
emit(downloadDirChanged(downloadDir)); emit(downloadDirChanged(downloadDir));
@ -82,6 +83,7 @@ void SettingsManager::setDownloadDir(QString downloadDir)
void SettingsManager::setMonitorDir(QString monitorDir) void SettingsManager::setMonitorDir(QString monitorDir)
{ {
monitorDir = QDir::toNativeSeparators(monitorDir);
m_monitorDir = monitorDir; m_monitorDir = monitorDir;
m_settings.setValue("monitor/dir", monitorDir); m_settings.setValue("monitor/dir", monitorDir);
emit(monitorDirChanged(monitorDir)); emit(monitorDirChanged(monitorDir));