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

Search on Grooveshark on the left/Internet tab directly, instead of Grooveshark magic playlist. 

Next steps:
- add GS albums search on the left tab
- do the same for Spotify if it's convincing enough
- clean-up magic search playlists
This commit is contained in:
Arnaud Bienner 2012-06-27 01:21:57 +02:00
parent 2fe212e68b
commit ac936c5374
8 changed files with 258 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/CMakeLists.txt
View File

@ -183,6 +183,7 @@ set(SOURCES
internet/magnatuneservice.cpp
internet/magnatuneurlhandler.cpp
internet/savedradio.cpp
internet/searchboxwidget.cpp
internet/somafmservice.cpp
internet/somafmurlhandler.cpp
@ -449,6 +450,7 @@ set(HEADERS
internet/magnatunesettingspage.h
internet/magnatuneservice.h
internet/savedradio.h
internet/searchboxwidget.h
internet/somafmservice.h
internet/somafmurlhandler.h
@ -621,6 +623,7 @@ set(UI
internet/internetviewcontainer.ui
internet/magnatunedownloaddialog.ui
internet/magnatunesettingspage.ui
internet/searchboxwidget.ui
internet/spotifysettingspage.ui
library/groupbydialog.ui

97
src/internet/groovesharkservice.cpp
View File

@ -40,6 +40,7 @@
#include "groovesharkradio.h"
#include "groovesharksearchplaylisttype.h"
#include "groovesharkurlhandler.h"
#include "searchboxwidget.h"
#include "core/application.h"
#include "core/closure.h"
@ -84,7 +85,6 @@ typedef QPair<QString, QVariant> Param;
GroovesharkService::GroovesharkService(Application* app, InternetModel *parent)
: InternetService(kServiceName, app, parent, parent),
url_handler_(new GroovesharkUrlHandler(this, this)),
pending_search_playlist_(NULL),
next_pending_search_id_(0),
root_(NULL),
search_(NULL),
@ -93,7 +93,8 @@ GroovesharkService::GroovesharkService(Application* app, InternetModel *parent)
stations_(NULL),
grooveshark_radio_(NULL),
favorites_(NULL),
subscribed_playlists_divider_(NULL),
playlists_parent_(NULL),
subscribed_playlists_parent_(NULL),
network_(new NetworkAccessManager(this)),
context_menu_(NULL),
create_playlist_(NULL),
@ -103,6 +104,7 @@ GroovesharkService::GroovesharkService(Application* app, InternetModel *parent)
remove_from_favorites_(NULL),
get_url_to_share_song_(NULL),
get_url_to_share_playlist_(NULL),
search_box_(new SearchBoxWidget(this)),
search_delay_(new QTimer(this)),
last_search_reply_(NULL),
api_key_(QByteArray::fromBase64(kApiSecret)),
@ -132,6 +134,8 @@ GroovesharkService::GroovesharkService(Application* app, InternetModel *parent)
QByteArray ba = QByteArray::fromBase64(QCoreApplication::applicationName().toLatin1());
int n = api_key_.length(), n2 = ba.length();
for (int i=0; i<n; i++) api_key_[i] = api_key_[i] ^ ba[i%n2];
connect(search_box_, SIGNAL(TextChanged(QString)), SLOT(Search(QString)));
}
@ -161,15 +165,18 @@ void GroovesharkService::ShowConfig() {
app_->OpenSettingsDialogAtPage(SettingsDialog::Page_Grooveshark);
}
void GroovesharkService::Search(const QString& text, Playlist* playlist, bool now) {
QWidget* GroovesharkService::HeaderWidget() const {
return search_box_;
}
void GroovesharkService::Search(const QString& text, bool now) {
pending_search_ = text;
pending_search_playlist_ = playlist;
// If there is no text (e.g. user cleared search box), we don't need to do a
// real query that will return nothing: we can clear the playlist now
if (text.isEmpty()) {
search_delay_->stop();
pending_search_playlist_->Clear();
ClearSearchResults();
return;
}
@ -264,11 +271,12 @@ void GroovesharkService::DoSearch() {
task_search_id_ = app_->task_manager()->StartTask(tr("Searching on Grooveshark"));
}
QList<Param> parameters;
ClearSearchResults();
QList<Param> parameters;
parameters << Param("query", pending_search_)
<< Param("country", "")
<< Param("limit", QString("%1").arg(kSongSearchLimit))
<< Param("limit", QString::number(kSongSearchLimit))
<< Param("offset", "");
last_search_reply_ = CreateRequest("getSongSearchResults", parameters);
connect(last_search_reply_, SIGNAL(finished()), SLOT(SearchSongsFinished()));
@ -283,10 +291,21 @@ void GroovesharkService::SearchSongsFinished() {
QVariantMap result = ExtractResult(reply);
SongList songs = ExtractSongs(result);
pending_search_playlist_->Clear();
pending_search_playlist_->InsertInternetItems(this, songs);
app_->task_manager()->SetTaskFinished(task_search_id_);
task_search_id_ = 0;
// Fill results list
foreach (const Song& song, songs) {
QStandardItem* child = new QStandardItem(song.PrettyTitleWithArtist());
child->setData(Type_Track, InternetModel::Role_Type);
child->setData(QVariant::fromValue(song), InternetModel::Role_SongMetadata);
child->setData(InternetModel::PlayBehaviour_SingleItem, InternetModel::Role_PlayBehaviour);
child->setData(song.url(), InternetModel::Role_Url);
search_->appendRow(child);
}
QModelIndex index = model()->merged_model()->mapFromSource(search_->index());
ScrollToIndex(index);
}
void GroovesharkService::InitCountry() {
@ -408,6 +427,11 @@ void GroovesharkService::Authenticated() {
EnsureItemsCreated();
}
void GroovesharkService::ClearSearchResults() {
if (search_)
search_->removeRows(0, search_->rowCount());
}
void GroovesharkService::Logout() {
ResetSessionId();
RemoveItems();
@ -421,10 +445,12 @@ void GroovesharkService::RemoveItems() {
popular_month_ = NULL;
popular_today_ = NULL;
favorites_ = NULL;
subscribed_playlists_divider_ = NULL;
subscribed_playlists_parent_ = NULL;
stations_ = NULL;
grooveshark_radio_ = NULL;
playlists_parent_ = NULL;
playlists_.clear();
subscribed_playlists_parent_ = NULL;
subscribed_playlists_.clear();
}
@ -549,47 +575,45 @@ void GroovesharkService::RefreshItems() {
void GroovesharkService::EnsureItemsCreated() {
if (IsLoggedIn() && !search_) {
search_ = new QStandardItem(IconLoader::Load("edit-find"),
tr("Search Grooveshark (opens a new tab)"));
tr("Search results"));
search_->setToolTip(tr("Start typing something on the search box above to "
"fill this search results list"));
search_->setData(Type_SearchResults, InternetModel::Role_Type);
search_->setData(InternetModel::PlayBehaviour_DoubleClickAction,
InternetModel::Role_PlayBehaviour);
root_->appendRow(search_);
QStandardItem* popular_divider = new QStandardItem(tr("Popular songs"));
popular_divider->setData(true, InternetModel::Role_IsDivider);
root_->appendRow(popular_divider);
QStandardItem* popular = new QStandardItem(QIcon(":/star-on.png"),
tr("Popular songs"));
root_->appendRow(popular);
popular_month_ = new QStandardItem(QIcon(":/star-on.png"), tr("Popular songs of the Month"));
popular_month_->setData(InternetModel::Type_UserPlaylist, InternetModel::Role_Type);
popular_month_->setData(true, InternetModel::Role_CanLazyLoad);
popular_month_->setData(InternetModel::PlayBehaviour_SingleItem,
InternetModel::Role_PlayBehaviour);
root_->appendRow(popular_month_);
popular->appendRow(popular_month_);
popular_today_ = new QStandardItem(QIcon(":/star-on.png"), tr("Popular songs today"));
popular_today_->setData(InternetModel::Type_UserPlaylist, InternetModel::Role_Type);
popular_today_->setData(true, InternetModel::Role_CanLazyLoad);
popular_today_->setData(InternetModel::PlayBehaviour_SingleItem,
InternetModel::Role_PlayBehaviour);
root_->appendRow(popular_today_);
popular->appendRow(popular_today_);
QStandardItem* radios_divider = new QStandardItem(tr("Radios"));
radios_divider->setData(true, InternetModel::Role_IsDivider);
QStandardItem* radios_divider = new QStandardItem(QIcon(":last.fm/icon_radio.png"),
tr("Radios"));
root_->appendRow(radios_divider);
stations_ = new QStandardItem(QIcon(":last.fm/icon_radio.png"), tr("Stations"));
stations_->setData(InternetModel::Type_UserPlaylist, InternetModel::Role_Type);
stations_->setData(true, InternetModel::Role_CanLazyLoad);
root_->appendRow(stations_);
radios_divider->appendRow(stations_);
grooveshark_radio_ = new QStandardItem(QIcon(":last.fm/icon_radio.png"), tr("Grooveshark radio"));
grooveshark_radio_->setToolTip(tr("Listen to Grooveshark songs based on what you've listened to previously"));
grooveshark_radio_->setData(InternetModel::Type_SmartPlaylist, InternetModel::Role_Type);
root_->appendRow(grooveshark_radio_);
QStandardItem* playlists_divider = new QStandardItem(tr("Playlists"));
playlists_divider->setData(true, InternetModel::Role_IsDivider);
root_->appendRow(playlists_divider);
radios_divider->appendRow(grooveshark_radio_);
favorites_ = new QStandardItem(QIcon(":/last.fm/love.png"), tr("Favorites"));
favorites_->setData(InternetModel::Type_UserPlaylist, InternetModel::Role_Type);
@ -600,9 +624,11 @@ void GroovesharkService::EnsureItemsCreated() {
InternetModel::Role_PlayBehaviour);
root_->appendRow(favorites_);
subscribed_playlists_divider_ = new QStandardItem(tr("Subscribed playlists"));
subscribed_playlists_divider_->setData(true, InternetModel::Role_IsDivider);
root_->appendRow(subscribed_playlists_divider_);
playlists_parent_ = new QStandardItem(tr("Playlists"));
root_->appendRow(playlists_parent_);
subscribed_playlists_parent_ = new QStandardItem(tr("Subscribed playlists"));
root_->appendRow(subscribed_playlists_parent_);
RetrieveUserFavorites();
RetrieveUserPlaylists();
@ -655,11 +681,12 @@ void GroovesharkService::UserPlaylistsRetrieved() {
const QString& playlist_name = playlist_info.name_;
QStandardItem* playlist_item =
CreatePlaylistItem(playlist_name, playlist_id);
// Insert this new item just below the favorites list
root_->insertRow(favorites_->row() + 1, playlist_item);
playlists_parent_->appendRow(playlist_item);
// Keep in mind this playlist
playlists_.insert(playlist_id,
PlaylistInfo(playlist_id, playlist_name, playlist_item));
// Request playlist's songs
RefreshPlaylist(playlist_id);
}
@ -833,7 +860,7 @@ void GroovesharkService::SubscribedPlaylistsRetrieved(QNetworkReply* reply) {
subscribed_playlists_.insert(playlist_id,
PlaylistInfo(playlist_id, playlist_name, playlist_item));
root_->insertRow(subscribed_playlists_divider_->row() + 1, playlist_item);
subscribed_playlists_parent_->appendRow(playlist_item);
// Request playlist's songs
RefreshPlaylist(playlist_id);
@ -974,9 +1001,6 @@ void GroovesharkService::OpenSearchTab() {
}
void GroovesharkService::ItemDoubleClicked(QStandardItem* item) {
if (item == search_) {
OpenSearchTab();
}
if (item == root_) {
EnsureConnected();
}
@ -1234,8 +1258,7 @@ void GroovesharkService::NewPlaylistCreated(QNetworkReply* reply, const QString&
QStandardItem* new_playlist_item = CreatePlaylistItem(name, playlist_id);
PlaylistInfo playlist_info(playlist_id, name, new_playlist_item);
playlist_info.item_ = new_playlist_item;
// Insert the newly created playlist just above the subscribed playlists
root_->insertRow(subscribed_playlists_divider_->row(), new_playlist_item);
playlists_parent_->appendRow(new_playlist_item);
playlists_.insert(playlist_id, playlist_info);
}
@ -1280,7 +1303,7 @@ void GroovesharkService::PlaylistDeleted(QNetworkReply* reply, int playlist_id)
return;
}
PlaylistInfo playlist_info = playlists_.take(playlist_id);
root_->removeRow(playlist_info.item_->row());
playlists_parent_->removeRow(playlist_info.item_->row());
}
void GroovesharkService::RenameCurrentPlaylist() {
@ -1632,7 +1655,7 @@ QList<GroovesharkService::PlaylistInfo> GroovesharkService::ExtractPlaylistInfo(
}
// Sort playlists by name
qSort(playlists.begin(), playlists.end(), qGreater<PlaylistInfo>());
qSort(playlists.begin(), playlists.end());
return playlists;
}

11
src/internet/groovesharkservice.h
View File

@ -26,6 +26,7 @@
class GroovesharkUrlHandler;
class NetworkAccessManager;
class Playlist;
class SearchBoxWidget;
class QMenu;
class QNetworkReply;
@ -73,8 +74,8 @@ class GroovesharkService : public InternetService {
void DropMimeData(const QMimeData* data, const QModelIndex& index);
QList<QAction*> playlistitem_actions(const Song& song);
void ShowContextMenu(const QPoint& global_pos);
QWidget* HeaderWidget() const;
void Search(const QString& text, Playlist* playlist, bool now = false);
// User should be logged in to be able to generate streaming urls
QUrl GetStreamingUrlFromSongId(const QString& song_id, const QString& artist_id,
QString* server_id, QString* stream_key,
@ -129,6 +130,7 @@ class GroovesharkService : public InternetService {
void AlbumSongsLoaded(quint64 id, SongList songs);
public slots:
void Search(const QString& text, bool now = false);
void ShowConfig();
protected:
@ -196,6 +198,7 @@ class GroovesharkService : public InternetService {
void EnsureItemsCreated();
void RemoveItems();
void EnsureConnected();
void ClearSearchResults();
// Create a playlist item, with data set as excepted. Doesn't fill the item
// with songs rows.
@ -236,7 +239,6 @@ class GroovesharkService : public InternetService {
GroovesharkUrlHandler* url_handler_;
QString pending_search_;
Playlist* pending_search_playlist_;
int next_pending_search_id_;
QMap<QNetworkReply*, int> pending_searches_;
@ -253,7 +255,8 @@ class GroovesharkService : public InternetService {
QStandardItem* stations_;
QStandardItem* grooveshark_radio_;
QStandardItem* favorites_;
QStandardItem* subscribed_playlists_divider_;
QStandardItem* playlists_parent_;
QStandardItem* subscribed_playlists_parent_;
NetworkAccessManager* network_;
@ -272,6 +275,8 @@ class GroovesharkService : public InternetService {
QAction* get_url_to_share_playlist_;
QList<QAction*> playlistitem_actions_;
SearchBoxWidget* search_box_;
QTimer* search_delay_;
QNetworkReply* last_search_reply_;

3
src/internet/internetservice.h
View File

@ -72,6 +72,9 @@ signals:
void AddToPlaylistSignal(QMimeData* data);
void ScrollToIndex(const QModelIndex& index);
public slots:
virtual void ShowConfig() {}
private slots:
void AppendToPlaylist();
void ReplacePlaylist();

3
src/internet/internetviewcontainer.cpp
View File

@ -93,7 +93,8 @@ void InternetViewContainer::CurrentIndexChanged(const QModelIndex& index) {
}
void InternetViewContainer::Collapsed(const QModelIndex& index) {
if (app_->internet_model()->merged_model()->mapToSource(index).model() == app_->internet_model()) {
if (app_->internet_model()->merged_model()->mapToSource(index).model() == app_->internet_model()
&& index.data(InternetModel::Role_Type) == InternetModel::Type_Service) {
SetHeaderVisible(current_header_, false);
current_service_ = NULL;
current_header_ = NULL;

75
src/internet/searchboxwidget.cpp Normal file
View File

@ -0,0 +1,75 @@
/* 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 "internetservice.h"
#include "searchboxwidget.h"
#include "ui_searchboxwidget.h"
#include "ui/iconloader.h"
#include "widgets/maclineedit.h"
#include <QMenu>
SearchBoxWidget::SearchBoxWidget(InternetService* service)
: service_(service),
ui_(new Ui_SearchBoxWidget),
menu_(new QMenu(tr("Display options"), this))
{
ui_->setupUi(this);
// Icons
ui_->options->setIcon(IconLoader::Load("configure"));
// Options menu
menu_->setIcon(ui_->options->icon());
ui_->options->setMenu(menu_);
menu_->addAction(IconLoader::Load("configure"),
tr("Configure %1...").arg(service_->name()),
service_, SLOT(ShowConfig()));
#ifdef Q_OS_DARWIN
delete ui_->filter;
MacLineEdit* lineedit = new MacLineEdit(this);
ui_->horizontalLayout->insertWidget(1, lineedit);
filter_ = lineedit;
#else
filter_ = ui_->filter;
#endif
filter_->set_hint(QString("Search on %1").arg(service_->name()));
connect(filter_->widget(), SIGNAL(textChanged(QString)), SIGNAL(TextChanged(QString)));
}
SearchBoxWidget::~SearchBoxWidget() {
delete ui_;
}
void SearchBoxWidget::FocusOnFilter(QKeyEvent *event) {
ui_->filter->setFocus(Qt::OtherFocusReason);
QApplication::sendEvent(ui_->filter, event);
}
void SearchBoxWidget::keyReleaseEvent(QKeyEvent* e) {
switch (e->key()) {
case Qt::Key_Escape:
filter_->clear();
e->accept();
break;
}
QWidget::keyReleaseEvent(e);
}

54
src/internet/searchboxwidget.h Normal file
View File

@ -0,0 +1,54 @@
/* 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 SEARCHFILTERWIDGET_H
#define SEARCHFILTERWIDGET_H
#include <QWidget>
class InternetService;
class LineEditInterface;
class Ui_SearchBoxWidget;
class QActionGroup;
class QMenu;
class SearchBoxWidget : public QWidget {
Q_OBJECT
public:
SearchBoxWidget(InternetService* service);
~SearchBoxWidget();
signals:
void TextChanged(const QString& text);
public slots:
void FocusOnFilter(QKeyEvent* e);
protected:
void keyReleaseEvent(QKeyEvent* e);
private:
InternetService* service_;
Ui_SearchBoxWidget* ui_;
QMenu* menu_;
LineEditInterface* filter_;
};
#endif // SEARCHFILTERWIDGET_H

53
src/internet/searchboxwidget.ui Normal file
View File

@ -0,0 +1,53 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>SearchBoxWidget</class>
<widget class="QWidget" name="SearchBoxWidget">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>513</width>
<height>27</height>
</rect>
</property>
<property name="windowTitle">
<string>Form</string>
</property>
<layout class="QHBoxLayout" name="horizontalLayout">
<property name="spacing">
<number>0</number>
</property>
<property name="margin">
<number>0</number>
</property>
<item>
<widget class="LineEdit" name="filter"/>
</item>
<item>
<widget class="QToolButton" name="options">
<property name="iconSize">
<size>
<width>16</width>
<height>16</height>
</size>
</property>
<property name="popupMode">
<enum>QToolButton::InstantPopup</enum>
</property>
<property name="autoRaise">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</widget>
<customwidgets>
<customwidget>
<class>LineEdit</class>
<extends>QLineEdit</extends>
<header>widgets/lineedit.h</header>
</customwidget>
</customwidgets>
<resources/>
<connections/>
</ui>