From ee5bc16e4735a62055c67f433db9aafb4ef5edf6 Mon Sep 17 00:00:00 2001 From: Jonas Kvinge Date: Sat, 24 Aug 2024 21:10:52 +0200 Subject: [PATCH] CollectionWatcher: Use Song::kRejectedExtensions --- src/collection/collectionwatcher.cpp | 3 +-- src/collection/collectionwatcher.h | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/collection/collectionwatcher.cpp b/src/collection/collectionwatcher.cpp index 9d5b17496..4a03820dd 100644 --- a/src/collection/collectionwatcher.cpp +++ b/src/collection/collectionwatcher.cpp @@ -73,7 +73,6 @@ using namespace std::chrono_literals; QStringList CollectionWatcher::sValidImages = QStringList() << QStringLiteral("jpg") << QStringLiteral("png") << QStringLiteral("gif") << QStringLiteral("jpeg"); -const QStringList CollectionWatcher::kIgnoredExtensions = QStringList() << QStringLiteral("tmp") << QStringLiteral("tar") << QStringLiteral("gz") << QStringLiteral("bz2") << QStringLiteral("xz") << QStringLiteral("tbz") << QStringLiteral("tgz") << QStringLiteral("z") << QStringLiteral("zip") << QStringLiteral("rar"); CollectionWatcher::CollectionWatcher(Song::Source source, QObject *parent) : QObject(parent), @@ -558,7 +557,7 @@ void CollectionWatcher::ScanSubdirectory(const QString &path, const CollectionSu else { QString ext_part(ExtensionPart(child)); QString dir_part(DirectoryPart(child)); - if (kIgnoredExtensions.contains(child_info.suffix(), Qt::CaseInsensitive) || child_info.baseName() == QLatin1String("qt_temp")) { + if (Song::kRejectedExtensions.contains(child_info.suffix(), Qt::CaseInsensitive) || child_info.baseName() == QLatin1String("qt_temp")) { t->AddToProgress(1); } else if (sValidImages.contains(ext_part)) { diff --git a/src/collection/collectionwatcher.h b/src/collection/collectionwatcher.h index 6cc41c6b0..fe2c202b4 100644 --- a/src/collection/collectionwatcher.h +++ b/src/collection/collectionwatcher.h @@ -253,7 +253,6 @@ class CollectionWatcher : public QObject { CueParser *cue_parser_; static QStringList sValidImages; - static const QStringList kIgnoredExtensions; qint64 last_scan_time_;