From 595d77b832eb42d9840477415a862bf99011fa6f Mon Sep 17 00:00:00 2001 From: Veloman Yunkan Date: Tue, 30 Jul 2024 17:50:19 +0400 Subject: [PATCH] Moved ContentManager::setMonitoredDirectories() --- src/contentmanager.cpp | 19 +++++++++++++++++++ src/kiwixapp.cpp | 15 --------------- 2 files changed, 19 insertions(+), 15 deletions(-) diff --git a/src/contentmanager.cpp b/src/contentmanager.cpp index f8f92df..d526630 100644 --- a/src/contentmanager.cpp +++ b/src/contentmanager.cpp @@ -855,11 +855,30 @@ void ContentManager::setSortBy(const QString& sortBy, const bool sortOrderAsc) emit(booksChanged()); } +//////////////////////////////////////////////////////////////////////////////// +// Directory monitoring stuff +//////////////////////////////////////////////////////////////////////////////// + void ContentManager::setMonitorDirZims(QString monitorDir, Library::QStringSet zimList) { m_knownZimsInDir[monitorDir] = zimList; } +void ContentManager::setMonitoredDirectories(QStringSet dirList) +{ + for (auto path : m_watcher.directories()) { + m_watcher.removePath(path); + } + for (auto dir : dirList) { + if (dir != "") { + const auto zimsInDir = mp_library->getLibraryZimsFromDir(dir); + setMonitorDirZims(dir, zimsInDir); + m_watcher.addPath(dir); + asyncUpdateLibraryFromDir(dir); + } + } +} + void ContentManager::asyncUpdateLibraryFromDir(QString dir) { (void) QtConcurrent::run([=]() { diff --git a/src/kiwixapp.cpp b/src/kiwixapp.cpp index 4594615..b3f07e9 100644 --- a/src/kiwixapp.cpp +++ b/src/kiwixapp.cpp @@ -119,21 +119,6 @@ void KiwixApp::setupDirectoryMonitoring() mp_manager->setMonitoredDirectories(dirList); } -void ContentManager::setMonitoredDirectories(QStringSet dirList) -{ - for (auto path : m_watcher.directories()) { - m_watcher.removePath(path); - } - for (auto dir : dirList) { - if (dir != "") { - const auto zimsInDir = mp_library->getLibraryZimsFromDir(dir); - setMonitorDirZims(dir, zimsInDir); - m_watcher.addPath(dir); - asyncUpdateLibraryFromDir(dir); - } - } -} - KiwixApp::~KiwixApp() { m_server.stop();