hashtags/lmms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

LocalResourceProvider: watch out for changes in base directory

Browse Source 
Changes in base directory were not tracked by filesystem watcher.
Explicitely add base directory to filesystem watcher and add a special
case to LocalResourceProvider::reloadDirectory().
This commit is contained in:
Tobias Doerffel
2009-11-11 13:23:14 +01:00
parent 0b5dae4a2a
commit 0679c83c33
1 changed files with 25 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/core/LocalResourceProvider.cpp
View File

@@ -22,7 +22,7 @@
*
*/
#include <QtCore/QDebug>
#include <QtCore/QDir>
#include "LocalResourceProvider.h"
@@ -45,6 +45,8 @@ LocalResourceProvider::LocalResourceProvider(
connect( database(), SIGNAL( directoryItemRemoved( const QString & ) ),
this, SLOT( removeDirectory( const QString & ) ) );
m_watcher.addPath( ResourceItem::getBaseDirectory( m_baseDir ) + m_dir );
database()->init();
}
@@ -120,23 +122,30 @@ void LocalResourceProvider::reloadDirectory( const QString & _path )
p += QDir::separator();
}
foreach( ResourceItem * it, database()->items() )
if( p == ResourceItem::getBaseDirectory( m_baseDir ) + m_dir )
{
if( it->type() == ResourceItem::TypeDirectory &&
it->fullName() == p )
{
dirRelation = it->relation();
}
updateDatabase();
}
if( dirRelation )
else
{
ResourceItem * dirItem = dirRelation->item();
if( dirItem )
foreach( ResourceItem * it, database()->items() )
{
m_scannedFolders.clear();
readDir( dirItem->fullRelativeName(),
dirRelation->parent() );
if( it->type() == ResourceItem::TypeDirectory &&
it->fullName() == p )
{
dirRelation = it->relation();
}
}
if( dirRelation )
{
ResourceItem * dirItem = dirRelation->item();
if( dirItem )
{
m_scannedFolders.clear();
readDir( dirItem->fullRelativeName(),
dirRelation->parent() );
}
}
}
@@ -165,7 +174,7 @@ void LocalResourceProvider::readDir( const QString & _dir,
ResourceItem::Relation * curParent = _parent->findChild( d.dirName() +
QDir::separator(),
m_baseDir );
printf("read dir: %s\n", d.canonicalPath().toUtf8().constData() );
qDebug() << "read dir" << d.canonicalPath();
if( curParent )
{
parentItem = curParent->item();
@@ -202,6 +211,7 @@ printf("read dir: %s\n", d.canonicalPath().toUtf8().constData() );
{
if( f.isSymLink() )
{
qDebug() << "following symlink" << f.canonicalFilePath() << "to" << f.symLinkTarget();
f = QFileInfo( f.symLinkTarget() );
}