Funkwhale
/
Clementine-audio-player-Mac-Linux-Windows
mirror of https://github.com/clementine-player/Clementine
1
0
Fork 0
Code Issues Releases Wiki Activity

Upgrade to libechonest 0.1.1

This commit is contained in:
David Sansome 2010-10-04 21:49:56 +00:00
parent 0071cb9856
commit 6f5ece9964
5 changed files with 74 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
3rdparty/libechonest/Artist.cpp vendored
View File

@ -31,6 +31,12 @@ Echonest::Artist::Artist( const QByteArray& id, const QString& name )
d->name = name;
}
Echonest::Artist::Artist(const QString& name)
: d( new ArtistData )
{
setName( name );
}
Echonest::Artist::Artist(const Echonest::Artist& other)
: d( other.d )
{}

2
3rdparty/libechonest/Artist.h vendored
View File

@ -108,6 +108,8 @@ namespace Echonest{
Artist();
Artist( const QByteArray& id, const QString& name );
explicit Artist( const QString& name );
Artist( const Artist& other );
Artist& operator=( const Artist& artist );
~Artist();

37
3rdparty/libechonest/Config.cpp vendored
View File

@ -47,17 +47,48 @@ Echonest::ParseError::ParseError(Echonest::ErrorType error): exception()
Echonest::ParseError::~ParseError() throw()
{}
Echonest::ErrorType Echonest::ParseError::errorType() const
Echonest::ErrorType Echonest::ParseError::errorType() const throw()
{
return type;
}
void Echonest::ParseError::setNetworkError( QNetworkReply::NetworkError error )
void Echonest::ParseError::setNetworkError( QNetworkReply::NetworkError error ) throw()
{
nError = error;
}
QNetworkReply::NetworkError Echonest::ParseError::networkError() const
const char* Echonest::ParseError::what() const throw()
{
switch( type )
{
case UnknownError:
return "Unknown Echo Nest Error";
case NoError:
return "No Error";
case MissingAPIKey:
return "Missing Echo Nest API Key";
case NotAllowed:
return "Method not allowed";
case RateLimitExceeded:
return "Rate limit exceeded";
case MissingParameter:
return "Missing parameter";
case InvalidParameter:
return "Invalid parameter";
case UnfinishedQuery:
return "Unfinished query object";
case EmptyResult:
return "No results";
case NetworkError:
return "Network Error";
case UnknownParseError:
return "Unknown Parse Error";
}
return "";
}
QNetworkReply::NetworkError Echonest::ParseError::networkError() const throw()
{
return nError;
}

9
3rdparty/libechonest/Config.h vendored
View File

@ -56,21 +56,22 @@ namespace Echonest{
NetworkError = 9
};
class ParseError : public std::exception
class ECHONEST_EXPORT ParseError : public std::exception
{
public:
ParseError( ErrorType error );
virtual ~ParseError() throw();
ErrorType errorType() const;
ErrorType errorType() const throw();
/**
* If the ErrorType is NetworkError, this value contains the QNetworkReply
* error code that was returned.
*/
void setNetworkError( QNetworkReply::NetworkError error );
QNetworkReply::NetworkError networkError() const;
void setNetworkError( QNetworkReply::NetworkError error ) throw();
QNetworkReply::NetworkError networkError() const throw();
virtual const char* what() const throw ();
private:
ErrorType type;
QNetworkReply::NetworkError nError;

53
3rdparty/libechonest/Parsing.cpp vendored
View File

@ -25,11 +25,12 @@
void Echonest::Parser::checkForErrors( QNetworkReply* reply ) throw( Echonest::ParseError )
{
if( !reply )
throw new ParseError( Echonest::UnknownError );
if( !reply->isFinished() )
throw new ParseError( Echonest::UnfinishedQuery );
throw ParseError( Echonest::UnknownError );
// TODO sometimes this returns false when it shouldn't be? what's going on..
// if( !reply->isFinished() )
// throw ParseError( Echonest::UnfinishedQuery );
//
if( reply->error() != QNetworkReply::NoError ) {
ParseError* err = new ParseError( Echonest::NetworkError );
err->setNetworkError( reply->error() );
@ -43,11 +44,11 @@ void Echonest::Parser::readStatus( QXmlStreamReader& xml ) throw( Echonest::Pars
if( xml.readNextStartElement() ) {
// sanity checks
if( xml.name() != QLatin1String( "response" ) )
throw new ParseError( UnknownParseError );
throw ParseError( UnknownParseError );
if( xml.readNextStartElement() ) {
if( xml.name() != "status" )
throw new ParseError( UnknownParseError );
throw ParseError( UnknownParseError );
// only check the error code for now
xml.readNextStartElement();
@ -61,14 +62,14 @@ void Echonest::Parser::readStatus( QXmlStreamReader& xml ) throw( Echonest::Pars
xml.readNextStartElement();
if( code != Echonest::NoError ) {
throw new ParseError( code );
throw ParseError( code );
}
xml.readNext();
}
} else {
throw new ParseError( UnknownParseError );
throw ParseError( UnknownParseError );
}
}
@ -87,7 +88,7 @@ QVector< Echonest::Song > Echonest::Parser::parseSongList( QXmlStreamReader& xml
Echonest::Song Echonest::Parser::parseSong( QXmlStreamReader& xml ) throw( Echonest::ParseError )
{
if( xml.name() != "song" )
throw new ParseError( Echonest::UnknownParseError );
throw ParseError( Echonest::UnknownParseError );
Echonest::Song song;
while( !( xml.name() == "song" && xml.tokenType() == QXmlStreamReader::EndElement ) ) {
@ -125,7 +126,7 @@ Echonest::Song Echonest::Parser::parseSong( QXmlStreamReader& xml ) throw( Echon
Echonest::Track Echonest::Parser::parseTrack( QXmlStreamReader& xml ) throw( Echonest::ParseError )
{
if( xml.name() != "track" ) {
throw new ParseError( Echonest::UnknownParseError );
throw ParseError( Echonest::UnknownParseError );
}
Echonest::Track track;
@ -165,7 +166,7 @@ Echonest::Track Echonest::Parser::parseTrack( QXmlStreamReader& xml ) throw( Ech
Echonest::AudioSummary Echonest::Parser::parseAudioSummary( QXmlStreamReader& xml ) throw( Echonest::ParseError )
{
if( xml.name() != "audio_summary" ) {
throw new ParseError( Echonest::UnknownParseError );
throw ParseError( Echonest::UnknownParseError );
}
Echonest::AudioSummary summary;
@ -196,14 +197,14 @@ Echonest::Artists Echonest::Parser::parseArtists( QXmlStreamReader& xml )
{
// we expect to be in an <artists> start element
if( xml.name() != "artists" || !xml.isStartElement() )
throw new ParseError( Echonest::UnknownParseError );
throw ParseError( Echonest::UnknownParseError );
xml.readNextStartElement();
Echonest::Artists artists;
while( xml.name() != "artists" || !xml.isEndElement() ) {
if( xml.name() != "artist" || !xml.isStartElement() )
throw new Echonest::ParseError( Echonest::UnknownParseError );
throw Echonest::ParseError( Echonest::UnknownParseError );
Echonest::Artist artist;
while( xml.name() != "artist" || !xml.isEndElement() ) {
parseArtistInfo( xml, artist );
@ -287,7 +288,7 @@ void Echonest::Parser::parseArtistInfo( QXmlStreamReader& xml, Echonest::Artist&
void Echonest::Parser::parseAudio( QXmlStreamReader& xml, Echonest::Artist& artist ) throw( Echonest::ParseError )
{
if( xml.name() != "audio" || xml.tokenType() != QXmlStreamReader::StartElement )
throw new Echonest::ParseError( Echonest::UnknownParseError );
throw Echonest::ParseError( Echonest::UnknownParseError );
xml.readNextStartElement();
Echonest::AudioList audioList;
@ -323,7 +324,7 @@ void Echonest::Parser::parseAudio( QXmlStreamReader& xml, Echonest::Artist& arti
void Echonest::Parser::parseBiographies( QXmlStreamReader& xml, Echonest::Artist& artist ) throw( Echonest::ParseError )
{
if( xml.name() != "biographies" || xml.tokenType() != QXmlStreamReader::StartElement )
throw new Echonest::ParseError( Echonest::UnknownParseError );
throw Echonest::ParseError( Echonest::UnknownParseError );
xml.readNextStartElement();
Echonest::BiographyList bios;
@ -352,7 +353,7 @@ void Echonest::Parser::parseBiographies( QXmlStreamReader& xml, Echonest::Artist
void Echonest::Parser::parseImages( QXmlStreamReader& xml, Echonest::Artist& artist ) throw( Echonest::ParseError )
{
if( xml.name() != "images" || xml.tokenType() != QXmlStreamReader::StartElement )
throw new Echonest::ParseError( Echonest::UnknownParseError );
throw Echonest::ParseError( Echonest::UnknownParseError );
xml.readNextStartElement();
Echonest::ArtistImageList imgs;
@ -376,9 +377,9 @@ void Echonest::Parser::parseImages( QXmlStreamReader& xml, Echonest::Artist& art
void Echonest::Parser::parseNewsOrBlogs( QXmlStreamReader& xml, Echonest::Artist& artist, bool news ) throw( Echonest::ParseError )
{
if( news && ( xml.name() != "news" || xml.tokenType() != QXmlStreamReader::StartElement ) )
throw new Echonest::ParseError( Echonest::UnknownParseError );
throw Echonest::ParseError( Echonest::UnknownParseError );
else if( !news && ( xml.name() != "blogs" || xml.tokenType() != QXmlStreamReader::StartElement ) )
throw new Echonest::ParseError( Echonest::UnknownParseError );
throw Echonest::ParseError( Echonest::UnknownParseError );
xml.readNextStartElement();
Echonest::NewsList newsList;
@ -413,7 +414,7 @@ void Echonest::Parser::parseNewsOrBlogs( QXmlStreamReader& xml, Echonest::Artist
void Echonest::Parser::parseReviews( QXmlStreamReader& xml, Echonest::Artist& artist ) throw( Echonest::ParseError )
{
if( xml.name() != "reviews" || xml.tokenType() != QXmlStreamReader::StartElement )
throw new Echonest::ParseError( Echonest::UnknownParseError );
throw Echonest::ParseError( Echonest::UnknownParseError );
xml.readNextStartElement();
Echonest::ReviewList reviews;
@ -447,7 +448,7 @@ void Echonest::Parser::parseReviews( QXmlStreamReader& xml, Echonest::Artist& ar
void Echonest::Parser::parseArtistSong( QXmlStreamReader& xml, Echonest::Artist& artist ) throw( Echonest::ParseError )
{
if( xml.name() != "songs" || xml.tokenType() != QXmlStreamReader::StartElement )
throw new Echonest::ParseError( Echonest::UnknownParseError );
throw Echonest::ParseError( Echonest::UnknownParseError );
xml.readNextStartElement();
Echonest::SongList songs;
@ -472,7 +473,7 @@ void Echonest::Parser::parseArtistSong( QXmlStreamReader& xml, Echonest::Artist&
void Echonest::Parser::parseTerms( QXmlStreamReader& xml, Echonest::Artist& artist ) throw( Echonest::ParseError )
{
if( xml.name() != "terms" || xml.tokenType() != QXmlStreamReader::StartElement )
throw new Echonest::ParseError( Echonest::UnknownParseError );
throw Echonest::ParseError( Echonest::UnknownParseError );
artist.setTerms( parseTermList( xml ) );
}
@ -480,7 +481,7 @@ void Echonest::Parser::parseTerms( QXmlStreamReader& xml, Echonest::Artist& arti
void Echonest::Parser::parseUrls( QXmlStreamReader& xml, Echonest::Artist& artist ) throw( Echonest::ParseError )
{
if( xml.name() != "urls" || xml.tokenType() != QXmlStreamReader::StartElement )
throw new Echonest::ParseError( Echonest::UnknownParseError );
throw Echonest::ParseError( Echonest::UnknownParseError );
xml.readNextStartElement();
xml.readNextStartElement();
@ -507,7 +508,7 @@ void Echonest::Parser::parseUrls( QXmlStreamReader& xml, Echonest::Artist& artis
void Echonest::Parser::parseVideos( QXmlStreamReader& xml, Echonest::Artist& artist ) throw( Echonest::ParseError )
{
if( xml.name() != "video" || xml.tokenType() != QXmlStreamReader::StartElement )
throw new Echonest::ParseError( Echonest::UnknownParseError );
throw Echonest::ParseError( Echonest::UnknownParseError );
Echonest::VideoList videos;
while( xml.name() == "video" && xml.isStartElement() ) {
@ -540,7 +541,7 @@ void Echonest::Parser::parseVideos( QXmlStreamReader& xml, Echonest::Artist& art
Echonest::TermList Echonest::Parser::parseTermList( QXmlStreamReader& xml )
{
if( xml.name() != "terms" || xml.tokenType() != QXmlStreamReader::StartElement )
throw new Echonest::ParseError( Echonest::UnknownParseError );
throw Echonest::ParseError( Echonest::UnknownParseError );
Echonest::TermList terms;
while( xml.name() == "terms" && xml.isStartElement() ) {
@ -572,7 +573,7 @@ void Echonest::Parser::parseForeignIds( QXmlStreamReader& xml, Echonest::Artist&
Echonest::License Echonest::Parser::parseLicense( QXmlStreamReader& xml ) throw( Echonest::ParseError )
{
if( xml.name() != "license" || xml.tokenType() != QXmlStreamReader::StartElement )
throw new Echonest::ParseError( Echonest::UnknownParseError );
throw Echonest::ParseError( Echonest::UnknownParseError );
Echonest::License license;
while( xml.name() != "license" || xml.tokenType() != QXmlStreamReader::EndElement ) {
@ -593,7 +594,7 @@ Echonest::License Echonest::Parser::parseLicense( QXmlStreamReader& xml ) throw(
QByteArray Echonest::Parser::parsePlaylistSessionId( QXmlStreamReader& xml ) throw( ParseError )
{
if( xml.name() != "session_id" || xml.tokenType() != QXmlStreamReader::StartElement )
throw new Echonest::ParseError( Echonest::UnknownParseError );
throw Echonest::ParseError( Echonest::UnknownParseError );
QByteArray sessionId = xml.readElementText().toLatin1();
xml.readNext(); //read to next start element