mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-14 18:14:50 +02:00
Code Issues Releases Wiki Activity

Use a hashmap for state tracking.

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2015-03-25 10:00:36 +01:00
parent 77eed10a19
commit e94363ba4f
2 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/libtomahawk/DownloadManager.cpp
View File

@@ -46,7 +46,11 @@ DownloadManager::DownloadManager()
QVariantList downloads = TomahawkSettings::instance()->downloadStates(); QVariantList downloads = TomahawkSettings::instance()->downloadStates();
foreach ( const QVariant& download, downloads ) foreach ( const QVariant& download, downloads )
{ {
m_downloadStates << download.toMap(); QVariantMap map = download.toMap();
QString localFile = map[ "localfile" ].toString();
QFileInfo fi( localFile );
if ( fi.exists() )
m_downloadStates[ map[ "url" ].toString() ] = map;
} }
QTimer::singleShot( 0, this, SLOT( resumeJobs() ) ); QTimer::singleShot( 0, this, SLOT( resumeJobs() ) );
@@ -64,17 +68,15 @@ DownloadManager::~DownloadManager()
QString QString
DownloadManager::localFileForDownload( const QString& url ) const DownloadManager::localFileForDownload( const QString& url ) const
{ {
foreach ( const QVariantMap& map, m_downloadStates ) if ( m_downloadStates.contains( url ) )
{ {
tDebug() << "Found known download:" << map["url"] << map["localfile"]; QVariantMap map = m_downloadStates[ url ];
tDebug() << "Looking for download:" << url; // tDebug() << "Found known download:" << map["url"] << map["localfile"];
if ( map[ "url" ].toString() == url ) // tDebug() << "Looking for download:" << url;
{ QString localFile = map[ "localfile" ].toString();
QString localFile = map[ "localfile" ].toString(); QFileInfo fi( localFile );
QFileInfo fi( localFile ); if ( fi.exists() )
if ( fi.exists() ) return localFile;
return localFile;
}
} }
return QString(); return QString();
@@ -94,7 +96,7 @@ DownloadManager::storeJobs( const QList<downloadjob_ptr>& jobs )
map[ "url" ] = job->format().url; map[ "url" ] = job->format().url;
map[ "localfile" ] = job->localFile(); map[ "localfile" ] = job->localFile();
m_downloadStates << map; m_downloadStates[ map[ "url" ].toString() ] = map;
downloads << map; downloads << map;
} }

2
src/libtomahawk/DownloadManager.h
View File

@@ -67,7 +67,7 @@ private slots:
private: private:
QList< downloadjob_ptr > m_jobs; QList< downloadjob_ptr > m_jobs;
bool m_globalState; bool m_globalState;
QList<QVariantMap> m_downloadStates; QHash<QString, QVariantMap> m_downloadStates;
static DownloadManager* s_instance; static DownloadManager* s_instance;
}; };