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

Fix missing condition, wrong method, and put more info in the ChangeLog

Browse Source
This commit is contained in:
Jeff Mitchell
2011-04-02 01:17:48 -04:00
parent 2214b750be
commit 01f2fe6adc
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@@ -1,7 +1,10 @@
Version 0.1.0: Version 0.1.0:
* Watch folders for changes and automatically update your collection. This * Watch folders for changes and automatically update your collection. This
is on by default; you can turn it off on the Local Music tab in the is on by default; you can turn it off on the Local Music tab in the
settings dialog. settings dialog. Note that this triggers only on files or folders being
added to or removed from folders; it is not watch individual files as
most OSes can't support enough file watches to handle a normal-sized
music collection.
Version 0.0.3: Version 0.0.3:
* Fix crashes in Twitter authentication. For reals now. * Fix crashes in Twitter authentication. For reals now.

6
src/musicscanner.cpp
View File

@@ -40,7 +40,7 @@ DirLister::go()
void void
DirLister::scanDir( QDir dir, int depth, DirLister::Mode mode ) DirLister::scanDir( QDir dir, int depth, DirLister::Mode mode )
{ {
qDebug() << "DirLister::scanDir scanning: " << dir.absolutePath(); qDebug() << "DirLister::scanDir scanning: " << dir.absolutePath() << " with mode " << mode;
QFileInfoList dirs; QFileInfoList dirs;
const uint mtime = QFileInfo( dir.absolutePath() ).lastModified().toUTC().toTime_t(); const uint mtime = QFileInfo( dir.absolutePath() ).lastModified().toUTC().toTime_t();
m_newdirmtimes.insert( dir.absolutePath(), mtime ); m_newdirmtimes.insert( dir.absolutePath(), mtime );
@@ -49,7 +49,7 @@ DirLister::scanDir( QDir dir, int depth, DirLister::Mode mode )
{ {
// dont scan this dir, unchanged since last time. // dont scan this dir, unchanged since last time.
} }
else else if( mode != DirLister::MTimeOnly )
{ {
if( m_dirmtimes.contains( dir.absolutePath() ) ) if( m_dirmtimes.contains( dir.absolutePath() ) )
Database::instance()->enqueue( QSharedPointer<DatabaseCommand>( new DatabaseCommand_DeleteFiles( dir, SourceList::instance()->getLocal() ) ) ); Database::instance()->enqueue( QSharedPointer<DatabaseCommand>( new DatabaseCommand_DeleteFiles( dir, SourceList::instance()->getLocal() ) ) );
@@ -67,7 +67,7 @@ DirLister::scanDir( QDir dir, int depth, DirLister::Mode mode )
foreach( const QFileInfo& di, dirs ) foreach( const QFileInfo& di, dirs )
{ {
if( mode == DirLister::Recursive || !m_dirmtimes.contains( di.absolutePath() ) ) if( mode == DirLister::Recursive || !m_dirmtimes.contains( di.absoluteFilePath() ) )
scanDir( di.absoluteFilePath(), depth + 1, DirLister::Recursive ); 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 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 ); scanDir( di.absoluteFilePath(), depth + 1, DirLister::MTimeOnly );