Funkwhale/Clementine-audio-player-Mac-Linux-Windows
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add some more stop points in the library watcher to make it shut down faster

Browse Source
This commit is contained in:
David Sansome 2010-04-14 12:41:03 +00:00
parent 6bac7f6cec
commit dfa8dabc7e
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/librarywatcher.cpp
View File

@ -61,6 +61,9 @@ LibraryWatcher::ScanTransaction::ScanTransaction(LibraryWatcher* watcher,
}
LibraryWatcher::ScanTransaction::~ScanTransaction() {
// If we're stopping then don't commit the transaction
if (watcher_->stop_requested_) return;
if (!new_songs.isEmpty())
emit watcher_->NewOrUpdatedSongs(new_songs);
@ -134,6 +137,7 @@ void LibraryWatcher::AddDirectory(const Directory& dir, const SubdirectoryList&
ScanTransaction transaction(this, dir.id, true);
transaction.SetKnownSubdirs(subdirs);
foreach (const Subdirectory& subdir, subdirs) {
if (stop_requested_) return;
ScanSubdirectory(subdir.path, subdir, &transaction);
AddWatch(data.watcher, subdir.path);
}
@ -161,6 +165,8 @@ void LibraryWatcher::ScanSubdirectory(
// and possible album artwork.
QDirIterator it(path, QDir::Dirs | QDir::Files | QDir::NoDotAndDotDot);
while (it.hasNext()) {
if (stop_requested_) return;
QString child(it.next());
QFileInfo child_info(child);
@ -274,6 +280,7 @@ void LibraryWatcher::ScanSubdirectory(
// Recurse into the new subdirs that we found
foreach (const Subdirectory& my_new_subdir, my_new_subdirs) {
if (stop_requested_) return;
ScanSubdirectory(my_new_subdir.path, my_new_subdir, t, true);
}
}