From edaabc0ae63f497a5709c83901f31f8cf3c27134 Mon Sep 17 00:00:00 2001 From: Jeff Mitchell Date: Tue, 19 Apr 2011 15:57:13 -0400 Subject: [PATCH] Efficiency++ --- .../infosystem/infosystemcache.cpp | 26 ++++++++++++------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/src/libtomahawk/infosystem/infosystemcache.cpp b/src/libtomahawk/infosystem/infosystemcache.cpp index ba019a2a1..f212cad48 100644 --- a/src/libtomahawk/infosystem/infosystemcache.cpp +++ b/src/libtomahawk/infosystem/infosystemcache.cpp @@ -169,6 +169,11 @@ InfoSystemCache::loadCache( Tomahawk::InfoSystem::InfoType type, const QString & qDebug() << "Checking files in dir " << dir.canonicalPath(); QFileInfoList files = dir.entryInfoList( QDir::Files ); qDebug() << "Found " << files.size() << " files"; + + QHash< InfoCriteriaHash, QVariant > dataHash = m_dataCache[type]; + QHash< InfoCriteriaHash, QDateTime > insertDateHash = m_insertTimeCache[type]; + QHash< InfoCriteriaHash, QDateTime > maxDateHash = m_maxTimeCache[type]; + QHash< InfoCriteriaHash, QString > fileLocationHash = m_fileLocationCache[type]; foreach ( QFileInfo file, files ) { @@ -183,10 +188,7 @@ InfoSystemCache::loadCache( Tomahawk::InfoSystem::InfoType type, const QString & QSettings cachedSettings( file.canonicalFilePath(), QSettings::IniFormat ); - QHash< InfoCriteriaHash, QVariant > dataHash = m_dataCache[type]; - QHash< InfoCriteriaHash, QDateTime > insertDateHash = m_insertTimeCache[type]; - QHash< InfoCriteriaHash, QDateTime > maxDateHash = m_maxTimeCache[type]; - QHash< InfoCriteriaHash, QString > fileLocationHash = m_fileLocationCache[type]; + InfoCriteriaHash criteria; cachedSettings.beginGroup( "criteria" ); foreach ( QString key, cachedSettings.childKeys() ) @@ -196,12 +198,13 @@ InfoSystemCache::loadCache( Tomahawk::InfoSystem::InfoType type, const QString & insertDateHash[criteria] = cachedSettings.value( "inserttime" ).toDateTime(); maxDateHash[criteria] = QDateTime::fromMSecsSinceEpoch( file.baseName().toLongLong() ); fileLocationHash[criteria] = file.canonicalFilePath(); - m_dataCache[type] = dataHash; - m_insertTimeCache[type] = insertDateHash; - m_maxTimeCache[type] = maxDateHash; - m_fileLocationCache[type] = fileLocationHash; } - + + m_dataCache[type] = dataHash; + m_insertTimeCache[type] = insertDateHash; + m_maxTimeCache[type] = maxDateHash; + m_fileLocationCache[type] = fileLocationHash; + m_cacheRemainingToLoad--; } @@ -221,6 +224,8 @@ InfoSystemCache::saveCache( Tomahawk::InfoSystem::InfoType type, const QString & } } + QHash< InfoCriteriaHash, QString > fileLocationHash = m_fileLocationCache[type]; + foreach ( InfoCriteriaHash criteria, m_dirtySet[type].values() ) { QString maxAge( QString::number( m_maxTimeCache[type][criteria].toMSecsSinceEpoch() ) ); @@ -246,9 +251,12 @@ InfoSystemCache::saveCache( Tomahawk::InfoSystem::InfoType type, const QString & cachedSettings.endGroup(); cachedSettings.setValue( "data", m_dataCache[type][criteria] ); cachedSettings.setValue( "inserttime", m_insertTimeCache[type][criteria] ); + fileLocationHash[criteria] = settingsFilePath; m_dirtySet[type].remove( criteria ); } + m_fileLocationCache[type] = fileLocationHash; + }