Request 271 (accepted)

libechonest.spec Changed

libechonest-1.2.0.tar.bz2/CMakeLists.txt -> libechonest-2.0.1.tar.bz2/CMakeLists.txt Changed

@@ -16,9 +16,9 @@
 
 include( ${QT_USE_FILE} )
 
-set( ECHONEST_LIB_MAJOR_VERSION "1" )
-set( ECHONEST_LIB_MINOR_VERSION "2" )
-set( ECHONEST_LIB_PATCH_VERSION "0" )
+set( ECHONEST_LIB_MAJOR_VERSION "2" )
+set( ECHONEST_LIB_MINOR_VERSION "0" )
+set( ECHONEST_LIB_PATCH_VERSION "1" )
 set( ECHONEST_LIB_VERSION "${ECHONEST_LIB_MAJOR_VERSION}.${ECHONEST_LIB_MINOR_VERSION}.${ECHONEST_LIB_PATCH_VERSION}" )
 
 set( ECHONEST_LIB_VERSION_SONAME "${ECHONEST_LIB_MAJOR_VERSION}.${ECHONEST_LIB_MINOR_VERSION}")
@@ -26,11 +26,16 @@
 if (CMAKE_COMPILER_IS_GNUCXX)
     ADD_DEFINITIONS( -Wall -Wundef -Wcast-align -Wchar-subscripts -Wpointer-arith
        -Wwrite-strings -Wpacked -Wformat-security -Wmissing-format-attribute
-       -Wold-style-cast -Woverloaded-virtual -Wnon-virtual-dtor -Werror )
+       -Wold-style-cast -Woverloaded-virtual -Wnon-virtual-dtor )
     if ( NOT WIN32 )
         add_definitions( -fvisibility=hidden )
     endif()
 
+    # disable -Werror on ARM since Qt containers cause a lot of alignment warnings
+    if ( NOT CMAKE_SYSTEM_PROCESSOR MATCHES "arm" )
+        add_definitions( -Werror )
+    endif()
+
 # to be added:
 #       -Wshadow
 # FIXME we might want this one back in, but Qt 4.4.3 spits gazillions of warnings with it on Linux-64:

libechonest-1.2.0.tar.bz2/Doxyfile.in -> libechonest-2.0.1.tar.bz2/Doxyfile.in Changed

libechonest-1.2.0.tar.bz2/README -> libechonest-2.0.1.tar.bz2/README Changed

libechonest-1.2.0.tar.bz2/TODO -> libechonest-2.0.1.tar.bz2/TODO Changed

libechonest-1.2.0.tar.bz2/src/Artist.cpp -> libechonest-2.0.1.tar.bz2/src/Artist.cpp Changed

@@ -1,5 +1,5 @@
 /****************************************************************************************
- * Copyright (c) 2010 Leo Franchi <lfranchi@kde.org>                                    *
+ * Copyright (c) 2010-2012 Leo Franchi <lfranchi@kde.org>                               *
  *                                                                                      *
  * This program is free software; you can redistribute it and/or modify it under        *
  * the terms of the GNU General Public License as published by the Free Software        *
@@ -359,7 +359,7 @@
 
     Echonest::Artist::SearchParams::const_iterator iter = params.constBegin();
     for( ; iter < params.constEnd(); ++iter )
-        url.addQueryItem( QLatin1String( searchParamToString( iter->first ) ), iter->second.toString().replace( QLatin1Char( ' ' ), QLatin1Char( '+' ) ) );
+        url.addEncodedQueryItem( searchParamToString( iter->first ), Echonest::escapeSpacesAndPluses( iter->second.toString() ) );
 
     return Echonest::Config::instance()->nam()->get( QNetworkRequest( url ) );
 }
@@ -403,7 +403,7 @@
 
     Echonest::Artist::SearchParams::const_iterator iter = params.constBegin();
     for( ; iter < params.constEnd(); ++iter )
-        url.addQueryItem( QLatin1String( searchParamToString( iter->first ) ), iter->second.toString().replace( QLatin1Char( ' ' ), QLatin1Char( '+' ) ) );
+        url.addEncodedQueryItem( searchParamToString( iter->first ), Echonest::escapeSpacesAndPluses( iter->second.toString() ) );
     url.addEncodedQueryItem( "limit", limit ? "true" : "false" );
     addQueryInformation( url, information );
 
@@ -446,7 +446,7 @@
 {
     QUrl url = Echonest::baseGetQuery( "artist", "suggest" );
     QString realname = name;
-    url.addQueryItem( QLatin1String( "name" ), realname.replace( QLatin1Char( ' ' ), QLatin1Char( '+' ) ) );
+    url.addEncodedQueryItem( "name", Echonest::escapeSpacesAndPluses( realname ) );
     url.addEncodedQueryItem( "results", QByteArray::number( results ) );
 
     return Echonest::Config::instance()->nam()->get( QNetworkRequest( url ) );
@@ -540,9 +540,7 @@
     if( !d->id.isEmpty() )
         url.addEncodedQueryItem( "id", d->id );
     else if( !d->name.isEmpty() ) {
-        QString name = d->name;
-        name.replace( QLatin1Char( ' ' ), QLatin1Char( '+' ) );
-        url.addQueryItem( QLatin1String( "name" ), name );
+        url.addEncodedQueryItem( "name", Echonest::escapeSpacesAndPluses( d->name ) );
     } else {
         qWarning() << "Artist method" << methodName << "called on an artist object without name or id!";
         return QUrl();

libechonest-1.2.0.tar.bz2/src/Artist.h -> libechonest-2.0.1.tar.bz2/src/Artist.h Changed

libechonest-1.2.0.tar.bz2/src/ArtistTypes.cpp -> libechonest-2.0.1.tar.bz2/src/ArtistTypes.cpp Changed

libechonest-1.2.0.tar.bz2/src/ArtistTypes.h -> libechonest-2.0.1.tar.bz2/src/ArtistTypes.h Changed

libechonest-1.2.0.tar.bz2/src/ArtistTypes_p.h -> libechonest-2.0.1.tar.bz2/src/ArtistTypes_p.h Changed

@@ -1,5 +1,5 @@
 /****************************************************************************************
- * Copyright (c) 2010 Leo Franchi <lfranchi@kde.org>                                    *
+ * Copyright (c) 2010-2012 Leo Franchi <lfranchi@kde.org>                               *
  *                                                                                      *
  * This program is free software; you can redistribute it and/or modify it under        *
  * the terms of the GNU General Public License as published by the Free Software        *
@@ -29,7 +29,7 @@
 {
 public:
     AudioFileData() {}
-    AudioFileData( const AudioFileData& other ) {
+    AudioFileData( const AudioFileData& other ) : QSharedData( other ) {
         title = other.title;
         artist = other.artist;
         url = other.url;
@@ -54,7 +54,7 @@
 {
 public:
     BiographyData() {}
-    BiographyData( const BiographyData& other ) {
+    BiographyData( const BiographyData& other ) : QSharedData( other ) {
         url = other.url;
         text = other.text;
         site = other.site;
@@ -71,7 +71,7 @@
 {
 public:
     BlogData() {}
-    BlogData( const BlogData& other ) {
+    BlogData( const BlogData& other ) : QSharedData( other ) {
         name = other.name;
         url = other.url;
         date_posted = other.date_posted;
@@ -92,7 +92,7 @@
 {
 public:
     ArtistImageData() {}
-    ArtistImageData( const ArtistImageData& other ) {
+    ArtistImageData( const ArtistImageData& other ) : QSharedData( other ) {
         url = other.url;
         license = other.license;
     }
@@ -105,7 +105,7 @@
 {
 public:
     ReviewData() {}
-    ReviewData( const ReviewData& other ) {
+    ReviewData( const ReviewData& other ) : QSharedData( other ) {
         name = other.name;
         url = other.url;
         summary = other.summary;
@@ -130,7 +130,7 @@
 {
 public:
     TermData() {}
-    TermData( const TermData& other ) {   
+    TermData( const TermData& other ) : QSharedData( other ) {   
         name = other.name;
         frequency = other.frequency;
         weight = other.weight;
@@ -145,7 +145,7 @@
 {
 public:
     VideoData() {}
-    VideoData( const VideoData& other ) {
+    VideoData( const VideoData& other ) : QSharedData( other ) {
         title = other.title;
         url = other.url;
         site = other.site;

libechonest-1.2.0.tar.bz2/src/Artist_p.h -> libechonest-2.0.1.tar.bz2/src/Artist_p.h Changed

libechonest-1.2.0.tar.bz2/src/AudioSummary.cpp -> libechonest-2.0.1.tar.bz2/src/AudioSummary.cpp Changed

libechonest-1.2.0.tar.bz2/src/AudioSummary.h -> libechonest-2.0.1.tar.bz2/src/AudioSummary.h Changed

libechonest-1.2.0.tar.bz2/src/AudioSummary_p.h -> libechonest-2.0.1.tar.bz2/src/AudioSummary_p.h Changed

@@ -1,5 +1,5 @@
 /****************************************************************************************
- * Copyright (c) 2010 Leo Franchi <lfranchi@kde.org>                                    *
+ * Copyright (c) 2010-2012 Leo Franchi <lfranchi@kde.org>                               *
  *                                                                                      *
  * This program is free software; you can redistribute it and/or modify it under        *
  * the terms of the GNU General Public License as published by the Free Software        *
@@ -27,7 +27,7 @@
     AudioSummaryData() : key( -1 ), tempo( -1 ), mode( -1 ), time_signature( -1 ), duration( -1 ), loudness( -1 ), samplerate( -1 ), danceability( -1 ), energy( -1 ),
                          analysis_time( -1 ), status( -1 ), timestamp( -1 ), end_of_fade_in( -1 ), key_confidence( -1 ), mode_confidence( -1 ), num_samples( -1 ),
                          start_of_fade_out( -1 ), tempo_confidence( -1 ), time_signature_confidence( -1 ) {}
-    AudioSummaryData(const AudioSummaryData& other)
+    AudioSummaryData(const AudioSummaryData& other) : QSharedData( other )
     {
         key = other.key;
         tempo = other.tempo;

libechonest-1.2.0.tar.bz2/src/CMakeLists.txt -> libechonest-2.0.1.tar.bz2/src/CMakeLists.txt Changed

libechonest-1.2.0.tar.bz2/src/Catalog.cpp -> libechonest-2.0.1.tar.bz2/src/Catalog.cpp Changed

libechonest-1.2.0.tar.bz2/src/Catalog.h -> libechonest-2.0.1.tar.bz2/src/Catalog.h Changed

libechonest-1.2.0.tar.bz2/src/CatalogArtist.cpp -> libechonest-2.0.1.tar.bz2/src/CatalogArtist.cpp Changed

libechonest-1.2.0.tar.bz2/src/CatalogArtist.h -> libechonest-2.0.1.tar.bz2/src/CatalogArtist.h Changed

libechonest-1.2.0.tar.bz2/src/CatalogItem.cpp -> libechonest-2.0.1.tar.bz2/src/CatalogItem.cpp Changed

libechonest-1.2.0.tar.bz2/src/CatalogItem.h -> libechonest-2.0.1.tar.bz2/src/CatalogItem.h Changed

libechonest-1.2.0.tar.bz2/src/CatalogItem_p.h -> libechonest-2.0.1.tar.bz2/src/CatalogItem_p.h Changed

libechonest-1.2.0.tar.bz2/src/CatalogSong.cpp -> libechonest-2.0.1.tar.bz2/src/CatalogSong.cpp Changed

libechonest-1.2.0.tar.bz2/src/CatalogSong.h -> libechonest-2.0.1.tar.bz2/src/CatalogSong.h Changed

libechonest-1.2.0.tar.bz2/src/CatalogUpdateEntry.cpp -> libechonest-2.0.1.tar.bz2/src/CatalogUpdateEntry.cpp Changed

libechonest-1.2.0.tar.bz2/src/CatalogUpdateEntry.h -> libechonest-2.0.1.tar.bz2/src/CatalogUpdateEntry.h Changed

libechonest-1.2.0.tar.bz2/src/CatalogUpdateEntry_p.h -> libechonest-2.0.1.tar.bz2/src/CatalogUpdateEntry_p.h Changed

libechonest-1.2.0.tar.bz2/src/Catalog_p.h -> libechonest-2.0.1.tar.bz2/src/Catalog_p.h Changed

libechonest-1.2.0.tar.bz2/src/Config.cpp -> libechonest-2.0.1.tar.bz2/src/Config.cpp Changed

@@ -1,5 +1,5 @@
 /****************************************************************************************
- * Copyright (c) 2010 Leo Franchi <lfranchi@kde.org>                                    *
+ * Copyright (c) 2010-2012 Leo Franchi <lfranchi@kde.org>                               *
  * Copyright (c) 2011 Jeff Mitchell <mitchell@kde.org>                                  *
  *                                                                                      *
  * This program is free software; you can redistribute it and/or modify it under        *
@@ -115,6 +115,7 @@
     ConfigPrivate()
     {
         threadNamHash QThread::currentThread()  = new QNetworkAccessManager();
+        ourNamSet.insert( QThread::currentThread() );
     }
 
     ~ConfigPrivate()
@@ -169,7 +170,12 @@
         oldNam = d->threadNamHash currThread ;
 
     if( oldNam == nam )
+    {
+        // If we're being passed back our own NAM, assume they want to
+        // ensure that we don't delete it out from under them
+        d->ourNamSet.remove( currThread );
         return;
+    }
 
     d->threadNamHash currThread  = nam;
     d->ourNamSet.remove( currThread );

libechonest-1.2.0.tar.bz2/src/Config.h -> libechonest-2.0.1.tar.bz2/src/Config.h Changed

libechonest-1.2.0.tar.bz2/src/Generator.cpp -> libechonest-2.0.1.tar.bz2/src/Generator.cpp Changed

@@ -1,5 +1,5 @@
 /****************************************************************************************
- * Copyright (c) 2010 Leo Franchi <lfranchi@kde.org>                                    *
+ * Copyright (c) 2010-2012 Leo Franchi <lfranchi@kde.org>                               *
  *                                                                                      *
  * This program is free software; you can redistribute it and/or modify it under        *
  * the terms of the GNU General Public License as published by the Free Software        *
@@ -27,7 +27,7 @@
 QByteArray Echonest::Generator::catalogEntriesToJson( const Echonest::CatalogUpdateEntries& items )
 {
     QJson::Serializer s;
-    
+
     QVariant itms = catalogEntriesToVariant( items );
     QByteArray serialized = s.serialize( itms );
 //    qDebug() << "Serialized:" << serialized;
@@ -37,7 +37,7 @@
 QByteArray Echonest::Generator::catalogEntryToJson( const Echonest::CatalogUpdateEntry& item )
 {
     QJson::Serializer s;
-    
+
     QVariant itm = catalogEntryToVariant( item );
     QByteArray serialized = s.serialize( itm );
    // qDebug() << "Serialized:" << serialized;
@@ -51,7 +51,8 @@
     QVariantList itemList;
     foreach( const Echonest::CatalogUpdateEntry& item, items )
         itemList << catalogEntryToVariant( item );
-    
+
+    qDebug() << "Generated " << itemList.size() << "entries to catalog variant!";
     return itemList;
 }
 
@@ -59,60 +60,60 @@
 {
     QVariantMap itemMap;
     QVariantMap itm;
-    
+
     itemMap QLatin1String( "action" )  = Echonest::catalogUpdateActionToLiteral( item.action() );
-    
+
     if( item.itemId().isEmpty() )
         itm QLatin1String( "item_id" )  = QUuid::createUuid().toString().replace( QLatin1Char( '{' ), QString() ).replace( QLatin1Char( '}' ), QString() );
     else
         itm QLatin1String( "item_id" )  = item.itemId();
-    
+
     if( !item.fingerprint().isEmpty() )
         itm QLatin1String( "fp_code" )  = item.fingerprint();
-    
+
     if( !item.songId().isEmpty() )
         itm QLatin1String( "song_id" )  = item.songId();
-    
+
     if( !item.songName().isEmpty() )
         itm QLatin1String( "song_name" )  = item.songName();
-    
+
     if( !item.artistId().isEmpty() )
         itm QLatin1String( "artist_id" )  = item.artistId();
-    
+
     if( !item.artistName().isEmpty() )
         itm QLatin1String( "artist_name" )  = item.artistName();
-    
+
     if( !item.release().isEmpty() )
         itm QLatin1String( "release" )  = item.release();
-    
+
     if( !item.genre().isEmpty() )
         itm QLatin1String( "genre" )  = item.genre();
-    
+
     if( item.trackNumber() > -1 )
         itm QLatin1String( "track_number" )  = item.trackNumber();
-    
+
     if( item.discNumber() > -1 )
         itm QLatin1String( "disc_number" )  = item.discNumber();
-    
+
     if( !item.url().isEmpty() )
         itm QLatin1String( "url" )  = item.url();
-    
+
     if( item.favoriteSet() )
         itm QLatin1String( "favorite" )  = item.favorite();
-    
+
     if( item.bannedSet() )
         itm QLatin1String( "banned" )  = item.banned();
-    
+
     if( item.playCount() > -1 )
         itm QLatin1String( "play_count" )  = item.playCount();
-    
+
     if( item.skipCount() > -1 )
         itm QLatin1String( "skip_count" )  = item.skipCount();
-    
+
     if( item.rating() > -1 )
         itm QLatin1String( "rating" )  = item.rating();
-    
+
     itemMap QLatin1String( "item" )  = itm;
-    
+
     return itemMap;
 }

libechonest-1.2.0.tar.bz2/src/Generator_p.h -> libechonest-2.0.1.tar.bz2/src/Generator_p.h Changed

libechonest-1.2.0.tar.bz2/src/Parsing.cpp -> libechonest-2.0.1.tar.bz2/src/Parsing.cpp Changed

@@ -1,5 +1,5 @@
 /****************************************************************************************
- * Copyright (c) 2010 Leo Franchi <lfranchi@kde.org>                                    *
+ * Copyright (c) 2010-2012 Leo Franchi <lfranchi@kde.org>                               *
  *                                                                                      *
  * This program is free software; you can redistribute it and/or modify it under        *
  * the terms of the GNU General Public License as published by the Free Software        *
@@ -837,6 +837,40 @@
     return sessionId;
 }
 
+Echonest::SongList Echonest::Parser::parseDynamicLookahead( QXmlStreamReader& xml ) throw( Echonest::ParseError )
+{
+    if( xml.atEnd() || xml.tokenType() != QXmlStreamReader::StartElement )
+        throw Echonest::ParseError( Echonest::UnknownParseError );
+
+    Echonest::SongList lookahead;
+
+    // Might not be any
+    if ( xml.name() != "lookahead" )
+        return lookahead;
+
+    while( !xml.atEnd() && ( xml.name() == "lookahead" && xml.tokenType() == QXmlStreamReader::StartElement ) ) {
+        // Read each lookahead track
+        Echonest::Song song;
+        while( !xml.atEnd() && ( xml.name() != "lookahead" || xml.tokenType() != QXmlStreamReader::EndElement ) ) {
+            if( xml.name() == "id" && xml.isStartElement() )
+                song.setId( xml.readElementText().toLatin1() );
+            else if( xml.name() == "title" && xml.isStartElement() )
+                song.setTitle( xml.readElementText() );
+            else if( xml.name() == "artist_id" && xml.isStartElement() )
+                song.setArtistId( xml.readElementText().toLatin1() );
+            else if( xml.name() == "artist_name" && xml.isStartElement() )
+                song.setArtistName( xml.readElementText() );
+
+            xml.readNext();
+        }
+        lookahead.append(song);
+
+        xml.readNext();
+    }
+
+    return lookahead;
+}
+
 // Catalogs parseCatalogList( QXmlStreamReader& xml ) throw( ParseError );
 Echonest::Catalogs Echonest::Parser::parseCatalogList( QXmlStreamReader& xml ) throw( Echonest::ParseError )
 {
@@ -1123,6 +1157,11 @@
 
     while( xml.name() != "response" || !xml.isEndElement() ) {
 //         qDebug() << "Parsing part of session info:" << xml.name() << xml.isStartElement();
+        // TODO
+    /** Sample output:
+     http://files.lfranchi.com/echonest_dynamic_info.xml
+
+
         if( xml.name() == "terms" && xml.isStartElement() ) {
             info.terms = parseTopTermList( xml );
             continue;
@@ -1153,7 +1192,7 @@
         } else if( xml.name() == "history" && xml.isStartElement() ) {
             info.history = parseSessionSongItem( xml, QLatin1String( "history" ) );
             continue;
-        }
+        }*/
         xml.readNext();
     }
     return info;
@@ -1176,7 +1215,8 @@
     }
     return rules;
 }
-
+/*
+ * TODO port to API v2
 QVector< Echonest::SessionItem > Echonest::Parser::parseSessionSongItem( QXmlStreamReader& xml, const QString& type ) throw( Echonest::ParseError )
 {
     if( xml.atEnd() || xml.name() != type || xml.tokenType() != QXmlStreamReader::StartElement )
@@ -1210,5 +1250,5 @@
         xml.readNext();
     }
     return items;
-}
+}*/

libechonest-1.2.0.tar.bz2/src/Parsing_p.h -> libechonest-2.0.1.tar.bz2/src/Parsing_p.h Changed

@@ -1,5 +1,5 @@
 /****************************************************************************************
- * Copyright (c) 2010 Leo Franchi <lfranchi@kde.org>                                    *
+ * Copyright (c) 2010-2012 Leo Franchi <lfranchi@kde.org>                               *
  *                                                                                      *
  * This program is free software; you can redistribute it and/or modify it under        *
  * the terms of the GNU General Public License as published by the Free Software        *
@@ -94,6 +94,7 @@
     License parseLicense( QXmlStreamReader& xml ) throw( ParseError );
 
     QByteArray parsePlaylistSessionId( QXmlStreamReader& xml ) throw( ParseError );
+    SongList parseDynamicLookahead( QXmlStreamReader& xml ) throw( ParseError );
 
     // Catalog functions
     Catalogs parseCatalogList( QXmlStreamReader& xml ) throw( ParseError );
@@ -112,10 +113,10 @@
 
     SessionInfo parseSessionInfo( QXmlStreamReader& xml ) throw( ParseError );
     QVector< QString > parseRulesList( QXmlStreamReader& xml ) throw( ParseError );
-    QVector< SessionItem > parseSessionSongItem( QXmlStreamReader& xml, const QString& type ) throw( ParseError );
+//     QVector< SessionItem > parseSessionSongItem( QXmlStreamReader& xml, const QString& type ) throw( ParseError );
 
-};
-};
+}
+}
 
 #endif

libechonest-1.2.0.tar.bz2/src/Playlist.cpp -> libechonest-2.0.1.tar.bz2/src/Playlist.cpp Changed

@@ -1,5 +1,5 @@
 /****************************************************************************************
- * Copyright (c) 2010 Leo Franchi <lfranchi@kde.org>                                    *
+ * Copyright (c) 2010-2012 Leo Franchi <lfranchi@kde.org>                               *
  *                                                                                      *
  * This program is free software; you can redistribute it and/or modify it under        *
  * the terms of the GNU General Public License as published by the Free Software        *
@@ -43,13 +43,13 @@
     return *this;
 }
 
-QNetworkReply* Echonest::DynamicPlaylist::start(const Echonest::DynamicPlaylist::PlaylistParams& params) const
+QNetworkReply* Echonest::DynamicPlaylist::create(const Echonest::DynamicPlaylist::PlaylistParams& params) const
 {
     // params are the same, if user passes in format parsing will throw, but it should be expected..
-    return generateInternal( params, "dynamic" );
+    return generateInternal( params, "dynamic/create" );
 }
 
-Echonest::Song Echonest::DynamicPlaylist::parseStart(QNetworkReply* reply) throw( Echonest::ParseError )
+void Echonest::DynamicPlaylist::parseCreate(QNetworkReply* reply) throw( Echonest::ParseError )
 {
     Echonest::Parser::checkForErrors( reply );
     QByteArray data = reply->readAll();
@@ -58,14 +58,14 @@
 
     Echonest::Parser::readStatus( xml );
     d->sessionId = Echonest::Parser::parsePlaylistSessionId( xml );
-    Echonest::SongList songs = Echonest::Parser::parseSongList( xml );
-    if( !songs.size() == 1 )
-        throw Echonest::ParseError( UnknownParseError );
 
-    d->currentSong = songs.front();
 
-    reply->deleteLater();
-    return d->currentSong;
+    Q_ASSERT( !d->sessionId.isEmpty() );
+}
+
+QNetworkReply* Echonest::DynamicPlaylist::restart(const Echonest::DynamicPlaylist::PlaylistParams& params) const
+{
+    return generateInternal( params, "dynamic/restart" );
 }
 
 QByteArray Echonest::DynamicPlaylist::sessionId() const
@@ -88,47 +88,139 @@
     d->currentSong = song;
 }
 
-QNetworkReply* Echonest::DynamicPlaylist::fetchNextSong(int rating) const
+QNetworkReply* Echonest::DynamicPlaylist::next( int results, int lookahead ) const
 {
-    QUrl url = Echonest::baseGetQuery( "playlist", "dynamic" );
+    QUrl url = Echonest::baseGetQuery( "playlist/dynamic", "next" );
     url.addEncodedQueryItem( "session_id", d->sessionId );
+    url.addEncodedQueryItem( "results", QByteArray::number( results ) );
+    url.addEncodedQueryItem( "lookahead", QByteArray::number( lookahead ) );
 
-    if( rating > 0 )
-        url.addEncodedQueryItem( "rating", QByteArray::number( rating ) );
+    return Echonest::Config::instance()->nam()->get( QNetworkRequest( url ) );
+}
+
+QNetworkReply* Echonest::DynamicPlaylist::fetchInfo() const
+{
+    QUrl url = Echonest::baseGetQuery( "playlist/dynamic", "info" );
+    url.addEncodedQueryItem( "session_id", d->sessionId );
 
     return Echonest::Config::instance()->nam()->get( QNetworkRequest( url ) );
+}
+
+
+Echonest::DynamicPlaylist::FetchPair Echonest::DynamicPlaylist::parseNext(QNetworkReply* reply) throw( Echonest::ParseError )
+{
+    Echonest::Parser::checkForErrors( reply );
 
+//     const QByteArray data = reply->readAll();
+//     qDebug() << data;
+    QXmlStreamReader xml( reply->readAll() );
+
+    Echonest::Parser::readStatus( xml );
+
+    Echonest::SongList lookahead = Echonest::Parser::parseDynamicLookahead( xml );
+    Echonest::SongList results = Echonest::Parser::parseSongList( xml );
+
+    reply->deleteLater();
+
+    return qMakePair(results, lookahead);
 }
 
-QNetworkReply* Echonest::DynamicPlaylist::fetchNextSong(const DynamicControls& controls) const
+QNetworkReply* Echonest::DynamicPlaylist::feedback(const Echonest::DynamicPlaylist::DynamicFeedback& feedback) const
 {
-    QUrl url = Echonest::baseGetQuery( "playlist", "dynamic" );
+    QUrl url = Echonest::baseGetQuery( "playlist/dynamic", "feedback" );
     url.addEncodedQueryItem( "session_id", d->sessionId );
 
-    DynamicControls::const_iterator iter = controls.begin();
-    for( ; iter != controls.end(); ++iter ) {
-        QString value = iter->second;
-        url.addEncodedQueryItem( dynamicControlToString( iter->first ), value.replace( QLatin1Char( ' ' ), QLatin1Char( '+' ) ).toUtf8() );
+    foreach( const Echonest::DynamicPlaylist::DynamicFeedbackParamData& param, feedback ) {
+        url.addEncodedQueryItem(dynamicFeedbackToString(param.first), param.second);
     }
 
     return Echonest::Config::instance()->nam()->get( QNetworkRequest( url ) );
 }
 
-QNetworkReply* Echonest::DynamicPlaylist::fetchSessionInfo() const
+void Echonest::DynamicPlaylist::parseFeedback(QNetworkReply* reply) const throw( Echonest::ParseError )
 {
-    QUrl url = Echonest::baseGetQuery( "playlist", "session_info" );
+    Echonest::Parser::checkForErrors( reply );
+
+    QXmlStreamReader xml( reply->readAll() );
+
+    Echonest::Parser::readStatus( xml );
+
+    reply->deleteLater();
+}
+
+QNetworkReply* Echonest::DynamicPlaylist::steer(const Echonest::DynamicPlaylist::PlaylistParams& steerParams) const
+{
+    QUrl url = Echonest::baseGetQuery( "playlist/dynamic", "steer" );
     url.addEncodedQueryItem( "session_id", d->sessionId );
 
+    foreach( const Echonest::DynamicPlaylist::PlaylistParamData& param, steerParams ) {
+        // HACK ARG min/max functions for steering are min_foo_bar, but params for static/initial seeds are foo_min_bar. can't reuse :(
+        QByteArray str;
+        switch ( param.first )
+        {
+            case Echonest::DynamicPlaylist::ArtistMinFamiliarity:
+                str = "min_artist_familiarity";
+                break;
+            case Echonest::DynamicPlaylist::ArtistMaxFamiliarity:
+                str = "max_artist_familiarity";
+                break;
+            case Echonest::DynamicPlaylist::ArtistMinHotttnesss:
+                str = "min_artist_hotttnesss";
+                break;
+            case Echonest::DynamicPlaylist::ArtistMaxHotttnesss:
+                str = "max_artist_hotttnesss";
+                break;
+            case Echonest::DynamicPlaylist::SongMinHotttnesss:
+                str = "min_song_hotttnesss";
+                break;
+            case Echonest::DynamicPlaylist::SongMaxHotttnesss:
+                str = "max_song_hotttnesss";
+                break;
+            case Echonest::DynamicPlaylist::MinEnergy:
+                str = "min_energy";
+                break;
+            case Echonest::DynamicPlaylist::MaxEnergy:
+                str = "max_energy";
+                break;
+            case Echonest::DynamicPlaylist::MinDanceability:
+                str = "min_danceability";
+                break;
+            case Echonest::DynamicPlaylist::MaxDanceability:
+                str = "max_danceability";
+                break;
+            case Echonest::DynamicPlaylist::MinLoudness:
+                str = "min_loudness";
+                break;
+            case Echonest::DynamicPlaylist::MaxLoudness:
+                str = "max_loudness";
+                break;
+            case Echonest::DynamicPlaylist::MinTempo:
+                str = "min_tempo";
+                break;
+            case Echonest::DynamicPlaylist::MaxTempo:
+                str = "max_tempo";
+                break;
+            default:
+                str = playlistParamToString( param.first );
+        }
+        url.addEncodedQueryItem(str, param.second.toString().toUtf8());
+    }
+
     return Echonest::Config::instance()->nam()->get( QNetworkRequest( url ) );
 }
 
-
-Echonest::Song Echonest::DynamicPlaylist::parseNextSong(QNetworkReply* reply)
+void Echonest::DynamicPlaylist::parseSteer(QNetworkReply* reply) const throw( Echonest::ParseError )
 {
-    return parseStart( reply );
+    Echonest::Parser::checkForErrors( reply );
+
+    QXmlStreamReader xml( reply->readAll() );
+
+    Echonest::Parser::readStatus( xml );
+
+    reply->deleteLater();
 }
 
-Echonest::SessionInfo Echonest::DynamicPlaylist::parseSessionInfo(QNetworkReply* reply) throw( Echonest::ParseError )
+Echonest::SessionInfo Echonest::DynamicPlaylist::parseInfo(QNetworkReply* reply) throw( Echonest::ParseError )
 {
     Echonest::Parser::checkForErrors( reply );
 
@@ -141,6 +233,26 @@
 
 }
 
+QNetworkReply* Echonest::DynamicPlaylist::deleteSession() const
+{
+    QUrl url = Echonest::baseGetQuery( "playlist/dynamic", "delete" );
+    url.addEncodedQueryItem( "session_id", d->sessionId );
+
+    return Echonest::Config::instance()->nam()->get( QNetworkRequest( url ) );
+}
+
+void Echonest::DynamicPlaylist::parseDeleteSession(QNetworkReply* reply)
+{
+    Echonest::Parser::checkForErrors( reply );
+
+    QXmlStreamReader xml( reply->readAll() );
+
+    Echonest::Parser::readStatus( xml );
+
+    d->sessionId.clear();
+
+    reply->deleteLater();
+}
 
 QNetworkReply* Echonest::DynamicPlaylist::staticPlaylist(const Echonest::DynamicPlaylist::PlaylistParams& params)
 {
@@ -208,11 +320,11 @@
         } else if( iter->first == SongInformation ){
             Echonest::Song::addQueryInformation( url, Echonest::SongInformation( iter->second.value< Echonest::SongInformation >() ) );
         } else {
-            url.addQueryItem( QLatin1String( playlistParamToString( iter->first ) ), iter->second.toString().replace( QLatin1Char( ' ' ), QLatin1Char( '+' ) ) );
+            url.addEncodedQueryItem( playlistParamToString( iter->first ), Echonest::escapeSpacesAndPluses( iter->second.toString() ) );
         }
     }
 
-    qDebug() << "Creating playlist URL" << url;
+//     qDebug() << "Creating playlist URL" << url;
     return Echonest::Config::instance()->nam()->get( QNetworkRequest( url ) );
 }
 
@@ -305,6 +417,24 @@
             return "style";
         case Echonest::DynamicPlaylist::Adventurousness :
             return "adventurousness";
+        case Echonest::DynamicPlaylist::MoreLikeThis :
+            return "more_like_this";
+        case Echonest::DynamicPlaylist::LessLikeThis :
+            return "less_like_this";
+        case Echonest::DynamicPlaylist::TargetTempo :
+            return "target_tempo";
+        case Echonest::DynamicPlaylist::TargetDanceability :
+            return "target_danceability";
+        case Echonest::DynamicPlaylist::TargetEnergy :
+            return "target_energy";
+        case Echonest::DynamicPlaylist::TargetLoudness :
+            return "target_loudness";
+        case Echonest::DynamicPlaylist::TargetArtistFamiliarity :
+            return "target_artist_familiarity";
+        case Echonest::DynamicPlaylist::TargetArtistHotttnesss :
+            return "target_artist_hotttnesss";
+        case Echonest::DynamicPlaylist::TargetSongHotttnesss :
+            return "target_song_hotttnesss";
     }
     return QByteArray();
 }
@@ -397,24 +527,32 @@
     return QByteArray();
 }
 
-QByteArray Echonest::DynamicPlaylist::dynamicControlToString(Echonest::DynamicPlaylist::DynamicControlItem control)
+QByteArray Echonest::DynamicPlaylist::dynamicFeedbackToString(Echonest::DynamicPlaylist::DynamicFeedbackParam param)
 {
-    switch( control )
+    switch( param )
     {
-        case Steer:
-            return "steer";
-        case SteerDescription:
-            return "steer_description";
-        case Rating:
-            return "rating";
-        case Ban:
-            return "ban";
+        case BanArtist:
+            return "ban_artist";
+        case FavoriteArtist:
+            return "favorite_artist";
+        case BanSong:
+            return "ban_song";
+        case FavoriteSong:
+            return "favorite_song";
+        case SkipSong:
+            return "skip_song";
+        case PlaySong:
+            return "play_song";
+        case UnplaySong:
+            return "unplay_song";
+        case RateSong:
+            return "rate_song";
         default:
+            Q_ASSERT(false);
             return "";
     }
 }
 
-
 QDebug Echonest::operator<<(QDebug d, const Echonest::DynamicPlaylist& playlist)
 {
     d << QString::fromLatin1( "DynamicPlaylist(%1, %2)" ).arg( QLatin1String( playlist.sessionId() ), playlist.currentSong().toString() );

libechonest-1.2.0.tar.bz2/src/Playlist.h -> libechonest-2.0.1.tar.bz2/src/Playlist.h Changed

@@ -1,5 +1,5 @@
 /****************************************************************************************
- * Copyright (c) 2010 Leo Franchi <lfranchi@kde.org>                                    *
+ * Copyright (c) 2010-2012 Leo Franchi <lfranchi@kde.org>                               *
  *                                                                                      *
  * This program is free software; you can redistribute it and/or modify it under        *
  * the terms of the GNU General Public License as published by the Free Software        *
@@ -33,35 +33,23 @@
 namespace Echonest{
 
     typedef struct {
-        qreal served_time;
-        QByteArray artist_id;
-        QByteArray id;
-        QString artist_name;
-        QString title;
-        int rating;
-    } SessionItem;
-
-    typedef struct {
-        TermList terms;
-        SongList seed_songs;
-//         description .. what data is in here?
-        Artists banned_artists;
-        QVector< QString > rules;
         QByteArray session_id;
-        Artists seeds;
-        QVector< SessionItem > skipped_songs;
-        QVector< SessionItem > banned_songs;
-        QString playlist_type;
-        Catalogs seed_catalogs;
-        QVector< SessionItem > rated_songs;
-        QVector< SessionItem > history;
+        Artists banned_artists;
+        Artists favorited_artists;
+        SongList banned_songs;
+        SongList favorited_songs;
+        QVariantMap options;
+        QVariantMap ratingsMap;
+        // TODO favorites_map
+        // TODO constraints
+
     } SessionInfo;
 
     /**
      * This encapsulates an Echo Nest dynamic playlist. It contains a playlist ID and
      *  the current song, and can fetch the next song.
      *
-     *  See http://developer.echonest.com/docs/v4/playlist.html#dynamic
+     *  See http://developer.echonest.com/docs/v4/playlist.html
      *   for more information
      */
     class ECHONEST_EXPORT DynamicPlaylist
@@ -175,25 +163,39 @@
             ChainXSPF, /// true, false    If true, returns an xspf for this dynamic playlist with 2 items. The second item will be a link to the API call for the next track in the chain. Please note that this sidesteps libechonest's handling of the tracks.
             Mood, /// A mood to limit this playlist to, for example "happy" or "sad". Multiples of this param are okay. See the method Artist::listTerms for details on what moods are currently available
             Style, /// A style to limit this playlist to, for example "happy" or "sad". Multiples of this param are okay. See the method Artist::listTerms for details on what styles are currently available
-            Adventurousness
+            Adventurousness, /// A value of 0 means no adventurousness, only known and preferred music will be played. A value of 1 means high adventurousness, mostly unknown music will be played. This parameter only applies to catalog and catalog-radio type playlists.
+            MoreLikeThis, /// When steering: Supply a song id to steer this session towards. Can be boosted from 0-5 like so: SO12341234^2. Default is 1
+            LessLikeThis, /// When steering: Supply a song id to steer this session away from. Can be boosted from 0-5 like so: SO12341234^2. Default is 1
+            TargetTempo, /// When steering: 0.0 < tempo < 500. (BPM). Target a desired tempo for the songs in this dynamic playlist session
+            TargetLoudness, /// When steering: -100. < loudness < 100. (BPM)dB. Target a desired loudness for the songs in this dynamic playlist session
+            TargetDanceability, /// When steering: 0.0 < danceability < 1. Target a desired danceability for the songs in this dynamic playlist session
+            TargetEnergy, /// When steering: 0.0 < energy < 1.Target a desired energy for the songs in this dynamic playlist session
+            TargetSongHotttnesss, /// When steering: 0.0 < song_hotttnesss < 1.Target a desired song_hotttnesss for the songs in this dynamic playlist session
+            TargetArtistHotttnesss, /// When steering: 0.0 < artist_hottttnesss < 1.Target a desired artist_hottttnesss for the songs in this dynamic playlist session
+            TargetArtistFamiliarity, /// When steering: 0.0 < artist_familiarity < 1.Target a desired energy for the artist_familiarity in this dynamic playlist session
         };
 
-        typedef QPair< PlaylistParam, QVariant > PlaylistParamData;
-        typedef QVector< PlaylistParamData > PlaylistParams;
-
         /**
-         * The various controls for a dynamic playlist.
-         *
-         * Please see The Echo Nest API documentation for more information
+         * The types of feedback that can be used to steer a dynamic playlist
          */
-        enum DynamicControlItem {
-          Steer = 0,
-          SteerDescription,
-          Rating,
-          Ban
+        enum DynamicFeedbackParam {
+            BanArtist, /// Ban this artist from this dynamic session. artist_id, track_id, song_id, "last"
+            FavoriteArtist, /// Mark this artist as 'liked' for this session. artist_id, track_id, song_id, "last"
+            BanSong, /// Ban this song from this dynamic session. track_id, song_id, "last"
+            SkipSong, /// Mark this song as skipped by the user. Will not appear for the rest of the session. track_id, song_id, "last"
+            FavoriteSong, /// Mark this song as a favorite. track_id, song_id, "last"
+            PlaySong, /// Mark this song as played. Unneeded unless you want to pre-seed a station. track_id, song_id, "last"
+            UnplaySong, /// Remove a song from a dynamic session's history. Will not blacklist the song. track_id, song_id, "last"
+            RateSong, /// Rate the desired song. track_id, song_id, "last"^0-10. E.g: "last^3" or "TRTLKZV12E5AC92E11^5"
         };
-        typedef QPair< DynamicControlItem, QString > DynamicControl;
-        typedef QVector< DynamicControl > DynamicControls;
+
+        typedef QPair< PlaylistParam, QVariant > PlaylistParamData;
+        typedef QVector< PlaylistParamData > PlaylistParams;
+
+        typedef QPair< DynamicFeedbackParam, QByteArray > DynamicFeedbackParamData;
+        typedef QVector< DynamicFeedbackParamData > DynamicFeedback;
+
+        typedef QPair< SongList, SongList > FetchPair;
 
         DynamicPlaylist();
         virtual ~DynamicPlaylist();
@@ -203,11 +205,21 @@
         /**
          * Start a dynamic playlist with the given parameters.
          *  Once the QNetworkReply has finished, pass it to parseStart()
-         *  and the inital song will be populated and returned. The sessionId(), currentSong(),
-         *  and fetchNextSong() methods will then be useful.
+         *
+         *  To fetch tracks, call fetchNextSong(). The info() method can be used
+         *   to extract session information
+         */
+        QNetworkReply* create( const PlaylistParams& params ) const;
+        void parseCreate( QNetworkReply* ) throw( ParseError );
+
+        /**
+         * Retart a dynamic playlist with the given parameters.
+         *  Once the QNetworkReply has finished, pass it to parseStart()
+         *
+         * This is the same as start(), except it maintains the history from an
+         *  already-existing playing station.
          */
-        QNetworkReply* start( const PlaylistParams& params ) const;
-        Song parseStart( QNetworkReply* ) throw( ParseError );
+        QNetworkReply* restart( const PlaylistParams& params ) const;
 
         /**
          * The session id of this dynamic playlist. If the playlist has ended, or has not been started,
@@ -225,27 +237,67 @@
         void setCurrentSong( const Song& song );
 
         /**
-         * Queries The Echo Nest for the next playable song in this
+         * Queries The Echo Nest for the next playable song(s) in this
          *  dynamic playlist.
          *
-         * Once the query has emitted the finished() signal, pass it to parseNextSong(), which will
-         *  return the new song to play. It will also set the current song to the newly parsed song.
+         * \param @results How many results to return, 1-5. This lets you
+         *                 reduce the calls if you need more than one. Default is 1.
+         * \param @lookahead The potential next songs (after the results)
+         *                   if there is no steering applied. 0-5, default of 0.
+         */
+        QNetworkReply* next( int results = 1, int lookahead = 0 ) const;
+
+        /**
+         * Return the result of a dynamic/next API call. This will return two lists:
+         * the "next" list and the "lookahead" list. Consult the \ref next() docs
+         * and The Echo Nest documentation for more information.
+         */
+        FetchPair parseNext( QNetworkReply* reply ) throw( ParseError );
+
+        /**
+         * Returns feedback to The Echo Nest for the currently playing dynamic
+         *  playlist.
+         *
+         * See The Echo Nest api documentation for complete details.
+         *
+         * \param feedback A list of feedback items to apply.
+         */
+        QNetworkReply* feedback(const DynamicFeedback& feedback) const;
+
+        /**
+         * Parses the result of the feedback call.
          *
-         * If the playlist has no more songs, the returned song object will be have no name nor id.
+         * Will throw an exception if the return code is not successful (as other parse methods do).
+         */
+        void parseFeedback(QNetworkReply* reply) const throw( ParseError );
+
+        /**
+         * Modifies the upcoming tracks in this dynamic playlist session by steering it.
          *
-         * @param rating The rating for the song that was just played. Ranges from 1 (lowest) to 5 (highest)
-         * @param controls The controls to apply when fetching the next track.
+         * Steering is additive, and can be reset for a dynamic playlist by calling reset.
+         *
+         * \param steerParams The desired steering params. Only use the enum values that correspond to valid steering commands.
+         */
+        QNetworkReply* steer(const PlaylistParams& steerParams) const;
+
+        /**
+         * Parses the result of the steer call.
          *
+         * Will throw an exception if the return code is not successful (as other parse methods do).
          */
-        QNetworkReply* fetchNextSong( int rating = -1 ) const;
-        QNetworkReply* fetchNextSong( const DynamicControls& controls ) const;
-        Song parseNextSong( QNetworkReply* reply );
+        void parseSteer(QNetworkReply* reply) const throw( ParseError );
 
         /**
          * Returns a description of this dynamic playlist session
          */
-        QNetworkReply* fetchSessionInfo() const;
-        SessionInfo parseSessionInfo( QNetworkReply* reply ) throw( ParseError );;
+        QNetworkReply* fetchInfo() const;
+        SessionInfo parseInfo( QNetworkReply* reply ) throw( ParseError );
+
+        /**
+         * Deletes a currently active playlist session. A non-commercial API can have, at most 1,000 active playlist sessions.
+         */
+        QNetworkReply* deleteSession() const;
+        void parseDeleteSession(QNetworkReply* reply);
 
         /**
          * Generate a static playlist, according to the desired criteria. Use parseXSPFPlaylist if
@@ -264,7 +316,7 @@
         static QNetworkReply* generateInternal( const PlaylistParams& params, const QByteArray& type );
         static QByteArray playlistSortToString(SortingType sorting);
         static QByteArray playlistArtistPickToString(ArtistPick pick);
-        static QByteArray dynamicControlToString(DynamicControlItem control);
+        static QByteArray dynamicFeedbackToString(DynamicFeedbackParam param);
 
         QSharedDataPointer<DynamicPlaylistData> d;
     };
@@ -272,7 +324,7 @@
     ECHONEST_EXPORT QDebug operator<<(QDebug d, const Echonest::DynamicPlaylist& playlist);
 
 
-}; // namespace
+} // namespace
 
 
 Q_DECLARE_METATYPE( Echonest::DynamicPlaylist )

libechonest-1.2.0.tar.bz2/src/Playlist_p.h -> libechonest-2.0.1.tar.bz2/src/Playlist_p.h Changed

libechonest-1.2.0.tar.bz2/src/Song.cpp -> libechonest-2.0.1.tar.bz2/src/Song.cpp Changed

@@ -1,5 +1,5 @@
 /****************************************************************************************
- * Copyright (c) 2010 Leo Franchi <lfranchi@kde.org>                                    *
+ * Copyright (c) 2010-2012 Leo Franchi <lfranchi@kde.org>                               *
  *                                                                                      *
  * This program is free software; you can redistribute it and/or modify it under        *
  * the terms of the GNU General Public License as published by the Free Software        *
@@ -197,7 +197,7 @@
 
     SearchParams::const_iterator iter = params.constBegin();
     for( ; iter < params.constEnd(); ++iter )
-        url.addQueryItem( QLatin1String( searchParamToString( iter->first ) ), iter->second.toString().replace( QLatin1Char( ' ' ), QLatin1Char( '+' ) ) );
+        url.addEncodedQueryItem( searchParamToString( iter->first ), Echonest::escapeSpacesAndPluses( iter->second.toString() ) );
 
     qDebug() << "Creating search URL" << url;
     return Echonest::Config::instance()->nam()->get( QNetworkRequest( url ) );

libechonest-1.2.0.tar.bz2/src/Song.h -> libechonest-2.0.1.tar.bz2/src/Song.h Changed

libechonest-1.2.0.tar.bz2/src/Song_p.h -> libechonest-2.0.1.tar.bz2/src/Song_p.h Changed

libechonest-1.2.0.tar.bz2/src/Track.cpp -> libechonest-2.0.1.tar.bz2/src/Track.cpp Changed

libechonest-1.2.0.tar.bz2/src/Track.h -> libechonest-2.0.1.tar.bz2/src/Track.h Changed

libechonest-1.2.0.tar.bz2/src/Track_p.h -> libechonest-2.0.1.tar.bz2/src/Track_p.h Changed

@@ -1,5 +1,5 @@
 /****************************************************************************************
- * Copyright (c) 2010 Leo Franchi <lfranchi@kde.org>                                    *
+ * Copyright (c) 2010-2012 Leo Franchi <lfranchi@kde.org>                               *
  *                                                                                      *
  * This program is free software; you can redistribute it and/or modify it under        *
  * the terms of the GNU General Public License as published by the Free Software        *
@@ -45,14 +45,14 @@
         request.setHeader( QNetworkRequest::ContentTypeHeader, QLatin1String( "application/x-www-form-urlencoded" ) );
         return Echonest::Config::instance()->nam()->post( request, data );
     }
-};
+}
 
 class TrackData : public QSharedData
 {
 public:
     TrackData() {}
 
-    TrackData(const TrackData& other)
+    TrackData(const TrackData& other) : QSharedData( other )
     {
         analyzer_version = other.analyzer_version;
         artist = other.artist;

libechonest-1.2.0.tar.bz2/src/TypeInformation.cpp -> libechonest-2.0.1.tar.bz2/src/TypeInformation.cpp Changed

libechonest-1.2.0.tar.bz2/src/TypeInformation.h -> libechonest-2.0.1.tar.bz2/src/TypeInformation.h Changed

@@ -1,5 +1,5 @@
 /****************************************************************************************
- * Copyright (c) 2010 Leo Franchi <lfranchi@kde.org>                                    *
+ * Copyright (c) 2010-2012 Leo Franchi <lfranchi@kde.org>                               *
  *                                                                                      *
  * This program is free software; you can redistribute it and/or modify it under        *
  * the terms of the GNU General Public License as published by the Free Software        *
@@ -48,7 +48,7 @@
             Reviews = 0x0080,
             Terms = 0x0100,
             Urls = 0x200,
-            Videos = 0x0400,
+            Videos = 0x0400
         };
         Q_DECLARE_FLAGS( ArtistInformationFlags, ArtistInformationFlag )
         
@@ -127,7 +127,7 @@
     };
     
     Q_DECLARE_OPERATORS_FOR_FLAGS(SongInformation::SongInformationFlags)
-};
+}
 
 Q_DECLARE_METATYPE( Echonest::ArtistInformation )
 Q_DECLARE_METATYPE( Echonest::SongInformation )

libechonest-1.2.0.tar.bz2/src/Util.cpp -> libechonest-2.0.1.tar.bz2/src/Util.cpp Changed

@@ -1,5 +1,5 @@
 /****************************************************************************************
- * Copyright (c) 2010 Leo Franchi <lfranchi@kde.org>                                    *
+ * Copyright (c) 2010-2012 Leo Franchi <lfranchi@kde.org>                               *
  *                                                                                      *
  * This program is free software; you can redistribute it and/or modify it under        *
  * the terms of the GNU General Public License as published by the Free Software        *
@@ -18,6 +18,15 @@
 
 #include <QString>
 
+QByteArray Echonest::escapeSpacesAndPluses(const QString& in)
+{
+    // Echonest wants " " treated as "+", so we force QUrl to encode spaces as +es rather than %20
+    QByteArray escaped = QUrl::toPercentEncoding( in, " " );
+    escaped.replace( " ", "+" );
+    return escaped;
+}
+
+
 Echonest::Analysis::AnalysisStatus Echonest::statusToEnum(const QString& status)
 {
     if( status == QLatin1String("unknown") ) {
@@ -115,7 +124,7 @@
         return Echonest::CatalogTypes::Update;
     else if( type == "skip" )
         return Echonest::CatalogTypes::Skip;
-    
+
     return Echonest::CatalogTypes::Update;
 }

libechonest-1.2.0.tar.bz2/src/Util.h -> libechonest-2.0.1.tar.bz2/src/Util.h Changed

@@ -1,5 +1,5 @@
 /****************************************************************************************
- * Copyright (c) 2010 Leo Franchi <lfranchi@kde.org>                                    *
+ * Copyright (c) 2010-2012 Leo Franchi <lfranchi@kde.org>                               *
  *                                                                                      *
  * This program is free software; you can redistribute it and/or modify it under        *
  * the terms of the GNU General Public License as published by the Free Software        *
@@ -30,7 +30,7 @@
 namespace Echonest
 {
     namespace Analysis
-    {    
+    {
         enum AnalysisStatus {
             Unknown = 0,
             Pending = 1,
@@ -38,21 +38,21 @@
             Error = 4
         };
     }
-    
+
     namespace CatalogTypes
     {
         enum Type {
             Artist = 0,
             Song = 1
         };
-        
+
         enum Action {
             Delete,
             Update,
             Play,
             Skip
         };
-        
+
         enum TicketStatus {
             Unknown = 0,
             Pending = 1,
@@ -60,7 +60,7 @@
             Error = 4
         };
     }
-        
+
     typedef struct
     {
         qreal confidence;
@@ -84,45 +84,47 @@
         qreal start;
         QVector< qreal > timbre;
     } Segment;
-    
-    
+
+
     typedef QVector< Bar > BarList;
     typedef QVector< Beat > BeatList;
     typedef QVector< Section > SectionList;
     typedef QVector< Tatum > TatumList;
     typedef QVector< Segment > SegmentList;
-    
+
     typedef struct {
         QUrl url;
         QString attribution;
         QString type;
     } License;
-    
+
     typedef struct {
         QString catalog;
         QString foreign_id;
     } ForeignId;
-    
+
     typedef struct {
         qreal latitude;
         qreal longitude;
         QString location;
     } ArtistLocation;
-    
+
     typedef QVector< ForeignId > ForeignIds;
-        
+
+    QByteArray escapeSpacesAndPluses( const QString& in );
+
     Analysis::AnalysisStatus statusToEnum( const QString& status );
     QString statusToString( Analysis::AnalysisStatus status );
-    
+
     QByteArray catalogTypeToLiteral( CatalogTypes::Type );
     CatalogTypes::Type literalToCatalogType( const QByteArray& type );
-    
+
     QByteArray catalogStatusToLiteral( CatalogTypes::TicketStatus );
     CatalogTypes::TicketStatus literalToCatalogStatus( const QByteArray& type );
-    
+
     QByteArray catalogUpdateActionToLiteral( CatalogTypes::Action );
     CatalogTypes::Action literalToCatalogUpdateAction( const QByteArray& type );
-    
+
     ECHONEST_EXPORT QDebug operator<<(QDebug d, const ForeignId& id);
     ECHONEST_EXPORT QDebug operator<<(QDebug d, const ArtistLocation& id);
 }

libechonest-1.2.0.tar.bz2/src/echonest_export.h -> libechonest-2.0.1.tar.bz2/src/echonest_export.h Changed

libechonest-1.2.0.tar.bz2/tests/ArtistTest.cpp -> libechonest-2.0.1.tar.bz2/tests/ArtistTest.cpp Changed

@@ -1,5 +1,5 @@
  /****************************************************************************************
-  * Copyright (c) 2010 Leo Franchi <lfranchi@kde.org>                                    *
+  * Copyright (c) 2010-2012 Leo Franchi <lfranchi@kde.org>                               *
   *                                                                                      *
   * This program is free software; you can redistribute it and/or modify it under        *
   * the terms of the GNU General Public License as published by the Free Software        *
@@ -69,7 +69,7 @@
     testArtist.parseProfile( reply );
 
     qDebug() << testArtist.audio().size();
-    QVERIFY( testArtist.audio().size() == 5 );
+    QVERIFY( testArtist.audio().size() == 2 );
 
     qDebug() << testArtist.audio().at(0).artist() << testArtist.audio().at(0).date() << testArtist.audio().at(0).id() << testArtist.audio().at(0).length() << testArtist.audio().at(0).release() <<
                 testArtist.audio().at(0).title() << testArtist.audio().at(0).url() << testArtist.audio().at(0).title() << testArtist.audio().at(0).link();
@@ -104,10 +104,26 @@
     testArtist.parseProfile( reply );
 
     qDebug() << testArtist.biographies().size();
-    QVERIFY( testArtist.biographies().size() == 13 );
+    QVERIFY( testArtist.biographies().size() > 5 );
 
 //     qDebug() << testArtist.biographies().at( 0 ).license().type << testArtist.biographies().at( 0 ).site() << testArtist.biographies().at( 0 ).text() << testArtist.biographies().at( 0 ).url();
 
+    try {
+        testArtist = Artist();
+        testArtist.setName( QLatin1String( "Florence + The Machine" ) );
+        reply = testArtist.fetchBiographies();
+        qDebug() << reply->url().toString();
+
+        loop.connect( reply, SIGNAL(finished()), SLOT(quit()) );
+        loop.exec();
+        testArtist.parseProfile( reply );
+
+        qDebug() << testArtist.biographies().size();
+        QVERIFY( testArtist.biographies().size() > 5 );
+    } catch ( Echonest::ParseError& e ) {
+        QVERIFY( false );
+    }
+
 }
 
 
@@ -490,7 +506,7 @@
     artists.clear();
     params.clear();
     params.append( Artist::SearchParamEntry( Artist::Name, QLatin1String( "Devo" ) ) );
-    params.append( Artist::SearchParamEntry( Artist::Name, QLatin1String( "The New Pornographers" ) ) );
+    params.append( Artist::SearchParamEntry( Artist::Name, QLatin1String( "Florence + The Machine" ) ) );
     params.append( Artist::SearchParamEntry( Artist::Name, QLatin1String( "Lady Gaga" ) ) );
     params.append( Artist::SearchParamEntry( Artist::MinFamiliarity, 0.5 ) );

libechonest-1.2.0.tar.bz2/tests/ArtistTest.h -> libechonest-2.0.1.tar.bz2/tests/ArtistTest.h Changed

libechonest-1.2.0.tar.bz2/tests/CatalogTest.cpp -> libechonest-2.0.1.tar.bz2/tests/CatalogTest.cpp Changed

@@ -1,5 +1,5 @@
  /****************************************************************************************
-  * Copyright (c) 2010 Leo Franchi <lfranchi@kde.org>                                    *
+  * Copyright (c) 2010-2012 Leo Franchi <lfranchi@kde.org>                               *
   *                                                                                      *
   * This program is free software; you can redistribute it and/or modify it under        *
   * the terms of the GNU General Public License as published by the Free Software        *
@@ -25,7 +25,7 @@
 
 void CatalogTest::initTestCase()
 {
-    Echonest::Config::instance()->setAPIKey( "JGJCRKWLXLBZIFAZB" );
+    Echonest::Config::instance()->setAPIKey( "JRIHWEP6GPOER2QQ6" );
 }
 
 void CatalogTest::testList()
@@ -165,12 +165,12 @@
 void CatalogTest::testCreateUpdateDeleteSong()
 {
 
-//     {
-//         Echonest::Catalog c( "CAKOHPN131DA98630D" );
-//         QNetworkReply* reply = c.deleteCatalog();
-//     QEventLoop loop;
-//     loop.connect( reply, SIGNAL(finished()), SLOT(quit()) );
-//     loop.exec(); exit(1);}
+    {
+        Echonest::Catalog c( "CAQBYCW132B7313E1A" );
+        QNetworkReply* reply = c.deleteCatalog();
+    QEventLoop loop;
+    loop.connect( reply, SIGNAL(finished()), SLOT(quit()) );
+    loop.exec(); exit(1);}
 
     try {
         QNetworkReply* reply = Echonest::Catalog::create( QLatin1String( "unittest_catalog_song_X" ), Echonest::CatalogTypes::Song );

libechonest-1.2.0.tar.bz2/tests/CatalogTest.h -> libechonest-2.0.1.tar.bz2/tests/CatalogTest.h Changed

libechonest-1.2.0.tar.bz2/tests/PlaylistTest.cpp -> libechonest-2.0.1.tar.bz2/tests/PlaylistTest.cpp Changed

@@ -1,5 +1,5 @@
 /****************************************************************************************
- * Copyright (c) 2010 Leo Franchi <lfranchi@kde.org>                                    *
+ * Copyright (c) 2010-2012 Leo Franchi <lfranchi@kde.org>                               *
  *                                                                                      *
  * This program is free software; you can redistribute it and/or modify it under        *
  * the terms of the GNU General Public License as published by the Free Software        *
@@ -63,6 +63,7 @@
     p.append( DynamicPlaylist::PlaylistParamData( DynamicPlaylist::Artist, QLatin1String( "tallest man on earth" ) ) );
     p.append( DynamicPlaylist::PlaylistParamData( DynamicPlaylist::Artist, QLatin1String( "bon iver" ) ) );
     p.append( DynamicPlaylist::PlaylistParamData( DynamicPlaylist::Artist, QLatin1String( "mumford and sons" ) ) );
+    p.append( DynamicPlaylist::PlaylistParamData( DynamicPlaylist::Artist, QLatin1String( "Florence + The Machine" ) ) );
     p.append( DynamicPlaylist::PlaylistParamData( DynamicPlaylist::ArtistMaxFamiliarity, 0.4 ) );
     p.append( DynamicPlaylist::PlaylistParamData( DynamicPlaylist::MinDanceability, 0.7 ) );
     p.append( DynamicPlaylist::PlaylistParamData( DynamicPlaylist::Type, Echonest::DynamicPlaylist::ArtistType ) );
@@ -71,15 +72,16 @@
 
     QNetworkReply* reply = DynamicPlaylist::staticPlaylist( p );
 
-    qDebug() << reply->url().toString();
-    QCOMPARE( reply->url().toString(), QLatin1String( "http://developer.echonest.com/api/v4/playlist/static?api_key=JGJCRKWLXLBZIFAZB&format=xml&artist=tallest+man+on+earth&artist=bon+iver&artist=mumford+and+sons&artist_max_familiarity=0.4&min_danceability=0.7&type=artist&bucket=song_hotttnesss&bucket=artist_hotttnesss&bucket=artist_familiarity&results=4" ) );
+    qDebug() << reply->url().toEncoded();
+    QCOMPARE( QLatin1String( reply->url().toEncoded() ), QLatin1String( "http://developer.echonest.com/api/v4/playlist/static?api_key=JGJCRKWLXLBZIFAZB&format=xml&artist=tallest+man+on+earth&artist=bon+iver&artist=mumford+and+sons&artist=Florence+%2B+The+Machine&artist_max_familiarity=0.4&min_danceability=0.7&type=artist&bucket=song_hotttnesss&bucket=artist_hotttnesss&bucket=artist_familiarity&results=4" ) );
 
     QEventLoop loop;
     loop.connect( reply, SIGNAL(finished()), SLOT(quit()) );
     loop.exec();
     SongList songs = DynamicPlaylist::parseStaticPlaylist( reply );
 
-    QVERIFY( songs.size() == 4 );
+//     qDebug() << "Got songs;" << songs;
+    QVERIFY( songs.size() > 1 );
     Q_FOREACH( const Song& song, songs ) {
         QVERIFY( !song.id().isEmpty() );
     }
@@ -97,7 +99,7 @@
 
     reply = DynamicPlaylist::staticPlaylist( p );
 
-    qDebug() << reply->url().toString();
+//     qDebug() << reply->url().toString();
     QVERIFY( reply->url().toString() == QLatin1String( "http://developer.echonest.com/api/v4/playlist/static?api_key=JGJCRKWLXLBZIFAZB&format=xml&description=70s&description=folk^2&artist_min_familiarity=0.4&max_tempo=100&mode=0&type=artist-description&style=acoustic&bucket=audio_summary&bucket=song_hotttnesss&bucket=artist_hotttnesss&bucket=artist_familiarity&results=7" ) );
 
     QEventLoop loop2;
@@ -108,7 +110,7 @@
     QVERIFY( songs.size() == 7 );
     Q_FOREACH( const Song& song, songs ) {
         QVERIFY( !song.id().isEmpty() );
-        qDebug() << song << song.audioSummary();
+//         qDebug() << song << song.audioSummary();
         QVERIFY( song.audioSummary().duration() > 0 );
     }
 
@@ -161,37 +163,44 @@
     p.append( DynamicPlaylist::PlaylistParamData( DynamicPlaylist::Mood, QLatin1String( "sad" ) ) );
 
     DynamicPlaylist playlist;
-    QNetworkReply* reply = playlist.start( p );
+    QNetworkReply* reply = playlist.create( p );
 
     qDebug() << reply->url().toString();
-    QCOMPARE( reply->url().toString(), QLatin1String( "http://developer.echonest.com/api/v4/playlist/dynamic?api_key=JGJCRKWLXLBZIFAZB&format=xml&artist=tallest+man+on+earth&artist=fleet+foxes&artist=johnny+cash&artist=crosby,+stills,+nash+and+young&type=artist-radio&artist_min_hotttnesss=0.6&artist_max_familiarity=0.4&mood=sad" ) );
+    QCOMPARE( reply->url().toString(), QLatin1String( "http://developer.echonest.com/api/v4/playlist/dynamic/create?api_key=JGJCRKWLXLBZIFAZB&format=xml&artist=tallest+man+on+earth&artist=fleet+foxes&artist=johnny+cash&artist=crosby,+stills,+nash+and+young&type=artist-radio&artist_min_hotttnesss=0.6&artist_max_familiarity=0.4&mood=sad" ) );
 
     QEventLoop loop;
     loop.connect( reply, SIGNAL(finished()), SLOT(quit()) );
     loop.exec();
-    Song song = playlist.parseStart( reply );
+    playlist.parseCreate( reply );
+
+    reply = playlist.next( 1 );
+
+    loop.connect( reply, SIGNAL(finished()), SLOT(quit()) );
+    loop.exec();
+
+    Song song = playlist.parseNext( reply ).first.first();
+//     qDebug() << "next:" << song;
 
-    qDebug() << "next:" << song;
     QVERIFY( !song.id().isEmpty() );
     QVERIFY( !song.title().isEmpty() );
 
-    reply = playlist.fetchNextSong( 1 );
+    reply = playlist.next( 1 );
 
     loop.connect( reply, SIGNAL(finished()), SLOT(quit()) );
     loop.exec();
-    song = playlist.parseNextSong( reply );
+    song = playlist.parseNext( reply ).first.first();
 
-    qDebug() << "next:" << song;
+//     qDebug() << "next:" << song;
     QVERIFY( !song.id().isEmpty() );
     QVERIFY( !song.title().isEmpty() );
 
-    reply = playlist.fetchNextSong( 1 );
+    reply = playlist.next( 1 );
 
     loop.connect( reply, SIGNAL(finished()), SLOT(quit()) );
     loop.exec();
-    song = playlist.parseNextSong( reply );
+    song = playlist.parseNext( reply ).first.first();
 
-    qDebug() << "next:" << song;
+//     qDebug() << "next:" << song;
     QVERIFY( !song.id().isEmpty() );
     QVERIFY( !song.title().isEmpty() );
 }
@@ -212,71 +221,90 @@
     p.append( DynamicPlaylist::PlaylistParamData( DynamicPlaylist::SongInformation, QVariant::fromValue( Echonest::SongInformation( Echonest::SongInformation::AudioSummaryInformation | Echonest::SongInformation::Hotttnesss | Echonest::SongInformation::ArtistHotttnesss | Echonest::SongInformation::ArtistFamiliarity ) ) ) );
 
     DynamicPlaylist playlist;
-    QNetworkReply* reply = playlist.start( p );
+    QNetworkReply* reply = playlist.create( p );
 
     qDebug() << reply->url().toString();
-    QVERIFY( reply->url().toString() == QLatin1String( "http://developer.echonest.com/api/v4/playlist/dynamic?api_key=JGJCRKWLXLBZIFAZB&format=xml&artist=pink+floyd^-1&artist=the+who&artist=queen&artist=led+zeppelin^2&artist=-the+beatles&type=artist&artist_min_hotttnesss=0.7&artist_max_familiarity=0.3&min_loudness=-10&mode=1&bucket=audio_summary&bucket=song_hotttnesss&bucket=artist_hotttnesss&bucket=artist_familiarity" ) );
+    QCOMPARE( reply->url().toString(), QLatin1String( "http://developer.echonest.com/api/v4/playlist/dynamic/create?api_key=JGJCRKWLXLBZIFAZB&format=xml&artist=pink+floyd^-1&artist=the+who&artist=queen&artist=led+zeppelin^2&artist=-the+beatles&type=artist&artist_min_hotttnesss=0.7&artist_max_familiarity=0.3&min_loudness=-10&mode=1&bucket=audio_summary&bucket=song_hotttnesss&bucket=artist_hotttnesss&bucket=artist_familiarity" ) );
 
     QEventLoop loop;
     loop.connect( reply, SIGNAL(finished()), SLOT(quit()) );
     loop.exec();
-    Song song = playlist.parseStart( reply );
+    playlist.parseCreate( reply );
+
+    reply = playlist.next( 1 );
+
+    loop.connect( reply, SIGNAL(finished()), SLOT(quit()) );
+    loop.exec();
+    Echonest::Song song = playlist.parseNext( reply ).first.first();
 
-    qDebug() << "next:" << song;
+//     qDebug() << "next:" << song;
     QVERIFY( !song.id().isEmpty() );
     QVERIFY( !song.title().isEmpty() );
 
     // GET NEXT
-    reply = playlist.fetchNextSong( 1 );
+    reply = playlist.next( 1 );
 
     loop.connect( reply, SIGNAL(finished()), SLOT(quit()) );
     loop.exec();
-    song = playlist.parseNextSong( reply );
+    song = playlist.parseNext( reply ).first.first();
 
-    qDebug() << "next:" << song;
+//     qDebug() << "next:" << song;
     QVERIFY( !song.id().isEmpty() );
     QVERIFY( !song.title().isEmpty() );
 
     // GET NEXT
-    reply = playlist.fetchNextSong( 1 );
+    reply = playlist.next( 1 );
 
     loop.connect( reply, SIGNAL(finished()), SLOT(quit()) );
     loop.exec();
-    song = playlist.parseNextSong( reply );
+    song = playlist.parseNext( reply ).first.first();
 
-    qDebug() << "next:" << song;
+//     qDebug() << "next:" << song;
     QVERIFY( !song.id().isEmpty() );
     QVERIFY( !song.title().isEmpty() );
 
     // GET NEXT
-    DynamicPlaylist::DynamicControls controls;
-    controls.append( DynamicPlaylist::DynamicControl( DynamicPlaylist::Steer, QLatin1String( "energy^2" ) ) );
-    controls.append( DynamicPlaylist::DynamicControl( DynamicPlaylist::Rating, QLatin1String( "4" ) ) );
-    reply = playlist.fetchNextSong( controls );
-    qDebug() << "Control URL:" << reply->url().toString();
+    DynamicPlaylist::PlaylistParams steering;
+    steering.append( DynamicPlaylist::PlaylistParamData( Echonest::DynamicPlaylist::TargetEnergy, QLatin1String( ".8" ) ) );
+    steering.append( DynamicPlaylist::PlaylistParamData( Echonest::DynamicPlaylist::ArtistMinFamiliarity, QLatin1String( ".5" ) ) );
+
+    reply = playlist.steer( steering );
     loop.connect( reply, SIGNAL(finished()), SLOT(quit()) );
     loop.exec();
-    song = playlist.parseNextSong( reply );
-    qDebug() << "next steered:" << song;
+    playlist.parseSteer( reply );
+
+    reply = playlist.next( 1 );
+//     qDebug() << "Control URL:" << reply->url().toString();
+    loop.connect( reply, SIGNAL(finished()), SLOT(quit()) );
+    loop.exec();
+    song = playlist.parseNext( reply ).first.first();
+//     qDebug() << "next steered:" << song;
     QVERIFY( !song.id().isEmpty() );
     QVERIFY( !song.title().isEmpty() );
 
     // GET NEXT
-    controls.clear();
-//     controls.append( DynamicPlaylist::DynamicControl( DynamicPlaylist::SteerDescription, QLatin1String( "harp^2" ) ) ); // TODO API gives error atm
-    controls.append( DynamicPlaylist::DynamicControl( DynamicPlaylist::Ban, QLatin1String( "artist" ) ) );
-    controls.append( DynamicPlaylist::DynamicControl( DynamicPlaylist::Ban, QLatin1String( "song" ) ) );
-    reply = playlist.fetchNextSong( controls );
-    qDebug() << "Control URL:" << reply->url().toString();
+    steering.clear();
+    steering.append( DynamicPlaylist::PlaylistParamData( Echonest::DynamicPlaylist::TargetLoudness, QLatin1String( ".9" ) ) );
+    steering.append( DynamicPlaylist::PlaylistParamData( Echonest::DynamicPlaylist::MoreLikeThis, QLatin1String( "last" ) ) );
+
+    reply = playlist.steer( steering );
     loop.connect( reply, SIGNAL(finished()), SLOT(quit()) );
     loop.exec();
-    song = playlist.parseNextSong( reply );
-    qDebug() << "next steered:" << song;
+    playlist.parseSteer( reply );
+
+    playlist.next();
+
+    reply = playlist.next( 1 );
+//     qDebug() << "Control URL:" << reply->url().toString();
+    loop.connect( reply, SIGNAL(finished()), SLOT(quit()) );
+    loop.exec();
+    song = playlist.parseNext( reply ).first.first();
+//     qDebug() << "next steered:" << song;
     QVERIFY( !song.id().isEmpty() );
     QVERIFY( !song.title().isEmpty() );
 
-    // GET INFO
-    reply = playlist.fetchSessionInfo();
+    // GET INFO TODO
+    /*reply = playlist.fetchSessionInfo();
     qDebug() << "session info URL:" << reply->url().toString();
     loop.connect( reply, SIGNAL(finished()), SLOT(quit()) );
     loop.exec();
@@ -307,25 +335,131 @@
     QVERIFY( !info.session_id.isEmpty() );
 
     QVERIFY( !song.id().isEmpty() );
-    QVERIFY( !song.title().isEmpty() );
+    QVERIFY( !song.title().isEmpty() );*/
     QByteArray oldId = playlist.sessionId();
     // now reset it
     p.clear();
     p.append( DynamicPlaylist::PlaylistParamData( Echonest::DynamicPlaylist::Type, Echonest::DynamicPlaylist::ArtistRadioType ) );
     p.append( DynamicPlaylist::PlaylistParamData( Echonest::DynamicPlaylist::Artist, QLatin1String( "pink floyd" ) ) );
-    reply = playlist.start( p );
+    reply = playlist.create( p );
     qDebug() << reply->url().toString();
 
     loop.connect( reply, SIGNAL(finished()), SLOT(quit()) );
     loop.exec();
-    song = playlist.parseNextSong( reply );
-    qDebug() << "new:" << song << song.artistFamiliarity() << song.artistHotttnesss();
+    playlist.parseCreate( reply );
+
+    reply = playlist.next();
+    loop.connect( reply, SIGNAL(finished()), SLOT(quit()) );
+    loop.exec();
+
+    song = playlist.parseNext( reply ).first.first();
+//     qDebug() << "new:" << song << song.artistFamiliarity() << song.artistHotttnesss();
 
     QVERIFY( !song.id().isEmpty() );
     QVERIFY( !song.title().isEmpty() );
     QVERIFY( song.artistHotttnesss() == -1 ); // make sure we are in a new playlist, and we didn't ask for this info so it shouldn't be there
     QVERIFY( song.artistFamiliarity() == -1 ); // make sure we are in a new playlist, and we didn't ask for this info so it shouldn't be there
 
+    reply = playlist.deleteSession();
+
+    loop.connect( reply, SIGNAL(finished()), SLOT(quit()) );
+    loop.exec();
+
+    playlist.parseDeleteSession(reply);
+    Q_ASSERT(playlist.sessionId().isEmpty());
+
+}
+
+void PlaylistTest::testNewDynamicAPI()
+{
+    DynamicPlaylist::PlaylistParams p;
+    p.append( DynamicPlaylist::PlaylistParamData( Echonest::DynamicPlaylist::Artist, QLatin1String( "frightened rabbit" ) ) );
+    p.append( DynamicPlaylist::PlaylistParamData( Echonest::DynamicPlaylist::Artist, QLatin1String( "wilco" ) ) );
+    p.append( DynamicPlaylist::PlaylistParamData( Echonest::DynamicPlaylist::Artist, QLatin1String( "the tallest man on earth" ) ) );
+    p.append( DynamicPlaylist::PlaylistParamData( Echonest::DynamicPlaylist::Artist, QLatin1String( "noah and the whale" ) ) );
+    p.append( DynamicPlaylist::PlaylistParamData( Echonest::DynamicPlaylist::ArtistMaxFamiliarity, QLatin1String( ".4" ) ) );
+    p.append( DynamicPlaylist::PlaylistParamData( Echonest::DynamicPlaylist::Key, QLatin1String( "3" ) ) );
+    p.append( DynamicPlaylist::PlaylistParamData( Echonest::DynamicPlaylist::Type, Echonest::DynamicPlaylist::ArtistRadioType ) );
+
+    DynamicPlaylist playlist;
+    QNetworkReply* reply = playlist.create( p );
+
+//     qDebug() << reply->url().toString();
+    QCOMPARE( reply->url().toString(), QLatin1String( "http://developer.echonest.com/api/v4/playlist/dynamic/create?api_key=JGJCRKWLXLBZIFAZB&format=xml&artist=frightened+rabbit&artist=wilco&artist=the+tallest+man+on+earth&artist=noah+and+the+whale&artist_max_familiarity=.4&key=3&type=artist-radio" ) );
+
+    QEventLoop loop;
+    loop.connect( reply, SIGNAL(finished()), SLOT(quit()) );
+    loop.exec();
+    playlist.parseCreate( reply );
+
+    reply = playlist.next( 2 );
+
+//     qDebug() << reply->url().toString();
+    QCOMPARE( reply->url().toString(), QString( QLatin1String( "http://developer.echonest.com/api/v4/playlist/dynamic/next?api_key=JGJCRKWLXLBZIFAZB&format=xml&session_id=%1&results=2&lookahead=0" ) ).arg( QString::fromLatin1( playlist.sessionId() ) ) );
+    loop.connect( reply, SIGNAL(finished()), SLOT(quit()) );
+    loop.exec();
+
+    QPair< SongList, SongList > ret;
+    ret = playlist.parseNext( reply );
+
+    QCOMPARE( ret.first.size(), 2 );
+    QCOMPARE( ret.second.size(), 0 );
+
+    QVERIFY( !ret.first.at( 0 ).id().isNull() );
+    QVERIFY( !ret.first.at( 0 ).title().isNull() );
+    QVERIFY( !ret.first.at( 1 ).id().isNull() );
+    QVERIFY( !ret.first.at( 1 ).title().isNull() );
+
+    DynamicPlaylist::DynamicFeedback feedback;
+    feedback.append( DynamicPlaylist::DynamicFeedbackParamData( DynamicPlaylist::FavoriteArtist, "last" ) );
+    feedback.append( DynamicPlaylist::DynamicFeedbackParamData( DynamicPlaylist::FavoriteSong, "last" ) );
+    reply = playlist.feedback( feedback );
+
+//     qDebug() << reply->url().toString();
+    QString u = QString::fromUtf8( "http://developer.echonest.com/api/v4/playlist/dynamic/feedback?api_key=JGJCRKWLXLBZIFAZB&format=xml&session_id=%1&favorite_artist=last&favorite_song=last" );
+    QCOMPARE( reply->url().toString(), u.arg( QString::fromUtf8( playlist.sessionId() ) ) );
+    loop.connect( reply, SIGNAL(finished()), SLOT(quit()) );
+    loop.exec();
+    playlist.parseFeedback( reply );
+
+    DynamicPlaylist::PlaylistParams steering;
+    steering.append( DynamicPlaylist::PlaylistParamData( Echonest::DynamicPlaylist::MoreLikeThis, QLatin1String( "SONRAMP13775DE8214^4" ) ) );
+    steering.append( DynamicPlaylist::PlaylistParamData( Echonest::DynamicPlaylist::Mood, QLatin1String( "happy^2" ) ) );
+
+    reply = playlist.steer( steering );
+
+//     qDebug() << reply->url().toString();
+    u = QString::fromUtf8( "http://developer.echonest.com/api/v4/playlist/dynamic/steer?api_key=JGJCRKWLXLBZIFAZB&format=xml&session_id=%1&more_like_this=SONRAMP13775DE8214^4&mood=happy^2" );
+    QCOMPARE( reply->url().toString(), u.arg( QString::fromUtf8( playlist.sessionId() ) ) );
+    loop.connect( reply, SIGNAL(finished()), SLOT(quit()) );
+    loop.exec();
+    playlist.parseSteer( reply );
+
+    reply = playlist.next( 3, 3 );
+
+//     qDebug() << reply->url().toString();
+    u = QString::fromUtf8( "http://developer.echonest.com/api/v4/playlist/dynamic/next?api_key=JGJCRKWLXLBZIFAZB&format=xml&session_id=%1&results=3&lookahead=3" );
+    QCOMPARE( reply->url().toString(), u.arg( QString::fromUtf8( playlist.sessionId() ) ) );
+    loop.connect( reply, SIGNAL(finished()), SLOT(quit()) );
+    loop.exec();
+
+    ret = playlist.parseNext( reply );
+
+    QCOMPARE( ret.first.size(), 3 );
+    QCOMPARE( ret.second.size(), 3 );
+
+    QVERIFY( !ret.first.at( 0 ).id().isNull() );
+    QVERIFY( !ret.first.at( 0 ).title().isNull() );
+    QVERIFY( !ret.first.at( 1 ).id().isNull() );
+    QVERIFY( !ret.first.at( 1 ).title().isNull() );
+    QVERIFY( !ret.first.at( 2 ).id().isNull() );
+    QVERIFY( !ret.first.at( 2 ).title().isNull() );
+    QVERIFY( !ret.second.at( 0 ).id().isNull() );
+    QVERIFY( !ret.second.at( 0 ).title().isNull() );
+    QVERIFY( !ret.second.at( 1 ).id().isNull() );
+    QVERIFY( !ret.second.at( 1 ).title().isNull() );
+    QVERIFY( !ret.second.at( 2 ).id().isNull() );
+    QVERIFY( !ret.second.at( 2 ).title().isNull() );
 }
 
 void PlaylistTest::testDynamicChainXSPF()
@@ -349,7 +483,7 @@
     p.append( DynamicPlaylist::PlaylistParamData( DynamicPlaylist::Limit, true ) );
 
     DynamicPlaylist playlist;
-    QNetworkReply* reply = playlist.start( p );
+    QNetworkReply* reply = playlist.create( p );
 
     qDebug() << reply->url().toString();
 //     QVERIFY( reply->url().toString() == QLatin1String( "http://developer.echonest.com/api/v4/playlist/dynamic?api_key=JGJCRKWLXLBZIFAZB&artist=pink+floyd^-1&artist=the+who&artist=queen&artist=led+zeppelin^2&artist=-the+beatles&type=artist&artist_min_hotttnesss=0.7&artist_max_familiarity=0.3&min_loudness=-10&mode=1&chain_xspf=true&format=xspf&bucket=audio_summary&bucket=song_hotttnesss&bucket=artist_hotttnesss&bucket=artist_familiarity" ) );

libechonest-1.2.0.tar.bz2/tests/PlaylistTest.h -> libechonest-2.0.1.tar.bz2/tests/PlaylistTest.h Changed

libechonest-1.2.0.tar.bz2/tests/SongTest.cpp -> libechonest-2.0.1.tar.bz2/tests/SongTest.cpp Changed

@@ -1,5 +1,5 @@
  /****************************************************************************************
-  * Copyright (c) 2010 Leo Franchi <lfranchi@kde.org>                                    *
+  * Copyright (c) 2010-2012 Leo Franchi <lfranchi@kde.org>                               *
   *                                                                                      *
   * This program is free software; you can redistribute it and/or modify it under        *
   * the terms of the GNU General Public License as published by the Free Software        *
@@ -48,10 +48,10 @@
     QVERIFY( !songs.isEmpty() );
     for(int i = 0; i < songs.size(); i++) {
         Echonest::Song song = songs.value(i);
-        QLatin1String title = ( i == 0 ? QLatin1String( "float on" ) : QLatin1String( "blame it on the tetons" ) );
+        QLatin1String title = QLatin1String( "float on" );
         QCOMPARE( song.title().toLower(), title );
         QCOMPARE( song.artistName().toLower(), QLatin1String( "modest mouse" ) );
-        QCOMPARE( song.artistLocation().location.toLower(), QLatin1String( "issaquah" ) );
+        QCOMPARE( song.artistLocation().location.toLower(), QLatin1String( "issaquah, wa, us" ) );
         QCOMPARE( song.hotttnesss(), -1. );
         qDebug() << song.hotttnesss() << song.artistHotttnesss() << song.artistFamiliarity() << song.artistLocation();
 
@@ -131,7 +131,7 @@
     QVERIFY( songs.size() > 0 );
     QCOMPARE( songs.first().artistName(), QLatin1String( "Bon Iver" ) );
     QCOMPARE( songs.first().artistId(), QByteArray( "ARKDTAM1187FB54026" ) );
-    QCOMPARE( songs.first().title(), QLatin1String( "Flume" ) );
+    QCOMPARE( songs.first().title(), QLatin1String( "01 Flume" ) );
     QCOMPARE( songs.first().id(), QByteArray( "SOJEVHC12A8C13C3E5" ) );
 }

libechonest-1.2.0.tar.bz2/tests/SongTest.h -> libechonest-2.0.1.tar.bz2/tests/SongTest.h Changed

libechonest-1.2.0.tar.bz2/tests/TrackTest.cpp -> libechonest-2.0.1.tar.bz2/tests/TrackTest.cpp Changed

libechonest-1.2.0.tar.bz2/tests/TrackTest.h -> libechonest-2.0.1.tar.bz2/tests/TrackTest.h Changed

libechonest-2.0.1.tar.bz2/tests/test_data/License.txt Added

Overview

Request 271 (accepted)

Request History