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

Don't scan directories with .nomedia or .nomusic files (#5327)

Browse Source
This commit is contained in:
Mildred Ki'Lya 2016-04-15 11:44:44 +02:00 committed by John Maguire
parent 11670e1760
commit 3afa80bef0
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/library/librarywatcher.cpp
View File

@ -43,6 +43,11 @@
#undef RemoveDirectory
#endif
namespace {
static const char *kNoMediaFile = ".nomedia";
static const char *kNoMusicFile = ".nomusic";
}
QStringList LibraryWatcher::sValidImages;
const char* LibraryWatcher::kSettingsGroup = "LibraryWatcher";
@ -219,6 +224,7 @@ void LibraryWatcher::ScanSubdirectory(const QString& path,
ScanTransaction* t,
bool force_noincremental) {
QFileInfo path_info(path);
QDir path_dir(path);
// Do not scan symlinked dirs that are already in collection
if (path_info.isSymLink()) {
@ -231,6 +237,13 @@ void LibraryWatcher::ScanSubdirectory(const QString& path,
}
}
// Do not scan directories containing a .nomedia or .nomusic file
if (path_dir.exists(kNoMediaFile) ||
path_dir.exists(kNoMusicFile)) {
t->AddToProgress(1);
return;
}
if (!t->ignores_mtime() && !force_noincremental && t->is_incremental() &&
subdir.mtime == path_info.lastModified().toTime_t()) {
// The directory hasn't changed since last time