Funkwhale
/
strawberry-audio-player-windows-mac-linux
mirror of https://github.com/strawberrymusicplayer/strawberry
1
0
Fork 0
Code Issues Releases Wiki Activity

CollectionWatcher: Remove broken nomedia/nomusic handling 

It causes songs to be stuck when adding a nomedia file to an existing
directory.
This commit is contained in:
Jonas Kvinge 2022-01-28 23:56:10 +01:00
parent cd9f8b569b
commit 0dbf3b462b
1 changed files with 0 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/collection/collectionwatcher.cpp
View File

@ -68,11 +68,6 @@
using namespace std::chrono_literals;
namespace {
static const char *kNoMediaFile = ".nomedia";
static const char *kNoMusicFile = ".nomusic";
} // namespace
QStringList CollectionWatcher::sValidImages = QStringList() << "jpg" << "png" << "gif" << "jpeg";
CollectionWatcher::CollectionWatcher(Song::Source source, QObject *parent)
@ -419,7 +414,6 @@ void CollectionWatcher::AddDirectory(const Directory &dir, const SubdirectoryLis
void CollectionWatcher::ScanSubdirectory(const QString &path, const Subdirectory &subdir, const quint64 files_count, ScanTransaction *t, const 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()) {
@ -431,11 +425,6 @@ void CollectionWatcher::ScanSubdirectory(const QString &path, const Subdirectory
}
}
// Do not scan directories containing a .nomedia or .nomusic file
if (path_dir.exists(kNoMediaFile) || path_dir.exists(kNoMusicFile)) {
return;
}
bool songs_missing_fingerprint = false;
#ifdef HAVE_SONGFINGERPRINTING
if (song_tracking_) {
@ -1226,9 +1215,6 @@ quint64 CollectionWatcher::FilesCountForPath(ScanTransaction *t, const QString &
QFileInfo path_info(child);
if (path_info.isDir()) {
if (path_info.exists(kNoMediaFile) || path_info.exists(kNoMusicFile)) {
continue;
}
if (path_info.isSymLink()) {
QString real_path = path_info.symLinkTarget();
for (const Directory &dir : std::as_const(watched_dirs_)) {