mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-04-22 08:52:12 +02:00
Code Issues Releases Wiki Activity

* Fixed havoc causing bool-comparison in ScanManager. Added bool param to runFileScan which triggers whether the GUI is updated when scanning is finished.

Browse Source
This commit is contained in:
Christian Muehlhaeuser 2012-11-16 07:12:36 +01:00
parent 75efa60c44
commit 4902bac904
2 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/libtomahawk/filemetadata/ScanManager.cpp
View File

@ -51,6 +51,7 @@ ScanManager::ScanManager( QObject* parent )
, m_currScannerPaths()
, m_cachedScannerDirs()
, m_queuedScanType( None )
, m_updateGUI( true )
{
s_instance = this;
@ -131,6 +132,7 @@ ScanManager::scanTimerTimeout()
runNormalScan();
}
void
ScanManager::runFullRescan()
{
@ -138,13 +140,12 @@ ScanManager::runFullRescan()
}
void
ScanManager::runNormalScan( bool manualFull )
{
if ( !Database::instance() || ( Database::instance() && !Database::instance()->isReady() ) )
{
tLog() << Q_FUNC_INFO << "Error...Database is not ready, but should be";
tLog() << Q_FUNC_INFO << "Error... Database is not ready, but should be";
return;
}
@ -184,11 +185,11 @@ ScanManager::runNormalScan( bool manualFull )
void
ScanManager::runFileScan( const QStringList &paths )
ScanManager::runFileScan( const QStringList& paths, bool updateGUI )
{
if ( !Database::instance() || ( Database::instance() && !Database::instance()->isReady() ) )
{
tLog() << Q_FUNC_INFO << "Error...Database is not ready, but should be";
tLog() << Q_FUNC_INFO << "Error... Database is not ready, but should be";
return;
}
@ -214,6 +215,7 @@ ScanManager::runFileScan( const QStringList &paths )
m_scanTimer->stop();
m_musicScannerThreadController = new QThread( this );
m_currScanMode = FileScan;
m_updateGUI = updateGUI;
QMetaObject::invokeMethod( this, "runScan", Qt::QueuedConnection );
}
@ -276,10 +278,11 @@ ScanManager::scannerFinished()
m_musicScannerThreadController = 0;
}
SourceList::instance()->getLocal()->scanningFinished();
SourceList::instance()->getLocal()->scanningFinished( m_updateGUI );
m_updateGUI = true;
emit finished();
if ( !m_queuedScanType == File )
if ( m_queuedScanType != File )
m_currScannerPaths.clear();
switch ( m_queuedScanType )
{
@ -288,7 +291,7 @@ ScanManager::scannerFinished()
QMetaObject::invokeMethod( this, "runNormalScan", Qt::QueuedConnection, Q_ARG( bool, m_queuedScanType == Full ) );
break;
case File:
QMetaObject::invokeMethod( this, "runFileScan", Qt::QueuedConnection, Q_ARG( QStringList, QStringList() ) );
QMetaObject::invokeMethod( this, "", Qt::QueuedConnection, Q_ARG( QStringList, QStringList() ) );
break;
default:
break;

6
src/libtomahawk/filemetadata/ScanManager.h
View File

@ -42,7 +42,7 @@ Q_OBJECT
public:
enum ScanMode { DirScan, FileScan };
enum ScanType { None, Full, Normal, File };
static ScanManager* instance();
explicit ScanManager( QObject* parent = 0 );
@ -52,7 +52,7 @@ signals:
void finished();
public slots:
void runFileScan( const QStringList &paths = QStringList() );
void runFileScan( const QStringList& paths = QStringList(), bool updateGUI = true );
void runFullRescan();
void runNormalScan( bool manualFull = false );
@ -79,6 +79,8 @@ private:
QTimer* m_scanTimer;
ScanType m_queuedScanType;
bool m_updateGUI;
};
#endif