add google play music

data/data.qrc

@@ -328,6 +328,7 @@
         <file>providers/musicbrainz.png</file>
         <file>providers/mygpo32.png</file>
         <file>providers/myspace.png</file>
+        <file>providers/playmusic.png</file>
         <file>providers/podcast16.png</file>
         <file>providers/podcast32.png</file>
         <file>providers/radiogfm.png</file>

src/CMakeLists.txt

@@ -155,6 +155,7 @@ set(SOURCES
   globalsearch/simplesearchprovider.cpp
   globalsearch/somafmsearchprovider.cpp
   globalsearch/soundcloudsearchprovider.cpp
+  globalsearch/playmusicsearchprovider.cpp
   globalsearch/spotifysearchprovider.cpp
   globalsearch/suggestionwidget.cpp
   globalsearch/urlsearchprovider.cpp
@@ -198,6 +199,9 @@ set(SOURCES
   internet/subsonic/subsonicservice.cpp
   internet/subsonic/subsonicsettingspage.cpp
   internet/subsonic/subsonicurlhandler.cpp
+  internet/playmusic/playmusicservice.cpp
+  internet/playmusic/playmusicsettingspage.cpp
+  internet/playmusic/playmusicurlhandler.cpp
 
   library/groupbydialog.cpp
   library/library.cpp
@@ -462,6 +466,7 @@ set(HEADERS
   globalsearch/searchprovider.h
   globalsearch/simplesearchprovider.h
   globalsearch/soundcloudsearchprovider.h
+  globalsearch/playmusicsearchprovider.h
   globalsearch/spotifysearchprovider.h
   globalsearch/suggestionwidget.h
 
@@ -501,6 +506,9 @@ set(HEADERS
   internet/subsonic/subsonicservice.h
   internet/subsonic/subsonicsettingspage.h
   internet/subsonic/subsonicurlhandler.h
+  internet/playmusic/playmusicservice.h
+  internet/playmusic/playmusicsettingspage.h
+  internet/playmusic/playmusicurlhandler.h
 
   library/groupbydialog.h
   library/library.h
@@ -694,6 +702,7 @@ set(UI
   internet/soundcloud/soundcloudsettingspage.ui
   internet/spotify/spotifysettingspage.ui
   internet/subsonic/subsonicsettingspage.ui
+  internet/playmusic/playmusicsettingspage.ui
 
   library/groupbydialog.ui
   library/libraryfilterwidget.ui

src/globalsearch/playmusicsearchprovider.cpp

@@ -0,0 +1,89 @@
+/* This file is part of Clementine.
+   Copyright 2015, Marco Kirchner <kirchnermarco@gmail.com>
+   Copyright 2011, 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 "playmusicsearchprovider.h"
+
+#include <QIcon>
+
+#include "core/application.h"
+#include "core/logging.h"
+#include "covers/albumcoverloader.h"
+#include "internet/playmusic/playmusicservice.h"
+
+PlayMusicSearchProvider::PlayMusicSearchProvider(Application* app,
+                                                   QObject* parent)
+    : SearchProvider(app, parent), service_(nullptr) {}
+
+void PlayMusicSearchProvider::Init(PlayMusicService* service) {
+  service_ = service;
+  SearchProvider::Init(
+      "Google Play Music", "playmusic", QIcon(":providers/playmusic.png"),
+      WantsDelayedQueries | ArtIsProbablyRemote | CanShowConfig);
+
+  connect(service_, SIGNAL(SimpleSearchResults(int, SongList)),
+          SLOT(SearchDone(int, SongList)));
+
+  cover_loader_options_.desired_height_ = kArtHeight;
+  cover_loader_options_.pad_output_image_ = true;
+  cover_loader_options_.scale_output_image_ = true;
+
+  connect(app_->album_cover_loader(), SIGNAL(ImageLoaded(quint64, QImage)),
+          SLOT(AlbumArtLoaded(quint64, QImage)));
+}
+
+void PlayMusicSearchProvider::SearchAsync(int id, const QString& query) {
+  const int service_id = service_->SimpleSearch(query);
+  pending_searches_[service_id] = PendingState(id, TokenizeQuery(query));
+}
+
+void PlayMusicSearchProvider::SearchDone(int id, const SongList& songs) {
+  // Map back to the original id.
+  const PendingState state = pending_searches_.take(id);
+  const int global_search_id = state.orig_id_;
+
+  ResultList ret;
+  for (const Song& song : songs) {
+    Result result(this);
+    result.metadata_ = song;
+
+    ret << result;
+  }
+
+  emit ResultsAvailable(global_search_id, ret);
+  MaybeSearchFinished(global_search_id);
+}
+
+void PlayMusicSearchProvider::MaybeSearchFinished(int id) {
+  if (pending_searches_.keys(PendingState(id, QStringList())).isEmpty()) {
+    emit SearchFinished(id);
+  }
+}
+
+void PlayMusicSearchProvider::LoadArtAsync(int id, const Result& result) {
+  quint64 loader_id = app_->album_cover_loader()->LoadImageAsync(
+      cover_loader_options_, result.metadata_);
+  cover_loader_tasks_[loader_id] = id;
+}
+
+void PlayMusicSearchProvider::AlbumArtLoaded(quint64 id, const QImage& image) {
+  if (!cover_loader_tasks_.contains(id)) {
+    return;
+  }
+  int original_id = cover_loader_tasks_.take(id);
+  emit ArtLoaded(original_id, image);
+}

src/globalsearch/playmusicsearchprovider.h

@@ -0,0 +1,54 @@
+/* This file is part of Clementine.
+   Copyright 2015, Marco Kirchner <kirchnermarco@gmail.com>
+   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 PLAYMUSICSEARCHPROVIDER_H
+#define PLAYMUSICSEARCHPROVIDER_H
+
+#include "searchprovider.h"
+#include "covers/albumcoverloaderoptions.h"
+#include "internet/playmusic/playmusicservice.h"
+
+class AlbumCoverLoader;
+
+class PlayMusicSearchProvider : public SearchProvider {
+  Q_OBJECT
+
+ public:
+  explicit PlayMusicSearchProvider(Application* app, QObject* parent = nullptr);
+  void Init(PlayMusicService* service);
+
+  // SearchProvider
+  void SearchAsync(int id, const QString& query);
+  void LoadArtAsync(int id, const Result& result);
+  InternetService* internet_service() { return service_; }
+
+ private slots:
+  void AlbumArtLoaded(quint64 id, const QImage& image);
+  void SearchDone(int id, const SongList& songs);
+
+ private:
+  void MaybeSearchFinished(int id);
+
+  PlayMusicService* service_;
+  QMap<int, PendingState> pending_searches_;
+
+  AlbumCoverLoaderOptions cover_loader_options_;
+  QMap<quint64, int> cover_loader_tasks_;
+};
+
+#endif

src/internet/core/internetmodel.cpp

@@ -37,6 +37,7 @@
 #include "internet/internetradio/savedradio.h"
 #include "internet/somafm/somafmservice.h"
 #include "internet/soundcloud/soundcloudservice.h"
+#include "internet/playmusic/playmusicservice.h"
 #include "internet/spotify/spotifyservice.h"
 #include "internet/subsonic/subsonicservice.h"
 #include "core/closure.h"
@@ -98,6 +99,7 @@ InternetModel::InternetModel(Application* app, QObject* parent)
   AddService(new RadioTunesService(app, this));
   AddService(new SomaFMService(app, this));
   AddService(new SoundCloudService(app, this));
+  AddService(new PlayMusicService(app, this));
   AddService(new SpotifyService(app, this));
   AddService(new SubsonicService(app, this));
 #ifdef HAVE_BOX