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

Some ScanController cleanup

Browse Source
This commit is contained in:
Jeff Mitchell
2012-06-30 15:14:19 -04:00
parent e7dda25cac
commit c1ec90b825
1 changed files with 26 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -141,13 +141,19 @@ ScanManager::runFullRescan()
void void
ScanManager::runNormalScan( bool manualFull ) ScanManager::runNormalScan( bool manualFull )
{ {
tDebug( LOGVERBOSE ) << Q_FUNC_INFO; if ( !Database::instance() || ( Database::instance() && !Database::instance()->isReady() ) )
{
tLog() << Q_FUNC_INFO << "Error...Database is not ready, but should be";
return;
}
if ( QThread::currentThread() != ScanManager::instance()->thread() ) if ( QThread::currentThread() != ScanManager::instance()->thread() )
{
QMetaObject::invokeMethod( this, "runNormalScan", Qt::QueuedConnection, Q_ARG( bool, manualFull ) );
return; return;
}
if ( !Database::instance() || ( Database::instance() && !Database::instance()->isReady() ) ) tDebug( LOGVERBOSE ) << Q_FUNC_INFO;
return;
if ( m_musicScannerThreadController || !m_scanner.isNull() ) //still running if these are not zero if ( m_musicScannerThreadController || !m_scanner.isNull() ) //still running if these are not zero
{ {
@@ -178,16 +184,23 @@ ScanManager::runNormalScan( bool manualFull )
void void
ScanManager::runFileScan( const QStringList &paths ) ScanManager::runFileScan( const QStringList &paths )
{ {
tDebug( LOGVERBOSE ) << Q_FUNC_INFO; if ( !Database::instance() || ( Database::instance() && !Database::instance()->isReady() ) )
if ( QThread::currentThread() != ScanManager::instance()->thread() ) {
tLog() << Q_FUNC_INFO << "Error...Database is not ready, but should be";
return; return;
}
if ( QThread::currentThread() != ScanManager::instance()->thread() )
{
QMetaObject::invokeMethod( this, "runFileScan", Qt::QueuedConnection, Q_ARG( QStringList, paths ) );
return;
}
tDebug( LOGVERBOSE ) << Q_FUNC_INFO;
foreach( const QString& path, paths ) foreach( const QString& path, paths )
m_currScannerPaths.insert( path ); m_currScannerPaths.insert( path );
if ( !Database::instance() || ( Database::instance() && !Database::instance()->isReady() ) )
return;
if ( m_musicScannerThreadController || !m_scanner.isNull() ) //still running if these are not zero if ( m_musicScannerThreadController || !m_scanner.isNull() ) //still running if these are not zero
{ {
tDebug( LOGVERBOSE ) << "Could not run file scan, old scan still running"; tDebug( LOGVERBOSE ) << "Could not run file scan, old scan still running";
@@ -235,7 +248,7 @@ ScanManager::runScan()
QStringList paths = m_currScannerPaths.empty() ? TomahawkSettings::instance()->scannerPaths() : m_currScannerPaths.toList(); QStringList paths = m_currScannerPaths.empty() ? TomahawkSettings::instance()->scannerPaths() : m_currScannerPaths.toList();
if ( m_musicScannerThreadController || !m_scanner.isNull() ) //still running if these are not zero if ( m_musicScannerThreadController && m_scanner.isNull() )
{ {
m_scanner = QWeakPointer< MusicScanner >( new MusicScanner( m_currScanMode, paths ) ); m_scanner = QWeakPointer< MusicScanner >( new MusicScanner( m_currScanMode, paths ) );
m_scanner.data()->moveToThread( m_musicScannerThreadController ); m_scanner.data()->moveToThread( m_musicScannerThreadController );
@@ -243,10 +256,6 @@ ScanManager::runScan()
m_musicScannerThreadController->start( QThread::IdlePriority ); m_musicScannerThreadController->start( QThread::IdlePriority );
QMetaObject::invokeMethod( m_scanner.data(), "startScan" ); QMetaObject::invokeMethod( m_scanner.data(), "startScan" );
} }
else
{
QTimer::singleShot( 200, this, SLOT( runScan() ) );
}
} }
@@ -254,7 +263,7 @@ void
ScanManager::scannerFinished() ScanManager::scannerFinished()
{ {
tLog( LOGVERBOSE ) << Q_FUNC_INFO; tLog( LOGVERBOSE ) << Q_FUNC_INFO;
if ( m_musicScannerThreadController && !m_scanner.isNull() ) if ( !m_scanner.isNull() )
{ {
m_musicScannerThreadController->quit(); m_musicScannerThreadController->quit();
m_musicScannerThreadController->wait( 60000 ); m_musicScannerThreadController->wait( 60000 );
@@ -265,7 +274,7 @@ ScanManager::scannerFinished()
} }
m_scanTimer->start(); m_scanTimer->start();
m_currScannerPaths = QSet< QString >(); m_currScannerPaths.clear();
SourceList::instance()->getLocal()->scanningFinished( 0 ); SourceList::instance()->getLocal()->scanningFinished( 0 );
emit finished(); emit finished();
} }