mirror of
https://github.com/clementine-player/Clementine
synced 2025-01-11 09:24:50 +01:00
Remove some stray vkontakte code
This commit is contained in:
John Maguire
parent
c7b8aacad8
commit
becb0b3d7f
@ -1,123 +0,0 @@
|
||||
/* This file is part of Clementine.
|
||||
Copyright 2013, Vlad Maltsev <shedwardx@gmail.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 "vksearchprovider.h"
|
||||
|
||||
#include <algorithm>
|
||||
|
||||
#include "core/logging.h"
|
||||
#include "core/song.h"
|
||||
#include "ui/iconloader.h"
|
||||
|
||||
VkSearchProvider::VkSearchProvider(Application* app, QObject* parent)
|
||||
: SearchProvider(app, parent), service_(NULL) {}
|
||||
|
||||
void VkSearchProvider::Init(VkService* service) {
|
||||
service_ = service;
|
||||
SearchProvider::Init("Vk.com", "vk.com", IconLoader::Load("vk",
|
||||
IconLoader::Provider), WantsDelayedQueries
|
||||
| CanShowConfig);
|
||||
|
||||
connect(service_, SIGNAL(SongSearchResult(SearchID, SongList)), this,
|
||||
SLOT(SongSearchResult(SearchID, SongList)));
|
||||
connect(service_, SIGNAL(GroupSearchResult(SearchID, MusicOwnerList)), this,
|
||||
SLOT(GroupSearchResult(SearchID, MusicOwnerList)));
|
||||
}
|
||||
|
||||
void VkSearchProvider::SearchAsync(int id, const QString& query) {
|
||||
int count = service_->maxGlobalSearch();
|
||||
|
||||
SearchID rid(SearchID::GlobalSearch);
|
||||
songs_recived = false;
|
||||
groups_recived = false;
|
||||
pending_searches_[rid.id()] = PendingState(id, TokenizeQuery(query));
|
||||
service_->SongSearch(rid, query, count, 0);
|
||||
if (service_->isGroupsInGlobalSearch()) {
|
||||
service_->GroupSearch(rid, query);
|
||||
}
|
||||
}
|
||||
|
||||
bool VkSearchProvider::IsLoggedIn() {
|
||||
return (service_ && service_->HasAccount());
|
||||
}
|
||||
|
||||
void VkSearchProvider::ShowConfig() { service_->ShowConfig(); }
|
||||
|
||||
void VkSearchProvider::SongSearchResult(const SearchID& id, SongList songs) {
|
||||
if (id.type() == SearchID::GlobalSearch) {
|
||||
ClearSimilarSongs(songs);
|
||||
ResultList ret;
|
||||
for (const Song& song : songs) {
|
||||
Result result(this);
|
||||
result.metadata_ = song;
|
||||
ret << result;
|
||||
}
|
||||
qLog(Info) << "Found" << songs.count() << "songs.";
|
||||
songs_recived = true;
|
||||
const PendingState state = pending_searches_[id.id()];
|
||||
emit ResultsAvailable(state.orig_id_, ret);
|
||||
MaybeSearchFinished(id.id());
|
||||
}
|
||||
}
|
||||
|
||||
void VkSearchProvider::GroupSearchResult(const SearchID& rid,
|
||||
const MusicOwnerList& groups) {
|
||||
if (rid.type() == SearchID::GlobalSearch) {
|
||||
ResultList ret;
|
||||
for (const MusicOwner& group : groups) {
|
||||
Result result(this);
|
||||
result.metadata_ = group.toOwnerRadio();
|
||||
ret << result;
|
||||
}
|
||||
qLog(Info) << "Found" << groups.count() << "groups.";
|
||||
groups_recived = true;
|
||||
const PendingState state = pending_searches_[rid.id()];
|
||||
emit ResultsAvailable(state.orig_id_, ret);
|
||||
MaybeSearchFinished(rid.id());
|
||||
}
|
||||
}
|
||||
|
||||
void VkSearchProvider::MaybeSearchFinished(int id) {
|
||||
if (pending_searches_.keys(PendingState(id, QStringList())).isEmpty() &&
|
||||
songs_recived && groups_recived) {
|
||||
const PendingState state = pending_searches_.take(id);
|
||||
emit SearchFinished(state.orig_id_);
|
||||
}
|
||||
}
|
||||
|
||||
void VkSearchProvider::ClearSimilarSongs(SongList& list) {
|
||||
// Search result sorted by relevance, and better quality songs usualy come
|
||||
// first.
|
||||
// Stable sort don't mix similar song, so std::unique will remove bad quality
|
||||
// copies.
|
||||
qStableSort(list.begin(), list.end(), [](const Song& a, const Song& b) {
|
||||
return (a.artist().localeAwareCompare(b.artist()) > 0) ||
|
||||
(a.title().localeAwareCompare(b.title()) > 0);
|
||||
});
|
||||
|
||||
int old = list.count();
|
||||
|
||||
auto end =
|
||||
std::unique(list.begin(), list.end(), [](const Song& a, const Song& b) {
|
||||
return (a.artist().localeAwareCompare(b.artist()) == 0) &&
|
||||
(a.title().localeAwareCompare(b.title()) == 0);
|
||||
});
|
||||
|
||||
list.erase(end, list.end());
|
||||
|
||||
qDebug() << "Cleared" << old - list.count() << "items";
|
||||
}
|
||||
@ -1,50 +0,0 @@
|
||||
/* This file is part of Clementine.
|
||||
Copyright 2013, Vlad Maltsev <shedwardx@gmail.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 VKSEARCHPROVIDER_H
|
||||
#define VKSEARCHPROVIDER_H
|
||||
|
||||
#include "internet/vk/vkservice.h"
|
||||
|
||||
#include "searchprovider.h"
|
||||
|
||||
class VkSearchProvider : public SearchProvider {
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
VkSearchProvider(Application* app, QObject* parent = 0);
|
||||
void Init(VkService* service);
|
||||
void SearchAsync(int id, const QString& query);
|
||||
bool IsLoggedIn();
|
||||
void ShowConfig();
|
||||
InternetService* internet_service() { return service_; }
|
||||
|
||||
public slots:
|
||||
void SongSearchResult(const SearchID& id, SongList songs);
|
||||
void GroupSearchResult(const SearchID& rid, const MusicOwnerList& groups);
|
||||
|
||||
private:
|
||||
bool songs_recived;
|
||||
bool groups_recived;
|
||||
void MaybeSearchFinished(int id);
|
||||
void ClearSimilarSongs(SongList& list);
|
||||
VkService* service_;
|
||||
QMap<int, PendingState> pending_searches_;
|
||||
};
|
||||
|
||||
#endif // VKSEARCHPROVIDER_H
|
||||
@ -83,7 +83,6 @@ class SettingsDialog : public QDialog {
|
||||
Page_Dropbox,
|
||||
Page_Skydrive,
|
||||
Page_Box,
|
||||
Page_Vk,
|
||||
Page_Seafile,
|
||||
Page_InternetShow,
|
||||
Page_AmazonCloudDrive,
|
||||
@ -116,7 +115,7 @@ class SettingsDialog : public QDialog {
|
||||
// QWidget
|
||||
void showEvent(QShowEvent* e);
|
||||
|
||||
signals:
|
||||
signals:
|
||||
void NotificationPreview(OSD::Behaviour, QString, QString);
|
||||
void SetWiimotedevInterfaceActived(bool);
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user