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

* Keep resolving and don't abort if we found an offline match.

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2011-01-21 18:34:17 +01:00
parent 594d16cec5
commit d007dbb477
2 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -69,8 +69,6 @@ DatabaseCommand_Resolve::exec( DatabaseImpl* lib )
QList< int > tracks = lib->searchTable( "track", trackname, 10 ); QList< int > tracks = lib->searchTable( "track", trackname, 10 );
QList< int > albums = lib->searchTable( "album", albumname, 10 ); QList< int > albums = lib->searchTable( "album", albumname, 10 );
//qDebug() << "searchTable calls duration:" << timer.elapsed() << "ms";
if( artists.length() == 0 || tracks.length() == 0 ) if( artists.length() == 0 || tracks.length() == 0 )
{ {
//qDebug() << "No candidates found in first pass, aborting resolve" << artistname << trackname; //qDebug() << "No candidates found in first pass, aborting resolve" << artistname << trackname;
@@ -145,7 +143,7 @@ DatabaseCommand_Resolve::exec( DatabaseImpl* lib )
{ {
//qDebug() << "Skipping result for offline sourceid:" << files_query.value( 13 ).toUInt(); //qDebug() << "Skipping result for offline sourceid:" << files_query.value( 13 ).toUInt();
// will happen for valid sources which are offline (and thus not in the sourcelist) // will happen for valid sources which are offline (and thus not in the sourcelist)
return; continue;
} }
m.insert( "url", QString( "servent://%1\t%2" ).arg( s->userName() ).arg( url_str ) ); m.insert( "url", QString( "servent://%1\t%2" ).arg( s->userName() ).arg( url_str ) );

3
src/sourcetree/sourcetreeview.cpp
View File

@@ -104,8 +104,8 @@ SourceTreeView::setupMenus()
m_renamePlaylistAction->setEnabled( !readonly ); m_renamePlaylistAction->setEnabled( !readonly );
} }
connect( m_renamePlaylistAction, SIGNAL( triggered() ), SLOT( renamePlaylist() ) );
connect( m_loadPlaylistAction, SIGNAL( triggered() ), SLOT( loadPlaylist() ) ); connect( m_loadPlaylistAction, SIGNAL( triggered() ), SLOT( loadPlaylist() ) );
connect( m_renamePlaylistAction, SIGNAL( triggered() ), SLOT( renamePlaylist() ) );
connect( m_deletePlaylistAction, SIGNAL( triggered() ), SLOT( deletePlaylist() ) ); connect( m_deletePlaylistAction, SIGNAL( triggered() ), SLOT( deletePlaylist() ) );
} }
@@ -138,7 +138,6 @@ SourceTreeView::onItemActivated( const QModelIndex& index )
qDebug() << "SourceTreeItem toggled:" << item->source()->userName(); qDebug() << "SourceTreeItem toggled:" << item->source()->userName();
PlaylistManager::instance()->show( item->source()->collection() ); PlaylistManager::instance()->show( item->source()->collection() );
// APP->playlistManager()->show( item->source() );
} }
} }
} }