-- Clementine-1.3.1/CMakeLists.txt

++ Clementine-1.3.1/CMakeLists.txt

-- Clementine-1.3.1/src/CMakeLists.txt

++ Clementine-1.3.1/src/CMakeLists.txt

-- Clementine-1.3.1/src/main.cpp

++ Clementine-1.3.1/src/main.cpp

  QSslSocket::addDefaultCaCertificates(

  QSslSocket::addDefaultCaCertificates(QSslCertificate::fromPath(

      QSslCertificate::fromPath(":/Equifax_Secure_Certificate_Authority.pem", QSsl::Pem));

      ":/Equifax_Secure_Certificate_Authority.pem", QSsl::Pem));

-- Clementine-1.3.1/src/songinfo/artistinfoview.cpp

++ Clementine-1.3.1/src/songinfo/artistinfoview.cpp

-- Clementine-1.3.1/src/songinfo/echonestbiographies.cpp

++ Clementine-1.3.1/src/songinfo/echonestbiographies.cpp

/* This file is part of Clementine.

++ Clementine-1.3.1/src/songinfo/echonestbiographies.h

   Copyright 2010, 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 "echonestbiographies.h"

#include <memory>

#include <echonest/Artist.h>

#include "songinfotextview.h"

#include "core/logging.h"

#include "ui/iconloader.h"

struct EchoNestBiographies::Request {

  Request(int id) : id_(id), artist_(new Echonest::Artist) {}

  int id_;

  std::unique_ptr<Echonest::Artist> artist_;

};

EchoNestBiographies::EchoNestBiographies() {

  site_relevance_["wikipedia"] = 100;

  site_relevance_["lastfm"] = 60;

  site_relevance_["amazon"] = 30;

  site_icons_["amazon"] = IconLoader::Load("amazon", IconLoader::Provider);

  site_icons_["aol"] = IconLoader::Load("aol", IconLoader::Provider);

  site_icons_["cdbaby"] = IconLoader::Load("cdbaby", IconLoader::Provider);

  site_icons_["lastfm"] = IconLoader::Load("as", IconLoader::Lastfm);

  site_icons_["mog"] = IconLoader::Load("mog", IconLoader::Provider);

  site_icons_["mtvmusic"] = IconLoader::Load("mtvmusic", IconLoader::Provider);

  site_icons_["myspace"] = IconLoader::Load("myspace", IconLoader::Provider);

  site_icons_["wikipedia"] = IconLoader::Load("wikipedia", IconLoader::Provider);

}

void EchoNestBiographies::FetchInfo(int id, const Song& metadata) {

  std::shared_ptr<Request> request(new Request(id));

  request->artist_->setName(metadata.artist());

  QNetworkReply* reply = request->artist_->fetchBiographies();

  connect(reply, SIGNAL(finished()), SLOT(RequestFinished()));

  requests_[reply] = request;

}

void EchoNestBiographies::RequestFinished() {

  QNetworkReply* reply = qobject_cast<QNetworkReply*>(sender());

  if (!reply || !requests_.contains(reply)) return;

  reply->deleteLater();

  RequestPtr request = requests_.take(reply);

  try {

    request->artist_->parseProfile(reply);

  }

  catch (Echonest::ParseError e) {

    qLog(Warning) << "Error parsing echonest reply:" << e.errorType()

                  << e.what();

  }

  QSet<QString> already_seen;

  for (const Echonest::Biography& bio : request->artist_->biographies()) {

    QString canonical_site = bio.site().toLower();

    canonical_site.replace(QRegExp("[^a-z]"), "");

    if (already_seen.contains(canonical_site)) continue;

    already_seen.insert(canonical_site);

    CollapsibleInfoPane::Data data;

    data.id_ = "echonest/bio/" + bio.site();

    data.title_ = tr("Biography from %1").arg(bio.site());

    data.type_ = CollapsibleInfoPane::Data::Type_Biography;

    if (site_relevance_.contains(canonical_site))

      data.relevance_ = site_relevance_[canonical_site];

    if (site_icons_.contains(canonical_site))

      data.icon_ = site_icons_[canonical_site];

    SongInfoTextView* editor = new SongInfoTextView;

    QString text;

    // Add a link to the bio webpage at the top if we have one

    if (!bio.url().isEmpty()) {

      QString bio_url = bio.url().toEncoded();

      if (bio.site() == "facebook") {

        bio_url.replace("graph.facebook.com", "www.facebook.com");

      }

      text += "<p><a href=\"" + bio_url + "\">" +

              tr("Open in your browser") + "</a></p>";

    }

    text += bio.text();

    if (bio.site() == "last.fm") {

      // Echonest lost formatting and it seems there is currently no plans on

      // Echonest side for changing this.

      // But with last.fm, we can guess newlines: "  " corresponds to a newline

      // (this seems to be because on last.fm' website, extra blank is inserted

      // before <br /> tag, and this blank is kept).

      // This is tricky, but this make the display nicer for last.fm

      // biographies.

      text.replace("  ", "<p>");

    }

    editor->SetHtml(text);

    data.contents_ = editor;

    emit InfoReady(request->id_, data);

  }

  emit Finished(request->id_);

}

-- Clementine-1.3.1/src/songinfo/echonestbiographies.h

/* This file is part of Clementine.

++ Clementine-1.3.1/src/songinfo/echonestsimilarartists.cpp

   Copyright 2010, 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 ECHONESTBIOGRAPHIES_H

#define ECHONESTBIOGRAPHIES_H

#include <memory>

#include "songinfoprovider.h"

class QNetworkReply;

class EchoNestBiographies : public SongInfoProvider {

  Q_OBJECT

 public:

  EchoNestBiographies();

  void FetchInfo(int id, const Song& metadata);

 private slots:

  void RequestFinished();

 private:

  QMap<QString, int> site_relevance_;

  QMap<QString, QIcon> site_icons_;

  struct Request;

  typedef std::shared_ptr<Request> RequestPtr;

  QMap<QNetworkReply*, RequestPtr> requests_;

};

#endif  // ECHONESTBIOGRAPHIES_H

-- Clementine-1.3.1/src/songinfo/echonestsimilarartists.cpp

/* This file is part of Clementine.

++ Clementine-1.3.1/src/songinfo/echonestsimilarartists.h

   Copyright 2010, 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 "echonestsimilarartists.h"

#include "tagwidget.h"

#include "core/logging.h"

#include "ui/iconloader.h"

#include <echonest/Artist.h>

Q_DECLARE_METATYPE(QVector<QString>);

void EchoNestSimilarArtists::FetchInfo(int id, const Song& metadata) {

  using Echonest::Artist;

  Artist::SearchParams params;

  params << Artist::SearchParamEntry(Artist::Name, metadata.artist());

  params << Artist::SearchParamEntry(Artist::MinHotttnesss, 0.5);

  QNetworkReply* reply = Echonest::Artist::fetchSimilar(params);

  connect(reply, SIGNAL(finished()), SLOT(RequestFinished()));

  requests_[reply] = id;

}

void EchoNestSimilarArtists::RequestFinished() {

  QNetworkReply* reply = qobject_cast<QNetworkReply*>(sender());

  if (!reply || !requests_.contains(reply)) return;

  reply->deleteLater();

  int id = requests_.take(reply);

  Echonest::Artists artists;

  try {

    artists = Echonest::Artist::parseSimilar(reply);

  }

  catch (Echonest::ParseError e) {

    qLog(Warning) << "Error parsing echonest reply:" << e.errorType()

                  << e.what();

  }

  if (!artists.isEmpty()) {

    CollapsibleInfoPane::Data data;

    data.id_ = "echonest/similarartists";

    data.title_ = tr("Similar artists");

    data.type_ = CollapsibleInfoPane::Data::Type_Similar;

    data.icon_ = IconLoader::Load("echonest", IconLoader::Provider);

    TagWidget* widget = new TagWidget(TagWidget::Type_Artists);

    data.contents_ = widget;

    widget->SetIcon(IconLoader::Load("x-clementine-artist", IconLoader::Base));

    for (const Echonest::Artist& artist : artists) {

      widget->AddTag(artist.name());

      if (widget->count() >= 10) break;

    }

    emit InfoReady(id, data);

  }

  emit Finished(id);

}

-- Clementine-1.3.1/src/songinfo/echonestsimilarartists.h

/* This file is part of Clementine.

++ Clementine-1.3.1/src/songinfo/echonesttags.cpp

   Copyright 2010, 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 ECHONESTSIMILARARTISTS_H

#define ECHONESTSIMILARARTISTS_H

#include "songinfoprovider.h"

class QNetworkReply;

class EchoNestSimilarArtists : public SongInfoProvider {

  Q_OBJECT

 public:

  void FetchInfo(int id, const Song& metadata);

 private slots:

  void RequestFinished();

 private:

  QMap<QNetworkReply*, int> requests_;

};

#endif  // ECHONESTSIMILARARTISTS_H

-- Clementine-1.3.1/src/songinfo/echonesttags.cpp

/* This file is part of Clementine.

++ Clementine-1.3.1/src/songinfo/echonesttags.h

   Copyright 2010, 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 "echonesttags.h"

#include <memory>

#include <echonest/Artist.h>

#include "tagwidget.h"

#include "core/logging.h"

#include "ui/iconloader.h"

struct EchoNestTags::Request {

  Request(int id) : id_(id), artist_(new Echonest::Artist) {}

  int id_;

  std::unique_ptr<Echonest::Artist> artist_;

};

void EchoNestTags::FetchInfo(int id, const Song& metadata) {

  std::shared_ptr<Request> request(new Request(id));

  request->artist_->setName(metadata.artist());

  QNetworkReply* reply = request->artist_->fetchTerms();

  connect(reply, SIGNAL(finished()), SLOT(RequestFinished()));

  requests_[reply] = request;

}

void EchoNestTags::RequestFinished() {

  QNetworkReply* reply = qobject_cast<QNetworkReply*>(sender());

  if (!reply || !requests_.contains(reply)) return;

  reply->deleteLater();

  RequestPtr request = requests_.take(reply);

  try {

    request->artist_->parseProfile(reply);

  }

  catch (Echonest::ParseError e) {

    qLog(Warning) << "Error parsing echonest reply:" << e.errorType()

                  << e.what();

  }

  if (!request->artist_->terms().isEmpty()) {

    CollapsibleInfoPane::Data data;

    data.id_ = "echonest/artisttags";

    data.title_ = tr("Artist tags");

    data.type_ = CollapsibleInfoPane::Data::Type_Tags;

    data.icon_ = IconLoader::Load("icon_tag", IconLoader::Lastfm);

    TagWidget* widget = new TagWidget(TagWidget::Type_Tags);

    data.contents_ = widget;

    widget->SetIcon(data.icon_);

    for (const Echonest::Term& term : request->artist_->terms()) {

      widget->AddTag(term.name());

      if (widget->count() >= 10) break;

    }

    emit InfoReady(request->id_, data);

  }

  emit Finished(request->id_);

}

-- Clementine-1.3.1/src/songinfo/echonesttags.h

/* This file is part of Clementine.

++ Clementine-1.3.1/src/songinfo/songkickconcerts.cpp

   Copyright 2010, 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 ECHONESTTAGS_H

#define ECHONESTTAGS_H

#include <memory>

#include "songinfoprovider.h"

class QNetworkReply;

class EchoNestTags : public SongInfoProvider {

  Q_OBJECT

 public:

  void FetchInfo(int id, const Song& metadata);

 private slots:

  void RequestFinished();

 private:

  struct Request;

  typedef std::shared_ptr<Request> RequestPtr;

  QMap<QNetworkReply*, RequestPtr> requests_;

};

#endif  // ECHONESTTAGS_H

-- Clementine-1.3.1/src/songinfo/songkickconcerts.cpp

const char* SongkickConcerts::kSongkickArtistBucket = "songkick";

namespace {

const char* SongkickConcerts::kSongkickArtistCalendarUrl =

const char* kSongkickArtistCalendarUrl =

    "https://api.songkick.com/api/3.0/artists/%1/calendar.json?"

    "https://api.songkick.com/api/3.0/artists/%1/calendar.json";

    "per_page=5&"

const char* kSongkickArtistSearchUrl =

    "apikey=8rgKfy1WU6IlJFfN";

    "https://api.songkick.com/api/3.0/search/artists.json";

const char* kSongkickApiKey = "8rgKfy1WU6IlJFfN";

}  // namespace

  NewClosure(geolocator, SIGNAL(Finished(Geolocator::LatLng)), geolocator,

  connect(geolocator, SIGNAL(Finished(Geolocator::LatLng)), geolocator,

             SLOT(deleteLater()));

          SLOT(deleteLater()));

  Echonest::Artist::SearchParams params;

  if (metadata.artist().isEmpty()) {

  params.push_back(

    emit Finished(id);

      qMakePair(Echonest::Artist::Name, QVariant(metadata.artist())));

    return;

  qLog(Debug) << "Params:" << params;

  }

  QNetworkReply* reply = Echonest::Artist::search(

      params,

  QUrl url(kSongkickArtistSearchUrl);

      Echonest::ArtistInformation(Echonest::ArtistInformation::NoInformation,

  url.addQueryItem("apikey", kSongkickApiKey);

                                  QStringList() << kSongkickArtistBucket));

  url.addQueryItem("query", metadata.artist());

  qLog(Debug) << reply->request().url();

  QNetworkRequest request(url);

  QNetworkReply* reply = network_.get(request);

  try {

    Echonest::Artists artists = Echonest::Artist::parseSearch(reply);

  QJson::Parser parser;

    if (artists.isEmpty()) {

  QVariantMap json = parser.parse(reply).toMap();

      qLog(Debug) << "Failed to find artist in echonest";

      emit Finished(id);

  QVariantMap results_page = json["resultsPage"].toMap();

      return;

  QVariantMap results = results_page["results"].toMap();

    }

  QVariantList artists = results["artist"].toList();

    const Echonest::Artist& artist = artists[0];

  if (artists.isEmpty()) {

    const Echonest::ForeignIds& foreign_ids = artist.foreignIds();

    QString songkick_id;

    for (const Echonest::ForeignId& id : foreign_ids) {

      if (id.catalog == "songkick") {

        songkick_id = id.foreign_id;

        break;

      }

    }

    if (songkick_id.isEmpty()) {

      qLog(Debug) << "Failed to fetch songkick foreign id for artist";

      emit Finished(id);

      return;

    }

    QStringList split = songkick_id.split(':');

    if (split.count() != 3) {

      qLog(Error) << "Weird songkick id";

      emit Finished(id);

      return;

    }

    FetchSongkickCalendar(split[2], id);

  } catch (Echonest::ParseError& e) {

    qLog(Error) << "Error parsing echonest reply:" << e.errorType() << e.what();

-- Clementine-1.3.1/src/songinfo/songkickconcerts.h

++ Clementine-1.3.1/src/songinfo/songkickconcerts.h