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

* Remove artists from internal cache when destroying them.

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2013-03-31 07:15:44 +02:00
parent 5f32bdb277
commit 4994c4e5cc
2 changed files with 39 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/libtomahawk/Artist.cpp
View File

@@ -60,10 +60,10 @@ Artist::get( const QString& name, bool autoCreate )
return artist_ptr(); return artist_ptr();
QMutexLocker lock( &s_nameCacheMutex ); QMutexLocker lock( &s_nameCacheMutex );
const QString sortname = name.toLower(); const QString key = name.toLower();
if ( s_artistsByName.contains( sortname ) ) if ( s_artistsByName.contains( key ) )
{ {
artist_wptr artist = s_artistsByName.value( sortname ); artist_wptr artist = s_artistsByName.value( key );
if ( !artist.isNull() ) if ( !artist.isNull() )
return artist.toStrongRef(); return artist.toStrongRef();
} }
@@ -71,10 +71,10 @@ Artist::get( const QString& name, bool autoCreate )
if ( !Database::instance() || !Database::instance()->impl() ) if ( !Database::instance() || !Database::instance()->impl() )
return artist_ptr(); return artist_ptr();
artist_ptr artist = artist_ptr( new Artist( name ), &QObject::deleteLater ); artist_ptr artist = artist_ptr( new Artist( name ), &Artist::deleteLater );
artist->setWeakRef( artist.toWeakRef() ); artist->setWeakRef( artist.toWeakRef() );
artist->loadId( autoCreate ); artist->loadId( autoCreate );
s_artistsByName.insert( sortname, artist ); s_artistsByName.insert( key, artist );
return artist; return artist;
} }
@@ -95,17 +95,17 @@ Artist::get( unsigned int id, const QString& name )
s_idMutex.unlock(); s_idMutex.unlock();
QMutexLocker lock( &s_nameCacheMutex ); QMutexLocker lock( &s_nameCacheMutex );
const QString sortname = name.toLower(); const QString key = name.toLower();
if ( s_artistsByName.contains( sortname ) ) if ( s_artistsByName.contains( key ) )
{ {
artist_wptr artist = s_artistsByName.value( sortname ); artist_wptr artist = s_artistsByName.value( key );
if ( !artist.isNull() ) if ( !artist.isNull() )
return artist; return artist;
} }
artist_ptr a = artist_ptr( new Artist( id, name ), &QObject::deleteLater ); artist_ptr a = artist_ptr( new Artist( id, name ), &Artist::deleteLater );
a->setWeakRef( a.toWeakRef() ); a->setWeakRef( a.toWeakRef() );
s_artistsByName.insert( sortname, a ); s_artistsByName.insert( key, a );
if ( id > 0 ) if ( id > 0 )
{ {
@@ -156,6 +156,31 @@ Artist::Artist( const QString& name )
} }
void
Artist::deleteLater()
{
QMutexLocker lock( &s_nameCacheMutex );
const QString key = m_name.toLower();
if ( s_artistsByName.contains( key ) )
{
s_artistsByName.remove( key );
}
if ( m_id > 0 )
{
s_idMutex.lockForWrite();
if ( s_artistsById.contains( m_id ) )
{
s_artistsById.remove( m_id );
}
s_idMutex.unlock();
}
QObject::deleteLater();
}
void void
Artist::onTracksLoaded( Tomahawk::ModelMode mode, const Tomahawk::collection_ptr& collection ) Artist::onTracksLoaded( Tomahawk::ModelMode mode, const Tomahawk::collection_ptr& collection )
{ {

3
src/libtomahawk/Artist.h
View File

@@ -78,6 +78,9 @@ public:
void loadId( bool autoCreate ); void loadId( bool autoCreate );
public slots:
void deleteLater();
signals: signals:
void tracksAdded( const QList<Tomahawk::query_ptr>& tracks, Tomahawk::ModelMode mode, const Tomahawk::collection_ptr& collection ); void tracksAdded( const QList<Tomahawk::query_ptr>& tracks, Tomahawk::ModelMode mode, const Tomahawk::collection_ptr& collection );
void albumsAdded( const QList<Tomahawk::album_ptr>& albums, Tomahawk::ModelMode mode ); void albumsAdded( const QList<Tomahawk::album_ptr>& albums, Tomahawk::ModelMode mode );