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

Remove Twitter integration as the API now requires authentication which 

makes no sense for us.
This commit is contained in:
John Maguire 2012-08-17 11:04:14 +02:00
parent b9278c6c8b
commit 3e696be0d0
4 changed files with 0 additions and 285 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/CMakeLists.txt
View File

@ -283,7 +283,6 @@ set(SOURCES
songinfo/songinfoview.cpp
songinfo/songkickconcerts.cpp
songinfo/songplaystats.cpp
songinfo/twitterartistinfo.cpp
songinfo/ultimatelyricsprovider.cpp
songinfo/ultimatelyricsreader.cpp
@ -541,7 +540,6 @@ set(HEADERS
songinfo/songinfoview.h
songinfo/songkickconcerts.h
songinfo/songplaystats.h
songinfo/twitterartistinfo.h
songinfo/ultimatelyricsprovider.h
songinfo/ultimatelyricsreader.h

2
src/songinfo/artistinfoview.cpp
View File

@ -20,7 +20,6 @@
#include "echonestimages.h"
#include "songinfofetcher.h"
#include "songkickconcerts.h"
#include "twitterartistinfo.h"
#include "widgets/prettyimageview.h"
#ifdef HAVE_LIBLASTFM
@ -34,7 +33,6 @@ ArtistInfoView::ArtistInfoView(QWidget *parent)
fetcher_->AddProvider(new EchoNestBiographies);
fetcher_->AddProvider(new EchoNestImages);
fetcher_->AddProvider(new SongkickConcerts);
fetcher_->AddProvider(new TwitterArtistInfo);
#ifdef HAVE_LIBLASTFM
fetcher_->AddProvider(new EchoNestSimilarArtists);
fetcher_->AddProvider(new EchoNestTags);

233
src/songinfo/twitterartistinfo.cpp
View File

@ -1,233 +0,0 @@
/* This file is part of Clementine.
Copyright 2012, David Sansome <me@davidsansome.com>
Clementine 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 Foundation, either version 3 of the License, or
(at your option) any later version.
Clementine is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with Clementine. If not, see <http://www.gnu.org/licenses/>.
*/
#include "twitterartistinfo.h"
#include <QFile>
#include <QIcon>
#include <QXmlStreamWriter>
#include <echonest/Artist.h>
#include <qjson/parser.h>
#include "core/closure.h"
#include "core/utilities.h"
#include "songinfotextview.h"
const char* TwitterArtistInfo::kTwitterBucket = "id:twitter";
const char* TwitterArtistInfo::kTwitterTimelineUrl =
"https://api.twitter.com/1/statuses/user_timeline.json?"
"include_rts=true&count=10&include_entities=true&screen_name=%1";
TwitterArtistInfo::TwitterArtistInfo()
: network_(this) {
QFile file(":twitter.css");
file.open(QIODevice::ReadOnly);
stylesheet_ = file.readAll();
}
void TwitterArtistInfo::FetchInfo(int id, const Song& metadata) {
Echonest::Artist::SearchParams params;
params.push_back(qMakePair(Echonest::Artist::Name, QVariant(metadata.artist())));
params.push_back(qMakePair(Echonest::Artist::IdSpace, QVariant(kTwitterBucket)));
QNetworkReply* reply = Echonest::Artist::search(params);
NewClosure(reply, SIGNAL(finished()), this, SLOT(ArtistSearchFinished(QNetworkReply*, int)), reply, id);
}
void TwitterArtistInfo::ArtistSearchFinished(QNetworkReply* reply, int id) {
reply->deleteLater();
try {
Echonest::Artists artists = Echonest::Artist::parseSearch(reply);
if (artists.isEmpty()) {
qLog(Debug) << "Failed to find artist in echonest";
return;
}
const Echonest::Artist& artist = artists[0];
QString twitter_id;
foreach (const Echonest::ForeignId& id, artist.foreignIds()) {
if (id.catalog == "twitter") {
twitter_id = id.foreign_id;
break;
}
}
if (twitter_id.isEmpty()) {
qLog(Debug) << "Failed to fetch Twitter foreign id for artist";
return;
}
QStringList split = twitter_id.split(':');
if (split.count() != 3) {
qLog(Debug) << "Funky twitter id:" << twitter_id;
return;
}
FetchUserTimeline(split[2], id);
} catch (Echonest::ParseError& e) {
qLog(Error) << "Error parsing echonest reply:" << e.errorType() << e.what();
}
}
void TwitterArtistInfo::FetchUserTimeline(const QString& twitter_id, int id) {
QUrl url(QString(kTwitterTimelineUrl).arg(twitter_id));
QNetworkReply* reply = network_.get(QNetworkRequest(url));
NewClosure(reply, SIGNAL(finished()), this,
SLOT(UserTimelineRequestFinished(QNetworkReply*, QString, int)), reply, twitter_id, id);
}
namespace {
struct Entity {
int start_index;
int end_index;
QString text;
QUrl url;
bool operator <(const Entity& b) const {
return start_index < b.start_index;
}
};
Entity ParseUrlEntity(const QVariant& u) {
QVariantMap url = u.toMap();
QVariantList indices = url["indices"].toList();
Entity entity;
entity.start_index = indices[0].toInt();
entity.end_index = indices[1].toInt();
entity.text = url["display_url"].toString();
entity.url = QUrl(url["expanded_url"].toString());
return entity;
}
Entity ParseHashtagEntity(const QVariant& h) {
static const char* kTwitterSearchUrl = "https://twitter.com/search/%1";
QVariantMap hashtag = h.toMap();
QVariantList indices = hashtag["indices"].toList();
Entity entity;
entity.start_index = indices[0].toInt();
entity.end_index = indices[1].toInt();
entity.text += "#";
entity.text += hashtag["text"].toString();
entity.url = QUrl(QString(kTwitterSearchUrl).arg(hashtag["text"].toString()));
return entity;
}
Entity ParseMentionEntity(const QVariant& m) {
static const char* kTwitterUserUrl = "https://twitter.com/%1";
QVariantMap mention = m.toMap();
QVariantList indices = mention["indices"].toList();
Entity entity;
entity.start_index = indices[0].toInt();
entity.end_index = indices[1].toInt();
entity.text += "@";
entity.text += mention["screen_name"].toString();
entity.url = QUrl(QString(kTwitterUserUrl).arg(mention["screen_name"].toString()));
return entity;
}
static const char* kTweetClass = "tweet";
static const char* kAlternateClass = "tweet alternate";
QString GenerateHtmlForTweetStream(const QVariantList& tweets) {
QString html;
QXmlStreamWriter writer(&html);
bool alt = true;
foreach (const QVariant& v, tweets) {
QVariantMap tweet = v.toMap();
QString text = tweet["text"].toString();
QVariantMap es = tweet["entities"].toMap();
QVector<Entity> entities;
QVariantList urls = es["urls"].toList();
foreach (const QVariant& u, urls) {
entities.push_back(ParseUrlEntity(u));
}
QVariantList hashtags = es["hashtags"].toList();
foreach (const QVariant& h, hashtags) {
entities.push_back(ParseHashtagEntity(h));
}
QVariantList mentions = es["user_mentions"].toList();
foreach (const QVariant& m, mentions) {
entities.push_back(ParseMentionEntity(m));
}
qSort(entities);
writer.writeStartElement("div");
if ((alt = !alt)) {
writer.writeAttribute("class", kAlternateClass);
} else {
writer.writeAttribute("class", kTweetClass);
}
int offset = 0;
foreach (const Entity& e, entities) {
// Write all the plain text up to this entity.
writer.writeCharacters(Utilities::DecodeHtmlEntities(
text.mid(offset, e.start_index - offset)));
// Set the next starting position for reading more plain text.
offset = e.end_index;
// Write the entity (eg. a URL, a link to a hashtag search or a link to a
// user's stream from a @mention.
writer.writeStartElement("a");
writer.writeAttribute("href", e.url.toEncoded());
writer.writeCharacters(e.text);
writer.writeEndElement();
}
writer.writeCharacters(text.mid(offset));
writer.writeEndElement();
}
return html;
}
}
void TwitterArtistInfo::UserTimelineRequestFinished(
QNetworkReply* reply, const QString& twitter_id, int id) {
reply->deleteLater();
QJson::Parser parser;
bool ok = false;
QVariant result = parser.parse(reply, &ok);
if (!ok) {
qLog(Error) << "Error parsing Twitter reply";
return;
}
CollapsibleInfoPane::Data data;
data.type_ = CollapsibleInfoPane::Data::Type_Biography;
data.id_ = "twitter/" + twitter_id;
data.title_ = QString("Twitter (%1)").arg(twitter_id);
data.icon_ = QIcon(":providers/twitter.png");
QString html = GenerateHtmlForTweetStream(result.toList());
SongInfoTextView* text_view = new SongInfoTextView;
text_view->document()->setDefaultStyleSheet(stylesheet_);
text_view->SetHtml(html);
data.contents_ = text_view;
emit InfoReady(id, data);
emit Finished(id);
}

48
src/songinfo/twitterartistinfo.h
View File

@ -1,48 +0,0 @@
/* This file is part of Clementine.
Copyright 2012, David Sansome <me@davidsansome.com>
Clementine 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 Foundation, either version 3 of the License, or
(at your option) any later version.
Clementine is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with Clementine. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef TWITTERARTISTINFO_H
#define TWITTERARTISTINFO_H
#include "songinfoprovider.h"
#include "core/network.h"
class TwitterArtistInfo : public SongInfoProvider {
Q_OBJECT
public:
TwitterArtistInfo();
void FetchInfo(int id, const Song& metadata);
private slots:
void ArtistSearchFinished(QNetworkReply* reply, int id);
void UserTimelineRequestFinished(
QNetworkReply* reply, const QString& twitter_id, int id);
private:
void FetchUserTimeline(const QString& twitter_id, int id);
NetworkAccessManager network_;
QString stylesheet_;
static const char* kTwitterBucket;
static const char* kTwitterTimelineUrl;
};
#endif