mirror of
https://github.com/tomahawk-player/tomahawk.git
synced 2025-08-09 23:57:34 +02:00
Emit scanning progress from ScanManager. Don't update the local source directly.
This commit is contained in:
@@ -213,10 +213,7 @@ MusicScanner::startScan()
|
|||||||
m_scanned = m_skipped = m_cmdQueue = 0;
|
m_scanned = m_skipped = m_cmdQueue = 0;
|
||||||
m_skippedFiles.clear();
|
m_skippedFiles.clear();
|
||||||
|
|
||||||
if ( m_showProgress )
|
emit progress( m_scanned );
|
||||||
{
|
|
||||||
SourceList::instance()->getLocal()->scanningProgress( m_scanned );
|
|
||||||
}
|
|
||||||
|
|
||||||
// trigger the scan once we've loaded old filemtimes
|
// trigger the scan once we've loaded old filemtimes
|
||||||
//FIXME: For multiple collection support make sure the right prefix gets passed in...or not...
|
//FIXME: For multiple collection support make sure the right prefix gets passed in...or not...
|
||||||
@@ -467,8 +464,9 @@ MusicScanner::readFile( const QFileInfo& fi )
|
|||||||
const QVariant m = readTags( fi );
|
const QVariant m = readTags( fi );
|
||||||
|
|
||||||
if ( m_scanned )
|
if ( m_scanned )
|
||||||
if ( m_scanned % 3 == 0 && m_showProgress )
|
if ( m_scanned % 3 == 0 )
|
||||||
SourceList::instance()->getLocal()->scanningProgress( m_scanned );
|
emit progress( m_scanned );
|
||||||
|
|
||||||
if ( m_scanned % 100 == 0 || m_verbose )
|
if ( m_scanned % 100 == 0 || m_verbose )
|
||||||
tDebug( LOGINFO ) << "Scanning file:" << m_scanned << fi.canonicalFilePath();
|
tDebug( LOGINFO ) << "Scanning file:" << m_scanned << fi.canonicalFilePath();
|
||||||
|
|
||||||
|
@@ -130,6 +130,7 @@ signals:
|
|||||||
//void fileScanned( QVariantMap );
|
//void fileScanned( QVariantMap );
|
||||||
void finished();
|
void finished();
|
||||||
void batchReady( const QVariantList&, const QVariantList& );
|
void batchReady( const QVariantList&, const QVariantList& );
|
||||||
|
void progress( unsigned int files );
|
||||||
|
|
||||||
private:
|
private:
|
||||||
QVariant readFile( const QFileInfo& fi );
|
QVariant readFile( const QFileInfo& fi );
|
||||||
|
@@ -1,6 +1,6 @@
|
|||||||
/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
|
/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
|
||||||
*
|
*
|
||||||
* Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
|
* Copyright 2010-2014, Christian Muehlhaeuser <muesli@tomahawk-player.org>
|
||||||
* Copyright 2010-2012, Jeff Mitchell <jeff@tomahawk-player.org>
|
* Copyright 2010-2012, Jeff Mitchell <jeff@tomahawk-player.org>
|
||||||
*
|
*
|
||||||
* Tomahawk is free software: you can redistribute it and/or modify
|
* Tomahawk is free software: you can redistribute it and/or modify
|
||||||
@@ -56,6 +56,7 @@ MusicScannerThreadController::run()
|
|||||||
{
|
{
|
||||||
m_musicScanner = QPointer< MusicScanner >( new MusicScanner( m_mode, m_paths, m_bs ) );
|
m_musicScanner = QPointer< MusicScanner >( new MusicScanner( m_mode, m_paths, m_bs ) );
|
||||||
connect( m_musicScanner.data(), SIGNAL( finished() ), parent(), SLOT( scannerFinished() ), Qt::QueuedConnection );
|
connect( m_musicScanner.data(), SIGNAL( finished() ), parent(), SLOT( scannerFinished() ), Qt::QueuedConnection );
|
||||||
|
connect( m_musicScanner.data(), SIGNAL( progress( unsigned int ) ), parent(), SIGNAL( progress( unsigned int ) ), Qt::QueuedConnection );
|
||||||
QMetaObject::invokeMethod( m_musicScanner.data(), "startScan", Qt::QueuedConnection );
|
QMetaObject::invokeMethod( m_musicScanner.data(), "startScan", Qt::QueuedConnection );
|
||||||
|
|
||||||
exec();
|
exec();
|
||||||
|
@@ -52,7 +52,7 @@ private:
|
|||||||
QPointer< MusicScanner > m_musicScanner;
|
QPointer< MusicScanner > m_musicScanner;
|
||||||
MusicScanner::ScanMode m_mode;
|
MusicScanner::ScanMode m_mode;
|
||||||
QStringList m_paths;
|
QStringList m_paths;
|
||||||
quint32 m_bs;
|
quint32 m_bs;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
@@ -67,6 +67,8 @@ public:
|
|||||||
virtual ~ScanManager();
|
virtual ~ScanManager();
|
||||||
|
|
||||||
signals:
|
signals:
|
||||||
|
void started();
|
||||||
|
void progress( unsigned int files );
|
||||||
void finished();
|
void finished();
|
||||||
|
|
||||||
public slots:
|
public slots:
|
||||||
|
Reference in New Issue
Block a user