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

Fix dupes if you add a collection subfolder to your collection again

Browse Source
This commit is contained in:
Dominik Schmidt
2014-11-13 02:43:13 +01:00
parent 051f922e10
commit 65e0491b53
2 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/libtomahawk/filemetadata/MusicScanner.cpp
View File

@@ -286,6 +286,8 @@ MusicScanner::postOps()
m_filesToDelete.clear(); m_filesToDelete.clear();
} }
m_processedFiles.clear();
if ( !m_cmdQueue ) if ( !m_cmdQueue )
cleanup(); cleanup();
} }
@@ -348,6 +350,13 @@ MusicScanner::commandFinished()
void void
MusicScanner::scanFile( const QFileInfo& fi ) MusicScanner::scanFile( const QFileInfo& fi )
{ {
// Don't process a single file twice, this might happen if you add a subfolder of another collection folder to your collection
if ( m_processedFiles.contains( fi.canonicalFilePath() ) )
return;
else
m_processedFiles << fi.canonicalFilePath();
if ( m_filemtimes.contains( "file://" + fi.canonicalFilePath() ) ) if ( m_filemtimes.contains( "file://" + fi.canonicalFilePath() ) )
{ {
if ( !m_filemtimes.value( "file://" + fi.canonicalFilePath() ).values().isEmpty() && if ( !m_filemtimes.value( "file://" + fi.canonicalFilePath() ).values().isEmpty() &&

1
src/libtomahawk/filemetadata/MusicScanner.h
View File

@@ -158,6 +158,7 @@ private:
unsigned int m_cmdQueue; unsigned int m_cmdQueue;
QSet< QString > m_processedFiles;
QVariantList m_scannedfiles; QVariantList m_scannedfiles;
QVariantList m_filesToDelete; QVariantList m_filesToDelete;
quint32 m_batchsize; quint32 m_batchsize;