dryark/strawberry
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CollectionWatcher: Fix rescan songs feature

Browse Source
This commit is contained in:
Jonas Kvinge
2023-03-25 16:38:03 +01:00
parent 4de912cf41
commit b02ac833ad
3 changed files with 37 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/collection/collectionwatcher.h
View File

@@ -59,7 +59,6 @@ class CollectionWatcher : public QObject {
void IncrementalScanAsync();
void FullScanAsync();
void RescanTracksAsync(const SongList &songs);
void SetRescanPausedAsync(const bool pause);
void ReloadSettingsAsync();
@@ -68,6 +67,8 @@ class CollectionWatcher : public QObject {
void ExitAsync();
void RescanSongsAsync(const SongList &songs);
signals:
void NewOrUpdatedSongs(SongList);
void SongsMTimeUpdated(SongList);
@@ -166,9 +167,9 @@ class CollectionWatcher : public QObject {
void IncrementalScanCheck();
void IncrementalScanNow();
void FullScanNow();
void RescanTracksNow();
void RescanPathsNow();
void ScanSubdirectory(const QString &path, const CollectionSubdirectory &subdir, const quint64 files_count, CollectionWatcher::ScanTransaction *t, const bool force_noincremental = false);
void RescanSongs(const SongList &songs);
private:
static bool FindSongsByPath(const SongList &songs, const QString &path, SongList *out);
@@ -223,7 +224,6 @@ class CollectionWatcher : public QObject {
bool stop_requested_;
bool abort_requested_;
bool rescan_in_progress_; // True if RescanTracksNow() has been called and is working.
QMap<int, CollectionDirectory> watched_dirs_;
QTimer *rescan_timer_;
@@ -237,8 +237,6 @@ class CollectionWatcher : public QObject {
static QStringList sValidImages;
SongList song_rescan_queue_; // Set by UI thread
qint64 last_scan_time_;
};