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

ContentManager::handleNewZimFiles()

Browse Source
This commit is contained in:
Veloman Yunkan 2024-07-29 16:19:04 +04:00 committed by Kelson
parent af18f5826c
commit d5d5987fc1
2 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/contentmanager.cpp
View File

@ -879,10 +879,27 @@ void ContentManager::handleDisappearedZimFiles(const QStringSet& zimPaths)
} }
} }
ContentManager::QStringSet ContentManager::handleNewZimFiles(const QStringSet& zimPaths)
{
QStringSet successfullyAddedZims;
const auto kiwixLib = mp_library->getKiwixLibrary();
kiwix::Manager manager(kiwixLib);
for (auto bookPath : zimPaths) {
DBGOUT("directory monitoring: file appeared: " << bookPath);
if ( mp_library->isBeingDownloadedByUs(bookPath) ) {
DBGOUT(" it is being downloaded by us, ignoring...");
} else if ( manager.addBookFromPath(bookPath.toStdString()) ) {
DBGOUT(" and was added to the library");
successfullyAddedZims.insert(bookPath);
} else {
DBGOUT(" but could not be added to the library");
}
}
return successfullyAddedZims;
}
void ContentManager::updateLibraryFromDir(QString monitorDir) void ContentManager::updateLibraryFromDir(QString monitorDir)
{ {
typedef Library::QStringSet QStringSet;
QMutexLocker locker(&m_updateFromDirMutex); QMutexLocker locker(&m_updateFromDirMutex);
const QDir dir(monitorDir); const QDir dir(monitorDir);
const QStringSet oldDirEntries = m_knownZimsInDir[monitorDir]; const QStringSet oldDirEntries = m_knownZimsInDir[monitorDir];
@ -892,24 +909,9 @@ void ContentManager::updateLibraryFromDir(QString monitorDir)
} }
const QStringSet addedZims = newDirEntries - oldDirEntries; const QStringSet addedZims = newDirEntries - oldDirEntries;
const QStringSet removedZims = oldDirEntries - newDirEntries; const QStringSet removedZims = oldDirEntries - newDirEntries;
const auto kiwixLib = mp_library->getKiwixLibrary();
kiwix::Manager manager(kiwixLib);
bool needsRefresh = !removedZims.empty();
handleDisappearedZimFiles(removedZims); handleDisappearedZimFiles(removedZims);
for (auto bookPath : addedZims) { const auto successfullyAddedZims = handleNewZimFiles(addedZims);
if ( mp_library->isBeingDownloadedByUs(bookPath) ) { if (!removedZims.empty() || !successfullyAddedZims.empty()) {
DBGOUT("directory monitoring: " << bookPath
<< " ignored since it is being downloaded by us.");
} else {
DBGOUT("directory monitoring: file appeared: " << bookPath);
const bool added = manager.addBookFromPath(bookPath.toStdString());
DBGOUT(" "
<< (added ? "and was added" : "but could not be added")
<< " to the library");
needsRefresh |= added;
}
}
if (needsRefresh) {
mp_library->save(); mp_library->save();
emit(booksChanged()); emit(booksChanged());
setMonitorDirZims(monitorDir, newDirEntries); setMonitorDirZims(monitorDir, newDirEntries);

1
src/contentmanager.h
View File

@ -119,6 +119,7 @@ private: // functions
void setLanguages(); void setLanguages();
void updateLibraryFromDir(QString dir); void updateLibraryFromDir(QString dir);
void handleDisappearedZimFiles(const QStringSet& zimPaths); void handleDisappearedZimFiles(const QStringSet& zimPaths);
QStringSet handleNewZimFiles(const QStringSet& zimPaths);
void handleDisappearedZimFile(QString bookId); void handleDisappearedZimFile(QString bookId);
// Get the book with the specified id from // Get the book with the specified id from