mirror/musikcube
1
0
Fork 0
mirror of https://github.com/clangen/musikcube.git synced 2025-01-05 21:55:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed bug where indexer could not be interrupted.

Browse Source
This commit is contained in:
casey langen 2020-07-08 23:44:20 -07:00
parent ebda0b4d8f
commit 6d415ebdee
2 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/core/library/Indexer.cpp
View File

@ -347,9 +347,20 @@ void Indexer::FinalizeSync(const SyncContext& context) {
} }
void Indexer::ReadMetadataFromFile( void Indexer::ReadMetadataFromFile(
boost::asio::io_service* io,
const boost::filesystem::path& file, const boost::filesystem::path& file,
const std::string& pathId) const std::string& pathId)
{ {
/* we do this here because work may have already been queued before the abort
flag was raised */
if (io && this->Bail()) {
if (!io->stopped()) {
musik::debug::info(TAG, "run aborted");
io->stop();
}
return;
}
#define APPEND_LOG(x) if (logFile) { fprintf(logFile, " - [%s] %s\n", x, file.string().c_str()); } #define APPEND_LOG(x) if (logFile) { fprintf(logFile, " - [%s] %s\n", x, file.string().c_str()); }
musik::core::IndexerTrack track(0); musik::core::IndexerTrack track(0);
@ -447,10 +458,6 @@ void Indexer::SyncDirectory(
const std::string &currentPath, const std::string &currentPath,
int64_t pathId) int64_t pathId)
{ {
if (this->Bail()) {
return;
}
std::string normalizedSyncRoot = NormalizeDir(syncRoot); std::string normalizedSyncRoot = NormalizeDir(syncRoot);
std::string normalizedCurrentPath = NormalizeDir(currentPath); std::string normalizedCurrentPath = NormalizeDir(currentPath);
std::string leaf = boost::filesystem::path(currentPath).leaf().string(); /* trailing subdir in currentPath */ std::string leaf = boost::filesystem::path(currentPath).leaf().string(); /* trailing subdir in currentPath */
@ -469,6 +476,9 @@ void Indexer::SyncDirectory(
std::vector<Thread> threads; std::vector<Thread> threads;
for( ; file != end && !this->Bail(); file++) { for( ; file != end && !this->Bail(); file++) {
if (this->Bail()) {
break;
}
if (is_directory(file->status())) { if (is_directory(file->status())) {
/* recursion here */ /* recursion here */
/* musik::debug::info(TAG, "scanning subdirectory " + file->path().string()); */ /* musik::debug::info(TAG, "scanning subdirectory " + file->path().string()); */
@ -482,11 +492,12 @@ void Indexer::SyncDirectory(
io->post(boost::bind( io->post(boost::bind(
&Indexer::ReadMetadataFromFile, &Indexer::ReadMetadataFromFile,
this, this,
io,
file->path(), file->path(),
pathIdStr)); pathIdStr));
} }
else { else {
this->ReadMetadataFromFile(file->path(), pathIdStr); this->ReadMetadataFromFile(nullptr, file->path(), pathIdStr);
} }
break; break;
} }
@ -623,7 +634,12 @@ void Indexer::ThreadLoop() {
/* done with sync, remove all the threads in the pool to free resources. they'll /* done with sync, remove all the threads in the pool to free resources. they'll
be re-created later if we index again. */ be re-created later if we index again. */
io.post([&io]() { io.stop(); }); io.post([&io]() {
if (!io.stopped()) {
musik::debug::info(TAG, "scan completed successfully");
io.stop();
}
});
threadPool.join_all(); threadPool.join_all();
} }
else { else {

1
src/core/library/Indexer.h
View File

@ -146,6 +146,7 @@ namespace musik { namespace core {
int64_t pathId); int64_t pathId);
void ReadMetadataFromFile( void ReadMetadataFromFile(
boost::asio::io_service* io,
const boost::filesystem::path& path, const boost::filesystem::path& path,
const std::string& pathId); const std::string& pathId);