Funkwhale/strawberry-audio-player-windows-mac-linux
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make collection watcher unwatch removed directories

Browse Source 
Fixes #233
This commit is contained in:
Jonas Kvinge 2019-08-05 18:40:47 +02:00
parent c6e08e0039
commit ecb122d93c
2 changed files with 35 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/collection/collectionwatcher.cpp
View File

@ -195,13 +195,21 @@ void CollectionWatcher::ScanTransaction::CommitNewOrUpdatedSongs() {
touched_subdirs.clear(); touched_subdirs.clear();
} }
for (const Subdirectory &subdir : deleted_subdirs) {
if (watcher_->watched_dirs_.contains(dir_)) {
watcher_->RemoveWatch(watcher_->watched_dirs_[dir_], subdir);
}
}
deleted_subdirs.clear();
if (watcher_->monitor_) { if (watcher_->monitor_) {
// Watch the new subdirectories // Watch the new subdirectories
for (const Subdirectory &subdir : new_subdirs) { for (const Subdirectory &subdir : new_subdirs) {
if (watcher_->watched_dirs_.contains(dir_)) {
watcher_->AddWatch(watcher_->watched_dirs_[dir_], subdir.path); watcher_->AddWatch(watcher_->watched_dirs_[dir_], subdir.path);
} }
} }
}
new_subdirs.clear(); new_subdirs.clear();
} }
@ -329,10 +337,10 @@ void CollectionWatcher::ScanSubdirectory(const QString &path, const Subdirectory
// If a directory is moved then only its parent gets a changed notification, so we need to look and see if any of our children don't exist any more. // If a directory is moved then only its parent gets a changed notification, so we need to look and see if any of our children don't exist any more.
// If one has been removed, "rescan" it to get the deleted songs // If one has been removed, "rescan" it to get the deleted songs
SubdirectoryList previous_subdirs = t->GetImmediateSubdirs(path); SubdirectoryList previous_subdirs = t->GetImmediateSubdirs(path);
for (const Subdirectory &subdir : previous_subdirs) { for (const Subdirectory &prev_subdir : previous_subdirs) {
if (!QFile::exists(subdir.path) && subdir.path != path) { if (!QFile::exists(prev_subdir.path) && prev_subdir.path != path) {
t->AddToProgressMax(1); t->AddToProgressMax(1);
ScanSubdirectory(subdir.path, subdir, t, true); ScanSubdirectory(prev_subdir.path, prev_subdir, t, true);
} }
} }
@ -466,6 +474,10 @@ void CollectionWatcher::ScanSubdirectory(const QString &path, const Subdirectory
else else
t->touched_subdirs << updated_subdir; t->touched_subdirs << updated_subdir;
if (updated_subdir.mtime == 0) { // Subdirectory deleted, mark it for removal from the watcher.
t->deleted_subdirs << updated_subdir;
}
t->AddToProgress(1); t->AddToProgress(1);
if (live_scanning_) t->CommitNewOrUpdatedSongs(); if (live_scanning_) t->CommitNewOrUpdatedSongs();
@ -634,12 +646,26 @@ void CollectionWatcher::AddWatch(const Directory &dir, const QString &path) {
if (!QFile::exists(path)) return; if (!QFile::exists(path)) return;
qLog(Debug) << "Adding collection watch for" << path;
connect(fs_watcher_, SIGNAL(PathChanged(const QString&)), this, SLOT(DirectoryChanged(const QString&)), Qt::UniqueConnection); connect(fs_watcher_, SIGNAL(PathChanged(const QString&)), this, SLOT(DirectoryChanged(const QString&)), Qt::UniqueConnection);
fs_watcher_->AddPath(path); fs_watcher_->AddPath(path);
subdir_mapping_[path] = dir; subdir_mapping_[path] = dir;
} }
void CollectionWatcher::RemoveWatch(const Directory &dir, const Subdirectory &subdir) {
for (const QString &subdir_path : subdir_mapping_.keys(dir)) {
if (subdir_path != subdir.path) continue;
qLog(Debug) << "Removing collection watch for" << subdir_path;
fs_watcher_->RemovePath(subdir_path);
subdir_mapping_.remove(subdir_path);
break;
}
}
void CollectionWatcher::RemoveDirectory(const Directory &dir) { void CollectionWatcher::RemoveDirectory(const Directory &dir) {
rescan_queue_.remove(dir.id); rescan_queue_.remove(dir.id);
@ -647,6 +673,7 @@ void CollectionWatcher::RemoveDirectory(const Directory &dir) {
// Stop watching the directory's subdirectories // Stop watching the directory's subdirectories
for (const QString &subdir_path : subdir_mapping_.keys(dir)) { for (const QString &subdir_path : subdir_mapping_.keys(dir)) {
qLog(Debug) << "Removing collection watch for" << subdir_path;
fs_watcher_->RemovePath(subdir_path); fs_watcher_->RemovePath(subdir_path);
subdir_mapping_.remove(subdir_path); subdir_mapping_.remove(subdir_path);
} }
@ -687,7 +714,7 @@ void CollectionWatcher::DirectoryChanged(const QString &subdir) {
void CollectionWatcher::RescanPathsNow() { void CollectionWatcher::RescanPathsNow() {
for (int dir : rescan_queue_.keys()) { for (int dir : rescan_queue_.keys()) {
if (stop_requested_) return; if (stop_requested_) break;
ScanTransaction transaction(this, dir, false, false, prevent_delete_); ScanTransaction transaction(this, dir, false, false, prevent_delete_);
transaction.AddToProgressMax(rescan_queue_[dir].count()); transaction.AddToProgressMax(rescan_queue_[dir].count());

2
src/collection/collectionwatcher.h
View File

@ -114,6 +114,7 @@ signals:
SongList touched_songs; SongList touched_songs;
SubdirectoryList new_subdirs; SubdirectoryList new_subdirs;
SubdirectoryList touched_subdirs; SubdirectoryList touched_subdirs;
SubdirectoryList deleted_subdirs;
private: private:
ScanTransaction(const ScanTransaction&) {} ScanTransaction(const ScanTransaction&) {}
@ -161,6 +162,7 @@ signals:
QString PickBestImage(const QStringList &images); QString PickBestImage(const QStringList &images);
QUrl ImageForSong(const QString &path, QMap<QString, QStringList> &album_art); QUrl ImageForSong(const QString &path, QMap<QString, QStringList> &album_art);
void AddWatch(const Directory &dir, const QString &path); void AddWatch(const Directory &dir, const QString &path);
void RemoveWatch(const Directory &dir, const Subdirectory &subdir);
uint GetMtimeForCue(const QString &cue_path); uint GetMtimeForCue(const QString &cue_path);
void PerformScan(bool incremental, bool ignore_mtimes); void PerformScan(bool incremental, bool ignore_mtimes);