mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-03-24 01:39:42 +01:00
Code Issues Releases Wiki Activity

Streamline API: source->userName() -> source->nodeId()

Browse Source
This commit is contained in:
Dominik Schmidt 2013-01-27 23:31:15 +01:00
parent 1032cb5e05
commit d8f6378739
13 changed files with 34 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/libtomahawk/LatchManager.cpp
View File

@ -81,7 +81,7 @@ LatchManager::playlistChanged( Tomahawk::playlistinterface_ptr )
DatabaseCommand_SocialAction* cmd = new DatabaseCommand_SocialAction();
cmd->setSource( SourceList::instance()->getLocal() );
cmd->setAction( "latchOn");
cmd->setComment( m_latchedOnTo->userName() );
cmd->setComment( m_latchedOnTo->nodeId() );
cmd->setTimestamp( QDateTime::currentDateTime().toTime_t() );
Database::instance()->enqueue( QSharedPointer< DatabaseCommand >( cmd ) );
@ -101,7 +101,7 @@ LatchManager::playlistChanged( Tomahawk::playlistinterface_ptr )
DatabaseCommand_SocialAction* cmd = new DatabaseCommand_SocialAction();
cmd->setSource( SourceList::instance()->getLocal() );
cmd->setAction( "latchOff");
cmd->setComment( source->userName() );
cmd->setComment( source->nodeId() );
cmd->setTimestamp( QDateTime::currentDateTime().toTime_t() );
Database::instance()->enqueue( QSharedPointer< DatabaseCommand >( cmd ) );

8
src/libtomahawk/Source.cpp
View File

@ -46,11 +46,11 @@
using namespace Tomahawk;
Source::Source( int id, const QString& username )
Source::Source( int id, const QString& nodeId )
: QObject()
, m_isLocal( false )
, m_online( false )
, m_username( username )
, m_nodeId( nodeId )
, m_id( id )
, m_updateIndexWhenSynced( false )
, m_state( DBSyncConnection::UNKNOWN )
@ -125,7 +125,7 @@ QString
Source::friendlyName() const
{
if ( m_friendlyname.isEmpty() )
return m_username;
return m_nodeId;
//TODO: this is a terrible assumption, help me clean this up, mighty muesli!
if ( m_friendlyname.contains( "@conference." ) )
@ -228,7 +228,7 @@ Source::setOnline()
if ( !isLocal() )
{
// ensure username is in the database
DatabaseCommand_addSource* cmd = new DatabaseCommand_addSource( m_username, friendlyName() );
DatabaseCommand_addSource* cmd = new DatabaseCommand_addSource( m_nodeId, friendlyName() );
connect( cmd, SIGNAL( done( unsigned int, QString ) ),
SLOT( dbLoaded( unsigned int, const QString& ) ) );
Database::instance()->enqueue( QSharedPointer<DatabaseCommand>(cmd) );

7
src/libtomahawk/Source.h
View File

@ -55,13 +55,13 @@ friend class ::DatabaseCommand_DeleteFiles;
friend class ::MusicScanner;
public:
explicit Source( int id, const QString& username = QString() );
explicit Source( int id, const QString& nodeId = QString() );
virtual ~Source();
bool isLocal() const { return m_isLocal; }
bool isOnline() const { return m_online || m_isLocal; }
QString userName() const { return m_username; }
QString nodeId() const { return m_nodeId; }
QString friendlyName() const;
void setFriendlyName( const QString& fname );
@ -101,7 +101,6 @@ signals:
void collectionRemoved( const collection_ptr& collection );
void stats( const QVariantMap& );
void usernameChanged( const QString& );
void playbackStarted( const Tomahawk::query_ptr& query );
void playbackFinished( const Tomahawk::query_ptr& query );
@ -143,7 +142,7 @@ private:
bool m_isLocal;
bool m_online;
QString m_username;
QString m_nodeId;
QString m_friendlyname;
int m_id;
bool m_scrubFriendlyName;

14
src/libtomahawk/SourceList.cpp
View File

@ -111,7 +111,7 @@ SourceList::setLocal( const Tomahawk::source_ptr& localSrc )
{
QMutexLocker lock( &m_mut );
m_sources.insert( localSrc->userName(), localSrc );
m_sources.insert( localSrc->nodeId(), localSrc );
m_local = localSrc;
}
@ -127,11 +127,11 @@ SourceList::add( const source_ptr& source )
{
Q_ASSERT( m_isReady );
// qDebug() << "Adding to sources:" << source->userName() << source->id();
m_sources.insert( source->userName(), source );
// qDebug() << "Adding to sources:" << source->nodeId() << source->id();
m_sources.insert( source->nodeId(), source );
if ( source->id() > 0 )
m_sources_id2name.insert( source->id(), source->userName() );
m_sources_id2name.insert( source->id(), source->nodeId() );
connect( source.data(), SIGNAL( syncedWithDatabase() ), SLOT( sourceSynced() ) );
collection_ptr coll( new RemoteCollection( source ) );
@ -239,7 +239,7 @@ SourceList::sourceSynced()
{
Source* src = qobject_cast< Source* >( sender() );
m_sources_id2name.insert( src->id(), src->userName() );
m_sources_id2name.insert( src->id(), src->nodeId() );
}
@ -254,7 +254,7 @@ void
SourceList::latchedOff( const source_ptr& to )
{
Source* s = qobject_cast< Source* >( sender() );
const source_ptr source = m_sources[ s->userName() ];
const source_ptr source = m_sources[ s->nodeId() ];
emit sourceLatchedOff( source, to );
}
@ -264,7 +264,7 @@ SourceList::latchedOn( const source_ptr& to )
{
Source* s = qobject_cast< Source* >( sender() );
const source_ptr source = m_sources[ s->userName() ];
const source_ptr source = m_sources[ s->nodeId() ];
emit sourceLatchedOn( source, to );
}

2
src/libtomahawk/database/DatabaseCollection.cpp
View File

@ -33,7 +33,7 @@ using namespace Tomahawk;
DatabaseCollection::DatabaseCollection( const source_ptr& src, QObject* parent )
: Collection( src, QString( "dbcollection:%1" ).arg( src->userName() ), parent )
: Collection( src, QString( "dbcollection:%1" ).arg( src->nodeId() ), parent )
{
}

2
src/libtomahawk/database/DatabaseCommand_AllTracks.cpp
View File

@ -112,7 +112,7 @@ DatabaseCommand_AllTracks::exec( DatabaseImpl* dbi )
continue;
}
url = QString( "servent://%1\t%2" ).arg( s->userName() ).arg( url );
url = QString( "servent://%1\t%2" ).arg( s->nodeId() ).arg( url );
}
QString artist, track, album, composer;

4
src/libtomahawk/database/DatabaseCommand_Resolve.cpp
View File

@ -140,7 +140,7 @@ DatabaseCommand_Resolve::resolve( DatabaseImpl* lib )
continue;
}
url = QString( "servent://%1\t%2" ).arg( s->userName() ).arg( url );
url = QString( "servent://%1\t%2" ).arg( s->nodeId() ).arg( url );
}
bool cached = Tomahawk::Result::isCached( url );
@ -279,7 +279,7 @@ DatabaseCommand_Resolve::fullTextResolve( DatabaseImpl* lib )
continue;
}
url = QString( "servent://%1\t%2" ).arg( s->userName() ).arg( url );
url = QString( "servent://%1\t%2" ).arg( s->nodeId() ).arg( url );
}
bool cached = Tomahawk::Result::isCached( url );

4
src/libtomahawk/database/DatabaseImpl.cpp
View File

@ -293,7 +293,7 @@ DatabaseImpl::file( int fid )
return r;
}
url = QString( "servent://%1\t%2" ).arg( s->userName() ).arg( url );
url = QString( "servent://%1\t%2" ).arg( s->nodeId() ).arg( url );
}
r = Tomahawk::Result::get( url );
@ -691,7 +691,7 @@ DatabaseImpl::resultFromHint( const Tomahawk::query_ptr& origquery )
return res;
}
url = QString( "servent://%1\t%2" ).arg( s->userName() ).arg( url );
url = QString( "servent://%1\t%2" ).arg( s->nodeId() ).arg( url );
}
res = Tomahawk::Result::get( url );

10
src/libtomahawk/jobview/LatchedStatusItem.cpp
View File

@ -82,7 +82,7 @@ LatchedStatusManager::latchedOn( const Tomahawk::source_ptr& from, const Tomahaw
{
#ifndef ENABLE_HEADLESS
LatchedStatusItem* item = new LatchedStatusItem( from, to, this );
m_jobs[ from->userName() ] = item;
m_jobs[ from->nodeId() ] = item;
JobStatusView::instance()->model()->addJob( item );
#endif
@ -96,9 +96,9 @@ LatchedStatusManager::sourceOffline()
Tomahawk::Source* s = qobject_cast< Tomahawk::Source* >( sender() );
Q_ASSERT( s );
if ( m_jobs.contains( s->userName() ) )
if ( m_jobs.contains( s->nodeId() ) )
{
QPointer< LatchedStatusItem> job = m_jobs.take( s->userName() ).data();
QPointer< LatchedStatusItem> job = m_jobs.take( s->nodeId() ).data();
if ( !job.isNull() )
job.data()->stop();
}
@ -111,9 +111,9 @@ LatchedStatusManager::latchedOff( const Tomahawk::source_ptr& from, const Tomaha
if ( from.isNull() || to.isNull() )
return;
if ( to->isLocal() && m_jobs.contains( from->userName() ) )
if ( to->isLocal() && m_jobs.contains( from->nodeId() ) )
{
QPointer< LatchedStatusItem > item = m_jobs.take( from->userName() );
QPointer< LatchedStatusItem > item = m_jobs.take( from->nodeId() );
if ( !item.isNull() )
item.data()->stop();
}

4
src/libtomahawk/playlist/AlbumModel.cpp
View File

@ -51,7 +51,7 @@ AlbumModel::addCollection( const collection_ptr& collection, bool overwrite )
{
qDebug() << Q_FUNC_INFO << collection->name()
<< collection->source()->id()
<< collection->source()->userName();
<< collection->source()->nodeId();
DatabaseCommand_AllAlbums* cmd = new DatabaseCommand_AllAlbums( collection );
m_overwriteOnAdd = overwrite;
@ -88,7 +88,7 @@ AlbumModel::addFilteredCollection( const collection_ptr& collection, unsigned in
{
/* qDebug() << Q_FUNC_INFO << collection->name()
<< collection->source()->id()
<< collection->source()->userName()
<< collection->source()->nodeId()
<< amount << order;*/
DatabaseCommand_AllAlbums* cmd = new DatabaseCommand_AllAlbums( collection );

4
src/libtomahawk/playlist/TreeModel.cpp
View File

@ -246,7 +246,7 @@ TreeModel::addCollection( const collection_ptr& collection )
{
qDebug() << Q_FUNC_INFO << collection->name()
<< collection->source()->id()
<< collection->source()->userName();
<< collection->source()->nodeId();
startLoading();
@ -275,7 +275,7 @@ TreeModel::addFilteredCollection( const collection_ptr& collection, unsigned int
{
qDebug() << Q_FUNC_INFO << collection->name()
<< collection->source()->id()
<< collection->source()->userName()
<< collection->source()->nodeId()
<< amount << order;
DatabaseCommand_AllArtists* cmd = new DatabaseCommand_AllArtists( collection );

2
src/sourcetree/items/LovedTracksItem.cpp
View File

@ -95,7 +95,7 @@ LovedTracksItem::activate()
else
raModel->setDescription( tr( "All of %1's loved tracks" ).arg( par->source()->friendlyName() ) );
pv->setGuid( QString( "lovedtracks/%1" ).arg( par->source()->userName() ) );
pv->setGuid( QString( "lovedtracks/%1" ).arg( par->source()->nodeId() ) );
}
pv->setPlayableModel( raModel );

4
src/sourcetree/items/SourceItem.cpp
View File

@ -555,7 +555,7 @@ SourceItem::latestAdditionsClicked()
pv->setEmptyTip( tr( "Sorry, we could not find any recent additions!" ) );
raModel->setSource( m_source );
pv->setGuid( QString( "latestadditions/%1" ).arg( m_source->userName() ) );
pv->setGuid( QString( "latestadditions/%1" ).arg( m_source->nodeId() ) );
m_latestAdditionsPage = pv;
}
@ -596,7 +596,7 @@ SourceItem::recentPlaysClicked()
pv->setEmptyTip( tr( "Sorry, we could not find any recent plays!" ) );
raModel->setSource( m_source );
pv->setGuid( QString( "recentplays/%1" ).arg( m_source->userName() ) );
pv->setGuid( QString( "recentplays/%1" ).arg( m_source->nodeId() ) );
m_recentPlaysPage = pv;
}