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

Remove confusing manualFull variable that got passed all the way into

Browse Source 
scanners, use faster delete command when doing a full rescan
This commit is contained in:
Jeff Mitchell
2011-09-30 18:00:59 -04:00
parent ff764df4af
commit e47b750d21
3 changed files with 15 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/musicscanner.cpp
View File

@@ -39,7 +39,6 @@ void
DirLister::go() DirLister::go()
{ {
tLog() << Q_FUNC_INFO << "Recursive? :" << (m_recursive ? "true" : "false"); tLog() << Q_FUNC_INFO << "Recursive? :" << (m_recursive ? "true" : "false");
tLog() << Q_FUNC_INFO << "Manual full? :" << (m_manualFull ? "true" : "false");
if ( !m_recursive ) if ( !m_recursive )
{ {
@@ -100,16 +99,15 @@ DirLister::scanDir( QDir dir, int depth, DirLister::Mode mode )
const uint mtime = QFileInfo( dir.canonicalPath() ).lastModified().toUTC().toTime_t(); const uint mtime = QFileInfo( dir.canonicalPath() ).lastModified().toUTC().toTime_t();
m_newdirmtimes.insert( dir.canonicalPath(), mtime ); m_newdirmtimes.insert( dir.canonicalPath(), mtime );
if ( !m_manualFull && m_mode == TomahawkSettings::Dirs && m_dirmtimes.contains( dir.canonicalPath() ) && mtime == m_dirmtimes.value( dir.canonicalPath() ) ) if ( m_mode == TomahawkSettings::Dirs && m_dirmtimes.contains( dir.canonicalPath() ) && mtime == m_dirmtimes.value( dir.canonicalPath() ) )
{ {
// dont scan this dir, unchanged since last time. // dont scan this dir, unchanged since last time.
} }
else else
{ {
if ( m_manualFull || if ( m_mode == TomahawkSettings::Dirs
( m_mode == TomahawkSettings::Dirs
&& ( m_dirmtimes.contains( dir.canonicalPath() ) || !m_recursive ) && ( m_dirmtimes.contains( dir.canonicalPath() ) || !m_recursive )
&& mtime != m_dirmtimes.value( dir.canonicalPath() ) ) ) && mtime != m_dirmtimes.value( dir.canonicalPath() ) )
{ {
tDebug( LOGINFO ) << "Deleting database file entries from" << dir.canonicalPath(); tDebug( LOGINFO ) << "Deleting database file entries from" << dir.canonicalPath();
Database::instance()->enqueue( QSharedPointer<DatabaseCommand>( new DatabaseCommand_DeleteFiles( dir, SourceList::instance()->getLocal() ) ) ); Database::instance()->enqueue( QSharedPointer<DatabaseCommand>( new DatabaseCommand_DeleteFiles( dir, SourceList::instance()->getLocal() ) ) );
@@ -141,11 +139,10 @@ DirLister::scanDir( QDir dir, int depth, DirLister::Mode mode )
} }
MusicScanner::MusicScanner( const QStringList& dirs, TomahawkSettings::ScannerMode mode, bool manualFull, bool recursive, quint32 bs ) MusicScanner::MusicScanner( const QStringList& dirs, TomahawkSettings::ScannerMode mode, bool recursive, quint32 bs )
: QObject() : QObject()
, m_dirs( dirs ) , m_dirs( dirs )
, m_mode( manualFull ? TomahawkSettings::Dirs : mode ) , m_mode( mode )
, m_manualFull( manualFull )
, m_recursive( recursive ) , m_recursive( recursive )
, m_batchsize( bs ) , m_batchsize( bs )
, m_dirListerThreadController( 0 ) , m_dirListerThreadController( 0 )
@@ -235,7 +232,7 @@ MusicScanner::scan()
m_dirListerThreadController = new QThread( this ); m_dirListerThreadController = new QThread( this );
m_dirLister = QWeakPointer< DirLister >( new DirLister( m_dirs, m_dirmtimes, m_mode, m_manualFull, m_recursive ) ); m_dirLister = QWeakPointer< DirLister >( new DirLister( m_dirs, m_dirmtimes, m_mode, m_recursive ) );
m_dirLister.data()->moveToThread( m_dirListerThreadController ); m_dirLister.data()->moveToThread( m_dirListerThreadController );
connect( m_dirLister.data(), SIGNAL( fileToScan( QFileInfo ) ), connect( m_dirLister.data(), SIGNAL( fileToScan( QFileInfo ) ),

8
src/musicscanner.h
View File

@@ -50,8 +50,8 @@ public:
MTimeOnly MTimeOnly
}; };
DirLister( const QStringList& dirs, const QMap<QString, unsigned int>& dirmtimes, TomahawkSettings::ScannerMode mode, bool manualFull, bool recursive ) DirLister( const QStringList& dirs, const QMap<QString, unsigned int>& dirmtimes, TomahawkSettings::ScannerMode mode, bool recursive )
: QObject(), m_dirs( dirs ), m_dirmtimes( dirmtimes ), m_mode( mode ), m_manualFull( manualFull ), m_recursive( recursive ), m_opcount( 0 ), m_deleting( false ) : QObject(), m_dirs( dirs ), m_dirmtimes( dirmtimes ), m_mode( mode ), m_recursive( recursive ), m_opcount( 0 ), m_deleting( false )
{ {
qDebug() << Q_FUNC_INFO; qDebug() << Q_FUNC_INFO;
} }
@@ -76,7 +76,6 @@ private:
QStringList m_dirs; QStringList m_dirs;
QMap<QString, unsigned int> m_dirmtimes; QMap<QString, unsigned int> m_dirmtimes;
TomahawkSettings::ScannerMode m_mode; TomahawkSettings::ScannerMode m_mode;
bool m_manualFull;
bool m_recursive; bool m_recursive;
QMap<QString, unsigned int> m_newdirmtimes; QMap<QString, unsigned int> m_newdirmtimes;
@@ -92,7 +91,7 @@ class MusicScanner : public QObject
Q_OBJECT Q_OBJECT
public: public:
MusicScanner( const QStringList& dirs, TomahawkSettings::ScannerMode mode, bool manualFull, bool recursive = true, quint32 bs = 0 ); MusicScanner( const QStringList& dirs, TomahawkSettings::ScannerMode mode, bool recursive = true, quint32 bs = 0 );
~MusicScanner(); ~MusicScanner();
signals: signals:
@@ -127,7 +126,6 @@ private:
QVariantList m_scannedfiles; QVariantList m_scannedfiles;
QVariantList m_filesToDelete; QVariantList m_filesToDelete;
bool m_manualFull;
bool m_recursive; bool m_recursive;
quint32 m_batchsize; quint32 m_batchsize;

8
src/scanmanager.cpp
View File

@@ -148,9 +148,11 @@ ScanManager::runDirScan( const QStringList& paths, bool manualFull )
if ( !Database::instance() || ( Database::instance() && !Database::instance()->isReady() ) ) if ( !Database::instance() || ( Database::instance() && !Database::instance()->isReady() ) )
return; return;
if ( paths.isEmpty() ) if ( paths.isEmpty() || manualFull )
{ {
Database::instance()->enqueue( QSharedPointer<DatabaseCommand>( new DatabaseCommand_DeleteFiles( SourceList::instance()->getLocal() ) ) ); Database::instance()->enqueue( QSharedPointer< DatabaseCommand >( new DatabaseCommand_DeleteFiles( SourceList::instance()->getLocal() ) ) );
Database::instance()->enqueue( QSharedPointer< DatabaseCommand >( new DatabaseCommand_DirMtimes( QMap<QString, unsigned int>() ) ) );
if ( paths.isEmpty() )
return; return;
} }
@@ -158,7 +160,7 @@ ScanManager::runDirScan( const QStringList& paths, bool manualFull )
{ {
m_scanTimer->stop(); m_scanTimer->stop();
m_musicScannerThreadController = new QThread( this ); m_musicScannerThreadController = new QThread( this );
m_scanner = QWeakPointer< MusicScanner>( new MusicScanner( paths, TomahawkSettings::instance()->scannerMode(), manualFull ) ); m_scanner = QWeakPointer< MusicScanner>( new MusicScanner( paths, manualFull ? TomahawkSettings::Dirs : TomahawkSettings::instance()->scannerMode() ) );
m_scanner.data()->moveToThread( m_musicScannerThreadController ); m_scanner.data()->moveToThread( m_musicScannerThreadController );
connect( m_scanner.data(), SIGNAL( finished() ), SLOT( scannerFinished() ) ); connect( m_scanner.data(), SIGNAL( finished() ), SLOT( scannerFinished() ) );
m_musicScannerThreadController->start( QThread::IdlePriority ); m_musicScannerThreadController->start( QThread::IdlePriority );