mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-09 15:47:38 +02:00
Code Issues Releases Wiki Activity

* Also delete Lucene analyzer, just to be totally safe.

Browse Source 
* Don't get stuck displaying "Scanning 0 tracks" when there are no updates to our collection found.
This commit is contained in:
Christian Muehlhaeuser
2011-02-16 07:05:11 +01:00
parent 87b0cf5832
commit 433654291d
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/libtomahawk/database/fuzzyindex.cpp
View File

@@ -58,12 +58,14 @@ FuzzyIndex::beginIndexing()
delete m_luceneSearcher; delete m_luceneSearcher;
delete m_luceneReader; delete m_luceneReader;
delete m_luceneDir; delete m_luceneDir;
delete m_analyzer;
m_luceneSearcher = 0; m_luceneSearcher = 0;
m_luceneReader = 0; m_luceneReader = 0;
qDebug() << "Creating new lucene directory."; qDebug() << "Creating new lucene directory.";
QString lucenePath = TomahawkUtils::appDataDir().absoluteFilePath( "tomahawk.lucene" ); QString lucenePath = TomahawkUtils::appDataDir().absoluteFilePath( "tomahawk.lucene" );
m_luceneDir = FSDirectory::getDirectory( lucenePath.toStdString().c_str(), true ); m_luceneDir = FSDirectory::getDirectory( lucenePath.toStdString().c_str(), true );
m_analyzer = _CLNEW SimpleAnalyzer();
} }
qDebug() << "Creating new index writer."; qDebug() << "Creating new index writer.";

6
src/musicscanner.cpp
View File

@@ -64,7 +64,6 @@ MusicScanner::setMtimes( const QMap<QString, unsigned int>& m )
void void
MusicScanner::scan() MusicScanner::scan()
{ {
SourceList::instance()->getLocal()->scanningProgress( 0 );
qDebug() << "Scanning, num saved mtimes from last scan:" << m_dirmtimes.size(); qDebug() << "Scanning, num saved mtimes from last scan:" << m_dirmtimes.size();
connect( this, SIGNAL( batchReady( QVariantList ) ), connect( this, SIGNAL( batchReady( QVariantList ) ),
@@ -177,8 +176,9 @@ MusicScanner::readFile( const QFileInfo& fi )
return QVariantMap(); // invalid extension return QVariantMap(); // invalid extension
} }
if( m_scanned % 3 == 0 ) if ( m_scanned )
SourceList::instance()->getLocal()->scanningProgress( m_scanned ); if( m_scanned % 3 == 0 )
SourceList::instance()->getLocal()->scanningProgress( m_scanned );
if( m_scanned % 100 == 0 ) if( m_scanned % 100 == 0 )
qDebug() << "SCAN" << m_scanned << fi.absoluteFilePath(); qDebug() << "SCAN" << m_scanned << fi.absoluteFilePath();