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

Merge pull request #4161 from BrummbQ/master

Browse Source 
don't rescan unchanged files if library has been unavailable.  Fixes #3032
This commit is contained in:
David Sansome 2014-02-07 22:45:55 +11:00
commit eaf182a59a
5 changed files with 28 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/library/library.cpp
View File

@ -126,6 +126,8 @@ void Library::Init() {
backend_, SLOT(UpdateMTimesOnly(SongList)));
connect(watcher_, SIGNAL(SongsDeleted(SongList)),
backend_, SLOT(MarkSongsUnavailable(SongList)));
connect(watcher_, SIGNAL(SongsReadded(SongList,bool)),
backend_, SLOT(MarkSongsUnavailable(SongList,bool)));
connect(watcher_, SIGNAL(SubdirsDiscovered(SubdirectoryList)),
backend_, SLOT(AddOrUpdateSubdirs(SubdirectoryList)));
connect(watcher_, SIGNAL(SubdirsMTimeUpdated(SubdirectoryList)),

6
src/library/librarybackend.cpp
View File

@ -445,12 +445,12 @@ void LibraryBackend::DeleteSongs(const SongList &songs) {
UpdateTotalSongCountAsync();
}
void LibraryBackend::MarkSongsUnavailable(const SongList &songs) {
void LibraryBackend::MarkSongsUnavailable(const SongList& songs, bool unavailable) {
QMutexLocker l(db_->Mutex());
QSqlDatabase db(db_->Connect());
QSqlQuery remove(QString("UPDATE %1 SET unavailable = 1 WHERE ROWID = :id")
.arg(songs_table_), db);
QSqlQuery remove(QString("UPDATE %1 SET unavailable = %2 WHERE ROWID = :id")
.arg(songs_table_).arg(int(unavailable)), db);
ScopedTransaction transaction(&db);
foreach (const Song& song, songs) {

2
src/library/librarybackend.h
View File

@ -174,7 +174,7 @@ class LibraryBackend : public LibraryBackendInterface {
void AddOrUpdateSongs(const SongList& songs);
void UpdateMTimesOnly(const SongList& songs);
void DeleteSongs(const SongList& songs);
void MarkSongsUnavailable(const SongList& songs);
void MarkSongsUnavailable(const SongList& songs, bool unavailable = true);
void AddOrUpdateSubdirs(const SubdirectoryList& subdirs);
void UpdateCompilations();
void UpdateManualAlbumArt(const QString& artist, const QString& album, const QString& art);

11
src/library/librarywatcher.cpp
View File

@ -108,6 +108,9 @@ LibraryWatcher::ScanTransaction::~ScanTransaction() {
if (!deleted_songs.isEmpty())
emit watcher_->SongsDeleted(deleted_songs);
if (!readded_songs.isEmpty())
emit watcher_->SongsReadded(readded_songs);
if (!new_subdirs.isEmpty())
emit watcher_->SubdirsDiscovered(new_subdirs);
@ -323,8 +326,7 @@ void LibraryWatcher::ScanSubdirectory(
// watch out for cue songs which have their mtime equal to qMax(media_file_mtime, cue_sheet_mtime)
bool changed = (matching_song.mtime() != qMax(file_info.lastModified().toTime_t(), song_cue_mtime))
|| cue_deleted || cue_added
|| matching_song.is_unavailable();
|| cue_deleted || cue_added;
// Also want to look to see whether the album art has changed
QString image = ImageForSong(file, album_art);
@ -347,6 +349,11 @@ void LibraryWatcher::ScanSubdirectory(
UpdateNonCueAssociatedSong(file, matching_song, image, cue_deleted, t);
}
}
// nothing has changed - mark the song available without re-scanning
if (matching_song.is_unavailable())
t->readded_songs << matching_song;
} else {
// The song is on disk but not in the DB
SongList song_list = ScanNewFile(file, path, matching_cue, &cues_processed);

2
src/library/librarywatcher.h
View File

@ -57,6 +57,7 @@ class LibraryWatcher : public QObject {
void NewOrUpdatedSongs(const SongList& songs);
void SongsMTimeUpdated(const SongList& songs);
void SongsDeleted(const SongList& songs);
void SongsReadded(const SongList& songs, bool unavailable = false);
void SubdirsDiscovered(const SubdirectoryList& subdirs);
void SubdirsMTimeUpdated(const SubdirectoryList& subdirs);
void CompilationsNeedUpdating();
@ -99,6 +100,7 @@ class LibraryWatcher : public QObject {
bool ignores_mtime() const { return ignores_mtime_; }
SongList deleted_songs;
SongList readded_songs;
SongList new_songs;
SongList touched_songs;
SubdirectoryList new_subdirs;