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

ResourcesDB: use pointers to manage hash-tree (both in tree-structure

Browse Source 
and hash-map) - avoids local copies of objects as well as accidently
overwritten ResourcesDB::Item's in hash-map, which resulted in
inconsistencies in tree and finally crashes in several situations, e.g
removal of previously existing objects (closes #2584125)
This commit is contained in:
Tobias Doerffel
2009-02-26 23:55:20 +01:00
parent 1bf92af2d4
commit 57c7c64103
3 changed files with 176 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
include/resources_db.h
View File

@@ -1,7 +1,7 @@
/*
* resources_db.h - header file for ResourcesDB
*
* Copyright (c) 2008 Tobias Doerffel <tobydox/at/users.sourceforge.net>
* Copyright (c) 2008-2009 Tobias Doerffel <tobydox/at/users.sourceforge.net>
*
* This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
*
@@ -45,8 +45,8 @@ class ResourcesDB : public QObject
public:
class Item;
class TreeItem;
typedef QHash<QString, Item> ItemList;
typedef QList<TreeItem> TreeItemList;
typedef QHash<QString, Item *> ItemList;
typedef QList<TreeItem *> TreeItemList;
class Item
{
@@ -167,7 +167,7 @@ public:
bool isValid( void ) const
{
return !m_name.isEmpty() && m_type != TypeUnknown;
return m_type != TypeUnknown && !m_name.isEmpty();
}
void setTreeItem( TreeItem * _ti )
@@ -227,6 +227,30 @@ public:
m_temporaryMarker( false ),
m_item( _item )
{
if( m_parent )
{
m_parent->addChild( this );
}
if( m_item )
{
m_item->setTreeItem( this );
}
}
~TreeItem()
{
foreachTreeItem( m_children )
{
delete *it;
}
if( m_item )
{
m_item->setTreeItem( NULL );
}
if( m_parent )
{
m_parent->removeChild( this );
}
}
inline void setHidden( bool _h )
@@ -244,7 +268,7 @@ public:
int rc = 0;
foreachConstTreeItem( m_children )
{
if( !it->isHidden() )
if( !(*it)->isHidden() )
{
++rc;
}
@@ -257,11 +281,11 @@ public:
int rc = 0;
foreachTreeItem( m_children )
{
if( !it->isHidden() )
if( !(*it)->isHidden() )
{
if( rc == _row )
{
return &( *it );
return *it;
}
++rc;
}
@@ -279,9 +303,9 @@ public:
int row = 0;
foreachConstTreeItem( m_parent->m_children )
{
if( !it->isHidden() )
if( !(*it)->isHidden() )
{
if( &( *it ) == this )
if( *it == this )
{
return row;
}
@@ -291,11 +315,16 @@ public:
return 0;
}
inline void addChild( const TreeItem & _it )
inline void addChild( TreeItem * _it )
{
m_children.push_back( _it );
}
inline void removeChild( TreeItem * _it )
{
m_children.removeAll( _it );
}
inline TreeItemList & children( void )
{
return m_children;
@@ -307,18 +336,7 @@ public:
}
TreeItem * findChild( const QString & _name,
Item::BaseDirectories _base_dir )
{
foreachTreeItem( m_children )
{
if( it->item() && it->item()->name() == _name &&
it->item()->baseDir() == _base_dir )
{
return &( *it );
}
}
return NULL;
}
Item::BaseDirectories _base_dir );
inline Item * item( void )
{
@@ -347,8 +365,11 @@ public:
private:
// hide copy-ctor
TreeItem( const TreeItem & ) { }
TreeItem * m_parent;
QList<TreeItem> m_children;
QList<TreeItem *> m_children;
bool m_hidden;
bool m_temporaryMarker;
@@ -374,7 +395,7 @@ public:
return &m_topLevelNode;
}
const Item & nearestMatch( const Item & _item );
const Item * nearestMatch( const Item & _item );
private slots:
@@ -383,11 +404,13 @@ private slots:
private:
void readDir( const QString & _dir, TreeItem * _parent,
Item::BaseDirectories _base_dir );
void recursiveRemoveItems( TreeItemList::Iterator _it );
void replaceItem( Item * newItem );
void recursiveRemoveItems( TreeItem * parent,
bool removeTopLevelParent = true );
void saveTreeItem( const TreeItem & _i, QDomDocument & _doc,
void saveTreeItem( const TreeItem * _i, QDomDocument & _doc,
QDomElement & _de );
void loadTreeItem( TreeItem & _i, QDomElement & _de );
void loadTreeItem( TreeItem * _i, QDomElement & _de );
typedef QList<QPair<Item::BaseDirectories, QString> > FolderList;

178
src/core/resources_db.cpp
View File

@@ -1,7 +1,7 @@
/*
* resources_db.cpp - implementation of ResourcesDB
*
* Copyright (c) 2008 Tobias Doerffel <tobydox/at/users.sourceforge.net>
* Copyright (c) 2008-2009 Tobias Doerffel <tobydox/at/users.sourceforge.net>
*
* This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
*
@@ -57,7 +57,8 @@ bool ResourcesDB::Item::operator==( const Item & _other ) const
int ResourcesDB::Item::equalityLevel( const Item & _other ) const
{
int l = 0;
if( m_path == _other.m_path && m_name == _other.m_name )
if( m_name == _other.m_name &&
m_path == _other.m_path )
{
l += 40;
}
@@ -153,7 +154,7 @@ ResourcesDB::Item::Types ResourcesDB::Item::guessType( void ) const
void ResourcesDB::Item::init( void )
{
if( name().isEmpty() )
if( m_name.isEmpty() )
{
return;
}
@@ -245,6 +246,32 @@ QString ResourcesDB::Item::getBaseDirectory( BaseDirectories _bd )
ResourcesDB::TreeItem * ResourcesDB::TreeItem::findChild(
const QString & _name,
Item::BaseDirectories _base_dir )
{
if( _name.isNull() || _name.isEmpty() )
{
return NULL;
}
const int hash = qHash( _name );
foreachTreeItem( m_children )
{
TreeItem * ti = *it;
if( ti->item() &&
ti->item()->name() == _name &&
ti->item()->baseDir() == _base_dir )
{
return ti;
}
}
return NULL;
}
@@ -284,7 +311,7 @@ void ResourcesDB::load( void )
multimediaProject m( m_dbFile );
loadTreeItem( m_topLevelNode, m.content() );
loadTreeItem( &m_topLevelNode, m.content() );
}
@@ -293,7 +320,7 @@ void ResourcesDB::load( void )
void ResourcesDB::save( void )
{
multimediaProject m( multimediaProject::ResourcesDatabase );
saveTreeItem( m_topLevelNode, m, m.content() );
saveTreeItem( &m_topLevelNode, m, m.content() );
m.writeFile( m_dbFile );
}
@@ -301,17 +328,17 @@ void ResourcesDB::save( void )
void ResourcesDB::saveTreeItem( const TreeItem & _i, QDomDocument & _doc,
void ResourcesDB::saveTreeItem( const TreeItem * _i, QDomDocument & _doc,
QDomElement & _de )
{
QDomElement e = _i.item() ? _doc.createElement( "item" ) : _de;
foreachConstTreeItem( _i.children() )
QDomElement e = _i->item() ? _doc.createElement( "item" ) : _de;
foreachConstTreeItem( _i->children() )
{
saveTreeItem( *it, _doc, e );
}
if( _i.item() )
if( _i->item() )
{
const Item * it = _i.item();
const Item * it = _i->item();
e.setAttribute( "name", it->name() );
e.setAttribute( "type", it->type() );
e.setAttribute( "basedir", it->baseDir() );
@@ -328,7 +355,7 @@ void ResourcesDB::saveTreeItem( const TreeItem & _i, QDomDocument & _doc,
void ResourcesDB::loadTreeItem( TreeItem & _i, QDomElement & _de )
void ResourcesDB::loadTreeItem( TreeItem * _i, QDomElement & _de )
{
QDomNode node = _de.firstChild();
while( !node.isNull() )
@@ -339,7 +366,7 @@ void ResourcesDB::loadTreeItem( TreeItem & _i, QDomElement & _de )
const QString h = e.attribute( "hash" );
if( !h.isEmpty() )
{
m_items[h] = Item( e.attribute( "name" ),
Item * item = new Item( e.attribute( "name" ),
static_cast<Item::Types>( e.attribute( "type" ).toInt() ),
static_cast<Item::BaseDirectories>( e.attribute( "basedir" ).toInt() ),
e.attribute( "path" ),
@@ -347,16 +374,14 @@ void ResourcesDB::loadTreeItem( TreeItem & _i, QDomElement & _de )
e.attribute( "tags" ),
e.attribute( "size" ).toInt(),
QDateTime::fromString( e.attribute( "lastmod" ), Qt::ISODate ) );
_i.addChild( TreeItem( &_i, &m_items[h] ) );
m_items[h].setTreeItem( &_i.children().last() );
if( m_items[h].type() == Item::TypeDirectory &&
QFileInfo( m_items[h].fullPath() ).isDir() )
replaceItem( item );
TreeItem * treeItem = new TreeItem( _i, item );
if( item->type() == Item::TypeDirectory &&
QFileInfo( item->fullPath() ).isDir() )
{
m_watcher.addPath(
m_items[h].fullPath() );
m_watcher.addPath( item->fullPath() );
}
loadTreeItem( _i.children().last(), e );
loadTreeItem( treeItem, e );
}
}
node = node.nextSibling();
@@ -378,7 +403,7 @@ void ResourcesDB::scanResources( void )
const ResourcesDB::Item & ResourcesDB::nearestMatch( const Item & _item )
const ResourcesDB::Item * ResourcesDB::nearestMatch( const Item & _item )
{
if( !_item.hash().isEmpty() )
{
@@ -392,18 +417,18 @@ const ResourcesDB::Item & ResourcesDB::nearestMatch( const Item & _item )
int max_level = -1;
const Item * max_item = NULL;
foreach( const Item & it, m_items )
foreach( const Item * it, m_items )
{
const int l = it.equalityLevel( _item );
const int l = it->equalityLevel( _item );
if( l > max_level )
{
max_item = &it;
max_item = it;
}
}
Q_ASSERT( max_item != NULL );
return *max_item;
return max_item;
}
@@ -413,11 +438,12 @@ void ResourcesDB::reloadDirectory( const QString & _path )
{
TreeItem * dirTreeItem = NULL;
foreach( Item it, m_items )
foreach( Item * it, m_items )
{
if( it.type() == Item::TypeDirectory && it.fullPath() == _path )
if( it->type() == Item::TypeDirectory &&
it->fullPath() == _path )
{
dirTreeItem = it.treeItem();
dirTreeItem = it->treeItem();
}
}
@@ -438,20 +464,57 @@ void ResourcesDB::reloadDirectory( const QString & _path )
void ResourcesDB::recursiveRemoveItems( TreeItemList::Iterator _it )
void ResourcesDB::replaceItem( Item * newItem )
{
for( TreeItemList::Iterator ch_it = _it->children().begin();
ch_it != _it->children().end(); ++ch_it )
const QString hash = newItem->hash();
Item * oldItem = m_items[hash];
if( oldItem )
{
recursiveRemoveItems( ch_it );
}
if( _it->item() )
{
if( _it->item()->type() == Item::TypeDirectory )
TreeItem * oldTreeItem = oldItem->treeItem();
if( oldTreeItem )
{
m_watcher.removePath( _it->item()->fullPath() );
recursiveRemoveItems( oldTreeItem, false );
delete oldTreeItem;
}
m_items.remove( _it->item()->hash() );
if( oldItem->type() == Item::TypeDirectory )
{
m_watcher.removePath( oldItem->fullPath() );
}
m_items.remove( hash );
delete oldItem;
}
m_items[hash] = newItem;
}
void ResourcesDB::recursiveRemoveItems( TreeItem * parent,
bool removeTopLevelParent )
{
if( !parent )
{
return;
}
while( !parent->children().isEmpty() )
{
recursiveRemoveItems( parent->children().front() );
}
if( removeTopLevelParent && parent->item() )
{
if( parent->item()->type() == Item::TypeDirectory )
{
m_watcher.removePath( parent->item()->fullPath() );
}
const QString & hash = parent->item()->hash();
if( !hash.isEmpty() )
{
m_items.remove( hash );
}
delete parent;
}
}
@@ -483,26 +546,23 @@ printf("read dir: %s\n", d.canonicalPath().toAscii().constData() );
parentItem = curParent->item();
foreachTreeItem( curParent->children() )
{
it->setTemporaryMarker( false );
(*it)->setTemporaryMarker( false );
}
}
else
{
// create new item for current dir
Item parent( d.dirName(), Item::TypeDirectory,
parentItem = new Item( d.dirName(), Item::TypeDirectory,
_base_dir, _parent->item() ?
_parent->item()->path() + d.dirName() +
QDir::separator() :
QString::null );
parent.setLastMod( QFileInfo(
parentItem->setLastMod( QFileInfo(
d.canonicalPath() ).lastModified() );
parentItem = &( m_items[parent.hash()] = parent );
_parent->addChild( TreeItem( _parent, parentItem ) );
curParent = &_parent->children().last();
replaceItem( parentItem );
curParent = new TreeItem( _parent, parentItem );
curParent->setTemporaryMarker( true );
parentItem->setTreeItem( curParent );
m_watcher.addPath( parent.fullPath() );
m_watcher.addPath( parentItem->fullPath() );
}
@@ -528,7 +588,7 @@ printf("read dir: %s\n", d.canonicalPath().toAscii().constData() );
curChild->setTemporaryMarker( true );
if( f.lastModified() > curChild->item()->lastMod() )
{
printf("reload: %s\n", fname.toAscii().constData());
//printf("reload: %s\n", fname.toAscii().constData());
curChild->item()->setLastMod(
f.lastModified() );
if( curChild->item()->type() ==
@@ -554,13 +614,15 @@ printf("reload: %s\n", fname.toAscii().constData());
}
else if( f.isFile() )
{
Item i( f.fileName(), Item::TypeUnknown,
_base_dir, _dir );
i.setLastMod( f.lastModified() );
TreeItem ti( curParent,
&( m_items[i.hash()] = i ) );
ti.setTemporaryMarker( true );
curParent->addChild( ti );
Item * newItem =
new Item( f.fileName(),
Item::TypeUnknown,
_base_dir, _dir );
newItem->setLastMod( f.lastModified() );
replaceItem( newItem );
TreeItem * ti = new TreeItem( curParent,
newItem );
ti->setTemporaryMarker( true );
}
}
}
@@ -568,10 +630,10 @@ printf("reload: %s\n", fname.toAscii().constData());
for( TreeItemList::Iterator it = curParent->children().begin();
it != curParent->children().end(); )
{
if( it->temporaryMarker() == false )
if( (*it)->temporaryMarker() == false )
{
printf("removing %s\n", it->item()->name().toAscii().constData() );
recursiveRemoveItems( it );
//printf("removing %d %s\n", (*it)->item(), (*it)->item()->name().toAscii().constData() );
recursiveRemoveItems( *it );
it = curParent->children().erase( it );
}
else

14
src/core/resources_tree_model.cpp
View File

@@ -1,7 +1,7 @@
/*
* resources_tree_model.cpp - implementation of ResourcesTreeModel
*
* Copyright (c) 2008 Tobias Doerffel <tobydox/at/users.sourceforge.net>
* Copyright (c) 2008-2009 Tobias Doerffel <tobydox/at/users.sourceforge.net>
*
* This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
*
@@ -225,12 +225,11 @@ bool ResourcesTreeModel::filterItems( ResourcesDB::TreeItem * _item,
int row = 0;
bool hide = true;
for( QList<ResourcesDB::TreeItem>::Iterator it =
_item->children().begin();
for( ResourcesDB::TreeItemList::Iterator it = _item->children().begin();
it != _item->children().end(); ++it )
{
QModelIndex idx = createIndex( row, 0, &( *it ) );
if( filterItems( &( *it ), idx , _keywords ) )
QModelIndex idx = createIndex( row, 0, *it );
if( filterItems( *it, idx , _keywords ) )
{
hide = false;
}
@@ -251,12 +250,11 @@ void ResourcesTreeModel::setHidden( ResourcesDB::TreeItem * _item,
if( _recursive )
{
int row = 0;
for( QList<ResourcesDB::TreeItem>::Iterator it =
for( ResourcesDB::TreeItemList::Iterator it =
_item->children().begin();
it != _item->children().end(); ++it )
{
setHidden( &( *it ), createIndex( row, 0, &( *it ) ),
_hide );
setHidden( *it, createIndex( row, 0, *it ), _hide );
++row;
}
}