From c1cb85fee61123e55a378b7d5e82a933baf22764 Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Sat, 30 Jun 2012 23:18:29 +0200 Subject: [PATCH 01/17] * Use 'large' album covers from Last.fm. --- src/libtomahawk/accounts/lastfm/LastFmInfoPlugin.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/libtomahawk/accounts/lastfm/LastFmInfoPlugin.cpp b/src/libtomahawk/accounts/lastfm/LastFmInfoPlugin.cpp index 2036e43bc..f2166a900 100644 --- a/src/libtomahawk/accounts/lastfm/LastFmInfoPlugin.cpp +++ b/src/libtomahawk/accounts/lastfm/LastFmInfoPlugin.cpp @@ -212,7 +212,7 @@ LastFmInfoPlugin::scrobble() return; tLog() << Q_FUNC_INFO << "Scrobbling now:" << m_track.toString(); - + // FIXME: workaround for the duration-less dilandau (and others) tracks if ( m_track.duration() == 0 ) m_track.setDuration( 31 ); @@ -519,13 +519,14 @@ LastFmInfoPlugin::notInCacheSlot( QHash criteria, Tomahawk::In { QString artistName = criteria["artist"]; QString albumName = criteria["album"]; + tDebug() << Q_FUNC_INFO << artistName << albumName; QUrl imgurl( "http://ws.audioscrobbler.com/2.0/" ); imgurl.addQueryItem( "method", "album.imageredirect" ); imgurl.addEncodedQueryItem( "artist", QUrl::toPercentEncoding( artistName, "", "+" ) ); imgurl.addEncodedQueryItem( "album", QUrl::toPercentEncoding( albumName, "", "+" ) ); imgurl.addQueryItem( "autocorrect", QString::number( 1 ) ); - imgurl.addQueryItem( "size", "largesquare" ); + imgurl.addQueryItem( "size", "large" ); imgurl.addQueryItem( "api_key", "7a90f6672a04b809ee309af169f34b8b" ); QNetworkRequest req( imgurl ); @@ -539,6 +540,7 @@ LastFmInfoPlugin::notInCacheSlot( QHash criteria, Tomahawk::In case InfoArtistImages: { QString artistName = criteria["artist"]; + tDebug() << Q_FUNC_INFO << artistName; QUrl imgurl( "http://ws.audioscrobbler.com/2.0/" ); imgurl.addQueryItem( "method", "artist.imageredirect" ); From 4d188af33eb96bb142fffcbacc0292daf3013b85 Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Sat, 30 Jun 2012 23:21:13 +0200 Subject: [PATCH 02/17] * Return empty query_ptr when query data is invalid. --- src/libtomahawk/Query.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libtomahawk/Query.cpp b/src/libtomahawk/Query.cpp index 4fb15e037..ed3816598 100644 --- a/src/libtomahawk/Query.cpp +++ b/src/libtomahawk/Query.cpp @@ -82,8 +82,8 @@ PlaybackLog::PlaybackLog( const PlaybackLog& other ) query_ptr Query::get( const QString& artist, const QString& track, const QString& album, const QID& qid, bool autoResolve ) { - Q_ASSERT( !artist.trimmed().isEmpty() ); - Q_ASSERT( !track.trimmed().isEmpty() ); + if ( artist.trimmed().isEmpty() || track.trimmed().isEmpty() ) + return query_ptr(); if ( qid.isEmpty() ) autoResolve = false; From becb26363574a2481b948c1635af02bd5b5301fb Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Sat, 30 Jun 2012 23:21:52 +0200 Subject: [PATCH 03/17] * Be prepared for empty query_ptrs being returned from Query::get(). --- src/libtomahawk/GlobalActionManager.cpp | 32 ++++++--- .../accounts/lastfm/LastFmConfig.cpp | 17 +++-- .../spotify/SpotifyPlaylistUpdater.cpp | 3 + .../DatabaseCommand_GenericSelect.cpp | 2 + .../DatabaseCommand_LoadPlaylistEntries.cpp | 3 + src/libtomahawk/utils/GroovesharkParser.cpp | 3 +- src/libtomahawk/utils/ItunesParser.cpp | 35 +++++----- src/libtomahawk/utils/JspfLoader.cpp | 16 +++-- src/libtomahawk/utils/M3uLoader.cpp | 3 +- src/libtomahawk/utils/RdioParser.cpp | 25 ++++--- src/libtomahawk/utils/SpotifyParser.cpp | 40 +++++------ src/libtomahawk/utils/XspfLoader.cpp | 11 ++- src/libtomahawk/widgets/ChartDataLoader.cpp | 67 ++++++++++--------- src/web/Api_v1.cpp | 11 +-- src/xmppbot/XmppBot.cpp | 5 +- 15 files changed, 168 insertions(+), 105 deletions(-) diff --git a/src/libtomahawk/GlobalActionManager.cpp b/src/libtomahawk/GlobalActionManager.cpp index 45244f52e..b9a384cd9 100644 --- a/src/libtomahawk/GlobalActionManager.cpp +++ b/src/libtomahawk/GlobalActionManager.cpp @@ -617,16 +617,15 @@ GlobalActionManager::doQueueAdd( const QStringList& parts, const QList< QPair< Q { if ( parts.size() && parts[ 0 ] == "track" ) { - if ( queueSpotify( parts, queryItems ) ) return true; else if ( queueRdio( parts, queryItems ) ) return true; QPair< QString, QString > pair; - QString title, artist, album, urlStr; - foreach ( pair, queryItems ) { + foreach ( pair, queryItems ) + { pair.second = pair.second.replace( "+", " " ); // QUrl::queryItems doesn't decode + to a space :( if ( pair.first == "title" ) title = pair.second; @@ -642,9 +641,12 @@ GlobalActionManager::doQueueAdd( const QStringList& parts, const QList< QPair< Q { // an individual; query to add to queue query_ptr q = Query::get( artist, title, album, uuid(), false ); + if ( q.isNull() ) + return false; + if ( !urlStr.isEmpty() ) q->setResultHint( urlStr ); - Pipeline::instance()->resolve( q, true ); + Pipeline::instance()->resolve( q ); handleOpenTrack( q ); return true; @@ -666,9 +668,11 @@ GlobalActionManager::doQueueAdd( const QStringList& parts, const QList< QPair< Q { // give it a web result hint QFileInfo info( track.path() ); query_ptr q = Query::get( QString(), info.baseName(), QString(), uuid(), false ); - q->setResultHint( track.toString() ); + if ( q.isNull() ) + continue; - Pipeline::instance()->resolve( q, true ); + q->setResultHint( track.toString() ); + Pipeline::instance()->resolve( q ); ViewManager::instance()->queue()->model()->appendQuery( q ); ViewManager::instance()->showQueue(); @@ -1067,6 +1071,9 @@ GlobalActionManager::handlePlayCommand( const QUrl& url ) } query_ptr q = Query::get( artist, title, album ); + if ( q.isNull() ) + return false; + if ( !urlStr.isEmpty() ) q->setResultHint( urlStr ); @@ -1155,18 +1162,25 @@ bool GlobalActionManager::handleBookmarkCommand(const QUrl& url) urlStr = pair.second; } query_ptr q = Query::get( artist, title, album ); + if ( q.isNull() ) + return false; + if ( !urlStr.isEmpty() ) q->setResultHint( urlStr ); - Pipeline::instance()->resolve( q, true ); + Pipeline::instance()->resolve( q ); // now we add it to the special "bookmarks" playlist, creating it if it doesn't exist. if nothing is playing, start playing the track QSharedPointer< LocalCollection > col = SourceList::instance()->getLocal()->collection().dynamicCast< LocalCollection >(); playlist_ptr bookmarkpl = col->bookmarksPlaylist(); - if ( bookmarkpl.isNull() ) { // create it and do the deed then + if ( bookmarkpl.isNull() ) + { + // create it and do the deed then m_waitingToBookmark = q; col->createBookmarksPlaylist(); connect( col.data(), SIGNAL( bookmarkPlaylistCreated( Tomahawk::playlist_ptr ) ), this, SLOT( bookmarkPlaylistCreated( Tomahawk::playlist_ptr ) ), Qt::UniqueConnection ); - } else { + } + else + { doBookmark( bookmarkpl, q ); } diff --git a/src/libtomahawk/accounts/lastfm/LastFmConfig.cpp b/src/libtomahawk/accounts/lastfm/LastFmConfig.cpp index fb415d91d..75115a2a4 100644 --- a/src/libtomahawk/accounts/lastfm/LastFmConfig.cpp +++ b/src/libtomahawk/accounts/lastfm/LastFmConfig.cpp @@ -132,7 +132,7 @@ LastFmConfig::onHistoryLoaded() uint total = 0; bool finished = false; QNetworkReply* reply = qobject_cast< QNetworkReply* >( sender() ); - + try { lastfm::XmlQuery lfm; @@ -142,22 +142,25 @@ LastFmConfig::onHistoryLoaded() { // tDebug() << "Found:" << e["artist"].text() << e["name"].text() << e["date"].attribute( "uts" ).toUInt(); Tomahawk::query_ptr query = Query::get( e["artist"].text(), e["name"].text(), QString(), QString(), false ); + if ( query.isNull() ) + continue; + m_lastTimeStamp = e["date"].attribute( "uts" ).toUInt(); - + DatabaseCommand_LogPlayback* cmd = new DatabaseCommand_LogPlayback( query, DatabaseCommand_LogPlayback::Finished, m_lastTimeStamp ); Database::instance()->enqueue( QSharedPointer(cmd) ); } - + if ( !lfm.children( "recenttracks" ).isEmpty() ) { lastfm::XmlQuery stats = lfm.children( "recenttracks" ).first(); - + uint page = stats.attribute( "page" ).toUInt(); total = stats.attribute( "totalPages" ).toUInt(); - + m_ui->progressBar->setMaximum( total ); m_ui->progressBar->setValue( page ); - + if ( page < total ) { m_page = page + 1; @@ -174,7 +177,7 @@ LastFmConfig::onHistoryLoaded() tDebug() << "XmlQuery error:" << e.message(); finished = true; } - + if ( finished ) { if ( m_page != total ) diff --git a/src/libtomahawk/accounts/spotify/SpotifyPlaylistUpdater.cpp b/src/libtomahawk/accounts/spotify/SpotifyPlaylistUpdater.cpp index 64bdda98f..43ee8cf70 100644 --- a/src/libtomahawk/accounts/spotify/SpotifyPlaylistUpdater.cpp +++ b/src/libtomahawk/accounts/spotify/SpotifyPlaylistUpdater.cpp @@ -674,6 +674,9 @@ SpotifyPlaylistUpdater::variantToQueries( const QVariantList& list ) { QVariantMap trackMap = blob.toMap(); const query_ptr q = Query::get( trackMap.value( "artist" ).toString(), trackMap.value( "track" ).toString(), trackMap.value( "album" ).toString(), uuid(), false ); + if ( q.isNull() ) + continue; + if ( trackMap.contains( "id" ) ) q->setProperty( "annotation", trackMap.value( "id" ) ); diff --git a/src/libtomahawk/database/DatabaseCommand_GenericSelect.cpp b/src/libtomahawk/database/DatabaseCommand_GenericSelect.cpp index 88ee17de5..90edf32bb 100644 --- a/src/libtomahawk/database/DatabaseCommand_GenericSelect.cpp +++ b/src/libtomahawk/database/DatabaseCommand_GenericSelect.cpp @@ -91,6 +91,8 @@ DatabaseCommand_GenericSelect::exec( DatabaseImpl* dbi ) artist = query.value( 1 ).toString(); qry = Tomahawk::Query::get( artist, track, QString() ); + if ( qry.isNull() ) + continue; } else if ( m_queryType == Artist ) { diff --git a/src/libtomahawk/database/DatabaseCommand_LoadPlaylistEntries.cpp b/src/libtomahawk/database/DatabaseCommand_LoadPlaylistEntries.cpp index 89a4941b1..fa6be8fab 100644 --- a/src/libtomahawk/database/DatabaseCommand_LoadPlaylistEntries.cpp +++ b/src/libtomahawk/database/DatabaseCommand_LoadPlaylistEntries.cpp @@ -77,6 +77,9 @@ DatabaseCommand_LoadPlaylistEntries::generateEntries( DatabaseImpl* dbi ) e->setResultHint( query.value( 8 ).toString() ); Tomahawk::query_ptr q = Tomahawk::Query::get( query.value( 2 ).toString(), query.value( 1 ).toString(), query.value( 3 ).toString() ); + if ( q.isNull() ) + continue; + q->setResultHint( query.value( 8 ).toString() ); q->setProperty( "annotation", e->annotation() ); e->setQuery( q ); diff --git a/src/libtomahawk/utils/GroovesharkParser.cpp b/src/libtomahawk/utils/GroovesharkParser.cpp index 25c1e80d5..1edbab6f8 100644 --- a/src/libtomahawk/utils/GroovesharkParser.cpp +++ b/src/libtomahawk/utils/GroovesharkParser.cpp @@ -199,7 +199,8 @@ GroovesharkParser::trackPageFetchFinished() tDebug() << "Got track info from grooveshark, enough to create a query:" << title.toPlainText() << artist.toPlainText() << album.toPlainText(); Tomahawk::query_ptr q = Tomahawk::Query::get( artist.toPlainText(), title.toPlainText(), album.toPlainText(), uuid(), true ); - m_tracks << q; + if ( !q.isNull() ) + m_tracks << q; } checkTrackFinished(); diff --git a/src/libtomahawk/utils/ItunesParser.cpp b/src/libtomahawk/utils/ItunesParser.cpp index c2125a136..1031ac06a 100644 --- a/src/libtomahawk/utils/ItunesParser.cpp +++ b/src/libtomahawk/utils/ItunesParser.cpp @@ -37,18 +37,18 @@ using namespace Tomahawk; QPixmap* ItunesParser::s_pixmap = 0; + ItunesParser::ItunesParser( const QStringList& urls, QObject* parent ) : QObject ( parent ) , m_single( false ) - { foreach ( const QString& url, urls ) { - lookupItunesUri( url ); } } + ItunesParser::ItunesParser( const QString& Url, QObject* parent ) : QObject ( parent ) , m_single( true ) @@ -56,11 +56,12 @@ ItunesParser::ItunesParser( const QString& Url, QObject* parent ) lookupItunesUri( Url ); } + ItunesParser::~ItunesParser() { - } + void ItunesParser::lookupItunesUri( const QString& link ) { @@ -89,17 +90,17 @@ ItunesParser::lookupItunesUri( const QString& link ) } else return; - } tLog() << "Parsing itunes track:" << link; QUrl url; DropJob::DropType type; - if( link.contains( "artist" ) ) + if ( link.contains( "artist" ) ) { type = DropJob::Artist; url = QUrl( QString( "http://ax.phobos.apple.com.edgesuite.net/WebObjects/MZStoreServices.woa/wa/wsLookup?id=%1&entity=song&limit=30" ).arg( id ) ); - }else + } + else { type = ( trackId.isEmpty() ? DropJob::Album : DropJob::Track ); url = QUrl( QString( "http://ax.phobos.apple.com.edgesuite.net/WebObjects/MZStoreServices.woa/wa/wsLookup?id=%1&entity=song" ).arg( ( trackId.isEmpty() ? id : trackId ) ) ); @@ -113,8 +114,9 @@ ItunesParser::lookupItunesUri( const QString& link ) JobStatusView::instance()->model()->addJob( j ); m_queries.insert( reply ); - } + + void ItunesParser::itunesResponseLookupFinished() { @@ -134,7 +136,8 @@ ItunesParser::itunesResponseLookupFinished() tLog() << "Failed to parse json from Spotify track lookup:" << p.errorString() << "On line" << p.errorLine(); checkTrackFinished(); return; - } else if ( !res.contains( "results" ) ) + } + else if ( !res.contains( "results" ) ) { tLog() << "No 'results' item in the itunes track lookup result... not doing anything"; checkTrackFinished(); @@ -149,23 +152,25 @@ ItunesParser::itunesResponseLookupFinished() if ( ituneMap.value( "wrapperType" ).toString().contains( "track" ) ) { - title = ituneMap.value( "trackName" ).toString(); artist = ituneMap.value( "artistName" ).toString(); album = ituneMap.value( "collectionName" ).toString(); if ( title.isEmpty() && artist.isEmpty() ) // don't have enough... { tLog() << "Didn't get an artist and track name from itunes, not enough to build a query on. Aborting" << title << artist << album; - - }else{ - + } + else + { Tomahawk::query_ptr q = Tomahawk::Query::get( artist, title, album, uuid(), true ); + if ( q.isNull() ) + continue; + m_tracks << q; } } } - - } else + } + else { JobStatusView::instance()->model()->addJob( new ErrorStatusMessage( tr( "Error fetching iTunes information from the network!" ) ) ); tLog() << "Error in network request to Itunes for track decoding:" << r->errorString(); @@ -187,9 +192,9 @@ ItunesParser::checkTrackFinished() deleteLater(); } - } + QPixmap ItunesParser::pixmap() const { diff --git a/src/libtomahawk/utils/JspfLoader.cpp b/src/libtomahawk/utils/JspfLoader.cpp index 85c1d568c..393c563b6 100644 --- a/src/libtomahawk/utils/JspfLoader.cpp +++ b/src/libtomahawk/utils/JspfLoader.cpp @@ -34,16 +34,20 @@ using namespace Tomahawk; -JSPFLoader::JSPFLoader( bool autoCreate, QObject *parent ) + +JSPFLoader::JSPFLoader( bool autoCreate, QObject* parent ) : QObject( parent ) , m_autoCreate( autoCreate ) , m_autoDelete( true ) -{} +{ +} + JSPFLoader::~JSPFLoader() { } + QList< Tomahawk::query_ptr > JSPFLoader::entries() const { @@ -159,9 +163,9 @@ JSPFLoader::gotBody() if ( tM.value( "location" ).toList().size() > 0 ) url = tM.value( "location" ).toList().first().toString(); - if( artist.isEmpty() || track.isEmpty() ) + if ( artist.isEmpty() || track.isEmpty() ) { - if( !shownError ) + if ( !shownError ) { QMessageBox::warning( 0, tr( "Failed to save tracks" ), tr( "Some tracks in the playlist do not contain an artist and a title. They will be ignored." ), QMessageBox::Ok ); shownError = true; @@ -170,6 +174,9 @@ JSPFLoader::gotBody() } query_ptr q = Tomahawk::Query::get( artist, track, album, uuid() ); + if ( q.isNull() ) + continue; + q->setDuration( duration.toInt() / 1000 ); if( !url.isEmpty() ) q->setResultHint( url ); @@ -201,7 +208,6 @@ JSPFLoader::gotBody() m_creator, false, m_entries ); - } emit ok( m_playlist ); diff --git a/src/libtomahawk/utils/M3uLoader.cpp b/src/libtomahawk/utils/M3uLoader.cpp index 2d644936d..ed5db4e74 100644 --- a/src/libtomahawk/utils/M3uLoader.cpp +++ b/src/libtomahawk/utils/M3uLoader.cpp @@ -91,7 +91,8 @@ M3uLoader::getTags( const QFileInfo& info ) { qDebug() << Q_FUNC_INFO << artist << track << album; Tomahawk::query_ptr q = Tomahawk::Query::get( artist, track, album, uuid(), !m_createNewPlaylist ); - m_tracks << q; + if ( !q.isNull() ) + m_tracks << q; } } diff --git a/src/libtomahawk/utils/RdioParser.cpp b/src/libtomahawk/utils/RdioParser.cpp index f1132897e..9e0e7fddc 100644 --- a/src/libtomahawk/utils/RdioParser.cpp +++ b/src/libtomahawk/utils/RdioParser.cpp @@ -48,6 +48,7 @@ QPixmap* RdioParser::s_pixmap = 0; QCA::Initializer RdioParser::m_qcaInit = QCA::Initializer(); #endif + RdioParser::RdioParser( QObject* parent ) : QObject( parent ) , m_count( 0 ) @@ -56,10 +57,12 @@ RdioParser::RdioParser( QObject* parent ) { } + RdioParser::~RdioParser() { } + void RdioParser::parse( const QString& url ) { @@ -68,6 +71,7 @@ RdioParser::parse( const QString& url ) parseUrl( url ); } + void RdioParser::parse( const QStringList& urls ) { @@ -109,9 +113,9 @@ RdioParser::parseUrl( const QString& url ) // artist, album, or playlist link requre fetching fetchObjectsFromUrl( url, type ); } - } + void RdioParser::fetchObjectsFromUrl( const QString& url, DropJob::DropType type ) { @@ -134,10 +138,10 @@ RdioParser::fetchObjectsFromUrl( const QString& url, DropJob::DropType type ) m_reqQueries.insert( reply ); } + void RdioParser::rdioReturned() { - QNetworkReply* r = qobject_cast< QNetworkReply* >( sender() ); Q_ASSERT( r ); m_reqQueries.remove( r ); @@ -185,21 +189,22 @@ RdioParser::rdioReturned() } Tomahawk::query_ptr q = Tomahawk::Query::get( artist, title, album, uuid(), !m_createPlaylist ); + if ( q.isNull() ) + continue; + m_tracks << q; } - - } else + } + else { JobStatusView::instance()->model()->addJob( new ErrorStatusMessage( tr( "Error fetching Rdio information from the network!" ) ) ); tLog() << "Error in network request to Rdio for track decoding:" << r->errorString(); } - checkFinished(); - - } + void RdioParser::parseTrack( const QString& origUrl ) { @@ -313,6 +318,7 @@ RdioParser::hmacSha1(QByteArray key, QByteArray baseString) #endif } + void RdioParser::checkFinished() { @@ -325,7 +331,7 @@ RdioParser::checkFinished() if ( m_tracks.isEmpty() ) return; - if( m_createPlaylist ) + if ( m_createPlaylist ) { m_playlist = Playlist::create( SourceList::instance()->getLocal(), uuid(), @@ -353,6 +359,7 @@ RdioParser::checkFinished() } } + void RdioParser::playlistCreated( Tomahawk::PlaylistRevision ) { @@ -370,6 +377,7 @@ RdioParser::expandedLinks( const QStringList& urls ) } } + QPixmap RdioParser::pixmap() const { @@ -378,4 +386,3 @@ RdioParser::pixmap() const return *s_pixmap; } - diff --git a/src/libtomahawk/utils/SpotifyParser.cpp b/src/libtomahawk/utils/SpotifyParser.cpp index b03276412..7c37e1ed2 100644 --- a/src/libtomahawk/utils/SpotifyParser.cpp +++ b/src/libtomahawk/utils/SpotifyParser.cpp @@ -39,6 +39,7 @@ using namespace Tomahawk; QPixmap* SpotifyParser::s_pixmap = 0; + SpotifyParser::SpotifyParser( const QStringList& Urls, bool createNewPlaylist, QObject* parent ) : QObject ( parent ) , m_limit ( 40 ) @@ -52,6 +53,7 @@ SpotifyParser::SpotifyParser( const QStringList& Urls, bool createNewPlaylist, Q lookupUrl( url ); } + SpotifyParser::SpotifyParser( const QString& Url, bool createNewPlaylist, QObject* parent ) : QObject ( parent ) , m_limit ( 40 ) @@ -63,6 +65,7 @@ SpotifyParser::SpotifyParser( const QString& Url, bool createNewPlaylist, QObjec lookupUrl( Url ); } + SpotifyParser::~SpotifyParser() { } @@ -71,12 +74,12 @@ SpotifyParser::~SpotifyParser() void SpotifyParser::lookupUrl( const QString& link ) { - if( link.contains( "track" ) ) + if ( link.contains( "track" ) ) { m_trackMode = true; lookupTrack( link ); } - else if( link.contains( "playlist" ) || link.contains( "album" ) || link.contains( "artist" ) ) + else if ( link.contains( "playlist" ) || link.contains( "album" ) || link.contains( "artist" ) ) { if( !m_createNewPlaylist ) m_trackMode = true; @@ -87,7 +90,6 @@ SpotifyParser::lookupUrl( const QString& link ) } else return; // Not valid spotify item - } @@ -103,7 +105,6 @@ SpotifyParser::lookupSpotifyBrowse( const QString& linkRaw ) browseUri = "spotify:" + browseUri; } - DropJob::DropType type; if ( browseUri.contains( "spotify:user" ) ) @@ -133,6 +134,7 @@ SpotifyParser::lookupSpotifyBrowse( const QString& linkRaw ) m_queries.insert( reply ); } + void SpotifyParser::lookupTrack( const QString& link ) { @@ -159,7 +161,6 @@ SpotifyParser::lookupTrack( const QString& link ) JobStatusView::instance()->model()->addJob( j ); m_queries.insert( reply ); - } @@ -186,8 +187,6 @@ SpotifyParser::spotifyBrowseFinished() } QVariantMap resultResponse = res.value( res.value( "type" ).toString() ).toMap(); - - if ( !resultResponse.isEmpty() ) { m_title = resultResponse.value( "name" ).toString(); @@ -214,12 +213,14 @@ SpotifyParser::spotifyBrowseFinished() } Tomahawk::query_ptr q = Tomahawk::Query::get( artist, title, album, uuid(), m_trackMode ); + if ( q.isNull() ) + continue; + m_tracks << q; } - } - - } else + } + else { JobStatusView::instance()->model()->addJob( new ErrorStatusMessage( tr( "Error fetching Spotify information from the network!" ) ) ); tLog() << "Error in network request to Spotify for track decoding:" << r->errorString(); @@ -232,7 +233,6 @@ SpotifyParser::spotifyBrowseFinished() } - void SpotifyParser::spotifyTrackLookupFinished() { @@ -252,7 +252,8 @@ SpotifyParser::spotifyTrackLookupFinished() tLog() << "Failed to parse json from Spotify track lookup:" << p.errorString() << "On line" << p.errorLine(); checkTrackFinished(); return; - } else if ( !res.contains( "track" ) ) + } + else if ( !res.contains( "track" ) ) { tLog() << "No 'track' item in the spotify track lookup result... not doing anything"; checkTrackFinished(); @@ -261,7 +262,6 @@ SpotifyParser::spotifyTrackLookupFinished() // lets parse this baby QVariantMap t = res.value( "track" ).toMap(); - QString title, artist, album; title = t.value( "name", QString() ).toString(); @@ -278,8 +278,10 @@ SpotifyParser::spotifyTrackLookupFinished() } Tomahawk::query_ptr q = Tomahawk::Query::get( artist, title, album, uuid(), m_trackMode ); - m_tracks << q; - } else + if ( !q.isNull() ) + m_tracks << q; + } + else { tLog() << "Error in network request to Spotify for track decoding:" << r->errorString(); } @@ -288,9 +290,9 @@ SpotifyParser::spotifyTrackLookupFinished() checkTrackFinished(); else checkBrowseFinished(); - } + void SpotifyParser::checkBrowseFinished() { @@ -300,7 +302,7 @@ SpotifyParser::checkBrowseFinished() if ( m_browseJob ) m_browseJob->setFinished(); - if( m_createNewPlaylist && !m_tracks.isEmpty() ) + if ( m_createNewPlaylist && !m_tracks.isEmpty() ) { m_playlist = Playlist::create( SourceList::instance()->getLocal(), uuid(), @@ -322,6 +324,7 @@ SpotifyParser::checkBrowseFinished() } } + void SpotifyParser::checkTrackFinished() { @@ -338,13 +341,12 @@ SpotifyParser::checkTrackFinished() deleteLater(); } - } + void SpotifyParser::playlistCreated() { - ViewManager::instance()->show( m_playlist ); deleteLater(); diff --git a/src/libtomahawk/utils/XspfLoader.cpp b/src/libtomahawk/utils/XspfLoader.cpp index eb0726864..01515a548 100644 --- a/src/libtomahawk/utils/XspfLoader.cpp +++ b/src/libtomahawk/utils/XspfLoader.cpp @@ -40,6 +40,7 @@ using namespace Tomahawk; + QString XSPFLoader::errorToString( XSPFErrorCode error ) { @@ -56,7 +57,8 @@ XSPFLoader::errorToString( XSPFErrorCode error ) } } -XSPFLoader::XSPFLoader( bool autoCreate, bool autoUpdate, QObject *parent ) + +XSPFLoader::XSPFLoader( bool autoCreate, bool autoUpdate, QObject* parent ) : QObject( parent ) , m_autoCreate( autoCreate ) , m_autoUpdate( autoUpdate ) @@ -69,7 +71,8 @@ XSPFLoader::XSPFLoader( bool autoCreate, bool autoUpdate, QObject *parent ) XSPFLoader::~XSPFLoader() -{} +{ +} void @@ -235,6 +238,9 @@ XSPFLoader::gotBody() } query_ptr q = Tomahawk::Query::get( artist, track, album, uuid(), false ); + if ( q.isNull() ) + continue; + q->setDuration( duration.toInt() / 1000 ); if ( !url.isEmpty() ) q->setResultHint( url ); @@ -279,5 +285,4 @@ XSPFLoader::gotBody() if ( m_autoDelete ) deleteLater(); - } diff --git a/src/libtomahawk/widgets/ChartDataLoader.cpp b/src/libtomahawk/widgets/ChartDataLoader.cpp index 760df389c..785aac30a 100644 --- a/src/libtomahawk/widgets/ChartDataLoader.cpp +++ b/src/libtomahawk/widgets/ChartDataLoader.cpp @@ -27,47 +27,52 @@ ChartDataLoader::ChartDataLoader() { } + void ChartDataLoader::go() { switch ( m_type ) { - case Track: - { - QList< query_ptr > track_ptrs; - foreach ( const Tomahawk::InfoSystem::InfoStringHash& track, m_data ) + case Track: { - track_ptrs << Query::get( track[ "artist" ], track[ "track" ], QString(), uuid(), false ); + QList< query_ptr > track_ptrs; + foreach ( const Tomahawk::InfoSystem::InfoStringHash& track, m_data ) + { + query_ptr q = Query::get( track[ "artist" ], track[ "track" ], QString(), uuid(), false ); + if ( q.isNull() ) + continue; + + track_ptrs << q; + } + + emit tracks( this, track_ptrs ); + break; } - - emit tracks( this, track_ptrs ); - break; - } - case Artist: - { - QList< artist_ptr > artist_ptrs; - - foreach ( const QString& artistname, m_artists ) + case Artist: { - artist_ptrs << Artist::get( artistname, false ); + QList< artist_ptr > artist_ptrs; + + foreach ( const QString& artistname, m_artists ) + { + artist_ptrs << Artist::get( artistname, false ); + } + + emit artists( this, artist_ptrs ); + break; } - - emit artists( this, artist_ptrs ); - break; - } - case Album: - { - QList< album_ptr > album_ptrs; - - foreach ( const Tomahawk::InfoSystem::InfoStringHash& album, m_data ) + case Album: { - artist_ptr artistPtr = Artist::get( album[ "artist" ], false ); - album_ptr albumPtr = Album::get( artistPtr, album[ "album" ], false ); - album_ptrs << albumPtr; - } + QList< album_ptr > album_ptrs; - emit albums( this, album_ptrs ); - break; - } + foreach ( const Tomahawk::InfoSystem::InfoStringHash& album, m_data ) + { + artist_ptr artistPtr = Artist::get( album[ "artist" ], false ); + album_ptr albumPtr = Album::get( artistPtr, album[ "album" ], false ); + album_ptrs << albumPtr; + } + + emit albums( this, album_ptrs ); + break; + } } } diff --git a/src/web/Api_v1.cpp b/src/web/Api_v1.cpp index 2dddc8bff..4f8f78c9f 100644 --- a/src/web/Api_v1.cpp +++ b/src/web/Api_v1.cpp @@ -253,8 +253,7 @@ Api_v1::resolve( QxtWebRequestEvent* event ) !event->url.hasQueryItem( "track" ) ) { qDebug() << "Malformed HTTP resolve request"; - send404( event ); - return; + return send404( event ); } const QString artist = QUrl::fromPercentEncoding( event->url.queryItemValue( "artist" ).toUtf8() ); @@ -265,8 +264,7 @@ Api_v1::resolve( QxtWebRequestEvent* event ) track.trimmed().isEmpty() ) { qDebug() << "Malformed HTTP resolve request"; - send404( event ); - return; + return send404( event ); } QString qid; @@ -276,6 +274,11 @@ Api_v1::resolve( QxtWebRequestEvent* event ) qid = uuid(); query_ptr qry = Query::get( artist, track, album, qid, false ); + if ( qry.isNull() ) + { + return send404( event ); + } + Pipeline::instance()->resolve( qry, true, true ); QVariantMap r; diff --git a/src/xmppbot/XmppBot.cpp b/src/xmppbot/XmppBot.cpp index 35c2c2d4e..d90b30bdb 100644 --- a/src/xmppbot/XmppBot.cpp +++ b/src/xmppbot/XmppBot.cpp @@ -150,7 +150,7 @@ void XMPPBot::handleSubscription(const gloox::Subscription& subscription) void XMPPBot::handleMessage(const Message& msg, MessageSession* session) { //TODO: implement "properly" with MessageSessions, if the bot is to be multi-user - if (msg.subtype() != Message::Chat || msg.from().full().empty() || msg.to().full().empty()) + if ( msg.subtype() != Message::Chat || msg.from().full().empty() || msg.to().full().empty() ) return; QString body = QString::fromStdString( msg.body() ).toLower().trimmed(); @@ -163,6 +163,9 @@ void XMPPBot::handleMessage(const Message& msg, MessageSession* session) AudioEngine::instance()->play(); Tomahawk::query_ptr q = Tomahawk::Query::get( tokens.first().trimmed(), tokens.last().trimmed(), QString() ); + if ( q.isNull() ) + return; + connect( q.data(), SIGNAL( resultsAdded( QList ) ), SLOT( onResultsAdded( QList ) ) ); From afb624f8ebb5f12f4eed20b58bd3b240c7f7cb96 Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Sat, 30 Jun 2012 23:35:04 +0200 Subject: [PATCH 04/17] * Add 'Copy Artist/Album Link' context menu items. --- src/libtomahawk/ContextMenu.cpp | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/src/libtomahawk/ContextMenu.cpp b/src/libtomahawk/ContextMenu.cpp index faaac4bbe..9f226450a 100644 --- a/src/libtomahawk/ContextMenu.cpp +++ b/src/libtomahawk/ContextMenu.cpp @@ -151,8 +151,8 @@ ContextMenu::setAlbums( const QList& albums ) addSeparator(); -/* if ( m_supportedActions & ActionCopyLink && itemCount() == 1 ) - m_sigmap->setMapping( addAction( tr( "Copy Album &Link" ) ), ActionCopyLink ); */ + if ( m_supportedActions & ActionCopyLink && itemCount() == 1 ) + m_sigmap->setMapping( addAction( tr( "Copy Album &Link" ) ), ActionCopyLink ); foreach ( QAction* action, actions() ) { @@ -193,8 +193,8 @@ ContextMenu::setArtists( const QList& artists ) addSeparator(); -/* if ( m_supportedActions & ActionCopyLink && itemCount() == 1 ) - m_sigmap->setMapping( addAction( tr( "Copy Artist &Link" ) ), ActionCopyLink ); */ + if ( m_supportedActions & ActionCopyLink && itemCount() == 1 ) + m_sigmap->setMapping( addAction( tr( "Copy Artist &Link" ) ), ActionCopyLink ); foreach ( QAction* action, actions() ) { @@ -274,6 +274,14 @@ ContextMenu::copyLink() { GlobalActionManager::instance()->copyToClipboard( m_queries.first() ); } + else if ( m_albums.count() ) + { + GlobalActionManager::instance()->copyOpenLink( m_albums.first() ); + } + else if ( m_artists.count() ) + { + GlobalActionManager::instance()->copyOpenLink( m_artists.first() ); + } } From 8b9540cf9df2133425a6c130e812e49a66ec779b Mon Sep 17 00:00:00 2001 From: Leo Franchi Date: Sat, 30 Jun 2012 17:55:21 -0400 Subject: [PATCH 05/17] No more libspotify in bundle --- admin/mac/macdeploy.py | 8 -------- 1 file changed, 8 deletions(-) diff --git a/admin/mac/macdeploy.py b/admin/mac/macdeploy.py index 58324555f..144f46692 100755 --- a/admin/mac/macdeploy.py +++ b/admin/mac/macdeploy.py @@ -28,9 +28,6 @@ FRAMEWORK_SEARCH_PATH=[ LIBRARY_SEARCH_PATH=['/usr/local/lib', '/usr/local/Cellar/gettext/0.18.1.1/lib', '.'] -LIBSPOTIFY_VERSION = commands.getoutput("brew ls -version libspotify | tr -s \" \" \"\\\\012\" | tail -n 1").strip() -LIBSPOTIFY_PATH = "/usr/local/lib/libspotify.%s.dylib" % LIBSPOTIFY_VERSION - VLC_PLUGINS=[ 'libaccess_attachment_plugin.dylib', #'libaccess_avio_plugin.dylib', @@ -512,11 +509,6 @@ try: except: print 'Failed to find tomahawk_crash_reporter' -try: - FixPlugin(LIBSPOTIFY_PATH, "../Frameworks") -except: - print "Failed to copy libspotify from os: %s" % LIBSPOTIFY_PATH - for plugin in QT_PLUGINS: FixPlugin(FindQtPlugin(plugin), os.path.dirname(plugin)) From 7f5c78ec9fb7e280ef8b11976e7829c42726e3c8 Mon Sep 17 00:00:00 2001 From: Tomahawk CI Date: Sat, 30 Jun 2012 22:17:41 +0000 Subject: [PATCH 06/17] Automatic merge of Transifex translations --- lang/tomahawk_ar.ts | 119 +++++++++++++++++++++------------------- lang/tomahawk_bg.ts | 118 +++++++++++++++++++++------------------- lang/tomahawk_ca.ts | 118 +++++++++++++++++++++------------------- lang/tomahawk_de.ts | 119 +++++++++++++++++++++------------------- lang/tomahawk_en.ts | 120 ++++++++++++++++++++++------------------- lang/tomahawk_es.ts | 118 +++++++++++++++++++++------------------- lang/tomahawk_fr.ts | 119 +++++++++++++++++++++------------------- lang/tomahawk_ja.ts | 118 +++++++++++++++++++++------------------- lang/tomahawk_pl.ts | 118 +++++++++++++++++++++------------------- lang/tomahawk_pt_BR.ts | 118 +++++++++++++++++++++------------------- lang/tomahawk_ru.ts | 119 +++++++++++++++++++++------------------- lang/tomahawk_sv.ts | 118 +++++++++++++++++++++------------------- lang/tomahawk_tr.ts | 118 +++++++++++++++++++++------------------- lang/tomahawk_zh_CN.ts | 118 +++++++++++++++++++++------------------- lang/tomahawk_zh_TW.ts | 118 +++++++++++++++++++++------------------- 15 files changed, 961 insertions(+), 815 deletions(-) diff --git a/lang/tomahawk_ar.ts b/lang/tomahawk_ar.ts index 378fd4d67..cdb5c30a2 100644 --- a/lang/tomahawk_ar.ts +++ b/lang/tomahawk_ar.ts @@ -1,4 +1,31 @@ + + ACLJobDelegate + + + Allow %1 to +connect and stream from you? + + + + + Allow Streaming + + + + + Deny Access + + + + + ACLJobItem + + + Tomahawk needs you to decide whether %1 is allowed to connect. + + + AccountFactoryWrapper @@ -35,34 +62,6 @@ غير متصل - - AclJobDelegate - - - Allow %1 to -connect and stream from you? - هل تسمح ل %1 -بالربط بك ومشاركة أغانيك ؟ - - - - Allow Streaming - إسمح بالمشاركة - - - - Deny Access - عدم السماح - - - - AclJobItem - - - Tomahawk needs you to decide whether %1 is allowed to connect. - توماهوك يطلب منك إن كان %1 بإمكانه الاتصال. - - ActionCollection @@ -1788,28 +1787,28 @@ connect and stream from you? نقل التاريخ... - + History Incomplete. Resume تاريخ ناقص. استأنف - + Playback History Imported تم استيراد تاريخ إعادة الإستماع - - + + Failed فشلت - + Success نجاح - + Could not contact server لم أستطيع الإتصال بالخادم @@ -2042,7 +2041,7 @@ You may wish to try re-authenticating. - + &Love &أحب @@ -2052,7 +2051,17 @@ You may wish to try re-authenticating. &نسخ رابط الأغنية - + + Copy Album &Link + + + + + Copy Artist &Link + + + + Un-&Love لا &أحب @@ -2620,7 +2629,7 @@ Try tweaking the filters for a new set of songs to play. Tomahawk::GroovesharkParser - + Error fetching Grooveshark information from the network! مشكلة في جلب معلومات "Grooveshark" من الشبكة! @@ -2708,7 +2717,7 @@ Try tweaking the filters for a new set of songs to play. Tomahawk::ItunesParser - + Error fetching iTunes information from the network! مشكلة في جلب معلومات "iTunes" من الشبكة! @@ -2716,27 +2725,27 @@ Try tweaking the filters for a new set of songs to play. Tomahawk::JSPFLoader - + New Playlist قائمة أغاني جديدة - + Failed to save tracks فشل في حفظ الأغاني - + Some tracks in the playlist do not contain an artist and a title. They will be ignored. بعض الأغاني في قائمة التشغيل لا تحتوي على إسم الفنان أو إسم الأغنية. هذه الأغاني سوف تتجاهل. - + XSPF Error خطأ XSPF - + This is not a valid XSPF playlist. قائمة الأغاني XSPF هذه ليست صالحة. @@ -2796,7 +2805,7 @@ Try tweaking the filters for a new set of songs to play. Tomahawk::RdioParser - + Error fetching Rdio information from the network! مشكلة في جلب معلومات "Rdio" من الشبكة! @@ -2856,7 +2865,7 @@ Try tweaking the filters for a new set of songs to play. Tomahawk::SpotifyParser - + Error fetching Spotify information from the network! مشكلة في جلب معلومات "Spotify" من الشبكة! @@ -2872,7 +2881,7 @@ Try tweaking the filters for a new set of songs to play. TomahawkApp - + My Collection مجموعتي الخاصة @@ -3629,19 +3638,19 @@ You can re-send a sync message at any time simply by sending another tweet using XMPPBot - + Terms for %1: شروط %1: - + No terms found, sorry. لا شروط موجودة، نتأسف. - + Hotttness for %1: %2 @@ -3650,7 +3659,7 @@ Hotttness for %1: %2 - + Familiarity for %1: %2 @@ -3659,7 +3668,7 @@ Familiarity for %1: %2 - + Lyrics for "%1" by %2: @@ -3675,22 +3684,22 @@ Lyrics for "%1" by %2: XSPFLoader - + Failed to parse contents of XSPF playlist فشل في تحليل محتويات قائمة الأغاني XSPF - + Some playlist entries were found without artist and track name, they will be omitted تم العثور على مداخل في قوائم الأغاني لا تحتوي على إسم فنان أو إسم أغنية، هذه المداخل سوف تحذف - + Failed to fetch the desired playlist from the network, or the desired file does not exist فشل في جلب قائمة الأغاني المطلوبة من الشبكة، أو الملف المطلوب غير موجود - + New Playlist قائمة أغاني جديدة diff --git a/lang/tomahawk_bg.ts b/lang/tomahawk_bg.ts index d4b11705d..7ac5a77db 100644 --- a/lang/tomahawk_bg.ts +++ b/lang/tomahawk_bg.ts @@ -1,4 +1,31 @@ + + ACLJobDelegate + + + Allow %1 to +connect and stream from you? + + + + + Allow Streaming + + + + + Deny Access + + + + + ACLJobItem + + + Tomahawk needs you to decide whether %1 is allowed to connect. + + + AccountFactoryWrapper @@ -35,33 +62,6 @@ Извън линия - - AclJobDelegate - - - Allow %1 to -connect and stream from you? - Ще позволиш ли на %1 да се свърже и слуша музика от твоята колекция? - - - - Allow Streaming - - - - - Deny Access - - - - - AclJobItem - - - Tomahawk needs you to decide whether %1 is allowed to connect. - - - ActionCollection @@ -1794,28 +1794,28 @@ Tomahaw създаде доклад относно това и изпращай Импортирам... - + History Incomplete. Resume Непълна информация. Продължи. - + Playback History Imported Историята на просвирените песни е импортирана - - + + Failed Неуспешно - + Success Ура! - + Could not contact server Не мога да се свържа със сървъра @@ -2050,7 +2050,7 @@ You may wish to try re-authenticating. - + &Love &Харесай @@ -2060,7 +2060,17 @@ You may wish to try re-authenticating. &Копирай адресът на изпълнението - + + Copy Album &Link + + + + + Copy Artist &Link + + + + Un-&Love Не-&харесай @@ -2627,7 +2637,7 @@ Try tweaking the filters for a new set of songs to play. Tomahawk::GroovesharkParser - + Error fetching Grooveshark information from the network! Грешка при извличане на информацията от Grooveshark @@ -2715,7 +2725,7 @@ Try tweaking the filters for a new set of songs to play. Tomahawk::ItunesParser - + Error fetching iTunes information from the network! Грешка при извличане на информация от iTunes @@ -2723,27 +2733,27 @@ Try tweaking the filters for a new set of songs to play. Tomahawk::JSPFLoader - + New Playlist Нов списък - + Failed to save tracks Не мога да запазя избраните песни - + Some tracks in the playlist do not contain an artist and a title. They will be ignored. Някои песни в списъкът за изпълнение нямат артист и заглавие. Те ще бъдат игнорирани. - + XSPF Error XSPF грешка - + This is not a valid XSPF playlist. Това не е валиден XSPF списък @@ -2803,7 +2813,7 @@ Try tweaking the filters for a new set of songs to play. Tomahawk::RdioParser - + Error fetching Rdio information from the network! Грешка при извличане на информация от Rdio @@ -2863,7 +2873,7 @@ Try tweaking the filters for a new set of songs to play. Tomahawk::SpotifyParser - + Error fetching Spotify information from the network! Грешка при извличане на информация от Spotify @@ -2879,7 +2889,7 @@ Try tweaking the filters for a new set of songs to play. TomahawkApp - + My Collection Моята колекция @@ -3641,33 +3651,33 @@ You can re-send a sync message at any time simply by sending another tweet using XMPPBot - + Terms for %1: Условия за %1: - + No terms found, sorry. Няма открити условия, съжалявам. - + Hotttness for %1: %2 Популарност на %1:%2 - + Familiarity for %1: %2 Еднаквост за %1: %2 - + Lyrics for "%1" by %2: @@ -3682,23 +3692,23 @@ Lyrics for "%1" by %2: XSPFLoader - + Failed to parse contents of XSPF playlist Неуспешно извличане на данни от XSPF списък - + Some playlist entries were found without artist and track name, they will be omitted За някои от позициите не открих артист или име на песента. Те ще бъдат пропуснати. - + Failed to fetch the desired playlist from the network, or the desired file does not exist Неуспех при извличане на избраният списък през мрежата или избраният файл не съществува. - + New Playlist Нов списък diff --git a/lang/tomahawk_ca.ts b/lang/tomahawk_ca.ts index 15a37bfa3..7b44df220 100644 --- a/lang/tomahawk_ca.ts +++ b/lang/tomahawk_ca.ts @@ -1,4 +1,31 @@ + + ACLJobDelegate + + + Allow %1 to +connect and stream from you? + + + + + Allow Streaming + + + + + Deny Access + + + + + ACLJobItem + + + Tomahawk needs you to decide whether %1 is allowed to connect. + + + AccountFactoryWrapper @@ -35,33 +62,6 @@ Fora de línia - - AclJobDelegate - - - Allow %1 to -connect and stream from you? - Voleu permetre que %1 s'us connecti i transmetre-li la vostra música? - - - - Allow Streaming - Permet l'streaming - - - - Deny Access - - - - - AclJobItem - - - Tomahawk needs you to decide whether %1 is allowed to connect. - - - ActionCollection @@ -1787,28 +1787,28 @@ i emissores de ràdio basades en el vostre gust musical. S'està important l'historial... - + History Incomplete. Resume Historial incomplet... Reprèn - + Playback History Imported S'ha importat l'historial de reproducció - - + + Failed Error - + Success Èxit - + Could not contact server No s'ha pogut contactar amb el servidor @@ -2041,7 +2041,7 @@ Torneu a autenticar-vos. - + &Love &M'encanta @@ -2051,7 +2051,17 @@ Torneu a autenticar-vos. &Copia l'Enllaç de la Cançó - + + Copy Album &Link + + + + + Copy Artist &Link + + + + Un-&Love &Treu de les preferides @@ -2619,7 +2629,7 @@ Intenteu ajustar els filtres per reproduir noves cançons. Tomahawk::GroovesharkParser - + Error fetching Grooveshark information from the network! Error en cercar la informació de Grooveshark a través de la xarxa! @@ -2707,7 +2717,7 @@ Intenteu ajustar els filtres per reproduir noves cançons. Tomahawk::ItunesParser - + Error fetching iTunes information from the network! Error en cercar la informació d'iTunes a través de la xarxa! @@ -2715,27 +2725,27 @@ Intenteu ajustar els filtres per reproduir noves cançons. Tomahawk::JSPFLoader - + New Playlist Nova llista de reproducció - + Failed to save tracks Error en desar les cançons - + Some tracks in the playlist do not contain an artist and a title. They will be ignored. Algunes cançons de la llista no contenen ni artista ni titol i s'han ignorat. - + XSPF Error Error XSPF - + This is not a valid XSPF playlist. No és una llista XSPF vàlida. @@ -2795,7 +2805,7 @@ Intenteu ajustar els filtres per reproduir noves cançons. Tomahawk::RdioParser - + Error fetching Rdio information from the network! Error en cercar la informació de Rdio a través de la xarxa! @@ -2855,7 +2865,7 @@ Intenteu ajustar els filtres per reproduir noves cançons. Tomahawk::SpotifyParser - + Error fetching Spotify information from the network! Error en cercar la informació de Spotify a través de la xarxa! @@ -2871,7 +2881,7 @@ Intenteu ajustar els filtres per reproduir noves cançons. TomahawkApp - + My Collection La meva Col·lecció @@ -3628,7 +3638,7 @@ Podeu reenviar un missatge de sincronisme en qualsevol moment simplement enviant XMPPBot - + Terms for %1: @@ -3636,12 +3646,12 @@ Terms for %1: Termes per %1: - + No terms found, sorry. No s'han trobat termes. - + Hotttness for %1: %2 @@ -3649,14 +3659,14 @@ Hotttness for %1: %2 Rellevància per %1: %2 - + Familiarity for %1: %2 Semblança per %1: %2 - + Lyrics for "%1" by %2: @@ -3672,22 +3682,22 @@ Lletres de la cancó "%1" de %2: XSPFLoader - + Failed to parse contents of XSPF playlist Error en analitzar els continguts de la llista XSPF - + Some playlist entries were found without artist and track name, they will be omitted Algunes entrades de la llista no disposaven d'informació d'artista ni de nom de cançó, s'han omès - + Failed to fetch the desired playlist from the network, or the desired file does not exist Error en cercar la llista a la xarxa. Pot ser no existeix el fitxer - + New Playlist Nova llista de reproducció diff --git a/lang/tomahawk_de.ts b/lang/tomahawk_de.ts index 998c1a896..1db4a3d82 100644 --- a/lang/tomahawk_de.ts +++ b/lang/tomahawk_de.ts @@ -1,4 +1,31 @@ + + ACLJobDelegate + + + Allow %1 to +connect and stream from you? + + + + + Allow Streaming + + + + + Deny Access + + + + + ACLJobItem + + + Tomahawk needs you to decide whether %1 is allowed to connect. + + + AccountFactoryWrapper @@ -35,34 +62,6 @@ Nicht Verbunden - - AclJobDelegate - - - Allow %1 to -connect and stream from you? - Willst du %1 -erlauben sich mit dir zu verbinden? - - - - Allow Streaming - Verbindung erlauben - - - - Deny Access - Verbindung verweigern - - - - AclJobItem - - - Tomahawk needs you to decide whether %1 is allowed to connect. - Tomahawk will wissen, ob du dich mit %1 verbinden möchtest. - - ActionCollection @@ -1785,28 +1784,28 @@ erlauben sich mit dir zu verbinden? Importiere Historie... - + History Incomplete. Resume Historie unvollständig. Fortfahren - + Playback History Imported Lieder-Historie importiert - - + + Failed Fehlgeschlagen - + Success Erfolgreich - + Could not contact server Konnte den Server nicht erreichen! @@ -2037,7 +2036,7 @@ You may wish to try re-authenticating. - + &Love &Lieblingslied @@ -2047,7 +2046,17 @@ You may wish to try re-authenticating. &Kopiere Link zu diesem Stück - + + Copy Album &Link + + + + + Copy Artist &Link + + + + Un-&Love Kein &Lieblingslied @@ -2615,7 +2624,7 @@ Versuch die Filter anzupassen für neue Lieder. Tomahawk::GroovesharkParser - + Error fetching Grooveshark information from the network! Konnte Grooveshark-Daten nicht laden! @@ -2703,7 +2712,7 @@ Versuch die Filter anzupassen für neue Lieder. Tomahawk::ItunesParser - + Error fetching iTunes information from the network! Konnte iTunes-Daten nicht laden! @@ -2711,27 +2720,27 @@ Versuch die Filter anzupassen für neue Lieder. Tomahawk::JSPFLoader - + New Playlist Neue Playliste - + Failed to save tracks Konnte Stücke nicht abspeichern - + Some tracks in the playlist do not contain an artist and a title. They will be ignored. Einige Stücke in der Playliste enthalten weder Künstler noch Titel. Diese werden ignoriert. - + XSPF Error XSPF-Fehler - + This is not a valid XSPF playlist. Dies ist keine gültige XSPF-Playliste. @@ -2791,7 +2800,7 @@ Versuch die Filter anzupassen für neue Lieder. Tomahawk::RdioParser - + Error fetching Rdio information from the network! Konnte Rdio-Daten nicht laden! @@ -2851,7 +2860,7 @@ Versuch die Filter anzupassen für neue Lieder. Tomahawk::SpotifyParser - + Error fetching Spotify information from the network! Konnte Spotify-Daten nicht laden! @@ -2867,7 +2876,7 @@ Versuch die Filter anzupassen für neue Lieder. TomahawkApp - + My Collection Meine Sammlung @@ -3619,7 +3628,7 @@ You can re-send a sync message at any time simply by sending another tweet using XMPPBot - + Terms for %1: @@ -3628,26 +3637,26 @@ Begriffe für %1: - + No terms found, sorry. Kein Begriff gefunden, Sorry. - + Hotttness for %1: %2 - + Familiarity for %1: %2 - + Lyrics for "%1" by %2: @@ -3662,22 +3671,22 @@ Lyrics for "%1" by %2: XSPFLoader - + Failed to parse contents of XSPF playlist Fehler beim lesen der XSPF Playlist - + Some playlist entries were found without artist and track name, they will be omitted Einige Playlist Titel wurden ohne Künstler- oder Liedname gefunden und daher ignoriert - + Failed to fetch the desired playlist from the network, or the desired file does not exist Fehler beim Laden der Playliste - + New Playlist Neue Playliste diff --git a/lang/tomahawk_en.ts b/lang/tomahawk_en.ts index 025f594e1..e39879d2b 100644 --- a/lang/tomahawk_en.ts +++ b/lang/tomahawk_en.ts @@ -1,4 +1,32 @@ + + ACLJobDelegate + + + Allow %1 to +connect and stream from you? + Allow %1 to +connect and stream from you? + + + + Allow Streaming + Allow Streaming + + + + Deny Access + Deny Access + + + + ACLJobItem + + + Tomahawk needs you to decide whether %1 is allowed to connect. + Tomahawk needs you to decide whether %1 is allowed to connect. + + AccountFactoryWrapper @@ -35,34 +63,6 @@ Offline - - AclJobDelegate - - - Allow %1 to -connect and stream from you? - Allow %1 to -connect and stream from you? - - - - Allow Streaming - Allow Streaming - - - - Deny Access - Deny Access - - - - AclJobItem - - - Tomahawk needs you to decide whether %1 is allowed to connect. - Tomahawk needs you to decide whether %1 is allowed to connect. - - ActionCollection @@ -1788,28 +1788,28 @@ connect and stream from you? Importing History... - + History Incomplete. Resume History Incomplete. Resume - + Playback History Imported Playback History Imported - - + + Failed Failed - + Success Success - + Could not contact server Could not contact server @@ -2042,7 +2042,7 @@ You may wish to try re-authenticating. - + &Love &Love @@ -2052,7 +2052,17 @@ You may wish to try re-authenticating. &Copy Track Link - + + Copy Album &Link + Copy Album &Link + + + + Copy Artist &Link + Copy Artist &Link + + + Un-&Love Un-&Love @@ -2620,7 +2630,7 @@ Try tweaking the filters for a new set of songs to play. Tomahawk::GroovesharkParser - + Error fetching Grooveshark information from the network! Error fetching Grooveshark information from the network! @@ -2708,7 +2718,7 @@ Try tweaking the filters for a new set of songs to play. Tomahawk::ItunesParser - + Error fetching iTunes information from the network! Error fetching iTunes information from the network! @@ -2716,27 +2726,27 @@ Try tweaking the filters for a new set of songs to play. Tomahawk::JSPFLoader - + New Playlist New Playlist - + Failed to save tracks Failed to save tracks - + Some tracks in the playlist do not contain an artist and a title. They will be ignored. Some tracks in the playlist do not contain an artist and a title. They will be ignored. - + XSPF Error XSPF Error - + This is not a valid XSPF playlist. This is not a valid XSPF playlist. @@ -2796,7 +2806,7 @@ Try tweaking the filters for a new set of songs to play. Tomahawk::RdioParser - + Error fetching Rdio information from the network! Error fetching Rdio information from the network! @@ -2856,7 +2866,7 @@ Try tweaking the filters for a new set of songs to play. Tomahawk::SpotifyParser - + Error fetching Spotify information from the network! Error fetching Spotify information from the network! @@ -2872,7 +2882,7 @@ Try tweaking the filters for a new set of songs to play. TomahawkApp - + My Collection My Collection @@ -3629,7 +3639,7 @@ You can re-send a sync message at any time simply by sending another tweet using XMPPBot - + Terms for %1: @@ -3638,12 +3648,12 @@ Terms for %1: - + No terms found, sorry. No terms found, sorry. - + Hotttness for %1: %2 @@ -3652,7 +3662,7 @@ Hotttness for %1: %2 - + Familiarity for %1: %2 @@ -3661,7 +3671,7 @@ Familiarity for %1: %2 - + Lyrics for "%1" by %2: @@ -3677,22 +3687,22 @@ Lyrics for "%1" by %2: XSPFLoader - + Failed to parse contents of XSPF playlist Failed to parse contents of XSPF playlist - + Some playlist entries were found without artist and track name, they will be omitted Some playlist entries were found without artist and track name, they will be omitted - + Failed to fetch the desired playlist from the network, or the desired file does not exist Failed to fetch the desired playlist from the network, or the desired file does not exist - + New Playlist New Playlist diff --git a/lang/tomahawk_es.ts b/lang/tomahawk_es.ts index 5835a293f..e3cfa763d 100644 --- a/lang/tomahawk_es.ts +++ b/lang/tomahawk_es.ts @@ -1,4 +1,31 @@ + + ACLJobDelegate + + + Allow %1 to +connect and stream from you? + + + + + Allow Streaming + + + + + Deny Access + + + + + ACLJobItem + + + Tomahawk needs you to decide whether %1 is allowed to connect. + + + AccountFactoryWrapper @@ -35,33 +62,6 @@ Desconectado - - AclJobDelegate - - - Allow %1 to -connect and stream from you? - ¿Permitir a %1 conectarse y transmitirle música? - - - - Allow Streaming - - - - - Deny Access - - - - - AclJobItem - - - Tomahawk needs you to decide whether %1 is allowed to connect. - - - ActionCollection @@ -1786,28 +1786,28 @@ y estaciones basadas en sus gustos personales. - + History Incomplete. Resume - + Playback History Imported - - + + Failed Fallo - + Success Éxito - + Could not contact server No se pudo contactar el servidor @@ -2040,7 +2040,7 @@ Hay que volverse a autenticar. - + &Love &Favorito @@ -2050,7 +2050,17 @@ Hay que volverse a autenticar. &Copiar enlace del Tema - + + Copy Album &Link + + + + + Copy Artist &Link + + + + Un-&Love Quitar de &Favoritos @@ -2618,7 +2628,7 @@ Intente ajustar los filtros para reproducir nuevas canciones. Tomahawk::GroovesharkParser - + Error fetching Grooveshark information from the network! Error al buscar la información de Grooveshar en la red! @@ -2706,7 +2716,7 @@ Intente ajustar los filtros para reproducir nuevas canciones. Tomahawk::ItunesParser - + Error fetching iTunes information from the network! Error al buscar la información de iTunes en la red! @@ -2714,27 +2724,27 @@ Intente ajustar los filtros para reproducir nuevas canciones. Tomahawk::JSPFLoader - + New Playlist Nueva lista de reproducción - + Failed to save tracks Fallo al guardar pistas - + Some tracks in the playlist do not contain an artist and a title. They will be ignored. Algunas pistas en la lista de reproducción no contienen artista ni título. Éstas serán ignoradas. - + XSPF Error Error XSPF - + This is not a valid XSPF playlist. Esta no es una lista de reproducción XSPF válida. @@ -2794,7 +2804,7 @@ Intente ajustar los filtros para reproducir nuevas canciones. Tomahawk::RdioParser - + Error fetching Rdio information from the network! Error al buscar la información de Rdio en la red! @@ -2854,7 +2864,7 @@ Intente ajustar los filtros para reproducir nuevas canciones. Tomahawk::SpotifyParser - + Error fetching Spotify information from the network! Error al buscar la información de Spotify en la red! @@ -2870,7 +2880,7 @@ Intente ajustar los filtros para reproducir nuevas canciones. TomahawkApp - + My Collection Mi colección @@ -3627,7 +3637,7 @@ Puede reenviar el mensaje de sincronización en cualquier momento simplemente en XMPPBot - + Terms for %1: @@ -3635,12 +3645,12 @@ Terms for %1: Términos de %1: - + No terms found, sorry. No se encuentran términos, lo siento. - + Hotttness for %1: %2 @@ -3649,7 +3659,7 @@ Actualidad de %1: %2 - + Familiarity for %1: %2 @@ -3658,7 +3668,7 @@ Familiaridad de %1: %2 - + Lyrics for "%1" by %2: @@ -3674,22 +3684,22 @@ Letras de "%1" por %2: XSPFLoader - + Failed to parse contents of XSPF playlist Error al analizar los contenidos de la lista XSPF - + Some playlist entries were found without artist and track name, they will be omitted Algunas entradas de la lista no tenía información de artista o de títul y serán omitidas - + Failed to fetch the desired playlist from the network, or the desired file does not exist Error al buscar la lista deseada en la red, o el fichero no existe - + New Playlist Nueva lista de reproducción diff --git a/lang/tomahawk_fr.ts b/lang/tomahawk_fr.ts index 30a663eff..1bfae0b5d 100644 --- a/lang/tomahawk_fr.ts +++ b/lang/tomahawk_fr.ts @@ -1,4 +1,31 @@ + + ACLJobDelegate + + + Allow %1 to +connect and stream from you? + + + + + Allow Streaming + + + + + Deny Access + + + + + ACLJobItem + + + Tomahawk needs you to decide whether %1 is allowed to connect. + + + AccountFactoryWrapper @@ -35,34 +62,6 @@ Hors ligne - - AclJobDelegate - - - Allow %1 to -connect and stream from you? - Autoriser %1 à -se connecter et streamer depuis chez vous ? - - - - Allow Streaming - Permettre Streaming - - - - Deny Access - Refuser l'accès - - - - AclJobItem - - - Tomahawk needs you to decide whether %1 is allowed to connect. - Tomahawk a besoin que vous déciderez si %1 est autorisé à se connecter. - - ActionCollection @@ -1788,28 +1787,28 @@ et des stations basées sur vos goûts. Import de l'historique... - + History Incomplete. Resume Historique incomplet. Reprendre - + Playback History Imported Historique de lecture importé - - + + Failed Échec - + Success Succès - + Could not contact server Impossible de contacter le serveur @@ -2042,7 +2041,7 @@ Essayez de vous authentifier de nouveau. - + &Love &Favori @@ -2052,7 +2051,17 @@ Essayez de vous authentifier de nouveau. &Copier le lien de la piste - + + Copy Album &Link + + + + + Copy Artist &Link + + + + Un-&Love &Supprimer des Favoris @@ -2620,7 +2629,7 @@ Essayez de changer les filtres pour avoir de nouveaux morceaux à jouer. Tomahawk::GroovesharkParser - + Error fetching Grooveshark information from the network! Échec du chargement des informations Grooveshark depuis le réseau! @@ -2708,7 +2717,7 @@ Essayez de changer les filtres pour avoir de nouveaux morceaux à jouer. Tomahawk::ItunesParser - + Error fetching iTunes information from the network! Échec du chargement des informations iTunes depuis le réseau ! @@ -2716,27 +2725,27 @@ Essayez de changer les filtres pour avoir de nouveaux morceaux à jouer. Tomahawk::JSPFLoader - + New Playlist Nouvelle liste de lecture - + Failed to save tracks Échec de la sauvegarde des pistes - + Some tracks in the playlist do not contain an artist and a title. They will be ignored. Certaines pistes dans la liste de lecture ne contiennent pas d'artiste ou de titre. Elles seront ignorées. - + XSPF Error Erreur XSPF - + This is not a valid XSPF playlist. Ceci n'est pas une liste de lecture XSPF valide. @@ -2796,7 +2805,7 @@ Essayez de changer les filtres pour avoir de nouveaux morceaux à jouer. Tomahawk::RdioParser - + Error fetching Rdio information from the network! Échec du chargement des informations Rdio depuis le réseau! @@ -2856,7 +2865,7 @@ Essayez de changer les filtres pour avoir de nouveaux morceaux à jouer. Tomahawk::SpotifyParser - + Error fetching Spotify information from the network! Échec du chargement des informations Spotify depuis le réseau! @@ -2872,7 +2881,7 @@ Essayez de changer les filtres pour avoir de nouveaux morceaux à jouer. TomahawkApp - + My Collection Ma Collection @@ -3629,7 +3638,7 @@ Vous pouvez envoyer un message de synchronisation quand vous le souhaitez en env XMPPBot - + Terms for %1: @@ -3638,12 +3647,12 @@ Résultats pour %1 : - + No terms found, sorry. Aucun terme trouvé, désolé. - + Hotttness for %1: %2 @@ -3652,7 +3661,7 @@ Hotttness pour %1 : %2 - + Familiarity for %1: %2 @@ -3661,7 +3670,7 @@ Familiarité pour %1 : %2 - + Lyrics for "%1" by %2: @@ -3677,22 +3686,22 @@ Paroles de "%1" par %2 : XSPFLoader - + Failed to parse contents of XSPF playlist Échec du décodage de la liste de lecture XSPF - + Some playlist entries were found without artist and track name, they will be omitted Certaines entrées de la liste de lecture n'ont pas d'artiste ou de titre, elles seront omises - + Failed to fetch the desired playlist from the network, or the desired file does not exist Échec du chargement de la liste de lecture depuis le réseau, ou le fichier n'existe pas - + New Playlist Nouvelle liste de lecture diff --git a/lang/tomahawk_ja.ts b/lang/tomahawk_ja.ts index 421f9ff5d..86e89c70c 100644 --- a/lang/tomahawk_ja.ts +++ b/lang/tomahawk_ja.ts @@ -1,4 +1,31 @@ + + ACLJobDelegate + + + Allow %1 to +connect and stream from you? + + + + + Allow Streaming + + + + + Deny Access + + + + + ACLJobItem + + + Tomahawk needs you to decide whether %1 is allowed to connect. + + + AccountFactoryWrapper @@ -35,33 +62,6 @@ オフライン - - AclJobDelegate - - - Allow %1 to -connect and stream from you? - %1と接続して、音楽配信を許可しますか？ - - - - Allow Streaming - - - - - Deny Access - - - - - AclJobItem - - - Tomahawk needs you to decide whether %1 is allowed to connect. - - - ActionCollection @@ -1785,28 +1785,28 @@ connect and stream from you? - + History Incomplete. Resume - + Playback History Imported - - + + Failed - + Success - + Could not contact server @@ -2036,7 +2036,7 @@ You may wish to try re-authenticating. - + &Love &Love @@ -2046,7 +2046,17 @@ You may wish to try re-authenticating. - + + Copy Album &Link + + + + + Copy Artist &Link + + + + Un-&Love Loveじゃないトラック @@ -2610,7 +2620,7 @@ Try tweaking the filters for a new set of songs to play. Tomahawk::GroovesharkParser - + Error fetching Grooveshark information from the network! @@ -2698,7 +2708,7 @@ Try tweaking the filters for a new set of songs to play. Tomahawk::ItunesParser - + Error fetching iTunes information from the network! @@ -2706,27 +2716,27 @@ Try tweaking the filters for a new set of songs to play. Tomahawk::JSPFLoader - + New Playlist 新規プレイリスト - + Failed to save tracks トラックの保存に失敗しました。 - + Some tracks in the playlist do not contain an artist and a title. They will be ignored. - + XSPF Error - + This is not a valid XSPF playlist. @@ -2786,7 +2796,7 @@ Try tweaking the filters for a new set of songs to play. Tomahawk::RdioParser - + Error fetching Rdio information from the network! @@ -2846,7 +2856,7 @@ Try tweaking the filters for a new set of songs to play. Tomahawk::SpotifyParser - + Error fetching Spotify information from the network! @@ -2862,7 +2872,7 @@ Try tweaking the filters for a new set of songs to play. TomahawkApp - + My Collection @@ -3620,7 +3630,7 @@ Twitterを使っている友達にTomahawkを接続したいなら、ツイー XMPPBot - + Terms for %1: @@ -3629,26 +3639,26 @@ Terms for %1: - + No terms found, sorry. 語句と一致する結果は見つかりませんでした。 - + Hotttness for %1: %2 - + Familiarity for %1: %2 - + Lyrics for "%1" by %2: @@ -3660,22 +3670,22 @@ Lyrics for "%1" by %2: XSPFLoader - + Failed to parse contents of XSPF playlist - + Some playlist entries were found without artist and track name, they will be omitted - + Failed to fetch the desired playlist from the network, or the desired file does not exist - + New Playlist 新規プレイリスト diff --git a/lang/tomahawk_pl.ts b/lang/tomahawk_pl.ts index 9c2b22597..6be5385bb 100644 --- a/lang/tomahawk_pl.ts +++ b/lang/tomahawk_pl.ts @@ -1,4 +1,31 @@ + + ACLJobDelegate + + + Allow %1 to +connect and stream from you? + + + + + Allow Streaming + + + + + Deny Access + + + + + ACLJobItem + + + Tomahawk needs you to decide whether %1 is allowed to connect. + + + AccountFactoryWrapper @@ -35,33 +62,6 @@ Offline - - AclJobDelegate - - - Allow %1 to -connect and stream from you? - - - - - Allow Streaming - - - - - Deny Access - - - - - AclJobItem - - - Tomahawk needs you to decide whether %1 is allowed to connect. - - - ActionCollection @@ -1787,28 +1787,28 @@ indywidualnego profilu gustu. - + History Incomplete. Resume - + Playback History Imported - - + + Failed - + Success - + Could not contact server @@ -2038,7 +2038,7 @@ You may wish to try re-authenticating. - + &Love &Uwielbiam @@ -2048,7 +2048,17 @@ You may wish to try re-authenticating. - + + Copy Album &Link + + + + + Copy Artist &Link + + + + Un-&Love @@ -2614,7 +2624,7 @@ Try tweaking the filters for a new set of songs to play. Tomahawk::GroovesharkParser - + Error fetching Grooveshark information from the network! @@ -2702,7 +2712,7 @@ Try tweaking the filters for a new set of songs to play. Tomahawk::ItunesParser - + Error fetching iTunes information from the network! @@ -2710,27 +2720,27 @@ Try tweaking the filters for a new set of songs to play. Tomahawk::JSPFLoader - + New Playlist Nowa Lista - + Failed to save tracks Nie udało się zapisać utworów - + Some tracks in the playlist do not contain an artist and a title. They will be ignored. Niektóre utwory na liście nie zawierają artysty lub tytułu. Zostaną one zignorowane. - + XSPF Error Błąd XSPF - + This is not a valid XSPF playlist. To nie jest poprawna lista XSPF. @@ -2790,7 +2800,7 @@ Try tweaking the filters for a new set of songs to play. Tomahawk::RdioParser - + Error fetching Rdio information from the network! @@ -2850,7 +2860,7 @@ Try tweaking the filters for a new set of songs to play. Tomahawk::SpotifyParser - + Error fetching Spotify information from the network! @@ -2866,7 +2876,7 @@ Try tweaking the filters for a new set of songs to play. TomahawkApp - + My Collection Moja Kolekcja @@ -3623,26 +3633,26 @@ Zawsze możesz ponownie wysłać wiadomość synchronizacyjną - po prostu wyśl XMPPBot - + Terms for %1: - + No terms found, sorry. - + Hotttness for %1: %2 - + Familiarity for %1: %2 @@ -3651,7 +3661,7 @@ Znajomość dla %1: %2 - + Lyrics for "%1" by %2: @@ -3667,22 +3677,22 @@ Tekst dla "%1" wykonawcy %2: XSPFLoader - + Failed to parse contents of XSPF playlist - + Some playlist entries were found without artist and track name, they will be omitted - + Failed to fetch the desired playlist from the network, or the desired file does not exist - + New Playlist Nowa Lista diff --git a/lang/tomahawk_pt_BR.ts b/lang/tomahawk_pt_BR.ts index 7dabef5b9..c88bcd476 100644 --- a/lang/tomahawk_pt_BR.ts +++ b/lang/tomahawk_pt_BR.ts @@ -1,4 +1,31 @@ + + ACLJobDelegate + + + Allow %1 to +connect and stream from you? + + + + + Allow Streaming + + + + + Deny Access + + + + + ACLJobItem + + + Tomahawk needs you to decide whether %1 is allowed to connect. + + + AccountFactoryWrapper @@ -35,33 +62,6 @@ Offline - - AclJobDelegate - - - Allow %1 to -connect and stream from you? - Permitir que %1 se conecte e faça o stream por você? - - - - Allow Streaming - Permitir Streaming - - - - Deny Access - Negar Acesso - - - - AclJobItem - - - Tomahawk needs you to decide whether %1 is allowed to connect. - Tomahawk precisa que você decida se %1 tem permissão para se conectar. - - ActionCollection @@ -1787,28 +1787,28 @@ automáticas baseadas no seu gosto pessoal. Importando Histórico... - + History Incomplete. Resume Histórico Incompleto. Retomar - + Playback History Imported Reproduzir Histórico Importado - - + + Failed Falhou - + Success Sucesso - + Could not contact server Não foi possível contatar o servidor @@ -2041,7 +2041,7 @@ Você pode tentar re-autenticar. - + &Love &Favorita @@ -2051,7 +2051,17 @@ Você pode tentar re-autenticar. &Copiar Link da Faixa - + + Copy Album &Link + + + + + Copy Artist &Link + + + + Un-&Love &Desfavoritar @@ -2619,7 +2629,7 @@ Tente ajustar os filtros para ouvir um novo conjunto de músicas. Tomahawk::GroovesharkParser - + Error fetching Grooveshark information from the network! Erro ao obter informações do Grooveshark pela rede! @@ -2707,7 +2717,7 @@ Tente ajustar os filtros para ouvir um novo conjunto de músicas. Tomahawk::ItunesParser - + Error fetching iTunes information from the network! Erro ao obter informações do iTunes pela rede! @@ -2715,27 +2725,27 @@ Tente ajustar os filtros para ouvir um novo conjunto de músicas. Tomahawk::JSPFLoader - + New Playlist Nova Playlist - + Failed to save tracks Falha ao salvar faixas - + Some tracks in the playlist do not contain an artist and a title. They will be ignored. Algumas faixas na playlist não contem artista e título. Elas serão ignoradas. - + XSPF Error Erro XSPF - + This is not a valid XSPF playlist. Essa não é uma playlist XSPF válida. @@ -2795,7 +2805,7 @@ Tente ajustar os filtros para ouvir um novo conjunto de músicas. Tomahawk::RdioParser - + Error fetching Rdio information from the network! Erro ao obter informações do Rdio pela rede! @@ -2855,7 +2865,7 @@ Tente ajustar os filtros para ouvir um novo conjunto de músicas. Tomahawk::SpotifyParser - + Error fetching Spotify information from the network! Erro ao obter informações do Spotify pela rede! @@ -2871,7 +2881,7 @@ Tente ajustar os filtros para ouvir um novo conjunto de músicas. TomahawkApp - + My Collection Minha Coleção @@ -3628,7 +3638,7 @@ Você pode enviar uma outra mensagem de sincronia a qualquer momento simplesment XMPPBot - + Terms for %1: @@ -3637,12 +3647,12 @@ Termos para %1: - + No terms found, sorry. Nenhum termo encontrado, descupe. - + Hotttness for %1: %2 @@ -3651,14 +3661,14 @@ Hotttness para %1: %2 - + Familiarity for %1: %2 Familiar para %1: %2 - + Lyrics for "%1" by %2: @@ -3673,22 +3683,22 @@ Letras de "%1" por %2: XSPFLoader - + Failed to parse contents of XSPF playlist Falha ao analisar conteúdos da playlist XSPF - + Some playlist entries were found without artist and track name, they will be omitted Algumas entradas da playlist foram encontradas sem o nome do artista e música, elas serão omitidas - + Failed to fetch the desired playlist from the network, or the desired file does not exist Falha ao buscar a playlist desejada na rede ou o arquivo desejado não existe - + New Playlist Nova lista de reprodução diff --git a/lang/tomahawk_ru.ts b/lang/tomahawk_ru.ts index ff64f8575..ee72c72fc 100644 --- a/lang/tomahawk_ru.ts +++ b/lang/tomahawk_ru.ts @@ -1,4 +1,31 @@ + + ACLJobDelegate + + + Allow %1 to +connect and stream from you? + + + + + Allow Streaming + + + + + Deny Access + + + + + ACLJobItem + + + Tomahawk needs you to decide whether %1 is allowed to connect. + + + AccountFactoryWrapper @@ -35,34 +62,6 @@ Не в сети - - AclJobDelegate - - - Allow %1 to -connect and stream from you? - Разрешить %1 ⏎ -подключиться и слушать ваш поток? - - - - Allow Streaming - - - - - Deny Access - Доступ запрещен - - - - AclJobItem - - - Tomahawk needs you to decide whether %1 is allowed to connect. - - - ActionCollection @@ -1785,28 +1784,28 @@ connect and stream from you? Импортирование истории... - + History Incomplete. Resume - + Playback History Imported - - + + Failed Неудача - + Success Успех - + Could not contact server Не удается связаться с сервером @@ -2039,7 +2038,7 @@ You may wish to try re-authenticating. - + &Love &Любимая @@ -2049,7 +2048,17 @@ You may wish to try re-authenticating. &Скопировать Ссылку Песни - + + Copy Album &Link + + + + + Copy Artist &Link + + + + Un-&Love &Не Любимая @@ -2615,7 +2624,7 @@ Try tweaking the filters for a new set of songs to play. Tomahawk::GroovesharkParser - + Error fetching Grooveshark information from the network! @@ -2703,7 +2712,7 @@ Try tweaking the filters for a new set of songs to play. Tomahawk::ItunesParser - + Error fetching iTunes information from the network! Возникла ошибка при получении информации из iTunes! @@ -2711,27 +2720,27 @@ Try tweaking the filters for a new set of songs to play. Tomahawk::JSPFLoader - + New Playlist Новый плейлист - + Failed to save tracks Не удалось сохранить треки - + Some tracks in the playlist do not contain an artist and a title. They will be ignored. Некоторые треки в плейлисте не содержат исполнителя и название. Они будут проигнорированы. - + XSPF Error Ошибка XSPF - + This is not a valid XSPF playlist. Это не является допустимым XSPF плейлистом. @@ -2791,7 +2800,7 @@ Try tweaking the filters for a new set of songs to play. Tomahawk::RdioParser - + Error fetching Rdio information from the network! Возникла ошибка при получении информации из Rdio! @@ -2851,7 +2860,7 @@ Try tweaking the filters for a new set of songs to play. Tomahawk::SpotifyParser - + Error fetching Spotify information from the network! Возникла ошибка при получении информации из Spotify! @@ -2867,7 +2876,7 @@ Try tweaking the filters for a new set of songs to play. TomahawkApp - + My Collection Моя коллекция @@ -3622,7 +3631,7 @@ You can re-send a sync message at any time simply by sending another tweet using XMPPBot - + Terms for %1: @@ -3630,19 +3639,19 @@ Terms for %1: Условия для %1: - + No terms found, sorry. Извините не найдено терминов. - + Hotttness for %1: %2 - + Familiarity for %1: %2 @@ -3651,7 +3660,7 @@ Familiarity for %1: %2 - + Lyrics for "%1" by %2: @@ -3666,22 +3675,22 @@ Lyrics for "%1" by %2: XSPFLoader - + Failed to parse contents of XSPF playlist - + Some playlist entries were found without artist and track name, they will be omitted - + Failed to fetch the desired playlist from the network, or the desired file does not exist - + New Playlist Новый Плейлист diff --git a/lang/tomahawk_sv.ts b/lang/tomahawk_sv.ts index 4131fa1aa..78aa8eef4 100644 --- a/lang/tomahawk_sv.ts +++ b/lang/tomahawk_sv.ts @@ -1,4 +1,31 @@ + + ACLJobDelegate + + + Allow %1 to +connect and stream from you? + + + + + Allow Streaming + + + + + Deny Access + + + + + ACLJobItem + + + Tomahawk needs you to decide whether %1 is allowed to connect. + + + AccountFactoryWrapper @@ -35,33 +62,6 @@ Offline - - AclJobDelegate - - - Allow %1 to -connect and stream from you? - - - - - Allow Streaming - - - - - Deny Access - - - - - AclJobItem - - - Tomahawk needs you to decide whether %1 is allowed to connect. - - - ActionCollection @@ -1784,28 +1784,28 @@ connect and stream from you? - + History Incomplete. Resume - + Playback History Imported - - + + Failed Misslyckades - + Success - + Could not contact server @@ -2035,7 +2035,7 @@ You may wish to try re-authenticating. - + &Love @@ -2045,7 +2045,17 @@ You may wish to try re-authenticating. - + + Copy Album &Link + + + + + Copy Artist &Link + + + + Un-&Love @@ -2609,7 +2619,7 @@ Try tweaking the filters for a new set of songs to play. Tomahawk::GroovesharkParser - + Error fetching Grooveshark information from the network! @@ -2697,7 +2707,7 @@ Try tweaking the filters for a new set of songs to play. Tomahawk::ItunesParser - + Error fetching iTunes information from the network! @@ -2705,27 +2715,27 @@ Try tweaking the filters for a new set of songs to play. Tomahawk::JSPFLoader - + New Playlist Ny spellista - + Failed to save tracks Misslyckades med att spara spår - + Some tracks in the playlist do not contain an artist and a title. They will be ignored. - + XSPF Error XSPF-fel - + This is not a valid XSPF playlist. Detta är inte en giltig XSPF-spellista. @@ -2785,7 +2795,7 @@ Try tweaking the filters for a new set of songs to play. Tomahawk::RdioParser - + Error fetching Rdio information from the network! @@ -2845,7 +2855,7 @@ Try tweaking the filters for a new set of songs to play. Tomahawk::SpotifyParser - + Error fetching Spotify information from the network! @@ -2861,7 +2871,7 @@ Try tweaking the filters for a new set of songs to play. TomahawkApp - + My Collection @@ -3612,33 +3622,33 @@ You can re-send a sync message at any time simply by sending another tweet using XMPPBot - + Terms for %1: - + No terms found, sorry. - + Hotttness for %1: %2 - + Familiarity for %1: %2 - + Lyrics for "%1" by %2: @@ -3650,22 +3660,22 @@ Lyrics for "%1" by %2: XSPFLoader - + Failed to parse contents of XSPF playlist - + Some playlist entries were found without artist and track name, they will be omitted - + Failed to fetch the desired playlist from the network, or the desired file does not exist - + New Playlist Ny spellista diff --git a/lang/tomahawk_tr.ts b/lang/tomahawk_tr.ts index 21a356bde..f5f0ff044 100644 --- a/lang/tomahawk_tr.ts +++ b/lang/tomahawk_tr.ts @@ -1,4 +1,31 @@ + + ACLJobDelegate + + + Allow %1 to +connect and stream from you? + + + + + Allow Streaming + + + + + Deny Access + + + + + ACLJobItem + + + Tomahawk needs you to decide whether %1 is allowed to connect. + + + AccountFactoryWrapper @@ -35,33 +62,6 @@ Çevrimdışı - - AclJobDelegate - - - Allow %1 to -connect and stream from you? - - - - - Allow Streaming - - - - - Deny Access - - - - - AclJobItem - - - Tomahawk needs you to decide whether %1 is allowed to connect. - - - ActionCollection @@ -1783,28 +1783,28 @@ connect and stream from you? - + History Incomplete. Resume - + Playback History Imported - - + + Failed - + Success - + Could not contact server @@ -2034,7 +2034,7 @@ You may wish to try re-authenticating. - + &Love @@ -2044,7 +2044,17 @@ You may wish to try re-authenticating. - + + Copy Album &Link + + + + + Copy Artist &Link + + + + Un-&Love @@ -2608,7 +2618,7 @@ Try tweaking the filters for a new set of songs to play. Tomahawk::GroovesharkParser - + Error fetching Grooveshark information from the network! @@ -2696,7 +2706,7 @@ Try tweaking the filters for a new set of songs to play. Tomahawk::ItunesParser - + Error fetching iTunes information from the network! @@ -2704,27 +2714,27 @@ Try tweaking the filters for a new set of songs to play. Tomahawk::JSPFLoader - + New Playlist - + Failed to save tracks - + Some tracks in the playlist do not contain an artist and a title. They will be ignored. - + XSPF Error - + This is not a valid XSPF playlist. @@ -2784,7 +2794,7 @@ Try tweaking the filters for a new set of songs to play. Tomahawk::RdioParser - + Error fetching Rdio information from the network! @@ -2844,7 +2854,7 @@ Try tweaking the filters for a new set of songs to play. Tomahawk::SpotifyParser - + Error fetching Spotify information from the network! @@ -2860,7 +2870,7 @@ Try tweaking the filters for a new set of songs to play. TomahawkApp - + My Collection @@ -3611,33 +3621,33 @@ You can re-send a sync message at any time simply by sending another tweet using XMPPBot - + Terms for %1: - + No terms found, sorry. - + Hotttness for %1: %2 - + Familiarity for %1: %2 - + Lyrics for "%1" by %2: @@ -3649,22 +3659,22 @@ Lyrics for "%1" by %2: XSPFLoader - + Failed to parse contents of XSPF playlist - + Some playlist entries were found without artist and track name, they will be omitted - + Failed to fetch the desired playlist from the network, or the desired file does not exist - + New Playlist diff --git a/lang/tomahawk_zh_CN.ts b/lang/tomahawk_zh_CN.ts index 4883709e4..ce8c4bb54 100644 --- a/lang/tomahawk_zh_CN.ts +++ b/lang/tomahawk_zh_CN.ts @@ -1,4 +1,31 @@ + + ACLJobDelegate + + + Allow %1 to +connect and stream from you? + + + + + Allow Streaming + + + + + Deny Access + + + + + ACLJobItem + + + Tomahawk needs you to decide whether %1 is allowed to connect. + + + AccountFactoryWrapper @@ -35,33 +62,6 @@ 离线 - - AclJobDelegate - - - Allow %1 to -connect and stream from you? - - - - - Allow Streaming - - - - - Deny Access - - - - - AclJobItem - - - Tomahawk needs you to decide whether %1 is allowed to connect. - - - ActionCollection @@ -1783,28 +1783,28 @@ connect and stream from you? - + History Incomplete. Resume - + Playback History Imported - - + + Failed - + Success - + Could not contact server @@ -2034,7 +2034,7 @@ You may wish to try re-authenticating. - + &Love @@ -2044,7 +2044,17 @@ You may wish to try re-authenticating. - + + Copy Album &Link + + + + + Copy Artist &Link + + + + Un-&Love @@ -2608,7 +2618,7 @@ Try tweaking the filters for a new set of songs to play. Tomahawk::GroovesharkParser - + Error fetching Grooveshark information from the network! @@ -2696,7 +2706,7 @@ Try tweaking the filters for a new set of songs to play. Tomahawk::ItunesParser - + Error fetching iTunes information from the network! @@ -2704,27 +2714,27 @@ Try tweaking the filters for a new set of songs to play. Tomahawk::JSPFLoader - + New Playlist - + Failed to save tracks - + Some tracks in the playlist do not contain an artist and a title. They will be ignored. - + XSPF Error - + This is not a valid XSPF playlist. @@ -2784,7 +2794,7 @@ Try tweaking the filters for a new set of songs to play. Tomahawk::RdioParser - + Error fetching Rdio information from the network! @@ -2844,7 +2854,7 @@ Try tweaking the filters for a new set of songs to play. Tomahawk::SpotifyParser - + Error fetching Spotify information from the network! @@ -2860,7 +2870,7 @@ Try tweaking the filters for a new set of songs to play. TomahawkApp - + My Collection @@ -3611,33 +3621,33 @@ You can re-send a sync message at any time simply by sending another tweet using XMPPBot - + Terms for %1: - + No terms found, sorry. - + Hotttness for %1: %2 - + Familiarity for %1: %2 - + Lyrics for "%1" by %2: @@ -3649,22 +3659,22 @@ Lyrics for "%1" by %2: XSPFLoader - + Failed to parse contents of XSPF playlist - + Some playlist entries were found without artist and track name, they will be omitted - + Failed to fetch the desired playlist from the network, or the desired file does not exist - + New Playlist diff --git a/lang/tomahawk_zh_TW.ts b/lang/tomahawk_zh_TW.ts index d20b956e6..f4300410a 100644 --- a/lang/tomahawk_zh_TW.ts +++ b/lang/tomahawk_zh_TW.ts @@ -1,4 +1,31 @@ + + ACLJobDelegate + + + Allow %1 to +connect and stream from you? + + + + + Allow Streaming + + + + + Deny Access + + + + + ACLJobItem + + + Tomahawk needs you to decide whether %1 is allowed to connect. + + + AccountFactoryWrapper @@ -35,33 +62,6 @@ 離線 - - AclJobDelegate - - - Allow %1 to -connect and stream from you? - - - - - Allow Streaming - - - - - Deny Access - - - - - AclJobItem - - - Tomahawk needs you to decide whether %1 is allowed to connect. - - - ActionCollection @@ -1783,28 +1783,28 @@ connect and stream from you? - + History Incomplete. Resume - + Playback History Imported - - + + Failed 失敗 - + Success 成功 - + Could not contact server 無法聯繫服務器 @@ -2034,7 +2034,7 @@ You may wish to try re-authenticating. - + &Love @@ -2044,7 +2044,17 @@ You may wish to try re-authenticating. - + + Copy Album &Link + + + + + Copy Artist &Link + + + + Un-&Love @@ -2608,7 +2618,7 @@ Try tweaking the filters for a new set of songs to play. Tomahawk::GroovesharkParser - + Error fetching Grooveshark information from the network! @@ -2696,7 +2706,7 @@ Try tweaking the filters for a new set of songs to play. Tomahawk::ItunesParser - + Error fetching iTunes information from the network! @@ -2704,27 +2714,27 @@ Try tweaking the filters for a new set of songs to play. Tomahawk::JSPFLoader - + New Playlist 新增播放清單 - + Failed to save tracks 無法保存曲目 - + Some tracks in the playlist do not contain an artist and a title. They will be ignored. - + XSPF Error XSPF - + This is not a valid XSPF playlist. @@ -2784,7 +2794,7 @@ Try tweaking the filters for a new set of songs to play. Tomahawk::RdioParser - + Error fetching Rdio information from the network! @@ -2844,7 +2854,7 @@ Try tweaking the filters for a new set of songs to play. Tomahawk::SpotifyParser - + Error fetching Spotify information from the network! @@ -2860,7 +2870,7 @@ Try tweaking the filters for a new set of songs to play. TomahawkApp - + My Collection 我的收藏 @@ -3611,33 +3621,33 @@ You can re-send a sync message at any time simply by sending another tweet using XMPPBot - + Terms for %1: - + No terms found, sorry. - + Hotttness for %1: %2 - + Familiarity for %1: %2 - + Lyrics for "%1" by %2: @@ -3649,22 +3659,22 @@ Lyrics for "%1" by %2: XSPFLoader - + Failed to parse contents of XSPF playlist - + Some playlist entries were found without artist and track name, they will be omitted - + Failed to fetch the desired playlist from the network, or the desired file does not exist - + New Playlist 新播放清單 From faadb41054951e51e2a7634631c62869f7d51ad2 Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Sun, 1 Jul 2012 02:20:09 +0200 Subject: [PATCH 07/17] * Don't crash when removing page in history. --- src/libtomahawk/ViewManager.cpp | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/libtomahawk/ViewManager.cpp b/src/libtomahawk/ViewManager.cpp index 81601a5fe..a010b16fb 100644 --- a/src/libtomahawk/ViewManager.cpp +++ b/src/libtomahawk/ViewManager.cpp @@ -571,7 +571,7 @@ ViewManager::historyBack() return; ViewPage* page = m_pageHistoryBack.takeLast(); - + if ( m_currentPage ) { m_pageHistoryFwd << m_currentPage; @@ -590,7 +590,7 @@ ViewManager::historyForward() return; ViewPage* page = m_pageHistoryFwd.takeLast(); - + if ( m_currentPage ) { m_pageHistoryBack << m_currentPage; @@ -616,14 +616,7 @@ ViewManager::destroyPage( ViewPage* page ) return; tDebug() << Q_FUNC_INFO << "Deleting page:" << page->title(); - if ( m_currentPage == page ) - { - delete page; - m_currentPage = 0; - - historyBack(); - } - else if ( historyPages().contains( page ) ) + if ( historyPages().contains( page ) ) { m_pageHistoryBack.removeAll( page ); m_pageHistoryFwd.removeAll( page ); @@ -633,6 +626,13 @@ ViewManager::destroyPage( ViewPage* page ) delete page; } + + if ( m_currentPage == page ) + { + m_currentPage = 0; + + historyBack(); + } } @@ -868,7 +868,7 @@ ViewManager::onWidgetDestroyed( QWidget* widget ) { m_dynamicWidgets.remove( dynamicPlaylistForInterface( page->playlistInterface() ) ); } - + m_pageHistoryBack.removeAll( page ); m_pageHistoryFwd.removeAll( page ); } From c1e7ef2ea3dfd1be761225584659a6f5aa5609cc Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Sun, 1 Jul 2012 02:51:10 +0200 Subject: [PATCH 08/17] * Set m_coverLoaded to true before emitting the coverChanged signal. --- src/libtomahawk/Album.cpp | 6 +++--- src/libtomahawk/Artist.cpp | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/libtomahawk/Album.cpp b/src/libtomahawk/Album.cpp index a639042c7..b3f760076 100644 --- a/src/libtomahawk/Album.cpp +++ b/src/libtomahawk/Album.cpp @@ -176,6 +176,8 @@ Album::infoSystemInfo( const Tomahawk::InfoSystem::InfoRequestData& requestData, if ( !output.isNull() && output.isValid() ) { + m_coverLoaded = true; + QVariantMap returnedData = output.value< QVariantMap >(); const QByteArray ba = returnedData["imgbytes"].toByteArray(); if ( ba.length() ) @@ -183,8 +185,6 @@ Album::infoSystemInfo( const Tomahawk::InfoSystem::InfoRequestData& requestData, m_coverBuffer = ba; emit coverChanged(); } - - m_coverLoaded = true; } } @@ -237,6 +237,6 @@ Album::infoid() const { if ( m_uuid.isEmpty() ) m_uuid = uuid(); - + return m_uuid; } \ No newline at end of file diff --git a/src/libtomahawk/Artist.cpp b/src/libtomahawk/Artist.cpp index fbd30f477..b18a03215 100644 --- a/src/libtomahawk/Artist.cpp +++ b/src/libtomahawk/Artist.cpp @@ -317,14 +317,14 @@ Artist::infoSystemInfo( Tomahawk::InfoSystem::InfoRequestData requestData, QVari { if ( !output.isNull() && output.isValid() ) { + m_coverLoaded = true; + const QByteArray ba = returnedData["imgbytes"].toByteArray(); if ( ba.length() ) { m_coverBuffer = ba; emit coverChanged(); } - - m_coverLoaded = true; } break; @@ -353,7 +353,7 @@ Artist::infoSystemInfo( Tomahawk::InfoSystem::InfoRequestData requestData, QVari if ( source == "last.fm" ) m_biography = bmap[ source ].toHash()[ "text" ].toString(); } - + m_biographyLoaded = true; emit biographyLoaded(); @@ -459,7 +459,7 @@ Artist::playlistInterface( ModelMode mode, const Tomahawk::collection_ptr& colle pli = Tomahawk::playlistinterface_ptr( new Tomahawk::ArtistPlaylistInterface( this, mode, collection ) ); connect( pli.data(), SIGNAL( tracksLoaded( Tomahawk::ModelMode, Tomahawk::collection_ptr ) ), SLOT( onTracksLoaded( Tomahawk::ModelMode, Tomahawk::collection_ptr ) ) ); - + m_playlistInterface[ mode ][ collection ] = pli; } @@ -479,6 +479,6 @@ Artist::infoid() const { if ( m_uuid.isEmpty() ) m_uuid = uuid(); - + return m_uuid; } From 7946362dcf51f8dfe682eb066ad9560ee5d815b4 Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Sun, 1 Jul 2012 05:43:29 +0200 Subject: [PATCH 09/17] * Set m_coverLoaded to true even when we couldn't find any image. --- src/libtomahawk/Album.cpp | 4 ++-- src/libtomahawk/Artist.cpp | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/libtomahawk/Album.cpp b/src/libtomahawk/Album.cpp index b3f760076..48b2b6166 100644 --- a/src/libtomahawk/Album.cpp +++ b/src/libtomahawk/Album.cpp @@ -174,10 +174,10 @@ Album::infoSystemInfo( const Tomahawk::InfoSystem::InfoRequestData& requestData, return; } + m_coverLoaded = true; + if ( !output.isNull() && output.isValid() ) { - m_coverLoaded = true; - QVariantMap returnedData = output.value< QVariantMap >(); const QByteArray ba = returnedData["imgbytes"].toByteArray(); if ( ba.length() ) diff --git a/src/libtomahawk/Artist.cpp b/src/libtomahawk/Artist.cpp index b18a03215..ebcbcb526 100644 --- a/src/libtomahawk/Artist.cpp +++ b/src/libtomahawk/Artist.cpp @@ -315,10 +315,9 @@ Artist::infoSystemInfo( Tomahawk::InfoSystem::InfoRequestData requestData, QVari case Tomahawk::InfoSystem::InfoArtistImages: { + m_coverLoaded = true; if ( !output.isNull() && output.isValid() ) { - m_coverLoaded = true; - const QByteArray ba = returnedData["imgbytes"].toByteArray(); if ( ba.length() ) { From 2d4f7c88989df3585539c01fd1b00f59b885b6d9 Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Sun, 1 Jul 2012 05:44:30 +0200 Subject: [PATCH 10/17] * Remove debug output again. --- src/libtomahawk/accounts/lastfm/LastFmInfoPlugin.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/libtomahawk/accounts/lastfm/LastFmInfoPlugin.cpp b/src/libtomahawk/accounts/lastfm/LastFmInfoPlugin.cpp index f2166a900..9dc4571dc 100644 --- a/src/libtomahawk/accounts/lastfm/LastFmInfoPlugin.cpp +++ b/src/libtomahawk/accounts/lastfm/LastFmInfoPlugin.cpp @@ -519,7 +519,6 @@ LastFmInfoPlugin::notInCacheSlot( QHash criteria, Tomahawk::In { QString artistName = criteria["artist"]; QString albumName = criteria["album"]; - tDebug() << Q_FUNC_INFO << artistName << albumName; QUrl imgurl( "http://ws.audioscrobbler.com/2.0/" ); imgurl.addQueryItem( "method", "album.imageredirect" ); @@ -540,7 +539,6 @@ LastFmInfoPlugin::notInCacheSlot( QHash criteria, Tomahawk::In case InfoArtistImages: { QString artistName = criteria["artist"]; - tDebug() << Q_FUNC_INFO << artistName; QUrl imgurl( "http://ws.audioscrobbler.com/2.0/" ); imgurl.addQueryItem( "method", "artist.imageredirect" ); From 0ef5a6675d9fddfc1dc4fd40db9729ae07f2c215 Mon Sep 17 00:00:00 2001 From: Leo Franchi Date: Sun, 1 Jul 2012 00:43:23 -0400 Subject: [PATCH 11/17] Changelogify --- ChangeLog | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 52e98ecad..6df4ef2a7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,6 @@ Version 0.5.1: + * Fixed a few issues with automatic downloading and launching + of the spotify account. * Show an error message when not able to resolve a requested song. * Fixed a few crash and freeze issues. * Better detection of local networks for the Local Network connector. @@ -59,7 +61,7 @@ Version 0.4.0: * Fixed bug where filter text would be one step behind filter value. * Fixed bug where resolvers would enable themselves after auto-updating. * Fixed occasional crash when dropping tracks onto New Station item. - * Added jump-to-current-track support for search results page. + * Added jump-to-current-track support for search results page. * Fixed non-resolving tracks when dragging from album view. * Fixed fetching album covers for albums with special characters. * Show errors and continue gracefully when resolved audio is not available. @@ -84,7 +86,7 @@ Version 0.4.0: * Fixed out of sync Show/Hide menu items on OS X when hidden with cmd-h. * Fixed /Volumes directory not showing up on OS X. * Fixed startup crash on OS X. - + Version 0.3.3: * Automatically load Super Collection tracks when no official release information is available. @@ -96,7 +98,7 @@ Version 0.3.3: * Fixed dupe menu entry appearing on OS X. * Fixed invisible sidebar items on Linux. -Version 0.3.2: +Version 0.3.2: * Improved syncing process, it's faster and more reliable now. * Fixed UPnP issues. * Fixed not updating collections and views after a collection changes. @@ -150,7 +152,7 @@ Version 0.3.0: * Added YouTube resolver. * Fixed bug where going offline then online would not re-connect to many peers. - * Added support for auto-updating live XSPF playlists. + * Added support for auto-updating live XSPF playlists. * Don't show an age of 41 years for tracks that have no age information. * Show config UI for resolvers that have them as soon as you add them. * Add support for Echo Nest Personal Catalogs and User Radio. Synchronize From 064efb4570eab3dcfa33dd1049756acd4d8f705c Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Sun, 1 Jul 2012 06:49:17 +0200 Subject: [PATCH 12/17] * spotify -> Spotify. --- ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 6df4ef2a7..3b281c4b8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,6 @@ Version 0.5.1: * Fixed a few issues with automatic downloading and launching - of the spotify account. + of the Spotify account. * Show an error message when not able to resolve a requested song. * Fixed a few crash and freeze issues. * Better detection of local networks for the Local Network connector. From bbec1dfbbeb8135d4008f481a5239aa650a84ef5 Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Sun, 1 Jul 2012 08:56:57 +0200 Subject: [PATCH 13/17] * Fixed cover loading in error case. --- src/libtomahawk/Album.cpp | 10 +++++++--- src/libtomahawk/Artist.cpp | 9 +++++++-- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/src/libtomahawk/Album.cpp b/src/libtomahawk/Album.cpp index 48b2b6166..70ae122a5 100644 --- a/src/libtomahawk/Album.cpp +++ b/src/libtomahawk/Album.cpp @@ -174,10 +174,14 @@ Album::infoSystemInfo( const Tomahawk::InfoSystem::InfoRequestData& requestData, return; } - m_coverLoaded = true; - - if ( !output.isNull() && output.isValid() ) + if ( output.isNull() ) { + m_coverLoaded = true; + } + else if ( output.isValid() ) + { + m_coverLoaded = true; + QVariantMap returnedData = output.value< QVariantMap >(); const QByteArray ba = returnedData["imgbytes"].toByteArray(); if ( ba.length() ) diff --git a/src/libtomahawk/Artist.cpp b/src/libtomahawk/Artist.cpp index ebcbcb526..ea5b34790 100644 --- a/src/libtomahawk/Artist.cpp +++ b/src/libtomahawk/Artist.cpp @@ -315,9 +315,14 @@ Artist::infoSystemInfo( Tomahawk::InfoSystem::InfoRequestData requestData, QVari case Tomahawk::InfoSystem::InfoArtistImages: { - m_coverLoaded = true; - if ( !output.isNull() && output.isValid() ) + if ( output.isNull() ) { + m_coverLoaded = true; + } + else if ( output.isValid() ) + { + m_coverLoaded = true; + const QByteArray ba = returnedData["imgbytes"].toByteArray(); if ( ba.length() ) { From 53b00db602f9aa8daeb09c838104a5d9778598f3 Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Sun, 1 Jul 2012 20:54:06 +0200 Subject: [PATCH 14/17] * Don't ever accept invalid results coming from resolvers. --- src/libtomahawk/resolvers/QtScriptResolver.cpp | 2 ++ src/libtomahawk/resolvers/ScriptResolver.cpp | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/libtomahawk/resolvers/QtScriptResolver.cpp b/src/libtomahawk/resolvers/QtScriptResolver.cpp index 98de8f86b..e58a7b090 100644 --- a/src/libtomahawk/resolvers/QtScriptResolver.cpp +++ b/src/libtomahawk/resolvers/QtScriptResolver.cpp @@ -408,6 +408,8 @@ QtScriptResolver::parseResultVariantList( const QVariantList& reslist ) foreach( const QVariant& rv, reslist ) { QVariantMap m = rv.toMap(); + if ( m.value( "artist" ).toString().trimmed().isEmpty() || m.value( "track" ).toString().trimmed().isEmpty() ) + continue; Tomahawk::result_ptr rp = Tomahawk::Result::get( m.value( "url" ).toString() ); Tomahawk::artist_ptr ap = Tomahawk::Artist::get( m.value( "artist" ).toString(), false ); diff --git a/src/libtomahawk/resolvers/ScriptResolver.cpp b/src/libtomahawk/resolvers/ScriptResolver.cpp index 8b82cf437..4902d7a56 100644 --- a/src/libtomahawk/resolvers/ScriptResolver.cpp +++ b/src/libtomahawk/resolvers/ScriptResolver.cpp @@ -269,7 +269,9 @@ ScriptResolver::handleMsg( const QByteArray& msg ) foreach( const QVariant& rv, reslist ) { QVariantMap m = rv.toMap(); - qDebug() << "Found result:" << m; + tDebug( LOGVERBOSE ) << "Found result:" << m; + if ( m.value( "artist" ).toString().trimmed().isEmpty() || m.value( "track" ).toString().trimmed().isEmpty() ) + continue; Tomahawk::result_ptr rp = Tomahawk::Result::get( m.value( "url" ).toString() ); Tomahawk::artist_ptr ap = Tomahawk::Artist::get( m.value( "artist" ).toString(), false ); From eaf48bcf512acbac0131d5bcaaf28e92fb00e7d1 Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Sun, 1 Jul 2012 20:54:31 +0200 Subject: [PATCH 15/17] * Fixed crashes in DbCmd_SetPlaylistRevision. --- .../database/DatabaseCommand_SetPlaylistRevision.cpp | 12 +++++++++--- .../database/DatabaseCommand_SetPlaylistRevision.h | 9 +++++++-- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/src/libtomahawk/database/DatabaseCommand_SetPlaylistRevision.cpp b/src/libtomahawk/database/DatabaseCommand_SetPlaylistRevision.cpp index 00c8cf6bb..a64097809 100644 --- a/src/libtomahawk/database/DatabaseCommand_SetPlaylistRevision.cpp +++ b/src/libtomahawk/database/DatabaseCommand_SetPlaylistRevision.cpp @@ -80,7 +80,6 @@ DatabaseCommand_SetPlaylistRevision::DatabaseCommand_SetPlaylistRevision( tmp << s; setOrderedguids( tmp ); - setPlaylistguid( playlistguid ); } @@ -100,7 +99,6 @@ DatabaseCommand_SetPlaylistRevision::postCommitHook() playlist_ptr playlist = source()->collection()->playlist( m_playlistguid ); if ( playlist.isNull() ) { - qDebug() << m_playlistguid; Q_ASSERT( !playlist.isNull() ); return; } @@ -150,7 +148,9 @@ DatabaseCommand_SetPlaylistRevision::exec( DatabaseImpl* lib ) foreach( const plentry_ptr& e, m_entries ) { - if ( e->query()->results().isEmpty() ) + if ( !e->isValid() ) + continue; + if ( !e->query()->numResults() ) continue; adde.bindValue( 0, e->query()->results().first()->url() ); @@ -167,6 +167,9 @@ DatabaseCommand_SetPlaylistRevision::exec( DatabaseImpl* lib ) foreach( const plentry_ptr& e, m_entries ) { + if ( !e->isValid() ) + continue; + adde.bindValue( 0, e->query()->track() ); adde.bindValue( 1, e->query()->artist() ); adde.bindValue( 2, e->query()->album() ); @@ -189,6 +192,9 @@ DatabaseCommand_SetPlaylistRevision::exec( DatabaseImpl* lib ) qDebug() << "Num new playlist_items to add:" << m_addedentries.length(); foreach( const plentry_ptr& e, m_addedentries ) { + if ( !e->isValid() ) + continue; + // qDebug() << "Adding:" << e->guid() << e->query()->track() << e->query()->artist(); m_addedmap.insert( e->guid(), e ); // needed in postcommithook diff --git a/src/libtomahawk/database/DatabaseCommand_SetPlaylistRevision.h b/src/libtomahawk/database/DatabaseCommand_SetPlaylistRevision.h index 027bf03d8..17f631e8d 100644 --- a/src/libtomahawk/database/DatabaseCommand_SetPlaylistRevision.h +++ b/src/libtomahawk/database/DatabaseCommand_SetPlaylistRevision.h @@ -77,9 +77,11 @@ public: m_addedentries.clear(); foreach( const QVariant& v, vlist ) { - PlaylistEntry * pep = new PlaylistEntry; + PlaylistEntry* pep = new PlaylistEntry; QJson::QObjectHelper::qvariant2qobject( v.toMap(), pep ); - m_addedentries << plentry_ptr(pep); + + if ( pep->isValid() ) + m_addedentries << plentry_ptr( pep ); } } @@ -88,6 +90,9 @@ public: QVariantList vlist; foreach( const plentry_ptr& pe, m_addedentries ) { + if ( !pe->isValid() ) + continue; + QVariant v = QJson::QObjectHelper::qobject2qvariant( pe.data() ); vlist << v; } From c47c8894b0dbf7a2a3d2cb4f5e109ffc42bd3c89 Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Sun, 1 Jul 2012 20:54:56 +0200 Subject: [PATCH 16/17] * Indicate invalid PlaylistEntries. --- src/libtomahawk/Playlist.cpp | 1 + src/libtomahawk/Playlist.h | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/libtomahawk/Playlist.cpp b/src/libtomahawk/Playlist.cpp index 18fe9810a..1762b7b26 100644 --- a/src/libtomahawk/Playlist.cpp +++ b/src/libtomahawk/Playlist.cpp @@ -54,6 +54,7 @@ PlaylistEntry::setQueryVariant( const QVariant& v ) QString artist = m.value( "artist" ).toString(); QString album = m.value( "album" ).toString(); QString track = m.value( "track" ).toString(); + m_query = Tomahawk::Query::get( artist, track, album ); } diff --git a/src/libtomahawk/Playlist.h b/src/libtomahawk/Playlist.h index 649468086..c3ac6c45b 100644 --- a/src/libtomahawk/Playlist.h +++ b/src/libtomahawk/Playlist.h @@ -59,10 +59,11 @@ public: PlaylistEntry(); virtual ~PlaylistEntry(); + bool isValid() const { return !m_query.isNull(); } + void setQuery( const Tomahawk::query_ptr& q ); const Tomahawk::query_ptr& query() const; - // I wish Qt did this for me once i specified the Q_PROPERTIES: void setQueryVariant( const QVariant& v ); QVariant queryVariant() const; From 9c0a608e3e6c26dd354039f89f0a29a865782f4e Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Sun, 1 Jul 2012 22:37:07 +0200 Subject: [PATCH 17/17] * Update ChangeLog. --- ChangeLog | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ChangeLog b/ChangeLog index 3b281c4b8..ea23e41a4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Version 0.5.2: + * Fixed a crash when invalid results are coming back from a resolver or + are found in a playlist. + Version 0.5.1: * Fixed a few issues with automatic downloading and launching of the Spotify account.