iiiypuk/cantata
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Simpify cache save logic

Browse Source
This commit is contained in:
craig.p.drummond
2014-04-02 17:40:14 +00:00
committed by craig.p.drummond
parent 654f9b264b
commit 6cc3f52f41
2 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
models/musiclibrarymodel.cpp
View File

@@ -454,9 +454,8 @@ void MusicLibraryModel::updateMusicLibrary(MusicLibraryItemRoot *newroot, QDateT
newroot->setUseAlbumImages(rootItem->useAlbumImages());
newroot->setUseArtistImages(rootItem->useArtistImages());
bool updatedSongs=false;
bool needToSave=dbUpdate>databaseTime;
bool needToSave=!databaseTime.isValid() || (dbUpdate.isValid() && dbUpdate.date().year()>2000 && dbUpdate>databaseTime);
bool incremental=rootItem->childCount() && newroot->childCount();
bool needToUpdate=!databaseTime.isValid();
if (incremental && !QFile::exists(cacheFileName())) {
incremental=false;
@@ -495,7 +494,7 @@ void MusicLibraryModel::updateMusicLibrary(MusicLibraryItemRoot *newroot, QDateT
databaseTime=QDateTime::currentDateTime();
}
if ((updatedSongs || needToUpdate) && (!fromFile && (needToSave || needToUpdate))) {
if (needToSave || updatedSongs) {
rootItem->toXML(cacheFileName(), databaseTime, databaseTimeUnreliable);
}
@@ -507,8 +506,8 @@ void MusicLibraryModel::updatingMpd()
{
// MPD/Mopidy is being updated. If MPD's database-time is not reliable (as is the case for older proxy DBs, and Mopidy)
// then we set the databaseTime to NOW when updated. This means we will miss any updates. So, for these scenarios, when
// a users presses 'Refresh Database' in Cantata's main window, we need to reset our view of the databaseTime to null, s
// that we update. This does mean that we will ALWAYS fetch the whole listing - but we have n oway of knowing if it changed
// a user presses 'Refresh Database' in Cantata's main window, we need to reset our view of the databaseTime to null, so
// that we update. This does mean that we will ALWAYS fetch the whole listing - but we have no way of knowing if it changed
// or not :-(
if (databaseTimeUnreliable) {
removeCache();