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

CollectionWatcher: Make const

This commit is contained in:
Jonas Kvinge 2024-08-08 17:13:14 +02:00
parent e8f64bfe8f
commit d5d2eaba8a
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/collection/collectionwatcher.cpp
View File

@ -72,7 +72,7 @@
using namespace std::chrono_literals; using namespace std::chrono_literals;
QStringList CollectionWatcher::sValidImages = QStringList() << QStringLiteral("jpg") << QStringLiteral("png") << QStringLiteral("gif") << QStringLiteral("jpeg"); QStringList CollectionWatcher::sValidImages = QStringList() << QStringLiteral("jpg") << QStringLiteral("png") << QStringLiteral("gif") << QStringLiteral("jpeg");
QStringList CollectionWatcher::kIgnoredExtensions = QStringList() << QStringLiteral("tmp") << QStringLiteral("tar") << QStringLiteral("gz") << QStringLiteral("bz2") << QStringLiteral("xz") << QStringLiteral("tbz") << QStringLiteral("tgz") << QStringLiteral("z") << QStringLiteral("zip") << QStringLiteral("rar"); 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) CollectionWatcher::CollectionWatcher(Song::Source source, QObject *parent)
: QObject(parent), : QObject(parent),
@ -1013,8 +1013,8 @@ void CollectionWatcher::RemoveDirectory(const CollectionDirectory &dir) {
watched_dirs_.remove(dir.id); watched_dirs_.remove(dir.id);
// Stop watching the directory's subdirectories // Stop watching the directory's subdirectories
QStringList subdir_paths = subdir_mapping_.keys(dir); const QStringList subdir_paths = subdir_mapping_.keys(dir);
for (const QString &subdir_path : std::as_const(subdir_paths)) { for (const QString &subdir_path : subdir_paths) {
fs_watcher_->RemovePath(subdir_path); fs_watcher_->RemovePath(subdir_path);
subdir_mapping_.remove(subdir_path); subdir_mapping_.remove(subdir_path);
} }
@ -1035,8 +1035,8 @@ bool CollectionWatcher::FindSongsByPath(const SongList &songs, const QString &pa
bool CollectionWatcher::FindSongsByFingerprint(const QString &file, const QString &fingerprint, SongList *out) { bool CollectionWatcher::FindSongsByFingerprint(const QString &file, const QString &fingerprint, SongList *out) {
SongList songs = backend_->GetSongsByFingerprint(fingerprint); const SongList songs = backend_->GetSongsByFingerprint(fingerprint);
for (const Song &song : std::as_const(songs)) { for (const Song &song : songs) {
QString filename = song.url().toLocalFile(); QString filename = song.url().toLocalFile();
QFileInfo info(filename); QFileInfo info(filename);
// Allow mulitiple songs in different directories with the same fingerprint. // Allow mulitiple songs in different directories with the same fingerprint.

2
src/collection/collectionwatcher.h
View File

@ -245,7 +245,7 @@ class CollectionWatcher : public QObject {
CueParser *cue_parser_; CueParser *cue_parser_;
static QStringList sValidImages; static QStringList sValidImages;
static QStringList kIgnoredExtensions; static const QStringList kIgnoredExtensions;
qint64 last_scan_time_; qint64 last_scan_time_;