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

Hopefully fix removing files actually being removed from db during watch scan

Browse Source
This commit is contained in:
Jeff Mitchell
2011-04-03 13:30:13 -04:00
parent 8729c91c95
commit f66a062796
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/musicscanner.cpp
View File

@@ -75,9 +75,9 @@ DirLister::scanDir( QDir dir, int depth, DirLister::Mode mode )
{
// dont scan this dir, unchanged since last time.
}
else if( mode != DirLister::MTimeOnly )
else
{
if( m_dirmtimes.contains( dir.absolutePath() ) )
if( m_dirmtimes.contains( dir.absolutePath() ) || !m_recursive )
Database::instance()->enqueue( QSharedPointer<DatabaseCommand>( new DatabaseCommand_DeleteFiles( dir, SourceList::instance()->getLocal() ) ) );
dir.setFilter( QDir::Files | QDir::Readable | QDir::NoDotAndDotDot );
@@ -97,8 +97,6 @@ DirLister::scanDir( QDir dir, int depth, DirLister::Mode mode )
qDebug() << "m_dirmtimes contains it? " << (m_dirmtimes.contains( di.absoluteFilePath() ) ? "true" : "false");
if( mode == DirLister::Recursive || !m_dirmtimes.contains( di.absoluteFilePath() ) )
scanDir( di.absoluteFilePath(), depth + 1, DirLister::Recursive );
//else //should be the non-recursive case since the second test above should only happen with a new dir
// scanDir( di.absoluteFilePath(), depth + 1, DirLister::MTimeOnly );
}
}